]> git.aero2k.de Git - tmp/jakarta-migration.git/commitdiff
projects / tmp / jakarta-migration.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9b2047a)
cspace-84 created parent child relationships between several projects, repository...
authorSanjay Dalal <sanjay.dalal@berkeley.edu>
Wed, 6 May 2009 16:14:57 +0000 (16:14 +0000)
committerSanjay Dalal <sanjay.dalal@berkeley.edu>
Wed, 6 May 2009 16:14:57 +0000 (16:14 +0000)
22 files changed:
JaxRsServiceProvider/pom.xml patch | blob | history
build.xml patch | blob | history
nbproject/project.xml patch | blob | history
pom.xml [new file with mode: 0644] patch | blob
sandbox/sanjay/prototypes/jaxrs-prototype/pom.xml patch | blob | history
services/client/pom.xml [new file with mode: 0644] patch | blob
services/client/src/main/java/org/collectionspace/services/client/CollectionSpaceClient.java [moved from services/common/src/main/java/org/collectionspace/services/client/CollectionSpaceClient.java with 100% similarity] patch | blob | history
services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml patch | blob | history
services/collectionobject/3rdparty/pom.xml [new file with mode: 0644] patch | blob
services/collectionobject/client/nbactions.xml [new file with mode: 0644] patch | blob
services/collectionobject/client/pom.xml patch | blob | history
services/collectionobject/jaxb/pom.xml patch | blob | history
services/collectionobject/pom.xml [deleted file] patch | blob | history
services/collectionobject/service/pom.xml [new file with mode: 0644] patch | blob
services/collectionobject/service/src/main/java/org/collectionspace/services/CollectionObjectResource.java [moved from services/collectionobject/src/main/java/org/collectionspace/services/CollectionObjectResource.java with 100% similarity] patch | blob | history
services/collectionobject/service/src/main/java/org/collectionspace/services/CollectionObjectService.java [moved from services/collectionobject/src/main/java/org/collectionspace/services/CollectionObjectService.java with 100% similarity] patch | blob | history
services/collectionobject/service/src/main/java/org/collectionspace/services/CollectionObjectServiceNuxeoImpl.java [moved from services/collectionobject/src/main/java/org/collectionspace/services/CollectionObjectServiceNuxeoImpl.java with 100% similarity] patch | blob | history
services/collectionobject/service/src/test/java/org/collectionspace/services/test/CollectionObjectServiceTest.java [moved from services/collectionobject/src/test/java/org/collectionspace/services/test/CollectionObjectServiceTest.java with 100% similarity] patch | blob | history
services/collectionobject/service/src/test/resources/log4j.xml [moved from services/collectionobject/src/test/resources/log4j.xml with 100% similarity] patch | blob | history
services/common/pom.xml patch | blob | history
services/nbactions.xml [new file with mode: 0644] patch | blob
services/pom.xml [new file with mode: 0644] patch | blob

diff --git a/JaxRsServiceProvider/pom.xml b/JaxRsServiceProvider/pom.xml
index c9a855ed40711d9dcd150a76e0a4aa9420e88cb1..e59c41b1528a301803273a3ded003e51e5d026fc 100644 (file)
--- a/JaxRsServiceProvider/pom.xml
+++ b/JaxRsServiceProvider/pom.xml
@@ -1,103 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <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">\r
     \r
-    <!-- \r
-        <parent>\r
-        <artifactId>helloworld</artifactId>\r
-        <groupId>org.collectionspace.hello.services</groupId>\r
-        <version>0.1</version>\r
-        </parent>\r
-    -->\r
+    <parent>\r
+        <artifactId>org.collectionspace.services</artifactId>\r
+        <groupId>org.collectionspace.services</groupId>\r
+        <version>1.0</version>\r
+    </parent>\r
+\r
     \r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
-    <artifactId>CollectionSpace-JAXRS-ServiceProvider</artifactId>\r
+    <artifactId>org.collectionspace.services.jaxrs.provider</artifactId>\r
     <packaging>war</packaging>\r
-    <version>0.2</version>\r
-    <name>CollectionSpace JAX-RS Service Provider</name>\r
-    \r
-    <repositories>\r
-        <repository>\r
-            <id>java.net</id>\r
-            <url>http://download.java.net/maven/1</url>\r
-            <layout>legacy</layout>\r
-        </repository>\r
-        <repository>\r
-            <id>maven repo</id>\r
-            <name>maven repo</name>\r
-            <url>http://repo1.maven.org/maven2/</url>\r
-        </repository>\r
-        <!-- For resteasy -->\r
-        <repository>\r
-            <id>jboss</id>\r
-            <name>jboss repo</name>\r
-            <url>http://repository.jboss.org/maven2</url>\r
-        </repository>\r
-        <repository>\r
-            <id>mojo</id>\r
-            <name>mojo repo</name>\r
-            <url>http://svn.codehaus.org/mojo/trunk/mojo/jboss-maven-plugin</url>\r
-        </repository>\r
-        \r
-        <repository>\r
-            <id>maven-restlet</id>\r
-            <name>Public online Restlet repository</name>\r
-            <url>http://maven.restlet.org</url>\r
-        </repository>\r
-        \r
-        <repository>\r
-            <id>cspace.local.nuxeo</id>\r
-            <url>${nuxeo.local.repo.dir}</url>\r
-        </repository>\r
-        <repository>\r
-            <id>cspace.local.nuxeo.client</id>\r
-            <url>${nuxeo.local.repo.client.dir}</url>\r
-        </repository>\r
-        <repository>\r
-            <id>public</id>\r
-            <url>http://maven.nuxeo.org/public</url>\r
-            <releases>\r
-            </releases>\r
-            <snapshots>\r
-                <enabled>false</enabled>\r
-            </snapshots>\r
-        </repository>\r
-        <repository>\r
-            <id>public-snapshot</id>\r
-            <url>http://maven.nuxeo.org/public-snapshot</url>\r
-            <releases>\r
-                <enabled>false</enabled>\r
-            </releases>\r
-            <snapshots>\r
-            </snapshots>\r
-        </repository>\r
-        \r
-        \r
-    </repositories>\r
-    \r
-    <pluginRepositories>\r
-        <pluginRepository>\r
-            <id>public</id>\r
-            <url>http://maven.nuxeo.org/public</url>\r
-            <name>Nuxeo virtual release repository</name>\r
-            <releases>\r
-            </releases>\r
-            <snapshots>\r
-                <enabled>false</enabled>\r
-            </snapshots>\r
-        </pluginRepository>\r
-        <pluginRepository>\r
-            <id>public-snapshot</id>\r
-            <url>http://maven.nuxeo.org/public-snapshot</url>\r
-            <name>Nuxeo virtual snapshot repository</name>\r
-            <releases>\r
-                <enabled>false</enabled>\r
-            </releases>\r
-            <snapshots>\r
-            </snapshots>\r
-        </pluginRepository>\r
-    </pluginRepositories>\r
-    \r
+    <version>1.0</version>\r
+    <name>services.jaxrs.provider</name>\r
     \r
     <properties>\r
         <jboss.version>4.2.3.GA</jboss.version>\r
@@ -113,18 +29,13 @@
     <dependencies>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
