From f3673a5c01f612ffb65952f42ca942b5a1918592 Mon Sep 17 00:00:00 2001
From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Thu, 23 May 2013 15:18:27 -0700
Subject: [PATCH] CSPACE-6007: Renamed citationsNotes field to citationNote, in
 keeping with widely-used naming convention in services schema, to avoid
 ambiguity about potential repeatability, and to match the wiki schema name.

---
 .../resources/schemas/citations_common.xsd    | 110 ++++++++----------
 .../src/main/resources/citation_common.xsd    | 101 +++++++---------
 2 files changed, 91 insertions(+), 120 deletions(-)

diff --git a/services/citation/3rdparty/nuxeo-platform-cs-citation/src/main/resources/schemas/citations_common.xsd b/services/citation/3rdparty/nuxeo-platform-cs-citation/src/main/resources/schemas/citations_common.xsd
index 476c312d9..c8c1f2c13 100644
--- a/services/citation/3rdparty/nuxeo-platform-cs-citation/src/main/resources/schemas/citations_common.xsd
+++ b/services/citation/3rdparty/nuxeo-platform-cs-citation/src/main/resources/schemas/citations_common.xsd
@@ -6,9 +6,6 @@
     Entity  : Citation
     Part    : Common
     Used for: Nuxeo EP core document type
-    
-    $LastChangedRevision: 860 $
-    $LastChangedDate: 2009-10-14 14:48:05 -0700 (Wed, 14 Oct 2009) $
 -->
 
 <xs:schema 
@@ -18,7 +15,7 @@
     targetNamespace="http://collectionspace.org/services/citation"
     version="0.1"
 >
-<!-- See http://wiki.collectionspace.org/display/collectionspace/Citation+Service+Home -->    
+    <!-- See http://wiki.collectionspace.org/display/collectionspace/Citation+Service+Home -->    
 
     <!--  Citation Information Group -->
     <!--  inAuthority is the csid of the owning CitationAuthority -->
@@ -28,7 +25,14 @@
 
     <!-- Term Information repeatable group -->
     <xs:element name="citationTermGroupList" type="citationTermGroupList"/>
+    <xs:element name="citationPublicationInfoGroupList" type="citationPublicationInfoGroupList" />
+    <xs:element name="citationAgentInfoGroupList" type="citationAgentInfoGroupList" />
+    <xs:element name="citationNote" type="xs:string"/>
+    <xs:element name="citationResourceIdentGroupList" type="citationResourceIdentGroupList" />
+    <xs:element name="citationRelatedTermsGroupList" type="citationRelatedTermsGroupList" />
     
+    <!-- Complex types referenced in declarations above -->
+
     <xs:complexType name="citationTermGroupList">
         <xs:sequence>
             <xs:element name="citationTermGroup" type="citationTermGroup" minOccurs="0"
@@ -59,50 +63,16 @@
             <xs:element name="termIssue" type="xs:string"/>                        
         </xs:sequence>
     </xs:complexType>
