]> git.aero2k.de Git - tmp/jakarta-migration.git/commitdiff
CSPACE-303 added dist(ribution) target to all ant build files (where reqd.) in order...
authorSanjay Dalal <sanjay.dalal@berkeley.edu>
Fri, 10 Jul 2009 23:35:10 +0000 (23:35 +0000)
committerSanjay Dalal <sanjay.dalal@berkeley.edu>
Fri, 10 Jul 2009 23:35:10 +0000 (23:35 +0000)
M    services/authentication/build.xml
M    services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml
M    services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
M    services/collectionobject/3rdparty/pom.xml
M    services/collectionobject/3rdparty/build.xml
M    services/collectionobject/build.xml
D    services/JaxRsServiceProvider/build.properties
M    services/JaxRsServiceProvider/build.xml
M    services/common/build.xml
_M   services/intake/service
_M   services/intake/jaxb
M    services/intake/3rdparty/pom.xml
_M   services/intake/3rdparty/nuxeo-platform-cs-intake
D    services/intake/3rdparty/nuxeo-platform-cs-intake/build.properties
M    services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml
M    services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml
A    services/intake/3rdparty/build.xml
_M   services/intake/client
A    services/intake/build.xml
_M   services/id/service
_M   services/id/jaxb
M    services/relation/3rdparty/pom.xml
M    services/relation/3rdparty/build.xml
M    services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml
M    services/relation/3rdparty/nuxeo-platform-cs-relation/build.xml
M    services/relation/build.xml
M    services/build.xml
D    src/main/assembly
D    src/main/config
D    src/main/filters
D    src/main/resources/schemas
D    src/main/webapp
M    3rdparty/nuxeo/build.xml
M    3rdparty/build.xml
M    build.properties
M    build.xml
M    pom.xml

26 files changed:
3rdparty/build.xml
3rdparty/nuxeo/build.xml
build.properties
build.xml
pom.xml
services/JaxRsServiceProvider/build.properties [deleted file]
services/JaxRsServiceProvider/build.xml
services/authentication/build.xml
services/build.xml
services/collectionobject/3rdparty/build.xml
services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/build.xml
services/collectionobject/3rdparty/nuxeo-platform-cs-collectionobject/pom.xml
services/collectionobject/3rdparty/pom.xml
services/collectionobject/build.xml
services/common/build.xml
services/intake/3rdparty/build.xml [new file with mode: 0644]
services/intake/3rdparty/nuxeo-platform-cs-intake/build.properties [deleted file]
services/intake/3rdparty/nuxeo-platform-cs-intake/build.xml
services/intake/3rdparty/nuxeo-platform-cs-intake/pom.xml
services/intake/3rdparty/pom.xml
services/intake/build.xml [new file with mode: 0644]
services/relation/3rdparty/build.xml
services/relation/3rdparty/nuxeo-platform-cs-relation/build.xml
services/relation/3rdparty/nuxeo-platform-cs-relation/pom.xml
services/relation/3rdparty/pom.xml
services/relation/build.xml

index fa903f93dcc363b3c7fc8c2fefb300247b6d865c..9eb10375dbe15101dd52b6423b535f34873aee57 100644 (file)
@@ -1,7 +1,7 @@
 \r
 <project name="3rdparty" default="package" basedir=".">\r
     <description>\r
-        collectionspace authentication service\r
+        collectionspace 3rdparty\r
     </description>\r
   <!-- set global properties for this build -->\r
     <property name="services.trunk" value=".."/>\r
     </target>\r
 \r
     <target name="deploy" depends="install"\r
-    description="deploy 3rdparty stuff in ${jboss.server.cspace}">\r
+    description="deploy 3rdparty in ${jboss.server.cspace}">\r
         <ant antfile="nuxeo/build.xml" target="deploy" inheritall="false"/>\r
     </target>\r
 \r
     <target name="undeploy"\r
-    description="undeploy authentication service from ${jboss.server.cspace}">\r
+    description="undeploy 3rdparty from ${jboss.server.cspace}">\r
         <ant antfile="nuxeo/build.xml" target="undeploy" inheritall="false"/>\r
     </target>\r
 \r
+    <target name="dist"\r
+    description="generate distribution for 3rdparty">\r
+        <ant antfile="nuxeo/build.xml" target="dist" inheritall="false"/>\r
+    </target>\r
 \r
 </project>\r
index d984e65fb6b7eb59d19cb02c54da4e3dabe51108..f4633c47077e9c1a297cf642eab81a83dc8f4c4c 100644 (file)
@@ -1,7 +1,7 @@
 \r
 <project name="nuxeo" default="package" basedir=".">\r
     <description>\r
-        collectionspace authentication service\r
+        collectionspace nuxeo\r
     </description>\r
   <!-- set global properties for this build -->\r
     <property name="services.trunk" value="../.."/>\r
         <delete dir="${jboss.server.cspace}/nuxeo-client"/>\r
     </target>\r
 \r
+    <target name="dist"\r
+    description="generate distribution for nuxeo client libs">\r
+        <copy todir="${services.trunk}/${dist.server.cspace}/nuxeo-client">\r
+            <fileset dir="${basedir}/nuxeo-client"/>\r
+        </copy>\r
+    </target>\r
 \r
 </project>\r
