cspace-62 added ant build for collectionobject. co doctype is copied to correct lcoat...

M    services/authentication/build.xml
M    services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
A    services/collectionobject/3rdparty/build.xml
A    services/collectionobject/build.xml
M    services/JaxRsServiceProvider/pom.xml
M    services/JaxRsServiceProvider/build.xml
M    services/common/build.xml
M    services/pom.xml
M    services/id/service/pom.xml
M    services/build.xml
M    3rdparty/nuxeo/build.xml
M    3rdparty/build.xml
M    build.xml

diff --git a/3rdparty/build.xml b/3rdparty/build.xml
index 8f8b43231d21f935e8568fd704bf0a8edbf2de23..fa903f93dcc363b3c7fc8c2fefb300247b6d865c 100644 (file)
--- a/3rdparty/build.xml
+++ b/3rdparty/build.xml
@@ -51,7 +51,31 @@
             <arg value="${mvn.opts}" />\r
         </exec>\r
     </target>\r
-\r
+    \r
+    <target name="install" depends="package,install-unix,install-windows"\r
+  description="Install" />\r
+    <target name="install-unix" if="osfamily-unix">\r
+        <exec executable="mvn" failonerror="true">\r
+            <arg value="install" />\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="install-windows" if="osfamily-windows">\r
+        <exec executable="cmd" failonerror="true">\r
+            <arg value="/c" />\r
+            <arg value="mvn.bat" />\r
+            <arg value="install" />\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
     <target name="clean" depends="clean-unix,clean-windows"\r
   description="Delete target directories" >\r
@@ -88,7 +112,7 @@
         </exec>\r
     </target>\r
 \r
-    <target name="deploy" depends="package"\r
+    <target name="deploy" depends="install"\r
     description="deploy 3rdparty stuff in ${jboss.server.cspace}">\r
         <ant antfile="nuxeo/build.xml" target="deploy" inheritall="false"/>\r
     </target>\r

diff --git a/3rdparty/nuxeo/build.xml b/3rdparty/nuxeo/build.xml
index 46355799e8531334a9cbf8686499a987aedfb08b..d984e65fb6b7eb59d19cb02c54da4e3dabe51108 100644 (file)
--- a/3rdparty/nuxeo/build.xml
+++ b/3rdparty/nuxeo/build.xml
@@ -52,6 +52,30 @@
         </exec>\r
     </target>\r
 \r
+    <target name="install" depends="package,install-unix,install-windows"\r
+  description="Install" />\r
+    <target name="install-unix" if="osfamily-unix">\r
+        <exec executable="mvn" failonerror="true">\r
+            <arg value="install" />\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="install-windows" if="osfamily-windows">\r
+        <exec executable="cmd" failonerror="true">\r
+            <arg value="/c" />\r
+            <arg value="mvn.bat" />\r
+            <arg value="install" />\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
     <target name="clean" depends="clean-unix,clean-windows"\r
   description="Delete target directories" >\r
@@ -88,7 +112,7 @@
         </exec>\r
     </target>\r
 \r
-    <target name="deploy" depends="package"\r
+    <target name="deploy" depends="install"\r
     description="deploy nuxeo client libs to ${jboss.server.cspace}">\r
         <copy todir="${jboss.server.cspace}/nuxeo-client">\r
             <fileset dir="${basedir}/nuxeo-client"/>\r

diff --git a/build.xml b/build.xml
index f8e34c8cc4b9148e77a35db9362b276106e43dc4..820e111aa98c76c177cde0e04f092ceee033ef5d 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -14,7 +14,6 @@
     <property name="db.script.dir" location="${basedir}/src/main/resources/scripts/db/${db}"/>\r
 \r
 \r
-\r
     <condition property="osfamily-unix">\r
         <os family="unix" />\r
     </condition>\r
@@ -22,7 +21,7 @@
         <os family="windows" />\r
     </condition>\r
 \r
-    <target name="init" depends="setup">\r
+    <target name="init">\r
     <!-- Create the time stamp -->\r
         <tstamp/>\r
     <!-- Create the build directory structure used by compile -->\r
@@ -97,7 +96,7 @@
         </tar>\r
     </target>\r
 \r
-    <target name="package" depends="setup,package-unix,package-windows"\r
+    <target name="package" depends="package-unix,package-windows"\r
   description="Package CollectionSpace Services" />\r
     <target name="package-unix" if="osfamily-unix">\r
         <exec executable="mvn" failonerror="true">\r
