From 4bf4d1d6c24e3b50f52573fd65e0136bbeb6bcb4 Mon Sep 17 00:00:00 2001
From: Richard Millet <richard.millet@berkeley.edu>
Date: Mon, 15 Mar 2010 23:31:25 +0000
Subject: [PATCH] CSPACE-1214: Removed Maven transitive dependency of Nuxeo
 artifacts from code that uses our Java clients to access our services.

---
 3rdparty/nuxeo/pom.xml                        |  41 +++---
 3rdparty/pom.xml                              |  46 -------
 pom.xml                                       |   8 +-
 services/acquisition/client/pom.xml           |   7 +-
 .../services/client/AcquisitionClient.java    |   2 +-
 services/client/pom.xml                       |  12 +-
 .../client/AbstractServiceClientImpl.java     |  13 +-
 services/collectionobject/client/pom.xml      |  11 ++
 .../client/CollectionObjectClient.java        |   4 +-
 services/collectionobject/jaxb/pom.xml        |   4 +-
 .../collectionobject/sample/sample/pom.xml    |  28 +---
 services/common/pom.xml                       |  24 ++--
 services/contact/jaxb/pom.xml                 |   4 +-
 .../services/client/DimensionClient.java      |   2 +-
 services/dimension/service/pom.xml            |   1 +
 services/intake/client/pom.xml                |   7 +-
 .../services/client/IntakeClient.java         |   2 +-
 services/intake/service/pom.xml               |   1 +
 services/jaxb/.classpath                      |   9 ++
 services/jaxb/.project                        |  23 ++++
 services/jaxb/pom.xml                         | 128 ++++++++++++++++++
 .../src/main/resources/authorityref.xsd       |   0
 .../src/main/resources/relations_common.xsd   |   0
 services/pom.xml                              |  11 +-
 services/relation/client/pom.xml              |  10 +-
 .../services/client/RelationClient.java       |   2 +-
 26 files changed, 258 insertions(+), 142 deletions(-)
 create mode 100644 services/jaxb/.classpath
 create mode 100644 services/jaxb/.project
 create mode 100644 services/jaxb/pom.xml
 rename services/{common => jaxb}/src/main/resources/authorityref.xsd (100%)
 rename services/{common => jaxb}/src/main/resources/relations_common.xsd (100%)

diff --git a/3rdparty/nuxeo/pom.xml b/3rdparty/nuxeo/pom.xml
index 49da988d6..d835c08bc 100644
--- a/3rdparty/nuxeo/pom.xml
+++ b/3rdparty/nuxeo/pom.xml
@@ -17,57 +17,66 @@
         <module>nuxeo-platform-collectionspace</module>
     </modules>
 
-    <dependencies>       
+    <dependencies>
         <dependency>
             <groupId>org.osgi</groupId>
             <artifactId>org.osgi.core</artifactId>
             <version>4.1.0</version>
-        </dependency>        
+        </dependency>
         <!-- jboss -->
         <dependency>
             <groupId>jboss</groupId>
             <artifactId>jboss-remoting</artifactId>
             <version>2.2.2.SP8</version>
             <scope>provided</scope>
-        </dependency>        
+        </dependency>
         <!-- Nuxeo -->
+        <!-- Nuxeo Dependencies with versions
         <dependency>
             <groupId>org.nuxeo.common</groupId>
-            <artifactId>nuxeo-common</artifactId>            
-            <scope>provided</scope>
+            <artifactId>nuxeo-common</artifactId>
+            <version>1.5.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.nuxeo.runtime</groupId>
-            <artifactId>nuxeo-runtime</artifactId>            
+            <artifactId>nuxeo-runtime</artifactId>
+            <version>1.5.1-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>org.nuxeo.ecm.core</groupId>
-            <artifactId>nuxeo-core-api</artifactId>            
+            <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-client</artifactId>            
+            <artifactId>nuxeo-core-api</artifactId>
+            <version>1.5.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.nuxeo.ecm.core</groupId>
-            <artifactId>nuxeo-core-query</artifactId>            
+            <artifactId>nuxeo-core-client</artifactId>
+            <version>1.5.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.nuxeo.ecm.core</groupId>
-            <artifactId>nuxeo-core-schema</artifactId>            
+            <artifactId>nuxeo-core-query</artifactId>
+            <version>1.5.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.nuxeo.ecm.core</groupId>
-            <artifactId>nuxeo-core-io</artifactId>            
+            <artifactId>nuxeo-core-schema</artifactId>
+            <version>1.5.1-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>org.nuxeo.ecm.core</groupId>
-            <artifactId>nuxeo-core-facade</artifactId>            
+            <artifactId>nuxeo-core-io</artifactId>
+            <version>1.5.1-SNAPSHOT</version>
         </dependency>
         <dependency>
