Procházet zdrojové kódy

Compiler and co: improved the robustness of xml datamodel

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@1956 a333f486-631f-4898-b8df-5754b55c2be0
romainq před 13 roky
rodič
revize
80ee950376

+ 2 - 2
datamodel/itop-attachments/datamodel.itop-attachments.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <classes>
-    <class id="Attachment">
+    <class id="Attachment" _delta="define">
+      <parent>DBObject</parent>
       <properties>
         <comment><![CDATA[/**
  * Module attachments
@@ -17,7 +18,6 @@
  * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
  */]]></comment>
         <category>addon,bizmodel</category>
-        <parent>DBObject</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>attachment</db_table>

+ 10 - 10
datamodel/itop-change-mgmt-1.0.0/datamodel.itop-change-mgmt.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <classes>
-    <class id="Change">
+    <class id="Change" _delta="define">
+      <parent>Ticket</parent>
       <properties>
         <comment><![CDATA[/**
  * Persistent classes for a CMDB
@@ -12,7 +13,6 @@
  * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
  */]]></comment>
         <category>bizmodel,searchable,changemgmt</category>
-        <parent>Ticket</parent>
         <abstract>true</abstract>
         <key_type>autoincrement</key_type>
         <db_table>change</db_table>
@@ -1095,10 +1095,10 @@
         </list>
       </presentation>
     </class>
-    <class id="RoutineChange">
+    <class id="RoutineChange" _delta="define">
+      <parent>Change</parent>
       <properties>
         <category>bizmodel,searchable,changemgmt</category>
-        <parent>Change</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>change_routine</db_table>
@@ -1950,10 +1950,10 @@
         </list>
       </presentation>
     </class>
-    <class id="ApprovedChange">
+    <class id="ApprovedChange" _delta="define">
+      <parent>Change</parent>
       <properties>
         <category>bizmodel,searchable,changemgmt</category>
-        <parent>Change</parent>
         <abstract>true</abstract>
         <key_type>autoincrement</key_type>
         <db_table>change_approved</db_table>
@@ -2804,10 +2804,10 @@
         </list>
       </presentation>
     </class>
-    <class id="NormalChange">
+    <class id="NormalChange" _delta="define">
+      <parent>ApprovedChange</parent>
       <properties>
         <category>bizmodel,searchable,changemgmt</category>
-        <parent>ApprovedChange</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>change_normal</db_table>
@@ -3819,10 +3819,10 @@
         </list>
       </presentation>
     </class>
-    <class id="EmergencyChange">
+    <class id="EmergencyChange" _delta="define">
+      <parent>ApprovedChange</parent>
       <properties>
         <category>bizmodel,searchable,changemgmt</category>
-        <parent>ApprovedChange</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>change_emergency</db_table>

+ 80 - 80
datamodel/itop-config-mgmt-1.0.0/datamodel.itop-config-mgmt.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <classes>
-    <class id="Organization">
+    <class id="Organization" _delta="define">
+      <parent>cmdbAbstractObject</parent>
       <properties>
         <comment><![CDATA[/**
  * Persistent classes for a CMDB
@@ -12,7 +13,6 @@
  * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
  */]]></comment>
         <category>bizmodel,searchable,structure</category>
-        <parent>cmdbAbstractObject</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>organization</db_table>
@@ -88,10 +88,10 @@
         </list>
       </presentation>
     </class>
-    <class id="Location">
+    <class id="Location" _delta="define">
+      <parent>cmdbAbstractObject</parent>
       <properties>
         <category>bizmodel,searchable,structure</category>
-        <parent>cmdbAbstractObject</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>location</db_table>
@@ -221,10 +221,10 @@
         </list>
       </presentation>
     </class>
-    <class id="Contact">
+    <class id="Contact" _delta="define">
+      <parent>cmdbAbstractObject</parent>
       <properties>
         <category>bizmodel,searchable,structure</category>
-        <parent>cmdbAbstractObject</parent>
         <abstract>true</abstract>
         <key_type>autoincrement</key_type>
         <db_table>contact</db_table>
@@ -373,10 +373,10 @@
         </list>
       </presentation>
     </class>
