From f101ec3dd619254371cdcaeafd18d10e470f6f6a Mon Sep 17 00:00:00 2001
From: Pavol Mederly <mederly@evolveum.com>
Date: Fri, 16 Apr 2021 12:56:27 +0200
Subject: [PATCH] Add "id" attribute to containers in XSD

This is to avoid schema warnings when displaying XML in schema-aware
editors, as well as to provide access to PCV ID via generated beans.
---
 .../xml/ns/public/common/common-core-3.xsd    | 290 ++++++++++++++----
 1 file changed, 232 insertions(+), 58 deletions(-)

diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
index 489c20ce081..9d5d6096f8e 100755
--- a/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
+++ b/infra/schema/src/main/resources/xml/ns/public/common/common-core-3.xsd
@@ -1299,6 +1299,7 @@
                 <!--</xsd:annotation>-->
             <!--</xsd:element>-->
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="TaskWorkManagementType">
@@ -1360,6 +1361,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <!-- Work buckets configurations -->
@@ -1427,6 +1429,7 @@
                 <!--</xsd:annotation>-->
             <!--</xsd:element>-->
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="WorkAllocationConfigurationType">
@@ -1510,6 +1513,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="AbstractWorkSegmentationType">
@@ -1545,6 +1549,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="NumericWorkSegmentationType">
@@ -1682,6 +1687,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="boundarySpecification" type="tns:BoundarySpecificationType" />
 
@@ -3202,6 +3208,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="TaskExecutionConstraintsType">
@@ -3276,6 +3283,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="TaskExecutionGroupConstraintType">  <!-- TODO type name -->
@@ -3314,6 +3322,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="StructuredTaskProgressType">
@@ -3362,6 +3371,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="structuredTaskProgress" type="tns:StructuredTaskProgressType" />
 
@@ -3410,6 +3420,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="taskPartProgress" type="tns:TaskPartProgressType" />
 
@@ -3441,6 +3452,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="outcomeKeyedCounter" type="tns:OutcomeKeyedCounterType" />
 
@@ -3519,6 +3531,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="operationStats" type="tns:OperationStatsType" />
 
@@ -4191,6 +4204,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="UriStack">
@@ -4308,6 +4322,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="WorkerTasksPerNodeConfigurationType">
@@ -4370,6 +4385,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="TaskPartitionsDefinitionType">
@@ -4464,6 +4480,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="TaskPartitionDefinitionType">
@@ -4577,6 +4594,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
      <xsd:simpleType name="ExecutionModeType">
@@ -5701,7 +5719,7 @@
             </xsd:appinfo>
         </xsd:annotation>
         <xsd:sequence>
-              <xsd:element name="metadata" type="tns:MetadataType" minOccurs="0">
+            <xsd:element name="metadata" type="tns:MetadataType" minOccurs="0">
                 <xsd:annotation>
                     <xsd:documentation>
                         Timestamps and general metadata describing the credential change.
@@ -5730,7 +5748,8 @@
                     </xsd:appinfo>
                 </xsd:annotation>
             </xsd:element>
-          </xsd:sequence>
+        </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="SecurityQuestionsCredentialsType">
@@ -6234,6 +6253,7 @@
                 </xsd:annotation>
             </xsd:element>
        </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="AssignmentRelationType">
@@ -6303,6 +6323,7 @@
             </xsd:element>
             <!-- TODO: orderConstraint -->
        </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="MappingsType">
@@ -6314,12 +6335,13 @@
                 <a:container/>
             </xsd:appinfo>
         </xsd:annotation>
