Itop design: added an intermediate root node above 'classes'

SVN:trunk[1936]

datamodel/itop-attachments/datamodel.itop-attachments.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<itop_design>
   <classes>
     <class name="Attachment" category="addon,bizmodel" parent="DBObject" abstract="false" key_type="autoincrement" db_table="attachment" db_key_field="id" db_final_class_field="">
       <properties>
@@ -150,3 +151,4 @@
       </presentation>
     </class>
   </classes>
+</itop_design>

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

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<itop_design>
   <classes>
     <class name="Change" category="bizmodel,searchable,changemgmt" parent="Ticket" abstract="true" key_type="autoincrement" db_table="change" db_key_field="id" db_final_class_field="">
       <properties>
@@ -2957,3 +2958,4 @@
       </presentation>
     </class>
   </classes>
+</itop_design>

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

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<itop_design>
   <classes>
     <class name="Organization" category="bizmodel,searchable,structure" parent="cmdbAbstractObject" abstract="false" key_type="autoincrement" db_table="organization" db_key_field="id" db_final_class_field="">
       <properties>
@@ -2894,3 +2895,4 @@
       </presentation>
     </class>
   </classes>
+</itop_design>

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

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<itop_design>
   <classes>
     <class name="Incident" category="bizmodel,searchable,incidentmgmt" parent="ResponseTicket" abstract="false" key_type="autoincrement" db_table="ticket_incident" db_key_field="id" db_final_class_field="">
       <properties>
@@ -706,3 +707,4 @@
       </presentation>
     </class>
   </classes>
+</itop_design>

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

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<itop_design>
   <classes>
     <class name="KnownError" category="bizmodel,searchable,knownerrormgmt" parent="cmdbAbstractObject" abstract="false" key_type="autoincrement" db_table="known_error" db_key_field="id" db_final_class_field="">
       <properties>
@@ -179,3 +180,4 @@
       </presentation>
     </class>
   </classes>
+</itop_design>

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

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<itop_design>
   <classes>
     <class name="Problem" category="bizmodel,searchable,problemmgmt" parent="Ticket" abstract="false" key_type="autoincrement" db_table="ticket_problem" db_key_field="id" db_final_class_field="">
       <properties>
@@ -431,3 +432,4 @@
       </presentation>
     </class>
   </classes>
+</itop_design>

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

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<itop_design>
   <classes>
     <class name="UserRequest" category="bizmodel,searchable,requestmgmt" parent="ResponseTicket" abstract="false" key_type="autoincrement" db_table="ticket_request" db_key_field="id" db_final_class_field="">
       <properties>
@@ -668,3 +669,4 @@
       </presentation>
     </class>
   </classes>
+</itop_design>

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

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<itop_design>
   <classes>
     <class name="Contract" category="bizmodel,searchable,servicemgmt" parent="cmdbAbstractObject" abstract="true" key_type="autoincrement" db_table="contract" db_key_field="id" db_final_class_field="finalclass">
       <properties>
@@ -963,3 +964,4 @@
       </presentation>
     </class>
   </classes>
+</itop_design>

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

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<itop_design>
   <classes>
     <class name="Ticket" category="bizmodel,searchable" parent="cmdbAbstractObject" abstract="true" key_type="autoincrement" db_table="ticket" db_key_field="id" db_final_class_field="finalclass">
       <properties>
@@ -1000,3 +1001,4 @@
       </presentation>
     </class>
   </classes>
+</itop_design>

setup/modelfactory.class.inc.php

@@ -270,6 +270,7 @@ class ModelFactory
 {
 	protected $sRootDir;
 	protected $oDOMDocument;
+	protected $oRoot;
 	protected $oClasses;
 	static protected $aLoadedClasses;
 	static protected $aWellKnownParents = array('DBObject', 'CMDBObject','cmdbAbstractObject');
@@ -280,8 +281,10 @@ class ModelFactory
 	{
 		$this->sRootDir = $sRootDir;
 		$this->oDOMDocument = new DOMDocument('1.0', 'UTF-8');
+		$this->oRoot = $this->oDOMDocument->CreateElement('itop_design');
+		$this->oDOMDocument->AppendChild($this->oRoot);
 		$this->oClasses = $this->oDOMDocument->CreateElement('classes');
-		$this->oDOMDocument->AppendChild($this->oClasses);
+		$this->oRoot->AppendChild($this->oClasses);
 		self::$aLoadedClasses = array();
 		self::$aLoadedModules = array();
 	}
@@ -315,7 +318,7 @@ class ModelFactory
 					$oNode->SetAttribute('_source', $sXmlFile);
 			}
 			$oXPath = new DOMXPath($oDocument);
-			$oNodeList = $oXPath->query('//classes/class');
+			$oNodeList = $oXPath->query('/itop_design/classes/class');
 			foreach($oNodeList as $oNode)
 			{
 				if ($oNode->hasAttribute('parent'))
@@ -1109,10 +1112,12 @@ EOF
 	public function GetDelta()
 	{
 		$oDelta = new DOMDocument('1.0', 'UTF-8');
-		$oRootNode = $oDelta->createElement('classes');
+		$oRootNode = $oDelta->createElement('itop_design');
 		$oDelta->appendChild($oRootNode);
+		$oClasses = $oDelta->createElement('classes');
+		$oRootNode->appendChild($oClasses);
 		
-		$this->_priv_ImportModifiedChildren($oDelta, $oRootNode, $this->oDOMDocument->firstChild);
+		$this->_priv_ImportModifiedChildren($oDelta, $oClasses, $this->oDOMDocument->firstChild);
 		//file_put_contents($sXMLDestPath, $oDelta->saveXML());
 		return $oDelta->saveXML();
 	}