index a6ad561a07f11cabc9ab7a7dbbf0f64dfaa4303b..fdfd1f50f0286e71c06b53e796253ba235f71d55 100644 (file)
@@ -1,18 +1,49 @@
-jboss.release=jboss-4.2.3.GA\r
+#cspace\r
+cspace.release=0.2\r
+cspace.services.release=cspace-services-${cspace.release}\r
+\r
+domain.cspace=cspace\r
+domain.nuxeo=default\r
+\r
+#nuxeo\r
+nuxeo.release=5.2.M4\r
+nuxeo.ear=nuxeo.ear\r
+nuxeo.system=${nuxeo.ear}/system\r
+\r
+#distribution\r
+dist=dist\r
+dist.cspace=${dist}/cspace\r
+dist.nuxeo=${dist}/nuxeo\r
+\r
+#dist cspace domain\r
+dist.domain.cspace=${domain.cspace}\r
+dist.server.cspace=${dist.cspace}/server/${jboss.domain.cspace}\r
+dist.deploy.cspace=${dist.server.cspace}/deploy\r
+dist.lib.cspace=${dist.server.cspace}/lib\r
+\r
+#dist nuxeo domain\r
+dist.domain.nuxeo=${domain.nuxeo}\r
+dist.server.nuxeo=${dist.nuxeo}/server/${jboss.domain.nuxeo}\r
+dist.deploy.nuxeo=${dist.server.nuxeo}/deploy\r
+dist.lib.nuxeo=${dist.server.nuxeo}/lib\r
+dist.deploy.nuxeo.system=${dist.deploy.nuxeo}/${nuxeo.system}\r
+\r
+#jboss\r
 #assumption: both nuxeo and cspace domains are using the same JBoss installation\r
+jboss.release=jboss-4.2.3.GA\r
 jboss.dir=C:/dev/${jboss.release}\r
 jboss.home=${jboss.dir}\r
-jboss.domain.cspace=cspace\r
-jboss.domain.nuxeo=default\r
+\r
+#jboss cspace domain\r
+jboss.domain.cspace=${domain.cspace}\r
 jboss.server.cspace=${jboss.home}/server/${jboss.domain.cspace}\r
 jboss.deploy.cspace=${jboss.server.cspace}/deploy\r
 jboss.lib.cspace=${jboss.server.cspace}/lib\r
+\r
+#jboss nuxeo domain\r
+jboss.domain.nuxeo=${domain.nuxeo}\r
 jboss.server.nuxeo=${jboss.home}/server/${jboss.domain.nuxeo}\r
-jboss.deploy.nuxeo="${jboss.server.nuxeo}/deploy\r
+jboss.deploy.nuxeo=${jboss.server.nuxeo}/deploy\r
 jboss.lib.nuxeo=${jboss.server.nuxeo}/lib\r
-cspace.release=cspace-1.0\r
-cspace.services.release=services-${cspace.release}\r
-nuxeo.release=nuxeo-5.2.M4\r
-nuxeo.dir=${jboss.dir}/server/default/deploy/nuxeo.ear/system\r
-nuxeo.local.repo.dir=file:///${jboss.dir}/server/default/deploy/nuxeo.ear/system\r
+jboss.deploy.nuxeo.system=${jboss.deploy.nuxeo}/${nuxeo.system}\r
 \r
index 820e111aa98c76c177cde0e04f092ceee033ef5d..0e67881f84639d4a63883b571050346d9a8f9756 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -7,8 +7,6 @@
     <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
 \r
     <property name="db" value="mysql"/>\r
     <property name="db.script.dir" location="${basedir}/src/main/resources/scripts/db/${db}"/>\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="compile" depends="init"\r
-        description="compile the source " >\r
-    <!-- Compile the java code from ${src} into ${build} -->\r
-        <javac srcdir="${src}" destdir="${build}"/>\r
-\r
+    <target name="dist" depends="install"\r
+    description="generate cspace service distribution">\r
+        <!-- Create the distribution directory -->\r
+        <mkdir dir="${basedir}/dist"/>\r
+        <!-- copy db scripts, etc. -->\r
+        <copy todir="${basedir}/${dist.server.cspace}/cspace/services">\r
+            <fileset dir="${src}/main/resources/scripts"/>\r
+        </copy>\r
+        <!-- copy datasources -->\r
+        <copy todir="${basedir}/${dist.deploy.cspace}">\r
+            <fileset dir="${src}/main/resources/config"/>\r
+        </copy>\r
+        <ant antfile="3rdparty/build.xml" target="dist" inheritall="false"/>\r
+        <ant antfile="services/build.xml" target="dist" inheritall="false"/>\r
+\r
+        <!-- bundle up everything -->\r
+        <tar destfile="${basedir}/dist/${cspace.services.release}-${jboss.release}.tar.gz" compression="gzip">\r
+            <tarfileset dir="${basedir}/dist/cspace"\r
+              preserveLeadingSlashes="true">\r
+            </tarfileset>\r
+        </tar>\r
     </target>\r
 \r
