From: Sanjay Dalal <sanjay.dalal@berkeley.edu>
Date: Wed, 6 May 2009 16:14:57 +0000 (+0000)
Subject: cspace-84 created parent child relationships between several projects, repository... 
X-Git-Url: https://git.aero2k.de/?a=commitdiff_plain;h=3ddb2ab97fdab8dccca2096a895bd9aa54343e64;p=tmp%2Fjakarta-migration.git

cspace-84 created parent child relationships between several projects, repository info. is only in parent projects, added top-level project to build all children projects at a service level, fixed dependencies between the projects, clean package commands now work recursively from top level service trunk
---

diff --git a/JaxRsServiceProvider/pom.xml b/JaxRsServiceProvider/pom.xml
index c9a855ed4..e59c41b15 100644
--- a/JaxRsServiceProvider/pom.xml
+++ b/JaxRsServiceProvider/pom.xml
@@ -1,103 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>
-        <artifactId>helloworld</artifactId>
-        <groupId>org.collectionspace.hello.services</groupId>
-        <version>0.1</version>
-        </parent>
-    -->
+    <parent>
+        <artifactId>org.collectionspace.services</artifactId>
+        <groupId>org.collectionspace.services</groupId>
+        <version>1.0</version>
+    </parent>
+
     
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.collectionspace.services</groupId>
-    <artifactId>CollectionSpace-JAXRS-ServiceProvider</artifactId>
+    <artifactId>org.collectionspace.services.jaxrs.provider</artifactId>
     <packaging>war</packaging>
-    <version>0.2</version>
-    <name>CollectionSpace JAX-RS Service Provider</name>
-    
-    <repositories>
-        <repository>
-            <id>java.net</id>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </repository>
-        <repository>
-            <id>maven repo</id>
-            <name>maven repo</name>
-            <url>http://repo1.maven.org/maven2/</url>
-        </repository>
-        <!-- For resteasy -->
-        <repository>
-            <id>jboss</id>
-            <name>jboss repo</name>
-            <url>http://repository.jboss.org/maven2</url>
-        </repository>
-        <repository>
-            <id>mojo</id>
-            <name>mojo repo</name>
-            <url>http://svn.codehaus.org/mojo/trunk/mojo/jboss-maven-plugin</url>
-        </repository>
-        
-        <repository>
-            <id>maven-restlet</id>
-            <name>Public online Restlet repository</name>
-            <url>http://maven.restlet.org</url>
-        </repository>
-        
-        <repository>
-            <id>cspace.local.nuxeo</id>
-            <url>${nuxeo.local.repo.dir}</url>
-        </repository>
-        <repository>
-            <id>cspace.local.nuxeo.client</id>
-            <url>${nuxeo.local.repo.client.dir}</url>
-        </repository>
-        <repository>
-            <id>public</id>
-            <url>http://maven.nuxeo.org/public</url>
-            <releases>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>public-snapshot</id>
-            <url>http://maven.nuxeo.org/public-snapshot</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-            </snapshots>
-        </repository>
-        
-        
-    </repositories>
-    
-    <pluginRepositories>
-        <pluginRepository>
-            <id>public</id>
-            <url>http://maven.nuxeo.org/public</url>
-            <name>Nuxeo virtual release repository</name>
-            <releases>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-            <id>public-snapshot</id>
-            <url>http://maven.nuxeo.org/public-snapshot</url>
-            <name>Nuxeo virtual snapshot repository</name>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
-    
+    <version>1.0</version>
+    <name>services.jaxrs.provider</name>
     
     <properties>
         <jboss.version>4.2.3.GA</jboss.version>
@@ -113,18 +29,13 @@
     <dependencies>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
-            <artifactId>collectionobject-jaxb</artifactId>
-            <version>0.2</version>
+            <artifactId>org.collectionspace.services.common</artifactId>
+            <version>1.0</version>
         </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
-            <artifactId>org-collectionspace-services-common</artifactId>
-            <version>0.2</version>
-        </dependency>   
-        <dependency>
-            <groupId>org.collectionspace.services</groupId>
-            <artifactId>collectionobject-service</artifactId>
-            <version>0.2</version>
+            <artifactId>org.collectionspace.services.collectionobject.service</artifactId>
+            <version>1.0</version>
         </dependency>
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
@@ -156,68 +67,14 @@
         
         <!-- javax -->
         
-        <dependency>
-            <groupId>javax.security</groupId>
-            <artifactId>jaas</artifactId>
-            <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>
-            <groupId>org.nuxeo.ecm.core</groupId>
-            <artifactId>nuxeo-core-api</artifactId>
-            <version>${nuxeo.version.1.5}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>jboss-remoting</artifactId>
-                    <groupId>jboss</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        
-        <!--
-            <dependency>
-            <groupId>org.nuxeo.ecm.core</groupId>
-            <artifactId>nuxeo-core-client</artifactId>
-            <version>${nuxeo.version.1.5}</version>
-            </dependency>
-        -->
-        
-        <dependency>
-            <groupId>org.restlet</groupId>
-            <artifactId>org.restlet</artifactId>
-            <version>1.0.7</version>
-        </dependency>
-        <dependency>
-            <groupId>com.noelios.restlet</groupId>
-            <artifactId>com.noelios.restlet.ext.httpclient</artifactId>
-            <version>1.0.7</version>
-        </dependency>
-        <dependency>
-            <groupId>com.noelios.restlet</groupId>
-            <artifactId>com.noelios.restlet</artifactId>
-            <version>1.0.7</version>
-        </dependency>
-        <dependency>
-            <groupId>jaxen</groupId>
-            <artifactId>jaxen</artifactId>
-            <version>1.1.1</version>
-        </dependency>               
+
     </dependencies>
     
     <build>
