CSPACE-245,CSPACE-236: Began moving all remaining ID Service-related classes, current...

diff --git a/services/id/service/src/main/java/org/collectionspace/services/IDResource.java b/services/id/service/src/main/java/org/collectionspace/services/id/IDResource.java
similarity index 97%
rename from services/id/service/src/main/java/org/collectionspace/services/IDResource.java
rename to services/id/service/src/main/java/org/collectionspace/services/id/IDResource.java
index 233a2e60df01d5ce02737cd9fbc81c7e49acf066..55a1629d3910b63b8c5afd24b01297dbbe60b434 100644 (file)
--- a/services/id/service/src/main/java/org/collectionspace/services/IDResource.java
+++ b/services/id/service/src/main/java/org/collectionspace/services/id/IDResource.java
@@ -25,7 +25,7 @@
  * $LastChangedDate$
  */
   
-package org.collectionspace.services;
+package org.collectionspace.services.id;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.GET;
@@ -37,8 +37,8 @@ import javax.ws.rs.core.Response;
 import javax.xml.bind.JAXBContext;
 import javax.xml.bind.Marshaller;
 
-import org.collectionspace.services.IDService;
-import org.collectionspace.services.id.IDPattern;
+// import org.collectionspace.services.IDService;
+// import org.collectionspace.services.id.IDPattern;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/services/id/service/src/main/java/org/collectionspace/services/IDService.java b/services/id/service/src/main/java/org/collectionspace/services/id/IDService.java
similarity index 98%
rename from services/id/service/src/main/java/org/collectionspace/services/IDService.java
rename to services/id/service/src/main/java/org/collectionspace/services/id/IDService.java
index e8a3ac5ccfd7dbf66ed66f552d68a3bf9b0a2241..eafd628a119345248be5f8886b4bf575fcb5fd43 100644 (file)
--- a/services/id/service/src/main/java/org/collectionspace/services/IDService.java
+++ b/services/id/service/src/main/java/org/collectionspace/services/id/IDService.java
@@ -25,7 +25,7 @@
  * $LastChangedDate$
  */
  
-package org.collectionspace.services;
+package org.collectionspace.services.id;
 
 public interface IDService {
 

diff --git a/services/id/service/src/main/java/org/collectionspace/services/IDServiceJdbcImpl.java b/services/id/service/src/main/java/org/collectionspace/services/id/IDServiceJdbcImpl.java
similarity index 99%
rename from services/id/service/src/main/java/org/collectionspace/services/IDServiceJdbcImpl.java
rename to services/id/service/src/main/java/org/collectionspace/services/id/IDServiceJdbcImpl.java
index bed3f794ce45ffe6f2fe79c5d9b9e58a7b768bfe..7f6ce39ec6315a19da1e6c1ce46e1485ab6201fd 100644 (file)
--- a/services/id/service/src/main/java/org/collectionspace/services/IDServiceJdbcImpl.java
+++ b/services/id/service/src/main/java/org/collectionspace/services/id/IDServiceJdbcImpl.java
@@ -61,12 +61,12 @@
 // - "persist/find" (used by JPA)
 // - or?
 
-package org.collectionspace.services;
+package org.collectionspace.services.id;
 
-import org.collectionspace.services.IDService;
+// import org.collectionspace.services.IDService;
 // The following import statement has been left open-ended
 // to accommodate future ID generation components.
-import org.collectionspace.services.id.*;
+// import org.collectionspace.services.id.*;
 
 import com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.XStreamException;

diff --git a/services/id/service/src/main/java/org/collectionspace/services/IDServiceNuxeoImpl.java b/services/id/service/src/main/java/org/collectionspace/services/id/IDServiceNuxeoImpl.java
similarity index 99%
rename from services/id/service/src/main/java/org/collectionspace/services/IDServiceNuxeoImpl.java
rename to services/id/service/src/main/java/org/collectionspace/services/id/IDServiceNuxeoImpl.java
index d50cde5aeaaba9aae6a8d7895bc834366edc4c56..13891e873c729f94c0fa08fd592c6efc623f4097 100644 (file)
--- a/services/id/service/src/main/java/org/collectionspace/services/IDServiceNuxeoImpl.java
+++ b/services/id/service/src/main/java/org/collectionspace/services/id/IDServiceNuxeoImpl.java
@@ -21,7 +21,7 @@
  * $Date: 2009-06-19 19:03:38 -0700 (Fri, 19 Jun 2009) $
  */
  
-package org.collectionspace.services;
+package org.collectionspace.services.id;
 
 import java.io.ByteArrayInputStream;
 import java.io.IOException;

diff --git a/services/id/service/src/test/java/org/collectionspace/services/IDServiceJdbcImplTest.java b/services/id/service/src/test/java/org/collectionspace/services/id/IDServiceJdbcImplTest.java
similarity index 97%
rename from services/id/service/src/test/java/org/collectionspace/services/IDServiceJdbcImplTest.java
rename to services/id/service/src/test/java/org/collectionspace/services/id/IDServiceJdbcImplTest.java
index 4902999538249f18a272113c773c7e35bc865c82..98d9b57aa9d5c1aaa4f6fe2165684e73d2c31641 100644 (file)
--- a/services/id/service/src/test/java/org/collectionspace/services/IDServiceJdbcImplTest.java
+++ b/services/id/service/src/test/java/org/collectionspace/services/id/IDServiceJdbcImplTest.java
@@ -23,11 +23,11 @@
  * $LastChangedDate$
  */
 
-package org.collectionspace.services.test;
+package org.collectionspace.services.test.id;
 
-import org.collectionspace.services.IDService;
-import org.collectionspace.services.IDServiceJdbcImpl;
-import org.collectionspace.services.id.*;
+// import org.collectionspace.services.IDService;
+// import org.collectionspace.services.IDServiceJdbcImpl;
+// import org.collectionspace.services.id.*;
 
 import junit.framework.TestCase;
 import static org.junit.Assert.*;

diff --git a/services/id/service/src/test/java/org/collectionspace/services/IDServiceTest.java b/services/id/service/src/test/java/org/collectionspace/services/id/IDServiceTest.java
similarity index 99%
rename from services/id/service/src/test/java/org/collectionspace/services/IDServiceTest.java
rename to services/id/service/src/test/java/org/collectionspace/services/id/IDServiceTest.java
index 83711357a771ee44550288be71021fa0c085d4f9..2527be9e966df801dbaf5913801752e1696a18d9 100644 (file)
--- a/services/id/service/src/test/java/org/collectionspace/services/IDServiceTest.java
+++ b/services/id/service/src/test/java/org/collectionspace/services/id/IDServiceTest.java
@@ -36,7 +36,7 @@
 // verifying basic functionality, rather than relying on
 // public Internet services, like example.com.
 
-package org.collectionspace.services.test;
+package org.collectionspace.services.test.id;
 
 import junit.framework.TestCase;
 import static org.junit.Assert.*;