@@ -122,6 +121,31 @@
         </exec>\r
     </target>\r
 \r
+    <target name="install" depends="package,install-unix,install-windows"\r
+  description="Install" />\r
+    <target name="install-unix" if="osfamily-unix">\r
+        <exec executable="mvn" failonerror="true">\r
+            <arg value="install" />\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="install-windows" if="osfamily-windows">\r
+        <exec executable="cmd" failonerror="true">\r
+            <arg value="/c" />\r
+            <arg value="mvn.bat" />\r
+            <arg value="install" />\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
@@ -160,8 +184,7 @@
     </target>\r
 \r
     <target name="create_db"\r
-    description="create database(s), grant privileges to test users"\r
-    depends="setup">\r
+    description="create database(s), grant privileges to test users">\r
         <sql driver="com.mysql.jdbc.Driver"\r
         url="jdbc:mysql://localhost:3306/cspace"\r
         userid="root"\r
@@ -174,14 +197,14 @@
         </sql>\r
     </target>\r
 \r
-    <target name="deploy" depends="package"\r
+    <target name="deploy" depends="install"\r
     description="deploy services in ${jboss.server.cspace}">\r
         <ant antfile="services/build.xml" target="deploy" inheritall="false"/>\r
         <ant antfile="3rdparty/build.xml" target="deploy" inheritall="false"/>\r
         <copy file="${basedir}/target/${cspace-services.war}" todir="${jboss.lib.cspace}"/>\r
     </target>\r
 \r
-    <target name="undeploy" depends="setup"\r
+    <target name="undeploy"\r
     description="undeploy authentication service from ${jboss.server.cspace}">\r
         <ant antfile="services/build.xml" target="undeploy" inheritall="false"/>\r
         <ant antfile="3rdparty/build.xml" target="undeploy" inheritall="false"/>\r

diff --git a/services/JaxRsServiceProvider/build.xml b/services/JaxRsServiceProvider/build.xml
index d984b062e2f14813df7074e06c000bd50cc488f5..971f5d3c576affc7ad76c94577a7d01a9b9cf487 100644 (file)
--- a/services/JaxRsServiceProvider/build.xml
+++ b/services/JaxRsServiceProvider/build.xml
@@ -27,6 +27,30 @@
 
     </target>
 
+    <target name="install" depends="package,install-unix,install-windows"
+  description="Install" />
+    <target name="install-unix" if="osfamily-unix">
+        <exec executable="mvn" failonerror="true">
+            <arg value="install" />
+            <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="install-windows" if="osfamily-windows">
+        <exec executable="cmd" failonerror="true">
+            <arg value="/c" />
+            <arg value="mvn.bat" />
+            <arg value="install" />
+            <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" depends="package-unix,package-windows"
   description="Package CollectionSpace Services" />
@@ -89,7 +113,7 @@
         </exec>
     </target>
 
-    <target name="deploy" depends="package"
+    <target name="deploy" depends="install"
     description="deploy authentication service in ${jboss.server.cspace}">
         <copy file="${basedir}/target/${cspace-services.war}" todir="${jboss.server.cspace}/deploy"/>
     </target>

diff --git a/services/JaxRsServiceProvider/pom.xml b/services/JaxRsServiceProvider/pom.xml
index 83bdb6a83c0fc583259271985b5f9c8710ef2658..80073564a6200099463975051acaf7990d918feb 100644 (file)
--- a/services/JaxRsServiceProvider/pom.xml
+++ b/services/JaxRsServiceProvider/pom.xml
@@ -154,7 +154,6 @@
                 <executions>\r
                     <execution>\r
                         <id>jboss-undeploy</id>\r
-                        <phase>pre-integration-test</phase>\r
                         <goals>\r
                             <goal>undeploy</goal>\r
                         </goals>\r
@@ -166,7 +165,6 @@
                     </execution>\r
                     <execution>\r
                         <id>jboss-deploy</id>\r
-                        <phase>pre-integration-test</phase>\r
                         <goals>\r
                             <goal>deploy</goal>\r
                         </goals>\r