-    
-    <!-- Before (re)using this generic complex type in any record type -->
-    <!-- other than CollectionObject, be sure to verify that Nuxeo handles -->
-    <!-- that correctly in its table creation/row linking. -->
-    <xs:complexType name="structuredDateGroup">
-        <xs:sequence>
-            <xs:element name="dateDisplayDate" type="xs:string"/>
-            <xs:element name="dateAssociation" type="xs:string"/>
-            <xs:element name="dateEarliestSingleYear" type="xs:integer"/>
-            <xs:element name="dateEarliestSingleMonth" type="xs:integer"/>
-            <xs:element name="dateEarliestSingleDay" type="xs:integer"/>
-            <xs:element name="dateEarliestSingleEra" type="xs:string"/>
-            <xs:element name="dateEarliestSingleCertainty" type="xs:string"/>
-            <xs:element name="dateEarliestSingleQualifier" type="xs:string"/>
-            <xs:element name="dateEarliestSingleQualifierValue" type="xs:integer"/>
-            <xs:element name="dateEarliestSingleQualifierUnit" type="xs:string"/>
-            <xs:element name="dateLatestYear" type="xs:integer"/>
-            <xs:element name="dateLatestMonth" type="xs:integer"/>
-            <xs:element name="dateLatestDay" type="xs:integer"/>
-            <xs:element name="dateLatestEra" type="xs:string"/>
-            <xs:element name="dateLatestCertainty" type="xs:string"/>
-            <xs:element name="dateLatestQualifier" type="xs:string"/>
-            <xs:element name="dateLatestQualifierValue" type="xs:integer"/>
-            <xs:element name="dateLatestQualifierUnit" type="xs:string"/>
-            <xs:element name="datePeriod" type="xs:string"/>
-            <xs:element name="dateNote" type="xs:string"/>
-            <xs:element name="dateEarliestScalarValue" type="xs:date"/>
-            <xs:element name="dateLatestScalarValue" type="xs:date"/>
-            <xs:element name="scalarValuesComputed" type="xs:boolean"/>
-        </xs:sequence>
-    </xs:complexType>
-    
-    <xs:element name="citationPublicationInfoGroupList" type="citationPublicationInfoGroupList" />
-    
+        
     <xs:complexType name="citationPublicationInfoGroupList">
         <xs:sequence>
             <xs:element name="citationPublicationInfoGroup" type="citationPublicationInfoGroup" minOccurs="0"
-                maxOccurs="unbounded"/>
+                        maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
-    
     <xs:complexType name="citationPublicationInfoGroup">
         <xs:sequence>
-        	<xs:element name="publisher" type="xs:string"/>
+            <xs:element name="publisher" type="xs:string"/>
             <xs:element name="place" type="xs:string"/>
             <xs:element name="publicationDate" type="structuredDateGroup" minOccurs="0" maxOccurs="unbounded"/>
             <xs:element name="edition" type="xs:string"/>
@@ -110,60 +80,74 @@
         </xs:sequence>
     </xs:complexType>
     
-    
-    
-    <xs:element name="citationAgentInfoGroupList" type="citationAgentInfoGroupList" />
-    
     <xs:complexType name="citationAgentInfoGroupList">
         <xs:sequence>
             <xs:element name="citationAgentInfoGroup" type="citationAgentInfoGroup" minOccurs="0"
-                maxOccurs="unbounded"/>
+                        maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
-    
     <xs:complexType name="citationAgentInfoGroup">
         <xs:sequence>
-        	<xs:element name="agent" type="xs:string"/>
+            <xs:element name="agent" type="xs:string"/>
             <xs:element name="role" type="xs:string"/>            
             <xs:element name="note" type="xs:string"/>
         </xs:sequence>
     </xs:complexType>
-            
-    <xs:element name="citationResourceIdentGroupList" type="citationResourceIdentGroupList" />
-    
+        
     <xs:complexType name="citationResourceIdentGroupList">
         <xs:sequence>
             <xs:element name="citationResourceIdentGroup" type="citationResourceIdentGroup" minOccurs="0"
-                maxOccurs="unbounded"/>
+                        maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
-    
     <xs:complexType name="citationResourceIdentGroup">
         <xs:sequence>
-        	<xs:element name="resourceIdent" type="xs:string"/>
+            <xs:element name="resourceIdent" type="xs:string"/>
             <xs:element name="type" type="xs:string"/>            
             <xs:element name="captureDate" type="structuredDateGroup" minOccurs="0" maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
-    
-    
-    <xs:element name="citationRelatedTermsGroupList" type="citationRelatedTermsGroupList" />
-    
+        
     <xs:complexType name="citationRelatedTermsGroupList">
         <xs:sequence>
             <xs:element name="citationRelatedTermsGroup" type="citationRelatedTermsGroup" minOccurs="0"