-           <xsd:sequence>
-               <xsd:element ref="tns:description" minOccurs="0"/>
-               <xsd:element ref="tns:documentation" minOccurs="0"/>
-               <xsd:element name="mapping" type="tns:MappingType" minOccurs="0" maxOccurs="unbounded">
-                   </xsd:element>
-       </xsd:sequence>
+        <xsd:sequence>
+            <xsd:element ref="tns:description" minOccurs="0"/>
+            <xsd:element ref="tns:documentation" minOccurs="0"/>
+            <xsd:element name="mapping" type="tns:MappingType" minOccurs="0" maxOccurs="unbounded">
+            </xsd:element>
+        </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="ActivationType">
@@ -7014,6 +7036,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="XmlSchemaType">
@@ -7044,6 +7067,7 @@
             <xsd:element name="generationConstraints" type="tns:SchemaGenerationConstraintsType" minOccurs="0"/>
             <xsd:element name="definition" type="t:SchemaDefinitionType" minOccurs="0"/>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="schema" type="tns:XmlSchemaType"/>
 
@@ -7143,6 +7167,7 @@
             </xsd:annotation>
         </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="schemaHandling" type="tns:SchemaHandlingType"/>
 
@@ -7370,6 +7395,7 @@
                 </xsd:annotation>
              </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:simpleType name="SearchHierarchyScopeType">
@@ -8191,42 +8217,43 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
-   <xsd:complexType name="ResourceObjectTypeDependencyType">
-           <xsd:annotation>
-               <xsd:appinfo>
+    <xsd:complexType name="ResourceObjectTypeDependencyType">
+        <xsd:annotation>
+            <xsd:appinfo>
                 <a:container/>
             </xsd:appinfo>
-           </xsd:annotation>
-           <xsd:complexContent>
-               <xsd:extension base="tns:ShadowDiscriminatorType">
-                   <xsd:sequence>
-                       <xsd:element name="strictness" type="tns:ResourceObjectTypeDependencyStrictnessType" minOccurs="0"/>
-                       <xsd:element name="order" type="xsd:int" minOccurs="0" default="0">
-                           <xsd:annotation>
-                               <xsd:documentation>
-                                   Specifies the order in which the dependency is applied. Lower-order dependencies
-                                   are applied before higher-order dependencies. Dependencies with the same order
-                                   are applied at the same time. There must be no circular dependency formed from
-                                   dependencies of the same order.
-                               </xsd:documentation>
-                           </xsd:annotation>
-                       </xsd:element>
-                       <xsd:element name="forceLoad" type="xsd:boolean" minOccurs="0" maxOccurs="1" default="false">
-                           <xsd:annotation>
-                               <xsd:documentation>
-                                   Specifies if the shadow on which we depends has to be load. By default we do
-                                   not force to load full dependent shadow.
-                               </xsd:documentation>
-                           </xsd:annotation>
-                       </xsd:element>
-                   </xsd:sequence>
-               </xsd:extension>
-           </xsd:complexContent>
-   </xsd:complexType>
+        </xsd:annotation>
+        <xsd:complexContent>
+            <xsd:extension base="tns:ShadowDiscriminatorType">
+                <xsd:sequence>
+                    <xsd:element name="strictness" type="tns:ResourceObjectTypeDependencyStrictnessType" minOccurs="0"/>
+                    <xsd:element name="order" type="xsd:int" minOccurs="0" default="0">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Specifies the order in which the dependency is applied. Lower-order dependencies
+                                are applied before higher-order dependencies. Dependencies with the same order
+                                are applied at the same time. There must be no circular dependency formed from
+                                dependencies of the same order.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                    <xsd:element name="forceLoad" type="xsd:boolean" minOccurs="0" maxOccurs="1" default="false">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Specifies if the shadow on which we depends has to be load. By default we do
+                                not force to load full dependent shadow.
+                            </xsd:documentation>
+                        </xsd:annotation>
+                    </xsd:element>
+                </xsd:sequence>
+            </xsd:extension>
+        </xsd:complexContent>
+    </xsd:complexType>
 
-   <xsd:simpleType name="ResourceObjectTypeDependencyStrictnessType">
+    <xsd:simpleType name="ResourceObjectTypeDependencyStrictnessType">
         <xsd:annotation>
             <xsd:documentation>
                 TODO