diff --git a/services/authentication/build.xml b/services/authentication/build.xml
index 9978f2a074c9c4ba426ea877959c953b681a88dc..d2a0615f1ddd0b259e5f7393ceaff4cde79c64ba 100644 (file)
--- a/services/authentication/build.xml
+++ b/services/authentication/build.xml
@@ -53,7 +53,31 @@
         </exec>\r
     </target>\r
 \r
-\r
+    <target name="install" depends="package,install-unix,install-windows"\r
+  description="Install" />\r
+    <target name="install-unix" if="osfamily-unix">\r
+        <exec executable="mvn" failonerror="true">\r
+            <arg value="install" />\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="install-windows" if="osfamily-windows">\r
+        <exec executable="cmd" failonerror="true">\r
+            <arg value="/c" />\r
+            <arg value="mvn.bat" />\r
+            <arg value="install" />\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
     <target name="clean" depends="clean-unix,clean-windows"\r
   description="Delete target directories" >\r
         <delete dir="${build}"/>\r
@@ -89,7 +113,7 @@
         </exec>\r
     </target>\r
 \r
-    <target name="deploy" depends="package"\r
+    <target name="deploy" depends="install"\r
     description="deploy authentication service in ${jboss.server.cspace}">\r
         <copy file="${basedir}/target/${authentication.jar}" todir="${jboss.server.cspace}/lib"/>\r
         <echo message="Add authentication-policy to ${jboss.server.cspace}/conf/login-config.xml"/>\r

diff --git a/services/build.xml b/services/build.xml
index 7241d51a0aeb477b98b59c38a2241fffcb7ebf39..998c990877d2deaffeb14d809e055204255b6ef9 100644 (file)
--- a/services/build.xml
+++ b/services/build.xml
@@ -46,6 +46,31 @@
     </target>\r
 \r
 \r
+    <target name="install" depends="package,install-unix,install-windows"\r
+  description="Install" />\r
+    <target name="install-unix" if="osfamily-unix">\r
+        <exec executable="mvn" failonerror="true">\r
+            <arg value="install" />\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="install-windows" if="osfamily-windows">\r
+        <exec executable="cmd" failonerror="true">\r
+            <arg value="/c" />\r
+            <arg value="mvn.bat" />\r
+            <arg value="install" />\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
     <target name="clean" depends="clean-unix,clean-windows"\r
   description="Delete target directories" >\r
         <delete dir="${build}"/>\r
@@ -81,10 +106,11 @@
         </exec>\r
     </target>\r
 \r
-    <target name="deploy" depends="package"\r
+    <target name="deploy" depends="install"\r
     description="deploy services in ${jboss.server.cspace}">\r
         <ant antfile="authentication/build.xml" target="deploy" inheritall="false"/>\r
         <ant antfile="common/build.xml" target="deploy" inheritall="false"/>\r
+        <ant antfile="collectionobject/build.xml" target="deploy" inheritall="false"/>\r
         <ant antfile="JaxRsServiceProvider/build.xml" target="deploy" inheritall="false"/>\r
     </target>\r
 \r
@@ -92,6 +118,7 @@
     description="undeploy authentication service from ${jboss.server.cspace}">\r
         <ant antfile="authentication/build.xml" target="undeploy" inheritall="false"/>\r
         <ant antfile="common/build.xml" target="undeploy" inheritall="false"/>\r
+        <ant antfile="collectionobject/build.xml" target="undeploy" inheritall="false"/>\r
         <ant antfile="JaxRsServiceProvider/build.xml" target="undeploy" inheritall="false"/>\r
     </target>\r
 \r

