From: Richard Millet Date: Mon, 4 Apr 2016 17:47:30 +0000 (-0700) Subject: CSPACE-6935: Made more client update fixes. X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=ae4e7072ed19dbbf2a3efae6b1735c47634a9e02;p=tmp%2Fjakarta-migration.git CSPACE-6935: Made more client update fixes. --- diff --git a/services/JaxRsServiceProvider/.gitignore b/services/JaxRsServiceProvider/.gitignore new file mode 100644 index 000000000..1dd333108 --- /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 index 000000000..b83d22266 --- /dev/null +++ b/services/account/client/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/services/account/jaxb/.gitignore b/services/account/jaxb/.gitignore index 993e2e793..b83d22266 100644 --- 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 index 000000000..b83d22266 --- /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 index 000000000..b83d22266 --- /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 b6fa057bf..aab022d90 100644 --- 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 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 index 000000000..b83d22266 --- /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 a227dd5ab..b83d22266 100644 --- 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 index 000000000..b83d22266 --- /dev/null +++ b/services/authorization/pstore/.gitignore @@ -0,0 +1 @@ +/target/ diff --git a/services/batch/jaxb/.gitignore b/services/batch/jaxb/.gitignore index 1dd333108..b83d22266 100644 --- 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 1dd333108..b83d22266 100644 --- 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 1dd333108..b83d22266 100644 --- 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 e91d5c41b..b83d22266 100644 --- 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 11cb8de02..774552699 100644 --- 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"> - org.collectionspace.services.group org.collectionspace.services + org.collectionspace.services.group 4.4-SNAPSHOT diff --git a/services/hyperjaxb/.gitignore b/services/hyperjaxb/.gitignore index b49c56399..b83d22266 100644 --- 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 1dd333108..b83d22266 100644 --- 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 1dd333108..b83d22266 100644 --- 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 e08972260..fa0cd553f 100644 --- 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 { +public class MediaClient extends AbstractCommonListPoxServiceClientImpl { 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 42d623bbb..d3a8dabbb 100644 --- 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 { +public class MovementClient extends AbstractCommonListPoxServiceClientImpl { 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 1dd333108..b83d22266 100644 --- 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 a7b4d132b..d8f754aa7 100644 --- 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 { +public class ObjectExitClient extends AbstractCommonListPoxServiceClientImpl { 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 1dd333108..b83d22266 100644 --- 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 a2bb52280..f8ad53fc9 100644 --- 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 { +public class ReportClient extends AbstractCommonListPoxServiceClientImpl { 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 index 000000000..b83d22266 --- /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 1359961c6..6a1904ff4 100644 --- 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 { +public class ServiceGroupClient extends AbstractCommonListPoxServiceClientImpl { 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 58684eb8c..6372aa4d6 100644 --- 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 { +public class ValuationcontrolClient extends AbstractCommonListPoxServiceClientImpl { public static final String SERVICE_NAME = "valuationcontrols"; public static final String SERVICE_PATH_COMPONENT = SERVICE_NAME;