CSPACE-4526: Added Nuxeo support libs and settings for our Media and Blob services...

diff --git a/3rdparty/nuxeo/nuxeo-server/Bundle List.txt b/3rdparty/nuxeo/nuxeo-server/Bundle List.txt
new file mode 100644 (file)
index 0000000..00c67ef
--- /dev/null
+++ b/3rdparty/nuxeo/nuxeo-server/Bundle List.txt
@@ -0,0 +1,38 @@
+\r
+nuxeo-common-${version}.jar\r
+nuxeo-core-${version}.jar\r
+nuxeo-core-api-${version}.jar\r
+nuxeo-core-client-${version}.jar\r
+nuxeo-core-convert-api-${version}.jar\r
+nuxeo-core-event-${version}.jar\r
+nuxeo-core-io-${version}.jar\r
+nuxeo-core-query-${version}.jar\r
+nuxeo-core-schema-${version}.jar\r
+nuxeo-core-storage-sql-${version}.jar\r
+nuxeo-core-storage-sql-extensions-${version}.jar\r
+nuxeo-core-storage-sql-ra-${version}.jar\r
+nuxeo-platform-api-${version}.jar\r
+nuxeo-platform-audit-api-${version}.jar\r
+nuxeo-platform-directory-api-${version}.jar\r
+nuxeo-platform-filemanager-api-${version}.jar\r
+nuxeo-platform-filemanager-core-${version}.jar\r
+nuxeo-platform-imaging-api-${version}.jar\r
+nuxeo-platform-imaging-core-${version}.jar\r
+nuxeo-platform-imaging-preview-${version}.jar\r
+nuxeo-platform-login-${version}.jar\r
+nuxeo-platform-mimetype-api-${version}.jar\r
+nuxeo-platform-mimetype-core-${version}.jar\r
+nuxeo-platform-query-api-${version}.jar\r
+nuxeo-platform-search-api-${version}.jar\r
+nuxeo-platform-types-api-${version}.jar\r
+nuxeo-platform-types-core-${version}.jar\r
+nuxeo-platform-usermanager-api-${version}.jar\r
+nuxeo-runtime-${version}.jar\r
+nuxeo-runtime-datasource-${version}.jar\r
+nuxeo-runtime-jtajca-${version}.jar\r
+nuxeo-runtime-management-${version}.jar\r
+nuxeo-runtime-osgi-${version}.jar\r
+nuxeo-runtime-remoting-${version}.jar\r
+nuxeo-runtime-scripting-${version}.jar\r
+nuxeo-shell-ejb-core-${version}.jar\r
+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 3502bc60d8cdd3ff8998fbd53270de96fdee97c2..1fd370d02d4913fd040b0cca9193fc70acf9b7aa 100644 (file)
--- a/services/JaxRsServiceProvider/pom.xml
+++ b/services/JaxRsServiceProvider/pom.xml
@@ -107,12 +107,11 @@
                 </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
@@ -163,12 +162,11 @@
             <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

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 47fd41ace712e3e8c3dcf69dc77bd0741246b1ab..7abd3df3363a937dd4250ca2f1643b2f16239b14 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/blob/pom.xml b/services/blob/pom.xml
index d06a01a02d167acadc371cc394e2728417908374..3df225679d482b572b940631b742e0e3e9343771 100644 (file)
--- 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 3cc7f10af1c845264126abdd9804fb9883d8c928..ca1b1753f9e9a2225612e2dbebe408ee5a02bd80 100644 (file)
--- 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>