-    <class id="Person">
+    <class id="Person" _delta="define">
+      <parent>Contact</parent>
       <properties>
         <category>bizmodel,searchable,structure</category>
-        <parent>Contact</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>person</db_table>
@@ -456,10 +456,10 @@
         </list>
       </presentation>
     </class>
-    <class id="Team">
+    <class id="Team" _delta="define">
+      <parent>Contact</parent>
       <properties>
         <category>bizmodel,searchable,structure</category>
-        <parent>Contact</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>team</db_table>
@@ -528,11 +528,11 @@
         </list>
       </presentation>
     </class>
-    <class id="lnkTeamToContact">
+    <class id="lnkTeamToContact" _delta="define">
+      <parent>cmdbAbstractObject</parent>
       <properties>
         <is_link>1</is_link>
         <category>bizmodel,searchable,structure</category>
-        <parent>cmdbAbstractObject</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>lnkteamtocontact</db_table>
@@ -625,10 +625,10 @@
         </list>
       </presentation>
     </class>
-    <class id="Document">
+    <class id="Document" _delta="define">
+      <parent>cmdbAbstractObject</parent>
       <properties>
         <category>bizmodel,searchable,documentation</category>
-        <parent>cmdbAbstractObject</parent>
         <abstract>true</abstract>
         <key_type>autoincrement</key_type>
         <db_table>document</db_table>
@@ -757,10 +757,10 @@
         </list>
       </presentation>
     </class>
-    <class id="WebDoc">
+    <class id="WebDoc" _delta="define">
+      <parent>Document</parent>
       <properties>
         <category>bizmodel,searchable,documentation</category>
-        <parent>Document</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>externaldoc</db_table>
@@ -826,10 +826,10 @@
         </list>
       </presentation>
     </class>
-    <class id="Note">
+    <class id="Note" _delta="define">
+      <parent>Document</parent>
       <properties>
         <category>bizmodel,searchable,documentation</category>
-        <parent>Document</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>note</db_table>
@@ -894,10 +894,10 @@
         </list>
       </presentation>
     </class>
-    <class id="FileDoc">
+    <class id="FileDoc" _delta="define">
+      <parent>Document</parent>
       <properties>
         <category>bizmodel,searchable,documentation</category>
-        <parent>Document</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>filedoc</db_table>
@@ -978,10 +978,10 @@
         </list>
       </presentation>
     </class>
-    <class id="Licence">
+    <class id="Licence" _delta="define">
+      <parent>cmdbAbstractObject</parent>
       <properties>
         <category>bizmodel,searchable,configmgmt</category>
-        <parent>cmdbAbstractObject</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>licence</db_table>
@@ -1101,10 +1101,10 @@
         </list>
       </presentation>
     </class>
-    <class id="Subnet">
+    <class id="Subnet" _delta="define">
+      <parent>cmdbAbstractObject</parent>
       <properties>
         <category>bizmodel,searchable,configmgmt</category>
-        <parent>cmdbAbstractObject</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>subnet</db_table>
@@ -1239,10 +1239,10 @@
         </list>
       </presentation>
     </class>
-    <class id="Patch">
+    <class id="Patch" _delta="define">
+      <parent>cmdbAbstractObject</parent>
       <properties>
         <category>bizmodel,searchable,configmgmt</category>
-        <parent>cmdbAbstractObject</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>patch</db_table>
@@ -1332,10 +1332,10 @@
         </list>
       </presentation>
     </class>
-    <class id="Software">
+    <class id="Software" _delta="define">
+      <parent>cmdbAbstractObject</parent>
       <properties>
         <category>bizmodel,searchable,configmgmt</category>
-        <parent>cmdbAbstractObject</parent>
         <abstract>true</abstract>
         <key_type>autoincrement</key_type>
         <db_table>software</db_table>
@@ -1388,10 +1388,10 @@
         </list>
       </presentation>
     </class>
-    <class id="Application">
+    <class id="Application" _delta="define">
+      <parent>Software</parent>
       <properties>
         <category>bizmodel,searchable,configmgmt</category>
-        <parent>Software</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>software_app</db_table>
@@ -1441,10 +1441,10 @@
         </list>
       </presentation>
     </class>
