CSPACE-6935: Made more client update fixes.

diff --git a/services/JaxRsServiceProvider/.gitignore b/services/JaxRsServiceProvider/.gitignore
new file mode 100644 (file)
index 0000000..1dd3331
--- /dev/null
+++ b/services/JaxRsServiceProvider/.gitignore
@@ -0,0 +1,2 @@
+/target/
+/target/

diff --git a/services/account/client/.gitignore b/services/account/client/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
+++ b/services/account/client/.gitignore
@@ -0,0 +1 @@
+/target/

diff --git a/services/account/jaxb/.gitignore b/services/account/jaxb/.gitignore
index 993e2e7932e497f0ab63634be9241909544c722e..b83d22266ac8aa2f8df2edef68082c789727841d 100644 (file)
--- a/services/account/jaxb/.gitignore
+++ b/services/account/jaxb/.gitignore
@@ -1,6 +1 @@
 /target/
-/target/
-/target/
-/target/
-/target/
-/target/

diff --git a/services/account/pstore/.gitignore b/services/account/pstore/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
+++ b/services/account/pstore/.gitignore
@@ -0,0 +1 @@
+/target/

diff --git a/services/authentication/client/.gitignore b/services/authentication/client/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
+++ b/services/authentication/client/.gitignore
@@ -0,0 +1 @@
+/target/

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 b6fa057bf94e09d459400239435c67d1f4e96184..aab022d90b77c8356da7994ce9d8e80b5ab4e68f 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
@@ -41,22 +41,20 @@ import org.collectionspace.services.common.context.ServiceContext;
 import org.collectionspace.services.common.document.DocumentException;
 import org.collectionspace.services.common.document.DocumentNotFoundException;
 import org.collectionspace.services.common.document.DocumentWrapper;
-import org.collectionspace.services.common.document.DocumentHandler.Action;
 import org.collectionspace.services.common.vocabulary.AuthorityItemJAXBSchema;
 import org.collectionspace.services.common.vocabulary.AuthorityJAXBSchema;
 import org.collectionspace.services.common.vocabulary.RefNameServiceUtils.Specifier;
 import org.collectionspace.services.common.vocabulary.RefNameServiceUtils.SpecifierForm;
 import org.collectionspace.services.config.service.ObjectPartType;
-import org.collectionspace.services.nuxeo.client.java.NuxeoDocumentFilter;
 import org.collectionspace.services.nuxeo.client.java.NuxeoDocumentModelHandler;
 import org.collectionspace.services.nuxeo.client.java.CoreSessionInterface;
 import org.collectionspace.services.nuxeo.client.java.RepositoryClientImpl;
 import org.collectionspace.services.nuxeo.util.NuxeoUtils;
