CSPACE-1214: Removed Maven transitive dependency of Nuxeo artifacts from code that...

diff --git a/3rdparty/nuxeo/pom.xml b/3rdparty/nuxeo/pom.xml
index 49da988d6715e02f76370612dc3c577edec1badc..d835c08bca0b4a4e21aec8bb3dd4590b2b7f1451 100644 (file)
--- a/3rdparty/nuxeo/pom.xml
+++ b/3rdparty/nuxeo/pom.xml
@@ -17,57 +17,66 @@
         <module>nuxeo-platform-collectionspace</module>\r
     </modules>\r
 \r
-    <dependencies>       \r
+    <dependencies>\r
         <dependency>\r
             <groupId>org.osgi</groupId>\r
             <artifactId>org.osgi.core</artifactId>\r
             <version>4.1.0</version>\r
-        </dependency>        \r
+        </dependency>\r
         <!-- jboss -->\r
         <dependency>\r
             <groupId>jboss</groupId>\r
             <artifactId>jboss-remoting</artifactId>\r
             <version>2.2.2.SP8</version>\r
             <scope>provided</scope>\r
-        </dependency>        \r
+        </dependency>\r
         <!-- Nuxeo -->\r
+        <!-- Nuxeo Dependencies with versions\r
         <dependency>\r
             <groupId>org.nuxeo.common</groupId>\r
-            <artifactId>nuxeo-common</artifactId>            \r
-            <scope>provided</scope>\r
+            <artifactId>nuxeo-common</artifactId>\r
+            <version>1.5.1-SNAPSHOT</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.nuxeo.runtime</groupId>\r
-            <artifactId>nuxeo-runtime</artifactId>            \r
+            <artifactId>nuxeo-runtime</artifactId>\r
+            <version>1.5.1-SNAPSHOT</version>\r
         </dependency>\r
         <dependency>\r
-            <groupId>org.nuxeo.ecm.core</groupId>\r
-            <artifactId>nuxeo-core-api</artifactId>            \r
+            <groupId>org.nuxeo.runtime</groupId>\r
+            <artifactId>nuxeo-runtime-osgi</artifactId>\r
+            <version>1.5.1-SNAPSHOT</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.nuxeo.ecm.core</groupId>\r
-            <artifactId>nuxeo-core-client</artifactId>            \r
+            <artifactId>nuxeo-core-api</artifactId>\r
+            <version>1.5.1-SNAPSHOT</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.nuxeo.ecm.core</groupId>\r
-            <artifactId>nuxeo-core-query</artifactId>            \r
+            <artifactId>nuxeo-core-client</artifactId>\r
+            <version>1.5.1-SNAPSHOT</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.nuxeo.ecm.core</groupId>\r
-            <artifactId>nuxeo-core-schema</artifactId>            \r
+            <artifactId>nuxeo-core-query</artifactId>\r
+            <version>1.5.1-SNAPSHOT</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.nuxeo.ecm.core</groupId>\r
-            <artifactId>nuxeo-core-io</artifactId>            \r
+            <artifactId>nuxeo-core-schema</artifactId>\r
+            <version>1.5.1-SNAPSHOT</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.nuxeo.ecm.core</groupId>\r
-            <artifactId>nuxeo-core-facade</artifactId>            \r
+            <artifactId>nuxeo-core-io</artifactId>\r
+            <version>1.5.1-SNAPSHOT</version>\r
         </dependency>\r
         <dependency>\r
-            <groupId>org.nuxeo.runtime</groupId>\r
-            <artifactId>nuxeo-runtime-osgi</artifactId>            \r
-        </dependency>\r
+            <groupId>org.nuxeo.ecm.core</groupId>\r
+            <artifactId>nuxeo-core-facade</artifactId>\r
+            <version>1.5.1-SNAPSHOT</version>\r
+        </dependency> -->\r
     </dependencies>\r
 \r
 </project>\r

diff --git a/3rdparty/pom.xml b/3rdparty/pom.xml
index 50daba51866622a34335aea5c498f419e126d3cf..f0c1b9c51b61b691139a518207088c1885ebdeaa 100644 (file)
--- a/3rdparty/pom.xml
+++ b/3rdparty/pom.xml
@@ -18,52 +18,6 @@
     
     <dependencyManagement>
         <dependencies>