-            <groupId>org.nuxeo.runtime</groupId>
-            <artifactId>nuxeo-runtime-osgi</artifactId>            
-        </dependency>
+            <groupId>org.nuxeo.ecm.core</groupId>
+            <artifactId>nuxeo-core-facade</artifactId>
+            <version>1.5.1-SNAPSHOT</version>
+        </dependency> -->
     </dependencies>
 
 </project>
diff --git a/3rdparty/pom.xml b/3rdparty/pom.xml
index 50daba518..f0c1b9c51 100644
--- 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 63a6bc586..31da48cb2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -218,8 +218,8 @@
                     <groupId>org.apache.maven.plugins</groupId>
                     <artifactId>maven-compiler-plugin</artifactId>
                     <configuration>
-                        <source>1.5</source>
-                        <target>1.5</target>
+                        <source>1.6</source>
+                        <target>1.6</target>
                     </configuration>
                 </plugin>
                 <plugin>
@@ -282,7 +282,7 @@
                 <version>5.1.5</version>
                 <scope>test</scope>
             </dependency>
-            <!-- Nuxeo Dependencies with versions -->
+            <!-- Nuxeo Dependencies with versions 
             <dependency>
                 <groupId>org.nuxeo.common</groupId>
                 <artifactId>nuxeo-common</artifactId>
@@ -327,7 +327,7 @@
                 <groupId>org.nuxeo.ecm.core</groupId>
                 <artifactId>nuxeo-core-facade</artifactId>
                 <version>1.5.1-SNAPSHOT</version>
-            </dependency>
+            </dependency> -->
         </dependencies>
     </dependencyManagement>
 
diff --git a/services/acquisition/client/pom.xml b/services/acquisition/client/pom.xml
index ab957e1d1..33a681a64 100644
--- a/services/acquisition/client/pom.xml
+++ b/services/acquisition/client/pom.xml
@@ -27,6 +27,11 @@
             <scope>test</scope>
         </dependency>
         <!-- CollectionSpace Dependencies -->
+        <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.acquisition.jaxb</artifactId>
@@ -42,7 +47,7 @@
             <artifactId>org.collectionspace.services.person.client</artifactId>
             <version>${project.version}</version>
         </dependency>
-
+        <!-- External dependencies -->
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
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 2051c24e1..5052a18db 100644
--- 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 6c924319a..c8490bb03 100644
--- a/services/client/pom.xml
+++ b/services/client/pom.xml
@@ -22,11 +22,12 @@
             <artifactId>slf4j-log4j12</artifactId>
         </dependency>
 <!-- CollectionSpace dependencies -->
-        <dependency>
+<!--        <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.common</artifactId>
             <version>${project.version}</version>
-        </dependency>
+            <optional>true</optional>
+        </dependency> -->
 <!-- External dependencies -->        
         <dependency>
             <groupId>org.apache.maven.plugins</groupId>
@@ -73,17 +74,12 @@
             <version>1.0.01</version>
             <scope>provided</scope>
         </dependency>
-
         <dependency>
             <groupId>dom4j</groupId>
             <artifactId>dom4j</artifactId>
             <version>1.6.1</version>
             <scope>provided</scope>
-        </dependency>
-
-        <!-- jboss -->
-
-        <!-- nuxeo -->
+        </dependency>        
     </dependencies>
 
     <build>
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 12dc78a45..4425081cd 100644
--- 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;
 import org.apache.commons.httpclient.UsernamePasswordCredentials;
 import org.apache.commons.httpclient.auth.AuthScope;
