From d358c5957935d4cbff5b10ac8696ef1a8e0ec5be Mon Sep 17 00:00:00 2001
From: Sanjay Dalal <sanjay.dalal@berkeley.edu>
Date: Wed, 15 Jul 2009 19:09:08 +0000
Subject: [PATCH] CSPACE-303 added cspace-service.war property in
 build.properties, changed descripions of a few targets M   
 services/JaxRsServiceProvider/build.xml M    services/build.xml M   
 build.properties M    build.xml

---
 build.properties                        |  3 ++-
 build.xml                               | 20 +++++++++++---------
 services/JaxRsServiceProvider/build.xml |  2 +-
 services/build.xml                      |  2 +-
 4 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/build.properties b/build.properties
index fdfd1f50f..4bacc4e52 100644
--- a/build.properties
+++ b/build.properties
@@ -1,7 +1,7 @@
 #cspace
 cspace.release=0.2
 cspace.services.release=cspace-services-${cspace.release}
-
+cspace.services.war=cspace-services.war
 domain.cspace=cspace
 domain.nuxeo=default
 
@@ -39,6 +39,7 @@ jboss.domain.cspace=${domain.cspace}
 jboss.server.cspace=${jboss.home}/server/${jboss.domain.cspace}
 jboss.deploy.cspace=${jboss.server.cspace}/deploy
 jboss.lib.cspace=${jboss.server.cspace}/lib
+jboss.deploy.cspace.services=${jboss.server.cspace}/deploy/${cspace.services.war}
 
 #jboss nuxeo domain
 jboss.domain.nuxeo=${domain.nuxeo}
diff --git a/build.xml b/build.xml
index 0e67881f8..4dd5b0465 100644
--- a/build.xml
+++ b/build.xml
@@ -49,8 +49,8 @@
 
     <target name="dist-jboss-domains" depends="init"
     description="create jboss distributions for cspace and nuxeo">
-        <antcall name="dist-jboss-cspace"/>
-        <antcall name="dist-jboss-nuxeo"/>
+        <antcall target="dist-jboss-cspace"/>
+        <antcall target="dist-jboss-nuxeo"/>
     </target>
 
     <target name="dist-jboss-cspace" depends="dist"
@@ -63,16 +63,17 @@
             </condition>
         </fail>
 
-        <fail message="CSpace is not deployed or ${nuxeo.deploy} not found">
+        <fail message="CSpace is not deployed or ${jboss.deploy.cspace.services} not found">
             <condition>
                 <not>
-                    <available file="${nuxeo.deploy}" type="dir"/>
+                    <available file="${jboss.deploy.cspace.services}" type="file"/>
                 </not>
             </condition>
         </fail>
 
-        <tar destfile="${basedir}/dist/${jboss.release}-${cspace.release}.tar.gz" compression="gzip">
+        <tar destfile="${basedir}/dist/${jboss.release}-${domain.cspace}-${cspace.release}.tar.gz" compression="gzip">
             <tarfileset dir="${jboss.dir}"
+            prefix="${jboss.release}"
               preserveLeadingSlashes="true">
                 <exclude name="server/${jboss.domain.nuxeo}/**"/>
                 <exclude name="server/${jboss.domain.cspace}/log/**"/>
@@ -81,7 +82,7 @@
         </tar>
     </target>
     
-    <target name="dist-nuxeo-domain" depends="install"
+    <target name="dist-jboss-nuxeo" depends="dist"
         description="generate nuxeo domain distribution" >
         <fail message="JBoss is not installed or ${jboss.dir} not found">
             <condition>
@@ -99,8 +100,9 @@
             </condition>
         </fail>
 
-        <tar destfile="${basedir}/dist/${jboss.release}-${nuxeo.release}.tar.gz" compression="gzip">
+        <tar destfile="${basedir}/dist/${jboss.release}-${domain.nuxeo}-${nuxeo.release}.tar.gz" compression="gzip">
             <tarfileset dir="${jboss.dir}"
+              prefix="${jboss.release}"
               preserveLeadingSlashes="true">
                 <exclude name="server/${jboss.domain.cspace}/**"/>
                 <exclude name="server/${jboss.domain.nuxeo}/log/**"/>
@@ -110,7 +112,7 @@
     </target>
 
     <target name="package" depends="package-unix,package-windows"
-  description="Package CollectionSpace Services" />
+  description="mvn package" />
     <target name="package-unix" if="osfamily-unix">
         <exec executable="mvn" failonerror="true">
             <arg value="package" />
@@ -135,7 +137,7 @@
     </target>
 
     <target name="install" depends="package,install-unix,install-windows"
-  description="Install" />
+  description="mvn install" />
     <target name="install-unix" if="osfamily-unix">
         <exec executable="mvn" failonerror="true">
             <arg value="install" />
diff --git a/services/JaxRsServiceProvider/build.xml b/services/JaxRsServiceProvider/build.xml
index 579812b7a..5a969a5bb 100644
--- a/services/JaxRsServiceProvider/build.xml
+++ b/services/JaxRsServiceProvider/build.xml
@@ -8,7 +8,7 @@
     <property file="${services.trunk}/build.properties" />
     <property name="mvn.opts" value="" />
     <property name="src" location="src"/>
-    <property name="cspace-services.war" value="cspace-services.war"/>
+    <property name="cspace-services.war" value="${cspace.services.war}"/>
 
     <condition property="osfamily-unix">
         <os family="unix" />
diff --git a/services/build.xml b/services/build.xml
index 8953e05b4..cd229d094 100644
--- a/services/build.xml
+++ b/services/build.xml
@@ -130,7 +130,7 @@
 
     <!-- this target is called in order based on the dependencies between the services -->
     <target name="dist" depends="install"
-    description="distribute services">
+    description="create distribution for services">
         <ant antfile="common/build.xml" target="dist" inheritall="false"/>
         <ant antfile="authentication/build.xml" target="dist" inheritall="false"/>
         <ant antfile="relation/build.xml" target="dist" inheritall="false"/>
-- 
2.47.3