-        <finalName>CollectionSpace</finalName>
+        <finalName>collectionspace-services-jaxrs-provider</finalName>
         <plugins>
             <plugin>
                 <groupId>org.codehaus.mojo</groupId>
@@ -233,7 +90,7 @@
                             <goal>undeploy</goal>
                         </goals>
                         <configuration>
-                            <fileName>${basedir}/target/CollectionSpace.war</fileName>
+                            <fileName>${basedir}/target/collectionspace-services.war</fileName>
                         </configuration>
                     </execution>
                     <execution>
@@ -247,24 +104,8 @@
                         </configuration>
                     </execution>
                 </executions>
-            </plugin>        
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration></configuration>
-                <executions>
-                    <execution>
-                        <id>surefire-it</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>test</goal>
-                        </goals>
-                        <configuration>
-                            <skip>false</skip>
-                        </configuration>
-                    </execution>
-                </executions>
             </plugin>
+
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-war-plugin</artifactId>
diff --git a/build.xml b/build.xml
index a742a9561..57b86fc57 100644
--- a/build.xml
+++ b/build.xml
@@ -1,10 +1,11 @@
 
-<project name="Services" default="dist" basedir=".">
+<project name="services" default="package" basedir=".">
     <description>
         collectionspace services
     </description>
   <!-- set global properties for this build -->
     <property file="build.properties" />
+    <property name="mvn.opts" value="" />
     <property name="src" location="src"/>
     <property name="build" location="build"/>
     <property name="dist"  location="dist"/>
@@ -63,7 +64,6 @@
 
     <!-- Create the distribution directory -->
         <mkdir dir="${dist}"/>
-
         <tar destfile="${dist}/${jboss.release}.${nuxeo.release}.tar.gz" compression="gzip">
             <tarfileset dir="${jboss.dir}"
               preserveLeadingSlashes="true">
@@ -79,12 +79,86 @@
         </tar>
     </target>
 
-    <target name="clean"
-        description="clean up" >
-    <!-- Delete the ${build} and ${dist} directory trees -->
-    <!-- Delete the ${build} and ${dist} directory trees -->
+    <target name="package" depends="setproperties,package-unix,package-windows"
+  description="Package CollectionSpace Services" />
+    <target name="package-unix" if="osfamily-unix">
+        <exec executable="mvn" failonerror="true">
+            <arg value="package" />
+            <arg value="-Dmaven.test.skip=true" />
+            <arg value="-f" />
+            <arg value="${basedir}/pom.xml" />
+            <arg value="-N" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+    <target name="package-windows" if="osfamily-windows">
+        <exec executable="cmd" failonerror="true">
+            <arg value="/c" />
+            <arg value="mvn.bat" />
+            <arg value="package" />
+            <arg value="-Dmaven.test.skip=true" />
+            <arg value="-f" />
+            <arg value="${basedir}/pom.xml" />
+            <arg value="-N" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+
+
+    <target name="clean" depends="clean-unix,clean-windows"
+  description="Delete target directories" >
         <delete dir="${build}"/>
         <delete dir="${dist}"/>
+    </target>
+    <target name="clean-unix" if="osfamily-unix">
+        <exec executable="mvn" failonerror="true">
+            <arg value="clean" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+    <target name="clean-windows" if="osfamily-windows">
+        <exec executable="cmd" failonerror="true">
+            <arg value="/c" />
+            <arg value="mvn.bat" />
+            <arg value="clean" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
 
+    <target name="test" depends="test-unix,test-windows" description="Run tests" />
+    <target name="test-unix" if="osfamily-unix">
+        <exec executable="mvn" failonerror="true">
+            <arg value="test" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+    <target name="test-windows" if="osfamily-windows">
+        <exec executable="cmd" failonerror="true">
+            <arg value="/c" />
+            <arg value="mvn.bat" />
+            <arg value="test" />
+            <arg value="${mvn.opts}" />
+        </exec>
     </target>
+
+
+    <target name="eclipse" depends="eclipse-unix,eclipse-windows" description="Generate Eclipse files" />
+    <target name="eclipse-unix" if="osfamily-unix">
+        <exec executable="mvn" failonerror="true">
+            <arg value="eclipse:clean" />
+            <arg value="eclipse:eclipse" />
+            <arg value="${mvn.opts}" />
+        </exec>
+        <exec executable="fixeclipse" failonerror="true" />
+    </target>
+    <target name="eclipse-windows" if="osfamily-windows">
+        <exec executable="cmd" failonerror="true">
+            <arg value="/c" />
+            <arg value="mvn.bat" />
+            <arg value="eclipse:clean" />
+            <arg value="eclipse:eclipse" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+
 </project>
diff --git a/nbproject/project.xml b/nbproject/project.xml
index add6b7840..174e90fb5 100644
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -24,7 +24,7 @@
             </folders>
             <ide-actions>
                 <action name="build">
-                    <target>compile</target>
+                    <target>package</target>
                 </action>
                 <action name="clean">
                     <target>clean</target>
@@ -34,7 +34,7 @@
                 </action>
                 <action name="rebuild">
                     <target>clean</target>