-    <class id="DBServer">
+    <class id="DBServer" _delta="define">
+      <parent>Software</parent>
       <properties>
         <category>bizmodel,searchable,configmgmt</category>
-        <parent>Software</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>software_db</db_table>
@@ -1494,11 +1494,11 @@
         </list>
       </presentation>
     </class>
-    <class id="lnkPatchToCI">
+    <class id="lnkPatchToCI" _delta="define">
+      <parent>cmdbAbstractObject</parent>
       <properties>
         <is_link>1</is_link>
         <category>bizmodel,configmgmt</category>
-        <parent>cmdbAbstractObject</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>lnkpatchtoci</db_table>
@@ -1571,10 +1571,10 @@
         </list>
       </presentation>
     </class>
-    <class id="FunctionalCI">
+    <class id="FunctionalCI" _delta="define">
+      <parent>cmdbAbstractObject</parent>
       <properties>
         <category>bizmodel,searchable,configmgmt</category>
-        <parent>cmdbAbstractObject</parent>
         <abstract>true</abstract>
         <key_type>autoincrement</key_type>
         <db_table>functionalci</db_table>
@@ -1723,10 +1723,10 @@
         </list>
       </presentation>
     </class>
-    <class id="SoftwareInstance">
+    <class id="SoftwareInstance" _delta="define">
+      <parent>FunctionalCI</parent>
       <properties>
         <category>bizmodel,searchable,configmgmt</category>
-        <parent>FunctionalCI</parent>
         <abstract>true</abstract>
         <key_type>autoincrement</key_type>
         <db_table>softwareinstance</db_table>
@@ -1871,10 +1871,10 @@
         </list>
       </presentation>
     </class>
-    <class id="DBServerInstance">
+    <class id="DBServerInstance" _delta="define">
+      <parent>SoftwareInstance</parent>
       <properties>
         <category>bizmodel,searchable,configmgmt</category>
-        <parent>SoftwareInstance</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>softwareinstance_dbserver</db_table>
@@ -1964,10 +1964,10 @@
         </list>
       </presentation>
     </class>
-    <class id="ApplicationInstance">
+    <class id="ApplicationInstance" _delta="define">
+      <parent>SoftwareInstance</parent>
       <properties>
         <category>bizmodel,searchable,configmgmt</category>
-        <parent>SoftwareInstance</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>softwareinstance_application</db_table>
@@ -2050,10 +2050,10 @@
         </list>
       </presentation>
     </class>
-    <class id="DatabaseInstance">
+    <class id="DatabaseInstance" _delta="define">
+      <parent>FunctionalCI</parent>
       <properties>
         <category>bizmodel,searchable,configmgmt</category>
-        <parent>FunctionalCI</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>databaseinstance</db_table>
@@ -2164,10 +2164,10 @@
         </list>
       </presentation>
     </class>
-    <class id="ApplicationSolution">
+    <class id="ApplicationSolution" _delta="define">
+      <parent>FunctionalCI</parent>
       <properties>
         <category>bizmodel,searchable,configmgmt</category>
-        <parent>FunctionalCI</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>applicationsolution</db_table>
@@ -2273,10 +2273,10 @@
         </list>
       </presentation>
     </class>
-    <class id="BusinessProcess">
+    <class id="BusinessProcess" _delta="define">
+      <parent>FunctionalCI</parent>
       <properties>
         <category>bizmodel,searchable,configmgmt</category>
-        <parent>FunctionalCI</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>businessprocess</db_table>
@@ -2367,10 +2367,10 @@
         </list>
       </presentation>
     </class>
-    <class id="ConnectableCI">
+    <class id="ConnectableCI" _delta="define">
+      <parent>FunctionalCI</parent>
       <properties>
         <category>bizmodel,searchable,configmgmt</category>
-        <parent>FunctionalCI</parent>
         <abstract>true</abstract>
         <key_type>autoincrement</key_type>
         <db_table>connectableci</db_table>
@@ -2459,10 +2459,10 @@
         </list>
       </presentation>
     </class>