+
 import org.nuxeo.ecm.core.api.ClientException;
 import org.nuxeo.ecm.core.api.DocumentModel;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.testng.Assert;
 
 /**
  * AuthorityDocumentModelHandler
@@ -87,8 +85,9 @@ public abstract class AuthorityDocumentModelHandler<AuthCommon>
             throws Exception {
             PoxPayloadIn input = new PoxPayloadIn((String)res.readEntity(getEntityResponseType()));
             PayloadInputPart payloadInputPart = input.getPart(partLabel);
-            Assert.assertNotNull(payloadInputPart,
-                    "Part " + partLabel + " was unexpectedly null.");
+            if (payloadInputPart == null) {
+               logger.error("Part " + partLabel + " was unexpectedly null.");
+            }
             return payloadInputPart;
     }
     

diff --git a/services/authorization-mgt/import/.gitignore b/services/authorization-mgt/import/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
+++ b/services/authorization-mgt/import/.gitignore
@@ -0,0 +1 @@
+/target/

diff --git a/services/authorization/jaxb/.gitignore b/services/authorization/jaxb/.gitignore
index a227dd5ab7b6ef4c98cd0722f6e0e34feeae561e..b83d22266ac8aa2f8df2edef68082c789727841d 100644 (file)
--- a/services/authorization/jaxb/.gitignore
+++ b/services/authorization/jaxb/.gitignore
@@ -1,7 +1 @@
 /target/
-/target/
-/target/
-/target/
-/target/
-/target/
-/target/

diff --git a/services/authorization/pstore/.gitignore b/services/authorization/pstore/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
+++ b/services/authorization/pstore/.gitignore
@@ -0,0 +1 @@
+/target/

diff --git a/services/batch/jaxb/.gitignore b/services/batch/jaxb/.gitignore
index 1dd33310812560b414ca155359fca42cd9b8af9f..b83d22266ac8aa2f8df2edef68082c789727841d 100644 (file)
--- a/services/batch/jaxb/.gitignore
+++ b/services/batch/jaxb/.gitignore
@@ -1,2 +1 @@
 /target/
-/target/

diff --git a/services/citation/jaxb/.gitignore b/services/citation/jaxb/.gitignore
index 1dd33310812560b414ca155359fca42cd9b8af9f..b83d22266ac8aa2f8df2edef68082c789727841d 100644 (file)
--- a/services/citation/jaxb/.gitignore
+++ b/services/citation/jaxb/.gitignore
@@ -1,2 +1 @@
 /target/
-/target/

diff --git a/services/collectionobject/jaxb/.gitignore b/services/collectionobject/jaxb/.gitignore
index 1dd33310812560b414ca155359fca42cd9b8af9f..b83d22266ac8aa2f8df2edef68082c789727841d 100644 (file)
--- a/services/collectionobject/jaxb/.gitignore
+++ b/services/collectionobject/jaxb/.gitignore
@@ -1,2 +1 @@
 /target/
-/target/

diff --git a/services/config/.gitignore b/services/config/.gitignore
index e91d5c41bbb7f5764392b0113b64e9037c94bdcc..b83d22266ac8aa2f8df2edef68082c789727841d 100644 (file)
--- a/services/config/.gitignore
+++ b/services/config/.gitignore
@@ -1,3 +1 @@
 /target/
-/target/
-/target/

diff --git a/services/group/jaxb/pom.xml b/services/group/jaxb/pom.xml
index 11cb8de02c9f61d37ca514a98b8a6e65e7c27f1c..774552699d29b1f9d22ea85750eb6f79a3876495 100644 (file)
--- a/services/group/jaxb/pom.xml
+++ b/services/group/jaxb/pom.xml
@@ -3,8 +3,8 @@
     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.group</artifactId>
         <groupId>org.collectionspace.services</groupId>
+        <artifactId>org.collectionspace.services.group</artifactId>
         <version>4.4-SNAPSHOT</version>
     </parent>
     

diff --git a/services/hyperjaxb/.gitignore b/services/hyperjaxb/.gitignore
index b49c56399cdcf2ef417c7f7078009743de11194c..b83d22266ac8aa2f8df2edef68082c789727841d 100644 (file)
--- a/services/hyperjaxb/.gitignore
+++ b/services/hyperjaxb/.gitignore
@@ -1,4 +1 @@
 /target/
-/target/
-/target/
-/target/

diff --git a/services/jaxb/.gitignore b/services/jaxb/.gitignore
index 1dd33310812560b414ca155359fca42cd9b8af9f..b83d22266ac8aa2f8df2edef68082c789727841d 100644 (file)
--- a/services/jaxb/.gitignore
+++ b/services/jaxb/.gitignore
@@ -1,2 +1 @@
 /target/
-/target/

diff --git a/services/material/jaxb/.gitignore b/services/material/jaxb/.gitignore
index 1dd33310812560b414ca155359fca42cd9b8af9f..b83d22266ac8aa2f8df2edef68082c789727841d 100644 (file)
--- a/services/material/jaxb/.gitignore
+++ b/services/material/jaxb/.gitignore
@@ -1,2 +1 @@
 /target/
-/target/

diff --git a/services/media/client/src/main/java/org/collectionspace/services/client/MediaClient.java b/services/media/client/src/main/java/org/collectionspace/services/client/MediaClient.java
index e08972260bfb344234675822ebca78e36e64d180..fa0cd553fa1f1752d8074447144bceabe12d1321 100644 (file)
--- a/services/media/client/src/main/java/org/collectionspace/services/client/MediaClient.java
+++ b/services/media/client/src/main/java/org/collectionspace/services/client/MediaClient.java
@@ -17,6 +17,8 @@
 package org.collectionspace.services.client;
 
 import javax.ws.rs.core.Response;
+
+import org.collectionspace.services.media.MediaCommon;
 import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataOutput;
 import org.jboss.resteasy.client.ClientResponse;
 
@@ -27,7 +29,7 @@ import org.jboss.resteasy.client.ClientResponse;
  * $LastChangedDate: 2010-05-17 18:25:37 -0700 (Mon, 17 May 2010) $
  *
  */