-                    <target>compile</target>
+                    <target>package</target>
                 </action>
             </ide-actions>
             <view>
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 000000000..d67c8610b
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.collectionspace.services</groupId>
+    <version>1.0</version>
+    <artifactId>org.collectionspace.services</artifactId>
+    <packaging>pom</packaging>
+    <name>org.collectionspace.services</name>
+
+    <modules>
+        <module>services</module>
+        <module>JaxRsServiceProvider</module>
+    </modules>
+    <repositories>
+        <repository>
+            <id>maven repo</id>
+            <name>maven repo</name>
+            <url>http://repo1.maven.org/maven2/</url>
+        </repository>
+        <repository>
+            <id>java.net</id>
+            <name>java.net Maven Repository</name>
+            <url>https://maven-repository.dev.java.net/nonav/repository</url>
+            <layout>legacy</layout>
+        </repository>
+        <repository>
+            <id>maven2-repository.dev.java.net</id>
+            <name>Java.net Maven 2 Repository</name>
+            <url>http://download.java.net/maven/2</url>
+        </repository>
+        <repository>
+            <id>sun</id>
+            <url>http://download.java.net/maven/2</url>
+        </repository>
+        <repository>
+            <id>jboss</id>
+            <url>http://repository.jboss.org/maven2</url>
+        </repository>
+        <repository>
+            <id>mojo</id>
+            <name>mojo repo</name>
+            <url>http://svn.codehaus.org/mojo/trunk/mojo/jboss-maven-plugin</url>
+        </repository>
+    </repositories>
+    <pluginRepositories>
+        <pluginRepository>
+            <id>java.net</id>
+            <name>java.net Maven Repository</name>
+            <url>https://maven-repository.dev.java.net/nonav/repository</url>
+            <layout>legacy</layout>
+        </pluginRepository>
+        <pluginRepository>
+            <id>maven2-repository.dev.java.net</id>
+            <name>Java.net Maven 2 Repository</name>
+            <url>http://download.java.net/maven/2</url>
+        </pluginRepository>
+    </pluginRepositories>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <configuration>
+                        <source>1.5</source>
+                        <target>1.5</target>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-site-plugin</artifactId>
+                    <configuration>
+                        <unzipCommand>/usr/bin/unzip -o &gt; err.txt</unzipCommand>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <version>2.0.1</version>
+                    <configuration>
+
+                        <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
+                        <archive>
+                            <manifest>
+                                <addClasspath>true</addClasspath>
+                            </manifest>
+                        </archive>
+                    </configuration>
+                </plugin>
+
+            </plugins>
+        </pluginManagement>
+    </build>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>net.java.dev.jaxb2-commons</groupId>
+                <artifactId>jaxb-fluent-api</artifactId>
+                <version>2.0.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.testng</groupId>
+                <artifactId>testng</artifactId>
+                <version>5.6</version>
+                <scope>test</scope>
+                <classifier>jdk15</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>1.5.2</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-log4j12</artifactId>
+                <version>1.5.2</version>
+            </dependency>
+            <dependency>
+                <groupId>mysql</groupId>
+                <artifactId>mysql-connector-java</artifactId>
+                <version>5.1.5</version>
+                <scope>test</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+</project>
diff --git a/sandbox/sanjay/prototypes/jaxrs-prototype/pom.xml b/sandbox/sanjay/prototypes/jaxrs-prototype/pom.xml
index 28508a146..7a6a1a7a7 100644
--- a/sandbox/sanjay/prototypes/jaxrs-prototype/pom.xml
+++ b/sandbox/sanjay/prototypes/jaxrs-prototype/pom.xml
@@ -13,6 +13,7 @@
         <module>jaxrs-client</module>
         <module>jaxrs-nuxeo-service</module>
         <module>jaxrs-nuxeo-client</module>
+        <module>jaxrs-nuxeo-javaapi-service</module>
     </modules>
     <repositories>
         <repository>
diff --git a/services/client/pom.xml b/services/client/pom.xml
new file mode 100644
index 000000000..69686f3f5
--- /dev/null
+++ b/services/client/pom.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+        <artifactId>org.collectionspace.services.main</artifactId>
+        <groupId>org.collectionspace.services</groupId>
+        <version>1.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.collectionspace.services</groupId>
+    <artifactId>org.collectionspace.services.client</artifactId>
+    <packaging>jar</packaging>
+    <version>1.0</version>
+    <name>services.client</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-jaxrs</artifactId>
+            <version>1.0.2.GA</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>tjws</groupId>
+                    <artifactId>webserver</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-jaxb-provider</artifactId>
+            <version>1.0.2.GA</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-multipart-provider</artifactId>
+            <version>1.0.2.GA</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.1</version>
+            <scope>test</scope>
+        </dependency>
+
+      <!-- javax -->
+
+
+        <dependency>
+            <groupId>javax.security</groupId>
+            <artifactId>jaas</artifactId>
+            <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 -->
+    </dependencies>
+    
+    <build>
+        <finalName>collectionspace-services-client</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/services/common/src/main/java/org/collectionspace/services/client/CollectionSpaceClient.java b/services/client/src/main/java/org/collectionspace/services/client/CollectionSpaceClient.java
similarity index 100%
rename from services/common/src/main/java/org/collectionspace/services/client/CollectionSpaceClient.java
rename to services/client/src/main/java/org/collectionspace/services/client/CollectionSpaceClient.java
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml
index ebfa5ae18..d5eb52d94 100644
--- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml
@@ -1,30 +1,35 @@
 <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">
-  <modelVersion>4.0.0</modelVersion>
+    <modelVersion>4.0.0</modelVersion>
 
-  <parent>
-    <groupId>org.nuxeo.ecm.platform</groupId>
-    <artifactId>nuxeo-platform-parent</artifactId>
-    <version>5.2-SNAPSHOT</version>
-  </parent>
+    <parent>
+        <artifactId>org.collectionspace.services.collectionobject.3rdparty</artifactId>
+        <groupId>org.collectionspace.services</groupId>
+        <version>1.0</version>
+    </parent>
 
