From: Richard Millet <richard.millet@berkeley.edu>
Date: Fri, 7 Aug 2009 21:03:49 +0000 (+0000)
Subject: NOJIRA: Changing the Java packaging for the Relation service artifacts.
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=f2c5892a3946399198f06bcd79ef59b9387f25d1;p=tmp%2Fjakarta-migration.git

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

diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml
index a3edaf321..df50b2273 100644
--- a/services/JaxRsServiceProvider/pom.xml
+++ b/services/JaxRsServiceProvider/pom.xml
@@ -172,7 +172,7 @@
                     <port>8180</port>
                 </configuration>
                 <executions>
-                    <execution>
+<!--                    <execution>
                         <id>jboss-undeploy</id>
                         <goals>
                             <goal>undeploy</goal>
@@ -195,7 +195,7 @@
                                 <param>${project.build.directory}/${project.build.finalName}.war</param>
                             </fileNames>
                         </configuration>
-                    </execution>
+                    </execution> -->
                 </executions>
             </plugin>
 
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 df1802523..350f06d7e 100644
--- 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 cc4797ae8..7c6da0184 100644
--- 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
  * https://source.collectionspace.org/collection-space/LICENSE.txt
  */
-package org.collectionspace.services.common;
+package org.collectionspace.services.common.relation;
 
 import java.io.IOException;
 import java.util.List;
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 85135af64..506945bc6 100644
--- 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
  * https://source.collectionspace.org/collection-space/LICENSE.txt
  */
-package org.collectionspace.services.common;
+package org.collectionspace.services.common.relation;
 
 import java.io.IOException;
 import java.util.List;
 
 import org.collectionspace.services.common.repository.DocumentException;
-import org.collectionspace.services.nuxeo.RelationUtilsNuxeoImpl;
+import org.collectionspace.services.nuxeo.relation.RelationUtilsNuxeoImpl;
 import org.collectionspace.services.relation.Relation;
+import org.collectionspace.services.common.relation.RelationUtils;
+
 import org.dom4j.Document;
 
 /**
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 b94c549ad..ca4ac692e 100644
--- 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
  * https://source.collectionspace.org/collection-space/LICENSE.txt
  */
-package org.collectionspace.services.nuxeo;
+package org.collectionspace.services.nuxeo.relation;
 
 import java.io.IOException;
 import java.io.Serializable;
@@ -32,10 +32,10 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
-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.relation.RelationUtils;
 
-import org.collectionspace.services.common.RelationUtils;
 import org.collectionspace.services.relation.Relation;
 import org.collectionspace.services.relation.RelationshipType;
 import org.collectionspace.services.nuxeo.util.NuxeoUtils;
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 74c58e3c5..4c338e805 100644
--- 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
  * https://source.collectionspace.org/collection-space/LICENSE.txt
  */
-package org.collectionspace.services;
+package org.collectionspace.services.relation;
 
 /**
  * The Interface RelationJAXBSchema.
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 7e500529c..96d70a2c7 100644
--- 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
  * https://source.collectionspace.org/collection-space/LICENSE.txt
  */
-package org.collectionspace.services;
+package org.collectionspace.services.relation;
 
 /**
  * The Interface RelationListItemJAXBSchema.
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 a7624d9bb..5a6cc048d 100644
--- 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 31ff7b4b4..ba432921c 100644
--- 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 1b7d98913..4f2291157 100644
--- 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
  * https://source.collectionspace.org/collection-space/LICENSE.txt
  */
-package org.collectionspace.services;
+package org.collectionspace.services.relation;
 
 import java.io.IOException;
 import org.dom4j.Document;
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 1b729f3ef..7b889a528 100644
--- 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
  * https://source.collectionspace.org/collection-space/LICENSE.txt
  */
-package org.collectionspace.services;
+package org.collectionspace.services.relation;
 
 //import java.io.ByteArrayInputStream;
 import java.io.IOException;
@@ -39,13 +39,13 @@ import java.util.List;
 import org.collectionspace.services.common.repository.DocumentException;
 //import org.collectionspace.services.nuxeo.NuxeoRESTClient;
 import org.collectionspace.services.nuxeo.CollectionSpaceServiceNuxeoImpl;
-import org.collectionspace.services.nuxeo.RelationUtilsNuxeoImpl;
+import org.collectionspace.services.nuxeo.relation.RelationUtilsNuxeoImpl;
 import org.collectionspace.services.relation.Relation;
 //import org.collectionspace.services.relation.RelationList;
 //import org.collectionspace.services.relation.RelationshipType;
 //import org.collectionspace.services.RelationJAXBSchema;
 import org.collectionspace.services.nuxeo.util.NuxeoUtils;
-import org.collectionspace.services.common.RelationsManager;
+import org.collectionspace.services.common.relation.RelationsManager;
 //import org.collectionspace.services.common.ServiceMain;
 
 import org.dom4j.Document;