-            <artifactId>collectionobject-jaxb</artifactId>\r
-            <version>0.2</version>\r
+            <artifactId>org.collectionspace.services.common</artifactId>\r
+            <version>1.0</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
-            <artifactId>org-collectionspace-services-common</artifactId>\r
-            <version>0.2</version>\r
-        </dependency>   \r
-        <dependency>\r
-            <groupId>org.collectionspace.services</groupId>\r
-            <artifactId>collectionobject-service</artifactId>\r
-            <version>0.2</version>\r
+            <artifactId>org.collectionspace.services.collectionobject.service</artifactId>\r
+            <version>1.0</version>\r
         </dependency>\r
         <dependency>\r
             <groupId>org.jboss.resteasy</groupId>\r
@@ -156,68 +67,14 @@
         \r
         <!-- javax -->\r
         \r
-        <dependency>\r
-            <groupId>javax.security</groupId>\r
-            <artifactId>jaas</artifactId>\r
-            <version>1.0.01</version>\r
-            <scope>provided</scope>\r
-        </dependency>\r
-        \r
-        <dependency>\r
-            <groupId>dom4j</groupId>\r
-            <artifactId>dom4j</artifactId>\r
-            <version>1.6.1</version>\r
-            <scope>provided</scope>\r
-        </dependency>\r
-        \r
         <!-- jboss -->\r
         \r
         <!-- nuxeo -->\r
-        \r
-        <dependency>\r
-            <groupId>org.nuxeo.ecm.core</groupId>\r
-            <artifactId>nuxeo-core-api</artifactId>\r
-            <version>${nuxeo.version.1.5}</version>\r
-            <exclusions>\r
-                <exclusion>\r
-                    <artifactId>jboss-remoting</artifactId>\r
-                    <groupId>jboss</groupId>\r
-                </exclusion>\r
-            </exclusions>\r
-        </dependency>\r
-        \r
-        <!--\r
-            <dependency>\r
-            <groupId>org.nuxeo.ecm.core</groupId>\r
-            <artifactId>nuxeo-core-client</artifactId>\r
-            <version>${nuxeo.version.1.5}</version>\r
-            </dependency>\r
-        -->\r
-        \r
-        <dependency>\r
-            <groupId>org.restlet</groupId>\r
-            <artifactId>org.restlet</artifactId>\r
-            <version>1.0.7</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>com.noelios.restlet</groupId>\r
-            <artifactId>com.noelios.restlet.ext.httpclient</artifactId>\r
-            <version>1.0.7</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>com.noelios.restlet</groupId>\r
-            <artifactId>com.noelios.restlet</artifactId>\r
-            <version>1.0.7</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>jaxen</groupId>\r
-            <artifactId>jaxen</artifactId>\r
-            <version>1.1.1</version>\r
-        </dependency>               \r
+\r
     </dependencies>\r
     \r
     <build>\r
-        <finalName>CollectionSpace</finalName>\r
+        <finalName>collectionspace-services-jaxrs-provider</finalName>\r
         <plugins>\r
             <plugin>\r
                 <groupId>org.codehaus.mojo</groupId>\r
@@ -233,7 +90,7 @@
                             <goal>undeploy</goal>\r
                         </goals>\r
                         <configuration>\r
-                            <fileName>${basedir}/target/CollectionSpace.war</fileName>\r
+                            <fileName>${basedir}/target/collectionspace-services.war</fileName>\r
                         </configuration>\r
                     </execution>\r
                     <execution>\r
@@ -247,24 +104,8 @@
                         </configuration>\r
                     </execution>\r
                 </executions>\r
-            </plugin>        \r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-surefire-plugin</artifactId>\r
-                <configuration></configuration>\r
-                <executions>\r
-                    <execution>\r
-                        <id>surefire-it</id>\r
-                        <phase>integration-test</phase>\r
-                        <goals>\r
-                            <goal>test</goal>\r
-                        </goals>\r
-                        <configuration>\r
-                            <skip>false</skip>\r
-                        </configuration>\r
-                    </execution>\r
-                </executions>\r
             </plugin>\r
+\r
             <plugin>\r
                 <groupId>org.apache.maven.plugins</groupId>\r
                 <artifactId>maven-war-plugin</artifactId>\r
diff --git a/build.xml b/build.xml
index a742a956189618232a61249899b697174b3d268b..57b86fc5755f581118407c21ab5f07312f65235a 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -1,10 +1,11 @@
 \r
-<project name="Services" default="dist" basedir=".">\r
+<project name="services" default="package" basedir=".">\r
     <description>\r
         collectionspace services\r
     </description>\r
   <!-- set global properties for this build -->\r
     <property file="build.properties" />\r
+    <property name="mvn.opts" value="" />\r
     <property name="src" location="src"/>\r
     <property name="build" location="build"/>\r
     <property name="dist"  location="dist"/>\r
@@ -63,7 +64,6 @@
 \r
     <!-- Create the distribution directory -->\r
         <mkdir dir="${dist}"/>\r
-\r
         <tar destfile="${dist}/${jboss.release}.${nuxeo.release}.tar.gz" compression="gzip">\r
             <tarfileset dir="${jboss.dir}"\r
               preserveLeadingSlashes="true">\r
@@ -79,12 +79,86 @@
         </tar>\r
     </target>\r
 \r
-    <target name="clean"\r
-        description="clean up" >\r
-    <!-- Delete the ${build} and ${dist} directory trees -->\r
-    <!-- Delete the ${build} and ${dist} directory trees -->\r
+    <target name="package" depends="setproperties,package-unix,package-windows"\r
+  description="Package CollectionSpace Services" />\r
+    <target name="package-unix" if="osfamily-unix">\r
+        <exec executable="mvn" failonerror="true">\r
+            <arg value="package" />\r
+            <arg value="-Dmaven.test.skip=true" />\r
+            <arg value="-f" />\r
+            <arg value="${basedir}/pom.xml" />\r
+            <arg value="-N" />\r
+            <arg value="${mvn.opts}" />\r
+        </exec>\r
+    </target>\r
+    <target name="package-windows" if="osfamily-windows">\r
+        <exec executable="cmd" failonerror="true">\r
+            <arg value="/c" />\r
+            <arg value="mvn.bat" />\r
+            <arg value="package" />\r
+            <arg value="-Dmaven.test.skip=true" />\r
+            <arg value="-f" />\r
+            <arg value="${basedir}/pom.xml" />\r
+            <arg value="-N" />\r
+            <arg value="${mvn.opts}" />\r
+        </exec>\r
+    </target>\r
+\r
+\r
+    <target name="clean" depends="clean-unix,clean-windows"\r
+  description="Delete target directories" >\r
         <delete dir="${build}"/>\r
         <delete dir="${dist}"/>\r
+    </target>\r
+    <target name="clean-unix" if="osfamily-unix">\r
+        <exec executable="mvn" failonerror="true">\r
+            <arg value="clean" />\r
+            <arg value="${mvn.opts}" />\r
+        </exec>\r
+    </target>\r
+    <target name="clean-windows" if="osfamily-windows">\r
+        <exec executable="cmd" failonerror="true">\r
+            <arg value="/c" />\r
+            <arg value="mvn.bat" />\r
+            <arg value="clean" />\r
+            <arg value="${mvn.opts}" />\r
+        </exec>\r
+    </target>\r
 \r
