From: Aron Roberts Date: Tue, 15 Jun 2010 19:48:14 +0000 (+0000) Subject: CSPACE-2133,CSPACE-1796,CSPACE-1219: Updated Acqusition schema at the services layer... X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=8c7fd6ef3267ca8cc67e03868c5e34233b0de196;p=tmp%2Fjakarta-migration.git CSPACE-2133,CSPACE-1796,CSPACE-1219: Updated Acqusition schema at the services layer to Limited for 0.8 schema. Added one field, removed three fields, and changed the names of seven fields. --- diff --git a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/OSGI-INF/layouts-contrib.xml b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/OSGI-INF/layouts-contrib.xml index 54a1f0c5f..046093020 100644 --- a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/OSGI-INF/layouts-contrib.xml +++ b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/OSGI-INF/layouts-contrib.xml @@ -14,7 +14,7 @@ acquisitionAuthorizer acquisitionAuthorizerDate acquisitionDate - acquisitionFundingDenomination + acquisitionFundingCurrency acquisitionFundingValue acquisitionFundingSource acquisitionFundingSourceProvisos @@ -23,22 +23,20 @@ acquisitionProvisos acquisitionReason acquisitionReferenceNumber - acquisitionSource - groupPurchasePriceDenomination + owner + + groupPurchasePriceCurrency groupPurchasePriceValue - objectOfferPriceDenomination + objectOfferPriceCurrency objectOfferPriceValue - objectPurchaseOfferPriceDenomination + objectPurchaseOfferPriceCurrency objectPurchaseOfferPriceValue - objectPurchasePriceDenomination + objectPurchasePriceCurrency objectPurchasePriceValue - originalObjectPurchasePriceDenomination + originalObjectPurchasePriceCurrency originalObjectPurchasePriceValue transferOfTitleNumber - fieldCollectionDate fieldCollectionEventName - fieldCollectionNumber - fieldCollector @@ -93,13 +91,13 @@ - + - + true - acquisitions_common:acquisitionFundingDenomination + acquisitions_common:acquisitionFundingCurrency dataInputText @@ -210,6 +208,20 @@ + + + + + true + + acquisitions_common:owner + + + dataInputText + + + + - + - + true - acquisitions_common:groupPurchasePriceDenomination + acquisitions_common:groupPurchasePriceCurrency dataInputText @@ -249,13 +262,13 @@ - + - + true - acquisitions_common:objectOfferPriceDenomination + acquisitions_common:objectOfferPriceCurrency dataInputText @@ -275,13 +288,13 @@ - + - + true - acquisitions_common:objectPurchaseOfferPriceDenomination + acquisitions_common:objectPurchaseOfferPriceCurrency dataInputText @@ -301,13 +314,13 @@ - + - + true - acquisitions_common:objectPurchasePriceDenomination + acquisitions_common:objectPurchasePriceCurrency dataInputText @@ -327,13 +340,13 @@ - + - + true - acquisitions_common:originalObjectPurchasePriceDenomination + acquisitions_common:originalObjectPurchasePriceCurrency dataInputText @@ -366,19 +379,6 @@ - - - - - true - - acquisitions_common:fieldCollectionDate - - - dataInputText - - - @@ -392,32 +392,6 @@ - - - - - true - - acquisitions_common:fieldCollectionNumber - - - dataInputText - - - - - - - - true - - acquisitions_common:fieldCollector - - - dataInputText - - - 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 b942099b1..c67a95356 100644 --- 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 @@ -20,12 +20,12 @@ - + - + @@ -34,6 +34,7 @@ + @@ -41,20 +42,19 @@ - + - + - + - + - + + - - - + diff --git a/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionAuthRefsTest.java b/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionAuthRefsTest.java index d70ab4aad..f526eac63 100644 --- a/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionAuthRefsTest.java +++ b/services/acquisition/client/src/test/java/org/collectionspace/services/client/test/AcquisitionAuthRefsTest.java @@ -70,15 +70,12 @@ public class AcquisitionAuthRefsTest extends BaseServiceTest { private String knownResourceId = null; private List acquisitionIdsCreated = new ArrayList(); private List personIdsCreated = new ArrayList(); - private int CREATED_STATUS = Response.Status.CREATED.getStatusCode(); - private int OK_STATUS = Response.Status.OK.getStatusCode(); private String personAuthCSID = null; private String acquisitionAuthorizerRefName = null; private String acquisitionFundingSourceRefName = null; // Not ready for multiples, yet //private String acquisitionSourcesRefName = null; - private String fieldCollectorRefName = null; - private final int NUM_AUTH_REFS_EXPECTED = 3; + private final int NUM_AUTH_REFS_EXPECTED = 2; /* (non-Javadoc) * @see org.collectionspace.services.client.test.BaseServiceTest#getClientInstance() @@ -118,10 +115,9 @@ public class AcquisitionAuthRefsTest extends BaseServiceTest { createPersonRefs(); MultipartOutput multipart = createAcquisitionInstance( - "April 1, 2010", - acquisitionAuthorizerRefName, - acquisitionFundingSourceRefName, - fieldCollectorRefName ); + "April 1, 2010", + acquisitionAuthorizerRefName, + acquisitionFundingSourceRefName); AcquisitionClient acquisitionClient = new AcquisitionClient(); ClientResponse res = acquisitionClient.create(multipart); @@ -157,30 +153,25 @@ public class AcquisitionAuthRefsTest extends BaseServiceTest { protected void createPersonRefs(){ String authRefName = - PersonAuthorityClientUtils.createPersonAuthRefName(PERSON_AUTHORITY_NAME, false); + PersonAuthorityClientUtils.createPersonAuthRefName(PERSON_AUTHORITY_NAME, false); PersonAuthorityClient personAuthClient = new PersonAuthorityClient(); MultipartOutput multipart = PersonAuthorityClientUtils.createPersonAuthorityInstance( - PERSON_AUTHORITY_NAME, authRefName, personAuthClient.getCommonPartName()); + PERSON_AUTHORITY_NAME, authRefName, personAuthClient.getCommonPartName()); ClientResponse res = personAuthClient.create(multipart); int statusCode = res.getStatus(); Assert.assertTrue(REQUEST_TYPE.isValidStatusCode(statusCode), - invalidStatusCodeMessage(REQUEST_TYPE, statusCode)); - Assert.assertEquals(statusCode, CREATED_STATUS); + invalidStatusCodeMessage(REQUEST_TYPE, statusCode)); + Assert.assertEquals(statusCode, STATUS_CREATED); personAuthCSID = extractId(res); acquisitionAuthorizerRefName = PersonAuthorityClientUtils.createPersonRefName( - authRefName, "Annie Authorizer", true); + authRefName, "Annie Authorizer", true); personIdsCreated.add(createPerson("Annie", "Authorizer", acquisitionAuthorizerRefName)); acquisitionFundingSourceRefName = PersonAuthorityClientUtils.createPersonRefName( - authRefName, "Sammy Source", true); + authRefName, "Sammy Source", true); personIdsCreated.add(createPerson("Sammy", "Source", acquisitionFundingSourceRefName)); - - - fieldCollectorRefName = PersonAuthorityClientUtils.createPersonRefName( - authRefName, "Connie Collector", true); - personIdsCreated.add(createPerson("Connie", "Collector", fieldCollectorRefName)); } protected String createPerson(String firstName, String surName, String refName ) { @@ -189,14 +180,14 @@ public class AcquisitionAuthRefsTest extends BaseServiceTest { personInfo.put(PersonJAXBSchema.SUR_NAME, surName); PersonAuthorityClient personAuthClient = new PersonAuthorityClient(); MultipartOutput multipart = - PersonAuthorityClientUtils.createPersonInstance(personAuthCSID, - refName, personInfo, personAuthClient.getItemCommonPartName()); + PersonAuthorityClientUtils.createPersonInstance(personAuthCSID, + refName, personInfo, personAuthClient.getItemCommonPartName()); ClientResponse res = personAuthClient.createItem(personAuthCSID, multipart); int statusCode = res.getStatus(); Assert.assertTrue(REQUEST_TYPE.isValidStatusCode(statusCode), - invalidStatusCodeMessage(REQUEST_TYPE, statusCode)); - Assert.assertEquals(statusCode, CREATED_STATUS); + invalidStatusCodeMessage(REQUEST_TYPE, statusCode)); + Assert.assertEquals(statusCode, STATUS_CREATED); return extractId(res); } @@ -223,7 +214,7 @@ public class AcquisitionAuthRefsTest extends BaseServiceTest { logger.debug(testName + ".read: status = " + statusCode); } Assert.assertTrue(REQUEST_TYPE.isValidStatusCode(statusCode), - invalidStatusCodeMessage(REQUEST_TYPE, statusCode)); + invalidStatusCodeMessage(REQUEST_TYPE, statusCode)); Assert.assertEquals(statusCode, EXPECTED_STATUS_CODE); MultipartInput input = (MultipartInput) res.getEntity(); @@ -232,7 +223,7 @@ public class AcquisitionAuthRefsTest extends BaseServiceTest { Assert.assertNotNull(acquisition); // Check a couple of fields Assert.assertEquals(acquisition.getAcquisitionAuthorizer(), acquisitionAuthorizerRefName); - Assert.assertEquals(acquisition.getFieldCollector(), fieldCollectorRefName); + Assert.assertEquals(acquisition.getAcquisitionFundingSource(), acquisitionFundingSourceRefName); // Get the auth refs and check them ClientResponse res2 = @@ -327,15 +318,14 @@ public class AcquisitionAuthRefsTest extends BaseServiceTest { } private MultipartOutput createAcquisitionInstance( - String accessionDate, - String acquisitionAuthorizer, - String acquisitionFundingSource, - String fieldCollector ) { + String accessionDate, + String acquisitionAuthorizer, + String acquisitionFundingSource) { + AcquisitionsCommon acquisition = new AcquisitionsCommon(); acquisition.setAccessionDate(accessionDate); acquisition.setAcquisitionAuthorizer(acquisitionAuthorizer); acquisition.setAcquisitionFundingSource(acquisitionFundingSource); - acquisition.setFieldCollector(fieldCollector); MultipartOutput multipart = new MultipartOutput(); OutputPart commonPart = multipart.addPart(acquisition, MediaType.APPLICATION_XML_TYPE); diff --git a/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd index db4f19f54..8dbfeefa3 100644 --- a/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd +++ b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd @@ -37,7 +37,7 @@ - + @@ -46,23 +46,21 @@ + - + - + - + - + - + - - - diff --git a/services/common/src/main/config/services/tenant-bindings.xml b/services/common/src/main/config/services/tenant-bindings.xml index 06cb55674..af3aa1feb 100644 --- a/services/common/src/main/config/services/tenant-bindings.xml +++ b/services/common/src/main/config/services/tenant-bindings.xml @@ -650,7 +650,6 @@ authRefacquisitionAuthorizer authRefacquisitionFundingSource - authReffieldCollector authRefacquisitionAuthorizer authRefacquisitionFundingSource - authReffieldCollector