-  <artifactId>nuxeo-platform-collectionspace</artifactId>
-  <packaging>jar</packaging>
-  <name>Nuxeo CS Extensions</name>
-  <description>
-    Nuxeo Enterprise Platform: CS extensions
-  </description>
-
-  <dependencies>
-    <dependency>
-      <groupId>org.nuxeo.ecm.core</groupId>
-      <artifactId>nuxeo-core-schema</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.nuxeo.ecm.platform</groupId>
-      <artifactId>nuxeo-platform-types-core</artifactId>
-    </dependency>
-  </dependencies>
+    <artifactId>org.collectionspace.services.collectionobject.doctype</artifactId>
+    <packaging>jar</packaging>
+    <name>services.collectionobject.doctype</name>
+    <description>
+    CollectionObject Nuxeo document type
+    </description>
+    <properties>
+        <nuxeo.version.5.2>5.2-SNAPSHOT</nuxeo.version.5.2>
+        <nuxeo.version.1.5>1.5-SNAPSHOT</nuxeo.version.1.5>
+    </properties>
+    <dependencies>
+        <dependency>
+            <groupId>org.nuxeo.ecm.core</groupId>
+            <artifactId>nuxeo-core-schema</artifactId>
+            <version>${nuxeo.version.1.5}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.nuxeo.ecm.platform</groupId>
+            <artifactId>nuxeo-platform-types-core</artifactId>
+            <version>${nuxeo.version.5.2}</version>
+        </dependency>
+    </dependencies>
 
 </project>
diff --git a/services/collectionobject/3rdparty/pom.xml b/services/collectionobject/3rdparty/pom.xml
new file mode 100644
index 000000000..b4e1485c1
--- /dev/null
+++ b/services/collectionobject/3rdparty/pom.xml
@@ -0,0 +1,20 @@
+
+<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">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <artifactId>org.collectionspace.services.collectionobject</artifactId>
+        <groupId>org.collectionspace.services</groupId>
+        <version>1.0</version>
+    </parent>
+
+    <artifactId>org.collectionspace.services.collectionobject.3rdparty</artifactId>
+    <packaging>pom</packaging>
+    <name>services.collectionobject.3rdparty</name>
+    <description>
+    3rd party build for collectionobject service
+    </description>
+
+</project>
diff --git a/services/collectionobject/client/nbactions.xml b/services/collectionobject/client/nbactions.xml
new file mode 100644
index 000000000..458dbd096
--- /dev/null
+++ b/services/collectionobject/client/nbactions.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actions>
+        <action>
+            <actionName>rebuild</actionName>
+            <packagings>
+                <packaging>*</packaging>
+            </packagings>
+            <goals>
+                <goal>clean</goal>
+                <goal>install</goal>
+            </goals>
+            <properties>
+                <maven.test.skip>true</maven.test.skip>
+            </properties>
+        </action>
+    </actions>
diff --git a/services/collectionobject/client/pom.xml b/services/collectionobject/client/pom.xml
index d3d0a9261..b2a6f1232 100644
--- a/services/collectionobject/client/pom.xml
+++ b/services/collectionobject/client/pom.xml
@@ -2,29 +2,29 @@
 <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>
-        <artifactId>helloworld</artifactId>
-        <groupId>org.collectionspace.hello.services</groupId>
-        <version>0.1</version>
+
+    <parent>
+        <artifactId>org.collectionspace.services.collectionobject</artifactId>
+        <groupId>org.collectionspace.services</groupId>
+        <version>1.0</version>
     </parent>
--->
-    
+
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.collectionspace.services.client</groupId>
-    <artifactId>collectionobject-client</artifactId>
-    <packaging>jar</packaging>
-    <version>0.2</version>
-    <name>CollectionObject Client</name>
+    <groupId>org.collectionspace.services</groupId>
+    <artifactId>org.collectionspace.services.collectionobject.client</artifactId>
+    <version>1.0</version>
+    <name>services.collectionobject.client</name>
+    
     <dependencies>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
-            <artifactId>collectionobject-jaxb</artifactId>
-            <version>0.2</version>
-        </dependency>        
+            <artifactId>org.collectionspace.services.collectionobject.jaxb</artifactId>
+            <version>1.0</version>
+        </dependency>
         <dependency>
             <groupId>org.collectionspace.services</groupId>
-            <artifactId>org-collectionspace-services-common</artifactId>
-            <version>0.2</version>
+            <artifactId>org.collectionspace.services.client</artifactId>
+            <version>1.0</version>
         </dependency>
         
         <dependency>
@@ -72,6 +72,7 @@
     </dependencies>
     
     <build>
+        <finalName>collectionspace-services-collectionobject-client</finalName>
         <plugins>
             <plugin>
                 <artifactId>maven-compiler-plugin</artifactId>
diff --git a/services/collectionobject/jaxb/pom.xml b/services/collectionobject/jaxb/pom.xml
index 1e0b5e8b3..71979f68b 100644
--- a/services/collectionobject/jaxb/pom.xml
+++ b/services/collectionobject/jaxb/pom.xml
@@ -3,33 +3,17 @@
     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>
-        <artifactId>helloworld</artifactId>
-        <groupId>org.collectionspace.hello.services</groupId>
-        <version>0.1</version>
-        </parent>
-    -->    
+    <parent>
+        <artifactId>org.collectionspace.services.collectionobject</artifactId>
+        <groupId>org.collectionspace.services</groupId>
+        <version>1.0</version>
+    </parent>
     
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.collectionspace.services</groupId>
-    <artifactId>collectionobject-jaxb</artifactId>
-    <version>0.2</version>
-    <name>CollectionObject Service JAXB</name>
-    
-    <pluginRepositories>
-        <pluginRepository>
-            <id>java.net</id>
-            <name>java.net Maven Repository</name>
-            <url>https://maven-repository.dev.java.net/nonav/repository</url>
-            <layout>legacy</layout>
-        </pluginRepository>
-        <pluginRepository>
-            <id>maven2-repository.dev.java.net</id>
-            <name>Java.net Maven 2 Repository</name>
-            <url>http://download.java.net/maven/2</url>
-        </pluginRepository>
-    </pluginRepositories>
+    <artifactId>org.collectionspace.services.collectionobject.jaxb</artifactId>
+    <version>1.0</version>
+    <name>services.collectionobject.jaxb</name>
     
     <dependencies>
         <dependency>