-    <class id="NetworkInterface">
+    <class id="NetworkInterface" _delta="define">
+      <parent>ConnectableCI</parent>
       <properties>
         <category>bizmodel,searchable,configmgmt</category>
-        <parent>ConnectableCI</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>networkinterface</db_table>
@@ -2749,10 +2749,10 @@
         </list>
       </presentation>
     </class>
-    <class id="Device">
+    <class id="Device" _delta="define">
+      <parent>ConnectableCI</parent>
       <properties>
         <category>bizmodel,searchable,configmgmt</category>
-        <parent>ConnectableCI</parent>
         <abstract>true</abstract>
         <key_type>autoincrement</key_type>
         <db_table>device</db_table>
@@ -2857,10 +2857,10 @@
         </list>
       </presentation>
     </class>
-    <class id="PC">
+    <class id="PC" _delta="define">
+      <parent>Device</parent>
       <properties>
         <category>bizmodel,searchable,configmgmt</category>
-        <parent>Device</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>pc</db_table>
@@ -2975,10 +2975,10 @@
         </list>
       </presentation>
     </class>
-    <class id="MobileCI">
+    <class id="MobileCI" _delta="define">
+      <parent>Device</parent>
       <properties>
         <category>bizmodel,searchable,configmgmt</category>
-        <parent>Device</parent>
         <abstract>true</abstract>
         <key_type>autoincrement</key_type>
         <db_table>mobileci</db_table>
@@ -3044,10 +3044,10 @@
         </list>
       </presentation>
     </class>
-    <class id="MobilePhone">
+    <class id="MobilePhone" _delta="define">
+      <parent>MobileCI</parent>
       <properties>
         <category>bizmodel,searchable,configmgmt</category>
-        <parent>MobileCI</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>mobilephone</db_table>
@@ -3134,10 +3134,10 @@
         </list>
       </presentation>
     </class>
-    <class id="InfrastructureCI">
+    <class id="InfrastructureCI" _delta="define">
+      <parent>Device</parent>
       <properties>
         <category>bizmodel,searchable,configmgmt</category>
-        <parent>Device</parent>
         <abstract>true</abstract>
         <key_type>autoincrement</key_type>
         <db_table>infrastructureci</db_table>
@@ -3250,10 +3250,10 @@
         </list>
       </presentation>
     </class>
-    <class id="NetworkDevice">
+    <class id="NetworkDevice" _delta="define">
+      <parent>InfrastructureCI</parent>
       <properties>
         <category>bizmodel,searchable,configmgmt</category>
-        <parent>InfrastructureCI</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>networkdevice</db_table>
@@ -3372,10 +3372,10 @@
         </list>
       </presentation>
     </class>
-    <class id="Server">
+    <class id="Server" _delta="define">
+      <parent>InfrastructureCI</parent>
       <properties>
         <category>bizmodel,searchable,configmgmt</category>
-        <parent>InfrastructureCI</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>server</db_table>
@@ -3501,10 +3501,10 @@
         </list>
       </presentation>
     </class>
-    <class id="Printer">
+    <class id="Printer" _delta="define">
+      <parent>InfrastructureCI</parent>
       <properties>
         <category>bizmodel,searchable,configmgmt</category>
-        <parent>InfrastructureCI</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>printer</db_table>
@@ -3613,10 +3613,10 @@
         </list>
       </presentation>
     </class>
-    <class id="Group">
+    <class id="Group" _delta="define">
+      <parent>cmdbAbstractObject</parent>
       <properties>
         <category>bizmodel,searchable,configmgmt</category>
-        <parent>cmdbAbstractObject</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>group</db_table>
@@ -3726,11 +3726,11 @@
         </list>
       </presentation>
     </class>
-    <class id="lnkGroupToCI">
+    <class id="lnkGroupToCI" _delta="define">
+      <parent>cmdbAbstractObject</parent>
       <properties>
         <is_link>1</is_link>
         <category>bizmodel,configmgmt</category>
-        <parent>cmdbAbstractObject</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>lnkgrouptoci</db_table>
@@ -3811,11 +3811,11 @@
         </list>
       </presentation>
     </class>