@@ -8284,7 +8311,7 @@
                     </xsd:appinfo>
                 </xsd:annotation>
             </xsd:enumeration>
-             </xsd:restriction>
+        </xsd:restriction>
     </xsd:simpleType>
 
     <xsd:complexType name="ItemRefinedDefinitionType">
@@ -8515,6 +8542,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:simpleType name="ItemPersistenceType">
@@ -9184,6 +9212,7 @@
                  -->
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="ResourceActivationDefinitionType">
@@ -9233,6 +9262,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="ResourceObjectLifecycleDefinitionType">
@@ -9267,6 +9297,7 @@
                        We need to align this with similar method to control lifecycle transitions
                        for all other objects -->
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="ResourceBidirectionalMappingType">
@@ -9292,6 +9323,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="ResourceBidirectionalMappingAndDefinitionType">
@@ -9427,6 +9459,7 @@
             </xsd:element>
 
          </xsd:sequence>
+         <xsd:attribute name="id" type="xsd:long"/>
      </xsd:complexType>
 
      <xsd:complexType name="ShadowTagSpecificationType">
@@ -9456,6 +9489,7 @@
                  </xsd:annotation>
              </xsd:element>
          </xsd:sequence>
+         <xsd:attribute name="id" type="xsd:long"/>
      </xsd:complexType>
 
     <xsd:complexType name="ProvenanceFeedDefinitionType">
@@ -9513,6 +9547,7 @@
             <!-- A flag that determines that we want to provide different values for different attributes (to speed up processing)?
                  Currently we use the same metadata for all values in given resource object. -->
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
      <xsd:complexType name="ResourceObjectReferenceType">
@@ -9561,6 +9596,7 @@
              <xsd:element name="resolutionFrequency" type="tns:ResourceObjectReferenceResolutionFrequencyType" minOccurs="0" maxOccurs="1" default="once">
              </xsd:element>
          </xsd:sequence>
+         <xsd:attribute name="id" type="xsd:long"/>
      </xsd:complexType>
 
      <xsd:simpleType name="ResourceObjectReferenceResolutionStrategyType">
@@ -9900,6 +9936,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="capabilities" type="tns:CapabilitiesType"/>
 
@@ -9932,6 +9969,7 @@
                 </xsd:annotation>
             </xsd:any>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="OperationProvisioningScriptsType">
@@ -10286,6 +10324,7 @@
             <xsd:any minOccurs="0" maxOccurs="unbounded" processContents="lax">
             </xsd:any>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="AbstractMappingType">
@@ -10500,6 +10539,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="MappingType">
@@ -10920,6 +10960,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="ExpressionParameterType">
@@ -12140,6 +12181,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:element name="objectSynchronizationSorter" type="tns:ObjectSynchronizationSorterType"/>
@@ -14078,6 +14120,7 @@
                  </xsd:annotation>
              </xsd:element>
          </xsd:sequence>
+         <xsd:attribute name="id" type="xsd:long"/>
      </xsd:complexType>
 
      <xsd:complexType name="AutoassignSpecificationType">
@@ -14131,6 +14174,7 @@
              </xsd:element>
              <!-- TODO: later: inbound -->
          </xsd:sequence>
+         <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
      <xsd:complexType name="FocalAutoassignSpecificationType">
@@ -14181,6 +14225,7 @@
                   role managers to be set from GUI. But we can support most of the policy rule
                   constraints here (PolicyConstraintsType). -->
          </xsd:sequence>
+         <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="AutoassignMappingType">
@@ -14242,6 +14287,7 @@
             </xsd:element>
             <!-- TODO: later: activation, lifecycle -->
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="AuthorizationType">
@@ -14769,7 +14815,6 @@
         </xsd:complexContent>
     </xsd:complexType>
 
-
     <xsd:complexType name="OwnedObjectSelectorType">
         <xsd:annotation>
             <xsd:documentation>
@@ -15320,6 +15365,7 @@
                </xsd:annotation>
            </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="ConstructionType">
