- Migration of the XML files to the version 1.1 of the XML schema.

- Refactoring of the "state flags" definitions to take advantage of the "inherit_flags_from" capability available in the new XML schema.

git-svn-id: http://svn.code.sf.net/p/itop/code/trunk@3363 a333f486-631f-4898-b8df-5754b55c2be0

datamodels/2.x/itop-attachments/datamodel.itop-attachments.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1">
   <classes>
     <class id="Attachment" _delta="define">
       <parent>DBObject</parent>
@@ -37,20 +37,20 @@
         </reconciliation>
         <indexes>
           <index id="1">
-             <attributes>
-               <attribute id="temp_id"/>
-             </attributes>
+            <attributes>
+              <attribute id="temp_id"/>
+            </attributes>
           </index>
           <index id="2">
-             <attributes>
-               <attribute id="item_class"/>
-               <attribute id="item_id"/>
-             </attributes>
+            <attributes>
+              <attribute id="item_class"/>
+              <attribute id="item_id"/>
+            </attributes>
           </index>
           <index id="3">
-             <attributes>
-               <attribute id="item_org_id"/>
-             </attributes>
+            <attributes>
+              <attribute id="item_org_id"/>
+            </attributes>
           </index>
         </indexes>
       </properties>

datamodels/2.x/itop-bridge-virtualization-storage/datamodel.itop-bridge-virtualization-storage.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1">
   <classes>
     <class id="lnkVirtualDeviceToVolume" _delta="define">
       <parent>cmdbAbstractObject</parent>
@@ -92,4 +92,4 @@
       </presentation>
     </class>
   </classes>
-</itop_design>
+</itop_design>

datamodels/2.x/itop-change-mgmt/datamodel.itop-change-mgmt.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1">
   <classes>
     <class id="Change" _delta="define">
       <parent>Ticket</parent>
@@ -38,12 +38,12 @@
       <fields>
         <field id="status" xsi:type="AttributeEnum">
           <values>
-            <value>new</value>
-            <value>assigned</value>
-            <value>planned</value>
-            <value>approved</value>
-            <value>closed</value>
-            <value>rejected</value>
+            <value id="new">new</value>
+            <value id="assigned">assigned</value>
+            <value id="planned">planned</value>
+            <value id="approved">approved</value>
+            <value id="closed">closed</value>
+            <value id="rejected">rejected</value>
           </values>
           <sql>status</sql>
           <default_value>new</default_value>
@@ -51,12 +51,12 @@
         </field>
         <field id="category" xsi:type="AttributeEnum">
           <values>
-            <value>hardware</value>
-            <value>software</value>
-            <value>system</value>
-            <value>network</value>
-            <value>application</value>
-            <value>other</value>
+            <value id="hardware">hardware</value>
+            <value id="software">software</value>
+            <value id="system">system</value>
+            <value id="network">network</value>
+            <value id="application">application</value>
+            <value id="other">other</value>
           </values>
           <sql>category</sql>
           <default_value>hardware</default_value>
@@ -107,8 +107,8 @@
         </field>
         <field id="outage" xsi:type="AttributeEnum">
           <values>
-            <value>yes</value>
-            <value>no</value>
+            <value id="yes">yes</value>
+            <value id="no">no</value>
           </values>
           <sql>outage</sql>
           <default_value>no</default_value>
@@ -219,20 +219,14 @@
             </flags>
             <transitions>
               <transition id="ev_assign">
-                <stimulus>ev_assign</stimulus>
                 <target>assigned</target>
                 <actions/>
               </transition>
             </transitions>
           </state>
           <state id="assigned">
+            <inherit_flags_from>new</inherit_flags_from>
             <flags>
-              <attribute id="ref">
-                <read_only/>
-              </attribute>
-              <attribute id="org_id">
-                <mandatory/>
-              </attribute>
               <attribute id="team_id">
                 <mandatory/>
                 <must_prompt/>
@@ -241,57 +235,22 @@
                 <mandatory/>
                 <must_prompt/>
               </attribute>
-              <attribute id="title">
-                <mandatory/>
-              </attribute>
-              <attribute id="description">
-                <mandatory/>
-              </attribute>
-              <attribute id="last_update">
-                <read_only/>
-              </attribute>
-              <attribute id="close_date">
-                <hidden/>
-              </attribute>
-              <attribute id="reject_reason">
-                <hidden/>
-              </attribute>
               <attribute id="changemanager_id">
                 <mandatory/>
                 <must_prompt/>
               </attribute>
-              <attribute id="creation_date">
-                <read_only/>
-              </attribute>
-              <attribute id="approval_date">
-                <hidden/>
-              </attribute>
-              <attribute id="outage">
-                <hidden/>
-              </attribute>
+              <attribute id="caller_id"/>
             </flags>
             <transitions>
               <transition id="ev_plan">
-                <stimulus>ev_plan</stimulus>
                 <target>planned</target>
                 <actions/>
               </transition>
             </transitions>
           </state>
           <state id="planned">
+            <inherit_flags_from>assigned</inherit_flags_from>
             <flags>
-              <attribute id="ref">
-                <read_only/>
-              </attribute>
-              <attribute id="org_id">
-                <mandatory/>
-              </attribute>
-              <attribute id="title">
-                <mandatory/>
-              </attribute>
-              <attribute id="description">
-                <mandatory/>
-              </attribute>
               <attribute id="start_date">
                 <mandatory/>
                 <must_prompt/>
@@ -300,21 +259,6 @@
                 <mandatory/>
                 <must_prompt/>
               </attribute>
-              <attribute id="last_update">
-                <read_only/>
-              </attribute>
-              <attribute id="close_date">
-                <hidden/>
-              </attribute>
-              <attribute id="reject_reason">
-                <hidden/>
-              </attribute>
-              <attribute id="creation_date">
-                <read_only/>
-              </attribute>
-              <attribute id="approval_date">
-                <hidden/>
-              </attribute>
               <attribute id="fallback_plan">
                 <mandatory/>
                 <must_prompt/>
@@ -322,15 +266,6 @@
               <attribute id="caller_id">
                 <mandatory/>
               </attribute>
-              <attribute id="team_id">
-                <mandatory/>
-              </attribute>
-              <attribute id="agent_id">
-                <mandatory/>
-              </attribute>
-              <attribute id="changemanager_id">
-                <mandatory/>
-              </attribute>
               <attribute id="outage">
                 <mandatory/>
                 <must_prompt/>
@@ -338,12 +273,10 @@
             </flags>
             <transitions>
               <transition id="ev_reject">
-                <stimulus>ev_reject</stimulus>
                 <target>rejected</target>
                 <actions/>
               </transition>
               <transition id="ev_approve">
-                <stimulus>ev_approve</stimulus>
                 <target>approved</target>
                 <actions>
                   <action>
@@ -360,47 +293,46 @@
             <highlight>
               <code>rejected</code>
             </highlight>
+            <inherit_flags_from>assigned</inherit_flags_from>
             <flags>
-              <attribute id="ref">
+              <attribute id="start_date">
                 <read_only/>
               </attribute>
-              <attribute id="org_id">
+              <attribute id="end_date">
                 <read_only/>
               </attribute>
-              <attribute id="title">
+              <attribute id="private_log">
+                <read_only/>
                 <read_only/>
               </attribute>
-              <attribute id="description">
+              <attribute id="caller_id">
                 <read_only/>
               </attribute>
-              <attribute id="last_update">
+              <attribute id="fallback_plan">
                 <read_only/>
               </attribute>
-              <attribute id="close_date">
-                <hidden/>
+              <attribute id="category">
+                <read_only/>
               </attribute>
-              <attribute id="start_date">
+              <attribute id="parent_id">
                 <read_only/>
               </attribute>
-              <attribute id="end_date">
+              <attribute id="org_id">
                 <read_only/>
               </attribute>
-              <attribute id="private_log">
+              <attribute id="title">
+                <read_only/>
+              </attribute>
+              <attribute id="description">
                 <read_only/>
               </attribute>
               <attribute id="reject_reason">
                 <mandatory/>
                 <must_prompt/>
               </attribute>
-              <attribute id="creation_date">
-                <read_only/>
-              </attribute>
               <attribute id="approval_date">
                 <read_only/>
               </attribute>
-              <attribute id="caller_id">
-                <read_only/>
-              </attribute>
               <attribute id="team_id">
                 <read_only/>
               </attribute>
@@ -410,25 +342,12 @@
               <attribute id="changemanager_id">
                 <read_only/>
               </attribute>
-              <attribute id="private_log">
-                <read_only/>
-              </attribute>
-              <attribute id="fallback_plan">
-                <read_only/>
-              </attribute>
-              <attribute id="category">
-                <read_only/>
-              </attribute>
-              <attribute id="parent_id">
-                <read_only/>
-              </attribute>
               <attribute id="outage">
                 <read_only/>
               </attribute>
             </flags>
             <transitions>
               <transition id="ev_reopen">
-                <stimulus>ev_reopen</stimulus>
                 <target>assigned</target>
                 <actions/>
               </transition>
@@ -438,10 +357,11 @@
             <highlight>
               <code>approved</code>
             </highlight>
+            <inherit_flags_from>planned</inherit_flags_from>
             <flags>
-              <attribute id="ref">
-                <read_only/>
-              </attribute>
+              <attribute id="private_log"/>
+              <attribute id="category"/>
+              <attribute id="parent_id"/>
               <attribute id="org_id">
                 <read_only/>
               </attribute>
@@ -451,21 +371,12 @@
               <attribute id="description">
                 <read_only/>
               </attribute>
-              <attribute id="last_update">
-                <read_only/>
-              </attribute>
-              <attribute id="close_date">
-                <hidden/>
-              </attribute>
               <attribute id="start_date">
                 <read_only/>
               </attribute>
               <attribute id="end_date">
                 <read_only/>
               </attribute>
-              <attribute id="private_log">
-                <normal/>
-              </attribute>
               <attribute id="reject_reason">
                 <read_only/>
               </attribute>
@@ -487,22 +398,13 @@
               <attribute id="changemanager_id">
                 <read_only/>
               </attribute>
-              <attribute id="fallback_plan">
-                <normal/>
-              </attribute>
-              <attribute id="category">
-                <normal/>
-              </attribute>
-              <attribute id="parent_id">
-                <normal/>
-              </attribute>
+              <attribute id="fallback_plan"/>
               <attribute id="outage">
                 <read_only/>
               </attribute>
             </flags>
             <transitions>
               <transition id="ev_finish">
-                <stimulus>ev_finish</stimulus>
                 <target>closed</target>
                 <actions>
                   <action>
@@ -516,52 +418,14 @@
             <highlight>
               <code>closed</code>
             </highlight>
+            <inherit_flags_from>approved</inherit_flags_from>
             <flags>
-              <attribute id="ref">
-                <read_only/>
-              </attribute>
-              <attribute id="org_id">
-                <read_only/>
-              </attribute>
-              <attribute id="title">
-                <read_only/>
-              </attribute>
-              <attribute id="description">
-                <read_only/>
-              </attribute>
-              <attribute id="last_update">
-                <read_only/>
-              </attribute>
               <attribute id="close_date">
                 <read_only/>
               </attribute>
-              <attribute id="start_date">
-                <read_only/>
-              </attribute>
-              <attribute id="end_date">
-                <read_only/>
-              </attribute>
-              <attribute id="reject_reason">
-                <read_only/>
-              </attribute>
               <attribute id="creation_date">
                 <read_only/>
               </attribute>
-              <attribute id="approval_date">
-                <read_only/>
-              </attribute>
-              <attribute id="caller_id">
-                <read_only/>
-              </attribute>
-              <attribute id="team_id">
-                <read_only/>
-              </attribute>
-              <attribute id="agent_id">
-                <read_only/>
-              </attribute>
-              <attribute id="changemanager_id">
-                <read_only/>
-              </attribute>
               <attribute id="private_log">
                 <read_only/>
               </attribute>
@@ -574,9 +438,6 @@
               <attribute id="parent_id">
                 <read_only/>
               </attribute>
-              <attribute id="outage">
-                <read_only/>
-              </attribute>
             </flags>
             <transitions/>
           </state>

datamodels/2.x/itop-config-mgmt/datamodel.itop-config-mgmt.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1">
   <classes>
     <class id="Organization" _delta="define">
       <parent>cmdbAbstractObject</parent>
@@ -44,8 +44,8 @@
         </field>
         <field id="status" xsi:type="AttributeEnum">
           <values>
-            <value>active</value>
-            <value>inactive</value>
+            <value id="active">active</value>
+            <value id="inactive">inactive</value>
           </values>
           <sql>status</sql>
           <default_value>active</default_value>
@@ -144,8 +144,8 @@
         </field>
         <field id="status" xsi:type="AttributeEnum">
           <values>
-            <value>active</value>
-            <value>inactive</value>
+            <value id="active">active</value>
+            <value id="inactive">inactive</value>
           </values>
           <sql>status</sql>
           <default_value>active</default_value>
@@ -307,8 +307,8 @@
         </field>
         <field id="status" xsi:type="AttributeEnum">
           <values>
-            <value>active</value>
-            <value>inactive</value>
+            <value id="active">active</value>
+            <value id="inactive">inactive</value>
           </values>
           <sql>status</sql>
           <default_value>active</default_value>
@@ -337,8 +337,8 @@
         </field>
         <field id="notify" xsi:type="AttributeEnum">
           <values>
-            <value>yes</value>
-            <value>no</value>
+            <value id="yes">yes</value>
+            <value id="no">no</value>
           </values>
           <sql>notify</sql>
           <default_value>yes</default_value>
@@ -486,7 +486,7 @@
           <target_class>Location</target_class>
           <is_null_allowed>true</is_null_allowed>
           <on_target_delete>DEL_MANUAL</on_target_delete>
-	  <allow_target_creation>false</allow_target_creation>
+          <allow_target_creation>false</allow_target_creation>
         </field>
         <field id="location_name" xsi:type="AttributeExternalField">
           <extkey_attcode>location_id</extkey_attcode>
@@ -835,9 +835,9 @@
         </field>
         <field id="status" xsi:type="AttributeEnum">
           <values>
-            <value>draft</value>
-            <value>published</value>
-            <value>obsolete</value>
+            <value id="draft">draft</value>
+            <value id="published">published</value>
+            <value id="obsolete">obsolete</value>
           </values>
           <sql>status</sql>
           <default_value/>
@@ -972,7 +972,7 @@
           <static>false</static>
           <access>public</access>
           <type>Overload-cmdbAbstractObject</type>
