CSPACE-4172,CSPACE-3332: Minor cleanup re move to CommonList format in acquisition...

diff --git a/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
index 899a93b544c38d1aa4b9db0065834e74d7218fc7..72f7ecbde084d49df5de0780d24fa96946337413 100644 (file)
--- a/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
+++ b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
@@ -103,15 +103,6 @@
             <xs:element name="fieldCollectionEventName" type="xs:string" minOccurs="0" maxOccurs="unbounded"/>
         </xs:sequence>
     </xs:complexType>
-    
-    <!-- This is the base class for paginated lists -->
-    <xs:complexType name="abstractCommonList">
-        <xs:annotation>
-            <xs:appinfo>
-                <jaxb:class ref="org.collectionspace.services.jaxb.AbstractCommonList"/>
-            </xs:appinfo>
-        </xs:annotation>
-    </xs:complexType>
 
 </xs:schema>
 

diff --git a/services/intake/jaxb/src/main/resources/intakes-common.xsd b/services/intake/jaxb/src/main/resources/intakes-common.xsd
index c613b8d274e17c483690b80de758c12c8b040213..a088782e275ca997812db26f4e6c6e9504920881 100644 (file)
--- a/services/intake/jaxb/src/main/resources/intakes-common.xsd
+++ b/services/intake/jaxb/src/main/resources/intakes-common.xsd
@@ -151,14 +151,5 @@
         </xs:sequence>
     </xs:complexType>
     
-    <!-- This is the base class for paginated lists -->
-    <xs:complexType name="abstractCommonList">
-        <xs:annotation>
-            <xs:appinfo>
-                <jaxb:class ref="org.collectionspace.services.jaxb.AbstractCommonList"/>
-            </xs:appinfo>
-        </xs:annotation>
-    </xs:complexType>
-    
 </xs:schema>
 

diff --git a/services/loanin/client/src/main/java/org/collectionspace/services/client/LoaninClient.java b/services/loanin/client/src/main/java/org/collectionspace/services/client/LoaninClient.java
index 75a3b8e168b5b3ae09e5cd059d2ab459abc86047..e5c31e8f0d7615518ee1979c1bdb72b8271c9141 100644 (file)
--- a/services/loanin/client/src/main/java/org/collectionspace/services/client/LoaninClient.java
+++ b/services/loanin/client/src/main/java/org/collectionspace/services/client/LoaninClient.java
@@ -28,6 +28,8 @@ public class LoaninClient extends AbstractCommonListPoxServiceClientImpl<LoaninP
     public static final String SERVICE_NAME = "loansin";
     public static final String SERVICE_PATH_COMPONENT = SERVICE_NAME;
     public static final String SERVICE_PATH = "/" + SERVICE_PATH_COMPONENT;
+    public static final String SERVICE_PATH_PROXY = SERVICE_PATH + "/";
+    public static final String SERVICE_PAYLOAD_NAME = SERVICE_NAME;
 
     /* (non-Javadoc)
      * @see org.collectionspace.services.client.AbstractServiceClientImpl#getServicePathComponent()

diff --git a/services/loanin/client/src/main/java/org/collectionspace/services/client/LoaninProxy.java b/services/loanin/client/src/main/java/org/collectionspace/services/client/LoaninProxy.java
index 7dc0e9abfd3f230498852dbd27de2aac0ec13f4d..2e0b81ec580e90a979c4640f905eae79108a8b07 100644 (file)
--- a/services/loanin/client/src/main/java/org/collectionspace/services/client/LoaninProxy.java
+++ b/services/loanin/client/src/main/java/org/collectionspace/services/client/LoaninProxy.java
@@ -27,8 +27,8 @@ import javax.ws.rs.Produces;
  * $LastChangedDate$
  *
  */
-@Path("/loansin/")
-@Produces({"application/xml;charset=UTF-8"})
+@Path(LoaninClient.SERVICE_PATH_PROXY)
+@Produces({"application/xml"})
 @Consumes({"application/xml"})
 public interface LoaninProxy extends CollectionSpaceCommonListPoxProxy {
 }

diff --git a/services/loanin/jaxb/src/main/resources/loansin-common.xsd b/services/loanin/jaxb/src/main/resources/loansin-common.xsd
index 8cf52eba361aeba4799d039a626882b03f1b6d9d..9fe86ee6784d333bdeb427b090d9d2ec624e61a9 100644 (file)
--- a/services/loanin/jaxb/src/main/resources/loansin-common.xsd
+++ b/services/loanin/jaxb/src/main/resources/loansin-common.xsd
@@ -62,14 +62,5 @@
        </xs:sequence>
     </xs:complexType>
     
-    <!-- This is the base class for paginated lists -->
-    <xs:complexType name="abstractCommonList">
-        <xs:annotation>
-            <xs:appinfo>
-                <jaxb:class ref="org.collectionspace.services.jaxb.AbstractCommonList"/>
-            </xs:appinfo>
-        </xs:annotation>
-    </xs:complexType>
-    
 </xs:schema>