CSPACE-4043 see notes in Jira; Added change to services/collectionobject/jaxb/src...

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 3d1ddc0f4dcadc048b6678240d348bf2881727c5..27ff8075b4a18c99e819c7c6eb34902a7b8bc8a5 100644 (file)
--- 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<String> 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 e8d3b598f3e7b3b399437977054461470318aa8e..5be1b09c1b0cc49ac14bbc0685723be8a1500cd5 100644 (file)
--- a/services/collectionobject/jaxb/src/main/resources/collectionobjects_naturalhistory.xsd
+++ b/services/collectionobject/jaxb/src/main/resources/collectionobjects_naturalhistory.xsd
@@ -20,7 +20,9 @@
 >
     <!-- collection-object for museum of natural history  -->
     <xs:element name="collectionobjects_naturalhistory">
-    
+        <xs:complexType>
+                    <xs:sequence>
+
         <!--
             <xs:complexType>
                 <xs:sequence>
@@ -52,7 +54,11 @@
         <xs:element name="fieldCollDepthGroupList" type="fieldCollDepthGroupList"/>
         <xs:element name="associatedTaxaGroupList" type="associatedTaxaGroupList"/>
 
-        <xs:complexType name="taxonomicIdentGroupList">
+    </xs:sequence>
+   </xs:complexType>
+   </xs:element>
+
+    <xs:complexType name="taxonomicIdentGroupList">
                 <xs:sequence>
                         <xs:element name="taxonomicIdentGroup" type="taxonomicIdentGroup" minOccurs="0"
                                 maxOccurs="unbounded"/>
@@ -134,8 +140,8 @@
                         <xs:element name="interaction" type="xs:integer"/>
                  </xs:sequence>
         </xs:complexType>
-            
-    </xs:element>
+
+
     
 </xs:schema>