From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Fri, 4 May 2012 18:28:20 +0000 (-0700)
Subject: CSPACE-5119,CSPACE-5120,CSPACE-5157: Removed legacy Description field from Organizati... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=88ec78cbb72407eb1506f8b602e9a1858d6f3276;p=tmp%2Fjakarta-migration.git

CSPACE-5119,CSPACE-5120,CSPACE-5157: Removed legacy Description field from Organization schema. In the repeatable term info group, renamed termSourceUniqueID to termSourceID and termPreferredForLanguage to termPrefForLang, per Patrick's conciseness recommendations and to match Alex's UI schema.
---

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 283297e28..1c25429b8 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
@@ -32,7 +32,6 @@
 
     <xs:element name="mainBodyGroupList" type="mainBodyGroupList"/>
     
-    <xs:element name="description" type="xs:string"/>
     <xs:element name="foundingDate" type="xs:string"/>
     <xs:element name="dissolutionDate" type="xs:string"/>
     <xs:element name="foundingPlace" type="xs:string"/>
@@ -99,10 +98,10 @@
                 <xs:element name="termStatus" type="xs:string"/>
                 <xs:element name="termQualifier" type="xs:string"/>
                 <xs:element name="termLanguage" type="xs:string"/>
-                <xs:element name="termPreferredForLanguage" type="xs:boolean"/>
+                <xs:element name="termPrefForLang" type="xs:boolean"/>
                 <xs:element name="termSource" type="xs:string"/>
                 <xs:element name="termSourceDetail" type="xs:string"/>
-                <xs:element name="termSourceUniqueID" type="xs:string"/>
+                <xs:element name="termSourceID" type="xs:string"/>
                 <!-- Specific to Organization terms -->
             </xs:sequence>
         </xs:complexType>
diff --git a/services/organization/jaxb/src/main/resources/organization_common.xsd b/services/organization/jaxb/src/main/resources/organization_common.xsd
index 905b05d12..139d16663 100644
--- a/services/organization/jaxb/src/main/resources/organization_common.xsd
+++ b/services/organization/jaxb/src/main/resources/organization_common.xsd
@@ -29,7 +29,6 @@
                 
                 <xs:element name="mainBodyGroupList" type="mainBodyGroupList"/>
                 
-                <xs:element name="description" type="xs:string"/>
                 <xs:element name="foundingDate" type="xs:string"/>
                 <xs:element name="dissolutionDate" type="xs:string"/>
                 <xs:element name="foundingPlace" type="xs:string"/>
@@ -95,10 +94,10 @@
             <xs:element name="termStatus" type="xs:string"/>
             <xs:element name="termQualifier" type="xs:string"/>
             <xs:element name="termLanguage" type="xs:string"/>
-            <xs:element name="termPreferredForLanguage" type="xs:boolean"/>
+            <xs:element name="termPrefForLang" type="xs:boolean"/>
             <xs:element name="termSource" type="xs:string"/>
             <xs:element name="termSourceDetail" type="xs:string"/>
-            <xs:element name="termSourceUniqueID" type="xs:string"/>
+            <xs:element name="termSourceID" type="xs:string"/>
             <!-- Specific to Organization terms -->
         </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 87179a571..fe329a3fc 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
@@ -82,10 +82,10 @@
             <xs:element name="termStatus" type="xs:string"/>
             <xs:element name="termQualifier" type="xs:string"/>
             <xs:element name="termLanguage" type="xs:string"/>
-            <xs:element name="termPreferredForLanguage" type="xs:boolean"/>
+            <xs:element name="termPrefForLang" type="xs:boolean"/>
             <xs:element name="termSource" type="xs:string"/>
             <xs:element name="termSourceDetail" type="xs:string"/>
-            <xs:element name="termSourceUniqueID" type="xs:string"/>
+            <xs:element name="termSourceID" 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 23a483d79..fbaeb8a6e 100644
--- a/services/person/jaxb/src/main/resources/person_common.xsd
+++ b/services/person/jaxb/src/main/resources/person_common.xsd
@@ -71,10 +71,10 @@
             <xs:element name="termStatus" type="xs:string"/>
             <xs:element name="termQualifier" type="xs:string"/>
             <xs:element name="termLanguage" type="xs:string"/>
-            <xs:element name="termPreferredForLanguage" type="xs:boolean"/>
+            <xs:element name="termPrefForLang" type="xs:boolean"/>
             <xs:element name="termSource" type="xs:string"/>
             <xs:element name="termSourceDetail" type="xs:string"/>
-            <xs:element name="termSourceUniqueID" type="xs:string"/>
+            <xs:element name="termSourceID" type="xs:string"/>
             <!-- Specific to Person terms -->
             <xs:element name="foreName" type="xs:string"/>
             <xs:element name="middleName" type="xs:string"/>