-        <comment><![CDATA[/**
+          <comment><![CDATA[/**
 	 * Overload the display of the properties to add a tab (the first one)
 	 * with the preview of the document
 	 */
@@ -1320,9 +1320,9 @@
         </field>
         <field id="business_criticity" xsi:type="AttributeEnum">
           <values>
-            <value>high</value>
-            <value>medium</value>
-            <value>low</value>
+            <value id="high">high</value>
+            <value id="medium">medium</value>
+            <value id="low">low</value>
           </values>
           <sql>business_criticity</sql>
           <default_value>low</default_value>
@@ -1526,7 +1526,7 @@
           <target_class>Location</target_class>
           <is_null_allowed>true</is_null_allowed>
           <on_target_delete>DEL_MANUAL</on_target_delete>
-	  <allow_target_creation>false</allow_target_creation>
+          <allow_target_creation>false</allow_target_creation>
         </field>
         <field id="location_name" xsi:type="AttributeExternalField">
           <extkey_attcode>location_id</extkey_attcode>
@@ -1534,10 +1534,10 @@
         </field>
         <field id="status" xsi:type="AttributeEnum">
           <values>
-            <value>production</value>
-            <value>implementation</value>
-            <value>stock</value>
-            <value>obsolete</value>
+            <value id="production">production</value>
+            <value id="implementation">implementation</value>
+            <value id="stock">stock</value>
+            <value id="obsolete">obsolete</value>
           </values>
           <sql>status</sql>
           <default_value>production</default_value>
@@ -1708,8 +1708,6 @@
         </list>
       </presentation>
     </class>
-
-    
     <class id="ConnectableCI" _delta="define">
       <parent>PhysicalDevice</parent>
       <properties>
@@ -1940,7 +1938,7 @@
           <target_class>Rack</target_class>
           <is_null_allowed>true</is_null_allowed>
           <on_target_delete>DEL_MANUAL</on_target_delete>
-	  <allow_target_creation>false</allow_target_creation>
+          <allow_target_creation>false</allow_target_creation>
         </field>
         <field id="rack_name" xsi:type="AttributeExternalField">
           <extkey_attcode>rack_id</extkey_attcode>
@@ -1955,7 +1953,7 @@
           <target_class>Enclosure</target_class>
           <is_null_allowed>true</is_null_allowed>
           <on_target_delete>DEL_MANUAL</on_target_delete>
-	  <allow_target_creation>false</allow_target_creation>
+          <allow_target_creation>false</allow_target_creation>
         </field>
         <field id="enclosure_name" xsi:type="AttributeExternalField">
           <extkey_attcode>enclosure_id</extkey_attcode>
@@ -1980,7 +1978,7 @@
           <target_class>PowerConnection</target_class>
           <is_null_allowed>true</is_null_allowed>
           <on_target_delete>DEL_MANUAL</on_target_delete>
-	  <allow_target_creation>false</allow_target_creation>
+          <allow_target_creation>false</allow_target_creation>
         </field>
         <field id="powerA_name" xsi:type="AttributeExternalField">
           <extkey_attcode>powerA_id</extkey_attcode>
@@ -1995,7 +1993,7 @@
           <target_class>PowerConnection</target_class>
           <is_null_allowed>true</is_null_allowed>
           <on_target_delete>DEL_MANUAL</on_target_delete>
-	  <allow_target_creation>false</allow_target_creation>
+          <allow_target_creation>false</allow_target_creation>
         </field>
         <field id="powerB_name" xsi:type="AttributeExternalField">
           <extkey_attcode>powerB_id</extkey_attcode>
@@ -2835,8 +2833,6 @@
         </list>
       </presentation>
     </class>
-
-
     <class id="ApplicationSolution" _delta="define">
       <parent>FunctionalCI</parent>
       <properties>
@@ -2881,8 +2877,8 @@
         </field>
         <field id="status" xsi:type="AttributeEnum">
           <values>
-            <value>active</value>
-            <value>inactive</value>
+            <value id="active">active</value>
+            <value id="inactive">inactive</value>
           </values>
           <sql>status</sql>
           <default_value>active</default_value>
@@ -3030,8 +3026,8 @@
         </field>
         <field id="status" xsi:type="AttributeEnum">
           <values>
-            <value>active</value>
-            <value>inactive</value>
+            <value id="active">active</value>
+            <value id="inactive">inactive</value>
           </values>
           <sql>status</sql>
           <default_value>active</default_value>
@@ -3163,7 +3159,7 @@
           <target_class>FunctionalCI</target_class>
           <is_null_allowed>false</is_null_allowed>
           <on_target_delete>DEL_AUTO</on_target_delete>
-	  <allow_target_creation>false</allow_target_creation>
+          <allow_target_creation>false</allow_target_creation>
         </field>
         <field id="system_name" xsi:type="AttributeExternalField">
           <extkey_attcode>system_id</extkey_attcode>
@@ -3189,7 +3185,7 @@
           <target_class>SoftwareLicence</target_class>
           <is_null_allowed>true</is_null_allowed>
           <on_target_delete>DEL_MANUAL</on_target_delete>
-	  <allow_target_creation>false</allow_target_creation>
+          <allow_target_creation>false</allow_target_creation>
         </field>
         <field id="softwarelicence_name" xsi:type="AttributeExternalField">
           <extkey_attcode>softwarelicence_id</extkey_attcode>
@@ -3202,8 +3198,8 @@
         </field>
         <field id="status" xsi:type="AttributeEnum">
           <values>
-            <value>active</value>
-            <value>inactive</value>
+            <value id="active">active</value>
+            <value id="inactive">inactive</value>
           </values>
           <sql>status</sql>
           <default_value/>
@@ -4501,11 +4497,11 @@
         </field>
         <field id="type" xsi:type="AttributeEnum">
           <values>
-            <value>Middleware</value>
-            <value>DBServer</value>
-            <value>PCSoftware</value>
-            <value>OtherSoftware</value>
-            <value>WebServer</value>
+            <value id="Middleware">Middleware</value>
+            <value id="DBServer">DBServer</value>
+            <value id="PCSoftware">PCSoftware</value>
+            <value id="OtherSoftware">OtherSoftware</value>
+            <value id="WebServer">WebServer</value>
           </values>
           <sql>type</sql>
           <default_value/>
@@ -4926,8 +4922,8 @@
         </field>
         <field id="perpetual" xsi:type="AttributeEnum">
           <values>
-            <value>yes</value>
-            <value>no</value>
+            <value id="yes">yes</value>
+            <value id="no">no</value>
           </values>
           <sql>perpetual</sql>
           <default_value>no</default_value>
@@ -5736,24 +5732,24 @@
         </field>
         <field id="type" xsi:type="AttributeEnum">
           <values>
-            <value>NetworkDevice</value>
-            <value>Server</value>
-            <value>SANSwitch</value>
-            <value>StorageSystem</value>
-            <value>Rack</value>
-            <value>Enclosure</value>
-            <value>PC</value>
-            <value>Tablet</value>
-            <value>Telephone</value>
-            <value>MobilePhone</value>
-            <value>Printer</value>
-            <value>DiskArray</value>
-            <value>NAS</value>
-            <value>TapeLibrary</value>
-            <value>IPPhone</value>
-            <value>Peripheral</value>
-            <value>PowerSource</value>
-            <value>PDU</value>
+            <value id="NetworkDevice">NetworkDevice</value>
+            <value id="Server">Server</value>
+            <value id="SANSwitch">SANSwitch</value>
+            <value id="StorageSystem">StorageSystem</value>
+            <value id="Rack">Rack</value>
+            <value id="Enclosure">Enclosure</value>
+            <value id="PC">PC</value>
+            <value id="Tablet">Tablet</value>
+            <value id="Telephone">Telephone</value>
+            <value id="MobilePhone">MobilePhone</value>
+            <value id="Printer">Printer</value>
+            <value id="DiskArray">DiskArray</value>
+            <value id="NAS">NAS</value>
+            <value id="TapeLibrary">TapeLibrary</value>
+            <value id="IPPhone">IPPhone</value>
+            <value id="Peripheral">Peripheral</value>
+            <value id="PowerSource">PowerSource</value>
+            <value id="PDU">PDU</value>
           </values>
           <sql>type</sql>
           <default_value/>
@@ -6817,8 +6813,6 @@
         </list>
       </presentation>
     </class>
-
-
     <class id="NetworkInterface" _delta="define">
       <parent>cmdbAbstractObject</parent>
       <properties>
@@ -6874,7 +6868,6 @@
         </list>
       </presentation>
     </class>
-
     <class id="IPInterface" _delta="define">
       <parent>NetworkInterface</parent>
       <properties>
@@ -7214,7 +7207,6 @@
         </list>
       </presentation>
     </class>
-
     <class id="lnkConnectableCIToNetworkDevice" _delta="define">
       <parent>cmdbAbstractObject</parent>
       <properties>
@@ -7274,8 +7266,8 @@
         </field>
         <field id="connection_type" xsi:type="AttributeEnum">
           <values>
-            <value>uplink</value>
-            <value>downlink</value>
+            <value id="uplink">uplink</value>
+            <value id="downlink">downlink</value>
           </values>
           <sql>type</sql>
           <default_value>downlink</default_value>
@@ -7815,9 +7807,9 @@
         </field>
         <field id="status" xsi:type="AttributeEnum">
           <values>
-            <value>production</value>
-            <value>implementation</value>
-            <value>obsolete</value>
+            <value id="production">production</value>
+            <value id="implementation">implementation</value>
+            <value id="obsolete">obsolete</value>
           </values>
           <sql>status</sql>
           <default_value>implementation</default_value>
@@ -8053,146 +8045,146 @@
       <rank>1</rank>
       <parent>ConfigManagement</parent>
       <definition>
-  <layout>DashboardLayoutOneCol</layout>
-  <title></title>
-  <cells>
-    <cell id="0">
-      <rank>0</rank>
-      <dashlets>
-        <dashlet id="1" xsi:type="DashletHeaderStatic">
-          <rank>0</rank>
-          <title>Menu:ConfigManagement:AllDevices</title>
-          <icon>itop-config-mgmt/images/server.png</icon>
-          <subtitle>Menu_ConfigManagement_AllDevices</subtitle>
-        </dashlet>
-        <dashlet id="2" xsi:type="DashletBadge">
-          <rank>3</rank>
-          <class>Server</class>
-        </dashlet>
-        <dashlet id="3" xsi:type="DashletBadge">
-          <rank>4</rank>
-          <class>NetworkDevice</class>
-        </dashlet>
-      </dashlets>
-    </cell>
-    <cell id="3">
-      <rank>3</rank>
-      <dashlets>
-        <dashlet id="4" xsi:type="DashletHeaderStatic">
-          <rank>0</rank>
-          <title>Menu:ConfigManagement:SWAndApps</title>
-          <icon>itop-config-mgmt/images/application.png</icon>
-        </dashlet>
-        <dashlet id="5" xsi:type="DashletBadge">
-          <rank>1</rank>
-          <class>Middleware</class>
-        </dashlet>
-        <dashlet id="6" xsi:type="DashletBadge">
-          <rank>2</rank>
-          <class>DBServer</class>
-        </dashlet>
-        <dashlet id="7" xsi:type="DashletBadge">
-          <rank>3</rank>
-          <class>WebServer</class>
-        </dashlet>
-        <dashlet id="8" xsi:type="DashletBadge">
-          <rank>4</rank>
-          <class>PCSoftware</class>
-        </dashlet>
-        <dashlet id="9" xsi:type="DashletBadge">
-          <rank>5</rank>
-          <class>OtherSoftware</class>
-        </dashlet>
-        <dashlet id="10" xsi:type="DashletBadge">
-          <rank>6</rank>
-          <class>MiddlewareInstance</class>
-        </dashlet>
-        <dashlet id="11" xsi:type="DashletBadge">
-          <rank>7</rank>
-          <class>DatabaseSchema</class>
-        </dashlet>
-        <dashlet id="12" xsi:type="DashletBadge">
-          <rank>8</rank>
-          <class>WebApplication</class>
-        </dashlet>
-        <dashlet id="13" xsi:type="DashletBadge">
-          <rank>9</rank>
-          <class>Patch</class>
-        </dashlet>
-        <dashlet id="14" xsi:type="DashletBadge">
-          <rank>10</rank>
-          <class>Licence</class>
-        </dashlet>
-      </dashlets>
-    </cell>
-    <cell id="4">
-      <rank>4</rank>
-      <dashlets>
-        <dashlet id="15" xsi:type="DashletHeaderStatic">
-          <rank>0</rank>
-          <title>Menu:ConfigManagement:Misc</title>
-          <icon>itop-config-mgmt/images/subnet.png</icon>
-        </dashlet>
-        <dashlet id="16" xsi:type="DashletBadge">
-          <rank>1</rank>
-          <class>NetworkInterface</class>
-        </dashlet>
-        <dashlet id="17" xsi:type="DashletBadge">
-          <rank>2</rank>
-          <class>Subnet</class>
-        </dashlet>
-        <dashlet id="vlan" xsi:type="DashletBadge">
-          <rank>2.1</rank>
-          <class>VLAN</class>
-        </dashlet>
-        <dashlet id="18" xsi:type="DashletBadge">
-          <rank>4</rank>
-          <class>BusinessProcess</class>
-        </dashlet>
-        <dashlet id="19" xsi:type="DashletBadge">
-          <rank>5</rank>
-          <class>ApplicationSolution</class>
-        </dashlet>
-        <dashlet id="20" xsi:type="DashletBadge">
-          <rank>6</rank>
-          <class>Group</class>
-        </dashlet>
-      </dashlets>
-    </cell>
-  </cells>
+        <layout>DashboardLayoutOneCol</layout>
+        <title/>
+        <cells>
+          <cell id="0">
+            <rank>0</rank>
+            <dashlets>
+              <dashlet id="1" xsi:type="DashletHeaderStatic">
+                <rank>0</rank>
+                <title>Menu:ConfigManagement:AllDevices</title>
+                <icon>itop-config-mgmt/images/server.png</icon>
+                <subtitle>Menu_ConfigManagement_AllDevices</subtitle>
+              </dashlet>
+              <dashlet id="2" xsi:type="DashletBadge">
+                <rank>3</rank>
+                <class>Server</class>
+              </dashlet>
+              <dashlet id="3" xsi:type="DashletBadge">
+                <rank>4</rank>
+                <class>NetworkDevice</class>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="3">
+            <rank>3</rank>
+            <dashlets>
+              <dashlet id="4" xsi:type="DashletHeaderStatic">
+                <rank>0</rank>
+                <title>Menu:ConfigManagement:SWAndApps</title>
+                <icon>itop-config-mgmt/images/application.png</icon>
+              </dashlet>
+              <dashlet id="5" xsi:type="DashletBadge">
+                <rank>1</rank>
+                <class>Middleware</class>
+              </dashlet>
+              <dashlet id="6" xsi:type="DashletBadge">
+                <rank>2</rank>
+                <class>DBServer</class>
+              </dashlet>
+              <dashlet id="7" xsi:type="DashletBadge">
+                <rank>3</rank>
+                <class>WebServer</class>
+              </dashlet>
+              <dashlet id="8" xsi:type="DashletBadge">
+                <rank>4</rank>
+                <class>PCSoftware</class>
+              </dashlet>
+              <dashlet id="9" xsi:type="DashletBadge">
+                <rank>5</rank>
+                <class>OtherSoftware</class>
+              </dashlet>
+              <dashlet id="10" xsi:type="DashletBadge">
+                <rank>6</rank>
+                <class>MiddlewareInstance</class>
+              </dashlet>
+              <dashlet id="11" xsi:type="DashletBadge">
+                <rank>7</rank>
+                <class>DatabaseSchema</class>
+              </dashlet>
+              <dashlet id="12" xsi:type="DashletBadge">
+                <rank>8</rank>
+                <class>WebApplication</class>
+              </dashlet>
+              <dashlet id="13" xsi:type="DashletBadge">
+                <rank>9</rank>
+                <class>Patch</class>
+              </dashlet>
+              <dashlet id="14" xsi:type="DashletBadge">
+                <rank>10</rank>
+                <class>Licence</class>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="4">
+            <rank>4</rank>
+            <dashlets>
+              <dashlet id="15" xsi:type="DashletHeaderStatic">
+                <rank>0</rank>
+                <title>Menu:ConfigManagement:Misc</title>
+                <icon>itop-config-mgmt/images/subnet.png</icon>
+              </dashlet>
+              <dashlet id="16" xsi:type="DashletBadge">
+                <rank>1</rank>
+                <class>NetworkInterface</class>
+              </dashlet>
+              <dashlet id="17" xsi:type="DashletBadge">
+                <rank>2</rank>
+                <class>Subnet</class>
+              </dashlet>
+              <dashlet id="vlan" xsi:type="DashletBadge">
+                <rank>2.1</rank>
+                <class>VLAN</class>
+              </dashlet>
+              <dashlet id="18" xsi:type="DashletBadge">
+                <rank>4</rank>
+                <class>BusinessProcess</class>
+              </dashlet>
+              <dashlet id="19" xsi:type="DashletBadge">
+                <rank>5</rank>
+                <class>ApplicationSolution</class>
+              </dashlet>
+              <dashlet id="20" xsi:type="DashletBadge">
+                <rank>6</rank>
+                <class>Group</class>
+              </dashlet>
+            </dashlets>
+          </cell>
+        </cells>
       </definition>
     </menu>
     <menu id="Contact" xsi:type="DashboardMenuNode" _delta="define">
       <rank>2</rank>
       <parent>ConfigManagement</parent>
       <definition>
-  <layout>DashboardLayoutOneCol</layout>
-  <title></title>
-  <cells>
-    <cell id="0">
-      <rank>0</rank>
-      <dashlets>
-        <dashlet id="1" xsi:type="DashletHeaderDynamic">
-          <rank>1</rank>
-          <title>Menu:Contact</title>
-          <icon>itop-config-mgmt/images/team.png</icon>
-          <subtitle>Menu:Contact:Count</subtitle>
-          <query>SELECT Contact</query>
-          <group_by>status</group_by>
-          <values>active,inactive</values>
-        </dashlet>
-        <dashlet id="2" xsi:type="DashletBadge">
-          <rank>2</rank>
-          <class>Team</class>
-        </dashlet>
-        <dashlet id="3" xsi:type="DashletBadge">
-          <rank>3</rank>
-          <class>Person</class>
-        </dashlet>
-      </dashlets>
-    </cell>
-  </cells>
-  </definition>
+        <layout>DashboardLayoutOneCol</layout>
+        <title/>
+        <cells>
+          <cell id="0">
+            <rank>0</rank>
+            <dashlets>
+              <dashlet id="1" xsi:type="DashletHeaderDynamic">
+                <rank>1</rank>
+                <title>Menu:Contact</title>
+                <icon>itop-config-mgmt/images/team.png</icon>
+                <subtitle>Menu:Contact:Count</subtitle>
+                <query>SELECT Contact</query>
+                <group_by>status</group_by>
+                <values>active,inactive</values>
+              </dashlet>
+              <dashlet id="2" xsi:type="DashletBadge">
+                <rank>2</rank>
+                <class>Team</class>
+              </dashlet>
+              <dashlet id="3" xsi:type="DashletBadge">
+                <rank>3</rank>
+                <class>Person</class>
+              </dashlet>
+            </dashlets>
+          </cell>
+        </cells>
+      </definition>
     </menu>
     <menu id="NewContact" xsi:type="NewObjectMenuNode" _delta="define">
       <rank>3</rank>
@@ -8238,57 +8230,57 @@
       <oql>SELECT Group</oql>
       <do_search>1</do_search>
     </menu>
-  <menu id="Typology" xsi:type="DashboardMenuNode" _delta="define">
-    <rank>80</rank>
-    <parent>Catalogs</parent>
-    <definition>
-      <layout>DashboardLayoutOneCol</layout>
-      <title>Menu:ConfigManagement:Typology</title>
-      <cells>
-        <cell id="0">
-          <rank>0</rank>
-          <dashlets>
-            <dashlet id="1" xsi:type="DashletHeaderStatic">
-              <rank>0</rank>
-              <title>Menu:ConfigManagement:Typology</title>
-              <icon>itop-config-mgmt/images/typology.png</icon>
-            </dashlet>
-            <dashlet id="2" xsi:type="DashletBadge">
-              <rank>1</rank>
-              <class>Brand</class>
-            </dashlet>
-            <dashlet id="3" xsi:type="DashletBadge">
-              <rank>2</rank>
-              <class>Model</class>
-            </dashlet>
-            <dashlet id="4" xsi:type="DashletBadge">
-              <rank>3</rank>
-              <class>OSFamily</class>
-            </dashlet>
-            <dashlet id="5" xsi:type="DashletBadge">
-              <rank>4</rank>
-              <class>OSVersion</class>
-            </dashlet>
-            <dashlet id="6" xsi:type="DashletBadge">
-              <rank>5</rank>
-              <class>IOSVersion</class>
-            </dashlet>
-            <dashlet id="7" xsi:type="DashletBadge">
-              <rank>6</rank>
-              <class>NetworkDeviceType</class>
-            </dashlet>
-            <dashlet id="9" xsi:type="DashletBadge">
-              <rank>8</rank>
-              <class>ContactType</class>
-            </dashlet>
-            <dashlet id="10" xsi:type="DashletBadge">
-              <rank>9</rank>
-              <class>DocumentType</class>
-            </dashlet>
-          </dashlets>
-        </cell>
-      </cells>
-    </definition>
-  </menu>
+    <menu id="Typology" xsi:type="DashboardMenuNode" _delta="define">
+      <rank>80</rank>
+      <parent>Catalogs</parent>
+      <definition>
+        <layout>DashboardLayoutOneCol</layout>
+        <title>Menu:ConfigManagement:Typology</title>
+        <cells>
+          <cell id="0">
+            <rank>0</rank>
+            <dashlets>
+              <dashlet id="1" xsi:type="DashletHeaderStatic">
+                <rank>0</rank>
+                <title>Menu:ConfigManagement:Typology</title>
+                <icon>itop-config-mgmt/images/typology.png</icon>
+              </dashlet>
+              <dashlet id="2" xsi:type="DashletBadge">
+                <rank>1</rank>
+                <class>Brand</class>
+              </dashlet>
+              <dashlet id="3" xsi:type="DashletBadge">
+                <rank>2</rank>
+                <class>Model</class>
+              </dashlet>
+              <dashlet id="4" xsi:type="DashletBadge">
+                <rank>3</rank>
+                <class>OSFamily</class>
+              </dashlet>
+              <dashlet id="5" xsi:type="DashletBadge">
+                <rank>4</rank>
+                <class>OSVersion</class>
+              </dashlet>
+              <dashlet id="6" xsi:type="DashletBadge">
+                <rank>5</rank>
+                <class>IOSVersion</class>
+              </dashlet>
+              <dashlet id="7" xsi:type="DashletBadge">
+                <rank>6</rank>
+                <class>NetworkDeviceType</class>
+              </dashlet>
+              <dashlet id="9" xsi:type="DashletBadge">
+                <rank>8</rank>
+                <class>ContactType</class>
+              </dashlet>
+              <dashlet id="10" xsi:type="DashletBadge">
+                <rank>9</rank>
+                <class>DocumentType</class>
+              </dashlet>
+            </dashlets>
+          </cell>
+        </cells>
+      </definition>
+    </menu>
   </menus>
 </itop_design>

datamodels/2.x/itop-datacenter-mgmt/datamodel.itop-datacenter-mgmt.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1">
   <classes>
     <class id="Rack" _delta="define">
       <parent>PhysicalDevice</parent>
@@ -769,7 +769,7 @@
           <target_class>Rack</target_class>
           <is_null_allowed>false</is_null_allowed>
           <on_target_delete>DEL_MANUAL</on_target_delete>
-	  <allow_target_creation>false</allow_target_creation>
+          <allow_target_creation>false</allow_target_creation>
         </field>
         <field id="rack_name" xsi:type="AttributeExternalField">
           <extkey_attcode>rack_id</extkey_attcode>
@@ -784,8 +784,8 @@
           <target_class>PowerConnection</target_class>
           <is_null_allowed>true</is_null_allowed>
           <on_target_delete>DEL_MANUAL</on_target_delete>
-	  <allow_target_creation>false</allow_target_creation>
-	  <allow_target_creation>false</allow_target_creation>
+          <allow_target_creation>false</allow_target_creation>
+          <allow_target_creation>false</allow_target_creation>
         </field>
         <field id="powerstart_name" xsi:type="AttributeExternalField">
           <extkey_attcode>powerstart_id</extkey_attcode>
@@ -958,25 +958,25 @@
   </classes>
   <menus>
     <menu id="ConfigManagementOverview" xsi:type="DashboardMenuNode" _delta="must_exist">
-   <definition>
-  <cells>
-    <cell id="0" _delta="must_exist">
-      <dashlets>
-        <dashlet id="21" xsi:type="DashletBadge" _delta="define">
-          <rank>1</rank>
-          <class>Rack</class>
-        </dashlet>
-        <dashlet id="22" xsi:type="DashletBadge" _delta="define">
-          <rank>2</rank>
-          <class>Enclosure</class>
-        </dashlet>
-        <dashlet id="23" xsi:type="DashletBadge" _delta="define">
-          <rank>9</rank>
-          <class>PowerConnection</class>
-        </dashlet>
-      </dashlets>
-    </cell>
-  </cells>
+      <definition>
+        <cells>
+          <cell id="0" _delta="must_exist">
+            <dashlets>
+              <dashlet id="21" xsi:type="DashletBadge" _delta="define">
+                <rank>1</rank>
+                <class>Rack</class>
+              </dashlet>
+              <dashlet id="22" xsi:type="DashletBadge" _delta="define">
+                <rank>2</rank>
+                <class>Enclosure</class>
+              </dashlet>
+              <dashlet id="23" xsi:type="DashletBadge" _delta="define">
+                <rank>9</rank>
+                <class>PowerConnection</class>
+              </dashlet>
+            </dashlets>
+          </cell>
+        </cells>
       </definition>
     </menu>
   </menus>

datamodels/2.x/itop-endusers-devices/datamodel.itop-enduser-devices.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1">
   <classes>
-<class id="TelephonyCI" _delta="define">
+    <class id="TelephonyCI" _delta="define">
       <parent>PhysicalDevice</parent>
       <properties>
         <category>bizmodel,searchable</category>
@@ -860,8 +860,8 @@
         </field>
         <field id="type" xsi:type="AttributeEnum">
           <values>
-            <value>laptop</value>
-            <value>desktop</value>
+            <value id="laptop">laptop</value>
+            <value id="desktop">desktop</value>
           </values>
           <sql>type</sql>
           <default_value/>
@@ -1242,7 +1242,6 @@
         </list>
       </presentation>
     </class>
-
     <class id="Peripheral" _delta="define">
       <parent>PhysicalDevice</parent>
       <properties>
@@ -1396,51 +1395,51 @@
         </list>
       </presentation>
     </class>
-</classes>
-<menus>
-  <menu id="ConfigManagementOverview" xsi:type="DashboardMenuNode" _delta="must_exist">
-    <definition>
-      <cells>
-        <cell id="2" _delta="define">
-          <rank>2</rank>
-          <dashlets>
-            <dashlet id="25" xsi:type="DashletHeaderStatic">
-              <rank>0</rank>
-              <title>Menu:ConfigManagement:EndUsers</title>
-              <icon>itop-config-mgmt/images/team.png</icon>
-            </dashlet>
-            <dashlet id="26" xsi:type="DashletBadge">
-              <rank>1</rank>
-              <class>PC</class>
-            </dashlet>
-            <dashlet id="27" xsi:type="DashletBadge">
-              <rank>2</rank>
-              <class>Phone</class>
-            </dashlet>
-            <dashlet id="28" xsi:type="DashletBadge">
-              <rank>3</rank>
-              <class>IPPhone</class>
-            </dashlet>
-            <dashlet id="29" xsi:type="DashletBadge">
-              <rank>4</rank>
-              <class>MobilePhone</class>
-            </dashlet>
-            <dashlet id="30" xsi:type="DashletBadge">
-              <rank>5</rank>
-              <class>Tablet</class>
-            </dashlet>
-            <dashlet id="31" xsi:type="DashletBadge">
-              <rank>6</rank>
-              <class>Printer</class>
-            </dashlet>
-            <dashlet id="32" xsi:type="DashletBadge">
-              <rank>7</rank>
-              <class>Peripheral</class>
-            </dashlet>
-          </dashlets>
-        </cell>
-      </cells>
-    </definition>
-  </menu>
-</menus>
+  </classes>
+  <menus>
+    <menu id="ConfigManagementOverview" xsi:type="DashboardMenuNode" _delta="must_exist">
+      <definition>
+        <cells>
+          <cell id="2" _delta="define">
+            <rank>2</rank>
+            <dashlets>
+              <dashlet id="25" xsi:type="DashletHeaderStatic">
+                <rank>0</rank>
+                <title>Menu:ConfigManagement:EndUsers</title>
+                <icon>itop-config-mgmt/images/team.png</icon>
+              </dashlet>
+              <dashlet id="26" xsi:type="DashletBadge">
+                <rank>1</rank>
+                <class>PC</class>
+              </dashlet>
+              <dashlet id="27" xsi:type="DashletBadge">
+                <rank>2</rank>
+                <class>Phone</class>
+              </dashlet>
+              <dashlet id="28" xsi:type="DashletBadge">
+                <rank>3</rank>
+                <class>IPPhone</class>
+              </dashlet>
+              <dashlet id="29" xsi:type="DashletBadge">
+                <rank>4</rank>
+                <class>MobilePhone</class>
+              </dashlet>
+              <dashlet id="30" xsi:type="DashletBadge">
+                <rank>5</rank>
+                <class>Tablet</class>
+              </dashlet>
+              <dashlet id="31" xsi:type="DashletBadge">
+                <rank>6</rank>
+                <class>Printer</class>
+              </dashlet>
+              <dashlet id="32" xsi:type="DashletBadge">
+                <rank>7</rank>
+                <class>Peripheral</class>
+              </dashlet>
+            </dashlets>
+          </cell>
+        </cells>
+      </definition>
+    </menu>
+  </menus>
 </itop_design>

datamodels/2.x/itop-incident-mgmt-itil/datamodel.itop-incident-mgmt-itil.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0">
-   <constants>
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1">
+  <constants>
     <constant id="PORTAL_TYPE_TO_CLASS" xsi:type="string" _delta="redefine"><![CDATA[{"service_request":"UserRequest","incident":"Incident"}]]></constant>
     <constant id="PORTAL_INCIDENT_PUBLIC_LOG" xsi:type="string" _delta="define"><![CDATA[public_log]]></constant>
     <constant id="PORTAL_INCIDENT_USER_COMMENT" xsi:type="string" _delta="define"><![CDATA[user_comment]]></constant>
@@ -51,13 +51,13 @@
         <field id="status" xsi:type="AttributeEnum">
           <always_load_in_tables>true</always_load_in_tables>
           <values>
-            <value>new</value>
-            <value>assigned</value>
-            <value>pending</value>
-            <value>escalated_tto</value>
-            <value>escalated_ttr</value>
-            <value>resolved</value>
-            <value>closed</value>
+            <value id="new">new</value>
+            <value id="assigned">assigned</value>
+            <value id="pending">pending</value>
+            <value id="escalated_tto">escalated_tto</value>
+            <value id="escalated_ttr">escalated_ttr</value>
+            <value id="resolved">resolved</value>
+            <value id="closed">closed</value>
           </values>
           <sql>status</sql>
           <default_value>new</default_value>
@@ -66,9 +66,9 @@
         </field>
         <field id="impact" xsi:type="AttributeEnum">
           <values>
-            <value>1</value>
-            <value>2</value>
-            <value>3</value>
+            <value id="1">1</value>
+            <value id="2">2</value>
+            <value id="3">3</value>
           </values>
           <sql>impact</sql>
           <default_value>1</default_value>
@@ -77,10 +77,10 @@
         </field>
         <field id="priority" xsi:type="AttributeEnum">
           <values>
-            <value>1</value>
-            <value>2</value>
-            <value>3</value>
-            <value>4</value>
+            <value id="1">1</value>
+            <value id="2">2</value>
+            <value id="3">3</value>
+            <value id="4">4</value>
           </values>
           <sql>priority</sql>
           <default_value>4</default_value>
@@ -88,10 +88,10 @@
         </field>
         <field id="urgency" xsi:type="AttributeEnum">
           <values>
-            <value>1</value>
-            <value>2</value>
-            <value>3</value>
-            <value>4</value>
+            <value id="1">1</value>
+            <value id="2">2</value>
+            <value id="3">3</value>
+            <value id="4">4</value>
           </values>
           <sql>urgency</sql>
           <default_value>4</default_value>
@@ -99,10 +99,10 @@
         </field>
         <field id="origin" xsi:type="AttributeEnum">
           <values>
-            <value>mail</value>
-            <value>phone</value>
-            <value>portal</value>
-            <value>monitoring</value>
+            <value id="mail">mail</value>
+            <value id="phone">phone</value>
+            <value id="portal">portal</value>
+            <value id="monitoring">monitoring</value>
           </values>
           <sql>origin</sql>
           <default_value>phone</default_value>
@@ -118,7 +118,7 @@
           <target_class>Service</target_class>
           <is_null_allowed>true</is_null_allowed>
           <on_target_delete>DEL_MANUAL</on_target_delete>
-	  <allow_target_creation>false</allow_target_creation>
+          <allow_target_creation>false</allow_target_creation>
         </field>
         <field id="service_name" xsi:type="AttributeExternalField">
           <extkey_attcode>service_id</extkey_attcode>
@@ -133,7 +133,7 @@
           <target_class>ServiceSubcategory</target_class>
           <is_null_allowed>true</is_null_allowed>
           <on_target_delete>DEL_MANUAL</on_target_delete>
-	  <allow_target_creation>false</allow_target_creation>
+          <allow_target_creation>false</allow_target_creation>
         </field>
         <field id="servicesubcategory_name" xsi:type="AttributeExternalField">
           <extkey_attcode>servicesubcategory_id</extkey_attcode>
@@ -141,8 +141,8 @@
         </field>
         <field id="escalation_flag" xsi:type="AttributeEnum">
           <values>
-            <value>yes</value>
-            <value>no</value>
+            <value id="yes">yes</value>
+            <value id="no">no</value>
           </values>
           <sql>escalation_flag</sql>
           <default_value>no</default_value>
@@ -186,21 +186,19 @@
           <working_time/>
           <goal>ResponseTicketTTO</goal>
           <thresholds>
-            <threshold>
-              <percent>75</percent>
+            <threshold id="75">
               <highlight>
                 <code>warning</code>
                 <persistent>false</persistent>
-              </highlight> 
+              </highlight>
               <actions>
 		</actions>
             </threshold>
-            <threshold>
-              <percent>100</percent>
+            <threshold id="100">
               <highlight>
                 <code>critical</code>
                 <persistent>false</persistent>
-              </highlight> 
+              </highlight>
               <actions>
                 <action>
                   <verb>ApplyStimulus</verb>
@@ -223,21 +221,19 @@
           <working_time/>
           <goal>ResponseTicketTTR</goal>
           <thresholds>
-            <threshold>
-              <percent>75</percent>
+            <threshold id="75">
               <highlight>
                 <code>warning</code>
                 <persistent>false</persistent>
-              </highlight> 
+              </highlight>
               <actions>
 		</actions>
             </threshold>
-            <threshold>
-              <percent>100</percent>
+            <threshold id="100">
               <highlight>
                 <code>critical</code>
                 <persistent>false</persistent>
-              </highlight> 
+              </highlight>
               <actions>
                 <action>
                   <verb>ApplyStimulus</verb>
@@ -280,13 +276,13 @@
         </field>
         <field id="resolution_code" xsi:type="AttributeEnum">
           <values>
-            <value>assistance</value>
-            <value>other</value>
-            <value>software patch</value>
-            <value>training</value>
-            <value>hardware repair</value>
-            <value>system update</value>
-            <value>bug fixed</value>
+            <value id="assistance">assistance</value>
+            <value id="other">other</value>
+            <value id="software patch">software patch</value>
+            <value id="training">training</value>
+            <value id="hardware repair">hardware repair</value>
+            <value id="system update">system update</value>
+            <value id="bug fixed">bug fixed</value>
           </values>
           <sql>resolution_code</sql>
           <default_value>assistance</default_value>
@@ -356,10 +352,10 @@
         </field>
         <field id="user_satisfaction" xsi:type="AttributeEnum">
           <values>
-            <value>1</value>
-            <value>2</value>
-            <value>3</value>
-            <value>4</value>
+            <value id="1">1</value>
+            <value id="2">2</value>
+            <value id="3">3</value>
+            <value id="4">4</value>
           </values>
           <sql>user_satisfaction</sql>
           <default_value>1</default_value>
@@ -486,7 +482,6 @@
             </flags>
             <transitions>
               <transition id="ev_assign">
-                <stimulus>ev_assign</stimulus>
                 <target>assigned</target>
                 <actions>
                   <action>
@@ -495,12 +490,10 @@
                 </actions>
               </transition>
               <transition id="ev_timeout">
-                <stimulus>ev_timeout</stimulus>
                 <target>escalated_tto</target>
                 <actions/>
               </transition>
               <transition id="ev_autoresolve">
-                <stimulus>ev_autoresolve</stimulus>
                 <target>resolved</target>
                 <actions>
                   <action>
@@ -516,87 +509,13 @@
           <state id="escalated_tto">
             <highlight>
               <code>critical</code>
-            </highlight> 
+            </highlight>
+            <inherit_flags_from>new</inherit_flags_from>
             <flags>
-              <attribute id="ref">
-                <read_only/>
-              </attribute>
-              <attribute id="org_id">
-                <mandatory/>
-              </attribute>
-              <attribute id="caller_id">
-                <mandatory/>
-              </attribute>
-              <attribute id="agent_id">
-                <hidden/>
-              </attribute>
-              <attribute id="priority">
-                <read_only/>
-              </attribute>
-              <attribute id="start_date">
-                <read_only/>
-              </attribute>
-              <attribute id="last_update">
-                <read_only/>
-              </attribute>
-              <attribute id="close_date">
-                <hidden/>
-              </attribute>
-              <attribute id="escalation_flag">
-                <hidden/>
-              </attribute>
-              <attribute id="escalation_reason">
-                <hidden/>
-              </attribute>
-              <attribute id="assignment_date">
-                <hidden/>
-              </attribute>
-              <attribute id="resolution_date">
-                <hidden/>
-              </attribute>
-              <attribute id="last_pending_date">
-                <hidden/>
-              </attribute>
-              <attribute id="time_spent">
-                <hidden/>
-              </attribute>
-              <attribute id="resolution_code">
-                <hidden/>
-              </attribute>
-              <attribute id="solution">
-                <hidden/>
-              </attribute>
-              <attribute id="pending_reason">
-                <hidden/>
-              </attribute>
-              <attribute id="user_satisfaction">
-                <hidden/>
-              </attribute>
-              <attribute id="user_comment">
-                <hidden/>
-              </attribute>
-              <attribute id="tto_escalation_deadline">
-                <read_only/>
-              </attribute>
-              <attribute id="sla_tto_passed">
-                <hidden/>
-              </attribute>
-              <attribute id="sla_tto_over">
-                <hidden/>
-              </attribute>
-              <attribute id="sla_ttr_passed">
-                <hidden/>
-              </attribute>
-              <attribute id="ttr_escalation_deadline">
-                <hidden/>
-              </attribute>
-              <attribute id="sla_ttr_over">
-                <hidden/>
-              </attribute>
+              <attribute id="team_id"/>
             </flags>
             <transitions>
               <transition id="ev_assign">
-                <stimulus>ev_assign</stimulus>
                 <target>assigned</target>
                 <actions>
                   <action>
@@ -607,13 +526,8 @@
             </transitions>
           </state>
           <state id="assigned">
+            <inherit_flags_from>new</inherit_flags_from>
             <flags>
-              <attribute id="ref">
-                <read_only/>
-              </attribute>
-              <attribute id="org_id">
-                <mandatory/>
-              </attribute>
               <attribute id="team_id">
                 <mandatory/>
                 <must_prompt/>
@@ -622,45 +536,9 @@
                 <mandatory/>
                 <must_prompt/>
               </attribute>
-              <attribute id="priority">
-                <read_only/>
-              </attribute>
-              <attribute id="start_date">
-                <read_only/>
-              </attribute>
-              <attribute id="last_update">
-                <read_only/>
-              </attribute>
-              <attribute id="close_date">
-                <hidden/>
-              </attribute>
               <attribute id="assignment_date">
                 <read_only/>
               </attribute>
-              <attribute id="resolution_date">
-                <hidden/>
-              </attribute>
-              <attribute id="last_pending_date">
-                <hidden/>
-              </attribute>
-              <attribute id="time_spent">
-                <hidden/>
-              </attribute>
-              <attribute id="resolution_code">
-                <hidden/>
-              </attribute>
-              <attribute id="solution">
-                <hidden/>
-              </attribute>
-              <attribute id="pending_reason">
-                <hidden/>
-              </attribute>
-              <attribute id="user_satisfaction">
-                <hidden/>
-              </attribute>
-              <attribute id="user_comment">
-                <hidden/>
-              </attribute>
               <attribute id="tto_escalation_deadline">
                 <hidden/>
               </attribute>
@@ -670,19 +548,15 @@
               <attribute id="sla_tto_over">
                 <read_only/>
               </attribute>
-              <attribute id="sla_ttr_passed">
-                <hidden/>
-              </attribute>
               <attribute id="ttr_escalation_deadline">
                 <read_only/>
               </attribute>
-              <attribute id="sla_ttr_over">
-                <hidden/>
-              </attribute>
+              <attribute id="caller_id"/>
+              <attribute id="escalation_flag"/>
+              <attribute id="escalation_reason"/>
             </flags>
             <transitions>
               <transition id="ev_pending">
-                <stimulus>ev_pending</stimulus>
                 <target>pending</target>
                 <actions>
                   <action>
@@ -691,7 +565,6 @@
                 </actions>
               </transition>
               <transition id="ev_resolve">
-                <stimulus>ev_resolve</stimulus>
                 <target>resolved</target>
                 <actions>
                   <action>
@@ -703,17 +576,14 @@
                 </actions>
               </transition>
               <transition id="ev_reassign">
-                <stimulus>ev_reassign</stimulus>
                 <target>assigned</target>
                 <actions/>
               </transition>
               <transition id="ev_timeout">
-                <stimulus>ev_timeout</stimulus>
                 <target>escalated_ttr</target>
                 <actions/>
               </transition>
               <transition id="ev_autoresolve">
-                <stimulus>ev_autoresolve</stimulus>
                 <target>resolved</target>
                 <actions>
                   <action>
@@ -729,81 +599,11 @@
           <state id="escalated_ttr">
             <highlight>
               <code>critical</code>
-            </highlight> 
-            <flags>
-              <attribute id="ref">
-                <read_only/>
-              </attribute>
-              <attribute id="org_id">
-                <mandatory/>
-              </attribute>
-              <attribute id="team_id">
-                <mandatory/>
-              </attribute>
-              <attribute id="agent_id">
-                <mandatory/>
-              </attribute>
-              <attribute id="priority">
-                <read_only/>
-              </attribute>
-              <attribute id="start_date">
-                <read_only/>
-              </attribute>
-              <attribute id="last_update">
-                <read_only/>
-              </attribute>
-              <attribute id="close_date">
-                <hidden/>
-              </attribute>
-              <attribute id="assignment_date">
-                <read_only/>
-              </attribute>
-              <attribute id="resolution_date">
-                <hidden/>
-              </attribute>
-              <attribute id="last_pending_date">
-                <hidden/>
-              </attribute>
-              <attribute id="time_spent">
-                <hidden/>
-              </attribute>
-              <attribute id="resolution_code">
-                <hidden/>
-              </attribute>
-              <attribute id="solution">
-                <hidden/>
-              </attribute>
-              <attribute id="pending_reason">
-                <hidden/>
-              </attribute>
-              <attribute id="user_satisfaction">
-                <hidden/>
-              </attribute>
-              <attribute id="user_comment">
-                <hidden/>
-              </attribute>
-              <attribute id="tto_escalation_deadline">
-                <hidden/>
-              </attribute>
-              <attribute id="sla_tto_passed">
-                <read_only/>
-              </attribute>
-              <attribute id="sla_tto_over">
-                <read_only/>
-              </attribute>
-              <attribute id="sla_ttr_passed">
-                <hidden/>
-              </attribute>
-              <attribute id="ttr_escalation_deadline">
-                <read_only/>
-              </attribute>
-              <attribute id="sla_ttr_over">
-                <hidden/>
-              </attribute>
-            </flags>
+            </highlight>
+            <inherit_flags_from>assigned</inherit_flags_from>
+            <flags/>
             <transitions>
               <transition id="ev_pending">
-                <stimulus>ev_pending</stimulus>
                 <target>pending</target>
                 <actions>
                   <action>
@@ -812,7 +612,6 @@
                 </actions>
               </transition>
               <transition id="ev_resolve">
-                <stimulus>ev_resolve</stimulus>
                 <target>resolved</target>
                 <actions>
                   <action>
@@ -824,12 +623,10 @@
                 </actions>
               </transition>
               <transition id="ev_reassign">
-                <stimulus>ev_reassign</stimulus>
                 <target>assigned</target>
                 <actions/>
               </transition>
               <transition id="ev_autoresolve">
-                <stimulus>ev_autoresolve</stimulus>
                 <target>resolved</target>
                 <actions>
                   <action>
@@ -843,43 +640,11 @@
             </transitions>
           </state>
           <state id="pending">
+            <inherit_flags_from>assigned</inherit_flags_from>
             <flags>
-              <attribute id="ref">
-                <read_only/>
-              </attribute>
-              <attribute id="org_id">
-                <mandatory/>
-              </attribute>
-              <attribute id="team_id">
-                <mandatory/>
-              </attribute>
-              <attribute id="agent_id">
-                <mandatory/>
-              </attribute>
-              <attribute id="priority">
-                <read_only/>
-              </attribute>
-              <attribute id="start_date">
-                <read_only/>
-              </attribute>
-              <attribute id="last_update">
-                <read_only/>
-              </attribute>
-              <attribute id="close_date">
-                <hidden/>
-              </attribute>
-              <attribute id="assignment_date">
-                <read_only/>
-              </attribute>
-              <attribute id="resolution_date">
-                <hidden/>
-              </attribute>
               <attribute id="last_pending_date">
                 <read_only/>
               </attribute>
-              <attribute id="tto_escalation_deadline">
-                <hidden/>
-              </attribute>
               <attribute id="ttr_escalation_deadline">
                 <hidden/>
               </attribute>
@@ -889,41 +654,18 @@
               <attribute id="sla_tto_over">
                 <hidden/>
               </attribute>
-              <attribute id="sla_ttr_passed">
-                <hidden/>
-              </attribute>
-              <attribute id="sla_ttr_over">
-                <hidden/>
-              </attribute>
-              <attribute id="time_spent">
-                <hidden/>
-              </attribute>
-              <attribute id="resolution_code">
-                <hidden/>
-              </attribute>
-              <attribute id="solution">
-                <hidden/>
-              </attribute>
               <attribute id="pending_reason">
                 <mandatory/>
                 <must_prompt/>
               </attribute>
-              <attribute id="user_satisfaction">
-                <hidden/>
-              </attribute>
-              <attribute id="user_comment">
-                <hidden/>
-              </attribute>
             </flags>
             <transitions>
               <transition id="ev_assign">
-                <stimulus>ev_assign</stimulus>
                 <target>assigned</target>
                 <actions>
                 </actions>
               </transition>
               <transition id="ev_autoresolve">
-                <stimulus>ev_autoresolve</stimulus>
                 <target>resolved</target>
                 <actions>
                   <action>
@@ -939,47 +681,22 @@
           <state id="resolved">
             <highlight>
               <code>closed</code>
-            </highlight> 
+            </highlight>
+            <inherit_flags_from>assigned</inherit_flags_from>
             <flags>
-              <attribute id="ref">
-                <read_only/>
-              </attribute>
-              <attribute id="org_id">
-                <read_only/>
-              </attribute>
               <attribute id="caller_id">
                 <read_only/>
               </attribute>
               <attribute id="origin">
                 <read_only/>
               </attribute>
-              <attribute id="team_id">
-                <read_only/>
-              </attribute>
-              <attribute id="agent_id">
-                <read_only/>
-              </attribute>
-              <attribute id="start_date">
-                <read_only/>
-              </attribute>
-              <attribute id="last_update">
-                <read_only/>
-              </attribute>
-              <attribute id="private_log">
-                <normal/>
-              </attribute>
+              <attribute id="private_log"/>
               <attribute id="impact">
                 <read_only/>
               </attribute>
               <attribute id="urgency">
                 <read_only/>
               </attribute>
-              <attribute id="priority">
-                <read_only/>
-              </attribute>
-              <attribute id="close_date">
-                <hidden/>
-              </attribute>
               <attribute id="service_id">
                 <mandatory/>
                 <must_prompt/>
@@ -993,57 +710,45 @@
               <attribute id="escalation_reason">
                 <read_only/>
               </attribute>
-              <attribute id="assignment_date">
+              <attribute id="parent_incident_id">
                 <read_only/>
               </attribute>
-              <attribute id="resolution_date">
+              <attribute id="parent_change_id">
                 <read_only/>
               </attribute>
-              <attribute id="last_pending_date">
-                <hidden/>
-              </attribute>
-              <attribute id="time_spent">
+              <attribute id="parent_problem_id">
                 <read_only/>
               </attribute>
-              <attribute id="resolution_code">
-                <mandatory/>
-                <must_prompt/>
-              </attribute>
-              <attribute id="solution">
-                <mandatory/>
-                <must_prompt/>
-              </attribute>
-              <attribute id="pending_reason">
+              <attribute id="title">
                 <read_only/>
               </attribute>
-              <attribute id="user_satisfaction">
-                <hidden/>
-              </attribute>
-              <attribute id="user_comment">
-                <hidden/>
+              <attribute id="description">
+                <read_only/>
               </attribute>
-              <attribute id="parent_incident_id">
+              <attribute id="org_id">
                 <read_only/>
               </attribute>
-              <attribute id="parent_change_id">
+              <attribute id="team_id">
                 <read_only/>
               </attribute>
-              <attribute id="parent_problem_id">
+              <attribute id="agent_id">
                 <read_only/>
               </attribute>
-              <attribute id="title">
+              <attribute id="resolution_date">
                 <read_only/>
               </attribute>
-              <attribute id="description">
+              <attribute id="time_spent">
                 <read_only/>
               </attribute>
-              <attribute id="tto_escalation_deadline">
-                <hidden/>
+              <attribute id="resolution_code">
+                <mandatory/>
+                <must_prompt/>
               </attribute>
-              <attribute id="sla_tto_passed">
-                <read_only/>
+              <attribute id="solution">
+                <mandatory/>
+                <must_prompt/>
               </attribute>
-              <attribute id="sla_tto_over">
+              <attribute id="pending_reason">
                 <read_only/>
               </attribute>
               <attribute id="sla_ttr_passed">
@@ -1058,7 +763,6 @@
             </flags>
             <transitions>
               <transition id="ev_close">
-                <stimulus>ev_close</stimulus>
                 <target>closed</target>
                 <actions>
                   <action>
@@ -1067,13 +771,11 @@
                 </actions>
               </transition>
               <transition id="ev_reopen">
-                <stimulus>ev_reopen</stimulus>
                 <target>assigned</target>
                 <actions>
                 </actions>
               </transition>
               <transition id="ev_autoresolve">
-                <stimulus>ev_autoresolve</stimulus>
                 <target>resolved</target>
                 <actions>
                   <action>
@@ -1089,71 +791,30 @@
           <state id="closed">
             <highlight>
               <code>closed</code>
-            </highlight> 
+            </highlight>
+            <inherit_flags_from>resolved</inherit_flags_from>
             <flags>
-              <attribute id="ref">
-                <read_only/>
-              </attribute>
-              <attribute id="org_id">
-                <read_only/>
-              </attribute>
-              <attribute id="caller_id">
-                <read_only/>
-              </attribute>
-              <attribute id="origin">
-                <read_only/>
-              </attribute>
-              <attribute id="team_id">
-                <read_only/>
-              </attribute>
-              <attribute id="agent_id">
+              <attribute id="public_log">
                 <read_only/>
               </attribute>
-              <attribute id="start_date">
+              <attribute id="functionalcis_list">
                 <read_only/>
               </attribute>
-              <attribute id="last_update">
+              <attribute id="contacts_list">
                 <read_only/>
               </attribute>
               <attribute id="private_log">
                 <read_only/>
               </attribute>
-              <attribute id="impact">
-                <read_only/>
-              </attribute>
-              <attribute id="urgency">
-                <read_only/>
-              </attribute>
-              <attribute id="priority">
-                <read_only/>
-              </attribute>
               <attribute id="service_id">
                 <read_only/>
               </attribute>
               <attribute id="servicesubcategory_id">
                 <read_only/>
               </attribute>
-              <attribute id="escalation_flag">
-                <read_only/>
-              </attribute>
-              <attribute id="escalation_reason">
-                <read_only/>
-              </attribute>
-              <attribute id="assignment_date">
-                <read_only/>
-              </attribute>
-              <attribute id="resolution_date">
-                <read_only/>
-              </attribute>
               <attribute id="close_date">
                 <read_only/>
               </attribute>
-              <attribute id="last_pending_date">
-                <hidden/>
-              </attribute>
-              <attribute id="time_spent">
-                <read_only/>
-              </attribute>
               <attribute id="resolution_code">
                 <read_only/>
               </attribute>
@@ -1162,8 +823,6 @@
               </attribute>
               <attribute id="pending_reason">
                 <read_only/>
-              </attribute>
-              <attribute id="public_log">
                 <read_only/>
               </attribute>
               <attribute id="user_satisfaction">
@@ -1172,48 +831,6 @@
               <attribute id="user_comment">
                 <must_prompt/>
               </attribute>
-              <attribute id="pending_reason">
-                <read_only/>
-              </attribute>
-              <attribute id="parent_incident_id">
-                <read_only/>
-              </attribute>
-              <attribute id="parent_change_id">
-                <read_only/>
-              </attribute>
-              <attribute id="parent_problem_id">
-                <read_only/>
-              </attribute>
-              <attribute id="title">
-                <read_only/>
-              </attribute>
-              <attribute id="description">
-                <read_only/>
-              </attribute>
-              <attribute id="tto_escalation_deadline">
-                <hidden/>
-              </attribute>
-              <attribute id="sla_tto_passed">
-                <read_only/>
-              </attribute>
-              <attribute id="sla_tto_over">
-                <read_only/>
-              </attribute>
-              <attribute id="sla_ttr_passed">
-                <read_only/>
-              </attribute>
-              <attribute id="ttr_escalation_deadline">
-                <hidden/>
-              </attribute>
-              <attribute id="sla_ttr_over">
-                <read_only/>
-              </attribute>
-              <attribute id="functionalcis_list">
-                <read_only/>
-              </attribute>
-              <attribute id="contacts_list">
-                <read_only/>
-              </attribute>
             </flags>
             <transitions/>
           </state>
@@ -1962,9 +1579,9 @@
         <groups>
           <group id="Incident" _delta="define">
             <actions>
-              <action xsi:type="write">allow</action>
-              <action id="ev_close" xsi:type="stimulus">allow</action>
-              <action id="ev_reopen" xsi:type="stimulus">allow</action>
+              <action id="action:write">allow</action>
+              <action id="stimulus:ev_close">allow</action>
+              <action id="stimulus:ev_reopen">allow</action>
             </actions>
           </group>
         </groups>

datamodels/2.x/itop-knownerror-mgmt/datamodel.itop-knownerror-mgmt.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1">
   <classes>
     <class id="KnownError" _delta="define">
       <parent>cmdbAbstractObject</parent>
@@ -81,10 +81,10 @@
         </field>
         <field id="domain" xsi:type="AttributeEnum">
           <values>
-            <value>Network</value>
-            <value>Server</value>
-            <value>Application</value>
-            <value>Desktop</value>
+            <value id="Network">Network</value>
+            <value id="Server">Server</value>
+            <value id="Application">Application</value>
+            <value id="Desktop">Desktop</value>
           </values>
           <sql>domain</sql>
           <default_value>Application</default_value>
@@ -573,7 +573,7 @@
     <menu id="Problem:Shortcuts" xsi:type="TemplateMenuNode" _delta="define_if_not_exists">
       <rank>5</rank>
       <parent>ProblemManagement</parent>
-      <template_file />
+      <template_file/>
     </menu>
     <menu id="NewError" xsi:type="NewObjectMenuNode" _delta="define">
       <rank>3</rank>

datamodels/2.x/itop-problem-mgmt/datamodel.itop-problem-mgmt.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1">
   <classes>
     <class id="Problem" _delta="define">
       <parent>Ticket</parent>
@@ -38,10 +38,10 @@
       <fields>
         <field id="status" xsi:type="AttributeEnum">
           <values>
-            <value>new</value>
-            <value>assigned</value>
-            <value>resolved</value>
-            <value>closed</value>
+            <value id="new">new</value>
+            <value id="assigned">assigned</value>
+            <value id="resolved">resolved</value>
+            <value id="closed">closed</value>
           </values>
           <sql>status</sql>
           <default_value>new</default_value>
@@ -57,7 +57,7 @@
           <target_class>Service</target_class>
           <is_null_allowed>true</is_null_allowed>
           <on_target_delete>DEL_MANUAL</on_target_delete>
-	  <allow_target_creation>false</allow_target_creation>
+          <allow_target_creation>false</allow_target_creation>
         </field>
         <field id="service_name" xsi:type="AttributeExternalField">
           <extkey_attcode>service_id</extkey_attcode>
@@ -72,7 +72,7 @@
           <target_class>ServiceSubcategory</target_class>
           <is_null_allowed>true</is_null_allowed>
           <on_target_delete>DEL_MANUAL</on_target_delete>
-	  <allow_target_creation>false</allow_target_creation>
+          <allow_target_creation>false</allow_target_creation>
         </field>
         <field id="servicesubcategory_name" xsi:type="AttributeExternalField">
           <extkey_attcode>servicesubcategory_id</extkey_attcode>
@@ -85,9 +85,9 @@
         </field>
         <field id="impact" xsi:type="AttributeEnum">
           <values>
-            <value>1</value>
-            <value>2</value>
-            <value>3</value>
+            <value id="1">1</value>
+            <value id="2">2</value>
+            <value id="3">3</value>
           </values>
           <sql>impact</sql>
           <default_value>1</default_value>
@@ -96,10 +96,10 @@
         </field>
         <field id="urgency" xsi:type="AttributeEnum">
           <values>
-            <value>1</value>
-            <value>2</value>
-            <value>3</value>
-            <value>4</value>
+            <value id="1">1</value>
+            <value id="2">2</value>
+            <value id="3">3</value>
+            <value id="4">4</value>
           </values>
           <sql>urgency</sql>
           <default_value>1</default_value>
@@ -108,10 +108,10 @@
         </field>
         <field id="priority" xsi:type="AttributeEnum">
           <values>
-            <value>1</value>
-            <value>2</value>
-            <value>3</value>
-            <value>4</value>
+            <value id="1">1</value>
+            <value id="2">2</value>
+            <value id="3">3</value>
+            <value id="4">4</value>
           </values>
           <sql>priority</sql>
           <default_value>1</default_value>
@@ -219,7 +219,6 @@
             </flags>
             <transitions>
               <transition id="ev_assign">
-                <stimulus>ev_assign</stimulus>
                 <target>assigned</target>
                 <actions>
                   <action>
@@ -230,13 +229,9 @@
             </transitions>
           </state>
           <state id="assigned">
+            <inherit_flags_from>new</inherit_flags_from>
             <flags>
-              <attribute id="ref">
-                <read_only/>
-              </attribute>
-              <attribute id="org_id">
-                <normal/>
-              </attribute>
+              <attribute id="title"/>
               <attribute id="team_id">
                 <mandatory/>
                 <must_prompt/>
@@ -245,39 +240,22 @@
                 <mandatory/>
                 <must_prompt/>
               </attribute>
-              <attribute id="title">
-                <normal/>
-              </attribute>
-              <attribute id="description">
-                <normal/>
-              </attribute>
-              <attribute id="start_date">
-                <read_only/>
-              </attribute>
-              <attribute id="last_update">
-                <read_only/>
-              </attribute>
-              <attribute id="close_date">
-                <hidden/>
-              </attribute>
-              <attribute id="priority">
-                <read_only/>
-              </attribute>
               <attribute id="assignment_date">
                 <read_only/>
               </attribute>
-              <attribute id="resolution_date">
-                <hidden/>
-              </attribute>
+              <attribute id="service_id"/>
+              <attribute id="servicesubcategory_id"/>
+              <attribute id="product"/>
+              <attribute id="impact"/>
+              <attribute id="urgency"/>
+              <attribute id="related_change_id"/>
             </flags>
             <transitions>
               <transition id="ev_reassign">
-                <stimulus>ev_reassign</stimulus>
                 <target>assigned</target>
                 <actions/>
               </transition>
               <transition id="ev_resolve">
-                <stimulus>ev_resolve</stimulus>
                 <target>resolved</target>
                 <actions>
                   <action>
@@ -288,37 +266,11 @@
             </transitions>
           </state>
           <state id="resolved">
+            <inherit_flags_from>assigned</inherit_flags_from>
             <flags>
-              <attribute id="ref">
-                <read_only/>
-              </attribute>
-              <attribute id="org_id">
-                <read_only/>
-              </attribute>
-              <attribute id="team_id">
-                <read_only/>
-              </attribute>
-              <attribute id="agent_id">
-                <read_only/>
-              </attribute>
               <attribute id="caller_id">
                 <read_only/>
               </attribute>
-              <attribute id="title">
-                <read_only/>
-              </attribute>
-              <attribute id="description">
-                <read_only/>
-              </attribute>
-              <attribute id="start_date">
-                <read_only/>
-              </attribute>
-              <attribute id="last_update">
-                <read_only/>
-              </attribute>
-              <attribute id="close_date">
-                <hidden/>
-              </attribute>
               <attribute id="service_id">
                 <mandatory/>
               </attribute>
@@ -334,24 +286,28 @@
               <attribute id="urgency">
                 <read_only/>
               </attribute>
-              <attribute id="priority">
+              <attribute id="org_id">
                 <read_only/>
               </attribute>
-              <attribute id="assignment_date">
+              <attribute id="team_id">
                 <read_only/>
               </attribute>
-              <attribute id="resolution_date">
-                <hidden/>
+              <attribute id="agent_id">
+                <read_only/>
+              </attribute>
+              <attribute id="title">
+                <read_only/>
+              </attribute>
+              <attribute id="description">
+                <read_only/>
               </attribute>
             </flags>
             <transitions>
               <transition id="ev_reassign">
-                <stimulus>ev_reassign</stimulus>
                 <target>assigned</target>
                 <actions/>
               </transition>
               <transition id="ev_close">
-                <stimulus>ev_close</stimulus>
                 <target>closed</target>
                 <actions>
                   <action>
@@ -362,40 +318,17 @@
             </transitions>
           </state>
           <state id="closed">
+            <inherit_flags_from>resolved</inherit_flags_from>
             <flags>
-              <attribute id="ref">
-                <read_only/>
-              </attribute>
-              <attribute id="org_id">
-                <read_only/>
-              </attribute>
-              <attribute id="team_id">
-                <read_only/>
-              </attribute>
-              <attribute id="agent_id">
-                <read_only/>
-              </attribute>
-              <attribute id="caller_id">
-                <read_only/>
-              </attribute>
-              <attribute id="title">
-                <read_only/>
-              </attribute>
-              <attribute id="description">
-                <read_only/>
-              </attribute>
-              <attribute id="start_date">
+              <attribute id="private_log">
                 <read_only/>
               </attribute>
-              <attribute id="last_update">
+              <attribute id="related_change_id">
                 <read_only/>
               </attribute>
               <attribute id="close_date">
                 <read_only/>
               </attribute>
-              <attribute id="private_log">
-                <read_only/>
-              </attribute>
               <attribute id="service_id">
                 <read_only/>
               </attribute>
@@ -405,24 +338,6 @@
               <attribute id="product">
                 <read_only/>
               </attribute>
-              <attribute id="impact">
-                <read_only/>
-              </attribute>
-              <attribute id="urgency">
-                <read_only/>
-              </attribute>
-              <attribute id="priority">
-                <read_only/>
-              </attribute>
-              <attribute id="assignment_date">
-                <read_only/>
-              </attribute>
-              <attribute id="resolution_date">
-                <hidden/>
-              </attribute>
-              <attribute id="related_change_id">
-                <read_only/>
-              </attribute>
             </flags>
             <transitions/>
           </state>

datamodels/2.x/itop-profiles-itil/datamodel.itop-profiles-itil.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1">
   <classes/>
   <user_rights>
     <groups>
@@ -71,7 +71,7 @@
         <classes>
           <class id="KnownError"/>
           <class id="FAQ"/>
-         <class id="FAQCategory"/>
+          <class id="FAQCategory"/>
         </classes>
       </group>
       <group id="Ticketing" _delta="define">
@@ -104,29 +104,29 @@
         <groups>
           <group id="General">
             <actions>
-              <action xsi:type="write">allow</action>
-              <action xsi:type="bulk write">allow</action>
-              <action xsi:type="delete">allow</action>
+              <action id="action:write">allow</action>
+              <action id="action:bulk write">allow</action>
+              <action id="action:delete">allow</action>
             </actions>
           </group>
           <group id="Documentation">
             <actions>
-              <action xsi:type="write">allow</action>
-              <action xsi:type="bulk write">allow</action>
-              <action xsi:type="delete">allow</action>
+              <action id="action:write">allow</action>
+              <action id="action:bulk write">allow</action>
+              <action id="action:delete">allow</action>
             </actions>
           </group>
           <group id="Configuration">
             <actions>
-              <action xsi:type="write">allow</action>
-              <action xsi:type="bulk write">allow</action>
-              <action xsi:type="delete">allow</action>
+              <action id="action:write">allow</action>
+              <action id="action:bulk write">allow</action>
+              <action id="action:delete">allow</action>
             </actions>
           </group>
           <group id="*">
             <actions>
-              <action xsi:type="read">allow</action>
-              <action xsi:type="bulk read">allow</action>
+              <action id="action:read">allow</action>
+              <action id="action:bulk read">allow</action>
             </actions>
           </group>
         </groups>
@@ -137,30 +137,30 @@
         <groups>
           <group id="Ticketing">
             <actions>
-              <action xsi:type="delete">allow</action>
-              <action xsi:type="write">allow</action>
-              <action xsi:type="bulk write">allow</action>
-              <action id="ev_close" xsi:type="stimulus">allow</action>
+              <action id="action:delete">allow</action>
+              <action id="action:write">allow</action>
+              <action id="action:bulk write">allow</action>
+              <action id="stimulus:ev_close">allow</action>
             </actions>
           </group>
           <group id="Incident">
             <actions>
-              <action xsi:type="write">allow</action>
-              <action xsi:type="bulk write">allow</action>
-              <action id="ev_assign" xsi:type="stimulus">allow</action>
+              <action id="action:write">allow</action>
+              <action id="action:bulk write">allow</action>
+              <action id="stimulus:ev_assign">allow</action>
             </actions>
           </group>
           <group id="UserRequest">
             <actions>
-              <action xsi:type="write">allow</action>
-              <action xsi:type="bulk write">allow</action>
-              <action id="ev_assign" xsi:type="stimulus">allow</action>
+              <action id="action:write">allow</action>
+              <action id="action:bulk write">allow</action>
+              <action id="stimulus:ev_assign">allow</action>
             </actions>
           </group>
           <group id="*">
             <actions>
-              <action xsi:type="read">allow</action>
-              <action xsi:type="bulk read">allow</action>
+              <action id="action:read">allow</action>
+              <action id="action:bulk read">allow</action>
             </actions>
           </group>
         </groups>
@@ -171,39 +171,39 @@
         <groups>
           <group id="Ticketing">
             <actions>
-              <action xsi:type="delete">allow</action>
-              <action xsi:type="write">allow</action>
-              <action xsi:type="bulk write">allow</action>
-              <action id="ev_close" xsi:type="stimulus">allow</action>
+              <action id="action:delete">allow</action>
+              <action id="action:write">allow</action>
+              <action id="action:bulk write">allow</action>
+              <action id="stimulus:ev_close">allow</action>
             </actions>
           </group>
           <group id="Incident">
             <actions>
-              <action xsi:type="write">allow</action>
-              <action xsi:type="bulk write">allow</action>
-              <action id="ev_assign" xsi:type="stimulus">allow</action>
-              <action id="ev_reassign" xsi:type="stimulus">allow</action>
-              <action id="ev_resolve" xsi:type="stimulus">allow</action>
-              <action id="ev_close" xsi:type="stimulus">allow</action>
-              <action id="ev_pending" xsi:type="stimulus">allow</action>
+              <action id="action:write">allow</action>
+              <action id="action:bulk write">allow</action>
+              <action id="stimulus:ev_assign">allow</action>
+              <action id="stimulus:ev_reassign">allow</action>
+              <action id="stimulus:ev_resolve">allow</action>
+              <action id="stimulus:ev_close">allow</action>
+              <action id="stimulus:ev_pending">allow</action>
             </actions>
           </group>
           <group id="UserRequest">
             <actions>
-              <action xsi:type="write">allow</action>
-              <action xsi:type="bulk write">allow</action>
-              <action id="ev_assign" xsi:type="stimulus">allow</action>
-              <action id="ev_reassign" xsi:type="stimulus">allow</action>
-              <action id="ev_resolve" xsi:type="stimulus">allow</action>
-              <action id="ev_close" xsi:type="stimulus">allow</action>
-              <action id="ev_pending" xsi:type="stimulus">allow</action>
-              <action id="ev_wait_for_approval" xsi:type="stimulus">allow</action>
+              <action id="action:write">allow</action>
+              <action id="action:bulk write">allow</action>
+              <action id="stimulus:ev_assign">allow</action>
+              <action id="stimulus:ev_reassign">allow</action>
+              <action id="stimulus:ev_resolve">allow</action>
+              <action id="stimulus:ev_close">allow</action>
+              <action id="stimulus:ev_pending">allow</action>
+              <action id="stimulus:ev_wait_for_approval">allow</action>
             </actions>
           </group>
           <group id="*">
             <actions>
-              <action xsi:type="read">allow</action>
-              <action xsi:type="bulk read">allow</action>
+              <action id="action:read">allow</action>
+              <action id="action:bulk read">allow</action>
             </actions>
           </group>
         </groups>
@@ -214,33 +214,33 @@
         <groups>
           <group id="KnownError">
             <actions>
-              <action xsi:type="write">allow</action>
-              <action xsi:type="bulk write">allow</action>
-              <action xsi:type="delete">allow</action>
+              <action id="action:write">allow</action>
+              <action id="action:bulk write">allow</action>
+              <action id="action:delete">allow</action>
             </actions>
           </group>
           <group id="Ticketing">
             <actions>
-              <action xsi:type="delete">allow</action>
-              <action xsi:type="write">allow</action>
-              <action xsi:type="bulk write">allow</action>
-              <action id="ev_close" xsi:type="stimulus">allow</action>
+              <action id="action:delete">allow</action>
+              <action id="action:write">allow</action>
+              <action id="action:bulk write">allow</action>
+              <action id="stimulus:ev_close">allow</action>
             </actions>
           </group>
           <group id="Problem">
             <actions>
-              <action xsi:type="write">allow</action>
-              <action xsi:type="bulk write">allow</action>
-              <action id="ev_assign" xsi:type="stimulus">allow</action>
-              <action id="ev_reassign" xsi:type="stimulus">allow</action>
-              <action id="ev_resolve" xsi:type="stimulus">allow</action>
-              <action id="ev_close" xsi:type="stimulus">allow</action>
+              <action id="action:write">allow</action>
+              <action id="action:bulk write">allow</action>
+              <action id="stimulus:ev_assign">allow</action>
+              <action id="stimulus:ev_reassign">allow</action>
+              <action id="stimulus:ev_resolve">allow</action>
+              <action id="stimulus:ev_close">allow</action>
             </actions>
           </group>
           <group id="*">
             <actions>
-              <action xsi:type="read">allow</action>
-              <action xsi:type="bulk read">allow</action>
+              <action id="action:read">allow</action>
+              <action id="action:bulk read">allow</action>
             </actions>
           </group>
         </groups>
@@ -251,50 +251,50 @@
         <groups>
           <group id="Change">
             <actions>
-              <action xsi:type="write">allow</action>
-              <action xsi:type="bulk write">allow</action>
-              <action id="ev_assign" xsi:type="stimulus">allow</action>
-              <action id="ev_plan" xsi:type="stimulus">allow</action>
-              <action id="ev_reopen" xsi:type="stimulus">allow</action>
-              <action id="ev_finish" xsi:type="stimulus">allow</action>
+              <action id="action:write">allow</action>
+              <action id="action:bulk write">allow</action>
+              <action id="stimulus:ev_assign">allow</action>
+              <action id="stimulus:ev_plan">allow</action>
+              <action id="stimulus:ev_reopen">allow</action>
+              <action id="stimulus:ev_finish">allow</action>
             </actions>
           </group>
           <group id="Ticketing">
             <actions>
-              <action xsi:type="delete">allow</action>
-              <action xsi:type="write">allow</action>
-              <action xsi:type="bulk write">allow</action>
-              <action id="ev_close" xsi:type="stimulus">allow</action>
+              <action id="action:delete">allow</action>
+              <action id="action:write">allow</action>
+              <action id="action:bulk write">allow</action>
+              <action id="stimulus:ev_close">allow</action>
             </actions>
           </group>
           <group id="NormalChange">
             <actions>
-              <action id="ev_plan" xsi:type="stimulus">allow</action>
-              <action id="ev_replan" xsi:type="stimulus">allow</action>
-              <action id="ev_implement" xsi:type="stimulus">allow</action>
-              <action id="ev_monitor" xsi:type="stimulus">allow</action>
+              <action id="stimulus:ev_plan">allow</action>
+              <action id="stimulus:ev_replan">allow</action>
+              <action id="stimulus:ev_implement">allow</action>
+              <action id="stimulus:ev_monitor">allow</action>
             </actions>
           </group>
           <group id="EmergencyChange">
             <actions>
-              <action id="ev_plan" xsi:type="stimulus">allow</action>
-              <action id="ev_replan" xsi:type="stimulus">allow</action>
-              <action id="ev_implement" xsi:type="stimulus">allow</action>
-              <action id="ev_monitor" xsi:type="stimulus">allow</action>
+              <action id="stimulus:ev_plan">allow</action>
+              <action id="stimulus:ev_replan">allow</action>
+              <action id="stimulus:ev_implement">allow</action>
+              <action id="stimulus:ev_monitor">allow</action>
             </actions>
           </group>
           <group id="RoutineChange">
             <actions>
-              <action id="ev_plan" xsi:type="stimulus">allow</action>
-              <action id="ev_replan" xsi:type="stimulus">allow</action>
-              <action id="ev_implement" xsi:type="stimulus">allow</action>
-              <action id="ev_monitor" xsi:type="stimulus">allow</action>
+              <action id="stimulus:ev_plan">allow</action>
+              <action id="stimulus:ev_replan">allow</action>
+              <action id="stimulus:ev_implement">allow</action>
+              <action id="stimulus:ev_monitor">allow</action>
             </actions>
           </group>
           <group id="*">
             <actions>
-              <action xsi:type="read">allow</action>
-              <action xsi:type="bulk read">allow</action>
+              <action id="action:read">allow</action>
+              <action id="action:bulk read">allow</action>
             </actions>
           </group>
         </groups>
@@ -305,48 +305,48 @@
         <groups>
           <group id="Change">
             <actions>
-              <action xsi:type="write">allow</action>
-              <action xsi:type="bulk write">allow</action>
-              <action id="ev_assign" xsi:type="stimulus">allow</action>
-              <action id="ev_reopen" xsi:type="stimulus">allow</action>
-              <action id="ev_finish" xsi:type="stimulus">allow</action>
+              <action id="action:write">allow</action>
+              <action id="action:bulk write">allow</action>
+              <action id="stimulus:ev_assign">allow</action>
+              <action id="stimulus:ev_reopen">allow</action>
+              <action id="stimulus:ev_finish">allow</action>
             </actions>
           </group>
           <group id="Ticketing">
             <actions>
-              <action xsi:type="delete">allow</action>
-              <action xsi:type="write">allow</action>
-              <action xsi:type="bulk write">allow</action>
-              <action id="ev_close" xsi:type="stimulus">allow</action>
+              <action id="action:delete">allow</action>
+              <action id="action:write">allow</action>
+              <action id="action:bulk write">allow</action>
+              <action id="stimulus:ev_close">allow</action>
             </actions>
           </group>
           <group id="NormalChange">
             <actions>
-              <action id="ev_validate" xsi:type="stimulus">allow</action>
-              <action id="ev_reject" xsi:type="stimulus">allow</action>
-              <action id="ev_assign" xsi:type="stimulus">allow</action>
-              <action id="ev_reopen" xsi:type="stimulus">allow</action>
-              <action id="ev_finish" xsi:type="stimulus">allow</action>
+              <action id="stimulus:ev_validate">allow</action>
+              <action id="stimulus:ev_reject">allow</action>
+              <action id="stimulus:ev_assign">allow</action>
+              <action id="stimulus:ev_reopen">allow</action>
+              <action id="stimulus:ev_finish">allow</action>
             </actions>
           </group>
           <group id="EmergencyChange">
             <actions>
-              <action id="ev_assign" xsi:type="stimulus">allow</action>
-              <action id="ev_reopen" xsi:type="stimulus">allow</action>
-              <action id="ev_finish" xsi:type="stimulus">allow</action>
+              <action id="stimulus:ev_assign">allow</action>
+              <action id="stimulus:ev_reopen">allow</action>
+              <action id="stimulus:ev_finish">allow</action>
             </actions>
           </group>
           <group id="RoutineChange">
             <actions>
-              <action id="ev_assign" xsi:type="stimulus">allow</action>
-              <action id="ev_reopen" xsi:type="stimulus">allow</action>
-              <action id="ev_finish" xsi:type="stimulus">allow</action>
+              <action id="stimulus:ev_assign">allow</action>
+              <action id="stimulus:ev_reopen">allow</action>
+              <action id="stimulus:ev_finish">allow</action>
             </actions>
           </group>
           <group id="*">
             <actions>
-              <action xsi:type="read">allow</action>
-              <action xsi:type="bulk read">allow</action>
+              <action id="action:read">allow</action>
+              <action id="action:bulk read">allow</action>
             </actions>
           </group>
         </groups>
@@ -357,30 +357,30 @@
         <groups>
           <group id="Change">
             <actions>
-              <action xsi:type="write">allow</action>
-              <action xsi:type="bulk write">allow</action>
-              <action id="ev_approve" xsi:type="stimulus">allow</action>
-              <action id="ev_reject" xsi:type="stimulus">allow</action>
+              <action id="action:write">allow</action>
+              <action id="action:bulk write">allow</action>
+              <action id="stimulus:ev_approve">allow</action>
+              <action id="stimulus:ev_reject">allow</action>
             </actions>
           </group>
           <group id="Ticketing">
             <actions>
-              <action xsi:type="delete">allow</action>
-              <action xsi:type="write">allow</action>
-              <action xsi:type="bulk write">allow</action>
-              <action id="ev_close" xsi:type="stimulus">allow</action>
+              <action id="action:delete">allow</action>
+              <action id="action:write">allow</action>
+              <action id="action:bulk write">allow</action>
+              <action id="stimulus:ev_close">allow</action>
             </actions>
           </group>
           <group id="NormalChange">
             <actions>
-              <action id="ev_approve" xsi:type="stimulus">allow</action>
-              <action id="ev_notapprove" xsi:type="stimulus">allow</action>
+              <action id="stimulus:ev_approve">allow</action>
+              <action id="stimulus:ev_notapprove">allow</action>
             </actions>
           </group>
           <group id="EmergencyChange">
             <actions>
-              <action id="ev_approve" xsi:type="stimulus">allow</action>
-              <action id="ev_notapprove" xsi:type="stimulus">allow</action>
+              <action id="stimulus:ev_approve">allow</action>
+              <action id="stimulus:ev_notapprove">allow</action>
             </actions>
           </group>
           <group id="RoutineChange">
@@ -388,8 +388,8 @@
           </group>
           <group id="*">
             <actions>
-              <action xsi:type="read">allow</action>
-              <action xsi:type="bulk read">allow</action>
+              <action id="action:read">allow</action>
+              <action id="action:bulk read">allow</action>
             </actions>
           </group>
         </groups>
@@ -400,15 +400,15 @@
         <groups>
           <group id="Service">
             <actions>
-              <action xsi:type="write">allow</action>
-              <action xsi:type="bulk write">allow</action>
-              <action xsi:type="delete">allow</action>
+              <action id="action:write">allow</action>
+              <action id="action:bulk write">allow</action>
+              <action id="action:delete">allow</action>
             </actions>
           </group>
           <group id="*">
             <actions>
-              <action xsi:type="read">allow</action>
-              <action xsi:type="bulk read">allow</action>
+              <action id="action:read">allow</action>
+              <action id="action:bulk read">allow</action>
             </actions>
           </group>
         </groups>
@@ -419,15 +419,15 @@
         <groups>
           <group id="Documentation">
             <actions>
-              <action xsi:type="write">allow</action>
-              <action xsi:type="bulk write">allow</action>
-              <action xsi:type="delete">allow</action>
+              <action id="action:write">allow</action>
+              <action id="action:bulk write">allow</action>
+              <action id="action:delete">allow</action>
             </actions>
           </group>
           <group id="*">
             <actions>
-              <action xsi:type="read">allow</action>
-              <action xsi:type="bulk read">allow</action>
+              <action id="action:read">allow</action>
+              <action id="action:bulk read">allow</action>
             </actions>
           </group>
         </groups>
@@ -438,15 +438,15 @@
         <groups>
           <group id="UserRequest">
             <actions>
-              <action xsi:type="write">allow</action>
-              <action id="ev_close" xsi:type="stimulus">allow</action>
-              <action id="ev_reopen" xsi:type="stimulus">allow</action>
+              <action id="action:write">allow</action>
+              <action id="stimulus:ev_close">allow</action>
+              <action id="stimulus:ev_reopen">allow</action>
             </actions>
           </group>
           <group id="*">
             <actions>
-              <action xsi:type="read">allow</action>
-              <action xsi:type="bulk read">allow</action>
+              <action id="action:read">allow</action>
+              <action id="action:bulk read">allow</action>
             </actions>
           </group>
         </groups>

datamodels/2.x/itop-service-mgmt-provider/datamodel.itop-service-mgmt-provider.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1">
   <classes>
     <class id="Organization">
       <fields>
@@ -18,7 +18,7 @@
       <presentation>
         <details>
           <items>
-            <item id="deliverymodel_id"  _delta="define">
+            <item id="deliverymodel_id" _delta="define">
               <rank>50</rank>
             </item>
           </items>
@@ -26,7 +26,7 @@
       </presentation>
     </class>
     <class id="Ticket">
-      <fields>     
+      <fields>
         <field id="team_id" xsi:type="AttributeExternalKey" _delta="redefine">
           <filter><![CDATA[SELECT Team AS t JOIN lnkDeliveryModelToContact AS l1 ON l1.contact_id=t.id JOIN DeliveryModel AS dm ON l1.deliverymodel_id=dm.id JOIN Organization AS o ON o.deliverymodel_id=dm.id WHERE o.id = :this->org_id]]></filter>
           <dependencies>
@@ -36,7 +36,7 @@
           <target_class>Team</target_class>
           <is_null_allowed>true</is_null_allowed>
           <on_target_delete>DEL_AUTO</on_target_delete>
-	  <allow_target_creation>false</allow_target_creation>
+          <allow_target_creation>false</allow_target_creation>
         </field>
       </fields>
     </class>
@@ -123,8 +123,8 @@
         </field>
         <field id="cost_currency" xsi:type="AttributeEnum">
           <values>
-            <value>dollars</value>
-            <value>euros</value>
+            <value id="dollars">dollars</value>
+            <value id="euros">euros</value>
           </values>
           <sql>cost_currency</sql>
           <default_value/>
@@ -163,9 +163,9 @@
         </field>
         <field id="status" xsi:type="AttributeEnum">
           <values>
-            <value>production</value>
-            <value>implementation</value>
-            <value>obsolete</value>
+            <value id="production">production</value>
+            <value id="implementation">implementation</value>
+            <value id="obsolete">obsolete</value>
           </values>
           <sql>status</sql>
           <default_value/>
@@ -1069,9 +1069,9 @@
         </field>
         <field id="status" xsi:type="AttributeEnum">
           <values>
-            <value>production</value>
-            <value>implementation</value>
-            <value>obsolete</value>
+            <value id="production">production</value>
+            <value id="implementation">implementation</value>
+            <value id="obsolete">obsolete</value>
           </values>
           <sql>status</sql>
           <default_value/>
@@ -1383,8 +1383,8 @@
         </field>
         <field id="request_type" xsi:type="AttributeEnum">
           <values>
-            <value>incident</value>
-            <value>service_request</value>
+            <value id="incident">incident</value>
+            <value id="service_request">service_request</value>
           </values>
           <sql>request_type</sql>
           <default_value>incident</default_value>
@@ -1393,9 +1393,9 @@
         </field>
         <field id="status" xsi:type="AttributeEnum">
           <values>
-            <value>production</value>
-            <value>implementation</value>
-            <value>obsolete</value>
+            <value id="production">production</value>
+            <value id="implementation">implementation</value>
+            <value id="obsolete">obsolete</value>
           </values>
           <sql>status</sql>
           <default_value/>
@@ -1610,10 +1610,10 @@
         </field>
         <field id="priority" xsi:type="AttributeEnum">
           <values>
-            <value>1</value>
-            <value>2</value>
-            <value>3</value>
-            <value>4</value>
+            <value id="1">1</value>
+            <value id="2">2</value>
+            <value id="3">3</value>
+            <value id="4">4</value>
           </values>
           <sql>priority</sql>
           <default_value/>
@@ -1622,8 +1622,8 @@
         </field>
         <field id="request_type" xsi:type="AttributeEnum">
           <values>
-            <value>service_request</value>
-            <value>incident</value>
+            <value id="service_request">service_request</value>
+            <value id="incident">incident</value>
           </values>
           <sql>request_type</sql>
           <default_value/>
@@ -1632,8 +1632,8 @@
         </field>
         <field id="metric" xsi:type="AttributeEnum">
           <values>
-            <value>tto</value>
-            <value>ttr</value>
+            <value id="tto">tto</value>
+            <value id="ttr">ttr</value>
           </values>
           <sql>metric</sql>
           <default_value/>
@@ -1647,8 +1647,8 @@
         </field>
         <field id="unit" xsi:type="AttributeEnum">
           <values>
-            <value>hours</value>
-            <value>minutes</value>
+            <value id="hours">hours</value>
+            <value id="minutes">minutes</value>
           </values>
           <sql>unit</sql>
           <default_value/>

datamodels/2.x/itop-service-mgmt/datamodel.itop-service-mgmt.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1">
   <classes>
     <class id="Organization">
       <fields>
@@ -18,7 +18,7 @@
       <presentation>
         <details>
           <items>
-            <item id="deliverymodel_id"  _delta="define">
+            <item id="deliverymodel_id" _delta="define">
               <rank>50</rank>
             </item>
           </items>
@@ -26,7 +26,7 @@
       </presentation>
     </class>
     <class id="Ticket">
-      <fields>     
+      <fields>
         <field id="team_id" xsi:type="AttributeExternalKey" _delta="redefine">
           <filter><![CDATA[SELECT Team AS t JOIN lnkDeliveryModelToContact AS l1 ON l1.contact_id=t.id JOIN DeliveryModel AS dm ON l1.deliverymodel_id=dm.id JOIN Organization AS o ON o.deliverymodel_id=dm.id WHERE o.id = :this->org_id]]></filter>
           <dependencies>
@@ -36,7 +36,7 @@
           <target_class>Team</target_class>
           <is_null_allowed>true</is_null_allowed>
           <on_target_delete>DEL_AUTO</on_target_delete>
-	  <allow_target_creation>false</allow_target_creation>
+          <allow_target_creation>false</allow_target_creation>
         </field>
       </fields>
     </class>
@@ -123,8 +123,8 @@
         </field>
         <field id="cost_currency" xsi:type="AttributeEnum">
           <values>
-            <value>dollars</value>
-            <value>euros</value>
+            <value id="dollars">dollars</value>
+            <value id="euros">euros</value>
           </values>
           <sql>cost_currency</sql>
           <default_value/>
@@ -163,9 +163,9 @@
         </field>
         <field id="status" xsi:type="AttributeEnum">
           <values>
-            <value>production</value>
-            <value>implementation</value>
-            <value>obsolete</value>
+            <value id="production">production</value>
+            <value id="implementation">implementation</value>
+            <value id="obsolete">obsolete</value>
           </values>
           <sql>status</sql>
           <default_value/>
@@ -1042,9 +1042,9 @@
         </field>
         <field id="status" xsi:type="AttributeEnum">
           <values>
-            <value>production</value>
-            <value>implementation</value>
-            <value>obsolete</value>
+            <value id="production">production</value>
+            <value id="implementation">implementation</value>
+            <value id="obsolete">obsolete</value>
           </values>
           <sql>status</sql>
           <default_value/>
@@ -1378,8 +1378,8 @@
         </field>
         <field id="request_type" xsi:type="AttributeEnum">
           <values>
-            <value>incident</value>
-            <value>service_request</value>
+            <value id="incident">incident</value>
+            <value id="service_request">service_request</value>
           </values>
           <sql>request_type</sql>
           <default_value>incident</default_value>
@@ -1388,9 +1388,9 @@
         </field>
         <field id="status" xsi:type="AttributeEnum">
           <values>
-            <value>production</value>
-            <value>implementation</value>
-            <value>obsolete</value>
+            <value id="production">production</value>
+            <value id="implementation">implementation</value>
+            <value id="obsolete">obsolete</value>
           </values>
           <sql>status</sql>
           <default_value/>
@@ -1605,10 +1605,10 @@
         </field>
         <field id="priority" xsi:type="AttributeEnum">
           <values>
-            <value>1</value>
-            <value>2</value>
-            <value>3</value>
-            <value>4</value>
+            <value id="1">1</value>
+            <value id="2">2</value>
+            <value id="3">3</value>
+            <value id="4">4</value>
           </values>
           <sql>priority</sql>
           <default_value/>
@@ -1617,8 +1617,8 @@
         </field>
         <field id="request_type" xsi:type="AttributeEnum">
           <values>
-            <value>service_request</value>
-            <value>incident</value>
+            <value id="service_request">service_request</value>
+            <value id="incident">incident</value>
           </values>
           <sql>request_type</sql>
           <default_value/>
@@ -1627,8 +1627,8 @@
         </field>
         <field id="metric" xsi:type="AttributeEnum">
           <values>
-            <value>tto</value>
-            <value>ttr</value>
+            <value id="tto">tto</value>
+            <value id="ttr">ttr</value>
           </values>
           <sql>metric</sql>
           <default_value/>
@@ -1642,8 +1642,8 @@
         </field>
         <field id="unit" xsi:type="AttributeEnum">
           <values>
-            <value>hours</value>
-            <value>minutes</value>
+            <value id="hours">hours</value>
+            <value id="minutes">minutes</value>
           </values>
           <sql>unit</sql>
           <default_value/>

datamodels/2.x/itop-storage-mgmt/datamodel.itop-storage-mgmt.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1">
   <classes>
     <class id="StorageSystem" _delta="define">
       <parent>DatacenterDevice</parent>
@@ -1757,48 +1757,47 @@
         </list>
       </presentation>
     </class>
-</classes>
-<menus>
+  </classes>
+  <menus>
     <menu id="ConfigManagementOverview" xsi:type="DashboardMenuNode" _delta="must_exist">
       <rank>1</rank>
       <parent>ConfigManagement</parent>
       <definition>
-  <layout>DashboardLayoutOneCol</layout>
-  <title></title>
-  <cells>
-    <cell id="0" _delta="must_exist">
-      <rank>0</rank>
-      <dashlets>
-        <dashlet id="33" xsi:type="DashletBadge" _delta="define">
-          <rank>5</rank>
-          <class>StorageSystem</class>
-        </dashlet>
-        <dashlet id="34" xsi:type="DashletBadge" _delta="define">
-          <rank>6</rank>
-          <class>SANSwitch</class>
-        </dashlet>
-        <dashlet id="35" xsi:type="DashletBadge" _delta="define">
-          <rank>7</rank>
-          <class>NAS</class>
-        </dashlet>
-        <dashlet id="36" xsi:type="DashletBadge" _delta="define">
-          <rank>8</rank>
-          <class>TapeLibrary</class>
-        </dashlet>
-      </dashlets>
-    </cell>
-    <cell id="4" _delta="must_exist">
-      <rank>4</rank>
-      <dashlets>
-        <dashlet id="37" xsi:type="DashletBadge" _delta="define">
-          <rank>3</rank>
-          <class>LogicalVolume</class>
-        </dashlet>
-      </dashlets>
-    </cell>
-
-    </cells>
-    </definition>
+        <layout>DashboardLayoutOneCol</layout>
+        <title/>
+        <cells>
+          <cell id="0" _delta="must_exist">
+            <rank>0</rank>
+            <dashlets>
+              <dashlet id="33" xsi:type="DashletBadge" _delta="define">
+                <rank>5</rank>
+                <class>StorageSystem</class>
+              </dashlet>
+              <dashlet id="34" xsi:type="DashletBadge" _delta="define">
+                <rank>6</rank>
+                <class>SANSwitch</class>
+              </dashlet>
+              <dashlet id="35" xsi:type="DashletBadge" _delta="define">
+                <rank>7</rank>
+                <class>NAS</class>
+              </dashlet>
+              <dashlet id="36" xsi:type="DashletBadge" _delta="define">
+                <rank>8</rank>
+                <class>TapeLibrary</class>
+              </dashlet>
+            </dashlets>
+          </cell>
+          <cell id="4" _delta="must_exist">
+            <rank>4</rank>
+            <dashlets>
+              <dashlet id="37" xsi:type="DashletBadge" _delta="define">
+                <rank>3</rank>
+                <class>LogicalVolume</class>
+              </dashlet>
+            </dashlets>
+          </cell>
+        </cells>
+      </definition>
     </menu>
- </menus>
+  </menus>
 </itop_design>

datamodels/2.x/itop-tickets/datamodel.itop-tickets.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1">
   <constants>
     <constant id="RESPONSE_TICKET_SLT_QUERY" xsi:type="string" _delta="define"><![CDATA[SELECT SLT AS slt JOIN lnkSLAToSLT AS l1 ON l1.slt_id=slt.id JOIN SLA AS sla ON l1.sla_id=sla.id JOIN lnkCustomerContractToService AS l2 ON l2.sla_id=sla.id JOIN CustomerContract AS sc ON l2.customercontract_id=sc.id WHERE slt.metric = :metric AND l2.service_id = :this->service_id AND sc.org_id = :this->org_id AND slt.request_type = :request_type AND slt.priority = :this->priority]]></constant>
     <constant id="PORTAL_POWER_USER_PROFILE" xsi:type="string" _delta="define"><![CDATA[Portal power user]]></constant>
@@ -93,7 +93,7 @@
           <target_class>Person</target_class>
           <is_null_allowed>true</is_null_allowed>
           <on_target_delete>DEL_AUTO</on_target_delete>
-	  <allow_target_creation>false</allow_target_creation>
+          <allow_target_creation>false</allow_target_creation>
         </field>
         <field id="agent_name" xsi:type="AttributeExternalField">
           <extkey_attcode>agent_id</extkey_attcode>
@@ -213,7 +213,7 @@
         }
         ]]></code>
         </method>