+    <target name="test" depends="test-unix,test-windows" description="Run tests" />\r
+    <target name="test-unix" if="osfamily-unix">\r
+        <exec executable="mvn" failonerror="true">\r
+            <arg value="test" />\r
+            <arg value="${mvn.opts}" />\r
+        </exec>\r
+    </target>\r
+    <target name="test-windows" if="osfamily-windows">\r
+        <exec executable="cmd" failonerror="true">\r
+            <arg value="/c" />\r
+            <arg value="mvn.bat" />\r
+            <arg value="test" />\r
+            <arg value="${mvn.opts}" />\r
+        </exec>\r
     </target>\r
+\r
+\r
+    <target name="eclipse" depends="eclipse-unix,eclipse-windows" description="Generate Eclipse files" />\r
+    <target name="eclipse-unix" if="osfamily-unix">\r
+        <exec executable="mvn" failonerror="true">\r
+            <arg value="eclipse:clean" />\r
+            <arg value="eclipse:eclipse" />\r
+            <arg value="${mvn.opts}" />\r
+        </exec>\r
+        <exec executable="fixeclipse" failonerror="true" />\r
+    </target>\r
+    <target name="eclipse-windows" if="osfamily-windows">\r
+        <exec executable="cmd" failonerror="true">\r
+            <arg value="/c" />\r
+            <arg value="mvn.bat" />\r
+            <arg value="eclipse:clean" />\r
+            <arg value="eclipse:eclipse" />\r
+            <arg value="${mvn.opts}" />\r
+        </exec>\r
+    </target>\r
+\r
 </project>\r
diff --git a/nbproject/project.xml b/nbproject/project.xml
index add6b7840f7541d761614a3cb5022d4000167c60..174e90fb589315929cabec87531354f94f78cd5d 100644 (file)
--- a/nbproject/project.xml
+++ b/nbproject/project.xml
@@ -24,7 +24,7 @@
             </folders>\r
             <ide-actions>\r
                 <action name="build">\r
-                    <target>compile</target>\r
+                    <target>package</target>\r
                 </action>\r
                 <action name="clean">\r
                     <target>clean</target>\r
@@ -34,7 +34,7 @@
                 </action>\r
                 <action name="rebuild">\r
                     <target>clean</target>\r
-                    <target>compile</target>\r
+                    <target>package</target>\r
                 </action>\r
             </ide-actions>\r
             <view>\r
diff --git a/pom.xml b/pom.xml
new file mode 100644 (file)
index 0000000..d67c861
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<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">\r
+\r
+    <modelVersion>4.0.0</modelVersion>\r
+    <groupId>org.collectionspace.services</groupId>\r
+    <version>1.0</version>\r
+    <artifactId>org.collectionspace.services</artifactId>\r
+    <packaging>pom</packaging>\r
+    <name>org.collectionspace.services</name>\r
+\r
+    <modules>\r
+        <module>services</module>\r
+        <module>JaxRsServiceProvider</module>\r
+    </modules>\r
+    <repositories>\r
+        <repository>\r
+            <id>maven repo</id>\r
+            <name>maven repo</name>\r
+            <url>http://repo1.maven.org/maven2/</url>\r
+        </repository>\r
+        <repository>\r
+            <id>java.net</id>\r
+            <name>java.net Maven Repository</name>\r
+            <url>https://maven-repository.dev.java.net/nonav/repository</url>\r
+            <layout>legacy</layout>\r
+        </repository>\r
+        <repository>\r
+            <id>maven2-repository.dev.java.net</id>\r
+            <name>Java.net Maven 2 Repository</name>\r
+            <url>http://download.java.net/maven/2</url>\r
+        </repository>\r
+        <repository>\r
+            <id>sun</id>\r
+            <url>http://download.java.net/maven/2</url>\r
+        </repository>\r
+        <repository>\r
+            <id>jboss</id>\r
+            <url>http://repository.jboss.org/maven2</url>\r
+        </repository>\r
+        <repository>\r
+            <id>mojo</id>\r
+            <name>mojo repo</name>\r
+            <url>http://svn.codehaus.org/mojo/trunk/mojo/jboss-maven-plugin</url>\r
+        </repository>\r
+    </repositories>\r
+    <pluginRepositories>\r
+        <pluginRepository>\r
+            <id>java.net</id>\r
+            <name>java.net Maven Repository</name>\r
+            <url>https://maven-repository.dev.java.net/nonav/repository</url>\r
+            <layout>legacy</layout>\r
+        </pluginRepository>\r
+        <pluginRepository>\r
+            <id>maven2-repository.dev.java.net</id>\r
+            <name>Java.net Maven 2 Repository</name>\r
+            <url>http://download.java.net/maven/2</url>\r
+        </pluginRepository>\r
+    </pluginRepositories>\r
+\r
+    <build>\r
+        <pluginManagement>\r
+            <plugins>\r
+                <plugin>\r
+                    <groupId>org.apache.maven.plugins</groupId>\r
+                    <artifactId>maven-compiler-plugin</artifactId>\r
+                    <configuration>\r
+                        <source>1.5</source>\r
+                        <target>1.5</target>\r
+                    </configuration>\r
+                </plugin>\r
+                <plugin>\r
+                    <groupId>org.apache.maven.plugins</groupId>\r
+                    <artifactId>maven-site-plugin</artifactId>\r
+                    <configuration>\r
+                        <unzipCommand>/usr/bin/unzip -o &gt; err.txt</unzipCommand>\r
+                    </configuration>\r
+                </plugin>\r
+                <plugin>\r
+                    <groupId>org.apache.maven.plugins</groupId>\r
+                    <artifactId>maven-war-plugin</artifactId>\r
+                    <version>2.0.1</version>\r
+                    <configuration>\r
+\r
+                        <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>\r
+                        <archive>\r
+                            <manifest>\r
+                                <addClasspath>true</addClasspath>\r
+                            </manifest>\r
+                        </archive>\r
+                    </configuration>\r
+                </plugin>\r
+\r
+            </plugins>\r
+        </pluginManagement>\r
+    </build>\r
+    <dependencyManagement>\r
+        <dependencies>\r
+            <dependency>\r
+                <groupId>net.java.dev.jaxb2-commons</groupId>\r
+                <artifactId>jaxb-fluent-api</artifactId>\r
+                <version>2.0.1</version>\r
+            </dependency>\r
+            <dependency>\r
+                <groupId>org.testng</groupId>\r
+                <artifactId>testng</artifactId>\r
+                <version>5.6</version>\r
+                <scope>test</scope>\r
+                <classifier>jdk15</classifier>\r
+            </dependency>\r
+            <dependency>\r
+                <groupId>org.slf4j</groupId>\r
+                <artifactId>slf4j-api</artifactId>\r
+                <version>1.5.2</version>\r
+            </dependency>\r
+            <dependency>\r
+                <groupId>org.slf4j</groupId>\r
+                <artifactId>slf4j-log4j12</artifactId>\r
+                <version>1.5.2</version>\r
+            </dependency>\r
+            <dependency>\r
+                <groupId>mysql</groupId>\r
+                <artifactId>mysql-connector-java</artifactId>\r
+                <version>5.1.5</version>\r
+                <scope>test</scope>\r
+            </dependency>\r
+        </dependencies>\r
+    </dependencyManagement>\r
+</project>\r
diff --git a/sandbox/sanjay/prototypes/jaxrs-prototype/pom.xml b/sandbox/sanjay/prototypes/jaxrs-prototype/pom.xml
index 28508a1461370fd5b126c536547090e073747725..7a6a1a7a71657eea2fff06a0c55d76a8ba49118b 100644 (file)
--- a/sandbox/sanjay/prototypes/jaxrs-prototype/pom.xml
+++ b/sandbox/sanjay/prototypes/jaxrs-prototype/pom.xml
@@ -13,6 +13,7 @@
         <module>jaxrs-client</module>\r
         <module>jaxrs-nuxeo-service</module>\r
         <module>jaxrs-nuxeo-client</module>\r