-    <target name="dist" depends="package"\r
-    description="generate cspace service an nuxeo distribution">\r
-        <!-- Create the distribution directory -->\r
-        <mkdir dir="${dist}"/>\r
-        <antcall name="dist-cspace"/>\r
-        <antcall name="dist-nuxeo"/>\r
+    <target name="dist-jboss-domains" depends="init"\r
+    description="create jboss distributions for cspace and nuxeo">\r
+        <antcall name="dist-jboss-cspace"/>\r
+        <antcall name="dist-jboss-nuxeo"/>\r
     </target>\r
 \r
-    <target name="dist-cspace" depends="package"\r
-    description="generate cspace service distribution">\r
+    <target name="dist-jboss-cspace" depends="dist"\r
+    description="generate jboss distribution for cspace">\r
+        <fail message="JBoss is not installed or ${jboss.dir} not found">\r
+            <condition>\r
+                <not>\r
+                    <available file="${jboss.dir}" type="dir"/>\r
+                </not>\r
+            </condition>\r
+        </fail>\r
 \r
-        <tar destfile="${dist}/${jboss.release}.${cspace.services.release}.tar.gz" compression="gzip">\r
-            <tarfileset dir="${basedir}/services"\r
+        <fail message="CSpace is not deployed or ${nuxeo.deploy} not found">\r
+            <condition>\r
+                <not>\r
+                    <available file="${nuxeo.deploy}" type="dir"/>\r
+                </not>\r
+            </condition>\r
+        </fail>\r
+\r
+        <tar destfile="${basedir}/dist/${jboss.release}-${cspace.release}.tar.gz" compression="gzip">\r
+            <tarfileset dir="${jboss.dir}"\r
               preserveLeadingSlashes="true">\r
-                <include name="/services/JaxRsServiceProvider/target/*.war"/>\r
+                <exclude name="server/${jboss.domain.nuxeo}/**"/>\r
+                <exclude name="server/${jboss.domain.cspace}/log/**"/>\r
                 <exclude name="server/${jboss.domain.cspace}/tmp/**"/>\r
-                <exclude name="server/${jboss.domain.cspace}/deploy/helloworld.war"/>\r
-            </tarfileset>\r
-            <tarfileset dir="${src}/main/resources"\r
-              preserveLeadingSlashes="true">\r
-                <exclude name="schemas/**"/>\r
             </tarfileset>\r
-\r
         </tar>\r
     </target>\r
-\r
-    <target name="dist-nuxeo" depends="compile"\r
+    \r
+    <target name="dist-nuxeo-domain" depends="install"\r
         description="generate nuxeo domain distribution" >\r
         <fail message="JBoss is not installed or ${jboss.dir} not found">\r
             <condition>\r
             </condition>\r
         </fail>\r
 \r
-        <fail message="Nuxeo is not deployed or ${nuxeo.deploy} not found">\r
+        <fail message="Nuxeo is not deployed or ${jboss.deploy.nuxeo.systemy} not found">\r
             <condition>\r
                 <not>\r
-                    <available file="${nuxeo.deploy}" type="dir"/>\r
+                    <available file="${jboss.deploy.nuxeo.system}" type="dir"/>\r
                 </not>\r
             </condition>\r
         </fail>\r
 \r
-\r
-        <tar destfile="${dist}/${jboss.release}.${nuxeo.release}.tar.gz" compression="gzip">\r
+        <tar destfile="${basedir}/dist/${jboss.release}-${nuxeo.release}.tar.gz" compression="gzip">\r
             <tarfileset dir="${jboss.dir}"\r
               preserveLeadingSlashes="true">\r
+                <exclude name="server/${jboss.domain.cspace}/**"/>\r
                 <exclude name="server/${jboss.domain.nuxeo}/log/**"/>\r
                 <exclude name="server/${jboss.domain.nuxeo}/tmp/**"/>\r
-                <exclude name="server/${jboss.domain.nuxeo}/deploy/cspace*.*"/>\r
-            </tarfileset>\r
-            <tarfileset dir="${src}/main/resources"\r
-              preserveLeadingSlashes="true">\r
-                <exclude name="schemas/**"/>\r
             </tarfileset>\r
-\r
         </tar>\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
+        <delete dir="${basedir}/build"/>\r
+        <delete dir="${basedir}/dist"/>\r
     </target>\r
     <target name="clean-unix" if="osfamily-unix">\r
         <exec executable="mvn" failonerror="true">\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"\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
-        <delete file="${jboss.lib.cspace}/${cspace-services.war}"/>\r
     </target>\r
 \r
 \r
diff --git a/pom.xml b/pom.xml
index 70ea27b0d13111f11395b9c8977819c465fd17e5..b8fd6d24c259b585afc3ef0a7c141b9d8cc1d52c 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
     <version>1.0</version>\r
     <artifactId>org.collectionspace.services</artifactId>\r
     <packaging>pom</packaging>\r
-    <name>org.collectionspace.services</name>\r
+    <name>services</name>\r
 \r
     <modules>\r
         <module>services</module>\r
