CSPACE-5119,CSPACE-5120,CSPACE-5157: Removed legacy Description field from Organizati...

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 283297e2868b8d6d2b181bc300e7c953a130f459..1c25429b8a523e1e58d7323cd8677f0c8dc2a32c 100644 (file)
--- 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 905b05d124b0175245d96e383e81dadfd6daab95..139d16663d61c28e2db941ae8730ab2f0902c5d6 100644 (file)
--- 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 87179a5717a9380cff4e7fb8aacf88788984ce38..fe329a3fc5ed1561f4c08ae35731d6c08c29347f 100644 (file)
--- 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 23a483d79d0521eed3fb57eb43b5d96e969e4e50..fbaeb8a6e6455d9398ea4ce9efd5706fbd4a8293 100644 (file)
--- 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"/>