@@ -16155,6 +16201,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="LinkTypeDefinitionsType">
@@ -16185,6 +16232,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="LinkTypeDefinitionType">
@@ -16216,6 +16264,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="LinkedObjectSelectorType">
@@ -16314,9 +16363,9 @@
             </xsd:element>
             <!-- TODO: default view for archetyped objects? -->
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
-
     <xsd:complexType name="LookupTableType">
         <xsd:annotation>
             <xsd:documentation>
@@ -16549,6 +16598,7 @@
             <xsd:element name="limitations" type="tns:LimitationsType" minOccurs="0" maxOccurs="1"/>
             <xsd:element name="characterClass" type="tns:CharacterClassType" minOccurs="0" maxOccurs="1"/>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="LimitationsType">
@@ -16699,6 +16749,7 @@
         <xsd:sequence>
             <xsd:element name="item" type="tns:ProhibitedValueItemType" minOccurs="0" maxOccurs="unbounded"/>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="ProhibitedValueItemType">
@@ -16723,6 +16774,7 @@
             </xsd:element>
             <!-- TODO: matching (exact, norm, case ignore, partial, ...), matching parameters ( 3 characters difference ) -->
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
         <xsd:simpleType name="ValuePolicyOriginType">
@@ -17497,6 +17549,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="FullTextSearchIndexedItemsConfigurationType">
@@ -17533,6 +17586,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="SystemConfigurationAuditType">
@@ -17559,6 +17613,7 @@
             </xsd:element>
             <!-- TODO: recordRetentionPolicy -->
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="SystemConfigurationAuditEventRecordingType">
@@ -17635,6 +17690,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="SystemConfigurationAuditEventRecordingPropertyType">
@@ -17675,6 +17731,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="SystemConfigurationExpressionsType">
@@ -17721,6 +17778,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="ExpressionProfileType">
@@ -17779,6 +17837,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="ExpressionEvaluatorProfileType">
@@ -17837,6 +17896,7 @@
             </xsd:element>
             <!-- TODO: restrict runAs option -->
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="ScriptExpressionProfileType">
@@ -17908,6 +17968,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="ExpressionPermissionProfileType">
@@ -17982,6 +18043,7 @@
             </xsd:element>
             <!-- TODO: later: sandboxing, allowed operations -->
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="ExpressionPermissionPackageProfileType">
@@ -18032,6 +18094,7 @@
             </xsd:element>
             <!-- TODO: classes within a package? -->
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="ExpressionPermissionClassProfileType">
@@ -18089,6 +18152,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="ExpressionPermissionMethodProfileType">
@@ -18137,10 +18201,9 @@
             </xsd:element>
             <!-- TODO: later: parameter specification -->
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
-
-
     <xsd:complexType name="FunctionLibraryType">
         <xsd:annotation>
             <xsd:documentation>
@@ -18355,6 +18418,7 @@
             </xsd:element>
             <!-- TODO: Status may be added here later: all/active/active+delegated -->
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="CollectionRefSpecificationType">
@@ -18549,6 +18613,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="IntegerStatType">
@@ -18619,6 +18684,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="AuditSearchType">
@@ -18667,6 +18733,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="InternalsConfigurationType">
@@ -18872,6 +18939,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="internalsConfiguration" type="tns:InternalsConfigurationType"/>
 
@@ -18910,6 +18978,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="memoryDiagnosticsConfiguration" type="tns:MemoryDiagnosticsConfigurationType"/>
 
@@ -18970,6 +19039,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="operationResultHandlingStrategy" type="tns:OperationResultHandlingStrategyType" />
 
@@ -18996,6 +19066,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="synchronizationSituationUpdatingStrategy" type="tns:SynchronizationSituationUpdatingStrategyType" />
 
@@ -19029,6 +19100,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="operationExecutionRecordingStrategy" type="tns:OperationExecutionRecordingStrategyType" />
 
@@ -19053,6 +19125,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="metadataRecordingStrategy" type="tns:MetadataRecordingStrategyType" />
 
