From: Richard Millet <richard.millet@berkeley.edu>
Date: Fri, 11 Dec 2009 23:08:39 +0000 (+0000)
Subject: CSPACE-655: Adding refnum to result list.  This is a merge from the Venus branch.
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=5e2e9f9330d023c9818cefb0de118aaddf7c4543;p=tmp%2Fjakarta-migration.git

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 f6b79f8d6..585075e50 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
@@ -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 696fa2514..103338b98 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,7 +1,7 @@
 package org.collectionspace.services;
 
 public interface AcquisitionListItemJAXBSchema {
-	final static String ENTRY_NUMBER = "xyz";
+	final static String ACQUISITION_REFERENCE_NUMBER = "AcquisitionReferenceNumber";
 	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 4bba41de7..9c0dfaf81 100644
--- 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 1f83eb560..2c15d6f59 100644
--- 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);