From: Richard Millet <richard.millet@berkeley.edu>
Date: Tue, 22 Nov 2011 20:51:26 +0000 (+0000)
Subject: CSPACE-4526: Updated to Nuxeo 5.5 jars!!!  These are not the latest but are official... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=209057191082a151307e26e44820a54ffd6304b1;p=tmp%2Fjakarta-migration.git

CSPACE-4526: Updated to Nuxeo 5.5 jars!!!  These are not the latest but are official 5.5 jars as of November 4, 2011.
---

diff --git a/3rdparty/nuxeo/build.xml b/3rdparty/nuxeo/build.xml
index 75f9b1b34..c61d21a51 100644
--- a/3rdparty/nuxeo/build.xml
+++ b/3rdparty/nuxeo/build.xml
@@ -114,31 +114,33 @@
     </target>
 
     <target name="deploy" depends="package"
-    	description="deploy nuxeo client libs to ${jee.server.cspace}">
+    	description="deploy nuxeo server libs to ${jee.server.cspace}">
         <copy todir="${jee.server.cspace}/nuxeo-server">
             <fileset dir="${basedir}/nuxeo-server/${nuxeo.release}"/>
         </copy>
         <ant antfile="nuxeo-platform-collectionspace/build.xml" target="deploy" inheritall="false"/>
-    	<!--
-		<ant antfile="nuxeo-platform-quote/build.xml" target="deploy" inheritall="false"/>
-		<ant antfile="nuxeo-platform-quote-api/build.xml" target="deploy" inheritall="false"/>
-		-->
+    		<!--
+				<ant antfile="nuxeo-platform-quote/build.xml" target="deploy" inheritall="false"/>
+				<ant antfile="nuxeo-platform-quote-api/build.xml" target="deploy" inheritall="false"/>
+				-->
         <ant antfile="nuxeo-database-templates/build.xml" target="deploy" inheritall="false"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy nuxeo client libs from ${jee.server.cspace}">
-        <delete dir="${jee.server.cspace}/nuxeo-client"/>
+    	description="undeploy nuxeo server libs from ${jee.server.cspace}">
+        <delete dir="${jee.server.cspace}/nuxeo-server/bundles"/>
+        <delete dir="${jee.server.cspace}/nuxeo-server/config"/>
+        <delete dir="${jee.server.cspace}/nuxeo-server/lib"/>
         <ant antfile="nuxeo-platform-collectionspace/build.xml" target="undeploy" inheritall="false"/>
-		<ant antfile="nuxeo-platform-quote/build.xml" target="undeploy" inheritall="false"/>
-		<ant antfile="nuxeo-platform-quote-api/build.xml" target="undeploy" inheritall="false"/>
+				<ant antfile="nuxeo-platform-quote/build.xml" target="undeploy" inheritall="false"/>
+				<ant antfile="nuxeo-platform-quote-api/build.xml" target="undeploy" inheritall="false"/>
         <ant antfile="nuxeo-database-templates/build.xml" target="undeploy" inheritall="false"/>
     </target>
 
     <target name="dist"
-    	description="generate distribution for nuxeo client libs" depends="package">
-        <copy todir="${services.trunk}/${dist.server.cspace}/nuxeo-client">
-            <fileset dir="${basedir}/nuxeo-client"/>
+    	description="generate distribution for nuxeo server libs" depends="package">
+        <copy todir="${services.trunk}/${dist.server.cspace}/nuxeo-server">
+            <fileset dir="${basedir}/nuxeo-server"/>
         </copy>
     </target>
 
diff --git a/3rdparty/nuxeo/nuxeo-platform-collectionspace/build.xml b/3rdparty/nuxeo/nuxeo-platform-collectionspace/build.xml
index 15a16b5d5..21c2739a2 100644
--- a/3rdparty/nuxeo/nuxeo-platform-collectionspace/build.xml
+++ b/3rdparty/nuxeo/nuxeo-platform-collectionspace/build.xml
@@ -92,10 +92,6 @@
       <fileset dir="${jee.deploy.nuxeo.plugins}">
         <include name="${nuxeo.collectionspace_core.jars.all}"/>		
       </fileset>	  
