From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Tue, 24 May 2011 06:09:45 +0000 (+0000)
Subject: CSPACE-3865: Add custom Taxonomy-related fields to JAXB CollectionObject schema;... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=e31d6f9af4df0a4252f6ff207eb084a27ad42caf;p=tmp%2Fjakarta-migration.git

CSPACE-3865: Add custom Taxonomy-related fields to JAXB CollectionObject schema; make namespaces consistent between schemas and with core-types-contrib and tenant-bindings files.
---

diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects_naturalhistory.xsd b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects_naturalhistory.xsd
index f709a5c67..92c20a7f5 100644
--- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects_naturalhistory.xsd
+++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/src/main/resources/schemas/collectionobjects_naturalhistory.xsd
@@ -13,9 +13,9 @@
 
 <xs:schema 
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:ns="http://collectionspace.org/collectionobject/"
-  xmlns="http://collectionspace.org/collectionobject/"
-  targetNamespace="http://collectionspace.org/collectionobject/"
+  xmlns:ns="http://collectionspace.org/services/collectionobject/domain/naturalhistory"
+  xmlns="http://collectionspace.org/services/collectionobject/domain/naturalhistory"
+  targetNamespace="http://collectionspace.org/services/collectionobject/domain/naturalhistory"
   version="0.1">
 
   <!-- used for testing
diff --git a/services/collectionobject/jaxb/src/main/resources/collectionobjects_naturalhistory.xsd b/services/collectionobject/jaxb/src/main/resources/collectionobjects_naturalhistory.xsd
index 01c3b7d19..e8d3b598f 100644
--- a/services/collectionobject/jaxb/src/main/resources/collectionobjects_naturalhistory.xsd
+++ b/services/collectionobject/jaxb/src/main/resources/collectionobjects_naturalhistory.xsd
@@ -20,15 +20,121 @@
 >
     <!-- collection-object for museum of natural history  -->
     <xs:element name="collectionobjects_naturalhistory">