-    <class id="lnkCIToDoc">
+    <class id="lnkCIToDoc" _delta="define">
+      <parent>cmdbAbstractObject</parent>
       <properties>
         <is_link>1</is_link>
         <category>bizmodel,configmgmt</category>
-        <parent>cmdbAbstractObject</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>lnkcitodoc</db_table>
@@ -3900,11 +3900,11 @@
         </list>
       </presentation>
     </class>
-    <class id="lnkCIToContact">
+    <class id="lnkCIToContact" _delta="define">
+      <parent>cmdbAbstractObject</parent>
       <properties>
         <is_link>1</is_link>
         <category>bizmodel,configmgmt</category>
-        <parent>cmdbAbstractObject</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>lnkcitocontact</db_table>
@@ -3991,11 +3991,11 @@
         </list>
       </presentation>
     </class>
-    <class id="lnkSolutionToCI">
+    <class id="lnkSolutionToCI" _delta="define">
+      <parent>cmdbAbstractObject</parent>
       <properties>
         <is_link>1</is_link>
         <category>bizmodel,configmgmt</category>
-        <parent>cmdbAbstractObject</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>lnksolutiontoci</db_table>
@@ -4076,11 +4076,11 @@
         </list>
       </presentation>
     </class>
-    <class id="lnkProcessToSolution">
+    <class id="lnkProcessToSolution" _delta="define">
+      <parent>cmdbAbstractObject</parent>
       <properties>
         <is_link>1</is_link>
         <category>bizmodel,configmgmt</category>
-        <parent>cmdbAbstractObject</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>lnkprocesstosolution</db_table>

+ 4 - 4
datamodel/itop-incident-mgmt-1.0.0/datamodel.itop-incident-mgmt.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <classes>
-    <class id="Incident">
+    <class id="Incident" _delta="define">
+      <parent>ResponseTicket</parent>
       <properties>
         <comment><![CDATA[/**
  * Persistent classes for a CMDB
@@ -12,7 +13,6 @@
  * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
  */]]></comment>
         <category>bizmodel,searchable,incidentmgmt</category>
-        <parent>ResponseTicket</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>ticket_incident</db_table>
@@ -908,11 +908,11 @@
         </list>
       </presentation>
     </class>
-    <class id="lnkTicketToIncident">
+    <class id="lnkTicketToIncident" _delta="define">
+      <parent>cmdbAbstractObject</parent>
       <properties>
         <is_link>1</is_link>
         <category>bizmodel,searchable,incidentmgmt,requestmgmt,lnkincident</category>
-        <parent>cmdbAbstractObject</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>lnktickettoincident</db_table>

+ 6 - 6
datamodel/itop-knownerror-mgmt-1.0.0/datamodel.itop-knownerror-mgmt.xml

@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <classes>
-    <class id="KnownError">
+    <class id="KnownError" _delta="define">
+      <parent>cmdbAbstractObject</parent>
       <properties>
         <comment>/**
 * Description of known error
 */</comment>
         <category>bizmodel,searchable,knownerrormgmt</category>
-        <parent>cmdbAbstractObject</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>known_error</db_table>
@@ -162,14 +162,14 @@
         </list>
       </presentation>
     </class>
-    <class id="lnkInfraError">
+    <class id="lnkInfraError" _delta="define">
+      <parent>cmdbAbstractObject</parent>
       <properties>
         <comment>/**
 * n-n link between any Infra and a Known Error
 */</comment>
         <is_link>1</is_link>
         <category>bizmodel,searchable,knownerrormgmt,lnkknownerror</category>
-        <parent>cmdbAbstractObject</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>infra_error_links</db_table>
@@ -246,14 +246,14 @@
         </list>
       </presentation>
     </class>
-    <class id="lnkDocumentError">
+    <class id="lnkDocumentError" _delta="define">
+      <parent>cmdbAbstractObject</parent>
       <properties>
         <comment>/**
 * n-n link between any Contract and a Document
 */</comment>
         <is_link>1</is_link>
         <category>bizmodel,searchable,knownerrormgmt,lnkknownerror</category>
-        <parent>cmdbAbstractObject</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>documents_error_link</db_table>