-            <!--
-            <dependency>
-                <groupId>org.nuxeo.common</groupId>
-                <artifactId>nuxeo-common</artifactId>
-                <version>1.5.1-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.nuxeo.runtime</groupId>
-                <artifactId>nuxeo-runtime</artifactId>
-                <version>1.5.1-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.nuxeo.runtime</groupId>
-                <artifactId>nuxeo-runtime-osgi</artifactId>
-                <version>1.5.1-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.nuxeo.ecm.core</groupId>
-                <artifactId>nuxeo-core-api</artifactId>
-                <version>1.5.1-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.nuxeo.ecm.core</groupId>
-                <artifactId>nuxeo-core-client</artifactId>
-                <version>1.5.1-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.nuxeo.ecm.core</groupId>
-                <artifactId>nuxeo-core-query</artifactId>
-                <version>1.5.1-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.nuxeo.ecm.core</groupId>
-                <artifactId>nuxeo-core-schema</artifactId>
-                <version>1.5.1-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.nuxeo.ecm.core</groupId>
-                <artifactId>nuxeo-core-io</artifactId>
-                <version>1.5.1-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.nuxeo.ecm.core</groupId>
-                <artifactId>nuxeo-core-facade</artifactId>
-                <version>1.5.1-SNAPSHOT</version>
-            </dependency> -->
          </dependencies>
     </dependencyManagement>
 

diff --git a/pom.xml b/pom.xml
index 63a6bc586d6f3c52976312ec096dc6b1f6c9676a..31da48cb2a06dba23b6cc2c06da9442e51db0a0a 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -218,8 +218,8 @@
                     <groupId>org.apache.maven.plugins</groupId>\r
                     <artifactId>maven-compiler-plugin</artifactId>\r
                     <configuration>\r
-                        <source>1.5</source>\r
-                        <target>1.5</target>\r
+                        <source>1.6</source>\r
+                        <target>1.6</target>\r
                     </configuration>\r
                 </plugin>\r
                 <plugin>\r
@@ -282,7 +282,7 @@
                 <version>5.1.5</version>\r
                 <scope>test</scope>\r
             </dependency>\r
-            <!-- Nuxeo Dependencies with versions -->\r
+            <!-- Nuxeo Dependencies with versions \r
             <dependency>\r
                 <groupId>org.nuxeo.common</groupId>\r
                 <artifactId>nuxeo-common</artifactId>\r
@@ -327,7 +327,7 @@
                 <groupId>org.nuxeo.ecm.core</groupId>\r
                 <artifactId>nuxeo-core-facade</artifactId>\r
                 <version>1.5.1-SNAPSHOT</version>\r
-            </dependency>\r
+            </dependency> -->\r
         </dependencies>\r
     </dependencyManagement>\r
 \r

diff --git a/services/acquisition/client/pom.xml b/services/acquisition/client/pom.xml
index ab957e1d155c5470667bd879ba108eba184f8255..33a681a64774db162cdbf2f8c4ec715e88924ee4 100644 (file)
--- a/services/acquisition/client/pom.xml
+++ b/services/acquisition/client/pom.xml
@@ -27,6 +27,11 @@
             <scope>test</scope>\r
         </dependency>\r
         <!-- CollectionSpace Dependencies -->\r
+        <dependency>\r
+            <groupId>org.collectionspace.services</groupId>\r
+            <artifactId>org.collectionspace.services.jaxb</artifactId>\r
+            <version>${project.version}</version>\r
+        </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.acquisition.jaxb</artifactId>\r
@@ -42,7 +47,7 @@
             <artifactId>org.collectionspace.services.person.client</artifactId>\r
             <version>${project.version}</version>\r
         </dependency>\r
-\r
+        <!-- External dependencies -->\r
         <dependency>\r
             <groupId>org.testng</groupId>\r
             <artifactId>testng</artifactId>\r

diff --git a/services/acquisition/client/src/main/java/org/collectionspace/services/client/AcquisitionClient.java b/services/acquisition/client/src/main/java/org/collectionspace/services/client/AcquisitionClient.java
index 2051c24e1e14460db85199ab2a4f31f7903ca378..5052a18db5a586134305f63c16cbf105a67d51ec 100644 (file)
--- a/services/acquisition/client/src/main/java/org/collectionspace/services/client/AcquisitionClient.java
+++ b/services/acquisition/client/src/main/java/org/collectionspace/services/client/AcquisitionClient.java
@@ -4,7 +4,7 @@ import javax.ws.rs.core.Response;
 
 import org.collectionspace.services.acquisition.AcquisitionsCommonList;
 import org.collectionspace.services.common.authorityref.AuthorityRefList;
