NOJIRA: Changing the Java packaging for the Relation service artifacts.

diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml
index a3edaf3219cb2f37bc2aef524ba67f20e9122bb5..df50b22736140f5fb3282bc63abf175f430e5e7e 100644 (file)
--- a/services/JaxRsServiceProvider/pom.xml
+++ b/services/JaxRsServiceProvider/pom.xml
@@ -172,7 +172,7 @@
                     <port>8180</port>\r
                 </configuration>\r
                 <executions>\r
-                    <execution>\r
+<!--                    <execution>\r
                         <id>jboss-undeploy</id>\r
                         <goals>\r
                             <goal>undeploy</goal>\r
@@ -195,7 +195,7 @@
                                 <param>${project.build.directory}/${project.build.finalName}.war</param>\r
                             </fileNames>\r
                         </configuration>\r
-                    </execution>\r
+                    </execution> -->\r
                 </executions>\r
             </plugin>\r
 \r

diff --git a/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java b/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
index df1802523fd96ce199c48d5c2f17983565e6f8ee..350f06d7e1d501bec2809d093f552964e1390ce0 100644 (file)
--- a/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
+++ b/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
@@ -3,7 +3,7 @@ package org.collectionspace.services.jaxrs;
 import org.collectionspace.services.collectionobject.CollectionObjectResource;
 import org.collectionspace.services.id.IDResource;
 import org.collectionspace.services.intake.IntakeResource;
-import org.collectionspace.services.RelationResource;
+import org.collectionspace.services.relation.RelationResource;
 
 import javax.ws.rs.core.Application;
 import java.util.HashSet;

diff --git a/services/common/src/main/java/org/collectionspace/services/common/RelationUtils.java b/services/common/src/main/java/org/collectionspace/services/common/relation/RelationUtils.java
similarity index 94%
rename from services/common/src/main/java/org/collectionspace/services/common/RelationUtils.java
rename to services/common/src/main/java/org/collectionspace/services/common/relation/RelationUtils.java
index cc4797ae80c2f78499f0c623dbb23b1fee1b74de..7c6da01840d247026cbc0d8abad6b099e221d365 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/common/RelationUtils.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/relation/RelationUtils.java
@@ -24,7 +24,7 @@
  * You may obtain a copy of the ECL 2.0 License at\r
  * https://source.collectionspace.org/collection-space/LICENSE.txt\r
  */\r
-package org.collectionspace.services.common;\r
+package org.collectionspace.services.common.relation;\r
 \r
 import java.io.IOException;\r
 import java.util.List;\r

diff --git a/services/common/src/main/java/org/collectionspace/services/common/RelationsManager.java b/services/common/src/main/java/org/collectionspace/services/common/relation/RelationsManager.java
similarity index 91%
rename from services/common/src/main/java/org/collectionspace/services/common/RelationsManager.java
rename to services/common/src/main/java/org/collectionspace/services/common/relation/RelationsManager.java
index 85135af6415e00a9e2a9d6558fb86e7bce722ec1..506945bc63c02b330ce3dfdebcb6e1103ab9ecba 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/common/RelationsManager.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/relation/RelationsManager.java
@@ -24,14 +24,16 @@
  * You may obtain a copy of the ECL 2.0 License at\r
  * https://source.collectionspace.org/collection-space/LICENSE.txt\r
  */\r
-package org.collectionspace.services.common;\r
+package org.collectionspace.services.common.relation;\r
 \r
 import java.io.IOException;\r
 import java.util.List;\r
 \r
 import org.collectionspace.services.common.repository.DocumentException;\r
-import org.collectionspace.services.nuxeo.RelationUtilsNuxeoImpl;\r
+import org.collectionspace.services.nuxeo.relation.RelationUtilsNuxeoImpl;\r
 import org.collectionspace.services.relation.Relation;\r
+import org.collectionspace.services.common.relation.RelationUtils;\r
+\r
 import org.dom4j.Document;\r
 \r
 /**\r

diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/RelationUtilsNuxeoImpl.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/relation/RelationUtilsNuxeoImpl.java
similarity index 95%
rename from services/common/src/main/java/org/collectionspace/services/nuxeo/RelationUtilsNuxeoImpl.java
rename to services/common/src/main/java/org/collectionspace/services/nuxeo/relation/RelationUtilsNuxeoImpl.java
index b94c549ad52628da45177d830a108974893d8c3f..ca4ac692e171ac001d7222e99a2c47632cc98e42 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/RelationUtilsNuxeoImpl.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/relation/RelationUtilsNuxeoImpl.java
@@ -24,7 +24,7 @@
  * You may obtain a copy of the ECL 2.0 License at\r
  * https://source.collectionspace.org/collection-space/LICENSE.txt\r
  */\r