+ 2 - 2
datamodel/itop-problem-mgmt-1.0.0/datamodel.itop-problem-mgmt.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <classes>
-    <class id="Problem">
+    <class id="Problem" _delta="define">
+      <parent>Ticket</parent>
       <properties>
         <comment><![CDATA[/**
  * Persistent classes for a CMDB
@@ -12,7 +13,6 @@
  * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
  */]]></comment>
         <category>bizmodel,searchable,problemmgmt</category>
-        <parent>Ticket</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>ticket_problem</db_table>

+ 2 - 2
datamodel/itop-request-mgmt-1.0.0/datamodel.itop-request-mgmt.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <classes>
-    <class id="UserRequest">
+    <class id="UserRequest" _delta="define">
+      <parent>ResponseTicket</parent>
       <properties>
         <comment><![CDATA[/**
  * Persistent classes for a CMDB
@@ -12,7 +13,6 @@
  * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
  */]]></comment>
         <category>bizmodel,searchable,requestmgmt</category>
-        <parent>ResponseTicket</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>ticket_request</db_table>

+ 32 - 32
datamodel/itop-service-mgmt-1.0.0/datamodel.itop-service-mgmt.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <classes>
-    <class id="Contract">
+    <class id="Contract" _delta="define">
+      <parent>cmdbAbstractObject</parent>
       <properties>
         <comment><![CDATA[/**
  * Persistent classes for a CMDB
@@ -12,7 +13,6 @@
  * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
  */]]></comment>
         <category>bizmodel,searchable,servicemgmt</category>
-        <parent>cmdbAbstractObject</parent>
         <abstract>true</abstract>
         <key_type>autoincrement</key_type>
         <db_table>contract</db_table>
@@ -141,10 +141,10 @@
         </list>
       </presentation>
     </class>
-    <class id="ProviderContract">
+    <class id="ProviderContract" _delta="define">
+      <parent>Contract</parent>
       <properties>
         <category>bizmodel,searchable,servicemgmt</category>
-        <parent>Contract</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>providercontract</db_table>
@@ -256,10 +256,10 @@
         </list>
       </presentation>
     </class>
-    <class id="CustomerContract">
+    <class id="CustomerContract" _delta="define">
+      <parent>Contract</parent>
       <properties>
         <category>bizmodel,searchable,servicemgmt</category>
-        <parent>Contract</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>customercontract</db_table>
@@ -382,11 +382,11 @@
         </list>
       </presentation>
     </class>
-    <class id="lnkCustomerContractToProviderContract">
+    <class id="lnkCustomerContractToProviderContract" _delta="define">
+      <parent>cmdbAbstractObject</parent>
       <properties>
         <is_link>1</is_link>
         <category>bizmodel,searchable,servicemgmt,lnkservice</category>
-        <parent>cmdbAbstractObject</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>lnkcustomercontracttoprovider</db_table>
@@ -465,11 +465,11 @@
         </list>
       </presentation>
     </class>
-    <class id="lnkContractToSLA">
+    <class id="lnkContractToSLA" _delta="define">
+      <parent>cmdbAbstractObject</parent>
       <properties>
         <is_link>1</is_link>
         <category>bizmodel,searchable,servicemgmt,lnkservice</category>
-        <parent>cmdbAbstractObject</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>lnkcontracttosla</db_table>
@@ -550,11 +550,11 @@
         </list>
       </presentation>
     </class>
-    <class id="lnkContractToDoc">
+    <class id="lnkContractToDoc" _delta="define">
+      <parent>cmdbAbstractObject</parent>
       <properties>
         <is_link>1</is_link>
         <category>bizmodel,searchable,servicemgmt,lnkservice</category>
-        <parent>cmdbAbstractObject</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>lnkcontracttodoc</db_table>
@@ -635,11 +635,11 @@
         </list>
       </presentation>
     </class>
-    <class id="lnkContractToContact">
+    <class id="lnkContractToContact" _delta="define">
+      <parent>cmdbAbstractObject</parent>
       <properties>
         <is_link>1</is_link>
         <category>bizmodel,searchable,servicemgmt,lnkservice</category>