diff --git a/services/JaxRsServiceProvider/build.properties b/services/JaxRsServiceProvider/build.properties
deleted file mode 100644 (file)
index 50c3738..0000000
+++ /dev/null
@@ -1,4 +0,0 @@
-jboss.dir=C:/dev/jboss-4.2.3.GA\r
-nuxeo.dir=${jboss.dir}/server/default/deploy/nuxeo.ear/system\r
-nuxeo.local.repo.dir=file:///C:/dev/jboss-4.2.3.GA/server/default/deploy/nuxeo.ear/system\r
-nuxeo.local.repo.client.dir=file:///C:/dev/nuxeo/nuxeo-core/nuxeo-core-client/target\r
index 971f5d3c576affc7ad76c94577a7d01a9b9cf487..579812b7a64cc99404c62aeb78c4ec4cf290d48f 100644 (file)
@@ -1,15 +1,13 @@
 
 <project name="jaxrs.provider" default="package" basedir=".">
     <description>
-        collectionspace authentication service
+        collectionspace services war
     </description>
   <!-- set global properties for this build -->
     <property name="services.trunk" value="../.."/>
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="" />
     <property name="src" location="src"/>
-    <property name="build" location="build"/>
-    <property name="dist"  location="dist"/>
     <property name="cspace-services.war" value="cspace-services.war"/>
 
     <condition property="osfamily-unix">
@@ -22,9 +20,6 @@
     <target name="init">
     <!-- Create the time stamp -->
         <tstamp/>
-    <!-- Create the build directory structure used by compile -->
-        <mkdir dir="${build}"/>
-
     </target>
 
     <target name="install" depends="package,install-unix,install-windows"
     </target>
 
     <target name="deploy" depends="install"
-    description="deploy authentication service in ${jboss.server.cspace}">
+    description="deploy cspace services in ${jboss.server.cspace}">
         <copy file="${basedir}/target/${cspace-services.war}" todir="${jboss.server.cspace}/deploy"/>
     </target>
 
     <target name="undeploy"
-    description="undeploy authentication service from ${jboss.server.cspace}">
+    description="undeploy cspace services from ${jboss.server.cspace}">
         <delete file="${jboss.server.cspace}/deploy/${cspace-services.war}"/>
     </target>
 
-
+    <target name="dist"
+    description="generate distribution for cspace services" depends="install">
+        <copy todir="${services.trunk}/${dist.deploy.cspace}">
+            <fileset file="${basedir}/target/${cspace-services.war}"/>
+        </copy>
+    </target>
 
 </project>
index d2a0615f1ddd0b259e5f7393ceaff4cde79c64ba..2972776a6c02bf2f06f30d04303eedea10d0586b 100644 (file)
@@ -8,8 +8,6 @@
     <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="authentication.jar" value="cspace-services-authn.jar"/>\r
 \r
     <condition property="osfamily-unix">\r
@@ -22,9 +20,6 @@
     <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
 \r
         <echo message="Remove authentication-policy from ${jboss.server.cspace}/conf/login-config.xml"/>\r
     </target>\r
 \r
-\r
+    <target name="dist"\r
+    description="generate distribution for authentication service" depends="install">\r
+        <copy todir="${services.trunk}/${dist.lib.cspace}">\r
+            <fileset file="${basedir}/target/${authentication.jar}"/>\r
+        </copy>\r
+    </target>\r
 \r
 </project>\r
index ae3f34bbfca2e6687479eae1e75b03b0dc5e21b5..8decfa5d0b57c24f679ae4d82b79fb1ba950480f 100644 (file)
@@ -1,15 +1,13 @@
 \r
 <project name="services-main" default="package" basedir=".">\r
     <description>\r
-        collectionspace services root\r
+        collectionspace services main\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
 \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="authentication/build.xml" target="deploy" inheritall="false"/>\r
         <ant antfile="relation/build.xml" target="deploy" inheritall="false"/>\r
         <ant antfile="collectionobject/build.xml" target="deploy" inheritall="false"/>\r
+        <ant antfile="intake/build.xml" target="deploy" inheritall="false"/>\r
         <ant antfile="JaxRsServiceProvider/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="authentication/build.xml" target="undeploy" inheritall="false"/>\r
+    description="undeploy services from ${jboss.server.cspace}">\r
         <ant antfile="common/build.xml" target="undeploy" inheritall="false"/>\r
+        <ant antfile="authentication/build.xml" target="undeploy" inheritall="false"/>\r
         <ant antfile="relation/build.xml" target="undeploy" inheritall="false"/>\r
         <ant antfile="collectionobject/build.xml" target="undeploy" inheritall="false"/>\r
+        <ant antfile="intake/build.xml" target="undeploy" inheritall="false"/>\r
         <ant antfile="JaxRsServiceProvider/build.xml" target="undeploy" inheritall="false"/>\r
     </target>\r
 \r
+    <target name="dist" depends="install"\r
+    description="distribute services">\r
+        <ant antfile="common/build.xml" target="dist" inheritall="false"/>\r
+        <ant antfile="authentication/build.xml" target="dist" inheritall="false"/>\r
+        <ant antfile="relation/build.xml" target="dist" inheritall="false"/>\r
+        <ant antfile="collectionobject/build.xml" target="dist" inheritall="false"/>\r
+        <ant antfile="intake/build.xml" target="dist" inheritall="false"/>\r
+        <ant antfile="JaxRsServiceProvider/build.xml" target="dist" inheritall="false"/>\r
+    </target>\r
 \r
