From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Thu, 23 Jul 2009 18:37:45 +0000 (+0000)
Subject: CSPACE-245,CSPACE-236: Began moving all remaining ID Service-related classes, current... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=a7d3002fa510907ebb0cd06ff1768b2a3fe04e39;p=tmp%2Fjakarta-migration.git

CSPACE-245,CSPACE-236: Began moving all remaining ID Service-related classes, currently in the main org.collectionspace.services package, into org.collectionspace.services.id.
---

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 233a2e60d..55a1629d3 100644
--- 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 e8a3ac5cc..eafd628a1 100644
--- 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 bed3f794c..7f6ce39ec 100644
--- 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 d50cde5ae..13891e873 100644
--- 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 490299953..98d9b57aa 100644
--- 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 83711357a..2527be9e9 100644
--- 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.*;