-        <parent>cmdbAbstractObject</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>lnkcontracttocontact</db_table>
@@ -721,11 +721,11 @@
         </list>
       </presentation>
     </class>
-    <class id="lnkContractToCI">
+    <class id="lnkContractToCI" _delta="define">
+      <parent>cmdbAbstractObject</parent>
       <properties>
         <is_link>1</is_link>
         <category>bizmodel,searchable,servicemgmt,lnkservice</category>
-        <parent>cmdbAbstractObject</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>lnkcontracttoci</db_table>
@@ -799,10 +799,10 @@
         </list>
       </presentation>
     </class>
-    <class id="Service">
+    <class id="Service" _delta="define">
+      <parent>cmdbAbstractObject</parent>
       <properties>
         <category>bizmodel,searchable,servicemgmt</category>
-        <parent>cmdbAbstractObject</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>service</db_table>
@@ -943,10 +943,10 @@
         </list>
       </presentation>
     </class>
-    <class id="ServiceSubcategory">
+    <class id="ServiceSubcategory" _delta="define">
+      <parent>cmdbAbstractObject</parent>
       <properties>
         <category>bizmodel,searchable,servicemgmt</category>
-        <parent>cmdbAbstractObject</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>servicesubcategory</db_table>
@@ -1024,10 +1024,10 @@
         </list>
       </presentation>
     </class>
-    <class id="SLA">
+    <class id="SLA" _delta="define">
+      <parent>cmdbAbstractObject</parent>
       <properties>
         <category>bizmodel,searchable,servicemgmt</category>
-        <parent>cmdbAbstractObject</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>sla</db_table>
@@ -1095,10 +1095,10 @@
         </list>
       </presentation>
     </class>
-    <class id="SLT">
+    <class id="SLT" _delta="define">
+      <parent>cmdbAbstractObject</parent>
       <properties>
         <category>bizmodel,searchable,servicemgmt</category>
-        <parent>cmdbAbstractObject</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>slt</db_table>
@@ -1197,11 +1197,11 @@
         </list>
       </presentation>
     </class>
-    <class id="lnkSLTToSLA">
+    <class id="lnkSLTToSLA" _delta="define">
+      <parent>cmdbAbstractObject</parent>
       <properties>
         <is_link>1</is_link>
         <category>bizmodel,searchable,servicemgmt,lnkservice</category>
-        <parent>cmdbAbstractObject</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>lnkslttosla</db_table>
@@ -1296,11 +1296,11 @@
         </list>
       </presentation>
     </class>
-    <class id="lnkServiceToDoc">
+    <class id="lnkServiceToDoc" _delta="define">
+      <parent>cmdbAbstractObject</parent>
       <properties>
         <is_link>1</is_link>
         <category>bizmodel,searchable,servicemgmt,lnkservice</category>
-        <parent>cmdbAbstractObject</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>lnkservicetodoc</db_table>
@@ -1381,11 +1381,11 @@
         </list>
       </presentation>
     </class>
-    <class id="lnkServiceToContact">
+    <class id="lnkServiceToContact" _delta="define">
+      <parent>cmdbAbstractObject</parent>
       <properties>
         <is_link>1</is_link>
         <category>bizmodel,searchable,servicemgmt,lnkservice</category>
-        <parent>cmdbAbstractObject</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>lnkservicetocontact</db_table>
@@ -1467,10 +1467,10 @@
         </list>
       </presentation>
     </class>
-    <class id="lnkServiceToCI">
+    <class id="lnkServiceToCI" _delta="define">
+      <parent>cmdbAbstractObject</parent>
       <properties>
         <category>bizmodel,searchable,servicemgmt,lnkservice</category>
-        <parent>cmdbAbstractObject</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>lnkservicetoci</db_table>

+ 10 - 10
datamodel/itop-tickets-1.0.0/datamodel.itop-tickets.xml

@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <classes>
-    <class id="Ticket">
+    <class id="Ticket" _delta="define">
+      <parent>cmdbAbstractObject</parent>
       <properties>
         <comment><![CDATA[/**
  * Persistent classes for a CMDB
@@ -12,7 +13,6 @@
  * @license     http://www.opensource.org/licenses/gpl-3.0.html LGPL
  */]]></comment>
         <category>bizmodel,searchable</category>
