From 448afc640d475fc067333becba9c964ddcf2c164 Mon Sep 17 00:00:00 2001 From: Molkobain Date: Mon, 9 Nov 2020 19:48:28 +0100 Subject: [PATCH] Internal: Change XML version from 1.8 to 3.0 as it will now follow iTop core version numbering --- application/datamodel.application.xml | 2 +- core/datamodel.core.xml | 2 +- .../2.x/authent-cas/datamodel.authent-cas.xml | 2 +- .../authent-local/datamodel.authent-local.xml | 2 +- .../datamodel.combodo-db-tools.xml | 2 +- .../datamodel.itop-attachments.xml | 2 +- .../2.x/itop-backup/datamodel.itop-backup.xml | 2 +- .../datamodel.itop-bridge-cmdb-ticket.xml | 2 +- ...odel.itop-bridge-virtualization-storage.xml | 2 +- .../datamodel.itop-change-mgmt-itil.xml | 2 +- .../datamodel.itop-change-mgmt.xml | 2 +- .../datamodel.itop-config-mgmt.xml | 2 +- .../2.x/itop-config/datamodel.itop-config.xml | 2 +- .../datamodel.itop-core-update.xml | 2 +- .../datamodel.itop-datacenter-mgmt.xml | 2 +- .../datamodel.itop-enduser-devices.xml | 2 +- .../datamodel.itop-faq-light.xml | 2 +- .../datamodel.itop-files-information.xml | 2 +- .../datamodel.itop-full-itil.xml | 2 +- .../datamodel.itop-hub-connector.xml | 2 +- .../datamodel.itop-incident-mgmt-itil.xml | 2 +- .../datamodel.itop-knownerror-light.xml | 2 +- .../2.x/itop-portal/datamodel.itop-portal.xml | 2 +- .../datamodel.itop-problem-mgmt.xml | 2 +- .../datamodel.itop-profiles-itil.xml | 2 +- .../datamodel.itop-request-mgmt-itil.xml | 2 +- .../datamodel.itop-request-mgmt.xml | 2 +- .../datamodel.itop-service-mgmt-provider.xml | 2 +- .../datamodel.itop-service-mgmt.xml | 2 +- .../datamodel.itop-storage-mgmt.xml | 2 +- .../datamodel.itop-structure.xml | 2 +- .../itop-tickets/datamodel.itop-tickets.xml | 2 +- .../datamodel.itop-virtualization-mgmt.xml | 2 +- .../datamodel.itop-welcome-itil.xml | 2 +- setup/itopdesignformat.class.inc.php | 18 +++++++++--------- ....8.expected.xml => 1.7_to_3.0.expected.xml} | 2 +- ...7_to_1.8.input.xml => 1.7_to_3.0.input.xml} | 0 ....7.expected.xml => 3.0_to_1.7.expected.xml} | 0 ...8_to_1.7.input.xml => 3.0_to_1.7.input.xml} | 2 +- .../iTopDesignFormat/iTopDesignFormatTest.php | 4 ++-- 40 files changed, 47 insertions(+), 47 deletions(-) rename test/setup/iTopDesignFormat/{1.7_to_1.8.expected.xml => 1.7_to_3.0.expected.xml} (95%) rename test/setup/iTopDesignFormat/{1.7_to_1.8.input.xml => 1.7_to_3.0.input.xml} (100%) rename test/setup/iTopDesignFormat/{1.8_to_1.7.expected.xml => 3.0_to_1.7.expected.xml} (100%) rename test/setup/iTopDesignFormat/{1.8_to_1.7.input.xml => 3.0_to_1.7.input.xml} (99%) diff --git a/application/datamodel.application.xml b/application/datamodel.application.xml index d574c2a2d..2858b3c1e 100644 --- a/application/datamodel.application.xml +++ b/application/datamodel.application.xml @@ -1,5 +1,5 @@ - + cmdbAbstractObject diff --git a/core/datamodel.core.xml b/core/datamodel.core.xml index d6fe00783..b3fb52bc4 100644 --- a/core/datamodel.core.xml +++ b/core/datamodel.core.xml @@ -1,5 +1,5 @@ - + diff --git a/datamodels/2.x/authent-cas/datamodel.authent-cas.xml b/datamodels/2.x/authent-cas/datamodel.authent-cas.xml index a2257b8ec..8f1c39209 100644 --- a/datamodels/2.x/authent-cas/datamodel.authent-cas.xml +++ b/datamodels/2.x/authent-cas/datamodel.authent-cas.xml @@ -1,5 +1,5 @@ - + diff --git a/datamodels/2.x/authent-local/datamodel.authent-local.xml b/datamodels/2.x/authent-local/datamodel.authent-local.xml index fb6d8f06c..65450ddcf 100644 --- a/datamodels/2.x/authent-local/datamodel.authent-local.xml +++ b/datamodels/2.x/authent-local/datamodel.authent-local.xml @@ -1,5 +1,5 @@ - + diff --git a/datamodels/2.x/combodo-db-tools/datamodel.combodo-db-tools.xml b/datamodels/2.x/combodo-db-tools/datamodel.combodo-db-tools.xml index dc7419bf1..5b84bb692 100644 --- a/datamodels/2.x/combodo-db-tools/datamodel.combodo-db-tools.xml +++ b/datamodels/2.x/combodo-db-tools/datamodel.combodo-db-tools.xml @@ -1,5 +1,5 @@ - + 30 diff --git a/datamodels/2.x/itop-attachments/datamodel.itop-attachments.xml b/datamodels/2.x/itop-attachments/datamodel.itop-attachments.xml index e99285203..611156cd5 100755 --- a/datamodels/2.x/itop-attachments/datamodel.itop-attachments.xml +++ b/datamodels/2.x/itop-attachments/datamodel.itop-attachments.xml @@ -1,5 +1,5 @@ - + DBObject diff --git a/datamodels/2.x/itop-backup/datamodel.itop-backup.xml b/datamodels/2.x/itop-backup/datamodel.itop-backup.xml index 9bef043a5..793773f31 100644 --- a/datamodels/2.x/itop-backup/datamodel.itop-backup.xml +++ b/datamodels/2.x/itop-backup/datamodel.itop-backup.xml @@ -1,5 +1,5 @@ - + 50 diff --git a/datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml b/datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml index e192deb5a..11cb9974a 100644 --- a/datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml +++ b/datamodels/2.x/itop-bridge-cmdb-ticket/datamodel.itop-bridge-cmdb-ticket.xml @@ -1,5 +1,5 @@ - + diff --git a/datamodels/2.x/itop-bridge-virtualization-storage/datamodel.itop-bridge-virtualization-storage.xml b/datamodels/2.x/itop-bridge-virtualization-storage/datamodel.itop-bridge-virtualization-storage.xml index 7b4f0e207..7fdfbf738 100644 --- a/datamodels/2.x/itop-bridge-virtualization-storage/datamodel.itop-bridge-virtualization-storage.xml +++ b/datamodels/2.x/itop-bridge-virtualization-storage/datamodel.itop-bridge-virtualization-storage.xml @@ -1,5 +1,5 @@ - + cmdbAbstractObject diff --git a/datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml b/datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml index 21ffdf457..a9df49e28 100755 --- a/datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml +++ b/datamodels/2.x/itop-change-mgmt-itil/datamodel.itop-change-mgmt-itil.xml @@ -1,5 +1,5 @@ - + Ticket diff --git a/datamodels/2.x/itop-change-mgmt/datamodel.itop-change-mgmt.xml b/datamodels/2.x/itop-change-mgmt/datamodel.itop-change-mgmt.xml index 7c14296af..3e17517f4 100755 --- a/datamodels/2.x/itop-change-mgmt/datamodel.itop-change-mgmt.xml +++ b/datamodels/2.x/itop-change-mgmt/datamodel.itop-change-mgmt.xml @@ -1,5 +1,5 @@ - + Ticket diff --git a/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml b/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml index 98b8cdd9d..9271b0b6c 100755 --- a/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml +++ b/datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml @@ -1,5 +1,5 @@ - + cmdbAbstractObject diff --git a/datamodels/2.x/itop-config/datamodel.itop-config.xml b/datamodels/2.x/itop-config/datamodel.itop-config.xml index 7cb6710a6..ff2965f0e 100644 --- a/datamodels/2.x/itop-config/datamodel.itop-config.xml +++ b/datamodels/2.x/itop-config/datamodel.itop-config.xml @@ -1,5 +1,5 @@ - + 10 diff --git a/datamodels/2.x/itop-core-update/datamodel.itop-core-update.xml b/datamodels/2.x/itop-core-update/datamodel.itop-core-update.xml index 35c32498e..6bfcbf23f 100644 --- a/datamodels/2.x/itop-core-update/datamodel.itop-core-update.xml +++ b/datamodels/2.x/itop-core-update/datamodel.itop-core-update.xml @@ -1,5 +1,5 @@ - + 60 diff --git a/datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml b/datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml index e124ac6d8..4f9dd7edc 100755 --- a/datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml +++ b/datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml @@ -1,5 +1,5 @@ - + PhysicalDevice diff --git a/datamodels/2.x/itop-endusers-devices/datamodel.itop-enduser-devices.xml b/datamodels/2.x/itop-endusers-devices/datamodel.itop-enduser-devices.xml index eac5f6586..7ebcf7eb2 100644 --- a/datamodels/2.x/itop-endusers-devices/datamodel.itop-enduser-devices.xml +++ b/datamodels/2.x/itop-endusers-devices/datamodel.itop-enduser-devices.xml @@ -1,5 +1,5 @@ - + PhysicalDevice diff --git a/datamodels/2.x/itop-faq-light/datamodel.itop-faq-light.xml b/datamodels/2.x/itop-faq-light/datamodel.itop-faq-light.xml index c5d746224..e5addbabd 100755 --- a/datamodels/2.x/itop-faq-light/datamodel.itop-faq-light.xml +++ b/datamodels/2.x/itop-faq-light/datamodel.itop-faq-light.xml @@ -1,5 +1,5 @@ - + cmdbAbstractObject diff --git a/datamodels/2.x/itop-files-information/datamodel.itop-files-information.xml b/datamodels/2.x/itop-files-information/datamodel.itop-files-information.xml index d1ba47f21..42642225c 100644 --- a/datamodels/2.x/itop-files-information/datamodel.itop-files-information.xml +++ b/datamodels/2.x/itop-files-information/datamodel.itop-files-information.xml @@ -1,3 +1,3 @@ - + diff --git a/datamodels/2.x/itop-full-itil/datamodel.itop-full-itil.xml b/datamodels/2.x/itop-full-itil/datamodel.itop-full-itil.xml index 809f4258e..a5ccad800 100644 --- a/datamodels/2.x/itop-full-itil/datamodel.itop-full-itil.xml +++ b/datamodels/2.x/itop-full-itil/datamodel.itop-full-itil.xml @@ -1,5 +1,5 @@ - + diff --git a/datamodels/2.x/itop-hub-connector/datamodel.itop-hub-connector.xml b/datamodels/2.x/itop-hub-connector/datamodel.itop-hub-connector.xml index 471629026..ed51bf64b 100644 --- a/datamodels/2.x/itop-hub-connector/datamodel.itop-hub-connector.xml +++ b/datamodels/2.x/itop-hub-connector/datamodel.itop-hub-connector.xml @@ -1,5 +1,5 @@ - + diff --git a/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml b/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml index 365b48d79..c3f94ce01 100755 --- a/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml +++ b/datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml @@ -1,5 +1,5 @@ - + Ticket diff --git a/datamodels/2.x/itop-knownerror-light/datamodel.itop-knownerror-light.xml b/datamodels/2.x/itop-knownerror-light/datamodel.itop-knownerror-light.xml index c2f4fda36..60e82c416 100755 --- a/datamodels/2.x/itop-knownerror-light/datamodel.itop-knownerror-light.xml +++ b/datamodels/2.x/itop-knownerror-light/datamodel.itop-knownerror-light.xml @@ -1,5 +1,5 @@ - + cmdbAbstractObject diff --git a/datamodels/2.x/itop-portal/datamodel.itop-portal.xml b/datamodels/2.x/itop-portal/datamodel.itop-portal.xml index 395876353..c6f4a8bcb 100644 --- a/datamodels/2.x/itop-portal/datamodel.itop-portal.xml +++ b/datamodels/2.x/itop-portal/datamodel.itop-portal.xml @@ -1,5 +1,5 @@ - + pages/exec.php?exec_module=itop-portal-base&exec_page=index.php&portal_id=itop-portal diff --git a/datamodels/2.x/itop-problem-mgmt/datamodel.itop-problem-mgmt.xml b/datamodels/2.x/itop-problem-mgmt/datamodel.itop-problem-mgmt.xml index 0c0dfb17a..4750087e7 100755 --- a/datamodels/2.x/itop-problem-mgmt/datamodel.itop-problem-mgmt.xml +++ b/datamodels/2.x/itop-problem-mgmt/datamodel.itop-problem-mgmt.xml @@ -1,5 +1,5 @@ - + Ticket diff --git a/datamodels/2.x/itop-profiles-itil/datamodel.itop-profiles-itil.xml b/datamodels/2.x/itop-profiles-itil/datamodel.itop-profiles-itil.xml index bd15bce17..749b02579 100755 --- a/datamodels/2.x/itop-profiles-itil/datamodel.itop-profiles-itil.xml +++ b/datamodels/2.x/itop-profiles-itil/datamodel.itop-profiles-itil.xml @@ -1,5 +1,5 @@ - + diff --git a/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml b/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml index 109c51340..b26d8fc09 100755 --- a/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml +++ b/datamodels/2.x/itop-request-mgmt-itil/datamodel.itop-request-mgmt-itil.xml @@ -1,5 +1,5 @@ - + Ticket diff --git a/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml b/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml index 1052c0329..db701823a 100755 --- a/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml +++ b/datamodels/2.x/itop-request-mgmt/datamodel.itop-request-mgmt.xml @@ -1,5 +1,5 @@ - + Ticket diff --git a/datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml b/datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml index 4ac9d07d7..5c35e4686 100755 --- a/datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml +++ b/datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml @@ -1,5 +1,5 @@ - + diff --git a/datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml b/datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml index 36f427f5d..43f3854ec 100755 --- a/datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml +++ b/datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml @@ -1,5 +1,5 @@ - + diff --git a/datamodels/2.x/itop-storage-mgmt/datamodel.itop-storage-mgmt.xml b/datamodels/2.x/itop-storage-mgmt/datamodel.itop-storage-mgmt.xml index da9034bdb..cf41d4fa6 100644 --- a/datamodels/2.x/itop-storage-mgmt/datamodel.itop-storage-mgmt.xml +++ b/datamodels/2.x/itop-storage-mgmt/datamodel.itop-storage-mgmt.xml @@ -1,5 +1,5 @@ - + DatacenterDevice diff --git a/datamodels/2.x/itop-structure/datamodel.itop-structure.xml b/datamodels/2.x/itop-structure/datamodel.itop-structure.xml index 5a105a9c2..f9f484300 100644 --- a/datamodels/2.x/itop-structure/datamodel.itop-structure.xml +++ b/datamodels/2.x/itop-structure/datamodel.itop-structure.xml @@ -1,5 +1,5 @@ - + cmdbAbstractObject diff --git a/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml b/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml index 809239f5e..6b183e8de 100755 --- a/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml +++ b/datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml @@ -1,5 +1,5 @@ - + service_id AND sc.org_id = :this->org_id AND slt.request_type = :request_type AND slt.priority = :this->priority]]> diff --git a/datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml b/datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml index 05730fe37..4ff2ea96b 100644 --- a/datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml +++ b/datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml @@ -1,5 +1,5 @@ - + FunctionalCI diff --git a/datamodels/2.x/itop-welcome-itil/datamodel.itop-welcome-itil.xml b/datamodels/2.x/itop-welcome-itil/datamodel.itop-welcome-itil.xml index ba76dacd5..98f96fd17 100644 --- a/datamodels/2.x/itop-welcome-itil/datamodel.itop-welcome-itil.xml +++ b/datamodels/2.x/itop-welcome-itil/datamodel.itop-welcome-itil.xml @@ -1,5 +1,5 @@ - + 10 diff --git a/setup/itopdesignformat.class.inc.php b/setup/itopdesignformat.class.inc.php index e605fa69c..eb0547aea 100644 --- a/setup/itopdesignformat.class.inc.php +++ b/setup/itopdesignformat.class.inc.php @@ -17,7 +17,7 @@ * You should have received a copy of the GNU Affero General Public License */ -define('ITOP_DESIGN_LATEST_VERSION', '1.8'); // iTop >= 3.0.0 +define('ITOP_DESIGN_LATEST_VERSION', '3.0'); /** * Utility to upgrade the format of a given XML datamodel to the latest version @@ -87,12 +87,12 @@ class iTopDesignFormat '1.7' => array( 'previous' => '1.6', 'go_to_previous' => 'From17To16', - 'next' => '1.8', - 'go_to_next' => 'From17To18', + 'next' => '3.0', + 'go_to_next' => 'From17To30', ), - '1.8' => array( + '3.0' => array( 'previous' => '1.7', - 'go_to_previous' => 'From18To17', + 'go_to_previous' => 'From30To17', 'next' => null, 'go_to_next' => null, ), @@ -762,11 +762,11 @@ class iTopDesignFormat } /** - * Upgrade the format from version 1.7 to 1.8 + * Upgrade the format from version 1.7 to 3.0 * @param \ModelFactory $oFactory * @return void (Errors are logged) */ - protected function From17To18($oFactory) + protected function From17To30($oFactory) { $oXPath = new DOMXPath($this->oDocument); @@ -800,11 +800,11 @@ class iTopDesignFormat } /** - * Downgrade the format from version 1.8 to 1.7 + * Downgrade the format from version 3.0 to 1.7 * @param \ModelFactory $oFactory * @return void (Errors are logged) */ - protected function From18To17($oFactory) + protected function From30To17($oFactory) { $oXPath = new DOMXPath($this->oDocument); diff --git a/test/setup/iTopDesignFormat/1.7_to_1.8.expected.xml b/test/setup/iTopDesignFormat/1.7_to_3.0.expected.xml similarity index 95% rename from test/setup/iTopDesignFormat/1.7_to_1.8.expected.xml rename to test/setup/iTopDesignFormat/1.7_to_3.0.expected.xml index f75dbee54..f9da77e7c 100644 --- a/test/setup/iTopDesignFormat/1.7_to_1.8.expected.xml +++ b/test/setup/iTopDesignFormat/1.7_to_3.0.expected.xml @@ -1,5 +1,5 @@ - + diff --git a/test/setup/iTopDesignFormat/1.7_to_1.8.input.xml b/test/setup/iTopDesignFormat/1.7_to_3.0.input.xml similarity index 100% rename from test/setup/iTopDesignFormat/1.7_to_1.8.input.xml rename to test/setup/iTopDesignFormat/1.7_to_3.0.input.xml diff --git a/test/setup/iTopDesignFormat/1.8_to_1.7.expected.xml b/test/setup/iTopDesignFormat/3.0_to_1.7.expected.xml similarity index 100% rename from test/setup/iTopDesignFormat/1.8_to_1.7.expected.xml rename to test/setup/iTopDesignFormat/3.0_to_1.7.expected.xml diff --git a/test/setup/iTopDesignFormat/1.8_to_1.7.input.xml b/test/setup/iTopDesignFormat/3.0_to_1.7.input.xml similarity index 99% rename from test/setup/iTopDesignFormat/1.8_to_1.7.input.xml rename to test/setup/iTopDesignFormat/3.0_to_1.7.input.xml index 17b5a4fd2..6cb2d68d0 100644 --- a/test/setup/iTopDesignFormat/1.8_to_1.7.input.xml +++ b/test/setup/iTopDesignFormat/3.0_to_1.7.input.xml @@ -1,5 +1,5 @@ - + diff --git a/test/setup/iTopDesignFormat/iTopDesignFormatTest.php b/test/setup/iTopDesignFormat/iTopDesignFormatTest.php index ec76ddd5c..490433d8d 100644 --- a/test/setup/iTopDesignFormat/iTopDesignFormatTest.php +++ b/test/setup/iTopDesignFormat/iTopDesignFormatTest.php @@ -68,8 +68,8 @@ class TestForITopDesignFormatClass extends ItopTestCase { return array( '1.7 to 1.6' => array('1.6', '1.7_to_1.6.input', '1.7_to_1.6.expected'), - '1.7 to 1.8' => array('1.8', '1.7_to_1.8.input', '1.7_to_1.8.expected'), - '1.8 to 1.7' => array('1.7', '1.8_to_1.7.input', '1.8_to_1.7.expected'), + '1.7 to 3.0' => array('3.0', '1.7_to_3.0.input', '1.7_to_3.0.expected'), + '3.0 to 1.7' => array('1.7', '3.0_to_1.7.input', '3.0_to_1.7.expected'), ); } } \ No newline at end of file