From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Thu, 21 Jul 2011 20:25:04 +0000 (+0000)
Subject: CSPACE-4172,CSPACE-3332: Minor cleanup re move to CommonList format in acquisition... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=eeb476e93206908d56dfdc6447e1df8db2eec317;p=tmp%2Fjakarta-migration.git

CSPACE-4172,CSPACE-3332: Minor cleanup re move to CommonList format in acquisition, intake, loanin: removed JAXB declarations of AbstractCommonList; added constant for proxy service path.
---

diff --git a/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd b/services/acquisition/jaxb/src/main/resources/acquisitions_common.xsd
index 899a93b54..72f7ecbde 100644
--- 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 c613b8d27..a088782e2 100644
--- 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 75a3b8e16..e5c31e8f0 100644
--- 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 7dc0e9abf..2e0b81ec5 100644
--- 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 8cf52eba3..9fe86ee67 100644
--- 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>