-      <!-- Legacy deployment location through release 0.6 -->
-      <fileset dir="${jee.deploy.nuxeo.system}">
-        <include name="${nuxeo.collectionspace_core.jars.all}"/>
-      </fileset>
     </delete>
   </target>
   
diff --git a/3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/config/datasources-config.xml b/3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/config/datasources-config.xml
index 767fc5dd8..a9d7b870e 100644
--- a/3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/config/datasources-config.xml
+++ b/3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/config/datasources-config.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0"?>
 <component name="config:datasources">
   <extension target="org.nuxeo.runtime.datasource" point="datasources">
-  <!--
     <datasource name="jdbc/nxaudit" xaDataSource="com.mysql.jdbc.jdbc2.optional.MysqlXADataSource"
-	-->
-	<datasource name="jdbc/nxaudit" xaDataSource="org.postgresql.xa.PGXADataSource"
       maxActive="20" maxIdle="5">
         <property name="databaseName">nuxeo</property>
         <property name="user">nuxeo</property>
diff --git a/3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/config/default-repo-config.xml b/3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/config/default-repo-config.xml
index bc049997a..50fa6b258 100644
--- a/3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/config/default-repo-config.xml
+++ b/3rdparty/nuxeo/nuxeo-server/5.4.2-HF05/config/default-repo-config.xml
@@ -5,12 +5,12 @@
     <repository name="default"
       factory="org.nuxeo.ecm.core.storage.sql.ra.PoolingRepositoryFactory">
       <repository name="default">
-	  <!--
         <xa-datasource>com.mysql.jdbc.jdbc2.optional.MysqlXADataSource</xa-datasource>
         <property name="URL">jdbc:mysql://localhost:3306/nuxeo?relaxAutoCommit=true</property>
-		-->
+		<!--
         <xa-datasource>org.postgresql.xa.PGXADataSource</xa-datasource>
         <property name="URL">jdbc:postgresql://localhost:5432/nuxeo</property>