diff --git a/services/collectionobject/3rdparty/build.xml b/services/collectionobject/3rdparty/build.xml
new file mode 100644 (file)
index 0000000..1a281d0
--- /dev/null
+++ b/services/collectionobject/3rdparty/build.xml
@@ -0,0 +1,126 @@
+\r
+<project name="services.collectionobject.3rdparty" default="package" basedir=".">\r
+    <description>\r
+        collectionspace authentication service\r
+    </description>\r
+  <!-- set global properties for this build -->\r
+    <property name="services.trunk" value="../../.."/>\r
+    <property file="${services.trunk}/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
+\r
+    <condition property="osfamily-unix">\r
+        <os family="unix" />\r
+    </condition>\r
+    <condition property="osfamily-windows">\r
+        <os family="windows" />\r
+    </condition>\r
+\r
+    <target name="init" >\r
+    <!-- Create the time stamp -->\r
+        <tstamp/>\r
+    <!-- Create the build directory structure used by compile -->\r
+        <mkdir dir="${build}"/>\r
+\r
+    </target>\r
+\r
+    <target name="package" depends="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
+    <target name="install" depends="package,install-unix,install-windows"\r
+  description="Install" />\r
+    <target name="install-unix" if="osfamily-unix">\r
+        <exec executable="mvn" failonerror="true">\r
+            <arg value="install" />\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="install-windows" if="osfamily-windows">\r
+        <exec executable="cmd" failonerror="true">\r
+            <arg value="/c" />\r
+            <arg value="mvn.bat" />\r
+            <arg value="install" />\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
+    <target name="clean" depends="clean-unix,clean-windows"\r
+  description="Delete target directories" >\r
+        <delete dir="${build}"/>\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
+    <target name="deploy" depends="install"\r
+    description="deploy common elements in ${jboss.server.cspace}">\r
+        <ant antfile="nuxeo-platform-cs-collectionobject/build.xml" target="deploy" inheritall="false"/>\r
+    </target>\r
+\r
+    <target name="undeploy"\r
+    description="undeploy common elements from ${jboss.server.cspace}">\r
+        <ant antfile="nuxeo-platform-cs-collectionobject/build.xml" target="undeploy" inheritall="false"/>\r
+    </target>\r
+\r
+\r
+\r
+</project>\r

diff --git a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
index d4e3b266c1a9c04993b85840d4b7234c04f886c1..df6ca15ed2e8adacb27138ff7c84f77096f512c1 100644 (file)
--- a/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
+++ b/services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
@@ -1,14 +1,128 @@
-<?xml version="1.0"?>
-<project name="nuxeo cs" default="all" basedir=".">
-
-  <property file="build.properties" />
-  <property name="cs.nuxeo.jar" value="nuxeo-platform-collectionspace-5.2-SNAPSHOT.jar"/>
-
-  <target name="all" description="all">
-    <delete file="${jboss.nuxeo.ear.dir}/system/${cs.nuxeo.jar}"/>
-    <copy todir="${jboss.nuxeo.ear.dir}/system">
-      <fileset file="${basedir}/target/${cs.nuxeo.jar}" />
-    </copy>
-  </target>
-
-</project>
+\r
+<project name="nuxeo-platform-cs-collectionobject" default="package" basedir=".">\r
+    <description>\r
+        collectionobject nuxeo document type\r
+    </description>\r
+  <!-- set global properties for this build -->\r
+    <property name="services.trunk" value="../../../.."/>\r
+    <property file="${services.trunk}/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
+    <property name="nuxeo.collectionobject.jar" value="nuxeo-platform-cs-collectionobject-5.2-SNAPSHOT.jar"/>\r
+\r
+    <condition property="osfamily-unix">\r
+        <os family="unix" />\r
+    </condition>\r
+    <condition property="osfamily-windows">\r
+        <os family="windows" />\r
+    </condition>\r
+\r
+    <target name="init" >\r
+    <!-- Create the time stamp -->\r
+        <tstamp/>\r
+    <!-- Create the build directory structure used by compile -->\r
+        <mkdir dir="${build}"/>\r
+\r
+    </target>\r
+\r
+    <target name="package" depends="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
+    <target name="install" depends="package,install-unix,install-windows"\r
+  description="Install" />\r
+    <target name="install-unix" if="osfamily-unix">\r
+        <exec executable="mvn" failonerror="true">\r
+            <arg value="install" />\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="install-windows" if="osfamily-windows">\r
+        <exec executable="cmd" failonerror="true">\r
+            <arg value="/c" />\r
+            <arg value="mvn.bat" />\r
+            <arg value="install" />\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
+    <target name="clean" depends="clean-unix,clean-windows"\r
+  description="Delete target directories" >\r
+        <delete dir="${build}"/>\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
+    <target name="deploy" depends="install"\r
+    description="deploy common elements in ${jboss.server.cspace}">\r
+        <copy file="${basedir}/target/${nuxeo.collectionobject.jar}"\r
+        todir="${nuxeo.dir}"/>\r
+    </target>\r
+\r
+    <target name="undeploy"\r
+    description="undeploy common elements from ${jboss.server.cspace}">\r
+        <delete file="${nuxeo.dir}/${nuxeo.collectionobject.jar}"/>\r
+    </target>\r
+\r
+\r
+\r
+</project>\r

