[jboss-cvs] JBossAS SVN: r110858 - in tags/JBPAPP_5_1_1_ER1: testsuite and 1 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Mar 8 16:11:20 EST 2011 

Author: fnasser at redhat.com
Date: 2011-03-08 16:11:18 -0500 (Tue, 08 Mar 2011)
New Revision: 110858

Modified:
   tags/JBPAPP_5_1_1_ER1/build/build.properties
   tags/JBPAPP_5_1_1_ER1/build/build.xml
   tags/JBPAPP_5_1_1_ER1/testsuite/build.xml
   tags/JBPAPP_5_1_1_ER1/tools/etc/buildmagic/buildmagic.ent
   tags/JBPAPP_5_1_1_ER1/tools/etc/buildmagic/version-info.xml
Log:
Changes for a lack of version.tag

Modified: tags/JBPAPP_5_1_1_ER1/build/build.properties
===================================================================
--- tags/JBPAPP_5_1_1_ER1/build/build.properties	2011-03-08 20:49:01 UTC (rev 110857)
+++ tags/JBPAPP_5_1_1_ER1/build/build.properties	2011-03-08 21:11:18 UTC (rev 110858)
@@ -3,6 +3,6 @@
 version.major=5
 version.minor=1
 version.revision=1
-version.tag=Branch
+version.tag=
 version.name=EAP
 

Modified: tags/JBPAPP_5_1_1_ER1/build/build.xml
===================================================================
--- tags/JBPAPP_5_1_1_ER1/build/build.xml	2011-03-08 20:49:01 UTC (rev 110857)
+++ tags/JBPAPP_5_1_1_ER1/build/build.xml	2011-03-08 21:11:18 UTC (rev 110858)
@@ -82,7 +82,8 @@
     <!-- Module name(s) & version -->
     <property name="module.name" value="jboss"/>
     <property name="module.Name" value="JBoss Build"/>
-    <condition property="module.version" value="${version.major}.${version.minor}.${version.revision}.${version.tag}">
+<!--    <condition property="module.version" value="${version.major}.${version.minor}.${version.revision}.${version.tag}"> -->
+    <condition property="module.version" value="${version.major}.${version.minor}.${version.revision}">
        <isset property="release.version.tag"/>
     </condition>
     <condition property="module.version" value="${version.major}.${version.minor}.${version.revision}.${version.tag}">

Modified: tags/JBPAPP_5_1_1_ER1/testsuite/build.xml
===================================================================
--- tags/JBPAPP_5_1_1_ER1/testsuite/build.xml	2011-03-08 20:49:01 UTC (rev 110857)
+++ tags/JBPAPP_5_1_1_ER1/testsuite/build.xml	2011-03-08 21:11:18 UTC (rev 110858)
@@ -117,7 +117,7 @@
       this is used in the security policy file property references and needs to
       be valid for the platform.
    -->
-   <property name="version" value="${version.major}.${version.minor}.${version.revision}.${version.tag}"/>
+   <property name="version" value="${version.major}.${version.minor}.${version.revision}"/>
    <property name="jboss.dist.default" value="${project.root}${/}build${/}output${/}jboss-${version}"/>
    <condition property="jboss.dist" value="${jboss.dist.default}">
      <not>

Modified: tags/JBPAPP_5_1_1_ER1/tools/etc/buildmagic/buildmagic.ent
===================================================================
--- tags/JBPAPP_5_1_1_ER1/tools/etc/buildmagic/buildmagic.ent	2011-03-08 20:49:01 UTC (rev 110857)
+++ tags/JBPAPP_5_1_1_ER1/tools/etc/buildmagic/buildmagic.ent	2011-03-08 21:11:18 UTC (rev 110858)
@@ -89,20 +89,20 @@
   <property name="version.major" value="5"/>
   <property name="version.minor" value="1"/>
   <property name="version.revision" value="1"/>
-  <property name="version.tag" value="Branch"/>
+  <property name="version.tag" value=""/>
   <property name="version.name" value="EAP"/>
   <!-- This must be set to the CVS tag for any release -->
-  <property name="version.cvstag" value="JBPAPP_${version.major}_${version.minor}_${version.revision}_${version.tag}"/>
+  <property name="version.cvstag" value="JBPAPP_${version.major}_${version.minor}_${version.revision}"/>
 
   <!-- Manifest version info -->
   <property name="specification.title" value="JBossAS"/>
-  <property name="specification.version" value="${version.major}.${version.minor}.${version.revision}.${version.tag}"/>
+  <property name="specification.version" value="${version.major}.${version.minor}.${version.revision}"/>
   <property name="specification.vendor" value="JBoss (http://www.jboss.org/)"/>
 
   <property name="implementation.title" value="JBoss [${version.name}]"/>
   <property name="implementation.url" value="http://www.jboss.org/"/>
   <property name="implementation.version"
-    value="${version.major}.${version.minor}.${version.revision}.${version.tag} (build: SVNTag=${version.cvstag} date=${build.id})"/>
+    value="${version.major}.${version.minor}.${version.revision} (build: SVNTag=${version.cvstag} date=${build.id})"/>
   <property name="implementation.vendor" value="JBoss.org"/>
   <property name="implementation.vendor.id" value="${implementation.url}"/>
 

Modified: tags/JBPAPP_5_1_1_ER1/tools/etc/buildmagic/version-info.xml
===================================================================
--- tags/JBPAPP_5_1_1_ER1/tools/etc/buildmagic/version-info.xml	2011-03-08 20:49:01 UTC (rev 110857)
+++ tags/JBPAPP_5_1_1_ER1/tools/etc/buildmagic/version-info.xml	2011-03-08 21:11:18 UTC (rev 110858)
@@ -17,20 +17,20 @@
     <property name="version.major" value="5"/>
     <property name="version.minor" value="1"/>
     <property name="version.revision" value="1"/>
-    <property name="version.tag" value="Branch"/>
+    <property name="version.tag" value=""/>
     <property name="version.name" value="EAP"/>
     <!-- This must be set to the CVS tag for any release -->
-    <property name="version.cvstag" value="JBPAPP_${version.major}_${version.minor}_${version.revision}_${version.tag}"/>
+    <property name="version.cvstag" value="JBPAPP_${version.major}_${version.minor}_${version.revision}"/>
 
     <!-- Manifest version info -->
     <property name="specification.title" value="JBoss"/>
-    <property name="specification.version" value="${version.major}.${version.minor}.${version.revision}.${version.tag}"/>
+    <property name="specification.version" value="${version.major}.${version.minor}.${version.revision}"/>
     <property name="specification.vendor" value="JBoss (http://www.jboss.org/)"/>
 
     <property name="implementation.title" value="JBoss [${version.name}]"/>
     <property name="implementation.url" value="http://www.jboss.org/"/>
     <property name="implementation.version" 
-         value="${version.major}.${version.minor}.${version.revision}.${version.tag} (build: SVNTag=${version.cvstag} date=${build.id})"/>
+         value="${version.major}.${version.minor}.${version.revision} (build: SVNTag=${version.cvstag} date=${build.id})"/>
     <property name="implementation.vendor" value="JBoss Inc."/>
     <property name="implementation.vendor.id" value="${implementation.url}"/>

More information about the jboss-cvs-commits mailing list