From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Fri, 11 May 2012 00:12:53 +0000 (-0700)
Subject: CSPACE-5124: Update Place authority item schema in services Nuxeo and JAXB XSD files... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=a8de833366b00107b34797183551d8b2cfc3c7ae;p=tmp%2Fjakarta-migration.git

CSPACE-5124: Update Place authority item schema in services Nuxeo and JAXB XSD files to reflect the current wiki schema and App layer config. Specifically: 1) add placeSource field; 2) remove placeRecordAdminStatus field; 3) rename placeIdentifier field to placeID; 4) rename 'note' field to placeNote. Renaming as in 3) and 4) is for consistency with wiki schema for Place and with naming conventions used in other authority item schemas.
---

diff --git a/services/place/3rdparty/nuxeo-platform-cs-place/src/main/resources/schemas/places_common.xsd b/services/place/3rdparty/nuxeo-platform-cs-place/src/main/resources/schemas/places_common.xsd
index f686de145..86b9db2a0 100644
--- a/services/place/3rdparty/nuxeo-platform-cs-place/src/main/resources/schemas/places_common.xsd
+++ b/services/place/3rdparty/nuxeo-platform-cs-place/src/main/resources/schemas/places_common.xsd
@@ -28,18 +28,12 @@
     <!-- Term Information repeatable group -->
     <xs:element name="placeTermGroupList" type="placeTermGroupList"/>
         
-    <!-- Does this pertain to the item or to individual terms? -->
+    <xs:element name="placeID" type="xs:string" />
     <xs:element name="placeType" type="xs:string" />
-    
-    <xs:element name="placeRecordAdminStatus" type="xs:string" />
-    
-    <!-- Should this have been placeID? -->
-    <xs:element name="placeIdentifier" type="xs:string" />
-    
-    <!-- xs:element name="placeNameGroupList" type="placeNameGroupList"/ -->
-    
+    <xs:element name="placeSource" type="xs:string" />
+    <xs:element name="placeNote" type="xs:string" />
+
     <xs:element name="placeOwnerGroupList" type="placeOwnerGroupList"/>
-    <xs:element name="note" type="xs:string"/>
 
     <!-- Locality Information  -->
     <xs:element name="vCoordinates" type="xs:string"/>
@@ -62,30 +56,6 @@
 
     <xs:element name="placeGeoRefGroupList" type="placeGeoRefGroupList"/>
 
-    <!--
-    <xs:complexType name="placeNameGroupList">
-        <xs:sequence>
-            <xs:element name="placeNameGroup" type="placeNameGroup" minOccurs="0" maxOccurs="unbounded"/>
-        </xs:sequence>
-    </xs:complexType>
-
-    <xs:complexType name="placeNameGroup">
-        <xs:sequence>
-            <xs:element name="placeName" type="xs:string"/>
-            <xs:element name="nameQualifiedName" type="xs:string"/>
-            <xs:element name="nameLanguage" type="xs:string"/>
-            <xs:element name="nameAbbrev" type="xs:string"/>
-            <xs:element name="nameType" type="xs:string"/>
-            <xs:element name="nameStatus" type="xs:string"/>
-            <xs:element name="nameSource" type="xs:string"/>
-            <xs:element name="nameSourceDetail" type="xs:string"/>
-            <xs:element name="nameSourceRefId" type="xs:string"/>
-            <xs:element name="nameNote" type="xs:string"/>
-            <xs:element name="nameDateGroup" type="structuredDateGroup"/>
-            <xs:element name="nameAdminStatus" type="xs:string"/>
-        </xs:sequence>
-    </xs:complexType>
-    -->
     
     <xs:complexType name="placeOwnerGroupList">
         <xs:sequence>
diff --git a/services/place/jaxb/src/main/resources/place_common.xsd b/services/place/jaxb/src/main/resources/place_common.xsd
index ae411b67f..40c4591f4 100644
--- a/services/place/jaxb/src/main/resources/place_common.xsd
+++ b/services/place/jaxb/src/main/resources/place_common.xsd
@@ -9,7 +9,6 @@
     version="0.1"
 >
     
-    
     <!-- avoid XmlRootElement nightnmare, see http://weblogs.java.net/blog/kohsuke/archive/2006/03/why_does_jaxb_p.html-->
     <!-- See http://wiki.collectionspace.org/display/collectionspace/Place+Service+Home -->    
     
@@ -29,14 +28,12 @@
                     <!-- Term Information repeatable group -->
                 <xs:element name="placeTermGroupList" type="placeTermGroupList"/>                    
                     
+                <xs:element name="placeID" type="xs:string" />
                 <xs:element name="placeType" type="xs:string" />
-                <xs:element name="placeRecordAdminStatus" type="xs:string" />
-                <xs:element name="placeIdentifier" type="xs:string" />
-                    
-                    <!-- xs:element name="placeNameGroupList" type="placeNameGroupList"/ -->
+                <xs:element name="placeSource" type="xs:string" />
+                <xs:element name="placeNote" type="xs:string" />
                     
                 <xs:element name="placeOwnerGroupList" type="placeOwnerGroupList"/>
-                <xs:element name="note" type="xs:string"/>
 
                     <!-- Locality Information  -->
                 <xs:element name="vCoordinates" type="xs:string"/>
@@ -62,31 +59,6 @@
         </xs:complexType>
     </xs:element>
     
-    <!--
-    <xs:complexType name="placeNameGroupList">
-        <xs:sequence>
-            <xs:element name="placeNameGroup" type="placeNameGroup" minOccurs="0" maxOccurs="unbounded"/>
-        </xs:sequence>
-    </xs:complexType>
-
-    <xs:complexType name="placeNameGroup">
-        <xs:sequence>
-            <xs:element name="placeName" type="xs:string"/>
-            <xs:element name="nameQualifiedName" type="xs:string"/>
-            <xs:element name="nameLanguage" type="xs:string"/>
-            <xs:element name="nameAbbrev" type="xs:string"/>
-            <xs:element name="nameType" type="xs:string"/>
-            <xs:element name="nameStatus" type="xs:string"/>
-            <xs:element name="nameSource" type="xs:string"/>
-            <xs:element name="nameSourceDetail" type="xs:string"/>
-            <xs:element name="nameSourceRefId" type="xs:string"/>
-            <xs:element name="nameNote" type="xs:string"/>
-            <xs:element name="nameDateGroup" type="structuredDateGroup"/>
-            <xs:element name="nameAdminStatus" type="xs:string"/>
-        </xs:sequence>
-    </xs:complexType>
-    -->
-    
     <xs:complexType name="placeOwnerGroupList">
         <xs:sequence>
             <xs:element name="placeOwnerGroup" type="placeOwnerGroup" minOccurs="0" maxOccurs="unbounded"/>