@@ -19090,6 +19163,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="constraintsCheckingStrategy" type="tns:ConstraintsCheckingStrategyType" />
 
@@ -19114,6 +19188,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="repositoryConfiguration" type="tns:RepositoryConfigurationType" />
 
@@ -19144,6 +19219,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="repositoryStatisticsReportingConfiguration" type="tns:RepositoryStatisticsReportingConfigurationType" />
 
@@ -19258,6 +19334,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="tracingConfiguration" type="tns:TracingConfigurationType" />
 
@@ -19288,6 +19365,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="cachingConfiguration" type="tns:CachingConfigurationType" />
 
@@ -19424,6 +19502,7 @@
 <!--                </xsd:annotation>-->
 <!--            </xsd:element>-->
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="cachingProfile" type="tns:CachingProfileType" />
 
@@ -19570,6 +19649,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="cacheObjectTypeSettings" type="tns:CacheObjectTypeSettingsType" />
 
@@ -19601,6 +19681,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="cacheInvalidationConfiguration" type="tns:CacheInvalidationConfigurationType" />
 
@@ -19666,6 +19747,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="cacheStatisticsReportingConfiguration" type="tns:CacheStatisticsReportingConfigurationType" />
 
@@ -20036,6 +20118,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="AdminGuiConfigurationRoleManagementType">
@@ -20065,6 +20148,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="AdminGuiApprovalsConfigurationType">
@@ -20094,6 +20178,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="adminGuiApprovalsConfiguration" type="tns:AdminGuiApprovalsConfigurationType" />
 
@@ -20148,6 +20233,7 @@
                         precision (ronuding) of floating-point values
                         deafault boolean presentation (checkbox, on/off switch, dropdown) -->
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="FeedbackMessagesHookType">
@@ -20166,6 +20252,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="ConfigurableUserDashboardType">
@@ -20213,15 +20300,16 @@
                 <a:since>3.6</a:since>
             </xsd:appinfo>
         </xsd:annotation>
-               <xsd:sequence>
-                   <xsd:element name="widget" type="tns:DashboardWidgetType" minOccurs="0" maxOccurs="unbounded">
-                    <xsd:annotation>
-                        <xsd:appinfo>
-                            <a:displayName>DashboardLayoutType.widget</a:displayName>
-                        </xsd:appinfo>
-                    </xsd:annotation>
-                </xsd:element>
-               </xsd:sequence>
+        <xsd:sequence>
+            <xsd:element name="widget" type="tns:DashboardWidgetType" minOccurs="0" maxOccurs="unbounded">
+                <xsd:annotation>
+                    <xsd:appinfo>
+                        <a:displayName>DashboardLayoutType.widget</a:displayName>
+                    </xsd:appinfo>
+                </xsd:annotation>
+            </xsd:element>
+        </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="DashboardWidgetType">
@@ -20305,6 +20393,7 @@
                 </xsd:annotation>
             </xsd:element>
           </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:simpleType name="DashboardWidgetSourceTypeType">
@@ -20409,6 +20498,7 @@
               <!-- TODO: formRef (optional, for form-based widgets) -->
               <!-- TODO: view setting (optional, for list-based widgets) -->
           </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="DashboardWidgetDataFieldType">
@@ -20440,6 +20530,7 @@
               </xsd:element>
               <!-- TODO (later): condition? -->
           </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
         <xsd:simpleType name="DashboardWidgetDataFieldTypeType">
@@ -20527,6 +20618,7 @@
                   </xsd:annotation>
               </xsd:element>
           </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="UserInterfaceFeatureType">
@@ -20639,6 +20731,7 @@
                         </xsd:annotation>
                     </xsd:element>
                </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:simpleType name="UserInterfaceElementVisibilityType">
@@ -20783,6 +20876,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="IconType">
@@ -20845,6 +20939,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="ObjectPolicyConfigurationType">
@@ -20923,6 +21018,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="FetchErrorHandlingType">
@@ -20945,6 +21041,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="fetchErrorHandling" type="tns:FetchErrorHandlingType" />
 
