From: Aron Roberts <aron@socrates.berkeley.edu>
Date: Thu, 23 Jul 2009 18:47:15 +0000 (+0000)
Subject: CSPACE-245,CSPACE-236: Completed move of ID Service-related classes into the org... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=612fb732fb3dba13ad0a6c146b68d075a667ba06;p=tmp%2Fjakarta-migration.git

CSPACE-245,CSPACE-236: Completed move of ID Service-related classes into the org.collectionspace.services.id and org.collectionspace.services.test.id packages.
---

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 55a1629d3..14a3ff044 100644
--- 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 7f6ce39ec..e298cab4b 100644
--- 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 13891e873..0d59e78e4 100644
--- 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 98d9b57aa..a98386367 100644
--- 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 2527be9e9..33db9b64c 100644
--- 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;