NOJIRA: Broken build. The Vocabulary service is missing pom.xml and build.xml files...

"//FIXME: COLLECTIONSPACE1-SERVICESTRUNK1-22" in ALL source related files and uncomment the corresponding code.

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 199cc8061122111863ecd04d2cd0b226d3e548aa..d38bcd021484541625f4927f9de616c6956ced5e 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
@@ -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 fe66659d06847e142864628e97a52c45760d69fe..4e7d75dc5caf989cf39cdcec923575911a7b32fb 100644 (file)
--- a/services/build.xml
+++ b/services/build.xml
@@ -113,7 +113,8 @@
         <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
-        <ant antfile="vocabulary/build.xml" target="deploy" inheritAll="false"/>\r
+<!-- //FIXME: COLLECTIONSPACE1-SERVICESTRUNK1-22 -->\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 db7f104b770b3eeafc52b7679a81f4d3eb7c0957..619dcbf909c807df8c95196ab531d496dc8f4b35 100644 (file)
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -21,7 +21,10 @@
         <module>relation</module>\r
         <!--module>query</module-->\r
         <module>acquisition</module>\r
-        <module>vocabulary</module>\r
+        \r
+<!-- //FIXME: COLLECTIONSPACE1-SERVICESTRUNK1-22 -->        \r
+<!--        <module>vocabulary</module> -->\r
+\r
         <module>id</module>\r
         <module>collectionobject</module>\r
         <module>intake</module>\r