From: Patrick Schmitz <pschmitz@berkeley.edu>
Date: Thu, 8 Oct 2009 16:36:15 +0000 (+0000)
Subject: NOJIRA - Re-enabling Vocabulary service after patches to fix build. Bad Patrick.
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=744ea8243468685aedd792fac874cef04a5e855e;p=tmp%2Fjakarta-migration.git

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 d38bcd021..a801ccb0e 100644
--- 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 4e7d75dc5..fe66659d0 100644
--- a/services/build.xml
+++ b/services/build.xml
@@ -113,8 +113,7 @@
         <ant antfile="id/build.xml" target="deploy" inheritAll="false"/>
         <ant antfile="collectionobject/build.xml" target="deploy" inheritAll="false"/>
         <ant antfile="intake/build.xml" target="deploy" inheritAll="false"/>
-<!-- //FIXME: COLLECTIONSPACE1-SERVICESTRUNK1-22 -->
-<!--        <ant antfile="vocabulary/build.xml" target="deploy" inheritAll="false"/> -->
+        <ant antfile="vocabulary/build.xml" target="deploy" inheritAll="false"/>
         <ant antfile="acquisition/build.xml" target="deploy" inheritAll="false"/>
         <ant antfile="JaxRsServiceProvider/build.xml" target="deploy" inheritAll="false"/>
     </target>
diff --git a/services/pom.xml b/services/pom.xml
index 619dcbf90..1eb56b06e 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -22,8 +22,7 @@
         <!--module>query</module-->
         <module>acquisition</module>
         
-<!-- //FIXME: COLLECTIONSPACE1-SERVICESTRUNK1-22 -->        
-<!--        <module>vocabulary</module> -->
+        <module>vocabulary</module>
 
         <module>id</module>
         <module>collectionobject</module>