+    -->
         <property name="DatabaseName">nuxeo</property>
         <property name="User">nuxeo</property>
         <property name="Password">nuxpw</property>
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-common-5.5-I20111104_1115.jar b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-common-5.5-I20111104_1115.jar
new file mode 100644
index 000000000..c82e2fbdb
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-common-5.5-I20111104_1115.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-core-5.5-I20111104_1115.jar b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-core-5.5-I20111104_1115.jar
new file mode 100644
index 000000000..580cbf240
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-core-5.5-I20111104_1115.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-core-api-5.5-I20111104_1115.jar b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-core-api-5.5-I20111104_1115.jar
new file mode 100644
index 000000000..9e93f2861
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-core-api-5.5-I20111104_1115.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-core-client-5.5-I20111104_1115.jar b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-core-client-5.5-I20111104_1115.jar
new file mode 100644
index 000000000..084aa6bdc
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-core-client-5.5-I20111104_1115.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-core-convert-api-5.5-I20111104_1115.jar b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-core-convert-api-5.5-I20111104_1115.jar
new file mode 100644
index 000000000..3b766f4bd
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-core-convert-api-5.5-I20111104_1115.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-core-event-5.5-I20111104_1115.jar b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-core-event-5.5-I20111104_1115.jar
new file mode 100644
index 000000000..257394ff9
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-core-event-5.5-I20111104_1115.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-core-io-5.5-I20111104_1115.jar b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-core-io-5.5-I20111104_1115.jar
new file mode 100644
index 000000000..c651e0a1e
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-core-io-5.5-I20111104_1115.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-core-query-5.5-I20111104_1115.jar b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-core-query-5.5-I20111104_1115.jar
new file mode 100644
index 000000000..3e991b7d3
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-core-query-5.5-I20111104_1115.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-core-schema-5.5-I20111104_1115.jar b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-core-schema-5.5-I20111104_1115.jar
new file mode 100644
index 000000000..58b883149
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-core-schema-5.5-I20111104_1115.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-core-storage-sql-5.5-I20111104_1115.jar b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-core-storage-sql-5.5-I20111104_1115.jar
new file mode 100644
index 000000000..0eef232bc
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-core-storage-sql-5.5-I20111104_1115.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-core-storage-sql-extensions-5.5-I20111104_1115.jar b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-core-storage-sql-extensions-5.5-I20111104_1115.jar
new file mode 100644
index 000000000..c900d7423
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-core-storage-sql-extensions-5.5-I20111104_1115.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-core-storage-sql-ra-5.5-I20111104_1115.jar b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-core-storage-sql-ra-5.5-I20111104_1115.jar
new file mode 100644
index 000000000..7639e9d6f
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-core-storage-sql-ra-5.5-I20111104_1115.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-api-5.5-I20111104_1115.jar b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-api-5.5-I20111104_1115.jar
new file mode 100644
index 000000000..82ff9afdb
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-api-5.5-I20111104_1115.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-audit-api-5.5-I20111104_1115.jar b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-audit-api-5.5-I20111104_1115.jar
new file mode 100644
index 000000000..ede5b32d2
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-audit-api-5.5-I20111104_1115.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-directory-api-5.5-I20111104_1115.jar b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-directory-api-5.5-I20111104_1115.jar
new file mode 100644
index 000000000..26eca5f19
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-directory-api-5.5-I20111104_1115.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-filemanager-api-5.5-I20111104_1115.jar b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-filemanager-api-5.5-I20111104_1115.jar
new file mode 100644
index 000000000..1e818ee3c
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-filemanager-api-5.5-I20111104_1115.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-filemanager-core-5.5-I20111104_1115.jar b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-filemanager-core-5.5-I20111104_1115.jar
new file mode 100644
index 000000000..8d001cbe0
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-filemanager-core-5.5-I20111104_1115.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-imaging-api-5.5-I20111104_1115.jar b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-imaging-api-5.5-I20111104_1115.jar
new file mode 100644
index 000000000..8fa7f9683
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-imaging-api-5.5-I20111104_1115.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-imaging-core-5.5-I20111104_1115.jar b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-imaging-core-5.5-I20111104_1115.jar
new file mode 100644
index 000000000..d74fabeb3
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-imaging-core-5.5-I20111104_1115.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-imaging-preview-5.5-I20111104_1115.jar b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-imaging-preview-5.5-I20111104_1115.jar
new file mode 100644
index 000000000..c9a63f736
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-imaging-preview-5.5-I20111104_1115.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-login-5.5-I20111104_1115.jar b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-login-5.5-I20111104_1115.jar
new file mode 100644
index 000000000..cc8cd75e3
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-login-5.5-I20111104_1115.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-mimetype-api-5.5-I20111104_1115.jar b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-mimetype-api-5.5-I20111104_1115.jar
new file mode 100644
index 000000000..b60bce9f1
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-mimetype-api-5.5-I20111104_1115.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-mimetype-core-5.5-I20111104_1115.jar b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-mimetype-core-5.5-I20111104_1115.jar
new file mode 100644
index 000000000..1162c3dc5
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-mimetype-core-5.5-I20111104_1115.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-query-api-5.5-I20111104_1115.jar b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-query-api-5.5-I20111104_1115.jar
new file mode 100644
index 000000000..75d4b122a
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-query-api-5.5-I20111104_1115.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-search-api-5.5-I20111104_1115.jar b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-search-api-5.5-I20111104_1115.jar
new file mode 100644
index 000000000..d391b135f
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-search-api-5.5-I20111104_1115.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-types-api-5.5-I20111104_1115.jar b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-types-api-5.5-I20111104_1115.jar
new file mode 100644
index 000000000..104c9aebe
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-types-api-5.5-I20111104_1115.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-types-core-5.5-I20111104_1115.jar b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-types-core-5.5-I20111104_1115.jar
new file mode 100644
index 000000000..c27397f54
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-types-core-5.5-I20111104_1115.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-usermanager-api-5.5-I20111104_1115.jar b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-usermanager-api-5.5-I20111104_1115.jar
new file mode 100644
index 000000000..d7c6236c1
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-platform-usermanager-api-5.5-I20111104_1115.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-runtime-5.5-I20111104_1115.jar b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-runtime-5.5-I20111104_1115.jar
new file mode 100644
index 000000000..1ca242ee4
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-runtime-5.5-I20111104_1115.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-runtime-datasource-5.5-I20111104_1115.jar b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-runtime-datasource-5.5-I20111104_1115.jar
new file mode 100644
index 000000000..8f86019eb
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-runtime-datasource-5.5-I20111104_1115.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-runtime-jtajca-5.5-I20111104_1115.jar b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-runtime-jtajca-5.5-I20111104_1115.jar
new file mode 100644
index 000000000..b6432771b
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-runtime-jtajca-5.5-I20111104_1115.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-runtime-management-5.5-I20111104_1115.jar b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-runtime-management-5.5-I20111104_1115.jar
new file mode 100644
index 000000000..ddabd3577
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-runtime-management-5.5-I20111104_1115.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-runtime-osgi-5.5-I20111104_1115.jar b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-runtime-osgi-5.5-I20111104_1115.jar
new file mode 100644
index 000000000..34f07f05c
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-runtime-osgi-5.5-I20111104_1115.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-runtime-remoting-5.5-I20111104_1115.jar b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-runtime-remoting-5.5-I20111104_1115.jar
new file mode 100644
index 000000000..29a16f716
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-runtime-remoting-5.5-I20111104_1115.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-runtime-scripting-5.5-I20111104_1115.jar b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-runtime-scripting-5.5-I20111104_1115.jar
new file mode 100644
index 000000000..afc24f8fd
Binary files /dev/null and b/3rdparty/nuxeo/nuxeo-server/5.5-I20111104_1115/bundles/nuxeo-runtime-scripting-5.5-I20111104_1115.jar differ
diff --git a/3rdparty/nuxeo/nuxeo-server/Bundle List.txt b/3rdparty/nuxeo/nuxeo-server/Bundle List.txt
index 00c67ef75..7e8513e34 100644
--- a/3rdparty/nuxeo/nuxeo-server/Bundle List.txt	
+++ b/3rdparty/nuxeo/nuxeo-server/Bundle List.txt	
@@ -34,5 +34,3 @@ 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/build.properties b/build.properties
index ef18fa1d4..49e8072e5 100644
--- a/build.properties
+++ b/build.properties
@@ -11,8 +11,8 @@ domain.nuxeo=nuxeo-server
 #nuxeo
 #nuxeo.release=5.2.M4
 #nuxeo.release=5.3.2