@@ -21041,6 +21138,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:simpleType name="ConflictResolutionActionType">
@@ -21171,6 +21269,7 @@
                  </xsd:annotation>
              </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="ConnectorFrameworkType">
@@ -21188,6 +21287,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="ConnectorFrameworkConfigurationType">
@@ -21219,6 +21319,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="ProjectionPolicyType">
@@ -21256,6 +21357,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:simpleType name="AssignmentPolicyEnforcementType">
@@ -21441,6 +21543,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="LoggingAuditingConfigurationType">
@@ -21478,6 +21581,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="AdvancedLoggingConfigurationType" mixed="true">
@@ -21492,6 +21596,7 @@
         <xsd:sequence>
             <xsd:any maxOccurs="unbounded"/>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="AbstractLoggerConfigurationType" abstract="true">
@@ -21524,6 +21629,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="ClassLoggerConfigurationType">
@@ -21768,6 +21874,7 @@
             </xsd:element>
         </xsd:sequence>
         <!-- <xsd:attribute name="name" type="xsd:string"/> -->
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="FileAppenderConfigurationType">
@@ -22001,6 +22108,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="AssignmentConstraintsType">
@@ -22087,6 +22195,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="RelationDefinitionType">
@@ -22239,6 +22348,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:simpleType name="RelationKindType">
@@ -22619,6 +22729,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:simpleType name="PolicyRuleEvaluationTargetType">
@@ -23315,6 +23426,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="CleanupPolicyType">
@@ -23344,6 +23456,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="DeadNodeCleanupPolicyType">
@@ -23366,6 +23479,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <!-- Things relevant to model context serialization - more precisely, those parts that are publicly visible
@@ -23444,6 +23558,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="SelectorQualifiedGetOptionType">
@@ -23471,6 +23586,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="OptionObjectSelectorType">
@@ -23491,6 +23607,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="GetOperationOptionsType">
@@ -23602,6 +23719,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:simpleType name="RetrieveOptionType">
@@ -23796,9 +23914,7 @@
                             chosen but a custom paging exists, provided that the paging contains maxSize clause with a number
                             not greater than a specified limit (maxObjectsForImplicitFetchAllIterationMethod).
                         </xsd:documentation>
-                        <xsd:annotation>
-                            <a:since>3.9</a:since>
-                        </xsd:annotation>
+                        <a:since>3.9</a:since>
                     </xsd:appinfo>
                 </xsd:annotation>
             </xsd:enumeration>
@@ -23991,6 +24107,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="modelExecuteOptions" type="tns:ModelExecuteOptionsType"/>
 
@@ -24060,6 +24177,7 @@
             <xsd:element name="execution" type="tns:PartialProcessingTypeType" minOccurs="0" default="automatic"/>
             <xsd:element name="notification" type="tns:PartialProcessingTypeType" minOccurs="0" default="automatic"/>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
    </xsd:complexType>
    <xsd:element name="partialProcessingOptions" type="tns:PartialProcessingOptionsType">
        <xsd:annotation>
@@ -24382,6 +24500,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <!-- TODO profiling Configuration -->
@@ -24483,6 +24602,7 @@
             </xsd:element>
             <!-- Subsystems end -->
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="profilingConfiguration" type="tns:ProfilingConfigurationType"/>
 
@@ -24663,6 +24783,7 @@
             <xsd:any minOccurs="0" maxOccurs="unbounded" processContents="lax">
             </xsd:any>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="ReportType">
@@ -24915,6 +25036,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:simpleType name="ReportEngineSelectionType">
@@ -25001,6 +25123,7 @@
                 </xsd:element>
             </xsd:choice>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:simpleType name="FileFormatTypeType">
@@ -25038,6 +25161,7 @@
                 <a:container/>
             </xsd:appinfo>
         </xsd:annotation>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="CsvFileFormatType">
