CSPACE-7038: Worked through many (if not most) jar conflicts that were preventing...

diff --git a/build.properties b/build.properties
index 8de5df936cdea1dd49c87fdf309e610f6d6fa7d8..b1cc92bc6b1c2e1e1517fb6139bb3477501a9dc2 100644 (file)
--- a/build.properties
+++ b/build.properties
@@ -49,7 +49,7 @@ dist.deploy.nuxeo.system=${dist.deploy.nuxeo}/${nuxeo.system}
 dist.deploy.nuxeo.plugins=${dist.deploy.nuxeo}/${nuxeo.plugins}
 
 #JEE Application Server
-jee.release=apache-tomcat-6.0.33
+jee.release=apache-tomcat-7.0.57
 jee.dir=${env.CSPACE_JEESERVER_HOME}
 jee.home=${jee.dir}
 jee.bin=${jee.home}/bin

diff --git a/pom.xml b/pom.xml
index 746ab57e65f2f08fa8b7173e446c1d03e13a3c77..771890267e14e727f652c82be8165caa2bc0b1ad 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -13,7 +13,7 @@
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                <cspace.services.version>4.5-SNAPSHOT</cspace.services.version>
                <cspace.services.client.version>4.5-SNAPSHOT</cspace.services.client.version>
-               <nuxeo.general.release>7.10</nuxeo.general.release>
+               <nuxeo.general.release>7.10-HF17</nuxeo.general.release>
                <nuxeo.shell.version>${nuxeo.general.release}</nuxeo.shell.version>
                <nuxeo.platform.version>${nuxeo.general.release}</nuxeo.platform.version>
                <nuxeo.core.version>${nuxeo.general.release}</nuxeo.core.version>
@@ -133,7 +133,7 @@
                                <enabled>false</enabled>
                        </snapshots>
                </repository>
-
+               
                <repository>
                        <id>public-snapshot</id>
                        <url>http://maven.nuxeo.org/public-snapshot</url>
@@ -159,6 +159,18 @@
                        </snapshots>
                </repository>
 
+               <repository>
+                       <id>nightly-staging</id>
+                       <name>nuxeo-nightly-staging</name>
+                       <url>http://mavenin.nuxeo.com/nexus/content/repositories/nightly-staging</url>
+                       <releases>
+                               <enabled>true</enabled>
+                       </releases>
+                       <snapshots>
+                               <enabled>false</enabled>
+                       </snapshots>
+               </repository>           
+
                <repository>
                        <snapshots>
                                <enabled>false</enabled>

diff --git a/services/IntegrationTests/pom.xml b/services/IntegrationTests/pom.xml
index 663545f365233cacd8efed345b340a9333411710..49cd8e31cf8e8e04b462328dbb8ba264f6e076e9 100644 (file)
--- a/services/IntegrationTests/pom.xml
+++ b/services/IntegrationTests/pom.xml
@@ -116,7 +116,7 @@
         <dependency>
             <groupId>jaxen</groupId>
             <artifactId>jaxen</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.6</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml
index f23ae468eae548c9a3f199a2dfe97baa6f4b47e9..4f38cd3021aa1e527a227b272f0d3bff66407098 100644 (file)
--- a/services/JaxRsServiceProvider/pom.xml
+++ b/services/JaxRsServiceProvider/pom.xml
@@ -162,6 +162,10 @@
                                        <artifactId>jsp-2.1</artifactId>
                                        <groupId>org.mortbay.jetty</groupId>
                                </exclusion>
+                               <exclusion>
+                                       <artifactId>jaxb-impl</artifactId>
+                                       <groupId>com.sun.xml.bind</groupId>
+                               </exclusion>
                        </exclusions>
                </dependency>        
         <dependency>
@@ -363,10 +367,6 @@
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>jaxrs-api</artifactId>
-        </dependency>        
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
@@ -374,6 +374,12 @@
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxb-provider</artifactId>
+            <exclusions>
+               <exclusion>
+                       <artifactId>jaxb-impl</artifactId>
+                       <groupId>com.sun.xml.bind</groupId>
+               </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -521,17 +527,14 @@
         <dependency>
             <groupId>org.nuxeo.common</groupId>
             <artifactId>nuxeo-common</artifactId>
-            <version>${nuxeo.core.version}</version>
         </dependency>
         <dependency>
             <groupId>org.nuxeo.runtime</groupId>
             <artifactId>nuxeo-runtime</artifactId>
-                       <version>${nuxeo.core.version}</version>            
         </dependency>
         <dependency>
             <groupId>org.nuxeo.ecm.core</groupId>
             <artifactId>nuxeo-core</artifactId>
-                       <version>${nuxeo.core.version}</version>
                        <exclusions>
                 <exclusion>
                     <groupId>xerces</groupId>
@@ -546,7 +549,6 @@
         <dependency>
             <groupId>org.nuxeo.ecm.core</groupId>
             <artifactId>nuxeo-core-convert</artifactId>