@@ -49,6 +33,7 @@
         </dependency>
     </dependencies>
     <build>
+        <finalName>collectionspace-services-collectionobject-jaxb</finalName>
         <defaultGoal>install</defaultGoal>
         <plugins>
             <plugin>
diff --git a/services/collectionobject/pom.xml b/services/collectionobject/pom.xml
deleted file mode 100644
index 588c29715..000000000
--- a/services/collectionobject/pom.xml
+++ /dev/null
@@ -1,296 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<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>
-        <artifactId>helloworld</artifactId>
-        <groupId>org.collectionspace.hello.services</groupId>
-        <version>0.1</version>
-    </parent>
--->
-    
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>org.collectionspace.services</groupId>
-    <artifactId>collectionobject-service</artifactId>
-    <packaging>jar</packaging>
-    <version>0.2</version>
-    <name>CollectionObject Service</name>
-
-    <repositories>
-        <repository>
-            <id>java.net</id>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </repository>
-        <repository>
-            <id>maven repo</id>
-            <name>maven repo</name>
-            <url>http://repo1.maven.org/maven2/</url>
-        </repository>
-        <!-- For resteasy -->
-        <repository>
-            <id>jboss</id>
-            <name>jboss repo</name>
-            <url>http://repository.jboss.org/maven2</url>
-        </repository>
-        <repository>
-            <id>mojo</id>
-            <name>mojo repo</name>
-            <url>http://svn.codehaus.org/mojo/trunk/mojo/jboss-maven-plugin</url>
-        </repository>
-
-        <repository>
-            <id>maven-restlet</id>
-            <name>Public online Restlet repository</name>
-            <url>http://maven.restlet.org</url>
-        </repository>
-        
-        <repository>
-            <id>cspace.local.nuxeo</id>
-            <url>${nuxeo.local.repo.dir}</url>
-        </repository>
-        <repository>
-            <id>cspace.local.nuxeo.client</id>
-            <url>${nuxeo.local.repo.client.dir}</url>
-        </repository>
-        <repository>
-            <id>public</id>
-            <url>http://maven.nuxeo.org/public</url>
-            <releases>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>public-snapshot</id>
-            <url>http://maven.nuxeo.org/public-snapshot</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-            </snapshots>
-        </repository>
-
-
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>public</id>
-            <url>http://maven.nuxeo.org/public</url>
-            <name>Nuxeo virtual release repository</name>
-            <releases>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-            <id>public-snapshot</id>
-            <url>http://maven.nuxeo.org/public-snapshot</url>
-            <name>Nuxeo virtual snapshot repository</name>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
-
-
-    <properties>
-        <jboss.version>4.2.3.GA</jboss.version>
-        <jboss.ejb.version>3.0</jboss.ejb.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <apacheds.version>1.5.1</apacheds.version>
-        <apachedshared.version>0.9.7</apachedshared.version>
-        <nuxeo.version.5.2>5.2-SNAPSHOT</nuxeo.version.5.2>
-        <nuxeo.version.1.5>1.5-SNAPSHOT</nuxeo.version.1.5>
-    </properties>
-
-
-    <dependencies>
-        <dependency>
-            <groupId>org.collectionspace.services</groupId>
-            <artifactId>org-collectionspace-services-common</artifactId>
-            <version>0.2</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.collectionspace.services</groupId>
-            <artifactId>collectionobject-jaxb</artifactId>
-            <version>0.2</version>
-        </dependency>
-        
-        <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>resteasy-jaxrs</artifactId>
-            <version>1.0.2.GA</version>
-            <exclusions>
-                <exclusion>
-                    <groupId>tjws</groupId>
-                    <artifactId>webserver</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>resteasy-jaxb-provider</artifactId>
-            <version>1.0.2.GA</version>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.resteasy</groupId>
-            <artifactId>resteasy-multipart-provider</artifactId>
-            <version>1.0.2.GA</version>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.1</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.testng</groupId>
-            <artifactId>testng</artifactId>
-            <version>5.6</version>
-        </dependency>
-        
-
-      <!-- javax -->
-
-
-        <dependency>
-            <groupId>javax.security</groupId>
-            <artifactId>jaas</artifactId>
-            <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>
-            <groupId>org.nuxeo.ecm.core</groupId>
-            <artifactId>nuxeo-core-api</artifactId>
-            <version>${nuxeo.version.1.5}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>jboss-remoting</artifactId>
-                    <groupId>jboss</groupId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-<!--
-        <dependency>
-            <groupId>org.nuxeo.ecm.core</groupId>
-            <artifactId>nuxeo-core-client</artifactId>
-            <version>${nuxeo.version.1.5}</version>
-        </dependency>
--->
-
-        <dependency>
-            <groupId>org.restlet</groupId>
-            <artifactId>org.restlet</artifactId>
-            <version>1.0.7</version>
-        </dependency>
-        <dependency>
-            <groupId>com.noelios.restlet</groupId>
-            <artifactId>com.noelios.restlet.ext.httpclient</artifactId>
-            <version>1.0.7</version>
-        </dependency>
-        <dependency>
-            <groupId>com.noelios.restlet</groupId>
-            <artifactId>com.noelios.restlet</artifactId>
-            <version>1.0.7</version>
-        </dependency>
-
-        <dependency>
-            <groupId>jaxen</groupId>
-            <artifactId>jaxen</artifactId>
-            <version>1.1.1</version>
-        </dependency>
-
-
-    </dependencies>
-    
-    <build>
-        <finalName>collectionobject-service</finalName>
-        <plugins>
-            <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>jboss-maven-plugin</artifactId>
-                <configuration>
-                    <jbossHome>${jboss.dir}</jbossHome>
-                </configuration>
-
-<!--
-                <executions>
-                    <execution>
-                        <id>jboss-undeploy</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>undeploy</goal>
-                        </goals>
-                        <configuration>
-                            <fileName>${basedir}/target/helloworld.war</fileName>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>jboss-deploy</id>
-                        <phase>pre-integration-test</phase>
-                        <goals>
-                            <goal>deploy</goal>
-                        </goals>
-                        <configuration>
-                            <fileName>${basedir}/target/helloworld.war</fileName>
-                        </configuration>
-                    </execution>
-                </executions>
--->                
-            </plugin>
-
-<!--
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration></configuration>
-                <executions>
-                    <execution>
-                        <id>surefire-it</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>test</goal>
-                        </goals>
-                        <configuration>
-                            <skip>false</skip>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-war-plugin</artifactId>
-                <version>2.0</version>
-            </plugin>
-    -->
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/services/collectionobject/service/pom.xml b/services/collectionobject/service/pom.xml
new file mode 100644
index 000000000..024c0e559
--- /dev/null
+++ b/services/collectionobject/service/pom.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+        <artifactId>org.collectionspace.services.collectionobject</artifactId>
+        <groupId>org.collectionspace.services</groupId>
+        <version>1.0</version>
+    </parent>
+    
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.collectionspace.services</groupId>
+    <artifactId>org.collectionspace.services.collectionobject.service</artifactId>
+    <packaging>jar</packaging>
+    <version>1.0</version>
+    <name>services.collectionobject.service</name>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.collectionspace.services</groupId>
+            <artifactId>org.collectionspace.services.common</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.collectionspace.services</groupId>
+            <artifactId>org.collectionspace.services.collectionobject.jaxb</artifactId>
+            <version>1.0</version>
+        </dependency>
+        
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <version>5.6</version>
+        </dependency>
+        
+
+      <!-- javax -->
+
+
+        <dependency>
+            <groupId>javax.security</groupId>
+            <artifactId>jaas</artifactId>
+            <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 -->
+
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-jaxrs</artifactId>
+            <version>1.0.2.GA</version>
+            <exclusions>
+                <exclusion>
+                    <groupId>tjws</groupId>
+                    <artifactId>webserver</artifactId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-jaxb-provider</artifactId>
+            <version>1.0.2.GA</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.resteasy</groupId>
+            <artifactId>resteasy-multipart-provider</artifactId>
+            <version>1.0.2.GA</version>
+        </dependency>
+        
+        <!-- nuxeo -->
+
+        <dependency>
+            <groupId>org.nuxeo.ecm.core</groupId>
+            <artifactId>nuxeo-core-api</artifactId>
+            <version>${nuxeo.version.1.5}</version>
+            <exclusions>
+                <exclusion>
+                    <artifactId>jboss-remoting</artifactId>
+                    <groupId>jboss</groupId>
+                </exclusion>
+            </exclusions>
+        </dependency>
+
+        <dependency>
+            <groupId>org.restlet</groupId>
+            <artifactId>org.restlet</artifactId>
+            <version>1.0.7</version>
+        </dependency>
+        <dependency>
+            <groupId>com.noelios.restlet</groupId>
+            <artifactId>com.noelios.restlet.ext.httpclient</artifactId>
+            <version>1.0.7</version>
+        </dependency>
+        <dependency>
+            <groupId>com.noelios.restlet</groupId>
+            <artifactId>com.noelios.restlet</artifactId>
+            <version>1.0.7</version>
+        </dependency>
+
+    </dependencies>
+    
+    <build>
+        <finalName>collectionspace-services-commonobject</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>jboss-maven-plugin</artifactId>
+                <configuration>
+                    <jbossHome>${jboss.dir}</jbossHome>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <source>1.5</source>
+                    <target>1.5</target>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/services/collectionobject/src/main/java/org/collectionspace/services/CollectionObjectResource.java b/services/collectionobject/service/src/main/java/org/collectionspace/services/CollectionObjectResource.java
similarity index 100%
rename from services/collectionobject/src/main/java/org/collectionspace/services/CollectionObjectResource.java
rename to services/collectionobject/service/src/main/java/org/collectionspace/services/CollectionObjectResource.java
diff --git a/services/collectionobject/src/main/java/org/collectionspace/services/CollectionObjectService.java b/services/collectionobject/service/src/main/java/org/collectionspace/services/CollectionObjectService.java
similarity index 100%
rename from services/collectionobject/src/main/java/org/collectionspace/services/CollectionObjectService.java
rename to services/collectionobject/service/src/main/java/org/collectionspace/services/CollectionObjectService.java
diff --git a/services/collectionobject/src/main/java/org/collectionspace/services/CollectionObjectServiceNuxeoImpl.java b/services/collectionobject/service/src/main/java/org/collectionspace/services/CollectionObjectServiceNuxeoImpl.java
similarity index 100%
rename from services/collectionobject/src/main/java/org/collectionspace/services/CollectionObjectServiceNuxeoImpl.java
rename to services/collectionobject/service/src/main/java/org/collectionspace/services/CollectionObjectServiceNuxeoImpl.java
diff --git a/services/collectionobject/src/test/java/org/collectionspace/services/test/CollectionObjectServiceTest.java b/services/collectionobject/service/src/test/java/org/collectionspace/services/test/CollectionObjectServiceTest.java
similarity index 100%
rename from services/collectionobject/src/test/java/org/collectionspace/services/test/CollectionObjectServiceTest.java
rename to services/collectionobject/service/src/test/java/org/collectionspace/services/test/CollectionObjectServiceTest.java
diff --git a/services/collectionobject/src/test/resources/log4j.xml b/services/collectionobject/service/src/test/resources/log4j.xml
similarity index 100%
rename from services/collectionobject/src/test/resources/log4j.xml
rename to services/collectionobject/service/src/test/resources/log4j.xml
diff --git a/services/common/pom.xml b/services/common/pom.xml
index fbcf4b7b2..2af9ac8c9 100644
--- a/services/common/pom.xml
+++ b/services/common/pom.xml
@@ -1,116 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <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>
-        <artifactId>collectionspace-services</artifactId>
+    <parent>
+        <artifactId>org.collectionspace.services.main</artifactId>
         <groupId>org.collectionspace.services</groupId>