-\r
+    \r
 </project>\r
index 1a281d0a7486064d8e8d7bab2d6ff52cbbdd05c2..3e8a360a89bacbea5f6d060c25b2237d03546419 100644 (file)
@@ -1,7 +1,7 @@
 \r
-<project name="services.collectionobject.3rdparty" default="package" basedir=".">\r
+<project name="collectionobject.3rdparty" default="package" basedir=".">\r
     <description>\r
-        collectionspace authentication service\r
+        collectionobject service 3rd party\r
     </description>\r
   <!-- set global properties for this build -->\r
     <property name="services.trunk" value="../../.."/>\r
@@ -9,7 +9,6 @@
     <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
@@ -21,8 +20,6 @@
     <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>\r
 \r
     <target name="deploy" depends="install"\r
-    description="deploy common elements in ${jboss.server.cspace}">\r
+    description="deploy collectionobject in ${jboss.server.nuxeo}">\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
+    description="undeploy collectionobject from ${jboss.server.nuxeo}">\r
         <ant antfile="nuxeo-platform-cs-collectionobject/build.xml" target="undeploy" inheritall="false"/>\r
     </target>\r
 \r
-\r
+    <target name="dist"\r
+    description="generate distribution for collectionobject">\r
+        <ant antfile="nuxeo-platform-cs-collectionobject/build.xml" target="dist" inheritall="false"/>\r
+    </target>\r
 \r
 </project>\r
index df6ca15ed2e8adacb27138ff7c84f77096f512c1..5d8933601d2ecd02f6446de0c93542a8bc6a9d5b 100644 (file)
@@ -10,7 +10,7 @@
     <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
+    <property name="nuxeo.collectionobject.jar" value="org.collectionspace.services.collectionobject.3rdparty.nuxeo-1.0.jar"/>\r
 \r
     <condition property="osfamily-unix">\r
         <os family="unix" />\r
     </target>\r
 \r
     <target name="deploy" depends="install"\r
-    description="deploy common elements in ${jboss.server.cspace}">\r
+    description="deploy collectionobject doctype in ${jboss.server.nuxeo}">\r
         <copy file="${basedir}/target/${nuxeo.collectionobject.jar}"\r
-        todir="${nuxeo.dir}"/>\r
+        todir="${jboss.deploy.nuxeo.system}"/>\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
+    description="undeploy collectionobject doctype from ${jboss.server.nuxeo}">\r
+        <delete file="${jboss.deploy.nuxeo.system}/${nuxeo.collectionobject.jar}"/>\r
     </target>\r
 \r
-\r
+    <target name="dist"\r
+    description="generate distribution for collectionobject doctype" depends="install">\r
+        <copy todir="${services.trunk}/${dist.deploy.nuxeo.system}">\r
+            <fileset file="${basedir}/target/${nuxeo.collectionobject.jar}"/>\r
+        </copy>\r
+    </target>\r
 \r
 </project>\r
index 56fc1f11df8407f10b4c334662f74553de6c8e1a..3ae8f553cc47db073c1bdfcebf33f58106dc5304 100644 (file)
@@ -1,17 +1,17 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <artifactId>org.collectionspace.services.collectionobject.3rdparty</artifactId>
+        <groupId>org.collectionspace.services</groupId>
+        <version>1.0</version>
+    </parent>
     <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.nuxeo.ecm.platform</groupId>
-    <artifactId>nuxeo-platform-parent</artifactId>
-    <version>5.2-SNAPSHOT</version>
-  </parent>
-
-    <artifactId>nuxeo-platform-cs-collectionobject</artifactId>
+    <groupId>org.collectionspace.services</groupId>
+    <version>1.0</version>
+    <artifactId>org.collectionspace.services.collectionobject.3rdparty.nuxeo</artifactId>
     <packaging>jar</packaging>
-    <name>nuxeo-platform-cs-collectionobject</name>
+    <name>services.collectionobject.3rdparty.nuxeo</name>
     <description>
     CollectionObject Nuxeo document type
     </description>
index b4e1485c1f54927bd8fdf4b323bf923a95fb723c..4a9eb4b3eb5bbfb0a9be08f2b7b6abb9f2c6b7f8 100644 (file)
@@ -2,7 +2,6 @@
 <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>
@@ -10,6 +9,9 @@
         <version>1.0</version>
     </parent>
 
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.collectionspace.services</groupId>
+    <version>1.0</version>
     <artifactId>org.collectionspace.services.collectionobject.3rdparty</artifactId>
     <packaging>pom</packaging>
     <name>services.collectionobject.3rdparty</name>
index 77cd5ef4e339cee9aa0f96bded9c6e91c66aa41e..2de3b385a3be8e0599ed15c7bf0a8f4ed4763f72 100644 (file)
@@ -9,7 +9,6 @@
     <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
     </target>\r
 \r
     <target name="deploy" depends="install"\r