-import org.collectionspace.services.common.context.ServiceContext;
+//import org.collectionspace.services.common.context.ServiceContext;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -39,6 +39,13 @@ import org.slf4j.LoggerFactory;
 public abstract class AbstractServiceClientImpl implements CollectionSpaceClient {
 
     protected final Logger logger = LoggerFactory.getLogger(AbstractServiceClientImpl.class);
+    
+    /**
+     * The character used to separate the words in a part label
+     */
+    public static final String PART_LABEL_SEPERATOR = "_";
+    public static final String PART_COMMON_LABEL = "common";
+    
     private Properties properties = new Properties();
     private URL url;
     private HttpClient httpClient;
@@ -49,8 +56,8 @@ public abstract class AbstractServiceClientImpl implements CollectionSpaceClient
 
 	public String getCommonPartName(String servicePathComponent) {
 		return servicePathComponent
-		+ ServiceContext.PART_LABEL_SEPERATOR
-		+ ServiceContext.PART_COMMON_LABEL;
+		+ PART_LABEL_SEPERATOR
+		+ PART_COMMON_LABEL;
 	}
 
 	abstract public String getServicePathComponent();
diff --git a/services/collectionobject/client/pom.xml b/services/collectionobject/client/pom.xml
index 412c071ee..66d969a54 100644
--- a/services/collectionobject/client/pom.xml
+++ b/services/collectionobject/client/pom.xml
@@ -26,6 +26,17 @@
             <scope>test</scope>
         </dependency>
         <!-- CollectionSpace dependencies -->
+        <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.common</artifactId>
+            <optional>true</optional>
+            <version>${project.version}</version>
+        </dependency>        
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.client</artifactId>
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 1f1e02019..bb2b7a17c 100644
--- 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 017da7bc7..0d68379c9 100644
--- 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 ce28d5478..56134bedc 100644
--- 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 b5a3f6ee4..c306b51ba 100644
--- a/services/common/pom.xml
+++ b/services/common/pom.xml
@@ -14,6 +14,11 @@
 
     <dependencies>
         <!-- CollectionSpace dependencies -->
+        <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.authentication.jaxb</artifactId>
@@ -77,7 +82,7 @@
             <groupId>javax.persistence</groupId>
             <artifactId>persistence-api</artifactId>
         </dependency>
-
+        
         <dependency>
             <groupId>com.sun.xml.bind</groupId>
             <artifactId>jaxb-impl</artifactId>
@@ -225,33 +230,22 @@
                         </goals>
                     </execution>
                 </executions>
-
                 <configuration>
                     <args>
                         <arg>-XtoString</arg>
                         <arg>-Xinject-listener-code</arg>
-
                         <!-- <arg>-Xcollection-setter-injector</arg>
                                 <arg>-Xfluent-api</arg> -->
                     </args>
                     <plugins>
                         <plugin>
-                            <groupId>
-                                org.jvnet.jaxb2_commons
-                            </groupId>
+                            <groupId>org.jvnet.jaxb2_commons</groupId>
                             <artifactId>basic</artifactId>
-                            <version>0.4.1</version>
                         </plugin>
                         <plugin>
-                            <groupId>
-                                org.jvnet.jaxb2-commons
-                            </groupId>
-                            <artifactId>
-                                property-listener-injector
-                            </artifactId>
-                            <version>1.0</version>
+                            <groupId>org.jvnet.jaxb2-commons</groupId>
+                            <artifactId>property-listener-injector</artifactId>
                         </plugin>
-
                     </plugins>
                     <!--generatePackage>
                      org.collectionspace.hello
diff --git a/services/contact/jaxb/pom.xml b/services/contact/jaxb/pom.xml
index a93fc9d7b..20534406d 100644
--- 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 fd31a2d0d..3ea07ac21 100644
--- 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 91fa78260..99d21dbbc 100644
--- a/services/dimension/service/pom.xml
+++ b/services/dimension/service/pom.xml
@@ -82,6 +82,7 @@
         <dependency>
             <groupId>org.nuxeo.ecm.core</groupId>
             <artifactId>nuxeo-core-api</artifactId>
+            <version>1.5.1-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <artifactId>jboss-remoting</artifactId>
diff --git a/services/intake/client/pom.xml b/services/intake/client/pom.xml
index e54ea185f..26b89598e 100644
--- a/services/intake/client/pom.xml
+++ b/services/intake/client/pom.xml
@@ -25,7 +25,12 @@
             <artifactId>slf4j-log4j12</artifactId>
             <scope>test</scope>
         </dependency>
-<!-- CollectionSpace dependencies -->        
+<!-- CollectionSpace dependencies -->
+        <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.intake.jaxb</artifactId>
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 1ede8b3eb..6c5adba64 100644
--- 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 042909d27..e87bf35f4 100644
--- a/services/intake/service/pom.xml
+++ b/services/intake/service/pom.xml
@@ -87,6 +87,7 @@
         <dependency>
             <groupId>org.nuxeo.ecm.core</groupId>
             <artifactId>nuxeo-core-api</artifactId>
+            <version>1.5.1-SNAPSHOT</version>
             <exclusions>
                 <exclusion>
                     <artifactId>jboss-remoting</artifactId>
diff --git a/services/jaxb/.classpath b/services/jaxb/.classpath
new file mode 100644
index 000000000..bd6bf38eb
--- /dev/null
+++ b/services/jaxb/.classpath
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" output="target/classes" path="src/main/java"/>
+	<classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/>
+	<classpathentry kind="src" output="target/test-classes" path="src/test/java"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>
diff --git a/services/jaxb/.project b/services/jaxb/.project
new file mode 100644
index 000000000..a0fdd4162
--- /dev/null
+++ b/services/jaxb/.project
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>org.collectionspace.services.jaxb</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>
diff --git a/services/jaxb/pom.xml b/services/jaxb/pom.xml
new file mode 100644
index 000000000..3eca304b4
--- /dev/null
+++ b/services/jaxb/pom.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+ pom.xml
+ 
+ A Maven 2 project file for the 'jaxb' module of the ID Service project.
+
+ This document is a part of the source code and related artifacts
+ for CollectionSpace, an open source collections management system
+ for museums and related institutions:
+ 
+ http://www.collectionspace.org
+ http://wiki.collectionspace.org
+ 
+ Based on work by Sanjay Dalal and Richard Millet.
+
+ $LastChangedBy: aron $
+ $LastChangedRevision: 302 $
+ $LastChangedDate: 2009-06-29 15:36:29 -0700 (Mon, 29 Jun 2009) $
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+  <parent>
+    <groupId>org.collectionspace.services</groupId>
+    <artifactId>org.collectionspace.services.main</artifactId>
+    <version>0.6-SNAPSHOT</version>
+  </parent>
+  
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.collectionspace.services</groupId>
+  <artifactId>org.collectionspace.services.jaxb</artifactId>
+  <name>services.common.jaxb</name>
+  
+  <dependencies>  
+    <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-id-jaxb</finalName>
+    <defaultGoal>install</defaultGoal>
+    <plugins>
+    
+      <plugin>
+        <groupId>org.jvnet.jaxb2.maven2</groupId>
+        <artifactId>maven-jaxb2-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>generate</goal>
+            </goals>
+          </execution>
+        </executions>
+        <dependencies>
+         <!-- javax.activation.DataSource provider is required by spec -->
+          <dependency>
+            <groupId>javax.activation</groupId>
+            <artifactId>activation</artifactId>
+            <version>1.1</version>
+          </dependency>
+          <dependency>
+            <groupId>com.sun.xml.bind</groupId>
+            <artifactId>jaxb-impl</artifactId>
+            <version>2.1.9</version>
+          </dependency>
+        </dependencies>
+        <configuration>
+          <args>
+            <arg>-XtoString</arg>
+            <arg>-Xinject-listener-code</arg>
+
+           <!-- <arg>-Xcollection-setter-injector</arg>
+                <arg>-Xfluent-api</arg> -->
+          </args>
+          <plugins>
+            <plugin>
+              <groupId>
+               org.jvnet.jaxb2_commons
+              </groupId>
+              <artifactId>basic</artifactId>
+              <version>0.4.1</version>
+            </plugin>
+            <plugin>
+              <groupId>
+               org.jvnet.jaxb2-commons
+              </groupId>
+              <artifactId>
+               property-listener-injector
+              </artifactId>
+              <version>1.0</version>
+            </plugin>
+          </plugins>
+        </configuration>
+      </plugin>
+      
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <version>2.0.2</version>
+        <configuration>
+          <source>1.6</source>
+          <target>1.6</target>
+        </configuration>
+      </plugin>
+
+    </plugins>
+  </build>
+
+</project>
+
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 cba498b3c..9ef82fb67 100644
--- 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 34bca716a..06c21611b 100644
--- a/services/relation/client/pom.xml
+++ b/services/relation/client/pom.xml
@@ -25,16 +25,12 @@
             <artifactId>slf4j-log4j12</artifactId>
             <scope>test</scope>
         </dependency>
-        <!-- <dependency>
-            <groupId>org.collectionspace.services</groupId>
-            <artifactId>org.collectionspace.services.relation.jaxb</artifactId>
-            <version>1.0</version>
-            </dependency> -->
+        <!-- CollectionSpace dependencies -->
         <dependency>
             <groupId>org.collectionspace.services</groupId>
-            <artifactId>org.collectionspace.services.common</artifactId>
+            <artifactId>org.collectionspace.services.jaxb</artifactId>
             <version>${project.version}</version>
-        </dependency>
+        </dependency>        
         <dependency>
             <groupId>org.collectionspace.services</groupId>
             <artifactId>org.collectionspace.services.client</artifactId>
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 5bed9b5db..9bbc015be 100644
--- 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;
-- 
2.47.3