+        <module>jaxrs-nuxeo-javaapi-service</module>\r
     </modules>\r
     <repositories>\r
         <repository>\r
diff --git a/services/client/pom.xml b/services/client/pom.xml
new file mode 100644 (file)
index 0000000..69686f3
--- /dev/null
+++ b/services/client/pom.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<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">\r
+    <parent>\r
+        <artifactId>org.collectionspace.services.main</artifactId>\r
+        <groupId>org.collectionspace.services</groupId>\r
+        <version>1.0</version>\r
+    </parent>\r
+    <modelVersion>4.0.0</modelVersion>\r
+    <groupId>org.collectionspace.services</groupId>\r
+    <artifactId>org.collectionspace.services.client</artifactId>\r
+    <packaging>jar</packaging>\r
+    <version>1.0</version>\r
+    <name>services.client</name>\r
+\r
+    <dependencies>\r
+        <dependency>\r
+            <groupId>org.jboss.resteasy</groupId>\r
+            <artifactId>resteasy-jaxrs</artifactId>\r
+            <version>1.0.2.GA</version>\r
+            <exclusions>\r
+                <exclusion>\r
+                    <groupId>tjws</groupId>\r
+                    <artifactId>webserver</artifactId>\r
+                </exclusion>\r
+            </exclusions>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.jboss.resteasy</groupId>\r
+            <artifactId>resteasy-jaxb-provider</artifactId>\r
+            <version>1.0.2.GA</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.jboss.resteasy</groupId>\r
+            <artifactId>resteasy-multipart-provider</artifactId>\r
+            <version>1.0.2.GA</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>junit</groupId>\r
+            <artifactId>junit</artifactId>\r
+            <version>4.1</version>\r
+            <scope>test</scope>\r
+        </dependency>\r
+\r
+      <!-- javax -->\r
+\r
+\r
+        <dependency>\r
+            <groupId>javax.security</groupId>\r
+            <artifactId>jaas</artifactId>\r
+            <version>1.0.01</version>\r
+            <scope>provided</scope>\r
+        </dependency>\r
+\r
+        <dependency>\r
+            <groupId>dom4j</groupId>\r
+            <artifactId>dom4j</artifactId>\r
+            <version>1.6.1</version>\r
+            <scope>provided</scope>\r
+        </dependency>\r
+        \r
+        <!-- jboss -->\r
+\r
+        <!-- nuxeo -->\r
+    </dependencies>\r
+    \r
+    <build>\r
+        <finalName>collectionspace-services-client</finalName>\r
+        <plugins>\r
+            <plugin>\r
+                <groupId>org.apache.maven.plugins</groupId>\r
+                <artifactId>maven-compiler-plugin</artifactId>\r
+                <configuration>\r
+                    <source>1.5</source>\r
+                    <target>1.5</target>\r
+                </configuration>\r
+            </plugin>\r
+        </plugins>\r
+    </build>\r
+</project>\r
diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml
index ebfa5ae18625f3a20ddbec323a570b46d8836c3d..d5eb52d948852497860ed28d2383e3eba2225c4c 100644 (file)
--- 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 (file)
index 0000000..b4e1485
--- /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 (file)
index 0000000..458dbd0
--- /dev/null
+++ b/services/collectionobject/client/nbactions.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<actions>\r
+        <action>\r
+            <actionName>rebuild</actionName>\r
+            <packagings>\r
+                <packaging>*</packaging>\r
+            </packagings>\r
+            <goals>\r
+                <goal>clean</goal>\r
+                <goal>install</goal>\r
+            </goals>\r
+            <properties>\r
+                <maven.test.skip>true</maven.test.skip>\r
+            </properties>\r
+        </action>\r
+    </actions>\r
diff --git a/services/collectionobject/client/pom.xml b/services/collectionobject/client/pom.xml
index d3d0a9261f8aad68cc0b8774b8ecea1b2697faa4..b2a6f12322088a453f62cf6bfdd06145799f4d5d 100644 (file)
--- 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"\r
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
     xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">\r
-<!--    <parent>\r
-        <artifactId>helloworld</artifactId>\r
-        <groupId>org.collectionspace.hello.services</groupId>\r
-        <version>0.1</version>\r
+\r
+    <parent>\r
+        <artifactId>org.collectionspace.services.collectionobject</artifactId>\r
+        <groupId>org.collectionspace.services</groupId>\r
+        <version>1.0</version>\r
     </parent>\r
--->\r
-    \r
+\r
     <modelVersion>4.0.0</modelVersion>\r
-    <groupId>org.collectionspace.services.client</groupId>\r
-    <artifactId>collectionobject-client</artifactId>\r
-    <packaging>jar</packaging>\r
-    <version>0.2</version>\r
-    <name>CollectionObject Client</name>\r
+    <groupId>org.collectionspace.services</groupId>\r
+    <artifactId>org.collectionspace.services.collectionobject.client</artifactId>\r
+    <version>1.0</version>\r
+    <name>services.collectionobject.client</name>\r
+    \r
     <dependencies>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
-            <artifactId>collectionobject-jaxb</artifactId>\r
-            <version>0.2</version>\r
-        </dependency>        \r
+            <artifactId>org.collectionspace.services.collectionobject.jaxb</artifactId>\r
+            <version>1.0</version>\r
+        </dependency>\r
         <dependency>\r
             <groupId>org.collectionspace.services</groupId>\r
-            <artifactId>org-collectionspace-services-common</artifactId>\r
-            <version>0.2</version>\r
+            <artifactId>org.collectionspace.services.client</artifactId>\r
+            <version>1.0</version>\r
         </dependency>\r
         \r
         <dependency>\r
@@ -72,6 +72,7 @@
     </dependencies>\r
     \r
     <build>\r
+        <finalName>collectionspace-services-collectionobject-client</finalName>\r
         <plugins>\r
             <plugin>\r
                 <artifactId>maven-compiler-plugin</artifactId>\r