-                maxOccurs="unbounded"/>
+                        maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
-    
     <xs:complexType name="citationRelatedTermsGroup">
         <xs:sequence>
-        	<xs:element name="relatedTerm" type="xs:string"/>
+            <xs:element name="relatedTerm" type="xs:string"/>
             <xs:element name="relationType" type="xs:string"/>                        
         </xs:sequence>
     </xs:complexType>    
-    
-    <xs:element name="citationsNotes" type="xs:string"/>        
+        
+    <xs:complexType name="structuredDateGroup">
+        <xs:sequence>
+            <xs:element name="dateDisplayDate" type="xs:string"/>
+            <xs:element name="dateAssociation" type="xs:string"/>
+            <xs:element name="dateEarliestSingleYear" type="xs:integer"/>
+            <xs:element name="dateEarliestSingleMonth" type="xs:integer"/>
+            <xs:element name="dateEarliestSingleDay" type="xs:integer"/>
+            <xs:element name="dateEarliestSingleEra" type="xs:string"/>
+            <xs:element name="dateEarliestSingleCertainty" type="xs:string"/>
+            <xs:element name="dateEarliestSingleQualifier" type="xs:string"/>
+            <xs:element name="dateEarliestSingleQualifierValue" type="xs:integer"/>
+            <xs:element name="dateEarliestSingleQualifierUnit" type="xs:string"/>
+            <xs:element name="dateLatestYear" type="xs:integer"/>
+            <xs:element name="dateLatestMonth" type="xs:integer"/>
+            <xs:element name="dateLatestDay" type="xs:integer"/>
+            <xs:element name="dateLatestEra" type="xs:string"/>
+            <xs:element name="dateLatestCertainty" type="xs:string"/>
+            <xs:element name="dateLatestQualifier" type="xs:string"/>
+            <xs:element name="dateLatestQualifierValue" type="xs:integer"/>
+            <xs:element name="dateLatestQualifierUnit" type="xs:string"/>
+            <xs:element name="datePeriod" type="xs:string"/>
+            <xs:element name="dateNote" type="xs:string"/>
+            <xs:element name="dateEarliestScalarValue" type="xs:date"/>
+            <xs:element name="dateLatestScalarValue" type="xs:date"/>
+            <xs:element name="scalarValuesComputed" type="xs:boolean"/>
+        </xs:sequence>
+    </xs:complexType>      
 
 </xs:schema>
 
diff --git a/services/citation/jaxb/src/main/resources/citation_common.xsd b/services/citation/jaxb/src/main/resources/citation_common.xsd
index 0fd3cf6ac..9bc1b1808 100644
--- a/services/citation/jaxb/src/main/resources/citation_common.xsd
+++ b/services/citation/jaxb/src/main/resources/citation_common.xsd
@@ -6,9 +6,6 @@
     Entity  : Citation
     Part    : Common
     Used for: JAXB binding between XML and Java objects
-
-    $LastChangedRevision: $
-    $LastChangedDate: $
 -->
 
 <xs:schema 
@@ -21,7 +18,7 @@
     version="0.1"
 >
     
-    <!-- avoid XmlRootElement nightnmare, see http://weblogs.java.net/blog/kohsuke/archive/2006/03/why_does_jaxb_p.html-->
+    <!-- avoid XmlRootElement nightmare, see http://weblogs.java.net/blog/kohsuke/archive/2006/03/why_does_jaxb_p.html-->
     <!-- See http://wiki.collectionspace.org/display/collectionspace/Citation+Service+Home -->    
     
     <!-- Citation -->
@@ -40,22 +37,22 @@
                 <xs:element name="citationTermGroupList" type="citationTermGroupList"/>
                 
                 <xs:element name="citationPublicationInfoGroupList" type="citationPublicationInfoGroupList" />