-        <parent>cmdbAbstractObject</parent>
         <abstract>true</abstract>
         <key_type>autoincrement</key_type>
         <db_table>ticket</db_table>
@@ -120,10 +120,10 @@
         </list>
       </presentation>
     </class>
-    <class id="ResponseTicket">
+    <class id="ResponseTicket" _delta="define">
+      <parent>Ticket</parent>
       <properties>
         <category>bizmodel</category>
-        <parent>Ticket</parent>
         <abstract>true</abstract>
         <key_type>autoincrement</key_type>
         <db_table>ticket_response</db_table>
@@ -1317,11 +1317,11 @@
         </list>
       </presentation>
     </class>
-    <class id="lnkTicketToDoc">
+    <class id="lnkTicketToDoc" _delta="define">
+      <parent>cmdbAbstractObject</parent>
       <properties>
         <is_link>1</is_link>
         <category>bizmodel,searchable,incidentmgmt,requestmgmt,changemgmt,problemmgmt,lnkticket</category>
-        <parent>cmdbAbstractObject</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>lnktickettodoc</db_table>
@@ -1388,11 +1388,11 @@
         </list>
       </presentation>
     </class>
-    <class id="lnkTicketToContact">
+    <class id="lnkTicketToContact" _delta="define">
+      <parent>cmdbAbstractObject</parent>
       <properties>
         <is_link>1</is_link>
         <category>bizmodel,searchable,incidentmgmt,requestmgmt,changemgmt,problemmgmt,lnkticket</category>
-        <parent>cmdbAbstractObject</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>lnktickettocontact</db_table>
@@ -1474,11 +1474,11 @@
         </list>
       </presentation>
     </class>
-    <class id="lnkTicketToCI">
+    <class id="lnkTicketToCI" _delta="define">
+      <parent>cmdbAbstractObject</parent>
       <properties>
         <is_link>1</is_link>
         <category>bizmodel,searchable,incidentmgmt,requestmgmt,changemgmt,problemmgmt,lnkticket</category>
-        <parent>cmdbAbstractObject</parent>
         <abstract>false</abstract>
         <key_type>autoincrement</key_type>
         <db_table>lnktickettoci</db_table>

+ 1 - 1
setup/compiler.class.inc.php

@@ -676,7 +676,7 @@ EOF;
 		{
 			$sPHP .= 'class '.$oClass->getAttribute('id');
 		}
-		$sPHP .= " extends ".$oClass->GetUniqueElement('properties')->GetChildText('parent', 'DBObject')."\n";
+		$sPHP .= " extends ".$oClass->GetChildText('parent', 'DBObject')."\n";
 		$sPHP .=
 <<<EOF
 {

+ 2 - 1
setup/itop_design.xsd

@@ -11,13 +11,13 @@
       <xsd:element name="class" minOccurs="0" maxOccurs="unbounded">
        <xsd:complexType>
         <xsd:sequence>
+         <xsd:element name="parent" type="xsd:string" minOccurs="0"/>
          <xsd:element name="properties">
           <xsd:complexType>
            <xsd:sequence>
             <xsd:element name="comment" type="xsd:string" minOccurs="0"/>
             <xsd:element name="is_link" type="xsd:string" minOccurs="0"/>
             <xsd:element name="category" type="xsd:string"/>
-            <xsd:element name="parent" type="xsd:string"/>
             <xsd:element name="abstract" type="xsd:string"/>
             <xsd:element name="key_type" type="xsd:string"/>
             <xsd:element name="db_table" type="xsd:string"/>
@@ -177,6 +177,7 @@
          </xsd:element>
         </xsd:sequence>
         <xsd:attribute name="id" type="xsd:string" use="required"/>
+        <xsd:attribute name="_delta" type="xsd:string"/>
        </xsd:complexType>
 
       </xsd:element>

Rozdílová data souboru nebyla zobrazena, protože soubor je příliš velký
+ 523 - 300
setup/modelfactory.class.inc.php


Některé soubory nejsou zobrazeny, neboť je v těchto rozdílových datech změněno mnoho souborů