diff --git a/services/collectionobject/jaxb/pom.xml b/services/collectionobject/jaxb/pom.xml
index 1e0b5e8b341b0d6a561ead3ae525b80564f4d7f6..71979f68b14dda0bf4a5f6d5301adf15b2a8a600 100644 (file)
--- 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 (file)
index 588c297..0000000
--- a/services/collectionobject/pom.xml
+++ /dev/null
@@ -1,296 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<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">\r
-\r
-<!--\r
-    <parent>\r
-        <artifactId>helloworld</artifactId>\r
-        <groupId>org.collectionspace.hello.services</groupId>\r
-        <version>0.1</version>\r
-    </parent>\r
--->\r
-    \r
-    <modelVersion>4.0.0</modelVersion>\r
-    <groupId>org.collectionspace.services</groupId>\r
-    <artifactId>collectionobject-service</artifactId>\r
-    <packaging>jar</packaging>\r
-    <version>0.2</version>\r
-    <name>CollectionObject Service</name>\r
-\r
-    <repositories>\r
-        <repository>\r
-            <id>java.net</id>\r
-            <url>http://download.java.net/maven/1</url>\r
-            <layout>legacy</layout>\r
-        </repository>\r
-        <repository>\r
-            <id>maven repo</id>\r
-            <name>maven repo</name>\r
-            <url>http://repo1.maven.org/maven2/</url>\r
-        </repository>\r
-        <!-- For resteasy -->\r
-        <repository>\r
-            <id>jboss</id>\r
-            <name>jboss repo</name>\r
-            <url>http://repository.jboss.org/maven2</url>\r
-        </repository>\r
-        <repository>\r
-            <id>mojo</id>\r
-            <name>mojo repo</name>\r
-            <url>http://svn.codehaus.org/mojo/trunk/mojo/jboss-maven-plugin</url>\r
-        </repository>\r
-\r
-        <repository>\r
-            <id>maven-restlet</id>\r
-            <name>Public online Restlet repository</name>\r
-            <url>http://maven.restlet.org</url>\r
-        </repository>\r
-        \r
-        <repository>\r
-            <id>cspace.local.nuxeo</id>\r
-            <url>${nuxeo.local.repo.dir}</url>\r
-        </repository>\r
-        <repository>\r
-            <id>cspace.local.nuxeo.client</id>\r
-            <url>${nuxeo.local.repo.client.dir}</url>\r
-        </repository>\r
-        <repository>\r
-            <id>public</id>\r
-            <url>http://maven.nuxeo.org/public</url>\r
-            <releases>\r
-            </releases>\r
-            <snapshots>\r
-                <enabled>false</enabled>\r
-            </snapshots>\r
-        </repository>\r
-        <repository>\r
-            <id>public-snapshot</id>\r
-            <url>http://maven.nuxeo.org/public-snapshot</url>\r
-            <releases>\r
-                <enabled>false</enabled>\r
-            </releases>\r
-            <snapshots>\r
-            </snapshots>\r
-        </repository>\r
-\r
-\r
-    </repositories>\r
-\r
-    <pluginRepositories>\r
-        <pluginRepository>\r
-            <id>public</id>\r
-            <url>http://maven.nuxeo.org/public</url>\r
-            <name>Nuxeo virtual release repository</name>\r
-            <releases>\r
-            </releases>\r
-            <snapshots>\r
-                <enabled>false</enabled>\r
-            </snapshots>\r
-        </pluginRepository>\r
-        <pluginRepository>\r
-            <id>public-snapshot</id>\r
-            <url>http://maven.nuxeo.org/public-snapshot</url>\r
-            <name>Nuxeo virtual snapshot repository</name>\r
-            <releases>\r
-                <enabled>false</enabled>\r
-            </releases>\r
-            <snapshots>\r
-            </snapshots>\r
-        </pluginRepository>\r
-    </pluginRepositories>\r
-\r
-\r
-    <properties>\r
-        <jboss.version>4.2.3.GA</jboss.version>\r
-        <jboss.ejb.version>3.0</jboss.ejb.version>\r
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
-        <apacheds.version>1.5.1</apacheds.version>\r
-        <apachedshared.version>0.9.7</apachedshared.version>\r
-        <nuxeo.version.5.2>5.2-SNAPSHOT</nuxeo.version.5.2>\r
-        <nuxeo.version.1.5>1.5-SNAPSHOT</nuxeo.version.1.5>\r
-    </properties>\r
-\r
-\r
-    <dependencies>\r
-        <dependency>\r
-            <groupId>org.collectionspace.services</groupId>\r
-            <artifactId>org-collectionspace-services-common</artifactId>\r
-            <version>0.2</version>\r
-        </dependency>\r
-        \r
-        <dependency>\r
-            <groupId>org.collectionspace.services</groupId>\r
-            <artifactId>collectionobject-jaxb</artifactId>\r
-            <version>0.2</version>\r
-        </dependency>\r
-        \r
-        <dependency>\r
-            <groupId>org.jboss.resteasy</groupId>\r
-            <artifactId>resteasy-jaxrs</artifactId>\r
-            <version>1.0.2.GA</version>\r
-            <exclusions>\r
-                <exclusion>\r
-                    <groupId>tjws</groupId>\r
-                    <artifactId>webserver</artifactId>\r
-                </exclusion>\r
-            </exclusions>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.jboss.resteasy</groupId>\r
-            <artifactId>resteasy-jaxb-provider</artifactId>\r
-            <version>1.0.2.GA</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.jboss.resteasy</groupId>\r
-            <artifactId>resteasy-multipart-provider</artifactId>\r
-            <version>1.0.2.GA</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>junit</groupId>\r
-            <artifactId>junit</artifactId>\r
-            <version>4.1</version>\r
-            <scope>test</scope>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>org.testng</groupId>\r
-            <artifactId>testng</artifactId>\r
-            <version>5.6</version>\r
-        </dependency>\r
-        \r
-\r
-      <!-- javax -->\r
-\r
-\r
-        <dependency>\r
-            <groupId>javax.security</groupId>\r
-            <artifactId>jaas</artifactId>\r
-            <version>1.0.01</version>\r
-            <scope>provided</scope>\r
-        </dependency>\r
-\r
-        <dependency>\r
-            <groupId>dom4j</groupId>\r
-            <artifactId>dom4j</artifactId>\r
-            <version>1.6.1</version>\r
-            <scope>provided</scope>\r
-        </dependency>\r
-        \r
-        <!-- jboss -->\r
-\r
-        <!-- nuxeo -->\r
-\r
-        <dependency>\r
-            <groupId>org.nuxeo.ecm.core</groupId>\r
-            <artifactId>nuxeo-core-api</artifactId>\r
-            <version>${nuxeo.version.1.5}</version>\r
-            <exclusions>\r
-                <exclusion>\r
-                    <artifactId>jboss-remoting</artifactId>\r
-                    <groupId>jboss</groupId>\r
-                </exclusion>\r
-            </exclusions>\r
-        </dependency>\r
-\r
-<!--\r
-        <dependency>\r
-            <groupId>org.nuxeo.ecm.core</groupId>\r
-            <artifactId>nuxeo-core-client</artifactId>\r
-            <version>${nuxeo.version.1.5}</version>\r
-        </dependency>\r
--->\r
-\r
-        <dependency>\r
-            <groupId>org.restlet</groupId>\r
-            <artifactId>org.restlet</artifactId>\r
-            <version>1.0.7</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>com.noelios.restlet</groupId>\r
-            <artifactId>com.noelios.restlet.ext.httpclient</artifactId>\r
-            <version>1.0.7</version>\r
-        </dependency>\r
-        <dependency>\r
-            <groupId>com.noelios.restlet</groupId>\r
-            <artifactId>com.noelios.restlet</artifactId>\r
-            <version>1.0.7</version>\r
-        </dependency>\r
-\r
-        <dependency>\r
-            <groupId>jaxen</groupId>\r
-            <artifactId>jaxen</artifactId>\r
-            <version>1.1.1</version>\r
-        </dependency>\r
-\r
-\r
-    </dependencies>\r
-    \r
-    <build>\r
-        <finalName>collectionobject-service</finalName>\r
-        <plugins>\r
-            <plugin>\r
-                <groupId>org.codehaus.mojo</groupId>\r
-                <artifactId>jboss-maven-plugin</artifactId>\r
-                <configuration>\r
-                    <jbossHome>${jboss.dir}</jbossHome>\r
-                </configuration>\r
-\r
-<!--\r
-                <executions>\r
-                    <execution>\r
-                        <id>jboss-undeploy</id>\r
-                        <phase>pre-integration-test</phase>\r
-                        <goals>\r
-                            <goal>undeploy</goal>\r
-                        </goals>\r
-                        <configuration>\r
-                            <fileName>${basedir}/target/helloworld.war</fileName>\r
-                        </configuration>\r
-                    </execution>\r
-                    <execution>\r
-                        <id>jboss-deploy</id>\r
-                        <phase>pre-integration-test</phase>\r
-                        <goals>\r
-                            <goal>deploy</goal>\r
-                        </goals>\r
-                        <configuration>\r
-                            <fileName>${basedir}/target/helloworld.war</fileName>\r
-                        </configuration>\r
-                    </execution>\r
-                </executions>\r
--->                \r
-            </plugin>\r
-\r
-<!--\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-surefire-plugin</artifactId>\r
-                <configuration></configuration>\r
-                <executions>\r
-                    <execution>\r
-                        <id>surefire-it</id>\r
-                        <phase>integration-test</phase>\r
-                        <goals>\r
-                            <goal>test</goal>\r
-                        </goals>\r
-                        <configuration>\r
-                            <skip>false</skip>\r
-                        </configuration>\r
-                    </execution>\r
-                </executions>\r
-            </plugin>\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-war-plugin</artifactId>\r
-                <version>2.0</version>\r
-            </plugin>\r
-    -->\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-compiler-plugin</artifactId>\r
-                <configuration>\r
-                    <source>1.5</source>\r
-                    <target>1.5</target>\r
-                </configuration>\r
-            </plugin>\r
-        </plugins>\r
-    </build>\r
-</project>\r
diff --git a/services/collectionobject/service/pom.xml b/services/collectionobject/service/pom.xml
new file mode 100644 (file)
index 0000000..024c0e5
--- /dev/null
+++ b/services/collectionobject/service/pom.xml
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<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">\r
+\r
+    <parent>\r
+        <artifactId>org.collectionspace.services.collectionobject</artifactId>\r
+        <groupId>org.collectionspace.services</groupId>\r
+        <version>1.0</version>\r
+    </parent>\r
+    \r
+    <modelVersion>4.0.0</modelVersion>\r
+    <groupId>org.collectionspace.services</groupId>\r
+    <artifactId>org.collectionspace.services.collectionobject.service</artifactId>\r
+    <packaging>jar</packaging>\r
+    <version>1.0</version>\r
+    <name>services.collectionobject.service</name>\r
+\r
+    <dependencies>\r
+        <dependency>\r
+            <groupId>org.collectionspace.services</groupId>\r
+            <artifactId>org.collectionspace.services.common</artifactId>\r
+            <version>1.0</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.collectionspace.services</groupId>\r
+            <artifactId>org.collectionspace.services.collectionobject.jaxb</artifactId>\r
+            <version>1.0</version>\r
+        </dependency>\r
+        \r
+        <dependency>\r
+            <groupId>junit</groupId>\r
+            <artifactId>junit</artifactId>\r
+            <version>4.1</version>\r
+            <scope>test</scope>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.testng</groupId>\r
+            <artifactId>testng</artifactId>\r
+            <version>5.6</version>\r
+        </dependency>\r
+        \r
+\r
+      <!-- javax -->\r
+\r
+\r
+        <dependency>\r
+            <groupId>javax.security</groupId>\r
+            <artifactId>jaas</artifactId>\r
+            <version>1.0.01</version>\r
+            <scope>provided</scope>\r
+        </dependency>\r
+\r
+        <dependency>\r
+            <groupId>dom4j</groupId>\r
+            <artifactId>dom4j</artifactId>\r
+            <version>1.6.1</version>\r
+            <scope>provided</scope>\r
+        </dependency>\r
+        \r
+        <!-- jboss -->\r
+\r
+        <dependency>\r
+            <groupId>org.jboss.resteasy</groupId>\r
+            <artifactId>resteasy-jaxrs</artifactId>\r
+            <version>1.0.2.GA</version>\r
+            <exclusions>\r
+                <exclusion>\r
+                    <groupId>tjws</groupId>\r
+                    <artifactId>webserver</artifactId>\r
+                </exclusion>\r
+            </exclusions>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.jboss.resteasy</groupId>\r
+            <artifactId>resteasy-jaxb-provider</artifactId>\r
+            <version>1.0.2.GA</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>org.jboss.resteasy</groupId>\r
+            <artifactId>resteasy-multipart-provider</artifactId>\r
+            <version>1.0.2.GA</version>\r
+        </dependency>\r
+        \r
+        <!-- nuxeo -->\r
+\r
+        <dependency>\r
+            <groupId>org.nuxeo.ecm.core</groupId>\r
+            <artifactId>nuxeo-core-api</artifactId>\r
+            <version>${nuxeo.version.1.5}</version>\r
+            <exclusions>\r
+                <exclusion>\r
+                    <artifactId>jboss-remoting</artifactId>\r
+                    <groupId>jboss</groupId>\r
+                </exclusion>\r
+            </exclusions>\r
+        </dependency>\r
+\r
+        <dependency>\r
+            <groupId>org.restlet</groupId>\r
+            <artifactId>org.restlet</artifactId>\r
+            <version>1.0.7</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>com.noelios.restlet</groupId>\r
+            <artifactId>com.noelios.restlet.ext.httpclient</artifactId>\r
+            <version>1.0.7</version>\r
+        </dependency>\r
+        <dependency>\r
+            <groupId>com.noelios.restlet</groupId>\r
+            <artifactId>com.noelios.restlet</artifactId>\r
+            <version>1.0.7</version>\r
+        </dependency>\r
+\r
+    </dependencies>\r
+    \r
+    <build>\r
+        <finalName>collectionspace-services-commonobject</finalName>\r
+        <plugins>\r
+            <plugin>\r
+                <groupId>org.codehaus.mojo</groupId>\r
+                <artifactId>jboss-maven-plugin</artifactId>\r
+                <configuration>\r
+                    <jbossHome>${jboss.dir}</jbossHome>\r
+                </configuration>\r
+            </plugin>\r
+            <plugin>\r
+                <groupId>org.apache.maven.plugins</groupId>\r
+                <artifactId>maven-compiler-plugin</artifactId>\r
+                <configuration>\r
+                    <source>1.5</source>\r
+                    <target>1.5</target>\r
+                </configuration>\r
+            </plugin>\r
+        </plugins>\r
+    </build>\r
+</project>\r
diff --git a/services/common/pom.xml b/services/common/pom.xml
index fbcf4b7b2bc23b3348c7a725c6ff4aa5f1bbe8bd..2af9ac8c9b121a1c5a4ff2490c4154ef018a1ef4 100644 (file)
--- a/services/common/pom.xml
+++ b/services/common/pom.xml
@@ -1,116 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>\r
 <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">\r
