From: Richard Millet Date: Fri, 8 Jan 2010 18:38:27 +0000 (+0000) Subject: CSPACE-717: Adding v0.4 specific fields to the list results of the Intake, Acquisitio... X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=01e220bef8b96a5539a877cd84ec210f650cb8e8;p=tmp%2Fjakarta-migration.git CSPACE-717: Adding v0.4 specific fields to the list results of the Intake, Acquisition, and CollectionObject services. --- 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 f7aed8c5b..1932ced3d 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 @@ -604,6 +604,7 @@ public class AcquisitionServiceTest extends AbstractServiceTest { private MultipartOutput createAcquisitionInstance(String identifier) { AcquisitionsCommon acquisition = new AcquisitionsCommon(); acquisition.setAcquisitionReferenceNumber("acquisitionReferenceNumber-" + identifier); + acquisition.setAcquisitionSource("acquisitionSource-" + 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 103338b98..2158915f2 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 @@ -2,6 +2,7 @@ package org.collectionspace.services; public interface AcquisitionListItemJAXBSchema { 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 9c0dfaf81..350f783d2 100644 --- a/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd +++ b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd @@ -65,6 +65,8 @@ + 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 2c15d6f59..f720b9e06 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 @@ -124,6 +124,8 @@ 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)); //need fully qualified context for URI String id = NuxeoUtils.extractId(docModel.getPathAsString()); listItem.setUri(getServiceContextPath() + id); diff --git a/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectServiceTest.java b/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectServiceTest.java index e2532e4fd..bef77e5b3 100644 --- a/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectServiceTest.java +++ b/services/collectionobject/client/src/test/java/org/collectionspace/services/client/test/CollectionObjectServiceTest.java @@ -645,11 +645,13 @@ public class CollectionObjectServiceTest extends AbstractServiceTest { ons.add("urn:org.walkerart.id:123"); } multivalue = !multivalue; + //FIXME: Title does not need to be set. + collectionObject.setTitle("acoward"); collectionObject.setOtherNumbers(onList); collectionObject.setObjectNumber(objectNumber); collectionObject.setObjectName(objectName); collectionObject.setAge(""); //test for null string - collectionObject.setBriefDescription("Papier mache bird mask with horns, " + collectionObject.setBriefDescription("Papier mache bird cow mask with horns, " + "painted red with black and yellow spots. " + "Puerto Rico. ca. 8" high, 6" wide, projects 10" (with horns)."); MultipartOutput multipart = new MultipartOutput(); diff --git a/services/collectionobject/jaxb/src/main/java/org/collectionspace/services/CollectionObjectListItemJAXBSchema.java b/services/collectionobject/jaxb/src/main/java/org/collectionspace/services/CollectionObjectListItemJAXBSchema.java index 39a6b50a0..09b044133 100644 --- a/services/collectionobject/jaxb/src/main/java/org/collectionspace/services/CollectionObjectListItemJAXBSchema.java +++ b/services/collectionobject/jaxb/src/main/java/org/collectionspace/services/CollectionObjectListItemJAXBSchema.java @@ -2,6 +2,7 @@ package org.collectionspace.services; public interface CollectionObjectListItemJAXBSchema { final static String OBJECT_NUMBER = "objectNumber"; + final static String TITLE = "title"; final static String CSID = "csid"; final static String URI = "url"; } diff --git a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd index 0ad19e79a..f51021ce0 100644 --- a/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd +++ b/services/collectionobject/jaxb/src/main/resources/collectionobjects_common.xsd @@ -160,6 +160,8 @@ + diff --git a/services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/nuxeo/CollectionObjectDocumentModelHandler.java b/services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/nuxeo/CollectionObjectDocumentModelHandler.java index 72fb11e42..cdad7f58b 100644 --- a/services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/nuxeo/CollectionObjectDocumentModelHandler.java +++ b/services/collectionobject/service/src/main/java/org/collectionspace/services/collectionobject/nuxeo/CollectionObjectDocumentModelHandler.java @@ -117,6 +117,8 @@ public class CollectionObjectDocumentModelHandler CollectionObjectListItem coListItem = new CollectionObjectListItem(); coListItem.setObjectNumber((String) docModel.getProperty(getServiceContext().getCommonPartLabel(), CollectionObjectListItemJAXBSchema.OBJECT_NUMBER)); + coListItem.setTitle((String) docModel.getProperty(getServiceContext().getCommonPartLabel(), + CollectionObjectListItemJAXBSchema.TITLE)); String id = NuxeoUtils.extractId(docModel.getPathAsString()); coListItem.setUri(getServiceContextPath() + id); coListItem.setCsid(id); diff --git a/services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeServiceTest.java b/services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeServiceTest.java index e929092d8..30d8468c1 100644 --- a/services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeServiceTest.java +++ b/services/intake/client/src/test/java/org/collectionspace/services/client/test/IntakeServiceTest.java @@ -609,13 +609,17 @@ public class IntakeServiceTest extends AbstractServiceTest { private MultipartOutput createIntakeInstance(String identifier) { return createIntakeInstance( "entryNumber-" + identifier, - "entryDate-" + identifier); + "entryDate-" + identifier, + "depositor-" + identifier); } - private MultipartOutput createIntakeInstance(String entryNumber, String entryDate) { + private MultipartOutput createIntakeInstance(String entryNumber, + String entryDate, + String depositor) { IntakesCommon intake = new IntakesCommon(); intake.setEntryNumber(entryNumber); intake.setEntryDate(entryDate); + intake.setDepositor(depositor); MultipartOutput multipart = new MultipartOutput(); OutputPart commonPart = multipart.addPart(intake, MediaType.APPLICATION_XML_TYPE); diff --git a/services/intake/jaxb/src/main/java/org/collectionspace/services/IntakeListItemJAXBSchema.java b/services/intake/jaxb/src/main/java/org/collectionspace/services/IntakeListItemJAXBSchema.java index 22fbe87a8..5d2250976 100644 --- a/services/intake/jaxb/src/main/java/org/collectionspace/services/IntakeListItemJAXBSchema.java +++ b/services/intake/jaxb/src/main/java/org/collectionspace/services/IntakeListItemJAXBSchema.java @@ -2,6 +2,7 @@ package org.collectionspace.services; public interface IntakeListItemJAXBSchema { final static String ENTRY_NUMBER = "entryNumber"; + final static String DEPOSITOR="depositor"; final static String CSID = "csid"; final static String URI = "url"; } diff --git a/services/intake/jaxb/src/main/resources/intakes-common.xsd b/services/intake/jaxb/src/main/resources/intakes-common.xsd index d0dc652c1..e20eb2a40 100644 --- a/services/intake/jaxb/src/main/resources/intakes-common.xsd +++ b/services/intake/jaxb/src/main/resources/intakes-common.xsd @@ -109,6 +109,8 @@ + diff --git a/services/intake/service/src/main/java/org/collectionspace/services/intake/nuxeo/IntakeDocumentModelHandler.java b/services/intake/service/src/main/java/org/collectionspace/services/intake/nuxeo/IntakeDocumentModelHandler.java index c6ddab720..6f1beae77 100644 --- a/services/intake/service/src/main/java/org/collectionspace/services/intake/nuxeo/IntakeDocumentModelHandler.java +++ b/services/intake/service/src/main/java/org/collectionspace/services/intake/nuxeo/IntakeDocumentModelHandler.java @@ -124,6 +124,8 @@ public class IntakeDocumentModelHandler IntakeListItem ilistItem = new IntakeListItem(); ilistItem.setEntryNumber((String) docModel.getProperty(getServiceContext().getCommonPartLabel(), IntakeJAXBSchema.ENTRY_NUMBER)); + ilistItem.setDepositor((String) docModel.getProperty(getServiceContext().getCommonPartLabel(), + IntakeJAXBSchema.DEPOSITOR)); String id = NuxeoUtils.extractId(docModel.getPathAsString()); ilistItem.setUri(getServiceContextPath() + id); ilistItem.setCsid(id);