-                       <version>${nuxeo.core.version}</version>            
         </dependency>
         <dependency>
             <groupId>org.nuxeo.lib.core</groupId>
@@ -556,34 +558,25 @@
         <dependency>
             <groupId>org.nuxeo.ecm.core</groupId>
             <artifactId>nuxeo-core-storage-sql-ra</artifactId>
-                       <version>${nuxeo.core.version}</version>            
         </dependency>
         <dependency>
             <groupId>org.nuxeo.ecm.core</groupId>
             <artifactId>nuxeo-core-query</artifactId>
-                                               <version>${nuxeo.core.version}</version>            
+                       <version>${nuxeo.core.version}</version>            
         </dependency>
         <dependency>
             <groupId>org.nuxeo.ecm.core</groupId>
             <artifactId>nuxeo-core-schema</artifactId>
-                                               <version>${nuxeo.core.version}</version>            
         </dependency>
+        <!--
         <dependency>
             <groupId>org.nuxeo.ecm.core</groupId>
             <artifactId>nuxeo-core-io</artifactId>
-                       <version>${nuxeo.core.version}</version>            
         </dependency>
-<!--         
-        <dependency>
-                 <groupId>org.nuxeo.runtime</groupId>
-                 <artifactId>nuxeo-runtime-scripting</artifactId>
-                 <version>${nuxeo.core.version}</version>                
-        </dependency>
- -->        
+         -->
         <dependency>
                        <groupId>org.nuxeo.runtime</groupId>
                        <artifactId>nuxeo-runtime-jtajca</artifactId>
-                       <version>${nuxeo.core.version}</version>  
                        <!-- Until issue http://issues.collectionspace.org/browse/CSPACE-4639 is resolved, we
                                <version>5.5-NXP-8140</version>
                                need to use this patched Nuxeo artifact that is only available on our public Maven
@@ -607,7 +600,6 @@
         <dependency>
                        <groupId>org.nuxeo.runtime</groupId>
                        <artifactId>nuxeo-runtime-datasource</artifactId>
-                       <version>${nuxeo.core.version}</version>
         </dependency>
         <dependency>
                        <groupId>org.nuxeo.ecm.platform</groupId>
@@ -639,18 +631,24 @@
                        <groupId>org.nuxeo.ecm.platform</groupId>
                        <artifactId>nuxeo-platform-audit-api</artifactId>
                        <version>${nuxeo.core.version}</version>
+                       <exclusions>
+                               <exclusion>
+                                       <artifactId>jersey-client</artifactId>
+                                       <groupId>com.sun.jersey</groupId>
+                               </exclusion>
+                       </exclusions>
         </dependency>
         <dependency>
             <groupId>org.nuxeo.runtime</groupId>
             <artifactId>nuxeo-runtime-osgi</artifactId>
                        <version>${nuxeo.core.version}</version>            
         </dependency>
+               
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <version>4.1.0</version>
         </dependency>
-
          <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>

diff --git a/services/account/jaxb/pom.xml b/services/account/jaxb/pom.xml
index f3cd124fc3da4f1b24979b4a93f9e3bdc7f0555c..ccfa3b4b68772bba620081bb3fea47b89e31d978 100644 (file)
--- a/services/account/jaxb/pom.xml
+++ b/services/account/jaxb/pom.xml
@@ -16,7 +16,7 @@
 
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
+            <artifactId>jaxb-core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jvnet.jaxb2-commons</groupId>

diff --git a/services/account/pstore/pom.xml b/services/account/pstore/pom.xml
index 346dbc9fd9d5a3352d6ff9031feade17f98bbfc3..bf2f9cf0ec24d9feddce05d350abee30f4d7d4e8 100644 (file)
--- a/services/account/pstore/pom.xml
+++ b/services/account/pstore/pom.xml
@@ -19,7 +19,7 @@
        <dependencies>
                <dependency>
                        <groupId>com.sun.xml.bind</groupId>
-                       <artifactId>jaxb-impl</artifactId>
+                       <artifactId>jaxb-core</artifactId>
                </dependency>
                <dependency>
                        <groupId>org.jvnet.jaxb2-commons</groupId>

diff --git a/services/authentication/jaxb/pom.xml b/services/authentication/jaxb/pom.xml
index d42306d5333c277b10a29a9f64dcf6e30543a101..c6e7cbe44ccffb9624d556314e490c7013014165 100644 (file)
--- a/services/authentication/jaxb/pom.xml
+++ b/services/authentication/jaxb/pom.xml
@@ -21,7 +21,7 @@
     <dependencies>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
+            <artifactId>jaxb-core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jvnet.jaxb2-commons</groupId>

diff --git a/services/authentication/service/pom.xml b/services/authentication/service/pom.xml
index 4d30bc7ffa8f65f61935da4dfb4dd57de9a0cbd1..96219ad3c73af2b105b456a86aec87868ef609a1 100644 (file)
--- a/services/authentication/service/pom.xml
+++ b/services/authentication/service/pom.xml
@@ -58,8 +58,8 @@
         </dependency>
         <dependency>
             <groupId>org.jboss.logging</groupId>