@@ -25266,6 +25390,7 @@
             <xsd:any minOccurs="0" maxOccurs="unbounded" processContents="lax">
             </xsd:any>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="JasperReportEngineConfigurationType">
@@ -25319,7 +25444,7 @@
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="orientation" type="tns:OrientationType" minOccurs="0">
-    <xsd:annotation>
+                <xsd:annotation>
                     <xsd:documentation>
                         Report page orientation (portrait/landscape).
                         This item is specific to JasperRepors. But it may be reused for other report types.
@@ -25327,7 +25452,7 @@
                 </xsd:annotation>
             </xsd:element>
             <xsd:element name="export" type="tns:JasperExportType" minOccurs="0">
-<xsd:annotation>
+                <xsd:annotation>
                     <xsd:documentation>
                         Report output file format.
                     </xsd:documentation>
@@ -25395,6 +25520,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:simpleType name="JasperReportTypeType">
@@ -25473,6 +25599,7 @@
                 <a:since>4.2</a:since>
             </xsd:appinfo>
         </xsd:annotation>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="DashboardReportEngineConfigurationType">
@@ -25908,6 +26035,7 @@
             <xsd:element name="currentObjectOid" type="xsd:string" minOccurs="0" />
             <xsd:element name="currentObjectStartTimestamp" type="xsd:dateTime" minOccurs="0" />
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="IterativeTaskPartItemsProcessingInformationType">
@@ -25951,6 +26079,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="TaskPartExecutionRecordType">
@@ -25980,6 +26109,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="ProcessedItemSetType">
@@ -26086,6 +26216,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="SynchronizationInformationType">
@@ -26121,6 +26252,7 @@
             <xsd:element name="countUnlinkedAfter" type="xsd:int" minOccurs="0" />
             <xsd:element name="countUnmatchedAfter" type="xsd:int" minOccurs="0" />
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="SynchronizationSituationTransitionType">
@@ -26141,6 +26273,7 @@
             <xsd:element name="exclusionReason" type="tns:SynchronizationExclusionReasonType" minOccurs="0" />
             <xsd:element name="counter" type="tns:OutcomeKeyedCounterType" minOccurs="0" maxOccurs="unbounded"/>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="synchronizationSituationTransition" type="tns:SynchronizationSituationTransitionType"/>
 
@@ -26326,6 +26459,7 @@
                        </xsd:annotation>
                    </xsd:element>
                </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="GuiObjectListPanelConfigurationType">
@@ -26527,6 +26661,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="SearchBoxConfigurationType">
@@ -26687,6 +26822,7 @@
                    </xsd:element>
                    <!-- TODO: default relation (e.g. defalt, manager, all relations) -->
                </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="ObjectTypeSearchItemConfigurationType">
@@ -26840,6 +26976,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="SearchItemType">
@@ -26938,6 +27075,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="SearchFilterParameterType">
@@ -27283,6 +27421,7 @@
                        </xsd:annotation>
                    </xsd:element>
                </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:simpleType name="DirectionTypeType">
@@ -27468,6 +27607,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:simpleType name="DisplayValueType">
@@ -27565,6 +27705,7 @@
                    </xsd:element>
                    <!-- TODO later: expression, reference to java class, etc. -->
                </xsd:sequence>
+           <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="GuiExportSettingsType">
@@ -27593,6 +27734,7 @@
                    </xsd:element>
                    <!-- TODO: later: default data language, sync/async, whether to show detail dialog or just run the export, etc. -->
                </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="GuiObjectDetailsSetType">
@@ -27615,6 +27757,7 @@
                     </xsd:annotation>
                 </xsd:element>
                </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="AbstractObjectTypeConfigurationType" abstract="true">
@@ -27774,6 +27917,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="SummaryPanelSpecificationType">
@@ -27830,6 +27974,7 @@
                     </xsd:annotation>
                 </xsd:element>
                </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:simpleType name="DetailsPageSaveMethodType">