-package org.collectionspace.services.nuxeo;\r
+package org.collectionspace.services.nuxeo.relation;\r
 \r
 import java.io.IOException;\r
 import java.io.Serializable;\r
@@ -32,10 +32,10 @@ import java.util.ArrayList;
 import java.util.List;\r
 import java.util.Map;\r
 \r
-import org.collectionspace.services.RelationJAXBSchema;\r
-import org.collectionspace.services.RelationListItemJAXBSchema;\r
+import org.collectionspace.services.relation.RelationJAXBSchema;\r
+import org.collectionspace.services.relation.RelationListItemJAXBSchema;\r
+import org.collectionspace.services.common.relation.RelationUtils;\r
 \r
-import org.collectionspace.services.common.RelationUtils;\r
 import org.collectionspace.services.relation.Relation;\r
 import org.collectionspace.services.relation.RelationshipType;\r
 import org.collectionspace.services.nuxeo.util.NuxeoUtils;\r

diff --git a/services/common/src/main/java/org/collectionspace/services/RelationJAXBSchema.java b/services/common/src/main/java/org/collectionspace/services/relation/RelationJAXBSchema.java
similarity index 94%
rename from services/common/src/main/java/org/collectionspace/services/RelationJAXBSchema.java
rename to services/common/src/main/java/org/collectionspace/services/relation/RelationJAXBSchema.java
index 74c58e3c58c906247c50bf03c099a21c82e758f7..4c338e805b2f9f96829525a57847dbf40a7bf245 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/RelationJAXBSchema.java
+++ b/services/common/src/main/java/org/collectionspace/services/relation/RelationJAXBSchema.java
@@ -24,7 +24,7 @@
  * You may obtain a copy of the ECL 2.0 License at\r
  * https://source.collectionspace.org/collection-space/LICENSE.txt\r
  */\r
-package org.collectionspace.services;\r
+package org.collectionspace.services.relation;\r
 \r
 /**\r
  * The Interface RelationJAXBSchema.\r

diff --git a/services/common/src/main/java/org/collectionspace/services/RelationListItemJAXBSchema.java b/services/common/src/main/java/org/collectionspace/services/relation/RelationListItemJAXBSchema.java
similarity index 92%
rename from services/common/src/main/java/org/collectionspace/services/RelationListItemJAXBSchema.java
rename to services/common/src/main/java/org/collectionspace/services/relation/RelationListItemJAXBSchema.java
index 7e500529cae7ede1390f29e6e8798a5b79249bd4..96d70a2c78820dd0b9cc53134c546d7bce68d344 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/RelationListItemJAXBSchema.java
+++ b/services/common/src/main/java/org/collectionspace/services/relation/RelationListItemJAXBSchema.java
@@ -24,7 +24,7 @@
  * You may obtain a copy of the ECL 2.0 License at\r
  * https://source.collectionspace.org/collection-space/LICENSE.txt\r
  */\r
-package org.collectionspace.services;\r
+package org.collectionspace.services.relation;\r
 \r
 /**\r
  * The Interface RelationListItemJAXBSchema.\r

diff --git a/services/relation/client/src/test/java/org/collectionspace/services/client/test/RelationServiceTest.java b/services/relation/client/src/test/java/org/collectionspace/services/client/test/RelationServiceTest.java
index a7624d9bbfb725b26894aaa19d23aa8dbc72fb5d..5a6cc048d0e60c61c6feb3700d25754395fb8093 100644 (file)
--- a/services/relation/client/src/test/java/org/collectionspace/services/client/test/RelationServiceTest.java
+++ b/services/relation/client/src/test/java/org/collectionspace/services/client/test/RelationServiceTest.java
@@ -15,7 +15,7 @@ import org.collectionspace.services.relation.RelationList;
 import org.collectionspace.services.relation.RelationshipType;
 
 import org.collectionspace.services.client.RelationClient;
-import org.collectionspace.services.RelationJAXBSchema;
+import org.collectionspace.services.relation.RelationJAXBSchema;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/services/relation/service/src/main/java/org/collectionspace/services/RelationResource.java b/services/relation/service/src/main/java/org/collectionspace/services/relation/RelationResource.java
similarity index 98%
rename from services/relation/service/src/main/java/org/collectionspace/services/RelationResource.java
rename to services/relation/service/src/main/java/org/collectionspace/services/relation/RelationResource.java
index 31ff7b4b469b29361fee4b17ce50f90e3ff9fabf..ba432921c662f667497e1161eff3a88ea24e79ec 100644 (file)
--- a/services/relation/service/src/main/java/org/collectionspace/services/RelationResource.java
+++ b/services/relation/service/src/main/java/org/collectionspace/services/relation/RelationResource.java
@@ -24,7 +24,7 @@
  * You may obtain a copy of the ECL 2.0 License at
  * https://source.collectionspace.org/collection-space/LICENSE.txt
  */