-<!--    \r
-        <parent>\r
-        <artifactId>collectionspace-services</artifactId>\r
+    <parent>\r
+        <artifactId>org.collectionspace.services.main</artifactId>\r
         <groupId>org.collectionspace.services</groupId>\r
-        <version>0.1</version>\r
-        </parent> -->\r
-    \r
+        <version>1.0</version>\r
+    </parent>\r
     <modelVersion>4.0.0</modelVersion>\r
     <groupId>org.collectionspace.services</groupId>\r
-    <artifactId>org-collectionspace-services-common</artifactId>\r
+    <artifactId>org.collectionspace.services.common</artifactId>\r
     <packaging>jar</packaging>\r
-    <version>0.2</version>\r
-    <name>CollectionSpace Services Common</name>\r
-\r
-    <repositories>\r
-        <repository>\r
-            <id>java.net</id>\r
-            <url>http://download.java.net/maven/1</url>\r
-            <layout>legacy</layout>\r
-        </repository>\r
-        <repository>\r
-            <id>maven repo</id>\r
-            <name>maven repo</name>\r
-            <url>http://repo1.maven.org/maven2/</url>\r
-        </repository>\r
-        <!-- For resteasy -->\r
-        <repository>\r
-            <id>jboss</id>\r
-            <name>jboss repo</name>\r
-            <url>http://repository.jboss.org/maven2</url>\r
-        </repository>\r
-        <repository>\r
-            <id>mojo</id>\r
-            <name>mojo repo</name>\r
-            <url>http://svn.codehaus.org/mojo/trunk/mojo/jboss-maven-plugin</url>\r
-        </repository>\r
-\r
-        <repository>\r
-            <id>maven-restlet</id>\r
-            <name>Public online Restlet repository</name>\r
-            <url>http://maven.restlet.org</url>\r
-        </repository>\r
-        \r
-        <repository>\r
-            <id>cspace.local.nuxeo</id>\r
-            <url>${nuxeo.local.repo.dir}</url>\r
-        </repository>\r
-        <repository>\r
-            <id>cspace.local.nuxeo.client</id>\r
-            <url>${nuxeo.local.repo.client.dir}</url>\r
-        </repository>\r
-        <repository>\r
-            <id>public</id>\r
-            <url>http://maven.nuxeo.org/public</url>\r
-            <releases>\r
-            </releases>\r
-            <snapshots>\r
-                <enabled>false</enabled>\r
-            </snapshots>\r
-        </repository>\r
-        <repository>\r
-            <id>public-snapshot</id>\r
-            <url>http://maven.nuxeo.org/public-snapshot</url>\r
-            <releases>\r
-                <enabled>false</enabled>\r
-            </releases>\r
-            <snapshots>\r
-            </snapshots>\r
-        </repository>\r
-    </repositories>\r
-\r
-    <pluginRepositories>\r
-        <pluginRepository>\r
-            <id>public</id>\r
-            <url>http://maven.nuxeo.org/public</url>\r
-            <name>Nuxeo virtual release repository</name>\r
-            <releases>\r
-            </releases>\r
-            <snapshots>\r
-                <enabled>false</enabled>\r
-            </snapshots>\r
-        </pluginRepository>\r
-        <pluginRepository>\r
-            <id>public-snapshot</id>\r
-            <url>http://maven.nuxeo.org/public-snapshot</url>\r
-            <name>Nuxeo virtual snapshot repository</name>\r
-            <releases>\r
-                <enabled>false</enabled>\r
-            </releases>\r
-            <snapshots>\r
-            </snapshots>\r
-        </pluginRepository>\r
-    </pluginRepositories>\r
-\r
-\r
-    <properties>\r
-        <jboss.version>4.2.3.GA</jboss.version>\r
-        <jboss.ejb.version>3.0</jboss.ejb.version>\r
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
-        <apacheds.version>1.5.1</apacheds.version>\r
-        <apachedshared.version>0.9.7</apachedshared.version>\r
-        <nuxeo.version.5.2>5.2-SNAPSHOT</nuxeo.version.5.2>\r
-        <nuxeo.version.1.5>1.5-SNAPSHOT</nuxeo.version.1.5>\r
-    </properties>\r
+    <version>1.0</version>\r
+    <name>services.common</name>\r
 \r
     <dependencies>\r
