From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Fri, 13 May 2011 00:36:23 +0000 (+0000)
Subject: CSPACE-3756: Removed vestigial 'flat' structured date from CollectionObject service... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=d9e21355970608ca8536b1bd4d2885ba395a8e91;p=tmp%2Fjakarta-migration.git

CSPACE-3756: Removed vestigial 'flat' structured date from CollectionObject service's JAXB schema. Removed repeatable scalar ObjectProductionDates field from CollectionObject service's JAXB and Nuxeo schemas. Verified that these fields do not appear in default.xml.
---

diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects_common.xsd b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects_common.xsd
index c7766cc6d..06605323e 100644
--- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects_common.xsd
+++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects_common.xsd
@@ -216,24 +216,6 @@
 
     <!-- Object Production Information -->
 
-    <!--
-        The Object Production Date field is being transitioned to be a
-        structured date, per CSPACE-3756.
-
-        The original multivalued / repeating text field, objectProductionDates,
-        is being retained here for backwards compatibility, for now.  When the
-        objectProductionDateGroup is implemented across layers, and is additionally
-        made multivalued - in the services schemae, by wrapping it in a parent
-        objectProductionDateGroupList element - the legacy objectProductionDates
-        element can then be removed.
-    -->
-    <xs:element name="objectProductionDates">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element name="objectProductionDate" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
-            </xs:sequence>
-        </xs:complexType>
-    </xs:element>
     <xs:element name="objectProductionDateGroup" type="objectProductionDateGroup"/>
 
     <xs:element name="objectProductionNote" type="xs:string"/>
diff --git a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
index 9b9da39ee..82faac2c4 100644
--- a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
+++ b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
@@ -134,18 +134,6 @@
 
                 <!-- Object Production Information -->
 
-                <!--
-                    The Object Production Date field is being transitioned to be a
-                    structured date, per CSPACE-3756.
-
-                    The original multivalued / repeating text field, objectProductionDates,
-                    is being retained here for backwards compatibility, for now.  When the
-                    objectProductionDateGroup is implemented across layers, and is additionally
-                    made multivalued - in the services schemae, by wrapping it in a parent
-                    objectProductionDateGroupList element - the legacy objectProductionDates
-                    element can then be removed.
-                -->
-                <xs:element name="objectProductionDates" type="objectProductionDateList"/>
                 <xs:element name="objectProductionDateGroup" type="objectProductionDateGroup"/>
 
                 <xs:element name="objectProductionNote" type="xs:string"/>
@@ -219,18 +207,6 @@
                 <xs:element name="fieldCollectionSources" type="fieldCollectionSourceList"/>
                 <xs:element name="fieldCollectors" type="fieldCollectorList"/>
                 <xs:element name="fieldColEventNames" type="fieldColEventNameList"/>
-				
-                <!-- Object Description Date Information -->
-                <!-- This appears to be a placeholder structured date -->
-                <xs:element name="dateAssociation" type="xs:string"/>
-                <xs:element name="dateEarliestSingle" type="xs:string"/>
-                <xs:element name="dateEarliestSingleCertainty" type="xs:string"/>
-                <xs:element name="dateEarliestSingleQualifier" type="xs:string"/>
-                <xs:element name="dateLatest" type="xs:string"/>
-                <xs:element name="dateLatestCertainty" type="xs:string"/>
-                <xs:element name="dateLatestQualifier" type="xs:string"/>
-                <xs:element name="datePeriod" type="xs:string"/>
-                <xs:element name="dateText" type="xs:string"/>
                 
             </xs:sequence>
         </xs:complexType>