@@ -27901,6 +28046,7 @@
                     </xsd:annotation>
                 </xsd:element>
                </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
   <!-- ============================================================== -->
@@ -27928,6 +28074,7 @@
                     </xsd:annotation>
                 </xsd:element>
                </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="ObjectFormType">
@@ -28027,6 +28174,7 @@
                     </xsd:annotation>
                 </xsd:element>
                </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
 
@@ -28331,6 +28479,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="FormDisplayType">
@@ -28836,6 +28985,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="ValidationResultType">
@@ -28856,6 +29006,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="validationResult" type="tns:ValidationResultType"/>
 
@@ -28876,6 +29027,7 @@
             <xsd:element name="objectRef" type="tns:ObjectReferenceType" minOccurs="0" />
             <xsd:element name="itemPath" type="xsd:string" minOccurs="0" />                    <!-- ItemPathType is problem within containers -->
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:simpleType name="ValidationIssueSeverityType">
@@ -28973,6 +29125,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="ItemMergeConfigurationType">
@@ -29009,6 +29162,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="ItemRefMergeConfigurationType">
@@ -29283,6 +29437,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="InfrastructureConfigurationType">
@@ -29353,6 +29508,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:complexType name="CachingPolicyType">
@@ -29368,6 +29524,7 @@
         <xsd:sequence>
             <xsd:element name="cachingStategy" type="tns:CachingStategyType" minOccurs="0" maxOccurs="1" default="none"/>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
 
     <xsd:simpleType name="CachingStategyType">
@@ -29582,6 +29739,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="operationExecutionRecordRealOwner" type="tns:OperationExecutionRecordRealOwnerType"/>
 
@@ -29870,6 +30028,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="cachesStateInformation" type="tns:CachesStateInformationType" />
 
@@ -29923,6 +30082,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="singleCacheStateInformation" type="tns:SingleCacheStateInformationType" />
 
@@ -29967,6 +30127,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="componentSizeInformation" type="tns:ComponentSizeInformationType" />
 
@@ -30010,6 +30171,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="triggerCreation" type="tns:TriggerCreationType" />
 
@@ -30034,6 +30196,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="taskErrorHandlingStrategy" type="tns:TaskErrorHandlingStrategyType"/>
 
@@ -30073,6 +30236,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="taskErrorHandlingStrategyEntry" type="tns:TaskErrorHandlingStrategyEntryType"/>
 
@@ -30109,6 +30273,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="taskErrorSituationSelector" type="tns:TaskErrorSituationSelectorType"/>
 
@@ -30139,6 +30304,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="taskErrorReaction" type="tns:TaskErrorReactionType"/>
 
@@ -30153,6 +30319,7 @@
                 <a:experimental>true</a:experimental>
             </xsd:appinfo>
         </xsd:annotation>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="ignoreErrorReaction" type="tns:IgnoreErrorReactionType"/>
 
@@ -30167,6 +30334,7 @@
                 <a:experimental>true</a:experimental>
             </xsd:appinfo>
         </xsd:annotation>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="stopProcessingReaction" type="tns:StopProcessingReactionType"/>
 
@@ -30204,6 +30372,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="retryLaterReaction" type="tns:RetryLaterReactionType"/>
 
@@ -30242,6 +30411,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="plannedOperationAttempt" type="tns:PlannedOperationAttemptType"/>
 
@@ -30298,6 +30468,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="failedObjectsSelector" type="tns:FailedObjectsSelectorType"/>
 
@@ -30434,6 +30605,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="qualifiedItemProcessingOutcome" type="tns:QualifiedItemProcessingOutcomeType" />
 
@@ -30467,6 +30639,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="taskReportingOptions" type="tns:TaskReportingOptionsType" />
 
@@ -30497,6 +30670,7 @@
                 </xsd:annotation>
             </xsd:element>
         </xsd:sequence>
+        <xsd:attribute name="id" type="xsd:long"/>
     </xsd:complexType>
     <xsd:element name="taskLoggingOptions" type="tns:TaskLoggingOptionsType" />