CSPACE-6007: Remove references to contacts sub-resource, since Citation Authority...

diff --git a/services/citation/client/pom.xml b/services/citation/client/pom.xml
index 96a0c4e2d52eafc08b45ca9a917118633d0c54cc..26ad47edb0c85d1f051e26da4909b82e9f2f3cd4 100644 (file)
--- a/services/citation/client/pom.xml
+++ b/services/citation/client/pom.xml
@@ -50,11 +50,6 @@
             <artifactId>org.collectionspace.services.client</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.collectionspace.services</groupId>
-            <artifactId>org.collectionspace.services.contact.client</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <!-- External dependencies -->
         <dependency>
             <groupId>org.testng</groupId>

diff --git a/services/citation/client/src/main/java/org/collectionspace/services/client/CitationAuthorityClient.java b/services/citation/client/src/main/java/org/collectionspace/services/client/CitationAuthorityClient.java
index e1cb8a41948f4f79ada0aac80f1b563b4fba6a73..849b0fa0f81b1ff0b6548f7e7757fb0d78fa4d94 100644 (file)
--- a/services/citation/client/src/main/java/org/collectionspace/services/client/CitationAuthorityClient.java
+++ b/services/citation/client/src/main/java/org/collectionspace/services/client/CitationAuthorityClient.java
@@ -22,7 +22,7 @@ import org.collectionspace.services.citation.CitationsCommon;
 /**
  * The Class CitationAuthorityClient.
  */
-public class CitationAuthorityClient extends AuthorityWithContactsClientImpl<CitationsCommon, CitationAuthorityProxy> {
+public class CitationAuthorityClient extends AuthorityClientImpl<CitationsCommon, CitationAuthorityProxy> {
 
     public static final String SERVICE_NAME = "citationauthorities";
     public static final String SERVICE_PATH_COMPONENT = SERVICE_NAME;

diff --git a/services/citation/client/src/main/java/org/collectionspace/services/client/CitationAuthorityProxy.java b/services/citation/client/src/main/java/org/collectionspace/services/client/CitationAuthorityProxy.java
index 015830de1ba8e981661192978c09f0f8c33b88d5..d5af999ea6fc55e9315f4663ce6482cbbf67e95d 100644 (file)
--- a/services/citation/client/src/main/java/org/collectionspace/services/client/CitationAuthorityProxy.java
+++ b/services/citation/client/src/main/java/org/collectionspace/services/client/CitationAuthorityProxy.java
@@ -10,6 +10,6 @@ import javax.ws.rs.Produces;
 @Path(CitationAuthorityClient.SERVICE_PATH + "/")
 @Produces({"application/xml"})
 @Consumes({"application/xml"})
-public interface CitationAuthorityProxy extends AuthorityWithContactsProxy {
+public interface CitationAuthorityProxy extends AuthorityProxy {
 
 }

diff --git a/services/citation/service/pom.xml b/services/citation/service/pom.xml
index 54abb80f8919c9b5cda9030a79724de857b1e784..a66caa39818738cee5fae07414d20a478106fce9 100644 (file)
--- a/services/citation/service/pom.xml
+++ b/services/citation/service/pom.xml
@@ -42,11 +42,6 @@
             <artifactId>org.collectionspace.services.citation.client</artifactId>
             <version>${project.version}</version>
         </dependency>
-        <dependency>
-            <groupId>org.collectionspace.services</groupId>
-            <artifactId>org.collectionspace.services.contact.service</artifactId>
-            <version>${project.version}</version>
-        </dependency>
         <!-- External dependencies -->        
         <dependency>
             <groupId>junit</groupId>

diff --git a/services/citation/service/src/main/java/org/collectionspace/services/citation/CitationAuthorityResource.java b/services/citation/service/src/main/java/org/collectionspace/services/citation/CitationAuthorityResource.java
index 45b7d75e81e57ef52ccd359e45105459d8c6e05d..a245d54fcf52990156f526f14651816d86679cf2 100644 (file)
--- a/services/citation/service/src/main/java/org/collectionspace/services/citation/CitationAuthorityResource.java
+++ b/services/citation/service/src/main/java/org/collectionspace/services/citation/CitationAuthorityResource.java
@@ -26,7 +26,7 @@ import javax.ws.rs.Consumes;
 import javax.ws.rs.Path;
 import javax.ws.rs.Produces;
 import org.collectionspace.services.client.CitationAuthorityClient;
-import org.collectionspace.services.contact.AuthorityResourceWithContacts;
+import org.collectionspace.services.common.vocabulary.AuthorityResource;
 import org.collectionspace.services.citation.nuxeo.CitationDocumentModelHandler;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory;
 @Path(CitationAuthorityClient.SERVICE_PATH)
 @Consumes("application/xml")
 @Produces("application/xml")
-public class CitationAuthorityResource extends AuthorityResourceWithContacts<CitationauthoritiesCommon, CitationDocumentModelHandler> {
+public class CitationAuthorityResource extends AuthorityResource<CitationauthoritiesCommon, CitationDocumentModelHandler> {
 
     final Logger logger = LoggerFactory.getLogger(CitationAuthorityResource.class);