-#nuxeo.release=5.5-I20111104_1115
-nuxeo.release=5.4.2-HF05
+nuxeo.release=5.5-I20111104_1115
+#nuxeo.release=5.4.2-HF05
 nuxeo.ear=nuxeo.ear
 ## #old# nuxeo.system=${nuxeo.ear}/bundles
 nuxeo.system=bundles
@@ -82,6 +82,7 @@ db.base.dir=${jee.server.cspace}/cspace/services/db
 #db=mysql|postgresql
 # db=mysql
 db=postgresql
+
 #For mysql, uncomment this, and comment out postgres section
 # db.port=3306
 # db.driver.jar=${db.base.dir}/jdbc_drivers/mysql-connector-java-5.1.7.jar
diff --git a/pom.xml b/pom.xml
index 03ee7e911..af14b23ee 100644
--- a/pom.xml
+++ b/pom.xml
@@ -11,9 +11,9 @@
 
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<nuxeo.shell.version>5.4.2-HF05</nuxeo.shell.version>
-		<nuxeo.platform.version>5.4.2-HF05</nuxeo.platform.version>
-		<nuxeo.core.version>5.4.2-HF05</nuxeo.core.version>
+		<nuxeo.shell.version>5.5-I20111104_1115</nuxeo.shell.version>
+		<nuxeo.platform.version>5.5-I20111104_1115</nuxeo.platform.version>
+		<nuxeo.core.version>5.5-I20111104_1115</nuxeo.core.version>
 		<cspace.services.version>2.0-SNAPSHOT</cspace.services.version>
 		<cspace.services.client.version>2.0-SNAPSHOT</cspace.services.client.version>
 	</properties>
diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml
index a80329628..1bd50f0d6 100644
--- a/services/JaxRsServiceProvider/pom.xml
+++ b/services/JaxRsServiceProvider/pom.xml
@@ -346,22 +346,6 @@
             <scope>provided</scope>
         </dependency>
         <!-- nuxeo -->
-		<dependency>
-			<groupId>org.nuxeo.shell</groupId>
-			<artifactId>nuxeo-shell-ejb-core</artifactId>
-            <version>${nuxeo.shell.version}</version>
-            <exclusions>
-            	<exclusion>
-            		<artifactId>jruby</artifactId>
-            		<groupId>org.jruby</groupId>
-            	</exclusion>
-            </exclusions>
-		</dependency>
-		<dependency>
-			<groupId>org.nuxeo.shell</groupId>
-			<artifactId>nuxeo-shell-ejb-servlet-handlers</artifactId>
-            <version>${nuxeo.shell.version}</version>
-		</dependency>
         <dependency>
             <groupId>org.nuxeo.common</groupId>
             <artifactId>nuxeo-common</artifactId>
diff --git a/services/authority/service/pom.xml b/services/authority/service/pom.xml
index 51bb364af..4bd34c889 100644
--- a/services/authority/service/pom.xml
+++ b/services/authority/service/pom.xml
@@ -265,11 +265,13 @@
             <artifactId>nuxeo-core-io</artifactId>
             <version>${nuxeo.core.version}</version>
         </dependency>
+		<!--
         <dependency>
             <groupId>org.nuxeo.ecm.core</groupId>
             <artifactId>nuxeo-core-facade</artifactId>
             <version>${nuxeo.core.version}</version>
         </dependency>
+		-->
         <dependency>
             <groupId>org.nuxeo.ecm.core</groupId>
             <artifactId>nuxeo-core-io</artifactId>
diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/util/NuxeoUtils.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/util/NuxeoUtils.java
index c12a1b1a7..eb6a3cf1a 100644
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/util/NuxeoUtils.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/util/NuxeoUtils.java
@@ -415,6 +415,7 @@ public class NuxeoUtils {
         return result;
     }    
 
+    /*
     public static void printDocumentModel(DocumentModel docModel) throws Exception {
         String[] schemas = docModel.getDeclaredSchemas();
         for (int i = 0; schemas != null && i < schemas.length; i++) {
@@ -429,8 +430,8 @@ public class NuxeoUtils {
             logger.debug("Part-" + i + " schema =" + parts[i].getSchema().getName());
             propertyValues = parts[i].exportValues();
         }
-
     }
+    */
 
     /**
      * createPathRef creates a PathRef for given service context using given id
diff --git a/services/pom.xml b/services/pom.xml
index b891508b1..f1bba55e4 100644
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -17,7 +17,7 @@
 		<jaxb2-basics.version>0.6.2</jaxb2-basics.version>
 		<maven-jaxb2-plugin.version>0.8.0</maven-jaxb2-plugin.version>
 		<jaxb.version>2.2.4-1</jaxb.version>
-		<mysql.driver.version>5.1.7</mysql.driver.version>
+		<mysql.driver.version>5.1.8</mysql.driver.version>
 		<postgres.driver.version>8.4-702.jdbc4</postgres.driver.version>
 	</properties>
 
diff --git a/src/main/resources/config/cspace-ds.xml b/src/main/resources/config/cspace-ds.xml
index d4831c2e7..c5570734d 100644
--- a/src/main/resources/config/cspace-ds.xml
+++ b/src/main/resources/config/cspace-ds.xml
@@ -5,6 +5,8 @@
 http://www.mysql.com/downloads/api-jdbc-stable.html
 -->
 
+<!-- REM: 11/22/2011 - After our move to Apache Tomcat, this file is obsolete?
+
 <datasources>
   <local-tx-datasource>
     <jndi-name>CspaceDS</jndi-name>