-public class MediaClient extends AbstractCommonListPoxServiceClientImpl<MediaProxy> {
+public class MediaClient extends AbstractCommonListPoxServiceClientImpl<MediaProxy, MediaCommon> {
        public static final String SERVICE_NAME = "media";
        public static final String SERVICE_PATH_COMPONENT = SERVICE_NAME;       
        public static final String SERVICE_PATH = "/" + SERVICE_PATH_COMPONENT;

diff --git a/services/movement/client/src/main/java/org/collectionspace/services/client/MovementClient.java b/services/movement/client/src/main/java/org/collectionspace/services/client/MovementClient.java
index 42d623bbb0062f036f73b726bc9c4920646dbf61..d3a8dabbbfc4743036e8e9552d9b09ac15427736 100644 (file)
--- a/services/movement/client/src/main/java/org/collectionspace/services/client/MovementClient.java
+++ b/services/movement/client/src/main/java/org/collectionspace/services/client/MovementClient.java
@@ -19,6 +19,8 @@ package org.collectionspace.services.client;
 
 import javax.ws.rs.core.Response;
 
+import org.collectionspace.services.movement.MovementsCommon;
+
 /**
  * MovementClient.java
  *
@@ -26,7 +28,7 @@ import javax.ws.rs.core.Response;
  * $LastChangedDate$
  *
  */
-public class MovementClient extends AbstractCommonListPoxServiceClientImpl<MovementProxy> {
+public class MovementClient extends AbstractCommonListPoxServiceClientImpl<MovementProxy, MovementsCommon> {
     public static final String SERVICE_NAME = "movements";
        public static final String SERVICE_PATH_COMPONENT = SERVICE_NAME;       
        public static final String SERVICE_PATH = "/" + SERVICE_PATH_COMPONENT;

diff --git a/services/movement/jaxb/.gitignore b/services/movement/jaxb/.gitignore
index 1dd33310812560b414ca155359fca42cd9b8af9f..b83d22266ac8aa2f8df2edef68082c789727841d 100644 (file)
--- a/services/movement/jaxb/.gitignore
+++ b/services/movement/jaxb/.gitignore
@@ -1,2 +1 @@
 /target/
-/target/

diff --git a/services/objectexit/client/src/main/java/org/collectionspace/services/client/ObjectExitClient.java b/services/objectexit/client/src/main/java/org/collectionspace/services/client/ObjectExitClient.java
index a7b4d132bd2eace90b9757970b5a5a14fadb95c0..d8f754aa71aba68ae08b50b2a40d8ee40c5f8b07 100644 (file)
--- a/services/objectexit/client/src/main/java/org/collectionspace/services/client/ObjectExitClient.java
+++ b/services/objectexit/client/src/main/java/org/collectionspace/services/client/ObjectExitClient.java
@@ -16,6 +16,8 @@
  */
 package org.collectionspace.services.client;
 
+import org.collectionspace.services.objectexit.ObjectexitCommon;
+
 /**
  * ObjectExitClient.java
  *
@@ -23,7 +25,7 @@ package org.collectionspace.services.client;
  * $LastChangedDate: 2010-05-17 18:25:37 -0700 (Mon, 17 May 2010) $
  *
  */
-public class ObjectExitClient extends AbstractCommonListPoxServiceClientImpl<ObjectExitProxy> {
+public class ObjectExitClient extends AbstractCommonListPoxServiceClientImpl<ObjectExitProxy, ObjectexitCommon> {
 
     public static final String SERVICE_NAME = "objectexit";
     public static final String SERVICE_PATH_COMPONENT = SERVICE_NAME;

diff --git a/services/person/jaxb/.gitignore b/services/person/jaxb/.gitignore
index 1dd33310812560b414ca155359fca42cd9b8af9f..b83d22266ac8aa2f8df2edef68082c789727841d 100644 (file)
--- a/services/person/jaxb/.gitignore
+++ b/services/person/jaxb/.gitignore
@@ -1,2 +1 @@
 /target/
-/target/

diff --git a/services/report/client/src/main/java/org/collectionspace/services/client/ReportClient.java b/services/report/client/src/main/java/org/collectionspace/services/client/ReportClient.java
index a2bb522803a994dfb127355a298d968beaeff446..f8ad53fc9ca7609d918d822ee29a83891d225f14 100644 (file)
--- a/services/report/client/src/main/java/org/collectionspace/services/client/ReportClient.java
+++ b/services/report/client/src/main/java/org/collectionspace/services/client/ReportClient.java
@@ -27,7 +27,9 @@
 package org.collectionspace.services.client;
 
 import javax.ws.rs.core.Response;
+
 import org.collectionspace.services.common.invocable.InvocationContext;
+import org.collectionspace.services.report.ReportsCommon;
 
 /**
  * A ReportClient.
@@ -35,7 +37,7 @@ import org.collectionspace.services.common.invocable.InvocationContext;
  * @version $Revision:$
  * FIXME: http://issues.collectionspace.org/browse/CSPACE-1684
  */
-public class ReportClient extends AbstractCommonListPoxServiceClientImpl<ReportProxy> {
+public class ReportClient extends AbstractCommonListPoxServiceClientImpl<ReportProxy, ReportsCommon> {
 
     public static final String SERVICE_NAME = "reports";
     public static final String SERVICE_PATH_COMPONENT = SERVICE_NAME;

diff --git a/services/security/client/.gitignore b/services/security/client/.gitignore
new file mode 100644 (file)
index 0000000..b83d222
--- /dev/null
+++ b/services/security/client/.gitignore
@@ -0,0 +1 @@
+/target/

diff --git a/services/servicegroup/client/src/main/java/org/collectionspace/services/client/ServiceGroupClient.java b/services/servicegroup/client/src/main/java/org/collectionspace/services/client/ServiceGroupClient.java
index 1359961c6d2033799926d29ed8db0b77ec10785d..6a1904ff40a9db4cab744b7562d8c19e8f62c469 100644 (file)
--- a/services/servicegroup/client/src/main/java/org/collectionspace/services/client/ServiceGroupClient.java
+++ b/services/servicegroup/client/src/main/java/org/collectionspace/services/client/ServiceGroupClient.java
@@ -16,6 +16,8 @@
  */
 package org.collectionspace.services.client;
 
+import org.collectionspace.services.servicegroup.ServicegroupsCommon;
+
 /**
  * ServiceGroupClient.java
  *
@@ -23,7 +25,7 @@ package org.collectionspace.services.client;
  * $LastChangedDate: 2010-05-17 18:25:37 -0700 (Mon, 17 May 2010) $
  *
  */
-public class ServiceGroupClient extends AbstractCommonListPoxServiceClientImpl<ServiceGroupProxy> {
+public class ServiceGroupClient extends AbstractCommonListPoxServiceClientImpl<ServiceGroupProxy, ServicegroupsCommon> {
        
        public static final String SERVICE_NAME = "servicegroups";
        public static final String SERVICE_PATH_COMPONENT = SERVICE_NAME;       

diff --git a/services/valuationcontrol/client/src/main/java/org/collectionspace/services/client/ValuationcontrolClient.java b/services/valuationcontrol/client/src/main/java/org/collectionspace/services/client/ValuationcontrolClient.java
index 58684eb8c1416243b451cd1fa3e14ac8e962d799..6372aa4d67d0f37fa878e8ab1beeee452d24b631 100644 (file)
--- a/services/valuationcontrol/client/src/main/java/org/collectionspace/services/client/ValuationcontrolClient.java
+++ b/services/valuationcontrol/client/src/main/java/org/collectionspace/services/client/ValuationcontrolClient.java
@@ -16,10 +16,12 @@
  */
 package org.collectionspace.services.client;
 
+import org.collectionspace.services.valuationcontrol.ValuationcontrolsCommon;
+
 /**
  * ValuationcontrolClient.java
  */
-public class ValuationcontrolClient extends AbstractCommonListPoxServiceClientImpl<ValuationcontrolProxy> {
+public class ValuationcontrolClient extends AbstractCommonListPoxServiceClientImpl<ValuationcontrolProxy, ValuationcontrolsCommon> {
 
     public static final String SERVICE_NAME = "valuationcontrols";
     public static final String SERVICE_PATH_COMPONENT = SERVICE_NAME;