diff --git a/services/collectionobject/build.xml b/services/collectionobject/build.xml
new file mode 100644 (file)
index 0000000..77cd5ef
--- /dev/null
+++ b/services/collectionobject/build.xml
@@ -0,0 +1,121 @@
+\r
+<project name="collectionobject" default="package" basedir=".">\r
+    <description>\r
+        collectionobject service\r
+    </description>\r
+  <!-- set global properties for this build -->\r
+    <property name="services.trunk" value="../.."/>\r
+    <property file="${services.trunk}/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
+\r
+    <condition property="osfamily-unix">\r
+        <os family="unix" />\r
+    </condition>\r
+    <condition property="osfamily-windows">\r
+        <os family="windows" />\r
+    </condition>\r
+\r
+    <target name="package" depends="package-unix,package-windows"\r
+  description="Package CollectionSpace Services" />\r
+  \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
+    \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="install" depends="package,install-unix,install-windows"\r
+  description="Install" />\r
+    <target name="install-unix" if="osfamily-unix">\r
+        <exec executable="mvn" failonerror="true">\r
+            <arg value="install" />\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="install-windows" if="osfamily-windows">\r
+        <exec executable="cmd" failonerror="true">\r
+            <arg value="/c" />\r
+            <arg value="mvn.bat" />\r
+            <arg value="install" />\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
+    <target name="clean" depends="clean-unix,clean-windows"\r
+  description="Delete target directories" >\r
+        <delete dir="${build}"/>\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
+    <target name="deploy" depends="install"\r
+    description="deploy services in ${jboss.server.cspace}">\r
+        <ant antfile="3rdparty/build.xml" target="deploy" inheritall="false"/>\r
+    </target>\r
+\r
+    <target name="undeploy"\r
+    description="undeploy authentication service from ${jboss.server.cspace}">\r
+        <ant antfile="3rdparty/build.xml" target="undeploy" inheritall="false"/>\r
+    </target>\r
+\r
+\r
+\r
+</project>\r

diff --git a/services/common/build.xml b/services/common/build.xml
index 6a80765743dd4f12044c8bc9c7e6743783a21c85..31644b2899094abe50af3fb5ed33a772af48b53d 100644 (file)
--- a/services/common/build.xml
+++ b/services/common/build.xml
@@ -51,7 +51,31 @@
         </exec>\r
     </target>\r
 \r
-\r
+    <target name="install" depends="package,install-unix,install-windows"\r
+  description="Install" />\r
+    <target name="install-unix" if="osfamily-unix">\r
+        <exec executable="mvn" failonerror="true">\r
+            <arg value="install" />\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="install-windows" if="osfamily-windows">\r
+        <exec executable="cmd" failonerror="true">\r
+            <arg value="/c" />\r
+            <arg value="mvn.bat" />\r
+            <arg value="install" />\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
     <target name="clean" depends="clean-unix,clean-windows"\r
   description="Delete target directories" >\r
         <delete dir="${build}"/>\r
@@ -87,7 +111,7 @@
         </exec>\r
     </target>\r
 \r
-    <target name="deploy" depends="package"\r
+    <target name="deploy" depends="install"\r
     description="deploy common elements in ${jboss.server.cspace}">\r
         <copy file="${basedir}/src/main/config/service-config.xml"\r
         todir="${jboss.server.cspace}/cspace/config/services"/>\r

diff --git a/services/id/service/pom.xml b/services/id/service/pom.xml
index c936752c9d07b775286ca85f45e9b9058420005f..3c90f2664f69eec74b4e9700da3e54c6ee00d2c1 100644 (file)
--- a/services/id/service/pom.xml
+++ b/services/id/service/pom.xml
@@ -159,7 +159,7 @@
   
   <!-- Build element: declares the project's directory structure and manages plugins. -->
   <build>
-    <finalName>collectionspace-services-commonobject</finalName>
+    <finalName>collectionspace-services-id</finalName>
     <plugins>
       <plugin>
         <!-- The Mojo project manages a collection of plugins for Maven 2. -->

diff --git a/services/pom.xml b/services/pom.xml
index dcf87756a59685ca537f139fc46f26982f5f28aa..cf53bde2b31c56f55d60b144ffed67ff6403b367 100644 (file)
--- a/services/pom.xml
+++ b/services/pom.xml
@@ -36,14 +36,6 @@
             <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>