NOJIRA - Re-enabling Vocabulary service after patches to fix build. Bad Patrick.

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 d38bcd021484541625f4927f9de616c6956ced5e..a801ccb0ecefdd0b900e79e360d2bf330d8e9e29 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
@@ -7,8 +7,7 @@ import org.collectionspace.services.intake.IntakeResource;
 import org.collectionspace.services.relation.NewRelationResource;
 import org.collectionspace.services.acquisition.AcquisitionResource;
 
-////FIXME: COLLECTIONSPACE1-SERVICESTRUNK1-22
-//import org.collectionspace.services.vocabulary.VocabularyResource;
+import org.collectionspace.services.vocabulary.VocabularyResource;
 
 //import org.collectionspace.services.query.QueryResource;
 
@@ -30,8 +29,7 @@ public class CollectionSpaceJaxRsApplication extends Application {
 //        singletons.add(new RelationResource());
         singletons.add(new NewRelationResource());
 
-//FIXME: COLLECTIONSPACE1-SERVICESTRUNK1-22
-//        singletons.add(new VocabularyResource());
+        singletons.add(new VocabularyResource());
 
 //        singletons.add(new QueryResource());
 //        singletons.add(new DomainIdentifierResource());

diff --git a/services/build.xml b/services/build.xml
index 4e7d75dc5caf989cf39cdcec923575911a7b32fb..fe66659d06847e142864628e97a52c45760d69fe 100644 (file)
--- a/services/build.xml
+++ b/services/build.xml
@@ -113,8 +113,7 @@
         <ant antfile="id/build.xml" target="deploy" inheritAll="false"/>\r
         <ant antfile="collectionobject/build.xml" target="deploy" inheritAll="false"/>\r
         <ant antfile="intake/build.xml" target="deploy" inheritAll="false"/>\r
-<!-- //FIXME: COLLECTIONSPACE1-SERVICESTRUNK1-22 -->\r
-<!--        <ant antfile="vocabulary/build.xml" target="deploy" inheritAll="false"/> -->\r
+        <ant antfile="vocabulary/build.xml" target="deploy" inheritAll="false"/>\r
         <ant antfile="acquisition/build.xml" target="deploy" inheritAll="false"/>\r
         <ant antfile="JaxRsServiceProvider/build.xml" target="deploy" inheritAll="false"/>\r
     </target>\r

diff --git a/services/pom.xml b/services/pom.xml
index 619dcbf909c807df8c95196ab531d496dc8f4b35..1eb56b06ebed66ba4cefaae7d3451d30d41cca2e 100644 (file)
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -22,8 +22,7 @@
         <!--module>query</module-->\r
         <module>acquisition</module>\r
         \r
-<!-- //FIXME: COLLECTIONSPACE1-SERVICESTRUNK1-22 -->        \r
-<!--        <module>vocabulary</module> -->\r
+        <module>vocabulary</module>\r
 \r
         <module>id</module>\r
         <module>collectionobject</module>\r