-    description="deploy services in ${jboss.server.cspace}">\r
+    description="deploy collectionobject service">\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
+    description="undeploy collectionobject service">\r
         <ant antfile="3rdparty/build.xml" target="undeploy" inheritall="false"/>\r
     </target>\r
 \r
-\r
+    <target name="dist" depends="install"\r
+    description="distribute collectionobject service}">\r
+        <ant antfile="3rdparty/build.xml" target="dist" inheritall="false"/>\r
+    </target>\r
 \r
 </project>\r
index 31644b2899094abe50af3fb5ed33a772af48b53d..144607a679fcdc8468fbfec1e56e9bb2cf5804c7 100644 (file)
@@ -1,7 +1,7 @@
 \r
 <project name="common" default="package" basedir=".">\r
     <description>\r
-        collectionspace authentication service\r
+        collectionspace services common\r
     </description>\r
   <!-- set global properties for this build -->\r
     <property name="services.trunk" value="../.."/>\r
@@ -9,7 +9,6 @@
     <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
@@ -21,9 +20,6 @@
     <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
         <delete file="${jboss.server.cspace}/cspace/config/services/service-config.xml"/>\r
     </target>\r
 \r
-\r
+    <target name="dist"\r
+    description="generate distribution for common elements" depends="install">\r
+        <copy todir="${services.trunk}/${dist.server.cspace}/cspace/config/services">\r
+            <fileset file="${basedir}/src/main/config/service-config.xml"/>\r
+        </copy>\r
+    </target>\r
 \r
 </project>\r
diff --git a/services/intake/3rdparty/build.xml b/services/intake/3rdparty/build.xml
new file mode 100644 (file)
index 0000000..e9b64b7
--- /dev/null
@@ -0,0 +1,125 @@
+\r
+<project name="intake.3rdparty" default="package" basedir=".">\r
+    <description>\r
+        intake service 3rdparty\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
+\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
+    </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 intake in ${jboss.server.nuxeo}">\r
+        <ant antfile="nuxeo-platform-cs-intake/build.xml" target="deploy" inheritall="false"/>\r
+    </target>\r
+\r
+    <target name="undeploy"\r
+    description="undeploy intake from ${jboss.server.nuxeo}">\r
+        <ant antfile="nuxeo-platform-cs-intake/build.xml" target="undeploy" inheritall="false"/>\r
+    </target>\r
+\r
+    <target name="dist"\r
+    description="generate distribution for intake">\r
+        <ant antfile="nuxeo-platform-cs-intake/build.xml" target="dist" inheritall="false"/>\r
+    </target>\r
+\r
+\r
+</project>\r
diff --git a/services/intake/3rdparty/nuxeo-platform-cs-intake/build.properties b/services/intake/3rdparty/nuxeo-platform-cs-intake/build.properties
deleted file mode 100644 (file)
index c26799a..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-# Example for Windows
-jboss.dir=c:/dev/jboss-4.2.3.GA
-# Example for Unix
-#jboss.dir=/opt/jboss
-
-# Which JBoss server config to use
-jboss.config=default
-
-# nuxeo deployment
-jboss.nuxeo.ear.dir=${jboss.dir}/server/${jboss.config}/deploy/nuxeo.ear
-
-
-# additional command line parameters for mvn commands
-# e.g. to work offline:
-#mvn.opts=-o
index d4e3b266c1a9c04993b85840d4b7234c04f886c1..fed418ee99642218ff5606e6372a608dcbfea9ba 100644 (file)
-<?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"/>
+<project name="nuxeo-platform-cs-intake" default="package" basedir=".">
+    <description>
+        intake nuxeo document type
+    </description>
+  <!-- set global properties for this build -->
+    <property name="services.trunk" value="../../../.."/>
+    <property file="${services.trunk}/build.properties" />
+    <property name="mvn.opts" value="" />
+    <property name="src" location="src"/>
+    <property name="nuxeo.intake.jar" value="org.collectionspace.services.intake.3rdparty.nuxeo-1.0.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>
+    <condition property="osfamily-unix">
+        <os family="unix" />
+    </condition>
+    <condition property="osfamily-windows">
+        <os family="windows" />
+    </condition>
+
+    <target name="init" >
+    <!-- Create the time stamp -->
+        <tstamp/>
+    </target>
+
+    <target name="package" depends="package-unix,package-windows"
+  description="Package CollectionSpace Services" />
+    <target name="package-unix" if="osfamily-unix">
+        <exec executable="mvn" failonerror="true">
+            <arg value="package" />
+            <arg value="-Dmaven.test.skip=true" />
+            <arg value="-f" />
+            <arg value="${basedir}/pom.xml" />
+            <arg value="-N" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+    <target name="package-windows" if="osfamily-windows">
+        <exec executable="cmd" failonerror="true">
+            <arg value="/c" />
+            <arg value="mvn.bat" />
+            <arg value="package" />
+            <arg value="-Dmaven.test.skip=true" />
+            <arg value="-f" />
+            <arg value="${basedir}/pom.xml" />
+            <arg value="-N" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+
+    <target name="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="clean" depends="clean-unix,clean-windows"
+  description="Delete target directories" >
+        <delete dir="${build}"/>
+    </target>
+    <target name="clean-unix" if="osfamily-unix">
+        <exec executable="mvn" failonerror="true">
+            <arg value="clean" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+    <target name="clean-windows" if="osfamily-windows">
+        <exec executable="cmd" failonerror="true">
+            <arg value="/c" />
+            <arg value="mvn.bat" />
+            <arg value="clean" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+
+    <target name="test" depends="test-unix,test-windows" description="Run tests" />
+    <target name="test-unix" if="osfamily-unix">
+        <exec executable="mvn" failonerror="true">
+            <arg value="test" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+    <target name="test-windows" if="osfamily-windows">
+        <exec executable="cmd" failonerror="true">
+            <arg value="/c" />
+            <arg value="mvn.bat" />
+            <arg value="test" />
+            <arg value="${mvn.opts}" />
+        </exec>
+    </target>
+
+    <target name="deploy" depends="install"
+    description="deploy intake doctype in ${jboss.server.nuxeo}">
+        <copy file="${basedir}/target/${nuxeo.intake.jar}"
+        todir="${jboss.deploy.nuxeo.system}"/>
+    </target>
+
+    <target name="undeploy"
+    description="undeploy intake doctype from ${jboss.server.nuxeo}">
+        <delete file="${jboss.deploy.nuxeo.system}/${nuxeo.intake.jar}"/>
+    </target>
+
+
+    <target name="dist"
+    description="generate distribution for intake doctype" depends="install">
+        <copy todir="${services.trunk}/${dist.deploy.nuxeo.system}">
+            <fileset file="${basedir}/target/${nuxeo.intake.jar}"/>
+        </copy>
+    </target>
 
 </project>
