From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Fri, 4 May 2012 20:13:17 +0000 (-0700)
Subject: CSPACE-5119,CSPACE-5120: Added termSourceNote to person and org schema's repeatable... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=f900d83f09847037914848541ba38fcfa94f68e5;p=tmp%2Fjakarta-migration.git

CSPACE-5119,CSPACE-5120: Added termSourceNote to person and org schema's repeatable term info group. Moved two fields from mainBodyGroup into that term info group, and removed the mainBodyGroup.
---

diff --git a/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/schemas/organizations_common.xsd b/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/schemas/organizations_common.xsd
index 1c25429b8..6a9f12e0b 100644
--- a/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/schemas/organizations_common.xsd
+++ b/services/organization/3rdparty/nuxeo-platform-cs-organization/src/main/resources/schemas/organizations_common.xsd
@@ -29,82 +29,68 @@
     
     <!-- Term Information repeatable group -->
     <xs:element name="orgTermGroupList" type="orgTermGroupList"/>
-
-    <xs:element name="mainBodyGroupList" type="mainBodyGroupList"/>
     
     <xs:element name="foundingDate" type="xs:string"/>
     <xs:element name="dissolutionDate" type="xs:string"/>
     <xs:element name="foundingPlace" type="xs:string"/>
-    <xs:annotation>
     
-        <xs:element name="groups">
-            <xs:complexType>
-                <xs:sequence>
-                    <xs:element name="group" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-                </xs:sequence>
-            </xs:complexType>
-        </xs:element>
+    <xs:element name="groups">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="group" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
     
-        <xs:element name="functions">
-            <xs:complexType>
-                <xs:sequence>
-                    <xs:element name="function" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-                </xs:sequence>
-            </xs:complexType>
-        </xs:element>
-            
-        <xs:element name="contactNames">
-            <xs:complexType>
-                <xs:sequence>
-                    <xs:element name="contactName" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-                </xs:sequence>
-            </xs:complexType>
-        </xs:element>
-
-        <xs:element name="historyNotes" type="historyNotes"/>
-
-        <xs:complexType name="mainBodyGroupList">
+    <xs:element name="functions">
+        <xs:complexType>
             <xs:sequence>
-                <xs:element name="mainBodyGroup" type="mainBodyGroup" minOccurs="0" maxOccurs="unbounded"/>
+                <xs:element name="function" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
             </xs:sequence>
         </xs:complexType>
-
-        <xs:complexType name="mainBodyGroup">
+    </xs:element>
+            
+    <xs:element name="contactNames">
+        <xs:complexType>
             <xs:sequence>
-                <xs:element name="longName" type="xs:string"/>
-                <xs:element name="shortName" type="xs:string"/>
-                <xs:element name="nameAdditions" type="xs:string"/>
+                <xs:element name="contactName" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
             </xs:sequence>
         </xs:complexType>
+    </xs:element>
 
-        <xs:complexType name="historyNotes">
+    <xs:element name="historyNotes" type="historyNotes">
+        <xs:complexType>
             <xs:sequence>
                 <xs:element name="historyNote" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
             </xs:sequence>
         </xs:complexType>
+    </xs:element>
     
-        <xs:complexType name="orgTermGroupList">
-            <xs:sequence>
-                <xs:element name="orgTermGroup" type="orgTermGroup" minOccurs="0" maxOccurs="unbounded"/>
-            </xs:sequence>
-        </xs:complexType>
+    <xs:complexType name="orgTermGroupList">
+        <xs:sequence>
+            <xs:element name="orgTermGroup" type="orgTermGroup" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
 
-        <xs:complexType name="orgTermGroup">
-            <xs:sequence>
+    <xs:complexType name="orgTermGroup">
+        <xs:sequence>
                 <!-- Common across all authority item terms -->
-                <xs:element name="termDisplayName" type="xs:string"/>
-                <xs:element name="termName" type="xs:string"/>
-                <xs:element name="termType" type="xs:string"/>
-                <xs:element name="termStatus" type="xs:string"/>
-                <xs:element name="termQualifier" type="xs:string"/>
-                <xs:element name="termLanguage" type="xs:string"/>
-                <xs:element name="termPrefForLang" type="xs:boolean"/>
-                <xs:element name="termSource" type="xs:string"/>
-                <xs:element name="termSourceDetail" type="xs:string"/>
-                <xs:element name="termSourceID" type="xs:string"/>
+            <xs:element name="termDisplayName" type="xs:string"/>
+            <xs:element name="termName" type="xs:string"/>
+            <xs:element name="termType" type="xs:string"/>
+            <xs:element name="termStatus" type="xs:string"/>
+            <xs:element name="termQualifier" type="xs:string"/>
+            <xs:element name="termLanguage" type="xs:string"/>
+            <xs:element name="termPrefForLang" type="xs:boolean"/>
+            <xs:element name="termSource" type="xs:string"/>
+            <xs:element name="termSourceDetail" type="xs:string"/>
+            <xs:element name="termSourceID" type="xs:string"/>
+            <xs:element name="termSourceNote" type="xs:string"/>
                 <!-- Specific to Organization terms -->