-        <version>0.1</version>
-        </parent> -->
-    
+        <version>1.0</version>
+    </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.collectionspace.services</groupId>
-    <artifactId>org-collectionspace-services-common</artifactId>
+    <artifactId>org.collectionspace.services.common</artifactId>
     <packaging>jar</packaging>
-    <version>0.2</version>
-    <name>CollectionSpace Services Common</name>
-
-    <repositories>
-        <repository>
-            <id>java.net</id>
-            <url>http://download.java.net/maven/1</url>
-            <layout>legacy</layout>
-        </repository>
-        <repository>
-            <id>maven repo</id>
-            <name>maven repo</name>
-            <url>http://repo1.maven.org/maven2/</url>
-        </repository>
-        <!-- For resteasy -->
-        <repository>
-            <id>jboss</id>
-            <name>jboss repo</name>
-            <url>http://repository.jboss.org/maven2</url>
-        </repository>
-        <repository>
-            <id>mojo</id>
-            <name>mojo repo</name>
-            <url>http://svn.codehaus.org/mojo/trunk/mojo/jboss-maven-plugin</url>
-        </repository>
-
-        <repository>
-            <id>maven-restlet</id>
-            <name>Public online Restlet repository</name>
-            <url>http://maven.restlet.org</url>
-        </repository>
-        
-        <repository>
-            <id>cspace.local.nuxeo</id>
-            <url>${nuxeo.local.repo.dir}</url>
-        </repository>
-        <repository>
-            <id>cspace.local.nuxeo.client</id>
-            <url>${nuxeo.local.repo.client.dir}</url>
-        </repository>
-        <repository>
-            <id>public</id>
-            <url>http://maven.nuxeo.org/public</url>
-            <releases>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-        <repository>
-            <id>public-snapshot</id>
-            <url>http://maven.nuxeo.org/public-snapshot</url>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-            </snapshots>
-        </repository>
-    </repositories>
-
-    <pluginRepositories>
-        <pluginRepository>
-            <id>public</id>
-            <url>http://maven.nuxeo.org/public</url>
-            <name>Nuxeo virtual release repository</name>
-            <releases>
-            </releases>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </pluginRepository>
-        <pluginRepository>
-            <id>public-snapshot</id>
-            <url>http://maven.nuxeo.org/public-snapshot</url>
-            <name>Nuxeo virtual snapshot repository</name>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-            <snapshots>
-            </snapshots>
-        </pluginRepository>
-    </pluginRepositories>
-
-
-    <properties>
-        <jboss.version>4.2.3.GA</jboss.version>
-        <jboss.ejb.version>3.0</jboss.ejb.version>
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <apacheds.version>1.5.1</apacheds.version>
-        <apachedshared.version>0.9.7</apachedshared.version>
-        <nuxeo.version.5.2>5.2-SNAPSHOT</nuxeo.version.5.2>
-        <nuxeo.version.1.5>1.5-SNAPSHOT</nuxeo.version.1.5>
-    </properties>
+    <version>1.0</version>
+    <name>services.common</name>
 
     <dependencies>