-        <xs:complexType>
-            <xs:sequence>
-                <xs:element name="nh-string" type="xs:string" />
-                <xs:element name="nh-int" type="xs:int"/>
-                <xs:element name="nh-long" type="xs:long"/>
-                <xs:element name="nh-date" type="xs:dateTime"/>
-                <xs:element name="nh-note" type="xs:string"/>
-            </xs:sequence>
+    
+        <!--
+            <xs:complexType>
+                <xs:sequence>
+                    <xs:element name="nh-string" type="xs:string" />
+                    <xs:element name="nh-int" type="xs:int"/>
+                    <xs:element name="nh-long" type="xs:long"/>
+                    <xs:element name="nh-date" type="xs:dateTime"/>
+                    <xs:element name="nh-note" type="xs:string"/>
+                </xs:sequence>
+            </xs:complexType>
+        -->
+            
+        <xs:element name="fieldLocVerbatim" type="xs:string"/>
+        <xs:element name="fieldCollectionDateEarliest" type="xs:string"/>
+        <xs:element name="fieldCollectionDateLatest" type="xs:string"/>
+        <xs:element name="fieldLocLatDecimal" type="xs:string"/>
+        <xs:element name="fieldLocLongDecimal" type="xs:string"/>
+        <xs:element name="fieldLocElevation" type="xs:string"/>
+
+        <!-- These will become contolled lists -->
+        <xs:element name="fieldLocCounty" type="xs:string"/>
+        <xs:element name="fieldLocState" type="xs:string"/>
+        <xs:element name="fieldLocCountry" type="xs:string"/>
+        <xs:element name="fieldHigherGeography" type="xs:string"/>
+
+        <xs:element name="taxonomicIdentGroupList" type="taxonomicIdentGroupList"/>
+        <xs:element name="typeSpecimenGroupList" type="typeSpecimenGroupList"/>
+        <xs:element name="fieldCollElevationGroupList" type="fieldCollElevationGroupList"/>
+        <xs:element name="fieldCollDepthGroupList" type="fieldCollDepthGroupList"/>
+        <xs:element name="associatedTaxaGroupList" type="associatedTaxaGroupList"/>
+
+        <xs:complexType name="taxonomicIdentGroupList">
+                <xs:sequence>
+                        <xs:element name="taxonomicIdentGroup" type="taxonomicIdentGroup" minOccurs="0"
+                                maxOccurs="unbounded"/>
+                </xs:sequence>
+        </xs:complexType>
+        <xs:complexType name="taxonomicIdentGroup">
+                <xs:sequence>
+                        <xs:element name="taxon" type="xs:string"/>
+                        <xs:element name="qualifier" type="xs:string"/>
+                        <xs:element name="identBy" type="xs:string"/>
+                        <xs:element name="identDate" type="xs:string"/>
+                        <xs:element name="institution" type="xs:string"/>
+                        <xs:element name="identKind" type="xs:string"/>
+                        <xs:element name="reference" type="xs:string"/>
+                        <xs:element name="refPage" type="xs:string"/>
+                        <xs:element name="notes" type="xs:string"/>
+                 </xs:sequence>
+        </xs:complexType>
+
+        <xs:complexType name="typeSpecimenGroupList">
+                <xs:sequence>
+                        <xs:element name="typeSpecimenGroup" type="typeSpecimenGroup" minOccurs="0"
+                                maxOccurs="unbounded"/>
+                </xs:sequence>
+        </xs:complexType>
+        <xs:complexType name="typeSpecimenGroup">
+                <xs:sequence>
+                        <xs:element name="kindOfType" type="xs:string"/>
+                        <xs:element name="reference" type="xs:string"/>
+                        <xs:element name="refPage" type="xs:string"/>
+                        <xs:element name="institution" type="xs:string"/>
+                        <xs:element name="institutionType" type="xs:string"/>
+                        <xs:element name="notes" type="xs:string"/>
+                 </xs:sequence>
+        </xs:complexType>
+
+        <xs:complexType name="fieldCollElevationGroupList">
+                <xs:sequence>
+                        <xs:element name="fieldCollElevationGroup" type="fieldCollElevationGroup" minOccurs="0"
+                                maxOccurs="unbounded"/>
+                </xs:sequence>
+        </xs:complexType>
+        <xs:complexType name="fieldCollElevationGroup">
+                <xs:sequence>
+                        <xs:element name="minElevation" type="xs:integer"/>
+                        <xs:element name="maxElevation" type="xs:integer"/>
+                        <xs:element name="units" type="xs:string"/>
+                        <xs:element name="qualifier" type="xs:string"/>
+                        <xs:element name="notes" type="xs:string"/>
+                 </xs:sequence>
+        </xs:complexType>
+
+        <xs:complexType name="fieldCollDepthGroupList">
+                <xs:sequence>
+                        <xs:element name="fieldCollDepthGroup" type="fieldCollDepthGroup" minOccurs="0"
+                                maxOccurs="unbounded"/>
+                </xs:sequence>
+        </xs:complexType>
+        <xs:complexType name="fieldCollDepthGroup">
+                <xs:sequence>
+                        <xs:element name="minDepth" type="xs:integer"/>
+                        <xs:element name="maxDepth" type="xs:integer"/>
+                        <xs:element name="units" type="xs:string"/>
+                        <xs:element name="qualifier" type="xs:string"/>
+                        <xs:element name="notes" type="xs:string"/>
+                 </xs:sequence>
+        </xs:complexType>
+
+        <xs:complexType name="associatedTaxaGroupList">
+                <xs:sequence>
+                        <xs:element name="associatedTaxaGroup" type="associatedTaxaGroup" minOccurs="0"
+                                maxOccurs="unbounded"/>
+                </xs:sequence>
+        </xs:complexType>
+        <xs:complexType name="associatedTaxaGroup">
+                <xs:sequence>
+                        <xs:element name="taxon" type="xs:string"/>
+                        <xs:element name="commonName" type="xs:integer"/>
+                        <xs:element name="interaction" type="xs:integer"/>
+                 </xs:sequence>
         </xs:complexType>
+            
     </xs:element>
     
 </xs:schema>