-                <xs:element name="citationAgentInfoGroupList" type="citationAgentInfoGroupList" />                    
-			    <xs:element name="citationResourceIdentGroupList" type="citationResourceIdentGroupList" />
-			    <xs:element name="citationRelatedTermsGroupList" type="citationRelatedTermsGroupList" />
-			    <xs:element name="citationsNotes" type="xs:string"/>
-
+                <xs:element name="citationAgentInfoGroupList" type="citationAgentInfoGroupList" />
+                <xs:element name="citationNote" type="xs:string"/>
+                <xs:element name="citationResourceIdentGroupList" type="citationResourceIdentGroupList" />
+                <xs:element name="citationRelatedTermsGroupList" type="citationRelatedTermsGroupList" />
             </xs:sequence>
         </xs:complexType>
     </xs:element>
     
+    <!-- Complex types referenced in declarations above -->
+    
     <xs:complexType name="citationTermGroupList">
         <xs:sequence>
             <xs:element name="citationTermGroup" type="citationTermGroup" minOccurs="0"
                         maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
-
     <xs:complexType name="citationTermGroup">
         <xs:sequence>
             <!-- Common across all authority item terms -->
@@ -80,48 +77,16 @@
            
         </xs:sequence>
     </xs:complexType>
-    
-    <!-- Before (re)using this generic complex type in any record type -->
-    <!-- other than CollectionObject, be sure to verify that Nuxeo handles -->
-    <!-- that correctly in its table creation/row linking. -->
-    <xs:complexType name="structuredDateGroup">
-        <xs:sequence>
-            <xs:element name="dateDisplayDate" type="xs:string"/>
-            <xs:element name="dateAssociation" type="xs:string"/>
-            <xs:element name="dateEarliestSingleYear" type="xs:integer"/>
-            <xs:element name="dateEarliestSingleMonth" type="xs:integer"/>
-            <xs:element name="dateEarliestSingleDay" type="xs:integer"/>
-            <xs:element name="dateEarliestSingleEra" type="xs:string"/>
-            <xs:element name="dateEarliestSingleCertainty" type="xs:string"/>
-            <xs:element name="dateEarliestSingleQualifier" type="xs:string"/>
-            <xs:element name="dateEarliestSingleQualifierValue" type="xs:integer"/>
-            <xs:element name="dateEarliestSingleQualifierUnit" type="xs:string"/>
-            <xs:element name="dateLatestYear" type="xs:integer"/>
-            <xs:element name="dateLatestMonth" type="xs:integer"/>
-            <xs:element name="dateLatestDay" type="xs:integer"/>
-            <xs:element name="dateLatestEra" type="xs:string"/>
-            <xs:element name="dateLatestCertainty" type="xs:string"/>
-            <xs:element name="dateLatestQualifier" type="xs:string"/>
-            <xs:element name="dateLatestQualifierValue" type="xs:integer"/>
-            <xs:element name="dateLatestQualifierUnit" type="xs:string"/>
-            <xs:element name="datePeriod" type="xs:string"/>
-            <xs:element name="dateNote" type="xs:string"/>
-            <xs:element name="dateEarliestScalarValue" type="xs:date"/>
-            <xs:element name="dateLatestScalarValue" type="xs:date"/>
-            <xs:element name="scalarValuesComputed" type="xs:boolean"/>
-        </xs:sequence>
-    </xs:complexType>
-    
+
     <xs:complexType name="citationPublicationInfoGroupList">
         <xs:sequence>
             <xs:element name="citationPublicationInfoGroup" type="citationPublicationInfoGroup" minOccurs="0"
-                maxOccurs="unbounded"/>
+                        maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
-    
     <xs:complexType name="citationPublicationInfoGroup">
         <xs:sequence>
-        	<xs:element name="publisher" type="xs:string"/>
+            <xs:element name="publisher" type="xs:string"/>
             <xs:element name="place" type="xs:string"/>
             <xs:element name="publicationDate" type="structuredDateGroup" minOccurs="0" maxOccurs="unbounded"/>
             <xs:element name="edition" type="xs:string"/>
