From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Sat, 6 Feb 2010 01:27:38 +0000 (+0000)
Subject: CSPACE-873: Acquisition Source is now a repeatable field in Acquisition records.... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=d89aba2b48fe026981ad81408255ee9d198f04aa;p=tmp%2Fjakarta-migration.git

CSPACE-873: Acquisition Source is now a repeatable field in Acquisition records. Also renamed nearly all other fields in the Acquisitions schema for consistency with Service schema capitalization conventions: lowercase initial letter and interCaps. IMPORTANT: Due to changes in Nuxeo document type, will require running 'ant deploy' and a two-server restart.
---

diff --git a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/schemas/acquisitions_common.xsd b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/schemas/acquisitions_common.xsd
index 85754e6f8..acdf4351c 100644
--- a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/schemas/acquisitions_common.xsd
+++ b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/schemas/acquisitions_common.xsd
@@ -23,23 +23,30 @@
 <!--  Object Entry Information Group -->
     <xs:element name="accessionDate" type="xs:string"/>
     <xs:element name="acquisitionAuthorizer" type="xs:string"/>
-    <xs:element name="AcquisitionAuthorizerDate" type="xs:string"/>
-    <xs:element name="AcquisitionDate" type="xs:string"/>
-    <xs:element name="AcquisitionFunding" type="xs:string"/>
-    <xs:element name="AcquisitionFundingSource" type="xs:string"/>
-    <xs:element name="AcquisitionFundingSourceProvisos" type="xs:string"/>
-    <xs:element name="AcquisitionMethod" type="xs:string"/>
-    <xs:element name="AcquisitionNote" type="xs:string"/>
-    <xs:element name="AcquisitionProvisos" type="xs:string"/>
-    <xs:element name="AcquisitionReason" type="xs:string"/>
-    <xs:element name="AcquisitionReferenceNumber" type="xs:string"/>
-    <xs:element name="AcquisitionSource" type="xs:string"/>
-    <xs:element name="GroupPurchasePrice" type="xs:string"/>
-    <xs:element name="ObjectOfferPrice" type="xs:string"/>
-    <xs:element name="ObjectPurchaseOfferPrice" type="xs:string"/>
-    <xs:element name="ObjectPurchasePrice" type="xs:string"/>
-    <xs:element name="OriginalObjectPurchasePrice" type="xs:string"/>
-    <xs:element name="OriginalObjectPurchasePriceDenomination" type="xs:string"/>
-    <xs:element name="TransferOfTitleNumber" type="xs:string"/>                
+    <xs:element name="acquisitionAuthorizerDate" type="xs:string"/>
+    <xs:element name="acquisitionDate" type="xs:string"/>
+    <xs:element name="acquisitionFunding" type="xs:string"/>
+    <xs:element name="acquisitionFundingSource" type="xs:string"/>
+    <xs:element name="acquisitionFundingSourceProvisos" type="xs:string"/>
+    <xs:element name="acquisitionMethod" type="xs:string"/>
+    <xs:element name="acquisitionNote" type="xs:string"/>
+    <xs:element name="acquisitionProvisos" type="xs:string"/>
+    <xs:element name="acquisitionReason" type="xs:string"/>
+    <xs:element name="acquisitionReferenceNumber" type="xs:string"/>
+    <xs:element name="acquisitionSource" type="xs:string"/>
+    <xs:element name="acquisitionSources">
+        <xs:complexType>
+            <xs:sequence>
+                <xs:element name="acquisitionSource" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+            </xs:sequence>
+        </xs:complexType>
+    </xs:element>
+    <xs:element name="groupPurchasePrice" type="xs:string"/>
+    <xs:element name="objectOfferPrice" type="xs:string"/>
+    <xs:element name="objectPurchaseOfferPrice" type="xs:string"/>
+    <xs:element name="objectPurchasePrice" type="xs:string"/>
+    <xs:element name="originalObjectPurchasePrice" type="xs:string"/>
+    <xs:element name="originalObjectPurchasePriceDenomination" type="xs:string"/>
+    <xs:element name="transferOfTitleNumber" type="xs:string"/>
     
 </xs:schema>
diff --git a/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionServiceTest.java b/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionServiceTest.java
index 1932ced3d..e1c55e5d9 100644
--- a/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionServiceTest.java
+++ b/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionServiceTest.java
@@ -31,6 +31,7 @@ import org.collectionspace.services.client.AcquisitionClient;
 
 import org.collectionspace.services.acquisition.AcquisitionsCommon;
 import org.collectionspace.services.acquisition.AcquisitionsCommonList;
+import org.collectionspace.services.acquisition.AcquisitionSourceList;
 import org.jboss.resteasy.client.ClientResponse;
 
 import org.jboss.resteasy.plugins.providers.multipart.MultipartInput;
