From 933d0ce2803492b996e1b786848c56811ef4e305 Mon Sep 17 00:00:00 2001 From: Richard Millet Date: Wed, 7 Oct 2009 22:07:29 +0000 Subject: [PATCH] CSPACE-504: Changes to get Acquisition service working with the Nuxeo webapp again. --- .../resources/OSGI-INF/core-types-contrib.xml | 4 +- .../resources/OSGI-INF/layouts-contrib.xml | 274 +++++++++++++++++- .../resources/schemas/acquisitions-common.xsd | 14 - .../resources/schemas/acquisitions_common.xsd | 33 +++ .../client/test/AcquisitionServiceTest.java | 13 +- ...ons-common.xsd => acquisitions_common.xsd} | 23 +- .../src/main/config/tenant-bindings.xml | 4 +- 7 files changed, 337 insertions(+), 28 deletions(-) delete mode 100644 services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/schemas/acquisitions-common.xsd create mode 100644 services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/schemas/acquisitions_common.xsd rename services/acquisition/jaxb/src/main/resources/{acquisitions-common.xsd => acquisitions_common.xsd} (52%) diff --git a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/OSGI-INF/core-types-contrib.xml b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/OSGI-INF/core-types-contrib.xml index 4a8a87cc7..e3b2a71d9 100644 --- a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/OSGI-INF/core-types-contrib.xml +++ b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/OSGI-INF/core-types-contrib.xml @@ -1,13 +1,13 @@ - + - + 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 82738e962..511186e16 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 @@ -10,16 +10,282 @@ - accessiondate + accessionDate + acquisitionAuthorizer + AcquisitionAuthorizerDate + AcquisitionDate + AcquisitionFunding + AcquisitionFundingSource + AcquisitionFundingSourceProvisos + AcquisitionMethod + AcquisitionNote + AcquisitionProvisos + AcquisitionReason + AcquisitionReferenceNumber + AcquisitionSource + GroupPurchasePrice + ObjectOfferPrice + ObjectPurchaseOfferPrice + ObjectPurchasePrice + OriginalObjectPurchasePrice + OriginalObjectPurchasePriceDenomination + TransferOfTitleNumber - + - + true - accessiondate + acq:accessionDate + + + dataInputText + + + + + + + + true + + acq:acquisitionAuthorizer + + + dataInputText + + + + + + + + true + + acq:AcquisitionAuthorizerDate + + + dataInputText + + + + + + + + true + + acq:AcquisitionDate + + + dataInputText + + + + + + + + true + + acq:AcquisitionFunding + + + dataInputText + + + + + + + + true + + acq:AcquisitionFundingSource + + + dataInputText + + + + + + + + true + + acq:AcquisitionFundingSourceProvisos + + + dataInputText + + + + + + + + true + + acq:AcquisitionMethod + + + dataInputText + + + + + + + + true + + acq:AcquisitionNote + + + dataInputText + + + + + + + + true + + acq:AcquisitionProvisos + + + dataInputText + + + + + + + + true + + acq:AcquisitionReason + + + dataInputText + + + + + + + + true + + acq:AcquisitionReferenceNumber + + + dataInputText + + + + + + + + true + + acq:AcquisitionSource + + + dataInputText + + + + + + + + true + + acq:GroupPurchasePrice + + + dataInputText + + + + + + + + true + + acq:ObjectOfferPrice + + + dataInputText + + + + + + + + true + + acq:ObjectPurchaseOfferPrice + + + dataInputText + + + + + + + + true + + acq:ObjectPurchasePrice + + + dataInputText + + + + + + + + true + + acq:OriginalObjectPurchasePrice + + + dataInputText + + + + + + + + true + + acq:OriginalObjectPurchasePriceDenomination + + + dataInputText + + + + + + + + true + + acq:TransferOfTitleNumber 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 deleted file mode 100644 index c8442d1a2..000000000 --- a/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/schemas/acquisitions-common.xsd +++ /dev/null @@ -1,14 +0,0 @@ - - - - - - - - - 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 new file mode 100644 index 000000000..f97517298 --- /dev/null +++ b/services/acquisition/3rdparty/nuxeo-platform-cs-acquisition/src/main/resources/schemas/acquisitions_common.xsd @@ -0,0 +1,33 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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 dcf8126f3..053ac6f08 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 @@ -52,6 +52,11 @@ public class AcquisitionServiceTest extends AbstractServiceTest { final String SERVICE_PATH_COMPONENT = "acquisitions"; private String knownResourceId = null; + //FIXME: Remove this method once ALL the services use "_common" instead of "-common" + public String getCommonPartName() { + return getServicePathComponent() + "_common"; + } + // --------------------------------------------------------------- // CRUD tests : CREATE tests // --------------------------------------------------------------- @@ -273,7 +278,7 @@ public class AcquisitionServiceTest extends AbstractServiceTest { Assert.assertNotNull(acquisition); // Update the content of this resource. - acquisition.setAccessiondate("updated-" + acquisition.getAccessiondate()); + acquisition.setAccessionDate("updated-" + acquisition.getAccessionDate()); verbose("updated object", acquisition, AcquisitionsCommon.class); // Submit the request to the service and store the response. MultipartOutput output = new MultipartOutput(); @@ -295,8 +300,8 @@ public class AcquisitionServiceTest extends AbstractServiceTest { getCommonPartName(), AcquisitionsCommon.class); Assert.assertNotNull(updatedAcquisition); - Assert.assertEquals(updatedAcquisition.getAccessiondate(), - acquisition.getAccessiondate(), + Assert.assertEquals(updatedAcquisition.getAccessionDate(), + acquisition.getAccessionDate(), "Data in updated object did not match submitted data."); }catch(Exception e){ e.printStackTrace(); @@ -504,7 +509,7 @@ public class AcquisitionServiceTest extends AbstractServiceTest { private MultipartOutput createAcquisitionInstance(String identifier) { AcquisitionsCommon acquisition = new AcquisitionsCommon(); - acquisition.setAccessiondate("accessionDate-" + identifier); + acquisition.setAccessionDate("accessionDate-" + identifier); MultipartOutput multipart = new MultipartOutput(); OutputPart commonPart = multipart.addPart(acquisition, MediaType.APPLICATION_XML_TYPE); commonPart.getHeaders().add("label", getCommonPartName()); diff --git a/services/acquisition/jaxb/src/main/resources/acquisitions-common.xsd b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd similarity index 52% rename from services/acquisition/jaxb/src/main/resources/acquisitions-common.xsd rename to services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd index 46f45f474..0542493f7 100644 --- a/services/acquisition/jaxb/src/main/resources/acquisitions-common.xsd +++ b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd @@ -12,12 +12,31 @@ - + - + + + + + + + + + + + + + + + + + + + + diff --git a/services/common/src/main/config/tenant-bindings.xml b/services/common/src/main/config/tenant-bindings.xml index 66c7c7177..2e3d3e861 100644 --- a/services/common/src/main/config/tenant-bindings.xml +++ b/services/common/src/main/config/tenant-bindings.xml @@ -96,11 +96,11 @@ + label="acquisitions_common" updated="" order="1"> + schemaLocation="http://collectionspace.org/services/acquisition http://services.collectionspace.org/acquisition/acquisitions_common.xsd"> -- 2.47.3