From: Richard Millet <richard.millet@berkeley.edu>
Date: Mon, 21 Nov 2011 21:12:38 +0000 (+0000)
Subject: CSPACE-4526: Added Nuxeo support libs and settings for our Media and Blob services... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=e02d7064bada4335fb6532dacd32f504b26e8ba4;p=tmp%2Fjakarta-migration.git

CSPACE-4526: Added Nuxeo support libs and settings for our Media and Blob services.  All media and blob service tests are now passing.
---

diff --git a/3rdparty/nuxeo/nuxeo-server/Bundle List.txt b/3rdparty/nuxeo/nuxeo-server/Bundle List.txt
new file mode 100644
index 000000000..00c67ef75
--- /dev/null
+++ b/3rdparty/nuxeo/nuxeo-server/Bundle List.txt	
@@ -0,0 +1,38 @@
+
+nuxeo-common-${version}.jar
+nuxeo-core-${version}.jar
+nuxeo-core-api-${version}.jar
+nuxeo-core-client-${version}.jar
+nuxeo-core-convert-api-${version}.jar
+nuxeo-core-event-${version}.jar
+nuxeo-core-io-${version}.jar
+nuxeo-core-query-${version}.jar
+nuxeo-core-schema-${version}.jar
+nuxeo-core-storage-sql-${version}.jar
+nuxeo-core-storage-sql-extensions-${version}.jar
+nuxeo-core-storage-sql-ra-${version}.jar
+nuxeo-platform-api-${version}.jar
+nuxeo-platform-audit-api-${version}.jar
+nuxeo-platform-directory-api-${version}.jar
+nuxeo-platform-filemanager-api-${version}.jar
+nuxeo-platform-filemanager-core-${version}.jar
+nuxeo-platform-imaging-api-${version}.jar
+nuxeo-platform-imaging-core-${version}.jar
+nuxeo-platform-imaging-preview-${version}.jar
+nuxeo-platform-login-${version}.jar
+nuxeo-platform-mimetype-api-${version}.jar
+nuxeo-platform-mimetype-core-${version}.jar
+nuxeo-platform-query-api-${version}.jar
+nuxeo-platform-search-api-${version}.jar
+nuxeo-platform-types-api-${version}.jar
+nuxeo-platform-types-core-${version}.jar
+nuxeo-platform-usermanager-api-${version}.jar
+nuxeo-runtime-${version}.jar
+nuxeo-runtime-datasource-${version}.jar
+nuxeo-runtime-jtajca-${version}.jar
+nuxeo-runtime-management-${version}.jar
+nuxeo-runtime-osgi-${version}.jar
+nuxeo-runtime-remoting-${version}.jar
+nuxeo-runtime-scripting-${version}.jar
+nuxeo-shell-ejb-core-${version}.jar
+nuxeo-shell-ejb-servlet-handlers-${version}.jar
\ No newline at end of file
diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml
index 3502bc60d..1fd370d02 100644
--- a/services/JaxRsServiceProvider/pom.xml
+++ b/services/JaxRsServiceProvider/pom.xml
@@ -107,12 +107,11 @@
                 </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>
@@ -163,12 +162,11 @@
             <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>
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 47fd41ace..7abd3df33 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/blob/pom.xml b/services/blob/pom.xml
index d06a01a02..3df225679 100644
--- a/services/blob/pom.xml
+++ b/services/blob/pom.xml
@@ -7,7 +7,6 @@
         <version>2.0-SNAPSHOT</version>
     </parent>
     
-    <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.blob</artifactId>
     <name>services.blob</name>
     <packaging>pom</packaging>
@@ -16,7 +15,6 @@
     <modules>
         <module>service</module>
         <module>3rdparty</module>
-        <!-- Not working with embedded Nuxeo EP instance on Tomcat -->
         <module>client</module>
     </modules>
 
diff --git a/services/media/pom.xml b/services/media/pom.xml
index 3cc7f10af..ca1b1753f 100644
--- a/services/media/pom.xml
+++ b/services/media/pom.xml
@@ -8,7 +8,6 @@
     </parent>
     
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.collectionspace.services</groupId>
     <artifactId>org.collectionspace.services.media</artifactId>
     <name>services.media</name>
     <packaging>pom</packaging>
@@ -17,9 +16,7 @@
         <module>jaxb</module>
         <module>service</module>
         <module>3rdparty</module>
-        <!-- Not working with embedded Nuxeo EP instance on Tomcat
         <module>client</module>
-         -->
     </modules>
 
 </project>