CSPACE-873: Acquisition Source is now a repeatable field in Acquisition records....

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 85754e6f86ffbbd5a62def0e74c52b7453ad9a73..acdf4351c4f6cf7daa50c26530243172effd11f9 100644 (file)
--- 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 -->\r
     <xs:element name="accessionDate" type="xs:string"/>\r
     <xs:element name="acquisitionAuthorizer" type="xs:string"/>\r
-    <xs:element name="AcquisitionAuthorizerDate" type="xs:string"/>\r
-    <xs:element name="AcquisitionDate" type="xs:string"/>\r
-    <xs:element name="AcquisitionFunding" type="xs:string"/>\r
-    <xs:element name="AcquisitionFundingSource" type="xs:string"/>\r
-    <xs:element name="AcquisitionFundingSourceProvisos" type="xs:string"/>\r
-    <xs:element name="AcquisitionMethod" type="xs:string"/>\r
-    <xs:element name="AcquisitionNote" type="xs:string"/>\r
-    <xs:element name="AcquisitionProvisos" type="xs:string"/>\r
-    <xs:element name="AcquisitionReason" type="xs:string"/>\r
-    <xs:element name="AcquisitionReferenceNumber" type="xs:string"/>\r
-    <xs:element name="AcquisitionSource" type="xs:string"/>\r
-    <xs:element name="GroupPurchasePrice" type="xs:string"/>\r
-    <xs:element name="ObjectOfferPrice" type="xs:string"/>\r
-    <xs:element name="ObjectPurchaseOfferPrice" type="xs:string"/>\r
-    <xs:element name="ObjectPurchasePrice" type="xs:string"/>\r
-    <xs:element name="OriginalObjectPurchasePrice" type="xs:string"/>\r
-    <xs:element name="OriginalObjectPurchasePriceDenomination" type="xs:string"/>\r
-    <xs:element name="TransferOfTitleNumber" type="xs:string"/>                \r
+    <xs:element name="acquisitionAuthorizerDate" type="xs:string"/>\r
+    <xs:element name="acquisitionDate" type="xs:string"/>\r
+    <xs:element name="acquisitionFunding" type="xs:string"/>\r
+    <xs:element name="acquisitionFundingSource" type="xs:string"/>\r
+    <xs:element name="acquisitionFundingSourceProvisos" type="xs:string"/>\r
+    <xs:element name="acquisitionMethod" type="xs:string"/>\r
+    <xs:element name="acquisitionNote" type="xs:string"/>\r
+    <xs:element name="acquisitionProvisos" type="xs:string"/>\r
+    <xs:element name="acquisitionReason" type="xs:string"/>\r
+    <xs:element name="acquisitionReferenceNumber" type="xs:string"/>\r
+    <xs:element name="acquisitionSource" type="xs:string"/>\r
+    <xs:element name="acquisitionSources">\r
+        <xs:complexType>\r
+            <xs:sequence>\r
+                <xs:element name="acquisitionSource" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+    </xs:element>\r
+    <xs:element name="groupPurchasePrice" type="xs:string"/>\r
+    <xs:element name="objectOfferPrice" type="xs:string"/>\r
+    <xs:element name="objectPurchaseOfferPrice" type="xs:string"/>\r
+    <xs:element name="objectPurchasePrice" type="xs:string"/>\r
+    <xs:element name="originalObjectPurchasePrice" type="xs:string"/>\r
+    <xs:element name="originalObjectPurchasePriceDenomination" type="xs:string"/>\r
+    <xs:element name="transferOfTitleNumber" type="xs:string"/>\r
     \r
 </xs:schema>\r

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 1932ced3d0b9c20564e32ba32b98b5fec0264a11..e1c55e5d927b51cbf7c69f93c19f28def35f33cf 100644 (file)
--- 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 2158915f22c00d5b0e004b720f8ff915a40fb09c..a0d3999b28615280d7c66b813409bf6cfecf75ab 100644 (file)
--- 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;\r
 \r
 public interface AcquisitionListItemJAXBSchema {\r
-       final static String ACQUISITION_REFERENCE_NUMBER = "AcquisitionReferenceNumber";\r
-       final static String ACQUISITION_SOURCE="AcquisitionSource";\r
+       final static String ACQUISITION_REFERENCE_NUMBER = "acquisitionReferenceNumber";\r
+       final static String ACQUISITION_SOURCE="acquisitionSource";\r
        final static String CSID = "csid";\r
        final static String URI = "url";\r
 }\r

diff --git a/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
index 350f783d20e07b0fc8ef4bc74b911e09c0daf55a..b6a88a79d5c8640d8f0b0720bc5a8edbfc9bc47d 100644 (file)
--- 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"