From 549645bd53d699bab5a8377a8407d618952de0f8 Mon Sep 17 00:00:00 2001
From: Richard Millet <richard.millet@berkeley.edu>
Date: Thu, 17 Nov 2011 09:56:21 +0000
Subject: [PATCH] CSPACE-4526: Temporarily disabled blob and media services.

---
 services/JaxRsServiceProvider/pom.xml                | 12 ++++++++++--
 .../jaxrs/CollectionSpaceJaxRsApplication.java       |  8 ++++----
 services/pom.xml                                     |  4 ++--
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml
index 8dde18231..3502bc60d 100644
--- a/services/JaxRsServiceProvider/pom.xml
+++ b/services/JaxRsServiceProvider/pom.xml
@@ -107,11 +107,12 @@
                 </exclusion>
             </exclusions> 
         </dependency>
+		<!--
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.blob.service</artifactId>
             <version>${project.version}</version>
-        </dependency>
+        </dependency> -->
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.collectionobject.service</artifactId>
@@ -162,11 +163,12 @@
             <artifactId>org.collectionspace.services.imports.service</artifactId>
              <version>${project.version}</version>
         </dependency>
+		<!--
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.media.service</artifactId>
             <version>${project.version}</version>
-        </dependency>
+        </dependency> -->
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.location.service</artifactId>
@@ -331,6 +333,12 @@
         </dependency-->
 
         <!-- javax -->
+        <dependency>
+			<artifactId>servlet-api</artifactId>
+			<groupId>javax.servlet</groupId>
+			<version>2.5</version>
+			<scope>provided</scope>
+        </dependency>
 
         <!-- jboss -->
         <dependency>
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 7abd3df33..47fd41ace 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
@@ -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 3f3904844..14d2857ae 100644
--- 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>
-- 
2.47.3