-<!--        <dependency>
-            <groupId>org.collectionspace.hello.services</groupId>
-            <artifactId>helloworld-jaxb</artifactId>
-            <version>0.1</version>
-        </dependency> -->
         <dependency>
             <groupId>org.jboss.resteasy</groupId>
             <artifactId>resteasy-jaxrs</artifactId>
@@ -172,14 +74,6 @@
             </exclusions>
         </dependency>
 
-<!--
-        <dependency>
-            <groupId>org.nuxeo.ecm.core</groupId>
-            <artifactId>nuxeo-core-client</artifactId>
-            <version>${nuxeo.version.1.5}</version>
-        </dependency>
--->
-
         <dependency>
             <groupId>org.restlet</groupId>
             <artifactId>org.restlet</artifactId>
@@ -196,6 +90,7 @@
             <version>1.0.7</version>
         </dependency>
 
+        <!-- where is jaxen needed? -->
         <dependency>
             <groupId>jaxen</groupId>
             <artifactId>jaxen</artifactId>
@@ -204,25 +99,8 @@
     </dependencies>
     
     <build>
-        <finalName>org-collectionspace-services-common</finalName>
+        <finalName>collectionspace-services-common</finalName>
         <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-surefire-plugin</artifactId>
-                <configuration></configuration>
-                <executions>
-                    <execution>
-                        <id>surefire-it</id>
-                        <phase>integration-test</phase>
-                        <goals>
-                            <goal>test</goal>
-                        </goals>
-                        <configuration>
-                            <skip>false</skip>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
diff --git a/services/nbactions.xml b/services/nbactions.xml
new file mode 100644
index 000000000..458dbd096
--- /dev/null
+++ b/services/nbactions.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<actions>
+        <action>
+            <actionName>rebuild</actionName>
+            <packagings>
+                <packaging>*</packaging>
+            </packagings>
+            <goals>
+                <goal>clean</goal>
+                <goal>install</goal>
+            </goals>
+            <properties>
+                <maven.test.skip>true</maven.test.skip>
+            </properties>
+        </action>
+    </actions>
diff --git a/services/pom.xml b/services/pom.xml
new file mode 100644
index 000000000..844aba049
--- /dev/null
+++ b/services/pom.xml
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>
+        <artifactId>org.collectionspace.services</artifactId>
+        <groupId>org.collectionspace.services</groupId>
+        <version>1.0</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.collectionspace.services</groupId>
+    <version>1.0</version>
+    <artifactId>org.collectionspace.services.main</artifactId>
+    <packaging>pom</packaging>
+    <name>services.main</name>
+
+    <properties>
+        <jboss.version>4.2.3.GA</jboss.version>
+        <jboss.ejb.version>3.0</jboss.ejb.version>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+        <nuxeo.version.5.2>5.2-SNAPSHOT</nuxeo.version.5.2>
+        <nuxeo.version.1.5>1.5-SNAPSHOT</nuxeo.version.1.5>
+    </properties>
+
+    <modules>
+        <module>common</module>
+        <module>client</module>
+        <module>collectionobject</module>
+    </modules>
+
+    <repositories>
+        <repository>
+            <id>maven-restlet</id>
+            <name>Public online Restlet repository</name>
+            <url>http://maven.restlet.org</url>
+        </repository>
+        <repository>
+            <id>cspace.local.nuxeo</id>
+            <url>${nuxeo.local.repo.dir}</url>
+        </repository>
+        <repository>
+            <id>cspace.local.nuxeo.client</id>
+            <url>${nuxeo.local.repo.client.dir}</url>
+        </repository>
+        <repository>
+            <id>public</id>
+            <url>http://maven.nuxeo.org/public</url>
+            <releases>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </repository>
+        <repository>
+            <id>public-snapshot</id>
+            <url>http://maven.nuxeo.org/public-snapshot</url>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+            </snapshots>
+        </repository>
+    </repositories>
+    
+    <pluginRepositories>
+        <pluginRepository>
+            <id>public</id>
+            <url>http://maven.nuxeo.org/public</url>
+            <name>Nuxeo virtual release repository</name>
+            <releases>
+            </releases>
+            <snapshots>
+                <enabled>false</enabled>
+            </snapshots>
+        </pluginRepository>
+        <pluginRepository>
+            <id>public-snapshot</id>
+            <url>http://maven.nuxeo.org/public-snapshot</url>
+            <name>Nuxeo virtual snapshot repository</name>
+            <releases>
+                <enabled>false</enabled>
+            </releases>
+            <snapshots>
+            </snapshots>
+        </pluginRepository>
+    </pluginRepositories>
+
+    <build>
+        <pluginManagement>
+            <plugins>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-compiler-plugin</artifactId>
+                    <configuration>
+                        <source>1.5</source>
+                        <target>1.5</target>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-site-plugin</artifactId>
+                    <configuration>
+                        <unzipCommand>/usr/bin/unzip -o &gt; err.txt</unzipCommand>
+                    </configuration>
+                </plugin>
+                <plugin>
+                    <groupId>org.apache.maven.plugins</groupId>
+                    <artifactId>maven-war-plugin</artifactId>
+                    <version>2.0.1</version>
+                    <configuration>
+                        <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>
+                        <archive>
+                            <manifest>
+                                <addClasspath>true</addClasspath>
+
+                            </manifest>
+                        </archive>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+    </build>
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>net.java.dev.jaxb2-commons</groupId>
+                <artifactId>jaxb-fluent-api</artifactId>
+                <version>2.0.1</version>
+            </dependency>
+            <dependency>
+                <groupId>org.testng</groupId>
+                <artifactId>testng</artifactId>
+                <version>5.6</version>
+                <scope>test</scope>
+                <classifier>jdk15</classifier>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.resteasy</groupId>
+                <artifactId>jaxrs-api</artifactId>
+                <version>1.0.2.GA</version>
+            </dependency>
+            <dependency>
+                <groupId>net.java.dev.jaxb2-commons</groupId>
+                <artifactId>jaxb-fluent-api</artifactId>
+                <version>2.0.1</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</version>
+            </dependency>
+            <dependency>
+                <groupId>org.jboss.resteasy</groupId>
+                <artifactId>resteasy-jaxrs</artifactId>
+                <version>1.0.2.GA</version>
+            </dependency>
+            <dependency>
+                <groupId>commons-httpclient</groupId>
+                <artifactId>commons-httpclient</artifactId>
+                <version>3.1</version>
+            </dependency>
+            <dependency>
+                <groupId>com.sun.xml.bind</groupId>
+                <artifactId>jaxb-impl</artifactId>
+                <version>2.1.7</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-api</artifactId>
+                <version>1.5.2</version>
+            </dependency>
+            <dependency>
+                <groupId>org.slf4j</groupId>
+                <artifactId>slf4j-log4j12</artifactId>
+                <version>1.5.2</version>
+            </dependency>
+            <dependency>
+                <groupId>mysql</groupId>
+                <artifactId>mysql-connector-java</artifactId>
+                <version>5.1.5</version>
+                <scope>test</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+</project>