-<!--        <dependency>\r
-            <groupId>org.collectionspace.hello.services</groupId>\r
-            <artifactId>helloworld-jaxb</artifactId>\r
-            <version>0.1</version>\r
-        </dependency> -->\r
         <dependency>\r
             <groupId>org.jboss.resteasy</groupId>\r
             <artifactId>resteasy-jaxrs</artifactId>\r
@@ -172,14 +74,6 @@
             </exclusions>\r
         </dependency>\r
 \r
-<!--\r
-        <dependency>\r
-            <groupId>org.nuxeo.ecm.core</groupId>\r
-            <artifactId>nuxeo-core-client</artifactId>\r
-            <version>${nuxeo.version.1.5}</version>\r
-        </dependency>\r
--->\r
-\r
         <dependency>\r
             <groupId>org.restlet</groupId>\r
             <artifactId>org.restlet</artifactId>\r
@@ -196,6 +90,7 @@
             <version>1.0.7</version>\r
         </dependency>\r
 \r
+        <!-- where is jaxen needed? -->\r
         <dependency>\r
             <groupId>jaxen</groupId>\r
             <artifactId>jaxen</artifactId>\r
@@ -204,25 +99,8 @@
     </dependencies>\r
     \r
     <build>\r
-        <finalName>org-collectionspace-services-common</finalName>\r
+        <finalName>collectionspace-services-common</finalName>\r
         <plugins>\r
-            <plugin>\r
-                <groupId>org.apache.maven.plugins</groupId>\r
-                <artifactId>maven-surefire-plugin</artifactId>\r
-                <configuration></configuration>\r
-                <executions>\r
-                    <execution>\r
-                        <id>surefire-it</id>\r
-                        <phase>integration-test</phase>\r
-                        <goals>\r
-                            <goal>test</goal>\r
-                        </goals>\r
-                        <configuration>\r
-                            <skip>false</skip>\r
-                        </configuration>\r
-                    </execution>\r
-                </executions>\r
-            </plugin>\r
             <plugin>\r
                 <groupId>org.apache.maven.plugins</groupId>\r
                 <artifactId>maven-compiler-plugin</artifactId>\r