@@ -132,49 +97,71 @@
     <xs:complexType name="citationAgentInfoGroupList">
         <xs:sequence>
             <xs:element name="citationAgentInfoGroup" type="citationAgentInfoGroup" minOccurs="0"
-                maxOccurs="unbounded"/>
+                        maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
-    
     <xs:complexType name="citationAgentInfoGroup">
         <xs:sequence>
-        	<xs:element name="agent" type="xs:string"/>
+            <xs:element name="agent" type="xs:string"/>
             <xs:element name="role" type="xs:string"/>            
             <xs:element name="note" type="xs:string"/>
         </xs:sequence>
     </xs:complexType>
     
-
-     
     <xs:complexType name="citationResourceIdentGroupList">
         <xs:sequence>
             <xs:element name="citationResourceIdentGroup" type="citationResourceIdentGroup" minOccurs="0"
-                maxOccurs="unbounded"/>
+                        maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
-    
     <xs:complexType name="citationResourceIdentGroup">
         <xs:sequence>
-        	<xs:element name="resourceIdent" type="xs:string"/>
+            <xs:element name="resourceIdent" type="xs:string"/>
             <xs:element name="type" type="xs:string"/>            
             <xs:element name="captureDate" type="structuredDateGroup" minOccurs="0" maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
     
-    
     <xs:complexType name="citationRelatedTermsGroupList">
         <xs:sequence>
             <xs:element name="citationRelatedTermsGroup" type="citationRelatedTermsGroup" minOccurs="0"
-                maxOccurs="unbounded"/>
+                        maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
-    
     <xs:complexType name="citationRelatedTermsGroup">
         <xs:sequence>
-        	<xs:element name="relatedTerm" type="xs:string"/>
+            <xs:element name="relatedTerm" type="xs:string"/>
             <xs:element name="relationType" type="xs:string"/>                        
         </xs:sequence>
     </xs:complexType>
     
+    <xs:complexType name="structuredDateGroup">
+        <xs:sequence>
+            <xs:element name="dateDisplayDate" type="xs:string"/>
+            <xs:element name="dateAssociation" type="xs:string"/>
+            <xs:element name="dateEarliestSingleYear" type="xs:integer"/>
+            <xs:element name="dateEarliestSingleMonth" type="xs:integer"/>
+            <xs:element name="dateEarliestSingleDay" type="xs:integer"/>
+            <xs:element name="dateEarliestSingleEra" type="xs:string"/>
+            <xs:element name="dateEarliestSingleCertainty" type="xs:string"/>
+            <xs:element name="dateEarliestSingleQualifier" type="xs:string"/>
+            <xs:element name="dateEarliestSingleQualifierValue" type="xs:integer"/>
+            <xs:element name="dateEarliestSingleQualifierUnit" type="xs:string"/>
+            <xs:element name="dateLatestYear" type="xs:integer"/>
+            <xs:element name="dateLatestMonth" type="xs:integer"/>
+            <xs:element name="dateLatestDay" type="xs:integer"/>
+            <xs:element name="dateLatestEra" type="xs:string"/>
+            <xs:element name="dateLatestCertainty" type="xs:string"/>
+            <xs:element name="dateLatestQualifier" type="xs:string"/>
+            <xs:element name="dateLatestQualifierValue" type="xs:integer"/>
+            <xs:element name="dateLatestQualifierUnit" type="xs:string"/>
+            <xs:element name="datePeriod" type="xs:string"/>
+            <xs:element name="dateNote" type="xs:string"/>
+            <xs:element name="dateEarliestScalarValue" type="xs:date"/>
+            <xs:element name="dateLatestScalarValue" type="xs:date"/>
+            <xs:element name="scalarValuesComputed" type="xs:boolean"/>
+        </xs:sequence>
+    </xs:complexType>
+    
 </xs:schema>
 
-- 
2.47.3