-import org.collectionspace.services.common.context.ServiceContext;
+//import org.collectionspace.services.common.context.ServiceContext;
 import org.jboss.resteasy.client.ProxyFactory;
 import org.jboss.resteasy.plugins.providers.RegisterBuiltin;
 import org.jboss.resteasy.client.ClientResponse;

diff --git a/services/client/pom.xml b/services/client/pom.xml
index 6c924319ab53da7a2d7e6c0574bfcaaa5c7625a9..c8490bb039e6842481a12439a7153bcea4400dd2 100644 (file)
--- a/services/client/pom.xml
+++ b/services/client/pom.xml
@@ -22,11 +22,12 @@
             <artifactId>slf4j-log4j12</artifactId>\r
         </dependency>\r
 <!-- CollectionSpace dependencies -->\r
-        <dependency>\r
+<!--        <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.common</artifactId>\r
             <version>${project.version}</version>\r
-        </dependency>\r
+            <optional>true</optional>\r
+        </dependency> -->\r
 <!-- External dependencies -->        \r
         <dependency>\r
             <groupId>org.apache.maven.plugins</groupId>\r
@@ -73,17 +74,12 @@
             <version>1.0.01</version>\r
             <scope>provided</scope>\r
         </dependency>\r
-\r
         <dependency>\r
             <groupId>dom4j</groupId>\r
             <artifactId>dom4j</artifactId>\r
             <version>1.6.1</version>\r
             <scope>provided</scope>\r
-        </dependency>\r
-\r
-        <!-- jboss -->\r
-\r
-        <!-- nuxeo -->\r
+        </dependency>        \r
     </dependencies>\r
 \r
     <build>\r

diff --git a/services/client/src/main/java/org/collectionspace/services/client/AbstractServiceClientImpl.java b/services/client/src/main/java/org/collectionspace/services/client/AbstractServiceClientImpl.java
index 12dc78a450e41b141d80ef465ae43ec3bf20aed9..4425081cdf33676c2e848f9a3435e97dff412aaf 100644 (file)
--- a/services/client/src/main/java/org/collectionspace/services/client/AbstractServiceClientImpl.java
+++ b/services/client/src/main/java/org/collectionspace/services/client/AbstractServiceClientImpl.java
@@ -29,7 +29,7 @@ import java.util.Properties;
 import org.apache.commons.httpclient.HttpClient;\r
 import org.apache.commons.httpclient.UsernamePasswordCredentials;\r
 import org.apache.commons.httpclient.auth.AuthScope;\r
-import org.collectionspace.services.common.context.ServiceContext;\r
+//import org.collectionspace.services.common.context.ServiceContext;\r
 import org.slf4j.Logger;\r
 import org.slf4j.LoggerFactory;\r
 \r