-            <artifactId>jboss-logging-log4j</artifactId>
-            <version>2.1.0.GA</version>
+            <artifactId>jboss-logging</artifactId>
+            <version>3.1.4.GA</version>
         </dependency>
         <dependency>
         <!--

diff --git a/services/authority/jaxb/pom.xml b/services/authority/jaxb/pom.xml
index b1b273b86aa80ff4487801228c86a106cd428c9b..876e7f45efde9d74939e6dfe16118361debe12f8 100644 (file)
--- a/services/authority/jaxb/pom.xml
+++ b/services/authority/jaxb/pom.xml
@@ -15,7 +15,7 @@
     <dependencies>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
+            <artifactId>jaxb-core</artifactId>
         </dependency>
         <dependency>
             <groupId>org.jvnet.jaxb2-commons</groupId>

diff --git a/services/authority/pom.xml b/services/authority/pom.xml
index 205052855fe08037f8627c2841c248c60d604570..1741fc78db42d4ef29a96c03a1d2cf5da9ff2973 100644 (file)
--- a/services/authority/pom.xml
+++ b/services/authority/pom.xml
@@ -14,78 +14,6 @@
     <packaging>pom</packaging>
 
     <dependencies>
-        <!-- CollectionSpace dependencies
-        <dependency>
-            <groupId>org.collectionspace.services</groupId>
-            <artifactId>org.collectionspace.services.common-api</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.collectionspace.services</groupId>
-            <artifactId>org.collectionspace.services.jaxb</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.collectionspace.services</groupId>
-            <artifactId>org.collectionspace.services.client</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.collectionspace.services</groupId>
-            <artifactId>org.collectionspace.services.common</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.collectionspace.services</groupId>
-            <artifactId>org.collectionspace.services.authentication.jaxb</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.collectionspace.services</groupId>
-            <artifactId>org.collectionspace.services.authentication.service</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.collectionspace.services</groupId>
-            <artifactId>org.collectionspace.services.authorization.jaxb</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.collectionspace.services</groupId>
-            <artifactId>org.collectionspace.services.authorization.service</artifactId>
-            <version>${project.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.collectionspace.services</groupId>
-            <artifactId>org.collectionspace.services.relation.service</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.collectionspace.services</groupId>
-            <artifactId>org.collectionspace.services.relation.client</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-                -->
-
-
-        <!-- Utilities -->
-
-               <!--
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-api</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.slf4j</groupId>
-            <artifactId>slf4j-log4j12</artifactId>
-            <scope>provided</scope>
-        </dependency>
-               -->
         <dependency>
             <groupId>log4j</groupId>
             <artifactId>log4j</artifactId>
@@ -122,14 +50,6 @@
             <version>1.0</version>
             <scope>provided</scope>
         </dependency>
-        <!--
-            <dependency>
-            <groupId>dom4j</groupId>
-            <artifactId>dom4j</artifactId>
-            <version>1.6.1</version>
-            <scope>provided</scope>
-        </dependency>
-        -->
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
@@ -144,10 +64,6 @@
         </dependency>
 
         <!-- jboss -->
-        <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>jaxrs-api</artifactId>
-        </dependency>        
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
@@ -184,77 +100,6 @@
             <version>2.2.2.SP8</version>
             <scope>provided</scope>
         </dependency>
-        <!-- nuxeo -->
-<!-- 
-           <dependency>
-             <groupId>org.nuxeo.ecm.platform</groupId>
-             <artifactId>nuxeo-platform-mimetype-api</artifactId>
-             <version>${nuxeo.platform.version}</version>
-           </dependency>        
-           <dependency>
-             <groupId>org.nuxeo.ecm.platform</groupId>
-             <artifactId>nuxeo-platform-imaging-api</artifactId>
-             <version>${nuxeo.platform.version}</version>
-           </dependency>
-           <dependency>
-             <groupId>org.nuxeo.ecm.platform</groupId>
-             <artifactId>nuxeo-platform-filemanager-api</artifactId>
-                 <version>${nuxeo.platform.version}</version>        
-           </dependency>
--->        
-               <!--
-        <dependency>
-            <groupId>org.nuxeo.common</groupId>
-            <artifactId>nuxeo-common</artifactId>
-            <version>${nuxeo.core.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.nuxeo.runtime</groupId>
-            <artifactId>nuxeo-runtime</artifactId>
-            <version>${nuxeo.core.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.nuxeo.ecm.core</groupId>
-            <artifactId>nuxeo-core-api</artifactId>
-            <version>${nuxeo.core.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.nuxeo.ecm.core</groupId>
-            <artifactId>nuxeo-core-client</artifactId>
-            <version>${nuxeo.core.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.nuxeo.ecm.core</groupId>
-            <artifactId>nuxeo-core-query</artifactId>
-            <version>${nuxeo.core.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.nuxeo.ecm.core</groupId>
-            <artifactId>nuxeo-core-schema</artifactId>
-            <version>${nuxeo.core.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.nuxeo.ecm.core</groupId>
-            <artifactId>nuxeo-core-io</artifactId>
-            <version>${nuxeo.core.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.nuxeo.ecm.core</groupId>
-            <artifactId>nuxeo-core-io</artifactId>
-            <version>${nuxeo.core.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.nuxeo.runtime</groupId>
-            <artifactId>nuxeo-runtime-osgi</artifactId>
-            <version>${nuxeo.core.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>org.osgi</groupId>
-            <artifactId>org.osgi.core</artifactId>
-            <version>4.1.0</version>
-        </dependency>
-               -->
     </dependencies>
     
        <modules>

diff --git a/services/authority/service/pom.xml b/services/authority/service/pom.xml
index 62d404615ef914c6b672282c3cfb51f3e3819c9b..f4eb0571dea48b781cd3c1edf6a6634fd0e451e0 100644 (file)
--- a/services/authority/service/pom.xml
+++ b/services/authority/service/pom.xml
@@ -161,7 +161,7 @@
 
                <dependency>
                        <groupId>com.sun.xml.bind</groupId>
-                       <artifactId>jaxb-impl</artifactId>
+                       <artifactId>jaxb-core</artifactId>
                </dependency>
                <dependency>
                        <groupId>org.jvnet.jaxb2-commons</groupId>
@@ -169,10 +169,6 @@
                </dependency>
 
                <!-- jboss -->
-               <dependency>
-                       <groupId>org.jboss.resteasy</groupId>
-                       <artifactId>jaxrs-api</artifactId>
-               </dependency>
                <dependency>
                        <groupId>org.jboss.resteasy</groupId>
                        <artifactId>resteasy-jaxrs</artifactId>
@@ -228,13 +224,11 @@
                <dependency>
                        <groupId>org.nuxeo.common</groupId>
                        <artifactId>nuxeo-common</artifactId>
-                       <version>${nuxeo.core.version}</version>
                        <scope>provided</scope>
                </dependency>
                <dependency>
                        <groupId>org.nuxeo.runtime</groupId>
                        <artifactId>nuxeo-runtime</artifactId>
-                       <version>${nuxeo.core.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.nuxeo.ecm.core</groupId>
@@ -248,18 +242,17 @@
                <dependency>
                        <groupId>org.nuxeo.ecm.core</groupId>
                        <artifactId>nuxeo-core-schema</artifactId>
-                       <version>${nuxeo.core.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.nuxeo.ecm.core</groupId>
                        <artifactId>nuxeo-core-storage-sql</artifactId>
-                       <version>${nuxeo.core.version}</version>
                </dependency>
+               <!-- 
                <dependency>
                        <groupId>org.nuxeo.ecm.core</groupId>
                        <artifactId>nuxeo-core-io</artifactId>
-                       <version>${nuxeo.core.version}</version>
                </dependency>
+                -->
                <dependency>
                        <groupId>org.nuxeo.runtime</groupId>
                        <artifactId>nuxeo-runtime-osgi</artifactId>

diff --git a/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityResource.java b/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityResource.java
index c8611215f2d49b84db62606a6944c3cb4118c07c..ff5f1b763a34a1a3653462b428897dcbd0bed251 100644 (file)
--- a/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityResource.java
+++ b/services/authority/service/src/main/java/org/collectionspace/services/common/vocabulary/AuthorityResource.java
@@ -40,6 +40,7 @@ import javax.ws.rs.core.Request;
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriBuilder;
 import javax.ws.rs.core.UriInfo;
+import javax.ws.rs.core.MultivaluedHashMap;
 
 import org.collectionspace.services.client.IClientQueryParams;
 import org.collectionspace.services.client.IQueryManager;
@@ -1064,7 +1065,16 @@ public abstract class AuthorityResource<AuthCommon, AuthItemHandler>
         String parentcsid = lookupParentCSID(ctx, parentspecifier, "getReferencingObjects(parent)", "GET_ITEM_REF_OBJS", uriInfo);
         String itemcsid = lookupItemCSID(ctx, itemspecifier, parentcsid, "getReferencingObjects(item)", "GET_ITEM_REF_OBJS");
 
-        List<String> serviceTypes = queryParams.remove(ServiceBindingUtils.SERVICE_TYPE_PROP);
+        // RESTEasy returns a read-only set of query params, so we need to make a read-write copy of them
+        MultivaluedHashMap<String, String> tmpQueryParams = new MultivaluedHashMap<String, String>();
+        tmpQueryParams.putAll(queryParams);
+        // Set the original query params to the new copy
+        queryParams = tmpQueryParams;
+        // Update the service context with the new copy
+        ctx.setQueryParams(queryParams);
+        
+        // Remove the "type" property from the query params
+        List<String> serviceTypes = queryParams.remove(ServiceBindingUtils.SERVICE_TYPE_PROP);        
         if (serviceTypes == null || serviceTypes.isEmpty()) {
                serviceTypes = ServiceBindingUtils.getCommonServiceTypes(true); //CSPACE-5359: Should now include objects, procedures, and authorities
         }

diff --git a/services/authorization-mgt/client/pom.xml b/services/authorization-mgt/client/pom.xml
index efac3311047a024dde3e60b5db2c19555274b41a..79f366630dc8da24767e635f4c06820777ea8ce8 100644 (file)
--- a/services/authorization-mgt/client/pom.xml
+++ b/services/authorization-mgt/client/pom.xml
@@ -73,10 +73,12 @@
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxb-provider</artifactId>
         </dependency>
+        <!-- 
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
+         -->
         <dependency>
             <groupId>commons-httpclient</groupId>
             <artifactId>commons-httpclient</artifactId>

diff --git a/services/authorization/jaxb/pom.xml b/services/authorization/jaxb/pom.xml
index 3238904201f1072c8b353aa01847cf472314cf51..f14b1d67c630faf3ab4af74139261f4da866a61f 100644 (file)
--- a/services/authorization/jaxb/pom.xml
+++ b/services/authorization/jaxb/pom.xml
@@ -13,6 +13,10 @@
     <properties>
     </properties>
     <dependencies>
+        <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-core</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>

diff --git a/services/authorization/service/pom.xml b/services/authorization/service/pom.xml
index 7a2320035bbfd67336340730cdd8799848a71dec..8e32c5bc2b7b98937ad6258333a1dc8f425a8161 100644 (file)
--- a/services/authorization/service/pom.xml
+++ b/services/authorization/service/pom.xml
@@ -67,8 +67,8 @@
         <!-- jboss -->
         <dependency>
             <groupId>org.jboss.logging</groupId>
-            <artifactId>jboss-logging-log4j</artifactId>
-            <version>2.1.0.GA</version>
+            <artifactId>jboss-logging</artifactId>
+            <version>3.1.4.GA</version>
         </dependency>
         <dependency>
             <groupId>jboss</groupId>

diff --git a/services/client/pom.xml b/services/client/pom.xml
index 4b2342de97208cd6f5a90c662445d4b861580799..3a0c7e0b53c2f144bc60f2a42a11acf2b7abdce7 100644 (file)
--- a/services/client/pom.xml
+++ b/services/client/pom.xml
@@ -60,7 +60,7 @@
         <dependency>
                        <groupId>xerces</groupId>
                        <artifactId>xercesImpl</artifactId>
-                       <version>2.9.1</version>
+                       <version>2.11.0</version>
                </dependency>        
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -74,7 +74,7 @@
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
-            <artifactId>jaxrs-api</artifactId>
+            <artifactId>resteasy-jaxrs</artifactId>
         </dependency>        
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -84,6 +84,12 @@
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-multipart-provider</artifactId>
         </dependency>
+        <dependency>
+                       <groupId>org.jboss.logging</groupId>
+                       <artifactId>jboss-logging</artifactId>
+                       <version>3.1.4.GA</version>
+                       <scope>runtime</scope>          
+        </dependency>
         <!-- Set TestNG scope to default (compile), rather than test -->
         <!-- to allow import(s) in AbstractServiceTest class -->
         <dependency>
@@ -101,8 +107,7 @@
         </dependency>
         <dependency>
                    <groupId>com.sun.xml.bind</groupId>
-                   <artifactId>jaxb-impl</artifactId>
-                   <version>2.2.7</version>
+                   <artifactId>jaxb-core</artifactId>
                    <type>jar</type>
                    <scope>compile</scope>
                </dependency>        

diff --git a/services/common-api/pom.xml b/services/common-api/pom.xml
index 4370974c9064e8d1158408c67e5ae9a69a8248f6..b1c043b20dc37ff34dd6e812136bd4abb877df1f 100644 (file)
--- a/services/common-api/pom.xml
+++ b/services/common-api/pom.xml
@@ -33,7 +33,7 @@
         <dependency>
             <groupId>jaxen</groupId>
             <artifactId>jaxen</artifactId>
-            <version>1.1.1</version>
+            <version>1.1.6</version>
         </dependency>
 
     </dependencies>

diff --git a/services/common-test/pom.xml b/services/common-test/pom.xml
index 483fd3d7f44bcb3d7d2f50535330b7106604f356..db8ea871afd7fc9a49db3778df52dffcf54e47fc 100644 (file)
--- a/services/common-test/pom.xml
+++ b/services/common-test/pom.xml
@@ -55,10 +55,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-        <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>jaxrs-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxb-provider</artifactId>

diff --git a/services/common/pom.xml b/services/common/pom.xml
index 866f8e4ab7a66035ef071bb071d6984b320545d1..fb2dafaa79c7fb533c5d35205cb8f4d53486e8ab 100644 (file)
--- a/services/common/pom.xml
+++ b/services/common/pom.xml
@@ -151,14 +151,14 @@
                </dependency>
                <dependency>
                        <groupId>org.apache.tomcat</groupId>
-                       <artifactId>dbcp</artifactId>
-                       <version>6.0.33</version>
+                       <artifactId>tomcat-dbcp</artifactId>
+                       <version>7.0.64</version>
                        <scope>provided</scope>
                </dependency>
                <dependency>
                        <groupId>org.apache.tomcat</groupId>
-                       <artifactId>catalina</artifactId>
-                       <version>6.0.33</version>
+                       <artifactId>tomcat-catalina</artifactId>
+                       <version>7.0.64</version>
                        <scope>provided</scope>
                </dependency>
 
@@ -199,10 +199,6 @@
                </dependency>
 
                <!-- jboss -->
-               <dependency>
-                       <groupId>org.jboss.resteasy</groupId>
-                       <artifactId>jaxrs-api</artifactId>
-               </dependency>
                <dependency>
                        <groupId>org.jboss.resteasy</groupId>
                        <artifactId>resteasy-jaxrs</artifactId>
@@ -272,13 +268,11 @@
                <dependency>
                        <groupId>org.nuxeo.common</groupId>
                        <artifactId>nuxeo-common</artifactId>
-                       <version>${nuxeo.core.version}</version>
                        <scope>provided</scope>
                </dependency>
                <dependency>
                        <groupId>org.nuxeo.runtime</groupId>
                        <artifactId>nuxeo-runtime</artifactId>
-                       <version>${nuxeo.core.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.nuxeo.ecm.core</groupId>
@@ -292,39 +286,37 @@
                <dependency>
                        <groupId>org.nuxeo.ecm.core</groupId>
                        <artifactId>nuxeo-core-schema</artifactId>
-                       <version>${nuxeo.core.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.nuxeo.ecm.core</groupId>
                        <artifactId>nuxeo-core-storage-sql</artifactId>
-                       <version>${nuxeo.core.version}</version>
                </dependency>
                <dependency>
                        <groupId>org.nuxeo.ecm.core</groupId>
                        <artifactId>nuxeo-core-storage-sql-ra</artifactId>
-                       <version>${nuxeo.core.version}</version>
                </dependency>
+               <!-- 
                <dependency>
                        <groupId>org.nuxeo.ecm.core</groupId>
                        <artifactId>nuxeo-core-io</artifactId>
-                       <version>${nuxeo.core.version}</version>
                </dependency>
+                -->
                <dependency>
                        <groupId>org.nuxeo.ecm.core</groupId>
                        <artifactId>nuxeo-core-convert</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.runtime</groupId>
                        <artifactId>nuxeo-runtime-osgi</artifactId>
                        <version>${nuxeo.core.version}</version>
                </dependency>
+               <dependency>
+                       <groupId>org.nuxeo.ecm.core</groupId>
+                       <artifactId>nuxeo-opencmis-impl</artifactId>
+               </dependency>
                <dependency>
                        <groupId>org.nuxeo.ecm.core</groupId>
                        <artifactId>nuxeo-opencmis-bindings</artifactId>
-                       <version>${nuxeo.core.version}</version>
                        <exclusions>
                                <exclusion>
                                        <artifactId>jsr311-api</artifactId>

diff --git a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryClientImpl.java b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryClientImpl.java
index a24eb9cfc25aad4a034e2b219a9d2bd3ef1dc93f..5a03d506a8884c4a920e2118ed01e32ade74944a 100644 (file)
--- a/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryClientImpl.java
+++ b/services/common/src/main/java/org/collectionspace/services/nuxeo/client/java/RepositoryClientImpl.java
@@ -63,7 +63,6 @@ import org.collectionspace.services.common.config.TenantBindingConfigReaderImpl;
 import org.collectionspace.services.common.config.TenantBindingUtils;
 import org.collectionspace.services.common.storage.PreparedStatementBuilder;
 import org.collectionspace.services.common.vocabulary.RefNameServiceUtils.AuthorityItemSpecifier;
-import org.collectionspace.services.common.vocabulary.RefNameServiceUtils.Specifier;
 import org.collectionspace.services.config.tenant.TenantBindingType;
 import org.collectionspace.services.config.tenant.RepositoryDomainType;
 
@@ -341,7 +340,7 @@ public class RepositoryClientImpl implements RepositoryClient<PoxPayloadIn, PoxP
      * @throws TransactionException
      * @throws DocumentException
      */
-    @Override
+       @Override
     public void get(ServiceContext ctx, String id, DocumentHandler handler)
             throws DocumentNotFoundException, TransactionException, DocumentException {
 
@@ -359,8 +358,9 @@ public class RepositoryClientImpl implements RepositoryClient<PoxPayloadIn, PoxP
             try {
                 docModel = repoSession.getDocument(docRef);
                 assertWorkflowState(ctx, docModel);
-            } catch (ClientException ce) {
-                String msg = logException(ce, "Could not find document with CSID=" + id);
+            } catch (org.nuxeo.ecm.core.api.DocumentNotFoundException ce) {
+                String msg = logException(ce,
+                               String.format("Could not find %s resource/record with CSID=%s", ctx.getDocumentType(), id));
                 throw new DocumentNotFoundException(msg, ce);
             }
             //
@@ -1437,7 +1437,7 @@ public class RepositoryClientImpl implements RepositoryClient<PoxPayloadIn, PoxP
      * cannot be successfully completed
      * @throws DocumentException
      */
-    @Override
+       @Override
     public void update(ServiceContext ctx, String csid, DocumentHandler handler)
             throws BadRequestException, DocumentNotFoundException, TransactionException,
             DocumentException {
@@ -1454,8 +1454,9 @@ public class RepositoryClientImpl implements RepositoryClient<PoxPayloadIn, PoxP
             DocumentModel doc = null;
             try {
                 doc = repoSession.getDocument(docRef);
-            } catch (ClientException ce) {
-                String msg = logException(ce, "Could not find document to update with CSID=" + csid);
+            } catch (org.nuxeo.ecm.core.api.DocumentNotFoundException ce) {
+                String msg = logException(ce,
+                               String.format("Could not find %s resource/record to update with CSID=%s", ctx.getDocumentType(), csid));
                 throw new DocumentNotFoundException(msg, ce);
             }
             // Check for a versioned document, and check In and Out before we proceed.
@@ -1629,8 +1630,9 @@ public class RepositoryClientImpl implements RepositoryClient<PoxPayloadIn, PoxP
                 } else {
                        result = false; // delete failed for some reason
                 }
-            } catch (ClientException ce) {
-                String msg = logException(ce, "Could not find document to delete with CSID=" + id);
+            } catch (org.nuxeo.ecm.core.api.DocumentNotFoundException ce) {
+                String msg = logException(ce,
+                               String.format("Could not find %s resource/record to delete with CSID=%s", ctx.getDocumentType(), id));                
                 throw new DocumentNotFoundException(msg, ce);
             }
             repoSession.save();

diff --git a/services/jaxb/pom.xml b/services/jaxb/pom.xml
index d16c8d7bfb6b23cf8aa4763f83b2a2af4562a4fd..79ad7664bdb38c8706b2cd1916b078043737eaeb 100644 (file)
--- a/services/jaxb/pom.xml
+++ b/services/jaxb/pom.xml
@@ -24,7 +24,7 @@
        <dependencies>
                <dependency>
                        <groupId>com.sun.xml.bind</groupId>
-                       <artifactId>jaxb-impl</artifactId>
+                       <artifactId>jaxb-core</artifactId>
                </dependency>
                <dependency>
                        <groupId>org.jvnet.jaxb2_commons</groupId>

diff --git a/services/material/jaxb/pom.xml b/services/material/jaxb/pom.xml
index 6b8240de1d18c65e579a7e4d74b4c2485e66fb3f..173a34906e2e6ac5d04781e0dc0926ae864cf6ba 100644 (file)
--- a/services/material/jaxb/pom.xml
+++ b/services/material/jaxb/pom.xml
@@ -19,7 +19,7 @@
         </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
+            <artifactId>jaxb-core</artifactId>
         </dependency>
                 <!--
         <dependency>

diff --git a/services/place/jaxb/pom.xml b/services/place/jaxb/pom.xml
index 2c8603a95712079984621238595ae984c55a87ef..d06f0b6027800f25c1821eaa3bfbee88775935d2 100644 (file)
--- a/services/place/jaxb/pom.xml
+++ b/services/place/jaxb/pom.xml
@@ -19,7 +19,7 @@
             </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
+            <artifactId>jaxb-core</artifactId>
         </dependency>
                                <!--
         <dependency>

diff --git a/services/pom.xml b/services/pom.xml
index 7c9b89872764348e3fab3903d93fedca666c3d8f..d2976693894f54bc7ee9a91d6de578c88cfca938 100644 (file)
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -15,8 +15,8 @@
                <annox.version>0.5.0</annox.version>
                <jaxb2-basics.version>0.6.2</jaxb2-basics.version>
                <maven-jaxb2-plugin.version>0.12.3</maven-jaxb2-plugin.version>
-               <jaxb.version>2.2.4-1</jaxb.version>
-               <resteasy.version>3.0.9.Final</resteasy.version>
+               <jaxb.version>2.2.11</jaxb.version>
+               <resteasy.version>3.0.19.Final</resteasy.version>
                <mysql.driver.version>5.1.8</mysql.driver.version>
                <postgres.driver.version>9.1-901.jdbc4</postgres.driver.version>
                <!-- The default life cycle policy for Nuxeo document types -->
@@ -188,7 +188,7 @@
                                                                        <plugin> 
                                                                          <groupId>javax.xml.bind</groupId>
                                                                          <artifactId>jaxb-api</artifactId>
-                                                                         <version>2.1</version>
+                                                                         <version>${jaxb.version}</version>
                                     </plugin> 
                                                                        <plugin> 
                                            <groupId>org.jvnet.jaxb2_commons</groupId> 
@@ -310,11 +310,75 @@
                                <groupId>javax.servlet</groupId>
                                <version>2.5</version>
                        </dependency>
+
+                       <!-- Start of Nuxeo dependencies -->
+                       <dependency>
+                               <groupId>org.nuxeo.ecm.core</groupId>
+                               <artifactId>nuxeo-core</artifactId>
+                               <version>${nuxeo.core.version}</version>
+                       </dependency>
                <dependency>
                    <groupId>org.nuxeo.ecm.core</groupId>
                    <artifactId>nuxeo-core-api</artifactId>
-                   <version>${nuxeo.core.version}</version>            
+                   <version>${nuxeo.core.version}</version>
             </dependency>
+                       <dependency>
+                               <groupId>org.nuxeo.common</groupId>
+                               <artifactId>nuxeo-common</artifactId>
+                               <version>${nuxeo.core.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.nuxeo.runtime</groupId>
+                               <artifactId>nuxeo-runtime</artifactId>
+                               <version>${nuxeo.core.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.nuxeo.ecm.core</groupId>
+                               <artifactId>nuxeo-core-schema</artifactId>
+                               <version>${nuxeo.core.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.nuxeo.ecm.core</groupId>
+                               <artifactId>nuxeo-core-storage-sql</artifactId>
+                               <version>${nuxeo.core.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.nuxeo.ecm.core</groupId>
+                               <artifactId>nuxeo-core-storage-sql-ra</artifactId>
+                               <version>${nuxeo.core.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.nuxeo.ecm.core</groupId>
+                               <artifactId>nuxeo-core-io</artifactId>
+                               <version>${nuxeo.core.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.nuxeo.ecm.core</groupId>
+                               <artifactId>nuxeo-core-convert</artifactId>
+                               <version>${nuxeo.core.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.nuxeo.ecm.core</groupId>
+                               <artifactId>nuxeo-opencmis-impl</artifactId>
+                               <version>${nuxeo.core.version}</version>
+                       </dependency>                   
+                       <dependency>
+                               <groupId>org.nuxeo.ecm.core</groupId>
+                               <artifactId>nuxeo-opencmis-bindings</artifactId>
+                               <version>${nuxeo.core.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.nuxeo.runtime</groupId>
+                               <artifactId>nuxeo-runtime-jtajca</artifactId>
+                               <version>${nuxeo.core.version}</version>  
+                       </dependency>
+                       <dependency>
+                               <groupId>org.nuxeo.runtime</groupId>
+                               <artifactId>nuxeo-runtime-datasource</artifactId>
+                               <version>${nuxeo.core.version}</version>
+                       </dependency>
+                       <!-- End of Nuxeo dependencies -->
+
             <dependency>
                 <groupId>net.java.dev.jaxb2-commons</groupId>
                 <artifactId>jaxb-fluent-api</artifactId>
@@ -335,11 +399,6 @@
                                <artifactId>jaxb2-basics-runtime</artifactId>
                                <version>${jaxb2-basics.version}</version>
                        </dependency>
-            <dependency>
-                <groupId>org.jboss.resteasy</groupId>
-                <artifactId>jaxrs-api</artifactId>
-                <version>${resteasy.version}</version>
-            </dependency>
             <dependency>
                 <groupId>org.jboss.resteasy</groupId>
                 <artifactId>resteasy-jaxrs</artifactId>
@@ -370,6 +429,11 @@
                 <artifactId>commons-cli</artifactId>
                 <version>1.2</version>
             </dependency>
+                       <dependency>
+                               <groupId>com.sun.xml.bind</groupId>
+                               <artifactId>jaxb-core</artifactId>
+                               <version>${jaxb.version}</version>
+                       </dependency>
                        <dependency>
                                <groupId>com.sun.xml.bind</groupId>
                                <artifactId>jaxb-impl</artifactId>

diff --git a/services/query/service/pom.xml b/services/query/service/pom.xml
index c7d240375e9e4b395a6cbcc944ec1dba9f69d50d..7fd45ce4c67ab62e54a32a3baafb690b3c1d4d43 100644 (file)
--- a/services/query/service/pom.xml
+++ b/services/query/service/pom.xml
@@ -58,10 +58,6 @@
         
         <!-- jboss -->
 
-        <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>jaxrs-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>

diff --git a/services/work/jaxb/pom.xml b/services/work/jaxb/pom.xml
index 6f287804f4c18717363ee14ac9828013064b5346..d9ede862480600c2bf42f49bec2cd696c748bb30 100644 (file)
--- a/services/work/jaxb/pom.xml
+++ b/services/work/jaxb/pom.xml
@@ -19,7 +19,7 @@
         </dependency>
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
-            <artifactId>jaxb-impl</artifactId>
+            <artifactId>jaxb-core</artifactId>
         </dependency>
                 <!--
         <dependency>