-       </methods>
+      </methods>
       <presentation>
         <details>
           <items>
@@ -545,8 +545,8 @@
         </field>
         <field id="status" xsi:type="AttributeEnum">
           <values>
-            <value>open</value>
-            <value>closed</value>
+            <value id="open">open</value>
+            <value id="closed">closed</value>
           </values>
           <sql>status</sql>
           <default_value>open</default_value>
@@ -588,7 +588,7 @@
           <target_class>Person</target_class>
           <is_null_allowed>true</is_null_allowed>
           <on_target_delete>DEL_MANUAL</on_target_delete>
-	  <allow_target_creation>false</allow_target_creation>
+          <allow_target_creation>false</allow_target_creation>
         </field>
         <field id="agent_email" xsi:type="AttributeExternalField">
           <extkey_attcode>agent_id</extkey_attcode>
@@ -620,7 +620,6 @@
             <flags/>
             <transitions>
               <transition id="ev_close">
-                <stimulus>ev_close</stimulus>
                 <target>closed</target>
                 <actions/>
               </transition>

datamodels/2.x/itop-virtualization-mgmt/datamodel.itop-virtualization-mgmt.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1">
   <classes>
     <class id="VirtualDevice" _delta="define">
       <parent>FunctionalCI</parent>
@@ -30,10 +30,10 @@
       <fields>
         <field id="status" xsi:type="AttributeEnum">
           <values>
