CSPACE-6935: Cleaning up Index service files and continuing the refactor of the clien...

diff --git a/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityDocumentModelHandler.java b/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityDocumentModelHandler.java
index 6c0ad81c144e21481728d0d6071a3182dc65df0d..b6fa057bf94e09d459400239435c67d1f4e96184 100644 (file)
--- a/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityDocumentModelHandler.java
+++ b/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/nuxeo/AuthorityDocumentModelHandler.java
@@ -122,9 +122,11 @@ public abstract class AuthorityDocumentModelHandler<AuthCommon>
                    logger.debug(client.getClass().getCanonicalName() + ": status = " + statusCode);
                }
                
+            PoxPayloadIn input = new PoxPayloadIn((String)res.readEntity(getEntityResponseType())); // Get the entire response!
+               
                        PayloadInputPart payloadInputPart = extractPart(res, client.getCommonPartName());
                        if (payloadInputPart != null) {
-                               result = (CPT) payloadInputPart.getBody();
+//                             result = (client.getc) payloadInputPart.getBody();
                        }
         } finally {
                res.close();

diff --git a/services/blob/client/src/main/java/org/collectionspace/services/client/BlobClient.java b/services/blob/client/src/main/java/org/collectionspace/services/client/BlobClient.java
index 2e5dbd6b81e6ed87b3a7edb0b9305520cf613c1d..d5e266713084a3e6476ca88091001e6a4c6beda7 100644 (file)
--- a/services/blob/client/src/main/java/org/collectionspace/services/client/BlobClient.java
+++ b/services/blob/client/src/main/java/org/collectionspace/services/client/BlobClient.java
@@ -19,6 +19,7 @@ package org.collectionspace.services.client;
 import javax.ws.rs.PathParam;
 import javax.ws.rs.core.Response;
 
+import org.collectionspace.services.blob.BlobsCommon;
 import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataOutput;
 
 /**
@@ -28,7 +29,7 @@ import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataOutput;
  * $LastChangedDate: 2010-05-17 18:25:37 -0700 (Mon, 17 May 2010) $
  *
  */
-public class BlobClient extends AbstractCommonListPoxServiceClientImpl<BlobProxy> {
+public class BlobClient extends AbstractCommonListPoxServiceClientImpl<BlobProxy, BlobsCommon> {
        public static final String SERVICE_NAME = "blobs";
        public static final String SERVICE_PATH_COMPONENT = SERVICE_NAME;       
        public static final String SERVICE_PATH = "/" + SERVICE_PATH_COMPONENT;

diff --git a/services/client/src/main/java/org/collectionspace/services/client/index/IndexClient.java b/services/client/src/main/java/org/collectionspace/services/client/index/IndexClient.java
index 689618ca580196e221879f501c68066de76ba552..6938e50654ed5d2773ecdb0521ed2824e929234d 100644 (file)
--- a/services/client/src/main/java/org/collectionspace/services/client/index/IndexClient.java
+++ b/services/client/src/main/java/org/collectionspace/services/client/index/IndexClient.java
@@ -19,7 +19,7 @@ package org.collectionspace.services.client.index;
 import javax.ws.rs.core.Response;
 
 import org.collectionspace.services.client.AbstractCommonListPoxServiceClientImpl;
-import org.collectionspace.services.index.IndexesCommon;
+import org.collectionspace.services.index.IndexCommon;
 
 /**
  * IndexClient.java
@@ -28,7 +28,7 @@ import org.collectionspace.services.index.IndexesCommon;
  * $LastChangedDate: 2010-05-17 18:25:37 -0700 (Mon, 17 May 2010) $
  *
  */
-public class IndexClient extends AbstractCommonListPoxServiceClientImpl<IndexProxy, IndexesCommon> {
+public class IndexClient extends AbstractCommonListPoxServiceClientImpl<IndexProxy, IndexCommon> {
        public static final String SERVICE_NAME = "index";
        public static final String SERVICE_PATH_COMPONENT = SERVICE_NAME;       
        public static final String SERVICE_PATH = "/" + SERVICE_PATH_COMPONENT;

diff --git a/services/client/src/main/java/org/collectionspace/services/client/workflow/WorkflowClient.java b/services/client/src/main/java/org/collectionspace/services/client/workflow/WorkflowClient.java
index 5491864e41feb0a8cb855c7d25d1d062ad85cc03..d107f78008f7111d3dd2bc54a3f2735f0b8f4ee4 100644 (file)
--- a/services/client/src/main/java/org/collectionspace/services/client/workflow/WorkflowClient.java
+++ b/services/client/src/main/java/org/collectionspace/services/client/workflow/WorkflowClient.java
@@ -17,7 +17,9 @@
 package org.collectionspace.services.client.workflow;
 
 import javax.ws.rs.core.Response;
+
 import org.collectionspace.services.client.AbstractCommonListPoxServiceClientImpl;
+import org.collectionspace.services.workflow.WorkflowCommon;
 
 /**
  * WorkflowClient.java
@@ -26,7 +28,7 @@ import org.collectionspace.services.client.AbstractCommonListPoxServiceClientImp
  * $LastChangedDate: 2010-05-17 18:25:37 -0700 (Mon, 17 May 2010) $
  *
  */
-public class WorkflowClient extends AbstractCommonListPoxServiceClientImpl<WorkflowProxy> {
+public class WorkflowClient extends AbstractCommonListPoxServiceClientImpl<WorkflowProxy, WorkflowCommon> {
        public static final String SERVICE_NAME = "workflow";
        public static final String SERVICE_PATH_COMPONENT = SERVICE_NAME;       
        public static final String SERVICE_PATH = "/" + SERVICE_PATH_COMPONENT;

diff --git a/services/index/client/pom.xml b/services/index/client/pom.xml
index c749880690f3bb107d5aafe05094102b16e4df64..6d167c4c81e561c4682f542566c7dd56ba7fc077 100644 (file)
--- a/services/index/client/pom.xml
+++ b/services/index/client/pom.xml
@@ -42,7 +42,7 @@
         </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
-            <artifactId>org.collectionspace.services.index.jaxb</artifactId>
+            <artifactId>org.collectionspace.services.dimension.client</artifactId> <!-- Dimension instances are used as a unit-tests targets -->
             <version>${project.version}</version>
         </dependency>
 <!-- External dependencies -->        

diff --git a/services/index/client/src/main/java/org/collectionspace/services/client/README.java b/services/index/client/src/main/java/org/collectionspace/services/client/README.java
new file mode 100644 (file)
index 0000000..86331a1
--- /dev/null
+++ b/services/index/client/src/main/java/org/collectionspace/services/client/README.java
@@ -0,0 +1,5 @@
+package org.collectionspace.services.client;
+
+public final class README {
+       // The IndexClient class you expected to see here is in the ../services/services/client directory (Maven Module)
+}

diff --git a/services/index/client/src/test/java/org/collectionspace/services/client/test/README.java b/services/index/client/src/test/java/org/collectionspace/services/client/test/README.java
new file mode 100644 (file)
index 0000000..b2a9e33
--- /dev/null
+++ b/services/index/client/src/test/java/org/collectionspace/services/client/test/README.java
@@ -0,0 +1,5 @@
+package org.collectionspace.services.client.test;
+
+public final class README {
+
+}

diff --git a/services/index/jaxb/src/main/java/org/collectionspace/services/index/IndexJAXBSchema.java b/services/index/jaxb/src/main/java/org/collectionspace/services/index/IndexJAXBSchema.java
deleted file mode 100644 (file)
index aa05c9a..0000000
--- a/services/index/jaxb/src/main/java/org/collectionspace/services/index/IndexJAXBSchema.java
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * 
- */
-package org.collectionspace.services.index;
-
-public interface IndexJAXBSchema {
-}
-
-

diff --git a/services/index/jaxb/src/main/java/org/collectionspace/services/index/IndexListItemJAXBSchema.java b/services/index/jaxb/src/main/java/org/collectionspace/services/index/IndexListItemJAXBSchema.java
deleted file mode 100644 (file)
index 7ed65b9..0000000
--- a/services/index/jaxb/src/main/java/org/collectionspace/services/index/IndexListItemJAXBSchema.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package org.collectionspace.services.index;
-
-public interface IndexListItemJAXBSchema {
-}

diff --git a/services/index/pom.xml b/services/index/pom.xml
index 6c2cee691e9570bfb61d60e6f5efd4bc19120e9e..da22a260a62bc7ce5855c4a6df37e489cc0f4b1e 100644 (file)
--- a/services/index/pom.xml
+++ b/services/index/pom.xml
@@ -13,7 +13,6 @@
     <packaging>pom</packaging>
 
     <modules>
-        <module>jaxb</module>
         <module>3rdparty</module>
         <module>client</module>
         <module>service</module>

diff --git a/services/index/jaxb/src/main/resources/indexes-common.xsd b/services/jaxb/src/main/resources/index_common.xsd
similarity index 60%
rename from services/index/jaxb/src/main/resources/indexes-common.xsd
rename to services/jaxb/src/main/resources/index_common.xsd
index 8f8edbb5260a5c51434d17c36d5acf2317845504..e250df2d12c2ef43f49b7172fe2f369bfebad1fd 100644 (file)
--- a/services/index/jaxb/src/main/resources/indexes-common.xsd
+++ b/services/jaxb/src/main/resources/index_common.xsd
@@ -1,36 +1,34 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 
 <!--
-    Index schema (XSD)
+    Loan Out schema (XSD)
     
     Entity  : Index
     Part    : Common
     Used for: JAXB binding between XML and Java objects
 
-    $LastChangedRevision: 860 $
-    $LastChangedDate: 2009-10-14 14:48:05 -0700 (Wed, 14 Oct 2009) $
+    $LastChangedRevision: 2316 $
+    $LastChangedDate: 2010-06-02 16:03:51 -0700 (Wed, 02 Jun 2010) $
 -->
 
 <xs:schema 
   xmlns:xs="http://www.w3.org/2001/XMLSchema"
-  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb" jaxb:version="2.0"
-  elementFormDefault="unqualified"
+  xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
+  jaxb:version="1.0" elementFormDefault="unqualified"
   xmlns:ns="http://collectionspace.org/services/index"
   xmlns="http://collectionspace.org/services/index"
   targetNamespace="http://collectionspace.org/services/index"
   version="0.1">
-
 <!--
     Avoid XmlRootElement nightmare:
     See http://weblogs.java.net/blog/kohsuke/archive/2006/03/why_does_jaxb_p.html
--->
-<!-- See http://wiki.collectionspace.org/display/collectionspace/Index+Schema -->    
-    
-    <!-- index  -->
-    <xs:element name="indexes_common">
+-->    
+    <!-- index -->
+    <xs:element name="index_common">
         <xs:complexType>
             <xs:sequence>
-                <xs:element name="csid" type="xs:string" />
+                <!--  Index Information Group -->
+                <xs:element name="indexInfo" type="xs:string"/>
             </xs:sequence>
         </xs:complexType>
     </xs:element>    

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 e5c31e8f0d7615518ee1979c1bdb72b8271c9141..f611c1aba619cd890d2d1676df2f465564f39224 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
@@ -16,6 +16,8 @@
  */
 package org.collectionspace.services.client;
 
+import org.collectionspace.services.loanin.LoansinCommon;
+
 /**
  * LoaninClient.java
  *
@@ -23,7 +25,7 @@ package org.collectionspace.services.client;
  * $LastChangedDate$
  *
  */
-public class LoaninClient extends AbstractCommonListPoxServiceClientImpl<LoaninProxy> {
+public class LoaninClient extends AbstractCommonListPoxServiceClientImpl<LoaninProxy, LoansinCommon> {
 
     public static final String SERVICE_NAME = "loansin";
     public static final String SERVICE_PATH_COMPONENT = SERVICE_NAME;

diff --git a/services/loanout/client/src/main/java/org/collectionspace/services/client/LoanoutClient.java b/services/loanout/client/src/main/java/org/collectionspace/services/client/LoanoutClient.java
index 657bd95eeef7c433fa64c5af9975a8de137b079e..46457088b6522809ccf79ec67d99b16b43988412 100644 (file)
--- a/services/loanout/client/src/main/java/org/collectionspace/services/client/LoanoutClient.java
+++ b/services/loanout/client/src/main/java/org/collectionspace/services/client/LoanoutClient.java
@@ -16,13 +16,15 @@
  */
 package org.collectionspace.services.client;
 
+import org.collectionspace.services.loanout.LoansoutCommon;
+
 /**
  * LoanoutClient.java
  *
  * $LastChangedRevision$
  * $LastChangedDate$
  */
-public class LoanoutClient extends AbstractCommonListPoxServiceClientImpl<LoanoutProxy> {
+public class LoanoutClient extends AbstractCommonListPoxServiceClientImpl<LoanoutProxy, LoansoutCommon> {
 
     public static final String SERVICE_NAME = "loansout";
     public static final String SERVICE_PATH_COMPONENT = SERVICE_NAME;

diff --git a/services/publicitem/client/src/main/java/org/collectionspace/services/client/PublicItemClient.java b/services/publicitem/client/src/main/java/org/collectionspace/services/client/PublicItemClient.java
index 5d96dea6172920091b837b26fb51f2795c5cbfa9..a224bb4be4c763c1bc734f90261397e0f75b6a4e 100644 (file)
--- a/services/publicitem/client/src/main/java/org/collectionspace/services/client/PublicItemClient.java
+++ b/services/publicitem/client/src/main/java/org/collectionspace/services/client/PublicItemClient.java
@@ -16,6 +16,8 @@
  */
 package org.collectionspace.services.client;
 
+import org.collectionspace.services.publicitem.PublicitemsCommon;
+
 /**
  * PublicItemClient.java
  *
@@ -23,7 +25,7 @@ package org.collectionspace.services.client;
  * $LastChangedDate$
  *
  */
-public class PublicItemClient extends AbstractCommonListPoxServiceClientImpl<PublicItemProxy> {
+public class PublicItemClient extends AbstractCommonListPoxServiceClientImpl<PublicItemProxy, PublicitemsCommon> {
 
     public static final String SERVICE_NAME = "publicitems";
     public static final String SERVICE_PATH_COMPONENT = SERVICE_NAME;

diff --git a/services/workflow/client/src/main/java/org/collectionspace/services/client/README.java b/services/workflow/client/src/main/java/org/collectionspace/services/client/README.java
new file mode 100644 (file)
index 0000000..2daab5b
--- /dev/null
+++ b/services/workflow/client/src/main/java/org/collectionspace/services/client/README.java
@@ -0,0 +1,5 @@
+package org.collectionspace.services.client;
+
+public final class README {
+       // The WorkflowClient class you expected to see here is in the ../services/services/client directory (Maven Module)
+}

diff --git a/services/workflow/jaxb/pom.xml b/services/workflow/jaxb/pom.xml
index 8335c08c7debe831ea5b12b1fccd2b0dc1b155e3..b02f03ba79829eb02e190ecf44fa9604c18a752b 100644 (file)
--- a/services/workflow/jaxb/pom.xml
+++ b/services/workflow/jaxb/pom.xml
@@ -3,13 +3,12 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
     <parent>
-        <artifactId>org.collectionspace.services.workflow</artifactId>
         <groupId>org.collectionspace.services</groupId>
+        <artifactId>org.collectionspace.services.workflow</artifactId>
         <version>4.4-SNAPSHOT</version>
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.workflow.jaxb</artifactId>
     <name>services.workflow.jaxb</name>