+
index 39dcdf8ef5d460542d218ab4ba1318630d8ab9c8..6497beb7d43212f99cebe3c7c63c99a3279de04a 100644 (file)
@@ -1,17 +1,17 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <artifactId>org.collectionspace.services.intake.3rdparty</artifactId>
+        <groupId>org.collectionspace.services</groupId>
+        <version>1.0</version>
+    </parent>
     <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.nuxeo.ecm.platform</groupId>
-    <artifactId>nuxeo-platform-parent</artifactId>
-    <version>5.2-SNAPSHOT</version>
-  </parent>
-
-    <artifactId>nuxeo-platform-cs-intake</artifactId>
+    <groupId>org.collectionspace.services</groupId>
+    <version>1.0</version>
+    <artifactId>org.collectionspace.services.intake.3rdparty.nuxeo</artifactId>
     <packaging>jar</packaging>
-    <name>nuxeo-platform-cs-intake</name>
+    <name>services.intake.3rdparty.nuxeo</name>
     <description>
     Intake Nuxeo Document Type
     </description>
index 1d2e1b1061cacd1a354a49a9840e3dc4ea7e1e04..1f0687f2ae8948a7075cd0bcadc77dc5d74aef2b 100644 (file)
@@ -2,14 +2,14 @@
 <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.intake</artifactId>
         <groupId>org.collectionspace.services</groupId>
         <version>1.0</version>
     </parent>
-
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.collectionspace.services</groupId>
+    <version>1.0</version>
     <artifactId>org.collectionspace.services.intake.3rdparty</artifactId>
     <packaging>pom</packaging>
     <name>services.intake.3rdparty</name>
diff --git a/services/intake/build.xml b/services/intake/build.xml
new file mode 100644 (file)
index 0000000..814810a
--- /dev/null
@@ -0,0 +1,122 @@
+\r
+<project name="intake" default="package" basedir=".">\r
+    <description>\r
+        intake 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
+\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 intake service">\r
+        <ant antfile="3rdparty/build.xml" target="deploy" inheritall="false"/>\r
+    </target>\r
+\r
+    <target name="undeploy"\r
+    description="undeploy intake service">\r
+        <ant antfile="3rdparty/build.xml" target="undeploy" inheritall="false"/>\r
+    </target>\r
+\r
+    <target name="dist" depends="install"\r
+    description="distribute intake service">\r
+        <ant antfile="3rdparty/build.xml" target="dist" inheritall="false"/>\r
+    </target>\r
+\r
+</project>\r
index 09f98b5cd263718f1aea590ba99298f3573e72f5..b25c96cffe8e4420370387a0d9614024d6cf6224 100644 (file)
@@ -1,15 +1,13 @@
 \r
-<project name="services.relation.3rdparty" default="package" basedir=".">\r
+<project name="relation.3rdparty" default="package" basedir=".">\r
     <description>\r
-        collectionspace authentication service\r
+        relation service 3rdparty\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
@@ -21,8 +19,6 @@
     <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>\r
 \r
     <target name="deploy" depends="install"\r
-    description="deploy common elements in ${jboss.server.cspace}">\r
+    description="deploy relation in ${jboss.server.nuxeo}">\r
         <ant antfile="nuxeo-platform-cs-relation/build.xml" target="deploy" inheritall="false"/>\r
     </target>\r
 \r
     <target name="undeploy"\r
