From 8dca4f820ceaaa5714b7a4a5f0fb5dafff71994c Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Tue, 18 Sep 2012 16:46:29 -0700
Subject: [PATCH] CSPACE-5540: Standardize ordering of fields in
 relations_common.xsd files.

---
 .../src/main/resources/relations_common.xsd   | 18 +++++++++--------
 .../resources/schemas/relations_common.xsd    | 20 +++++++++----------
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/services/jaxb/src/main/resources/relations_common.xsd b/services/jaxb/src/main/resources/relations_common.xsd
index e17ac254c..bc6aef7c9 100644
--- a/services/jaxb/src/main/resources/relations_common.xsd
+++ b/services/jaxb/src/main/resources/relations_common.xsd
@@ -23,21 +23,23 @@
     <xs:element name="relations_common">
         <xs:complexType>
             <xs:sequence>
-            	<xs:element name="csid" type="xs:string" />            
+            	<xs:element name="csid" type="xs:string" />
+                        
+                <xs:element name="subjectCsid" type="xs:string"  minOccurs="1" maxOccurs="1"/>     <!-- new name for documentId1 -->
+                <xs:element name="subjectDocumentType" type="xs:string"  minOccurs="1" maxOccurs="1"/>     <!-- new name for documentType1 -->
+                <xs:element name="subjectUri" type="xs:string" minOccurs="1"/>
+                <xs:element name="subjectRefName" type="xs:string"  minOccurs="1" maxOccurs="1"/>
+
                 <!-- type of relationship between two entities -->
                 <xs:element name="relationshipType" type="xs:string" minOccurs="1"/>
                 <xs:element name="relationshipMetaType" type="xs:string" minOccurs="0"/>
+                <xs:element name="predicate" type="rel:RelationshipType" minOccurs="1" maxOccurs="1"/>   <!-- new name for relationshipType -->
                 <xs:element name="predicateDisplayName" type="xs:string" minOccurs="1"/>
-                <!--- New Names -->
-                <xs:element name="subjectCsid" type="xs:string"  minOccurs="1" maxOccurs="1"/>     <!-- new name for documentId1 -->
+                
                 <xs:element name="objectCsid" type="xs:string"  minOccurs="1" maxOccurs="1"/>        <!-- new name for documentId2 -->
-                <xs:element name="subjectDocumentType" type="xs:string"  minOccurs="1" maxOccurs="1"/>     <!-- new name for documentType1 -->
                 <xs:element name="objectDocumentType" type="xs:string"  minOccurs="1" maxOccurs="1"/>        <!-- new name for documentType2 -->
-                <xs:element name="subjectRefName" type="xs:string"  minOccurs="1" maxOccurs="1"/>
-                <xs:element name="objectRefName" type="xs:string"  minOccurs="1" maxOccurs="1"/>
-                <xs:element name="predicate" type="rel:RelationshipType" minOccurs="1" maxOccurs="1"/>   <!-- new name for relationshipType -->
-                <xs:element name="subjectUri" type="xs:string" minOccurs="1"/>
                 <xs:element name="objectUri" type="xs:string" minOccurs="1"/>
+                <xs:element name="objectRefName" type="xs:string"  minOccurs="1" maxOccurs="1"/>
             </xs:sequence>
         </xs:complexType>
     </xs:element>
diff --git a/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/schemas/relations_common.xsd b/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/schemas/relations_common.xsd
index 640e785c9..359946fc1 100644
--- a/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/schemas/relations_common.xsd
+++ b/services/relation/3rdparty/nuxeo-platform-cs-relation/src/main/resources/schemas/relations_common.xsd
@@ -28,24 +28,23 @@
 		maxOccurs="1" />     <!-- new name for documentId1 -->
 	<xs:element name="subjectDocumentType" type="xs:string"
 		minOccurs="1" maxOccurs="1" />     <!-- new name for documentType1 -->
-
-	<xs:element name="objectCsid" type="xs:string" minOccurs="1"
-		maxOccurs="1" />        <!-- new name for documentId2 -->
-	<xs:element name="objectDocumentType" type="xs:string"
-		minOccurs="1" maxOccurs="1" />        <!-- new name for documentType2 -->
-
-	<!-- type of relationship between two entities -->
+	<xs:element name="subjectUri" type="xs:string" />
+	<xs:element name="subjectRefName" type="xs:string" />
+        
+        <!-- type of relationship between two entities -->
 	<xs:element name="relationshipType" type="rel:RelationshipType"
 		minOccurs="1" maxOccurs="1" />
+        <xs:element name="relationshipMetaType" type="xs:string" minOccurs="0"/>
 	<xs:element name="predicate" type="rel:RelationshipType"
 		minOccurs="1" maxOccurs="1" />   <!-- new name for relationshipType -->
 	<xs:element name="predicateDisplayName" type="xs:string"
 		minOccurs="1" />
 
-	<xs:element name="subjectUri" type="xs:string" />
+	<xs:element name="objectCsid" type="xs:string" minOccurs="1"
+		maxOccurs="1" />        <!-- new name for documentId2 -->
+	<xs:element name="objectDocumentType" type="xs:string"
+		minOccurs="1" maxOccurs="1" />        <!-- new name for documentType2 -->
 	<xs:element name="objectUri" type="xs:string" />
-
-	<xs:element name="subjectRefName" type="xs:string" />
 	<xs:element name="objectRefName" type="xs:string" />
 
 	<!-- enumeration defining the type of relationship between two entities -->
@@ -62,7 +61,6 @@
 			<xs:enumeration value="hasBroader" />
 		</xs:restriction>
 	</xs:simpleType>
-        <xs:element name="relationshipMetaType" type="xs:string" minOccurs="0"/>
 
 </xs:schema>
 
-- 
2.47.3