CSPACE-5540: Standardize ordering of fields in relations_common.xsd files.

diff --git a/services/jaxb/src/main/resources/relations_common.xsd b/services/jaxb/src/main/resources/relations_common.xsd
index e17ac254cb7d7e983989efbeb63f8d0c8cb8dd2e..bc6aef7c9fa65c9925e1d9f88c19cff55770ae4e 100644 (file)
--- 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">\r
         <xs:complexType>\r
             <xs:sequence>\r
-               <xs:element name="csid" type="xs:string" />            \r
+               <xs:element name="csid" type="xs:string" />\r
+                        \r
+                <xs:element name="subjectCsid" type="xs:string"  minOccurs="1" maxOccurs="1"/>     <!-- new name for documentId1 -->\r
+                <xs:element name="subjectDocumentType" type="xs:string"  minOccurs="1" maxOccurs="1"/>     <!-- new name for documentType1 -->\r
+                <xs:element name="subjectUri" type="xs:string" minOccurs="1"/>\r
+                <xs:element name="subjectRefName" type="xs:string"  minOccurs="1" maxOccurs="1"/>\r
+\r
                 <!-- type of relationship between two entities -->\r
                 <xs:element name="relationshipType" type="xs:string" minOccurs="1"/>\r
                 <xs:element name="relationshipMetaType" type="xs:string" minOccurs="0"/>\r
+                <xs:element name="predicate" type="rel:RelationshipType" minOccurs="1" maxOccurs="1"/>   <!-- new name for relationshipType -->\r
                 <xs:element name="predicateDisplayName" type="xs:string" minOccurs="1"/>\r
-                <!--- New Names -->\r
-                <xs:element name="subjectCsid" type="xs:string"  minOccurs="1" maxOccurs="1"/>     <!-- new name for documentId1 -->\r
+                \r
                 <xs:element name="objectCsid" type="xs:string"  minOccurs="1" maxOccurs="1"/>        <!-- new name for documentId2 -->\r
-                <xs:element name="subjectDocumentType" type="xs:string"  minOccurs="1" maxOccurs="1"/>     <!-- new name for documentType1 -->\r
                 <xs:element name="objectDocumentType" type="xs:string"  minOccurs="1" maxOccurs="1"/>        <!-- new name for documentType2 -->\r
-                <xs:element name="subjectRefName" type="xs:string"  minOccurs="1" maxOccurs="1"/>\r
-                <xs:element name="objectRefName" type="xs:string"  minOccurs="1" maxOccurs="1"/>\r
-                <xs:element name="predicate" type="rel:RelationshipType" minOccurs="1" maxOccurs="1"/>   <!-- new name for relationshipType -->\r
-                <xs:element name="subjectUri" type="xs:string" minOccurs="1"/>\r
                 <xs:element name="objectUri" type="xs:string" minOccurs="1"/>\r
+                <xs:element name="objectRefName" type="xs:string"  minOccurs="1" maxOccurs="1"/>\r
             </xs:sequence>\r
         </xs:complexType>\r
     </xs:element>\r

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 640e785c9a861680a18c79f0765fc067ce95c04b..359946fc1bff5b3dc3f70bd255576a42ff0db80c 100644 (file)
--- 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 -->\r
        <xs:element name="subjectDocumentType" type="xs:string"\r
                minOccurs="1" maxOccurs="1" />     <!-- new name for documentType1 -->\r
-\r
-       <xs:element name="objectCsid" type="xs:string" minOccurs="1"\r
-               maxOccurs="1" />        <!-- new name for documentId2 -->\r
-       <xs:element name="objectDocumentType" type="xs:string"\r
-               minOccurs="1" maxOccurs="1" />        <!-- new name for documentType2 -->\r
-\r
-       <!-- type of relationship between two entities -->\r
+       <xs:element name="subjectUri" type="xs:string" />\r
+       <xs:element name="subjectRefName" type="xs:string" />\r
+        \r
+        <!-- type of relationship between two entities -->\r
        <xs:element name="relationshipType" type="rel:RelationshipType"\r
                minOccurs="1" maxOccurs="1" />\r
+        <xs:element name="relationshipMetaType" type="xs:string" minOccurs="0"/>\r
        <xs:element name="predicate" type="rel:RelationshipType"\r
                minOccurs="1" maxOccurs="1" />   <!-- new name for relationshipType -->\r
        <xs:element name="predicateDisplayName" type="xs:string"\r
                minOccurs="1" />\r
 \r
-       <xs:element name="subjectUri" type="xs:string" />\r
+       <xs:element name="objectCsid" type="xs:string" minOccurs="1"\r
+               maxOccurs="1" />        <!-- new name for documentId2 -->\r
+       <xs:element name="objectDocumentType" type="xs:string"\r
+               minOccurs="1" maxOccurs="1" />        <!-- new name for documentType2 -->\r
        <xs:element name="objectUri" type="xs:string" />\r
-\r
-       <xs:element name="subjectRefName" type="xs:string" />\r
        <xs:element name="objectRefName" type="xs:string" />\r
 \r
        <!-- enumeration defining the type of relationship between two entities -->\r
@@ -62,7 +61,6 @@
                        <xs:enumeration value="hasBroader" />\r
                </xs:restriction>\r
        </xs:simpleType>\r
-        <xs:element name="relationshipMetaType" type="xs:string" minOccurs="0"/>\r
 \r
 </xs:schema>\r
 \r