CSPACE-4526: Temporarily disabled blob and media services.

diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml
index 8dde18231159db0919bf47ae58e85c0cd10b49b9..3502bc60d8cdd3ff8998fbd53270de96fdee97c2 100644 (file)
--- a/services/JaxRsServiceProvider/pom.xml
+++ b/services/JaxRsServiceProvider/pom.xml
@@ -107,11 +107,12 @@
                 </exclusion>\r
             </exclusions> \r
         </dependency>\r
+               <!--\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.blob.service</artifactId>\r
             <version>${project.version}</version>\r
-        </dependency>\r
+        </dependency> -->\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.collectionobject.service</artifactId>\r
@@ -162,11 +163,12 @@
             <artifactId>org.collectionspace.services.imports.service</artifactId>\r
              <version>${project.version}</version>\r
         </dependency>\r
+               <!--\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.media.service</artifactId>\r
             <version>${project.version}</version>\r
-        </dependency>\r
+        </dependency> -->\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.location.service</artifactId>\r
@@ -331,6 +333,12 @@
         </dependency-->\r
 \r
         <!-- javax -->\r
+        <dependency>\r
+                       <artifactId>servlet-api</artifactId>\r
+                       <groupId>javax.servlet</groupId>\r
+                       <version>2.5</version>\r
+                       <scope>provided</scope>\r
+        </dependency>\r
 \r
         <!-- jboss -->\r
         <dependency>\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 7abd3df3363a937dd4250ca2f1643b2f16239b14..47fd41ace712e3e8c3dcf69dc77bd0741246b1ab 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
@@ -23,10 +23,10 @@
 package org.collectionspace.services.jaxrs;
 
 import org.collectionspace.services.account.AccountResource;
-import org.collectionspace.services.blob.BlobResource;
+//import org.collectionspace.services.blob.BlobResource;
 import org.collectionspace.services.collectionobject.CollectionObjectResource;
 import org.collectionspace.services.id.IDResource;
-import org.collectionspace.services.media.MediaResource;
+//import org.collectionspace.services.media.MediaResource;
 import org.collectionspace.services.note.NoteResource;
 import org.collectionspace.services.group.GroupResource;
 import org.collectionspace.services.intake.IntakeResource;
@@ -116,8 +116,8 @@ public class CollectionSpaceJaxRsApplication extends Application
         addResourceToMapAndSingletons(new ObjectExitResource());
         addResourceToMapAndSingletons(new BatchResource());
         addResourceToMapAndSingletons(new ImportsResource());
-        addResourceToMapAndSingletons(new MediaResource());
-        addResourceToMapAndSingletons(new BlobResource());
+//        addResourceToMapAndSingletons(new MediaResource());
+//        addResourceToMapAndSingletons(new BlobResource());
         addResourceToMapAndSingletons(new MovementResource());
         addResourceToMapAndSingletons(new ReportResource());
 

diff --git a/services/pom.xml b/services/pom.xml
index 3f3904844499761c2e01630f3f5c9099fa52e3a2..14d2857ae9c951ea9bb9e361bf58917c27db60a7 100644 (file)
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -32,7 +32,7 @@
         <module>common-api</module>
         <module>authentication</module>
         <module>authorization</module>
-        <module>blob</module>
+<!--        <module>blob</module> -->
         <module>client</module>
         <module>jaxb</module>
         <module>hyperjaxb</module>
@@ -64,7 +64,7 @@
         <module>dimension</module>
         <module>contact</module>
         <module>workflow</module>
-               <module>media</module>
+<!--           <module>media</module> -->
         <module>JaxRsServiceProvider</module>
         <!--module>sdk</module-->
         <module>IntegrationTests</module>