CSPACE-245,CSPACE-236: Completed move of ID Service-related classes into the org...

diff --git a/services/id/service/src/main/java/org/collectionspace/services/id/IDResource.java b/services/id/service/src/main/java/org/collectionspace/services/id/IDResource.java
index 55a1629d3910b63b8c5afd24b01297dbbe60b434..14a3ff04430fc3f9061767551bf4c8165b2b3761 100644 (file)
--- a/services/id/service/src/main/java/org/collectionspace/services/id/IDResource.java
+++ b/services/id/service/src/main/java/org/collectionspace/services/id/IDResource.java
@@ -37,9 +37,6 @@ 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.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/services/id/service/src/main/java/org/collectionspace/services/id/IDServiceJdbcImpl.java b/services/id/service/src/main/java/org/collectionspace/services/id/IDServiceJdbcImpl.java
index 7f6ce39ec6315a19da1e6c1ce46e1485ab6201fd..e298cab4b27e6c0060713c9925093ab415407a8a 100644 (file)
--- a/services/id/service/src/main/java/org/collectionspace/services/id/IDServiceJdbcImpl.java
+++ b/services/id/service/src/main/java/org/collectionspace/services/id/IDServiceJdbcImpl.java
@@ -63,11 +63,6 @@
 
 package org.collectionspace.services.id;
 
-// 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 com.thoughtworks.xstream.XStream;
 import com.thoughtworks.xstream.XStreamException;
 import com.thoughtworks.xstream.io.xml.DomDriver;

diff --git a/services/id/service/src/main/java/org/collectionspace/services/id/IDServiceNuxeoImpl.java b/services/id/service/src/main/java/org/collectionspace/services/id/IDServiceNuxeoImpl.java
index 13891e873c729f94c0fa08fd592c6efc623f4097..0d59e78e4718dfc44ed29ce30311f8d485ce2e3c 100644 (file)
--- a/services/id/service/src/main/java/org/collectionspace/services/id/IDServiceNuxeoImpl.java
+++ b/services/id/service/src/main/java/org/collectionspace/services/id/IDServiceNuxeoImpl.java
@@ -31,14 +31,9 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-// import org.collectionspace.services.nuxeo.NuxeoRESTClient;
-// import org.collectionspace.services.nuxeo.CollectionSpaceServiceNuxeoImpl;
-import org.collectionspace.services.id.*;
-
 import org.dom4j.Document;
 import org.dom4j.DocumentException;
 import org.dom4j.io.SAXReader;
-// import org.restlet.resource.Representation;
 
 public class IDServiceNuxeoImpl {      // implements IDService {
 

diff --git a/services/id/service/src/test/java/org/collectionspace/services/id/IDServiceJdbcImplTest.java b/services/id/service/src/test/java/org/collectionspace/services/id/IDServiceJdbcImplTest.java
index 98d9b57aa9d5c1aaa4f6fe2165684e73d2c31641..a983863672ff2d5f20a1efef258b6335d92df44d 100644 (file)
--- a/services/id/service/src/test/java/org/collectionspace/services/id/IDServiceJdbcImplTest.java
+++ b/services/id/service/src/test/java/org/collectionspace/services/id/IDServiceJdbcImplTest.java
@@ -25,9 +25,7 @@
 
 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.id.*;
 
 import junit.framework.TestCase;
 import static org.junit.Assert.*;

diff --git a/services/id/service/src/test/java/org/collectionspace/services/id/IDServiceTest.java b/services/id/service/src/test/java/org/collectionspace/services/id/IDServiceTest.java
index 2527be9e966df801dbaf5913801752e1696a18d9..33db9b64ca8907ef144be90a5cd4419d5cc62f64 100644 (file)
--- a/services/id/service/src/test/java/org/collectionspace/services/id/IDServiceTest.java
+++ b/services/id/service/src/test/java/org/collectionspace/services/id/IDServiceTest.java
@@ -38,13 +38,13 @@
 
 package org.collectionspace.services.test.id;
 
-import junit.framework.TestCase;
-import static org.junit.Assert.*;
-
 import java.net.MalformedURLException;
 import java.net.UnknownHostException;
 import java.net.URL;
 
+import junit.framework.TestCase;
+import static org.junit.Assert.*;
+
 import org.restlet.Client;
 import org.restlet.data.Method;
 import org.restlet.data.Protocol;