CSPACE-303 added cspace-service.war property in build.properties, changed descripions...

M    services/JaxRsServiceProvider/build.xml
M    services/build.xml
M    build.properties
M    build.xml

diff --git a/build.properties b/build.properties
index fdfd1f50f0286e71c06b53e796253ba235f71d55..4bacc4e52319fcce13a8d6b1d5797471d8c5ca06 100644 (file)
--- a/build.properties
+++ b/build.properties
@@ -1,7 +1,7 @@
 #cspace\r
 cspace.release=0.2\r
 cspace.services.release=cspace-services-${cspace.release}\r
-\r
+cspace.services.war=cspace-services.war\r
 domain.cspace=cspace\r
 domain.nuxeo=default\r
 \r
@@ -39,6 +39,7 @@ jboss.domain.cspace=${domain.cspace}
 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
+jboss.deploy.cspace.services=${jboss.server.cspace}/deploy/${cspace.services.war}\r
 \r
 #jboss nuxeo domain\r
 jboss.domain.nuxeo=${domain.nuxeo}\r

diff --git a/build.xml b/build.xml
index 0e67881f84639d4a63883b571050346d9a8f9756..4dd5b0465e183119571134fe6928bc0086b112fb 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -49,8 +49,8 @@
 \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
+        <antcall target="dist-jboss-cspace"/>\r
+        <antcall target="dist-jboss-nuxeo"/>\r
     </target>\r
 \r
     <target name="dist-jboss-cspace" depends="dist"\r
@@ -63,16 +63,17 @@
             </condition>\r
         </fail>\r
 \r
-        <fail message="CSpace is not deployed or ${nuxeo.deploy} not found">\r
+        <fail message="CSpace is not deployed or ${jboss.deploy.cspace.services} not found">\r
             <condition>\r
                 <not>\r
-                    <available file="${nuxeo.deploy}" type="dir"/>\r
+                    <available file="${jboss.deploy.cspace.services}" type="file"/>\r
                 </not>\r
             </condition>\r
         </fail>\r
 \r
-        <tar destfile="${basedir}/dist/${jboss.release}-${cspace.release}.tar.gz" compression="gzip">\r
+        <tar destfile="${basedir}/dist/${jboss.release}-${domain.cspace}-${cspace.release}.tar.gz" compression="gzip">\r
             <tarfileset dir="${jboss.dir}"\r
+            prefix="${jboss.release}"\r
               preserveLeadingSlashes="true">\r
                 <exclude name="server/${jboss.domain.nuxeo}/**"/>\r
                 <exclude name="server/${jboss.domain.cspace}/log/**"/>\r
@@ -81,7 +82,7 @@
         </tar>\r
     </target>\r
     \r
-    <target name="dist-nuxeo-domain" depends="install"\r
+    <target name="dist-jboss-nuxeo" depends="dist"\r
         description="generate nuxeo domain distribution" >\r
         <fail message="JBoss is not installed or ${jboss.dir} not found">\r
             <condition>\r
@@ -99,8 +100,9 @@
             </condition>\r
         </fail>\r
 \r
-        <tar destfile="${basedir}/dist/${jboss.release}-${nuxeo.release}.tar.gz" compression="gzip">\r
+        <tar destfile="${basedir}/dist/${jboss.release}-${domain.nuxeo}-${nuxeo.release}.tar.gz" compression="gzip">\r
             <tarfileset dir="${jboss.dir}"\r
+              prefix="${jboss.release}"\r
               preserveLeadingSlashes="true">\r
                 <exclude name="server/${jboss.domain.cspace}/**"/>\r
                 <exclude name="server/${jboss.domain.nuxeo}/log/**"/>\r
@@ -110,7 +112,7 @@
     </target>\r
 \r
     <target name="package" depends="package-unix,package-windows"\r
-  description="Package CollectionSpace Services" />\r
+  description="mvn package" />\r
     <target name="package-unix" if="osfamily-unix">\r
         <exec executable="mvn" failonerror="true">\r
             <arg value="package" />\r
@@ -135,7 +137,7 @@
     </target>\r
 \r
     <target name="install" depends="package,install-unix,install-windows"\r
-  description="Install" />\r
+  description="mvn install" />\r
     <target name="install-unix" if="osfamily-unix">\r
         <exec executable="mvn" failonerror="true">\r
             <arg value="install" />\r

diff --git a/services/JaxRsServiceProvider/build.xml b/services/JaxRsServiceProvider/build.xml
index 579812b7a64cc99404c62aeb78c4ec4cf290d48f..5a969a5bb92d2996a9000aaa886bd6fa2ff7bc34 100644 (file)
--- 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 8953e05b4c04a845e4c09b011558fadd1f527dd0..cd229d094558eeeec9c569e32bbd08c4f90f9c05 100644 (file)
--- a/services/build.xml
+++ b/services/build.xml
@@ -130,7 +130,7 @@
 \r
     <!-- this target is called in order based on the dependencies between the services -->\r
     <target name="dist" depends="install"\r
-    description="distribute services">\r
+    description="create distribution for 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