@@ -604,7 +605,12 @@ public class AcquisitionServiceTest extends AbstractServiceTest {
     private MultipartOutput createAcquisitionInstance(String identifier) {
         AcquisitionsCommon acquisition = new AcquisitionsCommon();
         acquisition.setAcquisitionReferenceNumber("acquisitionReferenceNumber-"  + identifier);
-        acquisition.setAcquisitionSource("acquisitionSource-"  + identifier);
+        AcquisitionSourceList acqSourcesList = new AcquisitionSourceList();
+        List<String> sources = acqSourcesList.getAcquisitionSource();
+        // @TODO Use properly formatted refNames for representative acquisition
+        // sources in this example test record. The following are mere placeholders.
+        sources.add("Donor Acquisition Source " + identifier);
+        sources.add("Museum Acquisition Source" + identifier);
         MultipartOutput multipart = new MultipartOutput();
         OutputPart commonPart = multipart.addPart(acquisition,
             MediaType.APPLICATION_XML_TYPE);
diff --git a/services/acquisition/jaxb/src/main/java/org/collectionspace/services/AcquisitionListItemJAXBSchema.java b/services/acquisition/jaxb/src/main/java/org/collectionspace/services/AcquisitionListItemJAXBSchema.java
index 2158915f2..a0d3999b2 100644
--- a/services/acquisition/jaxb/src/main/java/org/collectionspace/services/AcquisitionListItemJAXBSchema.java
+++ b/services/acquisition/jaxb/src/main/java/org/collectionspace/services/AcquisitionListItemJAXBSchema.java
@@ -1,8 +1,8 @@
 package org.collectionspace.services;
 
 public interface AcquisitionListItemJAXBSchema {
-	final static String ACQUISITION_REFERENCE_NUMBER = "AcquisitionReferenceNumber";
-	final static String ACQUISITION_SOURCE="AcquisitionSource";
+	final static String ACQUISITION_REFERENCE_NUMBER = "acquisitionReferenceNumber";
+	final static String ACQUISITION_SOURCE="acquisitionSource";
 	final static String CSID = "csid";
 	final static String URI = "url";
 }
diff --git a/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
index 350f783d2..b6a88a79d 100644
--- a/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
+++ b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
@@ -34,27 +34,33 @@
                 <!--  Object Entry Information Group -->
                 <xs:element name="accessionDate" type="xs:string"/>
                 <xs:element name="acquisitionAuthorizer" type="xs:string"/>
-                <xs:element name="AcquisitionAuthorizerDate" type="xs:string"/>
-                <xs:element name="AcquisitionDate" type="xs:string"/>
-                <xs:element name="AcquisitionFunding" type="xs:string"/>
-                <xs:element name="AcquisitionFundingSource" type="xs:string"/>
-                <xs:element name="AcquisitionFundingSourceProvisos" type="xs:string"/>
-                <xs:element name="AcquisitionMethod" type="xs:string"/>
-                <xs:element name="AcquisitionNote" type="xs:string"/>
-                <xs:element name="AcquisitionProvisos" type="xs:string"/>
-                <xs:element name="AcquisitionReason" type="xs:string"/>
-                <xs:element name="AcquisitionReferenceNumber" type="xs:string"/>
-                <xs:element name="AcquisitionSource" type="xs:string"/>
-                <xs:element name="GroupPurchasePrice" type="xs:string"/>
-                <xs:element name="ObjectOfferPrice" type="xs:string"/>
-                <xs:element name="ObjectPurchaseOfferPrice" type="xs:string"/>
-                <xs:element name="ObjectPurchasePrice" type="xs:string"/>
-                <xs:element name="OriginalObjectPurchasePrice" type="xs:string"/>
-                <xs:element name="OriginalObjectPurchasePriceDenomination" type="xs:string"/>
-                <xs:element name="TransferOfTitleNumber" type="xs:string"/>                
+                <xs:element name="acquisitionAuthorizerDate" type="xs:string"/>
+                <xs:element name="acquisitionDate" type="xs:string"/>
+                <xs:element name="acquisitionFunding" type="xs:string"/>
+                <xs:element name="acquisitionFundingSource" type="xs:string"/>
+                <xs:element name="acquisitionFundingSourceProvisos" type="xs:string"/>
+                <xs:element name="acquisitionMethod" type="xs:string"/>
+                <xs:element name="acquisitionNote" type="xs:string"/>
+                <xs:element name="acquisitionProvisos" type="xs:string"/>
+                <xs:element name="acquisitionReason" type="xs:string"/>
+                <xs:element name="acquisitionReferenceNumber" type="xs:string"/>
+                <xs:element name="acquisitionSources" type="acquisitionSourceList"/>
+                <xs:element name="groupPurchasePrice" type="xs:string"/>
+                <xs:element name="objectOfferPrice" type="xs:string"/>
+                <xs:element name="objectPurchaseOfferPrice" type="xs:string"/>
+                <xs:element name="objectPurchasePrice" type="xs:string"/>
+                <xs:element name="originalObjectPurchasePrice" type="xs:string"/>
+                <xs:element name="originalObjectPurchasePriceDenomination" type="xs:string"/>
+                <xs:element name="transferOfTitleNumber" type="xs:string"/>
             </xs:sequence>
         </xs:complexType>
     </xs:element>
+
+   <xs:complexType name="acquisitionSourceList">
+        <xs:sequence>
+            <xs:element name="acquisitionSource" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
     
     <!-- acquisition records, as in nuxeo repository -->
     <xs:element name="acquisitions-common-list">
@@ -63,9 +69,9 @@
                 <xs:element name="acquisition-list-item" maxOccurs="unbounded">
                     <xs:complexType>
                         <xs:sequence>
-                            <xs:element name="AcquisitionReferenceNumber" type="xs:string"
+                            <xs:element name="acquisitionReferenceNumber" type="xs:string"
                                 minOccurs="1" />
-                            <xs:element name="AcquisitionSource" type="xs:string"
+                            <xs:element name="acquisitionSource" type="xs:string"
                                 minOccurs="1" />
                             <!-- uri to retrive acquisition details -->
                             <xs:element name="uri" type="xs:anyURI"