-    description="undeploy common elements from ${jboss.server.cspace}">\r
+    description="undeploy relation from ${jboss.server.nuxeo}">\r
         <ant antfile="nuxeo-platform-cs-relation/build.xml" target="undeploy" inheritall="false"/>\r
     </target>\r
 \r
+    <target name="dist"\r
+    description="generate distribution for relation">\r
+        <ant antfile="nuxeo-platform-cs-relation/build.xml" target="dist" inheritall="false"/>\r
+    </target>\r
 \r
 \r
 </project>\r
index 9a1d5745cd13d2204204ab50d2259afcb5a16389..e0ce9c1b710b6f4e5833c6f11ab8e1bc21fb4fe3 100644 (file)
@@ -1,16 +1,14 @@
 \r
 <project name="nuxeo-platform-cs-relation" default="package" basedir=".">\r
     <description>\r
-        relationhip nuxeo document type\r
+        relation 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.relation.jar" value="nuxeo-platform-cs-relation-5.2-SNAPSHOT.jar"/>\r
+    <property name="nuxeo.relation.jar" value="org.collectionspace.services.relation.3rdparty.nuxeo-1.0.jar"/>\r
 \r
     <condition property="osfamily-unix">\r
         <os family="unix" />\r
@@ -22,9 +20,6 @@
     <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
     </target>\r
 \r
     <target name="deploy" depends="install"\r
-    description="deploy common elements in ${jboss.server.cspace}">\r
+    description="deploy relation doctype in ${jboss.server.cspace}">\r
         <copy file="${basedir}/target/${nuxeo.relation.jar}"\r
-        todir="${nuxeo.dir}"/>\r
+        todir="${jboss.deploy.nuxeo.system}"/>\r
     </target>\r
 \r
     <target name="undeploy"\r
-    description="undeploy common elements from ${jboss.server.cspace}">\r
-        <delete file="${nuxeo.dir}/${nuxeo.relation.jar}"/>\r
+    description="undeploy relation doctype from ${jboss.server.cspace}">\r
+        <delete file="${jboss.deploy.nuxeo.system}/${nuxeo.relation.jar}"/>\r
     </target>\r
 \r
 \r
+    <target name="dist"\r
+    description="generate distribution for relation doctype" depends="install">\r
+        <copy todir="${services.trunk}/${dist.deploy.nuxeo.system}">\r
+            <fileset file="${basedir}/target/${nuxeo.relation.jar}"/>\r
+        </copy>\r
+    </target>\r
 \r
 </project>\r
index 09536d9a5ca8d679bc5b0a109796f5a02fa3075e..e45c637ad9e0b58706729cd7ca345f0e4901f0e6 100644 (file)
@@ -1,17 +1,17 @@
 <project xmlns="http://maven.apache.org/POM/4.0.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    <parent>
+        <artifactId>org.collectionspace.services.relation.3rdparty</artifactId>
+        <groupId>org.collectionspace.services</groupId>
+        <version>1.0</version>
+    </parent>
     <modelVersion>4.0.0</modelVersion>
-
-  <parent>
-    <groupId>org.nuxeo.ecm.platform</groupId>
-    <artifactId>nuxeo-platform-parent</artifactId>
-    <version>5.2-SNAPSHOT</version>
-  </parent>
-
-    <artifactId>nuxeo-platform-cs-relation</artifactId>
+    <groupId>org.collectionspace.services</groupId>
+    <version>1.0</version>
+    <artifactId>org.collectionspace.services.relation.3rdparty.nuxeo</artifactId>
     <packaging>jar</packaging>
-    <name>nuxeo-platform-cs-relation</name>
+    <name>services.relation.3rdparty.nuxeo</name>
     <description>
     CollectionSpace relation Nuxeo document type
     </description>
index d8c41e45f709236e1eeaf2d74c43e5ba1d4e8770..5ec58caecff652486ca14ecf0dc3791619c21452 100644 (file)
@@ -2,14 +2,14 @@
 <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.relation</artifactId>
         <groupId>org.collectionspace.services</groupId>
         <version>1.0</version>
     </parent>
-
+    <modelVersion>4.0.0</modelVersion>
+    <groupId>org.collectionspace.services</groupId>
+    <version>1.0</version>
     <artifactId>org.collectionspace.services.relation.3rdparty</artifactId>
     <packaging>pom</packaging>
     <name>services.relation.3rdparty</name>
index 62bf0d23bb8f0a3049f9bd00b70274d290de552a..92b13dfda6c9e2cf6ce0c6049471ac88ce309e3b 100644 (file)
@@ -8,8 +8,6 @@
     <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
     </target>\r
 \r
     <target name="deploy" depends="install"\r
-    description="deploy services in ${jboss.server.cspace}">\r
+    description="deploy relation service">\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
+    description="undeploy relation service">\r
         <ant antfile="3rdparty/build.xml" target="undeploy" inheritall="false"/>\r
     </target>\r
 \r
+    <target name="dist"\r
+    description="generate distribution for relation">\r
+        <ant antfile="3rdparty/build.xml" target="dist" inheritall="false"/>\r
+    </target>\r
 \r
 \r
 </project>\r