From 1983b807f3a145baf587fbeab99fedcc2d28fea4 Mon Sep 17 00:00:00 2001 From: Laramie Crocker Date: Tue, 24 May 2011 08:26:42 +0000 Subject: [PATCH] CSPACE-4043 see notes in Jira; Added change to services/collectionobject/jaxb/src/main/resources/collectionobjects_naturalhistory.xsd to attempt to get it to compile after checkin from Aron. Just wrapped all existing elements in element/complexType/sequence. Jaxb compiles, and removed three lines in CollectionObjectServiceTest that referred to the old fields. All service tests pass. Checking in so work from Monday can get built on nightly --- .../client/test/CollectionObjectServiceTest.java | 7 +++---- .../resources/collectionobjects_naturalhistory.xsd | 14 ++++++++++---- 2 files changed, 13 insertions(+), 8 deletions(-) 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 3d1ddc0f4..27ff8075b 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 @@ -852,7 +852,6 @@ public class CollectionObjectServiceTest extends AbstractServiceTestImpl { * * @param testName the test name * @param id the id - * @param collectionObject the collection object * @return the client response */ private ClientResponse updateSend(String testName, String id, @@ -1311,9 +1310,9 @@ public class CollectionObjectServiceTest extends AbstractServiceTestImpl { // Add instances of fields from an extension schema CollectionobjectsNaturalhistory conh = new CollectionobjectsNaturalhistory(); - conh.setNhString("test-string"); - conh.setNhInt(999); - conh.setNhLong(9999); + // Laramie20110524 removed for build: conh.setNhString("test-string"); + // Laramie20110524 removed for build: conh.setNhInt(999); + // Laramie20110524 removed for build: conh.setNhLong(9999); PoxPayloadOut multipart = createCollectionObjectInstance(commonPartName, collectionObject, conh); return multipart; diff --git a/services/collectionobject/jaxb/src/main/resources/collectionobjects_naturalhistory.xsd b/services/collectionobject/jaxb/src/main/resources/collectionobjects_naturalhistory.xsd index e8d3b598f..5be1b09c1 100644 --- a/services/collectionobject/jaxb/src/main/resources/collectionobjects_naturalhistory.xsd +++ b/services/collectionobject/jaxb/src/main/resources/collectionobjects_naturalhistory.xsd @@ -20,7 +20,9 @@ > - + + +