diff --git a/bt5/erp5_configurator_maxma_demo/SkinTemplateItem/portal_skins/erp5_configurator_maxma_demo/BusinessConfiguration_afterMaxmaDemoConfiguration.py b/bt5/erp5_configurator_maxma_demo/SkinTemplateItem/portal_skins/erp5_configurator_maxma_demo/BusinessConfiguration_afterMaxmaDemoConfiguration.py index 8acacc5e6fb27dcc2108710d62d4254b9c199d69..74920b7e0f84adcf44c908b8100d6a2ac7f2943b 100644 --- a/bt5/erp5_configurator_maxma_demo/SkinTemplateItem/portal_skins/erp5_configurator_maxma_demo/BusinessConfiguration_afterMaxmaDemoConfiguration.py +++ b/bt5/erp5_configurator_maxma_demo/SkinTemplateItem/portal_skins/erp5_configurator_maxma_demo/BusinessConfiguration_afterMaxmaDemoConfiguration.py @@ -13,14 +13,10 @@ for document in portal.portal_catalog(portal_type=bt.getTemplatePortalTypeRoleLi document.updateLocalRolesOnSecurityGroups() conversion_server_url = portal.portal_preferences.getPreferredDocumentConversionServerUrl() -conversion_server_hostname = portal.portal_preferences.getPreferredOoodocServerAddress() -conversion_server_port = portal.portal_preferences.getPreferredOoodocServerPortNumber() for preference_id in ["default_configurator_preference", "default_configurator_system_preference"]: preference = getattr(portal.portal_preferences, preference_id) if preference.getPortalType() == "System Preference": preference.setPreferredDocumentConversionServerUrl(conversion_server_url) - preference.setPreferredOoodocServerPortNumber(conversion_server_port) - preference.setPreferredOoodocServerAddress(conversion_server_hostname) if isTransitionPossible(preference, "enable"): preference.enable() diff --git a/bt5/erp5_configurator_run_my_doc/TestTemplateItem/portal_components/test.erp5.testRunMyDocConfigurationWorkflow.py b/bt5/erp5_configurator_run_my_doc/TestTemplateItem/portal_components/test.erp5.testRunMyDocConfigurationWorkflow.py index 0ea1832c70d41f4ef3d063d7a56edb3082dd5217..6013634f090b1cf10fde4cb4b5d379edeb96eac3 100644 --- a/bt5/erp5_configurator_run_my_doc/TestTemplateItem/portal_components/test.erp5.testRunMyDocConfigurationWorkflow.py +++ b/bt5/erp5_configurator_run_my_doc/TestTemplateItem/portal_components/test.erp5.testRunMyDocConfigurationWorkflow.py @@ -187,10 +187,6 @@ class TestRunMyDocsConfiguratorWorkflowMixin(TestLiveConfiguratorWorkflowMixin): """ Check System Preference""" system_preference = self.portal.portal_catalog.getResultValue(portal_type="System Preference") conversion_dict = _getConversionServerDict() - self.assertEqual(system_preference.getPreferredOoodocServerPortNumber(), - conversion_dict['port']) - self.assertEqual(system_preference.getPreferredOoodocServerAddress(), - conversion_dict['hostname']) self.assertEqual(system_preference.getPreferredDocumentConversionServerUrl(), conversion_dict['url']) diff --git a/bt5/erp5_configurator_standard/TestTemplateItem/portal_components/test.erp5.testStandardConfigurationWorkflow.py b/bt5/erp5_configurator_standard/TestTemplateItem/portal_components/test.erp5.testStandardConfigurationWorkflow.py index bd0c540cec241131fe9224ce1d00d27c481845b4..781cf86496c52ed79cbde5d530d4f1f93bf37534 100644 --- a/bt5/erp5_configurator_standard/TestTemplateItem/portal_components/test.erp5.testStandardConfigurationWorkflow.py +++ b/bt5/erp5_configurator_standard/TestTemplateItem/portal_components/test.erp5.testStandardConfigurationWorkflow.py @@ -377,11 +377,6 @@ class StandardConfigurationMixin(TestLiveConfiguratorWorkflowMixin): preference_tool.getPreferredAccountingTransactionGap()) - # on Business Configuration - #self.assertEqual('localhost', preference_tool.getPreferredOoodocServerAddress()) - #self.assertEqual(8011, preference_tool.getPreferredOoodocServerPortNumber()) - #self.assertEqual('http://localhost:8011', preference_tool.getPreferredDocumentConversionServerUrl()) - # accounting self.assertEqual('group/my_group', preference_tool.getPreferredAccountingTransactionSectionCategory()) diff --git a/bt5/erp5_configurator_standard_ui_test/SkinTemplateItem/portal_skins/erp5_configurator_standard_ui_test/Zuite_setUpConfigurationTest.py b/bt5/erp5_configurator_standard_ui_test/SkinTemplateItem/portal_skins/erp5_configurator_standard_ui_test/Zuite_setUpConfigurationTest.py index b628ff04713f3a41f18755e6079b28604a9aa441..a3925beb5ab9c4430e82270b2b1ee3a7c2913069 100644 --- a/bt5/erp5_configurator_standard_ui_test/SkinTemplateItem/portal_skins/erp5_configurator_standard_ui_test/Zuite_setUpConfigurationTest.py +++ b/bt5/erp5_configurator_standard_ui_test/SkinTemplateItem/portal_skins/erp5_configurator_standard_ui_test/Zuite_setUpConfigurationTest.py @@ -21,12 +21,6 @@ default_site_preference.setPreferredHtmlStyleAccessTab('1') previous_conversion_server_url = portal.portal_preferences.getPreferredDocumentConversionServerUrl() default_site_preference.setPreferredDocumentConversionServerUrl(previous_conversion_server_url) -previous_conversion_server_address = portal.portal_preferences.getPreferredOoodocServerAddress() -default_site_preference.setPreferredOoodocServerAddress(previous_conversion_server_address) - -previous_conversion_port = portal.portal_preferences.getPreferredOoodocServerPortNumber() -default_site_preference.setPreferredOoodocServerPortNumber(previous_conversion_port) - if default_site_preference.getPreferenceState() != 'global': default_site_preference.enable() diff --git a/bt5/erp5_configurator_ung/TestTemplateItem/portal_components/test.erp5.testUNGConfigurationWorkflow.py b/bt5/erp5_configurator_ung/TestTemplateItem/portal_components/test.erp5.testUNGConfigurationWorkflow.py index 39a409a542ff3bdced8dbde8c3f74fa8a667924d..1f2a8f6ef3ca040ca234f2a168284805b6548fa7 100644 --- a/bt5/erp5_configurator_ung/TestTemplateItem/portal_components/test.erp5.testUNGConfigurationWorkflow.py +++ b/bt5/erp5_configurator_ung/TestTemplateItem/portal_components/test.erp5.testUNGConfigurationWorkflow.py @@ -213,10 +213,6 @@ class TestUNGConfiguratorWorkflowMixin(TestLiveConfiguratorWorkflowMixin): """ Check System Preference""" system_preference = self.portal.portal_catalog.getResultValue(portal_type="System Preference") conversion_dict = _getConversionServerDict() - self.assertEqual(system_preference.getPreferredOoodocServerPortNumber(), - conversion_dict['port']) - self.assertEqual(system_preference.getPreferredOoodocServerAddress(), - conversion_dict['hostname']) self.assertEqual(system_preference.getPreferredDocumentConversionServerUrl(), conversion_dict['url']) diff --git a/bt5/erp5_demo_ung/SkinTemplateItem/portal_skins/erp5_demo_ung/Alarm_configureUng.py b/bt5/erp5_demo_ung/SkinTemplateItem/portal_skins/erp5_demo_ung/Alarm_configureUng.py index a237e5ef5f83533f1711a116c3c8a14d1a344889..086215461ce6f4f00e1d309a44cad925bccceeeb 100644 --- a/bt5/erp5_demo_ung/SkinTemplateItem/portal_skins/erp5_demo_ung/Alarm_configureUng.py +++ b/bt5/erp5_demo_ung/SkinTemplateItem/portal_skins/erp5_demo_ung/Alarm_configureUng.py @@ -25,7 +25,5 @@ if ung_system_preference is None: ung_system_preference = portal.portal_preferences.newContent(portal_type='System Preference', id='ung_system_preference', title='UNG System Preference') - ung_system_preference.setPreferredOoodocServerAddress('localhost') - ung_system_preference.setPreferredOoodocServerPortNumber('8008') ung_system_preference.setPreferredDocumentConversionServerUrl('http://localhost:8008') ung_system_preference.enable() diff --git a/bt5/erp5_dms_conversion_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_preConvertDocumentList.py b/bt5/erp5_dms_conversion_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_preConvertDocumentList.py index d3749aa3ac786bad529c89e36550a6aea285eed0..215e080e747a9547ea018c675b29d045e64c2470 100644 --- a/bt5/erp5_dms_conversion_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_preConvertDocumentList.py +++ b/bt5/erp5_dms_conversion_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/SQLCatalog_preConvertDocumentList.py @@ -1,13 +1,9 @@ portal = context.getPortalObject() -MARKER = (None, '',) -url = portal.portal_preferences.getPreferredDocumentConversionServerUrl() -address = portal.portal_preferences.getPreferredOoodocServerAddress() -port = portal.portal_preferences.getPreferredOoodocServerPortNumber() # make sure cloudoo is available. this check is required ONLY due to # unit test nature where a bt5 with a data content which is to be reindexed # is installed BEFORE the real cloudoo is setup in preferences. -if url not in MARKER or (address not in MARKER and port not in MARKER): +if portal.portal_preferences.getPreferredDocumentConversionServerUrl(): for index_uid in range(len(uid)): document_relative_url = getRelativeUrl[index_uid] document = portal.restrictedTraverse(document_relative_url) diff --git a/bt5/erp5_ingestion/TestTemplateItem/portal_components/test.erp5.testLiveIngestion.py b/bt5/erp5_ingestion/TestTemplateItem/portal_components/test.erp5.testLiveIngestion.py index c9304d370d91eae5a4019891021c02827f3432ae..c9a8afa5ee179c4fb3eaf89c61c5d98af4ba20d5 100644 --- a/bt5/erp5_ingestion/TestTemplateItem/portal_components/test.erp5.testLiveIngestion.py +++ b/bt5/erp5_ingestion/TestTemplateItem/portal_components/test.erp5.testLiveIngestion.py @@ -77,8 +77,6 @@ class TestIngestion(ERP5TypeLiveTestCase): default_pref = portal_preferences.default_site_preference conversion_dict = _getConversionServerDict() default_pref.setPreferredDocumentConversionServerUrl(conversion_dict['url']) - default_pref.setPreferredOoodocServerAddress(conversion_dict['hostname']) - default_pref.setPreferredOoodocServerPortNumber(conversion_dict['port']) default_pref.setPreferredDocumentFileNameRegularExpression(FILE_NAME_REGULAR_EXPRESSION) default_pref.setPreferredDocumentReferenceRegularExpression(REFERENCE_REGULAR_EXPRESSION) if default_pref.getPreferenceState() != 'global': diff --git a/bt5/erp5_web_ung_theme/TestTemplateItem/portal_components/test.erp5.testUNG.py b/bt5/erp5_web_ung_theme/TestTemplateItem/portal_components/test.erp5.testUNG.py index 799e35b36a022f7a9e0ad81df356155fbe792d95..e6083de1ab613ea22ae829fdd032f4fa1b9a89d5 100644 --- a/bt5/erp5_web_ung_theme/TestTemplateItem/portal_components/test.erp5.testUNG.py +++ b/bt5/erp5_web_ung_theme/TestTemplateItem/portal_components/test.erp5.testUNG.py @@ -454,8 +454,6 @@ class TestUNG(ERP5TypeTestCase): system_preference = portal_preferences.newContent(portal_type='System Preference') conversion_dict = _getConversionServerDict() system_preference.setPreferredDocumentConversionServerUrl(conversion_dict["url"]) - system_preference.setPreferredOoodocServerAddress(conversion_dict["hostname"]) - system_preference.setPreferredOoodocServerPortNumber(conversion_dict["port"]) system_preference.enable() self.tic() document_path, filename = self.getDocumentPath() diff --git a/product/ERP5/tests/testBase.py b/product/ERP5/tests/testBase.py index 71ab6737b0cbc18863d9e683e7c1a05d0d31a9c3..e8880e479bc577a9a328a3e1bdbbf710bec172c5 100644 --- a/product/ERP5/tests/testBase.py +++ b/product/ERP5/tests/testBase.py @@ -123,8 +123,6 @@ class TestBase(ERP5TypeTestCase, ZopeTestCase.Functional): default_pref = self.portal.portal_preferences.default_site_preference conversion_dict = _getConversionServerDict() default_pref.setPreferredDocumentConversionServerUrl(conversion_dict['url']) - default_pref.setPreferredOoodocServerAddress(conversion_dict['hostname']) - default_pref.setPreferredOoodocServerPortNumber(conversion_dict['port']) if self.portal.portal_workflow.isTransitionPossible(default_pref, 'enable'): default_pref.enable() return default_pref diff --git a/product/ERP5/tests/testCRM.py b/product/ERP5/tests/testCRM.py index 5fdaec07b50a71933188190646a31cabd66f651b..5df368e4dc13c4240b19fc4c00672dd0771d7695 100644 --- a/product/ERP5/tests/testCRM.py +++ b/product/ERP5/tests/testCRM.py @@ -1020,8 +1020,6 @@ class TestCRMMailSend(BaseTestCRM): default_pref = self.portal.portal_preferences.default_site_preference conversion_dict = _getConversionServerDict() default_pref.setPreferredDocumentConversionServerUrl(conversion_dict['url']) - default_pref.setPreferredOoodocServerAddress(conversion_dict['hostname']) - default_pref.setPreferredOoodocServerPortNumber(conversion_dict['port']) default_pref.setPreferredDocumentFilenameRegularExpression(FILENAME_REGULAR_EXPRESSION) default_pref.setPreferredDocumentReferenceRegularExpression(REFERENCE_REGULAR_EXPRESSION) if default_pref.getPreferenceState() == 'disabled': diff --git a/product/ERP5/tests/testERP5WebWithCRM.py b/product/ERP5/tests/testERP5WebWithCRM.py index 8e142aba853dd6574e26aec62f0c8a2efe86fd52..7fcd8e08270c999e38d28f54592e2253727f6144 100644 --- a/product/ERP5/tests/testERP5WebWithCRM.py +++ b/product/ERP5/tests/testERP5WebWithCRM.py @@ -70,8 +70,6 @@ class TestERP5WebWithCRM(ERP5TypeTestCase): preference = preference_list[0] conversion_dict = _getConversionServerDict() preference.setPreferredDocumentConversionServerUrl(conversion_dict['url']) - preference.setPreferredOoodocServerAddress(conversion_dict['hostname']) - preference.setPreferredOoodocServerPortNumber(conversion_dict['port']) if self.portal.portal_workflow.isTransitionPossible(preference, 'enable'): preference.enable() diff --git a/product/ERP5/tests/testERP5WebWithDms.py b/product/ERP5/tests/testERP5WebWithDms.py index cf44a6afbe483c9de2c75c80900676c49642a6a7..207c9d9bd24f9df9aea3b2e774c9c4778b3264b4 100644 --- a/product/ERP5/tests/testERP5WebWithDms.py +++ b/product/ERP5/tests/testERP5WebWithDms.py @@ -154,8 +154,6 @@ class TestERP5WebWithDms(ERP5TypeTestCase, ZopeTestCase.Functional): default_pref = self.portal.portal_preferences.default_site_preference conversion_dict = _getConversionServerDict() default_pref.setPreferredDocumentConversionServerUrl(conversion_dict['url']) - default_pref.setPreferredOoodocServerAddress(conversion_dict['hostname']) - default_pref.setPreferredOoodocServerPortNumber(conversion_dict['port']) if self.portal.portal_workflow.isTransitionPossible(default_pref, 'enable'): default_pref.enable() return default_pref diff --git a/product/ERP5/tests/testWebCrawler.py b/product/ERP5/tests/testWebCrawler.py index e691602397142f73666329086133cf2167df3dfc..5f1a138f8edc3625f0332b589ddfe76a35c90544 100644 --- a/product/ERP5/tests/testWebCrawler.py +++ b/product/ERP5/tests/testWebCrawler.py @@ -96,10 +96,6 @@ class TestWebCrawler(ERP5TypeTestCase): portal_type='System Preference') conversion_dict = _getConversionServerDict() system_preference.setPreferredDocumentConversionServerUrl(conversion_dict['url']) - system_preference.\ - setPreferredOoodocServerAddress(conversion_dict['hostname']) - system_preference.\ - setPreferredOoodocServerPortNumber(conversion_dict['port']) system_preference.setPreferredDocumentFilenameRegularExpression( FILENAME_REGULAR_EXPRESSION) system_preference.setPreferredDocumentReferenceRegularExpression( diff --git a/product/ERP5Configurator/tests/ConfiguratorTestMixin.py b/product/ERP5Configurator/tests/ConfiguratorTestMixin.py index 1bdb3421d3397e0c08fdca64081468fc11267f76..a7a31f017b78454fad2faf111389974d2cddeeaa 100644 --- a/product/ERP5Configurator/tests/ConfiguratorTestMixin.py +++ b/product/ERP5Configurator/tests/ConfiguratorTestMixin.py @@ -132,8 +132,6 @@ class TestLiveConfiguratorWorkflowMixin(SecurityTestCase): preference = preference_list[0] conversion_dict = _getConversionServerDict() preference.setPreferredDocumentConversionServerUrl(conversion_dict['url']) - preference.setPreferredOoodocServerAddress(conversion_dict['hostname']) - preference.setPreferredOoodocServerPortNumber(conversion_dict['port']) if self.portal.portal_workflow.isTransitionPossible(preference, 'enable'): preference.enable() diff --git a/product/ERP5OOo/tests/TestFormPrintoutMixin.py b/product/ERP5OOo/tests/TestFormPrintoutMixin.py index 7e7edc85879d541becd7197d3ce285867c41a828..72e3c1293611f8d8bb24c540bb23baff63e18222 100644 --- a/product/ERP5OOo/tests/TestFormPrintoutMixin.py +++ b/product/ERP5OOo/tests/TestFormPrintoutMixin.py @@ -51,8 +51,6 @@ class TestFormPrintoutMixin(ERP5TypeTestCase): default_pref = self.portal.portal_preferences.default_site_preference conversion_dict = _getConversionServerDict() default_pref.setPreferredDocumentConversionServerUrl(conversion_dict['url']) - default_pref.setPreferredOoodocServerAddress(conversion_dict['hostname']) - default_pref.setPreferredOoodocServerPortNumber(conversion_dict['port']) #default_pref.setPreferredConversionCacheFactory('document_cache_factory') if default_pref.getPreferenceState() != 'global': default_pref.enable() diff --git a/product/ERP5OOo/tests/testDms.py b/product/ERP5OOo/tests/testDms.py index dd91f66992459077e2fb62beec2654afc624ffa1..750a19cb9768da1817943b07a66b4a039ffbad25 100644 --- a/product/ERP5OOo/tests/testDms.py +++ b/product/ERP5OOo/tests/testDms.py @@ -124,8 +124,6 @@ class TestDocumentMixin(ERP5TypeTestCase): default_pref = self.portal.portal_preferences.default_site_preference conversion_dict = _getConversionServerDict() default_pref.setPreferredDocumentConversionServerUrl(conversion_dict['url']) - default_pref.setPreferredOoodocServerAddress(conversion_dict['hostname']) - default_pref.setPreferredOoodocServerPortNumber(conversion_dict['port']) default_pref.setPreferredDocumentFilenameRegularExpression(FILENAME_REGULAR_EXPRESSION) default_pref.setPreferredDocumentReferenceRegularExpression(REFERENCE_REGULAR_EXPRESSION) if self.portal.portal_workflow.isTransitionPossible(default_pref, 'enable'): diff --git a/product/ERP5OOo/tests/testIngestion.py b/product/ERP5OOo/tests/testIngestion.py index f70251d9cbf218a10c9f599b32011f3763ece3fd..179c280476121e8af6d874680f48742ebb89d3f6 100644 --- a/product/ERP5OOo/tests/testIngestion.py +++ b/product/ERP5OOo/tests/testIngestion.py @@ -141,8 +141,6 @@ class TestIngestion(ERP5TypeTestCase): default_pref = self.portal.portal_preferences.default_site_preference conversion_dict = _getConversionServerDict() default_pref.setPreferredDocumentConversionServerUrl(conversion_dict['url']) - default_pref.setPreferredOoodocServerAddress(conversion_dict['hostname']) - default_pref.setPreferredOoodocServerPortNumber(conversion_dict['port']) default_pref.setPreferredDocumentFilenameRegularExpression(FILENAME_REGULAR_EXPRESSION) default_pref.setPreferredDocumentReferenceRegularExpression(REFERENCE_REGULAR_EXPRESSION) if default_pref.getPreferenceState() != 'global': diff --git a/product/ERP5OOo/tests/testOOoImport.py b/product/ERP5OOo/tests/testOOoImport.py index e744ea416cceec9ded4c2e70872689e3a745634f..cb2deb38d0a4d1441bbf80c62308ea5bb9a10194 100644 --- a/product/ERP5OOo/tests/testOOoImport.py +++ b/product/ERP5OOo/tests/testOOoImport.py @@ -59,8 +59,6 @@ class TestOOoImportMixin(ERP5TypeTestCase): portal_type='System Preference') conversion_dict = _getConversionServerDict() self.pref.setPreferredDocumentConversionServerUrl(conversion_dict['url']) - self.pref.setPreferredOoodocServerAddress(conversion_dict['hostname']) - self.pref.setPreferredOoodocServerPortNumber(conversion_dict['port']) self.pref.setPriority(Priority.SITE) self.pref.enable() diff --git a/product/ERP5OOo/tests/testOOoStyle.py b/product/ERP5OOo/tests/testOOoStyle.py index c9394b5d9dca7223fd31f96cad54b683c557b0f8..f4e787f428f15b5aaddc5f059259b4a922b6eb45 100644 --- a/product/ERP5OOo/tests/testOOoStyle.py +++ b/product/ERP5OOo/tests/testOOoStyle.py @@ -90,8 +90,6 @@ class TestOOoStyle(ERP5TypeTestCase, ZopeTestCase.Functional): default_pref = self.portal.portal_preferences.default_site_preference conversion_dict = _getConversionServerDict() default_pref.setPreferredDocumentConversionServerUrl(conversion_dict['url']) - default_pref.setPreferredOoodocServerAddress(conversion_dict['hostname']) - default_pref.setPreferredOoodocServerPortNumber(conversion_dict['port']) if self.portal.portal_workflow.isTransitionPossible(default_pref, 'enable'): default_pref.enable() return default_pref diff --git a/product/ERP5SyncML/tests/testERP5DocumentSyncML.py b/product/ERP5SyncML/tests/testERP5DocumentSyncML.py index 86025503445a237f83b43f2c5e9aada846decd9a..2304c72d301ed65d0b2e001b0c1b24c610b243dd 100644 --- a/product/ERP5SyncML/tests/testERP5DocumentSyncML.py +++ b/product/ERP5SyncML/tests/testERP5DocumentSyncML.py @@ -151,8 +151,6 @@ class TestERP5DocumentSyncMLMixin(TestERP5SyncMLMixin): default_pref = self.portal.portal_preferences.default_site_preference conversion_dict = _getConversionServerDict() default_pref.setPreferredDocumentConversionServerUrl(conversion_dict['url']) - default_pref.setPreferredOoodocServerAddress(conversion_dict['hostname']) - default_pref.setPreferredOoodocServerPortNumber(conversion_dict['port']) default_pref.setPreferredDocumentFileNameRegularExpression(FILENAME_REGULAR_EXPRESSION) default_pref.setPreferredDocumentReferenceRegularExpression(REFERENCE_REGULAR_EXPRESSION) if default_pref.getPreferenceState() == 'disabled':