NOJIRA disabled account service...was breaking the build.

M    JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
M    JaxRsServiceProvider/pom.xml

diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml
index c57d1261a50094418ad1a6b0b2f329000499390d..4c57e39c6d023549f144470bd5fba0a37fe1a307 100644 (file)
--- a/services/JaxRsServiceProvider/pom.xml
+++ b/services/JaxRsServiceProvider/pom.xml
@@ -22,11 +22,11 @@
             <artifactId>org.collectionspace.services.common</artifactId>\r
             <version>1.0</version>\r
         </dependency>\r
-        <dependency>\r
+        <!--dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.account.service</artifactId>\r
             <version>1.0</version>\r
-        </dependency>\r
+        </dependency-->\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.collectionobject.service</artifactId>\r

diff --git a/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java b/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
index 3b1d095ae6be2e1f50aadf5271bbef930d85ca3f..406b69d94de2f954c031d46c9a6b28bab15a35f8 100644 (file)
--- a/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
+++ b/services/JaxRsServiceProvider/src/main/java/org/collectionspace/services/jaxrs/CollectionSpaceJaxRsApplication.java
@@ -1,10 +1,9 @@
 package org.collectionspace.services.jaxrs;
 
-import org.collectionspace.services.account.AccountResource;
+//import org.collectionspace.services.account.AccountResource;
 import org.collectionspace.services.collectionobject.CollectionObjectResource;
 import org.collectionspace.services.id.IDResource;
 import org.collectionspace.services.intake.IntakeResource;
-////import org.collectionspace.services.relation.RelationResource;
 import org.collectionspace.services.relation.NewRelationResource;
 import org.collectionspace.services.acquisition.AcquisitionResource;
 
@@ -23,12 +22,11 @@ public class CollectionSpaceJaxRsApplication extends Application {
     private Set<Class<?>> empty = new HashSet<Class<?>>();
 
     public CollectionSpaceJaxRsApplication() {
-        singletons.add(new AccountResource());
+//        singletons.add(new AccountResource());
         singletons.add(new CollectionObjectResource());
         singletons.add(new IDResource());
         singletons.add(new IntakeResource());
         singletons.add(new AcquisitionResource());
-//        singletons.add(new RelationResource());
         singletons.add(new NewRelationResource());
 
         singletons.add(new VocabularyResource());