-            </xs:sequence>
-        </xs:complexType>
+            <xs:element name="mainBodyName" type="xs:string"/>
+            <xs:element name="additionsToName" type="xs:string"/>
+        </xs:sequence>
+    </xs:complexType>
     
-    </xs:schema>
+</xs:schema>
 
diff --git a/services/organization/jaxb/src/main/resources/organization_common.xsd b/services/organization/jaxb/src/main/resources/organization_common.xsd
index 139d16663..90941ec0b 100644
--- a/services/organization/jaxb/src/main/resources/organization_common.xsd
+++ b/services/organization/jaxb/src/main/resources/organization_common.xsd
@@ -26,9 +26,7 @@
                 
                 <!-- Term Information repeatable group -->
                 <xs:element name="orgTermGroupList" type="orgTermGroupList"/>
-                
-                <xs:element name="mainBodyGroupList" type="mainBodyGroupList"/>
-                
+                                
                 <xs:element name="foundingDate" type="xs:string"/>
                 <xs:element name="dissolutionDate" type="xs:string"/>
                 <xs:element name="foundingPlace" type="xs:string"/>
@@ -40,20 +38,6 @@
             </xs:sequence>
         </xs:complexType>
     </xs:element>
-
-    <xs:complexType name="mainBodyGroupList">
-        <xs:sequence>
-            <xs:element name="mainBodyGroup" type="mainBodyGroup" minOccurs="0" maxOccurs="unbounded"/>
-        </xs:sequence>
-    </xs:complexType>
-
-    <xs:complexType name="mainBodyGroup">
-        <xs:sequence>
-            <xs:element name="longName" type="xs:string"/>
-            <xs:element name="shortName" type="xs:string"/>
-            <xs:element name="nameAdditions" type="xs:string"/>
-        </xs:sequence>
-    </xs:complexType>
     
     <xs:complexType name="contactNameList">
         <xs:sequence>
@@ -98,7 +82,10 @@
             <xs:element name="termSource" type="xs:string"/>
             <xs:element name="termSourceDetail" type="xs:string"/>
             <xs:element name="termSourceID" type="xs:string"/>
+            <xs:element name="termSourceNote" type="xs:string"/>
             <!-- Specific to Organization terms -->
+            <xs:element name="mainBodyName" type="xs:string"/>
+            <xs:element name="additionsToName" type="xs:string"/>
         </xs:sequence>
     </xs:complexType>
 
diff --git a/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/schemas/persons_common.xsd b/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/schemas/persons_common.xsd
index fe329a3fc..56cc99ce3 100644
--- a/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/schemas/persons_common.xsd
+++ b/services/person/3rdparty/nuxeo-platform-cs-person/src/main/resources/schemas/persons_common.xsd
@@ -86,6 +86,7 @@
             <xs:element name="termSource" type="xs:string"/>
             <xs:element name="termSourceDetail" type="xs:string"/>
             <xs:element name="termSourceID" type="xs:string"/>
+            <xs:element name="termSourceNote" type="xs:string"/>
             <!-- Specific to Person terms -->
             <xs:element name="foreName" type="xs:string"/>
             <xs:element name="middleName" type="xs:string"/>
diff --git a/services/person/jaxb/src/main/resources/person_common.xsd b/services/person/jaxb/src/main/resources/person_common.xsd
index fbaeb8a6e..62402ff70 100644
--- a/services/person/jaxb/src/main/resources/person_common.xsd
+++ b/services/person/jaxb/src/main/resources/person_common.xsd
@@ -75,6 +75,7 @@
             <xs:element name="termSource" type="xs:string"/>
             <xs:element name="termSourceDetail" type="xs:string"/>
             <xs:element name="termSourceID" type="xs:string"/>
+            <xs:element name="termSourceNote" type="xs:string"/>
             <!-- Specific to Person terms -->
             <xs:element name="foreName" type="xs:string"/>
             <xs:element name="middleName" type="xs:string"/>