CSPACE-3756: Removed vestigial 'flat' structured date from CollectionObject service...

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 c7766cc6d2ec64e9278cfb97b194511e387c576a..06605323ec3210cb6105f59a7c142c9d28faccc1 100644 (file)
--- 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 @@
 \r
     <!-- Object Production Information -->\r
 \r
-    <!--\r
-        The Object Production Date field is being transitioned to be a\r
-        structured date, per CSPACE-3756.\r
-\r
-        The original multivalued / repeating text field, objectProductionDates,\r
-        is being retained here for backwards compatibility, for now.  When the\r
-        objectProductionDateGroup is implemented across layers, and is additionally\r
-        made multivalued - in the services schemae, by wrapping it in a parent\r
-        objectProductionDateGroupList element - the legacy objectProductionDates\r
-        element can then be removed.\r
-    -->\r
-    <xs:element name="objectProductionDates">\r
-        <xs:complexType>\r
-            <xs:sequence>\r
-                <xs:element name="objectProductionDate" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
-            </xs:sequence>\r
-        </xs:complexType>\r
-    </xs:element>\r
     <xs:element name="objectProductionDateGroup" type="objectProductionDateGroup"/>\r
 \r
     <xs:element name="objectProductionNote" type="xs:string"/>\r

diff --git a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd
index 9b9da39eeb984a501f24b5c29ac8ac74da40c546..82faac2c41d90c3786d458176852a1d5918bc236 100644 (file)
--- 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>