CSPACE-4058: Rationalize names of tarballs created by 'ant dist-jboss-domains' per...

diff --git a/build.properties b/build.properties
index 0ac6b03d0b2887aedcd21deaa195124aa5f62626..87791d2cba0b1a0a7ebe3c50a27624c926e50621 100644 (file)
--- a/build.properties
+++ b/build.properties
@@ -1,6 +1,7 @@
 host=127.0.0.1\r
 #cspace\r
-cspace.release=1.9-SNAPSHOT\r
+release.version=1.9\r
+cspace.release=${release.version}-SNAPSHOT\r
 cspace.services.release=cspace-services-${cspace.release}\r
 cspace.services.war=cspace-services.war\r
 domain.cspace=cspace\r

diff --git a/build.xml b/build.xml
index 7cba456f3a8acef8483ca1a6ffe774f26ff46aa8..27b8caa39f6758863e3346e299deb75b5eb5add4 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -71,7 +71,7 @@
             </condition>\r
         </fail>\r
 \r
-        <tar destfile="${basedir}/dist/${jboss.release}-${domain.cspace}-${cspace.release}.tar.gz" compression="gzip">\r
+        <tar destfile="${basedir}/dist/${jboss.release}-${domain.cspace}-${release.version}.tar.gz" compression="gzip">\r
             <tarfileset dir="${jboss.dir}"\r
                         prefix="${jboss.release}"\r
                         preserveLeadingSlashes="true">\r
@@ -100,7 +100,7 @@
             </condition>\r
         </fail>\r
 \r
-        <tar destfile="${basedir}/dist/${jboss.release}-${domain.nuxeo}-${nuxeo.release}.tar.gz" compression="gzip">\r
+        <tar destfile="${basedir}/dist/${jboss.release}-${domain.nuxeo}-${release.version}.tar.gz" compression="gzip">\r
             <tarfileset dir="${jboss.dir}"\r
                         prefix="${jboss.release}"\r
                         preserveLeadingSlashes="true">\r