diff --git a/services/nbactions.xml b/services/nbactions.xml
new file mode 100644 (file)
index 0000000..458dbd0
--- /dev/null
+++ b/services/nbactions.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<actions>\r
+        <action>\r
+            <actionName>rebuild</actionName>\r
+            <packagings>\r
+                <packaging>*</packaging>\r
+            </packagings>\r
+            <goals>\r
+                <goal>clean</goal>\r
+                <goal>install</goal>\r
+            </goals>\r
+            <properties>\r
+                <maven.test.skip>true</maven.test.skip>\r
+            </properties>\r
+        </action>\r
+    </actions>\r
diff --git a/services/pom.xml b/services/pom.xml
new file mode 100644 (file)
index 0000000..844aba0
--- /dev/null
+++ b/services/pom.xml
@@ -0,0 +1,188 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<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">\r
+    <parent>\r
+        <artifactId>org.collectionspace.services</artifactId>\r
+        <groupId>org.collectionspace.services</groupId>\r
+        <version>1.0</version>\r
+    </parent>\r
+    <modelVersion>4.0.0</modelVersion>\r
+    <groupId>org.collectionspace.services</groupId>\r
+    <version>1.0</version>\r
+    <artifactId>org.collectionspace.services.main</artifactId>\r
+    <packaging>pom</packaging>\r
+    <name>services.main</name>\r
+\r
+    <properties>\r
+        <jboss.version>4.2.3.GA</jboss.version>\r
+        <jboss.ejb.version>3.0</jboss.ejb.version>\r
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>\r
+        <nuxeo.version.5.2>5.2-SNAPSHOT</nuxeo.version.5.2>\r
+        <nuxeo.version.1.5>1.5-SNAPSHOT</nuxeo.version.1.5>\r
+    </properties>\r
+\r
+    <modules>\r
+        <module>common</module>\r
+        <module>client</module>\r
+        <module>collectionobject</module>\r
+    </modules>\r
+\r
+    <repositories>\r
+        <repository>\r
+            <id>maven-restlet</id>\r
+            <name>Public online Restlet repository</name>\r
+            <url>http://maven.restlet.org</url>\r
+        </repository>\r
+        <repository>\r
+            <id>cspace.local.nuxeo</id>\r
+            <url>${nuxeo.local.repo.dir}</url>\r
+        </repository>\r
+        <repository>\r
+            <id>cspace.local.nuxeo.client</id>\r
+            <url>${nuxeo.local.repo.client.dir}</url>\r
+        </repository>\r
+        <repository>\r
+            <id>public</id>\r
+            <url>http://maven.nuxeo.org/public</url>\r
+            <releases>\r
+            </releases>\r
+            <snapshots>\r
+                <enabled>false</enabled>\r
+            </snapshots>\r
+        </repository>\r
+        <repository>\r
+            <id>public-snapshot</id>\r
+            <url>http://maven.nuxeo.org/public-snapshot</url>\r
+            <releases>\r
+                <enabled>false</enabled>\r
+            </releases>\r
+            <snapshots>\r
+            </snapshots>\r
+        </repository>\r
+    </repositories>\r
+    \r
+    <pluginRepositories>\r
+        <pluginRepository>\r
+            <id>public</id>\r
+            <url>http://maven.nuxeo.org/public</url>\r
+            <name>Nuxeo virtual release repository</name>\r
+            <releases>\r
+            </releases>\r
+            <snapshots>\r
+                <enabled>false</enabled>\r
+            </snapshots>\r
+        </pluginRepository>\r
+        <pluginRepository>\r
+            <id>public-snapshot</id>\r
+            <url>http://maven.nuxeo.org/public-snapshot</url>\r
+            <name>Nuxeo virtual snapshot repository</name>\r
+            <releases>\r
+                <enabled>false</enabled>\r
+            </releases>\r
+            <snapshots>\r
+            </snapshots>\r
+        </pluginRepository>\r
+    </pluginRepositories>\r
+\r
+    <build>\r
+        <pluginManagement>\r
+            <plugins>\r
+                <plugin>\r
+                    <groupId>org.apache.maven.plugins</groupId>\r
+                    <artifactId>maven-compiler-plugin</artifactId>\r
+                    <configuration>\r
+                        <source>1.5</source>\r
+                        <target>1.5</target>\r
+                    </configuration>\r
+                </plugin>\r
+                <plugin>\r
+                    <groupId>org.apache.maven.plugins</groupId>\r
+                    <artifactId>maven-site-plugin</artifactId>\r
+                    <configuration>\r
+                        <unzipCommand>/usr/bin/unzip -o &gt; err.txt</unzipCommand>\r
+                    </configuration>\r
+                </plugin>\r
+                <plugin>\r
+                    <groupId>org.apache.maven.plugins</groupId>\r
+                    <artifactId>maven-war-plugin</artifactId>\r
+                    <version>2.0.1</version>\r
+                    <configuration>\r
+                        <warSourceExcludes>WEB-INF/lib/*.jar</warSourceExcludes>\r
+                        <archive>\r
+                            <manifest>\r
+                                <addClasspath>true</addClasspath>\r
+\r
+                            </manifest>\r
+                        </archive>\r
+                    </configuration>\r
+                </plugin>\r
+            </plugins>\r
+        </pluginManagement>\r
+    </build>\r
+    <dependencyManagement>\r
+        <dependencies>\r
+            <dependency>\r
+                <groupId>net.java.dev.jaxb2-commons</groupId>\r
+                <artifactId>jaxb-fluent-api</artifactId>\r
+                <version>2.0.1</version>\r
+            </dependency>\r
+            <dependency>\r
+                <groupId>org.testng</groupId>\r
+                <artifactId>testng</artifactId>\r
+                <version>5.6</version>\r
+                <scope>test</scope>\r
+                <classifier>jdk15</classifier>\r
+            </dependency>\r
+            <dependency>\r
+                <groupId>org.jboss.resteasy</groupId>\r
+                <artifactId>jaxrs-api</artifactId>\r
+                <version>1.0.2.GA</version>\r
+            </dependency>\r
+            <dependency>\r
+                <groupId>net.java.dev.jaxb2-commons</groupId>\r
+                <artifactId>jaxb-fluent-api</artifactId>\r
+                <version>2.0.1</version>\r
+            </dependency>\r
+            <dependency>\r
+                <groupId>org.jvnet.jaxb2-commons</groupId>\r
+                <artifactId>property-listener-injector</artifactId>\r
+                <version>1.0</version>\r
+            </dependency>\r
+            <dependency>\r
+                <groupId>org.jvnet.jaxb2_commons</groupId>\r
+                <artifactId>runtime</artifactId>\r
+                <version>0.4.1</version>\r
+            </dependency>\r
+            <dependency>\r
+                <groupId>org.jboss.resteasy</groupId>\r
+                <artifactId>resteasy-jaxrs</artifactId>\r
+                <version>1.0.2.GA</version>\r
+            </dependency>\r
+            <dependency>\r
+                <groupId>commons-httpclient</groupId>\r
+                <artifactId>commons-httpclient</artifactId>\r
+                <version>3.1</version>\r
+            </dependency>\r
+            <dependency>\r
+                <groupId>com.sun.xml.bind</groupId>\r
+                <artifactId>jaxb-impl</artifactId>\r
+                <version>2.1.7</version>\r
+            </dependency>\r
+            <dependency>\r
+                <groupId>org.slf4j</groupId>\r
+                <artifactId>slf4j-api</artifactId>\r
+                <version>1.5.2</version>\r
+            </dependency>\r
+            <dependency>\r
+                <groupId>org.slf4j</groupId>\r
+                <artifactId>slf4j-log4j12</artifactId>\r
+                <version>1.5.2</version>\r
+            </dependency>\r
+            <dependency>\r
+                <groupId>mysql</groupId>\r
+                <artifactId>mysql-connector-java</artifactId>\r
+                <version>5.1.5</version>\r
+                <scope>test</scope>\r
+            </dependency>\r
+        </dependencies>\r
+    </dependencyManagement>\r
+</project>\r