From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Mon, 10 Oct 2011 21:26:23 +0000 (+0000)
Subject: CSPACE-4468,CSPACE-4470: Added subjectRefName and objectRefName fields to Relation... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=ee776288b5b69a84170bc49ddb1d0fd11771c201;p=tmp%2Fjakarta-migration.git

CSPACE-4468,CSPACE-4470: Added subjectRefName and objectRefName fields to Relation record schema in support of making refNames alternate identifiers for Relation records, alongside CSIDs. Added subjectDocumentType and objectDocumentType fields to Relation record schema to continue transitioning to new style field names, from ambiguous old style names like 'documentType1' and 'documentType2'.
---

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 a3b41bb07..6c28e5cea 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
@@ -37,18 +37,23 @@
     <xs:element name="documentId1" type="xs:string"  minOccurs="1" maxOccurs="1"/>
     <xs:element name="subjectCsid" type="xs:string"  minOccurs="1" maxOccurs="1"/>     <!-- new name for documentId1 -->
     <xs:element name="documentType1" type="xs:string"  minOccurs="1" maxOccurs="1"/>
+    <xs:element name="subjectDocumentType" type="xs:string"  minOccurs="1" maxOccurs="1"/>     <!-- new name for documentType1 -->
+
     <xs:element name="documentId2" type="xs:string"  minOccurs="1" maxOccurs="1"/>
     <xs:element name="objectCsid" type="xs:string"  minOccurs="1" maxOccurs="1"/>        <!-- new name for documentId2 -->
     <xs:element name="documentType2" type="xs:string"  minOccurs="1" maxOccurs="1"/>
+    <xs:element name="objectDocumentType" type="xs:string"  minOccurs="1" maxOccurs="1"/>        <!-- new name for documentType2 -->
 
             <!-- type of relationship between two entities -->
     <xs:element name="relationshipType" type="rel:RelationshipType" minOccurs="1" maxOccurs="1"/>
     <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="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 -->
     <xs:simpleType name="RelationshipType">