CSPACE-3232: Made exitMethods field in Object Exit record repeatable in the services...

diff --git a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/src/main/resources/schemas/objectexit_common.xsd b/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/src/main/resources/schemas/objectexit_common.xsd
index cc1cca155b1036f4f8c7e1af46e91c97b55db67d..1aef98e8d08f72c37ef206e1ef03dd3a0edaf937 100644 (file)
--- a/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/src/main/resources/schemas/objectexit_common.xsd
+++ b/services/objectexit/3rdparty/nuxeo-platform-cs-objectexit/src/main/resources/schemas/objectexit_common.xsd
@@ -24,7 +24,13 @@
     <xs:element name="currentOwner" type="xs:string"/>\r
     <xs:element name="depositor" type="xs:string"/>\r
     <xs:element name="exitDate" type="xs:string"/>\r
-    <xs:element name="exitMethod" type="xs:string"/>\r
+    <xs:element name="exitMethods">\r
+        <xs:complexType>\r
+            <xs:sequence>\r
+                <xs:element name="exitMethod" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>\r
+            </xs:sequence>\r
+        </xs:complexType>\r
+   </xs:element>\r
     <xs:element name="exitNote" type="xs:string"/>\r
     <xs:element name="exitNumber" type="xs:string"/>\r
     <xs:element name="exitReason" type="xs:string"/>\r

diff --git a/services/objectexit/jaxb/src/main/java/org/collectionspace/services/ObjectexitJAXBSchema.java b/services/objectexit/jaxb/src/main/java/org/collectionspace/services/ObjectexitJAXBSchema.java
index 638b0b2ca40b49058b840c6dd48f2fbadce97be7..302847321956a692c6ac6bd4376df21b703fb186 100644 (file)
--- a/services/objectexit/jaxb/src/main/java/org/collectionspace/services/ObjectexitJAXBSchema.java
+++ b/services/objectexit/jaxb/src/main/java/org/collectionspace/services/ObjectexitJAXBSchema.java
@@ -7,6 +7,7 @@ public interface ObjectexitJAXBSchema {
     final static String OBJECT_EXIT_CURRENT_OWNER = "currentOwner";
     final static String OBJECT_EXIT_DEPOSITOR = "depositor";
     final static String OBJECT_EXIT_DATE = "exitDate";
+    final static String OBJECT_EXIT_METHODS = "exitMethods";
     final static String OBJECT_EXIT_METHOD = "exitMethod";
     final static String OBJECT_EXIT_NOTE = "exitNote";
     final static String OBJECT_EXIT_NUMBER = "exitNumber";

diff --git a/services/objectexit/jaxb/src/main/java/org/collectionspace/services/ObjectexitListItemJAXBSchema.java b/services/objectexit/jaxb/src/main/java/org/collectionspace/services/ObjectexitListItemJAXBSchema.java
index a6874a6dcefcc8ffc0e082bf719814bce36a7a0b..2692cf6d40a86a5df279884f9ded3835608c4904 100644 (file)
--- a/services/objectexit/jaxb/src/main/java/org/collectionspace/services/ObjectexitListItemJAXBSchema.java
+++ b/services/objectexit/jaxb/src/main/java/org/collectionspace/services/ObjectexitListItemJAXBSchema.java
@@ -2,14 +2,8 @@ package org.collectionspace.services;
 
 public interface ObjectexitListItemJAXBSchema {
     final static String OBJECT_EXIT_CURRENT_OWNER = "currentOwner";
-    final static String OBJECT_EXIT_DEPOSITOR = "depositor";
-    final static String OBJECT_EXIT_DATE = "exitDate";
-    final static String OBJECT_EXIT_METHOD = "exitMethod";
-    final static String OBJECT_EXIT_NOTE = "exitNote";
     final static String OBJECT_EXIT_NUMBER = "exitNumber";
-    final static String OBJECT_EXIT_REASON = "exitReason";
-    final static String OBJECT_EXIT_PACKING_NOTE = "packingNote";
-
+    
        final static String CSID = "csid";
        final static String URI = "url";
 }

diff --git a/services/objectexit/jaxb/src/main/resources/objectexit_common.xsd b/services/objectexit/jaxb/src/main/resources/objectexit_common.xsd
index 68abf9391f0055a5d49dcd780697a4b34b0af496..d6e6f91a592bcf8631cd2e939e05db140d0329b5 100644 (file)
--- a/services/objectexit/jaxb/src/main/resources/objectexit_common.xsd
+++ b/services/objectexit/jaxb/src/main/resources/objectexit_common.xsd
@@ -35,7 +35,7 @@
                 <xs:element name="currentOwner" type="xs:string"/>
                 <xs:element name="depositor" type="xs:string"/>
                 <xs:element name="exitDate" type="xs:string"/>
-                <xs:element name="exitMethod" type="xs:string"/>
+                <xs:element name="exitMethods" type="exitMethods"/>
                 <xs:element name="exitNote" type="xs:string"/>
                 <xs:element name="exitNumber" type="xs:string"/>
                 <xs:element name="exitReason" type="xs:string"/>
@@ -43,6 +43,12 @@
             </xs:sequence>
         </xs:complexType>
     </xs:element>
+    
+    <xs:complexType name="exitMethods">
+        <xs:sequence>
+            <xs:element name="exitMethod" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
+        </xs:sequence>
+    </xs:complexType>
 
     <!-- This is the base class for paginated lists -->
     <xs:complexType name="abstractCommonList">