From 38dcc8f0756255035214541111b9d75b2c1af06f Mon Sep 17 00:00:00 2001
From: Richard Millet <richard.millet@berkeley.edu>
Date: Thu, 8 Oct 2009 04:49:58 +0000
Subject: [PATCH] NOJIRA: Broken build.  The Vocabulary service is missing
 pom.xml and build.xml files in some of its submodules.  Once those files get
 committed, do a search for "//FIXME: COLLECTIONSPACE1-SERVICESTRUNK1-22" in
 ALL source related files and uncomment the corresponding code.

---
 .../jaxrs/CollectionSpaceJaxRsApplication.java         | 10 ++++++++--
 services/build.xml                                     |  3 ++-
 services/pom.xml                                       |  5 ++++-
 3 files changed, 14 insertions(+), 4 deletions(-)

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 199cc8061..d38bcd021 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
@@ -6,7 +6,10 @@ import org.collectionspace.services.intake.IntakeResource;
 ////import org.collectionspace.services.relation.RelationResource;
 import org.collectionspace.services.relation.NewRelationResource;
 import org.collectionspace.services.acquisition.AcquisitionResource;
-import org.collectionspace.services.vocabulary.VocabularyResource;
+
+////FIXME: COLLECTIONSPACE1-SERVICESTRUNK1-22
+//import org.collectionspace.services.vocabulary.VocabularyResource;
+
 //import org.collectionspace.services.query.QueryResource;
 
 import javax.ws.rs.core.Application;
@@ -26,7 +29,10 @@ public class CollectionSpaceJaxRsApplication extends Application {
         singletons.add(new AcquisitionResource());
 //        singletons.add(new RelationResource());
         singletons.add(new NewRelationResource());
-        singletons.add(new VocabularyResource());
+
+//FIXME: COLLECTIONSPACE1-SERVICESTRUNK1-22
+//        singletons.add(new VocabularyResource());
+
 //        singletons.add(new QueryResource());
 //        singletons.add(new DomainIdentifierResource());
 //        singletons.add(new PingResource());
diff --git a/services/build.xml b/services/build.xml
index fe66659d0..4e7d75dc5 100644
--- a/services/build.xml
+++ b/services/build.xml
@@ -113,7 +113,8 @@
         <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"/>
-        <ant antfile="vocabulary/build.xml" target="deploy" inheritAll="false"/>
+<!-- //FIXME: COLLECTIONSPACE1-SERVICESTRUNK1-22 -->
+<!--        <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 db7f104b7..619dcbf90 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -21,7 +21,10 @@
         <module>relation</module>
         <!--module>query</module-->
         <module>acquisition</module>
-        <module>vocabulary</module>
+        
+<!-- //FIXME: COLLECTIONSPACE1-SERVICESTRUNK1-22 -->        
+<!--        <module>vocabulary</module> -->
+
         <module>id</module>
         <module>collectionobject</module>
         <module>intake</module>
-- 
2.47.3