CSPACE-655: Adding refnum to result list. This is a merge from the Venus branch.

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 f6b79f8d6aac0f3de524584817c21abea8d1df8d..585075e5058f5c9c1dc03c5f5edd0b7705a83e4d 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
@@ -275,7 +275,7 @@ public class AcquisitionServiceTest extends AbstractServiceTest {
                 logger.debug(testName + ": list-item[" + i + "] csid=" +
                         item.getCsid());
                 logger.debug(testName + ": list-item[" + i + "] objectNumber=" +
-                        item.getAccessionDate());
+                        item.getAcquisitionReferenceNumber());
                 logger.debug(testName + ": list-item[" + i + "] URI=" +
                         item.getUri());
                 i++;
@@ -316,7 +316,7 @@ public class AcquisitionServiceTest extends AbstractServiceTest {
         Assert.assertNotNull(acquisition);
 
         // Update the content of this resource.
-        acquisition.setAccessionDate("updated-" + acquisition.getAccessionDate());
+        acquisition.setAcquisitionReferenceNumber("updated-" + acquisition.getAcquisitionReferenceNumber());
         if(logger.isDebugEnabled()){
             logger.debug("updated object");
             logger.debug(objectAsXmlString(acquisition, AcquisitionsCommon.class));
@@ -343,8 +343,8 @@ public class AcquisitionServiceTest extends AbstractServiceTest {
                         client.getCommonPartName(), AcquisitionsCommon.class);
         Assert.assertNotNull(updatedAcquisition);
 
-        Assert.assertEquals(updatedAcquisition.getAccessionDate(),
-                acquisition.getAccessionDate(),
+        Assert.assertEquals(updatedAcquisition.getAcquisitionReferenceNumber(),
+                acquisition.getAcquisitionReferenceNumber(),
                 "Data in updated object did not match submitted data.");
 
     }
@@ -607,7 +607,7 @@ public class AcquisitionServiceTest extends AbstractServiceTest {
 
     private MultipartOutput createAcquisitionInstance(String identifier) {
         AcquisitionsCommon acquisition = new AcquisitionsCommon();
-        acquisition.setAccessionDate("accessionDate-"  + identifier);
+        acquisition.setAcquisitionReferenceNumber("acquisitionReferenceNumber-"  + 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 696fa2514272dde1a91cbd69d01968e91ff6dc86..103338b98b394c638bc12348b3c6c3a0480f77a1 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,7 +1,7 @@
 package org.collectionspace.services;\r
 \r
 public interface AcquisitionListItemJAXBSchema {\r
-       final static String ENTRY_NUMBER = "xyz";\r
+       final static String ACQUISITION_REFERENCE_NUMBER = "AcquisitionReferenceNumber";\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 4bba41de7a9e54a9e6d1c6efd75f34f04eb8268e..9c0dfaf81d6d5d21f8e28a9ca475ae123d5c6fcd 100644 (file)
--- a/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
+++ b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
@@ -63,7 +63,7 @@
                 <xs:element name="acquisition-list-item" maxOccurs="unbounded">
                     <xs:complexType>
                         <xs:sequence>
-                            <xs:element name="accessionDate" type="xs:string"
+                            <xs:element name="AcquisitionReferenceNumber" type="xs:string"
                                 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 1f83eb560869dccf7f927c92e0a4e1e8b8df0708..2c15d6f593b684c405a2b7a51d706774de544632 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
@@ -27,6 +27,7 @@ import java.util.Iterator;
 import java.util.List;
 
 import org.collectionspace.services.AcquisitionJAXBSchema;
+import org.collectionspace.services.AcquisitionListItemJAXBSchema;
 import org.collectionspace.services.common.document.DocumentWrapper;
 import org.collectionspace.services.acquisition.AcquisitionsCommon;
 import org.collectionspace.services.acquisition.AcquisitionsCommonList;
@@ -121,8 +122,8 @@ public class AcquisitionDocumentModelHandler
         while (iter.hasNext()) {
             DocumentModel docModel = iter.next();
             AcquisitionListItem listItem = new AcquisitionListItem();
-            listItem.setAccessionDate((String) docModel.getProperty(getServiceContext().getCommonPartLabel(),
-                    AcquisitionJAXBSchema.ACCESSIONDATE));
+            listItem.setAcquisitionReferenceNumber((String) docModel.getProperty(getServiceContext().getCommonPartLabel(),
+                    AcquisitionListItemJAXBSchema.ACQUISITION_REFERENCE_NUMBER));
             //need fully qualified context for URI
             String id = NuxeoUtils.extractId(docModel.getPathAsString());
             listItem.setUri(getServiceContextPath() + id);