CSPACE-1494,CSPACE-873: Temporarily stub-out return of acquisitionSource in acquisiti...

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 a0d3999b28615280d7c66b813409bf6cfecf75ab..0f816b07c1c76d9115aeafcb3d29ab3742fdc7ad 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
@@ -2,7 +2,7 @@ package org.collectionspace.services;
 \r
 public interface AcquisitionListItemJAXBSchema {\r
        final static String ACQUISITION_REFERENCE_NUMBER = "acquisitionReferenceNumber";\r
-       final static String ACQUISITION_SOURCE="acquisitionSource";\r
+       final static String ACQUISITION_SOURCES = "acquisitionSources";\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 fa707b37611c3e89a44745f4d75fdcdc69758fbe..04fd09a6e218b8535fd276a08a4ff2b7671cc042 100644 (file)
--- a/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
+++ b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
@@ -81,7 +81,7 @@
                         <xs:sequence>
                             <xs:element name="acquisitionReferenceNumber" type="xs:string"
                                 minOccurs="1" />
-                            <xs:element name="acquisitionSource" type="xs:string"
+                            <xs:element name="acquisitionSources" type="acquisitionSourceList"
                                 minOccurs="1" />
                             <!-- uri to retrive acquisition details -->
                             <xs:element name="uri" type="xs:anyURI"

diff --git a/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/nuxeo/AcquisitionDocumentModelHandler.java b/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/nuxeo/AcquisitionDocumentModelHandler.java
index c79eb3890cf9e9efd355694d229bc416d1958115..3b1e3d4f7fa70f11b44facb5322267d2a56e3b39 100644 (file)
--- a/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/nuxeo/AcquisitionDocumentModelHandler.java
+++ b/services/acquisition/service/src/main/java/org/collectionspace/services/acquisition/nuxeo/AcquisitionDocumentModelHandler.java
@@ -32,6 +32,7 @@ import org.collectionspace.services.common.document.DocumentWrapper;
 import org.collectionspace.services.acquisition.AcquisitionsCommon;
 import org.collectionspace.services.acquisition.AcquisitionsCommonList;
 import org.collectionspace.services.acquisition.AcquisitionsCommonList.AcquisitionListItem;
+import org.collectionspace.services.acquisition.AcquisitionSourceList;
 
 import org.collectionspace.services.common.document.DocumentHandler.Action;
 import org.collectionspace.services.nuxeo.client.java.RemoteDocumentModelHandlerImpl;
@@ -120,8 +121,18 @@ public class AcquisitionDocumentModelHandler
             AcquisitionListItem listItem = new AcquisitionListItem();
             listItem.setAcquisitionReferenceNumber((String) docModel.getProperty(getServiceContext().getCommonPartLabel(),
                     AcquisitionListItemJAXBSchema.ACQUISITION_REFERENCE_NUMBER));
-            listItem.setAcquisitionSource((String) docModel.getProperty(getServiceContext().getCommonPartLabel(),
-                    AcquisitionListItemJAXBSchema.ACQUISITION_SOURCE));
+            // logger.warn("Before getting acquisitionSources ...");
+            // Investigate what is returned here by Nuxeo's DocumentModel.getProperty ... List<String> or?
+            // AcquisitionSourceList acquisitionSources =
+            //     (AcquisitionSourceList) docModel.getProperty(qetServiceContext().getCommonPartLabel(),
+            //         AcquisitionListItemJAXBSchema.ACQUISITION_SOURCES);
+            // logger.warn("acquisitionSources size = " + acquisitionSources.getAcquisitionSource().size());
+            if (logger.isDebugEnabled()) {
+              logger.debug("Before setting acquisition sources ...");
+            }
+            AcquisitionSourceList acquisitionSources = new AcquisitionSourceList();
+            acquisitionSources.getAcquisitionSource().add("Currently stubbed - see CSPACE-1494.");
+            listItem.setAcquisitionSources(acquisitionSources);
             //need fully qualified context for URI
             String id = NuxeoUtils.extractId(docModel.getPathAsString());
             listItem.setUri(getServiceContextPath() + id);