-            <value>production</value>
-            <value>implementation</value>
-            <value>stock</value>
-            <value>obsolete</value>
+            <value id="production">production</value>
+            <value id="implementation">implementation</value>
+            <value id="stock">stock</value>
+            <value id="obsolete">obsolete</value>
           </values>
           <sql>status</sql>
           <default_value>production</default_value>
@@ -967,35 +967,35 @@
         </list>
       </presentation>
     </class>
-</classes>
-<menus>
-  <menu id="ConfigManagementOverview" xsi:type="DashboardMenuNode" _delta="must_exist">
-    <definition>
-      <cells>
-        <cell id="1" _delta="define">
-          <rank>1</rank>
-          <dashlets>
-            <dashlet id="38" xsi:type="DashletHeaderStatic">
-              <rank>0</rank>
-              <title>Menu:ConfigManagement:virtualization</title>
-              <icon>itop-virtualization-mgmt/images/hypervisor-sw.png</icon>
-            </dashlet>
-            <dashlet id="39" xsi:type="DashletBadge">
-              <rank>1</rank>
-              <class>Farm</class>
-            </dashlet>
-            <dashlet id="40" xsi:type="DashletBadge">
-              <rank>2</rank>
-              <class>Hypervisor</class>
-            </dashlet>
-            <dashlet id="41" xsi:type="DashletBadge">
-              <rank>3</rank>
-              <class>VirtualMachine</class>
-            </dashlet>
-          </dashlets>
-        </cell>
-      </cells>
-    </definition>
-  </menu>
-</menus>
+  </classes>
+  <menus>
+    <menu id="ConfigManagementOverview" xsi:type="DashboardMenuNode" _delta="must_exist">
+      <definition>
+        <cells>
+          <cell id="1" _delta="define">
+            <rank>1</rank>
+            <dashlets>
+              <dashlet id="38" xsi:type="DashletHeaderStatic">
+                <rank>0</rank>
+                <title>Menu:ConfigManagement:virtualization</title>
+                <icon>itop-virtualization-mgmt/images/hypervisor-sw.png</icon>
+              </dashlet>
+              <dashlet id="39" xsi:type="DashletBadge">
+                <rank>1</rank>
+                <class>Farm</class>
+              </dashlet>
+              <dashlet id="40" xsi:type="DashletBadge">
+                <rank>2</rank>
+                <class>Hypervisor</class>
+              </dashlet>
+              <dashlet id="41" xsi:type="DashletBadge">
+                <rank>3</rank>
+                <class>VirtualMachine</class>
+              </dashlet>
+            </dashlets>
+          </cell>
+        </cells>
+      </definition>
+    </menu>
+  </menus>
 </itop_design>

datamodels/2.x/itop-welcome-itil/datamodel.itop-welcome-itil.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0">
+<itop_design xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.1">
   <menus>
     <menu id="WelcomeMenu" xsi:type="MenuGroup" _delta="define">
       <rank>10</rank>
@@ -9,7 +9,7 @@
       <parent>WelcomeMenu</parent>
       <definition>
         <layout>DashboardLayoutOneCol</layout>
-        <title></title>
+        <title/>
         <cells>
           <cell id="0">
             <rank>0</rank>