From: Richard Millet <richard.millet@berkeley.edu>
Date: Thu, 17 Nov 2011 20:09:32 +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=5ab0d019c57eb558fd6d3be249f2bc86d445afa7;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/5.4.2-HF05/bundles/nuxeo-platform-filemanager-api-5.4.2-HF05.jar b/3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/bundles/nuxeo-platform-filemanager-api-5.4.2-HF05.jar
new file mode 100644
index 000000000..d5901388b
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/bundles/nuxeo-platform-filemanager-api-5.4.2-HF05.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/bundles/nuxeo-platform-filemanager-core-5.4.2-HF05.jar b/3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/bundles/nuxeo-platform-filemanager-core-5.4.2-HF05.jar
new file mode 100644
index 000000000..f5c3b9d74
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/bundles/nuxeo-platform-filemanager-core-5.4.2-HF05.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/bundles/nuxeo-platform-imaging-api-5.4.2-HF05.jar b/3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/bundles/nuxeo-platform-imaging-api-5.4.2-HF05.jar
new file mode 100644
index 000000000..76cb20276
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/bundles/nuxeo-platform-imaging-api-5.4.2-HF05.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/bundles/nuxeo-platform-imaging-core-5.4.2-HF05.jar b/3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/bundles/nuxeo-platform-imaging-core-5.4.2-HF05.jar
new file mode 100644
index 000000000..890be59f8
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/bundles/nuxeo-platform-imaging-core-5.4.2-HF05.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/bundles/nuxeo-platform-imaging-preview-5.4.2-HF05.jar b/3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/bundles/nuxeo-platform-imaging-preview-5.4.2-HF05.jar
new file mode 100644
index 000000000..d8b036ecc
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/bundles/nuxeo-platform-imaging-preview-5.4.2-HF05.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/bundles/nuxeo-platform-mimetype-api-5.4.2-HF05.jar b/3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/bundles/nuxeo-platform-mimetype-api-5.4.2-HF05.jar
new file mode 100644
index 000000000..64cc3805b
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/bundles/nuxeo-platform-mimetype-api-5.4.2-HF05.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/bundles/nuxeo-platform-mimetype-core-5.4.2-HF05.jar b/3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/bundles/nuxeo-platform-mimetype-core-5.4.2-HF05.jar
new file mode 100644
index 000000000..3365270d9
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/bundles/nuxeo-platform-mimetype-core-5.4.2-HF05.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/bundles/nuxeo-platform-types-api-5.4.2-HF05.jar b/3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/bundles/nuxeo-platform-types-api-5.4.2-HF05.jar
new file mode 100644
index 000000000..c8d509aad
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/bundles/nuxeo-platform-types-api-5.4.2-HF05.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/bundles/nuxeo-platform-types-core-5.4.2-HF05.jar b/3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/bundles/nuxeo-platform-types-core-5.4.2-HF05.jar
new file mode 100644
index 000000000..2e1349b2a
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/bundles/nuxeo-platform-types-core-5.4.2-HF05.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/lib/jmimemagic.jar b/3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/lib/jmimemagic.jar
new file mode 100644
index 000000000..be2aa43d0
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/lib/jmimemagic.jar differ
diff --git a/services/blob/3rdparty/nuxeo-platform-cs-blob/src/main/resources/OSGI-INF/ecm-types-contrib.xml b/services/blob/3rdparty/nuxeo-platform-cs-blob/src/main/resources/OSGI-INF/ecm-types-contrib.xml
index b6d129f63..f591e7673 100644
--- a/services/blob/3rdparty/nuxeo-platform-cs-blob/src/main/resources/OSGI-INF/ecm-types-contrib.xml
+++ b/services/blob/3rdparty/nuxeo-platform-cs-blob/src/main/resources/OSGI-INF/ecm-types-contrib.xml
@@ -15,12 +15,14 @@
 
     <type id="Folder" coretype="Folder">
       <subtypes>
+        <type>Picture</type>
         <type>Blob</type>
       </subtypes>
     </type>
     
     <type id="Workspace" coretype="Workspace">
       <subtypes>
+        <type>Picture</type>
         <type>Blob</type>
       </subtypes>
     </type>
diff --git a/services/blob/pom.xml b/services/blob/pom.xml
index 3f9aaac4c..d06a01a02 100644
--- a/services/blob/pom.xml
+++ b/services/blob/pom.xml
@@ -16,9 +16,8 @@
     <modules>
         <module>service</module>
         <module>3rdparty</module>
-        <!-- Not working with embedded Nuxeo EP instance on Tomcat
+        <!-- Not working with embedded Nuxeo EP instance on Tomcat -->
         <module>client</module>
-         -->
     </modules>
 
 </project>
diff --git a/services/common/pom.xml b/services/common/pom.xml
index b9c4f8378..dbcf4df45 100644
--- a/services/common/pom.xml
+++ b/services/common/pom.xml
@@ -205,6 +205,21 @@
 	      <artifactId>nuxeo-platform-mimetype-api</artifactId>
 	      <version>${nuxeo.platform.version}</version>
 	    </dependency>        
+	    <dependency>
+	      <groupId>org.nuxeo.ecm.platform</groupId>
+	      <artifactId>nuxeo-platform-mimetype-core</artifactId>
+	      <version>${nuxeo.platform.version}</version>
+	    </dependency>        
+	    <dependency>
+	      <groupId>org.nuxeo.ecm.platform</groupId>
+	      <artifactId>nuxeo-platform-types-api</artifactId>
+	      <version>${nuxeo.platform.version}</version>
+	    </dependency>        
+	    <dependency>
+	      <groupId>org.nuxeo.ecm.platform</groupId>
+	      <artifactId>nuxeo-platform-types-core</artifactId>
+	      <version>${nuxeo.platform.version}</version>
+	    </dependency>        
 	    <dependency>
 	      <groupId>org.nuxeo.ecm.platform</groupId>
 	      <artifactId>nuxeo-platform-imaging-core</artifactId>