From c72218d3ae846d0008472fe60b0f4b4f519554b5 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Mon, 7 Oct 2024 11:34:22 +0300 Subject: [PATCH] ConvertService.ashx address replaced with converter --- CHANGELOG.md | 1 + .../csharp-mvc/Helpers/DocumentConverter.cs | 2 +- .../csharp-mvc/web.appsettings.config | 2 +- .../csharp/DocumentConverter.cs | 2 +- .../csharp/settings.config | 2 +- .../src/main/resources/settings.properties | 2 +- .../nodejs/config/default.json | 2 +- .../src/configuration/ConfigurationManager.php | 2 +- ...nManagerDocumentServerConverterURLTests.php | 2 +- .../python/src/configuration/configuration.py | 2 +- .../src/configuration/configuration_tests.py | 2 +- .../ruby/app/configuration/configuration.rb | 2 +- .../app/configuration/configuration_tests.rb | 2 +- .../ruby/app/models/service_converter.rb | 18 +++++++++--------- 14 files changed, 22 insertions(+), 21 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb963efa..52676142 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,7 @@ # Change Log - he-IL skin language +- ConvertService.ashx address replaced with converter ## 1.10.0 - nodejs: converting function on index page diff --git a/web/documentserver-example/csharp-mvc/Helpers/DocumentConverter.cs b/web/documentserver-example/csharp-mvc/Helpers/DocumentConverter.cs index 0ee44019..ff8880df 100644 --- a/web/documentserver-example/csharp-mvc/Helpers/DocumentConverter.cs +++ b/web/documentserver-example/csharp-mvc/Helpers/DocumentConverter.cs @@ -225,7 +225,7 @@ namespace OnlineEditorsExampleMVC.Helpers private static void ProcessResponseError(int errorCode) { var errorMessage = string.Empty; - const string errorMessageTemplate = "Error occurred in the ConvertService.ashx: {0}"; + const string errorMessageTemplate = "Error occurred in the ConvertService: {0}"; switch (errorCode) { diff --git a/web/documentserver-example/csharp-mvc/web.appsettings.config b/web/documentserver-example/csharp-mvc/web.appsettings.config index 384caec7..2f9e31cf 100644 --- a/web/documentserver-example/csharp-mvc/web.appsettings.config +++ b/web/documentserver-example/csharp-mvc/web.appsettings.config @@ -20,7 +20,7 @@ - + diff --git a/web/documentserver-example/csharp/DocumentConverter.cs b/web/documentserver-example/csharp/DocumentConverter.cs index 580f77af..2164a744 100644 --- a/web/documentserver-example/csharp/DocumentConverter.cs +++ b/web/documentserver-example/csharp/DocumentConverter.cs @@ -227,7 +227,7 @@ namespace ASC.Api.DocumentConverter private static void ProcessResponseError(int errorCode) { var errorMessage = string.Empty; - const string errorMessageTemplate = "Error occurred in the ConvertService.ashx: {0}"; + const string errorMessageTemplate = "Error occurred in the ConvertService: {0}"; switch (errorCode) { diff --git a/web/documentserver-example/csharp/settings.config b/web/documentserver-example/csharp/settings.config index 745a832c..421c496a 100644 --- a/web/documentserver-example/csharp/settings.config +++ b/web/documentserver-example/csharp/settings.config @@ -19,7 +19,7 @@ - + diff --git a/web/documentserver-example/java/src/main/resources/settings.properties b/web/documentserver-example/java/src/main/resources/settings.properties index 9bb38322..97f5bb28 100644 --- a/web/documentserver-example/java/src/main/resources/settings.properties +++ b/web/documentserver-example/java/src/main/resources/settings.properties @@ -8,7 +8,7 @@ enable-forgotten=TRUE files.docservice.timeout=120000 files.docservice.url.site=http://documentserver/ -files.docservice.url.converter=ConvertService.ashx +files.docservice.url.converter=converter files.docservice.url.command=coauthoring/CommandService.ashx files.docservice.url.api=web-apps/apps/api/documents/api.js files.docservice.url.preloader=web-apps/apps/api/documents/cache-scripts.html diff --git a/web/documentserver-example/nodejs/config/default.json b/web/documentserver-example/nodejs/config/default.json index 45dea196..86744e5a 100644 --- a/web/documentserver-example/nodejs/config/default.json +++ b/web/documentserver-example/nodejs/config/default.json @@ -18,7 +18,7 @@ "discovery": "hosting/discovery" }, "commandUrl": "coauthoring/CommandService.ashx", - "converterUrl": "ConvertService.ashx", + "converterUrl": "converter", "apiUrl": "web-apps/apps/api/documents/api.js", "preloaderUrl": "web-apps/apps/api/documents/cache-scripts.html", "exampleUrl": null, diff --git a/web/documentserver-example/php/src/configuration/ConfigurationManager.php b/web/documentserver-example/php/src/configuration/ConfigurationManager.php index b57742bf..03f2af26 100644 --- a/web/documentserver-example/php/src/configuration/ConfigurationManager.php +++ b/web/documentserver-example/php/src/configuration/ConfigurationManager.php @@ -81,7 +81,7 @@ class ConfigurationManager { $serverURL = $this->documentServerPrivateURL(); $path = getenv('DOCUMENT_SERVER_CONVERTER_PATH') - ?: 'ConvertService.ashx'; + ?: 'converter'; return $serverURL->joinPath($path); } diff --git a/web/documentserver-example/php/src/configuration/ConfigurationManagerDocumentServerConverterURLTests.php b/web/documentserver-example/php/src/configuration/ConfigurationManagerDocumentServerConverterURLTests.php index 79618385..67661ed0 100644 --- a/web/documentserver-example/php/src/configuration/ConfigurationManagerDocumentServerConverterURLTests.php +++ b/web/documentserver-example/php/src/configuration/ConfigurationManagerDocumentServerConverterURLTests.php @@ -42,7 +42,7 @@ final class ConfigurationManagerDocumentServerConverterURLTests extends TestCase $configManager = new ConfigurationManager(); $url = $configManager->documentServerConverterURL(); $this->assertEquals( - 'http://documentserver/ConvertService.ashx', + 'http://documentserver/converter', $url->string() ); } diff --git a/web/documentserver-example/python/src/configuration/configuration.py b/web/documentserver-example/python/src/configuration/configuration.py index f4b5eb49..dd7cfa89 100644 --- a/web/documentserver-example/python/src/configuration/configuration.py +++ b/web/documentserver-example/python/src/configuration/configuration.py @@ -81,7 +81,7 @@ class ConfigurationManager: base_url = server_url.geturl() path = ( environ.get('DOCUMENT_SERVER_CONVERTER_PATH') or - '/ConvertService.ashx' + '/converter' ) url = urljoin(base_url, path) return urlparse(url) diff --git a/web/documentserver-example/python/src/configuration/configuration_tests.py b/web/documentserver-example/python/src/configuration/configuration_tests.py index 3c86b380..468577dd 100644 --- a/web/documentserver-example/python/src/configuration/configuration_tests.py +++ b/web/documentserver-example/python/src/configuration/configuration_tests.py @@ -176,7 +176,7 @@ class ConfigurationManagerDocumentServerConverterURLTests(TestCase): url = config_manager.document_server_converter_url() self.assertEqual( url.geturl(), - 'http://localhost/ConvertService.ashx' + 'http://localhost/converter' ) @patch.object( diff --git a/web/documentserver-example/ruby/app/configuration/configuration.rb b/web/documentserver-example/ruby/app/configuration/configuration.rb index 58fe758a..1cbcd5b5 100644 --- a/web/documentserver-example/ruby/app/configuration/configuration.rb +++ b/web/documentserver-example/ruby/app/configuration/configuration.rb @@ -84,7 +84,7 @@ class ConfigurationManager def document_server_converter_uri path = ENV['DOCUMENT_SERVER_CONVERTER_PATH'] || - '/ConvertService.ashx' + '/converter' URI.join(document_server_private_uri, path) end diff --git a/web/documentserver-example/ruby/app/configuration/configuration_tests.rb b/web/documentserver-example/ruby/app/configuration/configuration_tests.rb index 16189727..e075bc3d 100644 --- a/web/documentserver-example/ruby/app/configuration/configuration_tests.rb +++ b/web/documentserver-example/ruby/app/configuration/configuration_tests.rb @@ -175,7 +175,7 @@ class ConfigurationManagerDocumentServerConverterURITests < Test::Unit::TestCase uri = config_manager.document_server_converter_uri assert_equal( uri.to_s, - 'http://documentserver/ConvertService.ashx' + 'http://documentserver/converter' ) end diff --git a/web/documentserver-example/ruby/app/models/service_converter.rb b/web/documentserver-example/ruby/app/models/service_converter.rb index 09b83fbe..bfe04e27 100755 --- a/web/documentserver-example/ruby/app/models/service_converter.rb +++ b/web/documentserver-example/ruby/app/models/service_converter.rb @@ -109,23 +109,23 @@ class ServiceConverter # add an error message to the error message template depending on the error code case error_code when -9 - error_message = 'Error occurred in the ConvertService.ashx: Error conversion output format' + error_message = 'Error occurred in the ConvertService: Error conversion output format' when -8 - error_message = 'Error occurred in the ConvertService.ashx: Error document VKey' + error_message = 'Error occurred in the ConvertService: Error document VKey' when -7 - error_message = 'Error occurred in the ConvertService.ashx: Error document request' + error_message = 'Error occurred in the ConvertService: Error document request' when -6 - error_message = 'Error occurred in the ConvertService.ashx: Error database' + error_message = 'Error occurred in the ConvertService: Error database' when -5 - error_message = 'Error occurred in the ConvertService.ashx: Incorrect password' + error_message = 'Error occurred in the ConvertService: Incorrect password' when -4 - error_message = 'Error occurred in the ConvertService.ashx: Error download error' + error_message = 'Error occurred in the ConvertService: Error download error' when -3 - error_message = 'Error occurred in the ConvertService.ashx: Error convertation error' + error_message = 'Error occurred in the ConvertService: Error convertation error' when -2 - error_message = 'Error occurred in the ConvertService.ashx: Error convertation timeout' + error_message = 'Error occurred in the ConvertService: Error convertation timeout' when -1 - error_message = 'Error occurred in the ConvertService.ashx: Error convertation unknown' + error_message = 'Error occurred in the ConvertService: Error convertation unknown' when 0 # public const int c_nErrorNo = 0 else