@@ -39,6 +39,13 @@ import org.slf4j.LoggerFactory;
 public abstract class AbstractServiceClientImpl implements CollectionSpaceClient {\r
 \r
     protected final Logger logger = LoggerFactory.getLogger(AbstractServiceClientImpl.class);\r
+    \r
+    /**\r
+     * The character used to separate the words in a part label\r
+     */\r
+    public static final String PART_LABEL_SEPERATOR = "_";\r
+    public static final String PART_COMMON_LABEL = "common";\r
+    \r
     private Properties properties = new Properties();\r
     private URL url;\r
     private HttpClient httpClient;\r
@@ -49,8 +56,8 @@ public abstract class AbstractServiceClientImpl implements CollectionSpaceClient
 \r
        public String getCommonPartName(String servicePathComponent) {\r
                return servicePathComponent\r
-               + ServiceContext.PART_LABEL_SEPERATOR\r
-               + ServiceContext.PART_COMMON_LABEL;\r
+               + PART_LABEL_SEPERATOR\r
+               + PART_COMMON_LABEL;\r
        }\r
 \r
        abstract public String getServicePathComponent();\r

diff --git a/services/collectionobject/client/pom.xml b/services/collectionobject/client/pom.xml
index 412c071ee4bd430415f75c0ad147f96fb009867a..66d969a5401a76ac2936b5e146a2ab0c04be5f1b 100644 (file)
--- a/services/collectionobject/client/pom.xml
+++ b/services/collectionobject/client/pom.xml
@@ -26,6 +26,17 @@
             <scope>test</scope>\r
         </dependency>\r
         <!-- CollectionSpace dependencies -->\r
+        <dependency>\r
+            <groupId>org.collectionspace.services</groupId>\r
+            <artifactId>org.collectionspace.services.jaxb</artifactId>\r
+            <version>${project.version}</version>\r
+        </dependency>        \r
+        <dependency>\r
+            <groupId>org.collectionspace.services</groupId>\r
+            <artifactId>org.collectionspace.services.common</artifactId>\r
+            <optional>true</optional>\r
+            <version>${project.version}</version>\r
+        </dependency>        \r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.client</artifactId>\r

diff --git a/services/collectionobject/client/src/main/java/org/collectionspace/services/client/CollectionObjectClient.java b/services/collectionobject/client/src/main/java/org/collectionspace/services/client/CollectionObjectClient.java
index 1f1e02019f9e174d0a7f64da96e224d2fe0b1080..bb2b7a17cf5316e434f6d3cde79766526f58f372 100644 (file)
--- a/services/collectionobject/client/src/main/java/org/collectionspace/services/client/CollectionObjectClient.java
+++ b/services/collectionobject/client/src/main/java/org/collectionspace/services/client/CollectionObjectClient.java
@@ -36,8 +36,8 @@ import javax.ws.rs.core.UriInfo;
 
 import org.collectionspace.services.collectionobject.CollectionobjectsCommonList;
 import org.collectionspace.services.common.authorityref.AuthorityRefList;
-import org.collectionspace.services.common.context.ServiceContext;
-import org.collectionspace.services.common.query.IQueryManager;
+//import org.collectionspace.services.common.context.ServiceContext;
+//import org.collectionspace.services.common.query.IQueryManager;
 import org.jboss.resteasy.client.ProxyFactory;
 import org.jboss.resteasy.plugins.providers.RegisterBuiltin;
 import org.jboss.resteasy.client.ClientResponse;

diff --git a/services/collectionobject/jaxb/pom.xml b/services/collectionobject/jaxb/pom.xml
index 017da7bc7f148bca7fc2d7c47c72eaede195ea96..0d68379c9c3035d90c2dc32b08777992ab984e38 100644 (file)
--- a/services/collectionobject/jaxb/pom.xml
+++ b/services/collectionobject/jaxb/pom.xml
@@ -17,19 +17,17 @@
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
-            <version>2.0.2</version>
         </dependency>
         <dependency>
             <groupId>org.jvnet.jaxb2-commons</groupId>
             <artifactId>property-listener-injector</artifactId>
-            <version>1.0</version>
         </dependency>
         <dependency>
             <groupId>org.jvnet.jaxb2_commons</groupId>
             <artifactId>runtime</artifactId>
-            <version>0.4.1.4</version>
         </dependency>
     </dependencies>
+
     <build>
         <finalName>collectionspace-services-collectionobject-jaxb</finalName>
         <defaultGoal>install</defaultGoal>

diff --git a/services/collectionobject/sample/sample/pom.xml b/services/collectionobject/sample/sample/pom.xml
index ce28d5478ebae20671f83cf3a797f06f2b195968..56134bedcf3bca1f45e626e4f35044e285a348b4 100644 (file)
--- a/services/collectionobject/sample/sample/pom.xml
+++ b/services/collectionobject/sample/sample/pom.xml
@@ -36,8 +36,7 @@
             <snapshots>
                 <enabled>false</enabled>
             </snapshots>            
-        </repository>
-        
+        </repository>        
         <repository>
             <id>libs-snapshots-local</id>
             <name>libs-snapshots-local</name>
@@ -49,31 +48,6 @@
                 <enabled>true</enabled>
             </snapshots>            
         </repository>
-
-<!--
-        <repository>
-            <id>collectionspace-releases</id>
-            <name>collectionspace-releases</name>
-            <url>http://source.collectionspace.org:8081/artifactory/nuxeo-public</url>            
-            <releases>
-                <enabled>true</enabled>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>            
-        </repository>
-        <repository>
-            <id>nuxeo-public-snapshot</id>
-            <name>nuxeo-public-snapshot</name>
-            <url>http://source.collectionspace.org:8081/artifactory/nuxeo-public-snapshot</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-                <enabled>true</enabled>
-            </snapshots>
-        </repository>
--->        
     </repositories>    
     
     <build>

diff --git a/services/common/pom.xml b/services/common/pom.xml
index b5a3f6ee400c6f6bfbbb414af9f559e6d802f378..c306b51ba73978629f6b41b0e37c869b1cc93934 100644 (file)
--- a/services/common/pom.xml
+++ b/services/common/pom.xml
@@ -14,6 +14,11 @@
 \r
     <dependencies>\r
         <!-- CollectionSpace dependencies -->\r
+        <dependency>\r
+            <groupId>org.collectionspace.services</groupId>\r
+            <artifactId>org.collectionspace.services.jaxb</artifactId>\r
+            <version>${project.version}</version>\r
+        </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.authentication.jaxb</artifactId>\r
@@ -77,7 +82,7 @@
             <groupId>javax.persistence</groupId>\r
             <artifactId>persistence-api</artifactId>\r
         </dependency>\r
-\r
+        \r
         <dependency>\r
             <groupId>com.sun.xml.bind</groupId>\r
             <artifactId>jaxb-impl</artifactId>\r
@@ -225,33 +230,22 @@
                         </goals>\r
                     </execution>\r
                 </executions>\r
-\r
                 <configuration>\r
                     <args>\r
                         <arg>-XtoString</arg>\r
                         <arg>-Xinject-listener-code</arg>\r
-\r
                         <!-- <arg>-Xcollection-setter-injector</arg>\r
                                 <arg>-Xfluent-api</arg> -->\r
                     </args>\r
                     <plugins>\r
                         <plugin>\r
-                            <groupId>\r
-                                org.jvnet.jaxb2_commons\r
-                            </groupId>\r
+                            <groupId>org.jvnet.jaxb2_commons</groupId>\r
                             <artifactId>basic</artifactId>\r
-                            <version>0.4.1</version>\r
                         </plugin>\r
                         <plugin>\r
-                            <groupId>\r
-                                org.jvnet.jaxb2-commons\r
-                            </groupId>\r
-                            <artifactId>\r
-                                property-listener-injector\r
-                            </artifactId>\r
-                            <version>1.0</version>\r
+                            <groupId>org.jvnet.jaxb2-commons</groupId>\r
+                            <artifactId>property-listener-injector</artifactId>\r
                         </plugin>\r
-\r
                     </plugins>\r
                     <!--generatePackage>\r
                      org.collectionspace.hello\r

diff --git a/services/contact/jaxb/pom.xml b/services/contact/jaxb/pom.xml
index a93fc9d7bd55263c2e769ef8ae4fab19e8f1390b..20534406d0d9e576e29b9ff77e222270d83bafcc 100644 (file)
--- a/services/contact/jaxb/pom.xml
+++ b/services/contact/jaxb/pom.xml
@@ -68,9 +68,7 @@
                     </args>
                     <plugins>
                         <plugin>
-                            <groupId>
-                           org.jvnet.jaxb2_commons
-                            </groupId>
+                            <groupId>org.jvnet.jaxb2_commons</groupId>
                             <artifactId>basic</artifactId>
                             <version>0.4.1</version>
                         </plugin>

diff --git a/services/dimension/client/src/main/java/org/collectionspace/services/client/DimensionClient.java b/services/dimension/client/src/main/java/org/collectionspace/services/client/DimensionClient.java
index fd31a2d0d35550493e9e756131cb306c78bba300..3ea07ac21b859324302e1ec8826f0731905370f2 100644 (file)
--- a/services/dimension/client/src/main/java/org/collectionspace/services/client/DimensionClient.java
+++ b/services/dimension/client/src/main/java/org/collectionspace/services/client/DimensionClient.java
@@ -28,7 +28,7 @@ package org.collectionspace.services.client;
 
 import javax.ws.rs.core.Response;
 
-import org.collectionspace.services.common.context.ServiceContext;
+//import org.collectionspace.services.common.context.ServiceContext;
 import org.collectionspace.services.dimension.DimensionsCommonList;
 
 import org.jboss.resteasy.client.ProxyFactory;

diff --git a/services/dimension/service/pom.xml b/services/dimension/service/pom.xml
index 91fa782600e2d6f6da89b0a77d00c29181bd6ca2..99d21dbbc21347d8fd16f7f6414c77ff7c54a1ca 100644 (file)
--- a/services/dimension/service/pom.xml
+++ b/services/dimension/service/pom.xml
@@ -82,6 +82,7 @@
         <dependency>\r
             <groupId>org.nuxeo.ecm.core</groupId>\r
             <artifactId>nuxeo-core-api</artifactId>\r
+            <version>1.5.1-SNAPSHOT</version>\r
             <exclusions>\r
                 <exclusion>\r
                     <artifactId>jboss-remoting</artifactId>\r

diff --git a/services/intake/client/pom.xml b/services/intake/client/pom.xml
index e54ea185f3fdee3e1bddf3857ee7012c32072670..26b89598e86557dc9e529d1298e58db5cdaabb2a 100644 (file)
--- a/services/intake/client/pom.xml
+++ b/services/intake/client/pom.xml
@@ -25,7 +25,12 @@
             <artifactId>slf4j-log4j12</artifactId>\r
             <scope>test</scope>\r
         </dependency>\r
-<!-- CollectionSpace dependencies -->        \r
+<!-- CollectionSpace dependencies -->\r
+        <dependency>\r
+            <groupId>org.collectionspace.services</groupId>\r
+            <artifactId>org.collectionspace.services.jaxb</artifactId>\r
+            <version>${project.version}</version>\r
+        </dependency>        \r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.intake.jaxb</artifactId>\r

diff --git a/services/intake/client/src/main/java/org/collectionspace/services/client/IntakeClient.java b/services/intake/client/src/main/java/org/collectionspace/services/client/IntakeClient.java
index 1ede8b3eb8ab26160083b486364ccee2b4248932..6c5adba64cb74a63880901c6214f0a80e3642726 100644 (file)
--- a/services/intake/client/src/main/java/org/collectionspace/services/client/IntakeClient.java
+++ b/services/intake/client/src/main/java/org/collectionspace/services/client/IntakeClient.java
@@ -30,7 +30,7 @@ import javax.ws.rs.PathParam;
 import javax.ws.rs.core.Response;
 
 import org.collectionspace.services.common.authorityref.AuthorityRefList;
-import org.collectionspace.services.common.context.ServiceContext;
+//import org.collectionspace.services.common.context.ServiceContext;
 import org.collectionspace.services.intake.IntakesCommonList;
 
 import org.jboss.resteasy.client.ProxyFactory;

diff --git a/services/intake/service/pom.xml b/services/intake/service/pom.xml
index 042909d27d878052a6787dfe021f66bbf9e9dc0b..e87bf35f4ac859b85e6a834e67dcc53cbd91d0f8 100644 (file)
--- a/services/intake/service/pom.xml
+++ b/services/intake/service/pom.xml
@@ -87,6 +87,7 @@
         <dependency>\r
             <groupId>org.nuxeo.ecm.core</groupId>\r
             <artifactId>nuxeo-core-api</artifactId>\r
+            <version>1.5.1-SNAPSHOT</version>\r
             <exclusions>\r
                 <exclusion>\r
                     <artifactId>jboss-remoting</artifactId>\r

diff --git a/services/jaxb/.classpath b/services/jaxb/.classpath
new file mode 100644 (file)
index 0000000..bd6bf38
--- /dev/null
+++ b/services/jaxb/.classpath
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<classpath>\r
+       <classpathentry kind="src" output="target/classes" path="src/main/java"/>\r
+       <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>\r
+       <classpathentry kind="src" output="target/test-classes" path="src/test/java"/>\r
+       <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>\r
+       <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>\r
+       <classpathentry kind="output" path="target/classes"/>\r
+</classpath>\r

diff --git a/services/jaxb/.project b/services/jaxb/.project
new file mode 100644 (file)
index 0000000..a0fdd41
--- /dev/null
+++ b/services/jaxb/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<projectDescription>\r
+       <name>org.collectionspace.services.jaxb</name>\r
+       <comment></comment>\r
+       <projects>\r
+       </projects>\r
+       <buildSpec>\r
+               <buildCommand>\r
+                       <name>org.eclipse.jdt.core.javabuilder</name>\r
+                       <arguments>\r
+                       </arguments>\r
+               </buildCommand>\r
+               <buildCommand>\r
+                       <name>org.maven.ide.eclipse.maven2Builder</name>\r
+                       <arguments>\r
+                       </arguments>\r
+               </buildCommand>\r
+       </buildSpec>\r
+       <natures>\r
+               <nature>org.maven.ide.eclipse.maven2Nature</nature>\r
+               <nature>org.eclipse.jdt.core.javanature</nature>\r
+       </natures>\r
+</projectDescription>\r

diff --git a/services/jaxb/pom.xml b/services/jaxb/pom.xml
new file mode 100644 (file)
index 0000000..3eca304
--- /dev/null
+++ b/services/jaxb/pom.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+\r
+<!--\r
+ pom.xml\r
+ \r
+ A Maven 2 project file for the 'jaxb' module of the ID Service project.\r
+\r
+ This document is a part of the source code and related artifacts\r
+ for CollectionSpace, an open source collections management system\r
+ for museums and related institutions:\r
+ \r
+ http://www.collectionspace.org\r
+ http://wiki.collectionspace.org\r
+ \r
+ Based on work by Sanjay Dalal and Richard Millet.\r
+\r
+ $LastChangedBy: aron $\r
+ $LastChangedRevision: 302 $\r
+ $LastChangedDate: 2009-06-29 15:36:29 -0700 (Mon, 29 Jun 2009) $\r
+-->\r
+\r
+<project xmlns="http://maven.apache.org/POM/4.0.0"\r
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
+\r
+  <parent>\r
+    <groupId>org.collectionspace.services</groupId>\r
+    <artifactId>org.collectionspace.services.main</artifactId>\r
+    <version>0.6-SNAPSHOT</version>\r
+  </parent>\r
+  \r
+  <modelVersion>4.0.0</modelVersion>\r
+  <groupId>org.collectionspace.services</groupId>\r
+  <artifactId>org.collectionspace.services.jaxb</artifactId>\r
+  <name>services.common.jaxb</name>\r
+  \r
+  <dependencies>  \r
+    <dependency>\r
+      <groupId>com.sun.xml.bind</groupId>\r
+      <artifactId>jaxb-impl</artifactId>\r
+      <version>2.0.2</version>\r
+    </dependency>\r
+    \r
+    <dependency>\r
+      <groupId>org.jvnet.jaxb2-commons</groupId>\r
+      <artifactId>property-listener-injector</artifactId>\r
+      <version>1.0</version>\r
+    </dependency>\r
+    \r
+    <dependency>\r
+      <groupId>org.jvnet.jaxb2_commons</groupId>\r
+      <artifactId>runtime</artifactId>\r
+      <version>0.4.1.4</version>\r
+    </dependency>\r
+    \r
+  </dependencies>\r
+  \r
+  <build>\r
+    <finalName>collectionspace-services-id-jaxb</finalName>\r
+    <defaultGoal>install</defaultGoal>\r
+    <plugins>\r
+    \r
+      <plugin>\r
+        <groupId>org.jvnet.jaxb2.maven2</groupId>\r
+        <artifactId>maven-jaxb2-plugin</artifactId>\r
+        <executions>\r
+          <execution>\r
+            <goals>\r
+              <goal>generate</goal>\r
+            </goals>\r
+          </execution>\r
+        </executions>\r
+        <dependencies>\r
+         <!-- javax.activation.DataSource provider is required by spec -->\r
+          <dependency>\r
+            <groupId>javax.activation</groupId>\r
+            <artifactId>activation</artifactId>\r
+            <version>1.1</version>\r
+          </dependency>\r
+          <dependency>\r
+            <groupId>com.sun.xml.bind</groupId>\r
+            <artifactId>jaxb-impl</artifactId>\r
+            <version>2.1.9</version>\r
+          </dependency>\r
+        </dependencies>\r
+        <configuration>\r
+          <args>\r
+            <arg>-XtoString</arg>\r
+            <arg>-Xinject-listener-code</arg>\r
+\r
+           <!-- <arg>-Xcollection-setter-injector</arg>\r
+                <arg>-Xfluent-api</arg> -->\r
+          </args>\r
+          <plugins>\r
+            <plugin>\r
+              <groupId>\r
+               org.jvnet.jaxb2_commons\r
+              </groupId>\r
+              <artifactId>basic</artifactId>\r
+              <version>0.4.1</version>\r
+            </plugin>\r
+            <plugin>\r
+              <groupId>\r
+               org.jvnet.jaxb2-commons\r
+              </groupId>\r
+              <artifactId>\r
+               property-listener-injector\r
+              </artifactId>\r
+              <version>1.0</version>\r
+            </plugin>\r
+          </plugins>\r
+        </configuration>\r
+      </plugin>\r
+      \r
+      <plugin>\r
+        <artifactId>maven-compiler-plugin</artifactId>\r
+        <version>2.0.2</version>\r
+        <configuration>\r
+          <source>1.6</source>\r
+          <target>1.6</target>\r
+        </configuration>\r
+      </plugin>\r
+\r
+    </plugins>\r
+  </build>\r
+\r
+</project>\r
+\r

diff --git a/services/common/src/main/resources/authorityref.xsd b/services/jaxb/src/main/resources/authorityref.xsd
similarity index 100%
rename from services/common/src/main/resources/authorityref.xsd
rename to services/jaxb/src/main/resources/authorityref.xsd

diff --git a/services/common/src/main/resources/relations_common.xsd b/services/jaxb/src/main/resources/relations_common.xsd
similarity index 100%
rename from services/common/src/main/resources/relations_common.xsd
rename to services/jaxb/src/main/resources/relations_common.xsd

diff --git a/services/pom.xml b/services/pom.xml
index cba498b3ca3560ab10af7e46dd97281a73522735..9ef82fb6771462e4d1f540521e806c0ec2f6782a 100644 (file)
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -13,6 +13,7 @@
     <packaging>pom</packaging>
 
     <modules>
+        <module>jaxb</module>
         <module>authentication</module>
         <module>common</module>
         <module>client</module>
@@ -190,11 +191,16 @@
                 <groupId>org.jboss.resteasy</groupId>
                 <artifactId>jaxrs-api</artifactId>
                 <version>1.1.GA</version>
+            </dependency>            
+            <dependency>
+                <groupId>org.jvnet.jaxb2_commons</groupId>
+                <artifactId>basic</artifactId>
+                <version>0.4.1</version>
             </dependency>
             <dependency>
                 <groupId>net.java.dev.jaxb2-commons</groupId>
                 <artifactId>jaxb-fluent-api</artifactId>
-                <version>2.0.1</version>
+                <version>2.0.2</version>
             </dependency>
             <dependency>
                 <groupId>org.jvnet.jaxb2-commons</groupId>
@@ -204,8 +210,9 @@
             <dependency>
                 <groupId>org.jvnet.jaxb2_commons</groupId>
                 <artifactId>runtime</artifactId>
-                <version>0.4.1</version>
+                <version>0.4.1.4</version>
             </dependency>
+            
             <dependency>
                 <groupId>org.jboss.resteasy</groupId>
                 <artifactId>resteasy-jaxrs</artifactId>

diff --git a/services/relation/client/pom.xml b/services/relation/client/pom.xml
index 34bca716a1fc9f678fa6b39cec45ef5356a68b6a..06c21611b61aa38abfca083f087ce625ed2e088a 100644 (file)
--- a/services/relation/client/pom.xml
+++ b/services/relation/client/pom.xml
@@ -25,16 +25,12 @@
             <artifactId>slf4j-log4j12</artifactId>\r
             <scope>test</scope>\r
         </dependency>\r
-        <!-- <dependency>\r
-            <groupId>org.collectionspace.services</groupId>\r
-            <artifactId>org.collectionspace.services.relation.jaxb</artifactId>\r
-            <version>1.0</version>\r
-            </dependency> -->\r
+        <!-- CollectionSpace dependencies -->\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
-            <artifactId>org.collectionspace.services.common</artifactId>\r
+            <artifactId>org.collectionspace.services.jaxb</artifactId>\r
             <version>${project.version}</version>\r
-        </dependency>\r
+        </dependency>        \r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
             <artifactId>org.collectionspace.services.client</artifactId>\r

diff --git a/services/relation/client/src/main/java/org/collectionspace/services/client/RelationClient.java b/services/relation/client/src/main/java/org/collectionspace/services/client/RelationClient.java
index 5bed9b5db936e5c6891f1eedd7690210ebab5bba..9bbc015be4054c13816af8fc60ab3d7a521812b4 100644 (file)
--- a/services/relation/client/src/main/java/org/collectionspace/services/client/RelationClient.java
+++ b/services/relation/client/src/main/java/org/collectionspace/services/client/RelationClient.java
@@ -2,7 +2,7 @@ package org.collectionspace.services.client;
 
 import javax.ws.rs.core.Response;
 
-import org.collectionspace.services.common.context.ServiceContext;
+//import org.collectionspace.services.common.context.ServiceContext;
 import org.collectionspace.services.relation.RelationsCommonList;
 
 import org.jboss.resteasy.client.ProxyFactory;