-package org.collectionspace.services;
+package org.collectionspace.services.relation;
 
 import java.util.Iterator;
 import java.util.List;
@@ -46,12 +46,12 @@ import javax.ws.rs.core.UriInfo;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.Marshaller;
 
-import org.collectionspace.services.RelationService;
+import org.collectionspace.services.relation.RelationService;
 import org.collectionspace.services.relation.*;
 import org.collectionspace.services.relation.RelationList.*;
 
-import org.collectionspace.services.RelationJAXBSchema;
-import org.collectionspace.services.RelationListItemJAXBSchema;
+import org.collectionspace.services.relation.RelationJAXBSchema;
+import org.collectionspace.services.relation.RelationListItemJAXBSchema;
 
 import org.collectionspace.services.common.ServiceMain;
 import org.collectionspace.services.common.repository.DocumentException;

diff --git a/services/relation/service/src/main/java/org/collectionspace/services/RelationService.java b/services/relation/service/src/main/java/org/collectionspace/services/relation/RelationService.java
similarity index 94%
rename from services/relation/service/src/main/java/org/collectionspace/services/RelationService.java
rename to services/relation/service/src/main/java/org/collectionspace/services/relation/RelationService.java
index 1b7d98913ab73af7829705b724a8930c9e3ff49c..4f2291157902c9467c7d4f3097633a384cd84764 100644 (file)
--- a/services/relation/service/src/main/java/org/collectionspace/services/RelationService.java
+++ b/services/relation/service/src/main/java/org/collectionspace/services/relation/RelationService.java
@@ -24,7 +24,7 @@
  * You may obtain a copy of the ECL 2.0 License at\r
  * https://source.collectionspace.org/collection-space/LICENSE.txt\r
  */\r
-package org.collectionspace.services;\r
+package org.collectionspace.services.relation;\r
 \r
 import java.io.IOException;\r
 import org.dom4j.Document;\r

diff --git a/services/relation/service/src/main/java/org/collectionspace/services/RelationServiceNuxeoImpl.java b/services/relation/service/src/main/java/org/collectionspace/services/relation/RelationServiceNuxeoImpl.java
similarity index 94%
rename from services/relation/service/src/main/java/org/collectionspace/services/RelationServiceNuxeoImpl.java
rename to services/relation/service/src/main/java/org/collectionspace/services/relation/RelationServiceNuxeoImpl.java
index 1b729f3ef60c3a3cb3db939194f970d9a222da98..7b889a528e524e9b7ae70ef42a23a01eae3480c2 100644 (file)
--- a/services/relation/service/src/main/java/org/collectionspace/services/RelationServiceNuxeoImpl.java
+++ b/services/relation/service/src/main/java/org/collectionspace/services/relation/RelationServiceNuxeoImpl.java
@@ -24,7 +24,7 @@
  * You may obtain a copy of the ECL 2.0 License at\r
  * https://source.collectionspace.org/collection-space/LICENSE.txt\r
  */\r
-package org.collectionspace.services;\r
+package org.collectionspace.services.relation;\r
 \r
 //import java.io.ByteArrayInputStream;\r
 import java.io.IOException;\r
@@ -39,13 +39,13 @@ import java.util.List;
 import org.collectionspace.services.common.repository.DocumentException;\r
 //import org.collectionspace.services.nuxeo.NuxeoRESTClient;\r
 import org.collectionspace.services.nuxeo.CollectionSpaceServiceNuxeoImpl;\r
-import org.collectionspace.services.nuxeo.RelationUtilsNuxeoImpl;\r
+import org.collectionspace.services.nuxeo.relation.RelationUtilsNuxeoImpl;\r
 import org.collectionspace.services.relation.Relation;\r
 //import org.collectionspace.services.relation.RelationList;\r
 //import org.collectionspace.services.relation.RelationshipType;\r
 //import org.collectionspace.services.RelationJAXBSchema;\r
 import org.collectionspace.services.nuxeo.util.NuxeoUtils;\r
-import org.collectionspace.services.common.RelationsManager;\r
+import org.collectionspace.services.common.relation.RelationsManager;\r
 //import org.collectionspace.services.common.ServiceMain;\r
 \r
 import org.dom4j.Document;\r