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

diff --git a/services/common/src/main/java/org/collectionspace/services/relation/RelationJAXBSchema.java b/services/common/src/main/java/org/collectionspace/services/common/relation/RelationJAXBSchema.java
similarity index 94%
rename from services/common/src/main/java/org/collectionspace/services/relation/RelationJAXBSchema.java
rename to services/common/src/main/java/org/collectionspace/services/common/relation/RelationJAXBSchema.java
index 4c338e805b2f9f96829525a57847dbf40a7bf245..2d3d7ed8d4fd118b119a24bf47e96afc536c1fa8 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/relation/RelationJAXBSchema.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/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.relation;\r
+package org.collectionspace.services.common.relation;\r
 \r
 /**\r
  * The Interface RelationJAXBSchema.\r

diff --git a/services/common/src/main/java/org/collectionspace/services/relation/RelationListItemJAXBSchema.java b/services/common/src/main/java/org/collectionspace/services/common/relation/RelationListItemJAXBSchema.java
similarity index 91%
rename from services/common/src/main/java/org/collectionspace/services/relation/RelationListItemJAXBSchema.java
rename to services/common/src/main/java/org/collectionspace/services/common/relation/RelationListItemJAXBSchema.java
index 96d70a2c78820dd0b9cc53134c546d7bce68d344..d84307a98386b42d12ae0d4b1b66973395ea9abd 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/relation/RelationListItemJAXBSchema.java
+++ b/services/common/src/main/java/org/collectionspace/services/common/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.relation;\r
+package org.collectionspace.services.common.relation;\r
 \r
 /**\r
  * The Interface RelationListItemJAXBSchema.\r

diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/relation/RelationUtilsNuxeoImpl.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/relation/RelationUtilsNuxeoImpl.java
index ca4ac692e171ac001d7222e99a2c47632cc98e42..a85712bd91b7a5ad8c4b2a6138b77183bb442a78 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/relation/RelationUtilsNuxeoImpl.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/relation/RelationUtilsNuxeoImpl.java
@@ -32,8 +32,8 @@ import java.util.ArrayList;
 import java.util.List;\r
 import java.util.Map;\r
 \r
-import org.collectionspace.services.relation.RelationJAXBSchema;\r
-import org.collectionspace.services.relation.RelationListItemJAXBSchema;\r
+import org.collectionspace.services.common.relation.RelationJAXBSchema;\r
+import org.collectionspace.services.common.relation.RelationListItemJAXBSchema;\r
 import org.collectionspace.services.common.relation.RelationUtils;\r
 \r
 import org.collectionspace.services.relation.Relation;\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 5a6cc048d0e60c61c6feb3700d25754395fb8093..d6b3494b287f3054b28583ee1d2f28e46113d0f4 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.relation.RelationJAXBSchema;
+import org.collectionspace.services.common.relation.RelationJAXBSchema;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/services/relation/service/src/main/java/org/collectionspace/services/relation/RelationResource.java b/services/relation/service/src/main/java/org/collectionspace/services/relation/RelationResource.java
index ba432921c662f667497e1161eff3a88ea24e79ec..460653144fa6a62361eda5ba11583b73753fa353 100644 (file)
--- a/services/relation/service/src/main/java/org/collectionspace/services/relation/RelationResource.java
+++ b/services/relation/service/src/main/java/org/collectionspace/services/relation/RelationResource.java
@@ -50,8 +50,8 @@ import org.collectionspace.services.relation.RelationService;
 import org.collectionspace.services.relation.*;
 import org.collectionspace.services.relation.RelationList.*;
 
-import org.collectionspace.services.relation.RelationJAXBSchema;
-import org.collectionspace.services.relation.RelationListItemJAXBSchema;
+import org.collectionspace.services.common.relation.RelationJAXBSchema;
+import org.collectionspace.services.common.relation.RelationListItemJAXBSchema;
 
 import org.collectionspace.services.common.ServiceMain;
 import org.collectionspace.services.common.repository.DocumentException;