From 3f264a19d8d39d50dbd5273964a72154aa6aead2 Mon Sep 17 00:00:00 2001
From: Radovan Semancik <radovan.semancik@evolveum.com>
Date: Thu, 31 Jul 2014 16:36:00 +0200
Subject: [PATCH] Moving displayName and identifier from OrgType to
 AbstractRoleType

---
 .../xml/ns/public/common/common-3.xsd         | 59 ++++++++++---------
 1 file changed, 30 insertions(+), 29 deletions(-)

diff --git a/infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd b/infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
index 9501f88dd18..56dacab40f8 100644
--- a/infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
+++ b/infra/schema/src/main/resources/xml/ns/public/common/common-3.xsd
@@ -6041,6 +6041,35 @@
         <xsd:complexContent>
             <xsd:extension base="tns:FocusType">
                 <xsd:sequence>
+                	<xsd:element name="displayName" type="t:PolyStringType">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                            	Human-readable name of the role or org. It may be quite long, container national characters
+                            	and there is no uniqueness requirement.
+                            </xsd:documentation>
+                            <xsd:appinfo>
+		                    	<a:displayName>Display Name</a:displayName>
+		                    	<a:displayOrder>100</a:displayOrder>
+		                    </xsd:appinfo>
+                        </xsd:annotation>
+                    </xsd:element>
+
+                    <xsd:element name="identifier" type="xsd:string" minOccurs="0" maxOccurs="1">
+                        <xsd:annotation>
+                            <xsd:documentation>
+                                Identifier of the role or org. It should be a structured information usually used for
+                                refering to the role or org or correlating it in various systems. E.g. numeric organizational
+                                unit identifier, role code, etc. It should be unique in its "own" scope. E.g. an organizational
+                                unit identifier should be unique in the scope of all organizational units but it may conflict 
+                                with an identifier of a project.
+                            </xsd:documentation>
+                            <xsd:appinfo>
+		                    	<a:displayName>Identifier</a:displayName>
+		                    	<a:displayOrder>110</a:displayOrder>
+		                    </xsd:appinfo>
+                        </xsd:annotation>
+                    </xsd:element>
+                   
                    <xsd:element name="inducement" type="tns:AssignmentType" minOccurs="0" maxOccurs="unbounded">
                         <xsd:annotation>
                             <xsd:documentation>
@@ -6717,35 +6746,7 @@
         <xsd:complexContent>
             <xsd:extension base="c:AbstractRoleType">
                 <xsd:sequence>
-                    <xsd:element name="displayName" type="t:PolyStringType">
-                        <xsd:annotation>
-                            <xsd:documentation>
-                            	Human-readable name of the org. It may be quite long, container national characters
-                            	and there is no uniqueness requirement.
-                            </xsd:documentation>
-                            <xsd:appinfo>
-		                    	<a:displayName>Display Name</a:displayName>
-		                    	<a:displayOrder>100</a:displayOrder>
-		                    </xsd:appinfo>
-                        </xsd:annotation>
-                    </xsd:element>
-
-                    <xsd:element name="identifier" type="xsd:string" minOccurs="0" maxOccurs="1">
-                        <xsd:annotation>
-                            <xsd:documentation>
-                                Identifier of the org. It should be a structured information usually used for
-                                refering to the org or correlating it in various systems. E.g. numeric organizational
-                                unit identifier. It should be unique in its "own" scope. E.g. an organizational unit identifier
-                                should be unique in the scope of all organizational units but it may conflict with an
-                                identifier of a project.
-                            </xsd:documentation>
-                            <xsd:appinfo>
-		                    	<a:displayName>Identifier</a:displayName>
-		                    	<a:displayOrder>110</a:displayOrder>
-		                    </xsd:appinfo>
-                        </xsd:annotation>
-                    </xsd:element>
-
+                    
                     <xsd:element name="orgType" type="xsd:string" minOccurs="0" maxOccurs="unbounded">
                         <xsd:annotation>
                             <xsd:documentation>