[jboss-cvs] JBossAS SVN: r62370 - in branches/JBoss_4_0_1_SP1_CP: testsuite/src/main/org/jboss and 3 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Mon Apr 16 12:44:43 EDT 2007


Author: jaroslaw.kijanowski
Date: 2007-04-16 12:44:43 -0400 (Mon, 16 Apr 2007)
New Revision: 62370

Added:
   branches/JBoss_4_0_1_SP1_CP/testsuite/src/main/org/jboss/ant/
   branches/JBoss_4_0_1_SP1_CP/testsuite/src/main/org/jboss/ant/taksdefs/
   branches/JBoss_4_0_1_SP1_CP/testsuite/src/main/org/jboss/ant/taksdefs/XMLJUnitMultipleResultFormatter.java
Modified:
   branches/JBoss_4_0_1_SP1_CP/testsuite/build.xml
   branches/JBoss_4_0_1_SP1_CP/tools/etc/buildmagic/buildmagic.ent
   branches/JBoss_4_0_1_SP1_CP/tools/etc/buildmagic/version-info.xml
Log:
update version info; backport compatibility tests; backport XMLJUnitMultipleResultFormatter; JBAS-4103

Modified: branches/JBoss_4_0_1_SP1_CP/testsuite/build.xml
===================================================================
--- branches/JBoss_4_0_1_SP1_CP/testsuite/build.xml	2007-04-16 15:50:13 UTC (rev 62369)
+++ branches/JBoss_4_0_1_SP1_CP/testsuite/build.xml	2007-04-16 16:44:43 UTC (rev 62370)
@@ -801,8 +801,13 @@
             <path refid="tests.classpath"/>
          </classpath>
 
-         <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+         <!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
+         <sysproperty key="jboss-junit-configuration" value="tomcat-ssl-tests"/>
+         <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" 
+                    usefile="${junit.formatter.usefile}" 
+                    extension="-tomcat-ssl-tests.xml"/>
 
+
          <batchtest todir="${build.reports}"
             haltonerror="${junit.batchtest.haltonerror}"
             haltonfailure="${junit.batchtest.haltonfailure}"
@@ -856,7 +861,11 @@
             <path refid="tests.classpath"/>
          </classpath>
 
-         <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+         <!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
+         <sysproperty key="jboss-junit-configuration" value="tomcat-sso-tests"/>
+         <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" 
+                    usefile="${junit.formatter.usefile}" 
+                    extension="-tomcat-sso-tests.xml"/>
 
          <batchtest todir="${build.reports}"
             haltonerror="${junit.batchtest.haltonerror}"
@@ -1037,7 +1046,11 @@
             <path refid="tests.classpath"/>
          </classpath>
 
-         <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+         <!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
+         <sysproperty key="jboss-junit-configuration" value="stress"/>
+         <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" 
+                    usefile="${junit.formatter.usefile}" 
+                    extension="-stress.xml"/>
 
          <batchtest todir="${build.reports}"
             haltonerror="${junit.batchtest.haltonerror}"
@@ -1101,7 +1114,11 @@
             <path refid="tests.classpath"/>
          </classpath>
 
-         <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+         <!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
+         <sysproperty key="jboss-junit-configuration" value="cluster"/>
+         <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" 
+                    usefile="${junit.formatter.usefile}" 
+                    extension="-cluster.xml"/>
 
          <batchtest todir="${build.reports}"
             haltonerror="${junit.batchtest.haltonerror}"
@@ -1146,7 +1163,11 @@
             <path refid="tests.classpath"/>
          </classpath>
 
-         <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+         <!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
+         <sysproperty key="jboss-junit-configuration" value="tests-ha"/>
+         <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" 
+                    usefile="${junit.formatter.usefile}" 
+                    extension="-tests-ha.xml"/>
 
          <batchtest todir="${build.reports}"
             haltonerror="${junit.batchtest.haltonerror}"
@@ -1199,7 +1220,11 @@
             <path refid="tests.classpath"/>
          </classpath>
 
-         <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+         <!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
+         <sysproperty key="jboss-junit-configuration" value="tests-client"/>
+         <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" 
+                    usefile="${junit.formatter.usefile}" 
+                    extension="-tests-client.xml"/>
 
          <batchtest todir="${build.reports}"
             haltonerror="${junit.batchtest.haltonerror}"
@@ -1251,7 +1276,11 @@
             <path refid="tests.classpath"/>
          </classpath>
 
-         <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+         <!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
+         <sysproperty key="jboss-junit-configuration" value="tests-security-basic"/>
+         <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" 
+                    usefile="${junit.formatter.usefile}" 
+                    extension="-tests-security-basic.xml"/>
 
          <batchtest todir="${build.reports}"
             haltonerror="${junit.batchtest.haltonerror}"
@@ -1310,7 +1339,11 @@
             <path refid="tests.classpath"/>
          </classpath>
 
-         <formatter type="xml"/>
+         <!-- formatter type="xml"/ -->
+         <sysproperty key="jboss-junit-configuration" value="tests-security-manager"/>
+         <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" 
+                    usefile="${junit.formatter.usefile}" 
+                    extension="-tests-security-manager.xml"/>
 
          <batchtest todir="${build.reports}"
             haltonerror="false"
@@ -1392,7 +1425,11 @@
             <path refid="tests.classpath"/>
          </classpath>
 
-         <formatter type="xml"/>
+         <!-- formatter type="xml"/ -->
+         <sysproperty key="jboss-junit-configuration" value="tests-jacc-security"/>
+         <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" 
+                    usefile="${junit.formatter.usefile}" 
+                    extension="-tests-jacc-security.xml"/>
 
          <batchtest todir="${build.reports}"
             haltonerror="false"
@@ -1472,7 +1509,11 @@
             <path refid="tests.classpath"/>
          </classpath>
 
-         <formatter type="xml"/>
+         <!-- formatter type="xml"/ -->
+         <sysproperty key="jboss-junit-configuration" value="tests-jacc-securitymgr"/>
+         <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" 
+                    usefile="${junit.formatter.usefile}" 
+                    extension="-tests-jacc-securitymgr.xml"/>
 
          <batchtest todir="${build.reports}"
             haltonerror="false"
@@ -1523,8 +1564,13 @@
             <path refid="tests.classpath"/>
          </classpath>
 
-         <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+         <!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
+         <sysproperty key="jboss-junit-configuration" value="tests-treecacheaop"/>
+         <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" 
+                    usefile="${junit.formatter.usefile}" 
+                    extension="-tests-treecacheaop.xml"/>
 
+
          <batchtest todir="${build.reports}"
             haltonerror="${junit.batchtest.haltonerror}"
             haltonfailure="${junit.batchtest.haltonfailure}"
@@ -1580,8 +1626,13 @@
             <path refid="tests.classpath"/>
          </classpath>
 
-         <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+         <!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
+         <sysproperty key="jboss-junit-configuration" value="tests-treecacheaopc"/>
+         <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" 
+                    usefile="${junit.formatter.usefile}" 
+                    extension="-tests-treecacheaopc.xml"/>
 
+
          <batchtest todir="${build.reports}"
             haltonerror="${junit.batchtest.haltonerror}"
             haltonfailure="${junit.batchtest.haltonfailure}"
@@ -1621,7 +1672,11 @@
             <path refid="tests.classpath"/>
          </classpath>
 
-         <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+         <!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
+         <sysproperty key="jboss-junit-configuration" value="tests-baseaop"/>
+         <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" 
+                    usefile="${junit.formatter.usefile}" 
+                    extension="-tests-baseaop.xml"/>
 
          <batchtest todir="${build.reports}"
             haltonerror="${junit.batchtest.haltonerror}"
@@ -1672,8 +1727,13 @@
             <path refid="tests.classpath"/>
          </classpath>
 
-         <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+         <!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
+         <sysproperty key="jboss-junit-configuration" value="tests-foe-deployer"/>
+         <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" 
+                    usefile="${junit.formatter.usefile}" 
+                    extension="-tests-foe-deployer.xml"/>
 
+
          <batchtest todir="${build.reports}"
             haltonerror="${junit.batchtest.haltonerror}"
             haltonfailure="${junit.batchtest.haltonfailure}"
@@ -1710,7 +1770,11 @@
             <path refid="tests.classpath"/>
          </classpath>
 
-         <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+         <!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
+         <sysproperty key="jboss-junit-configuration" value="tests-jbossmx-implementation"/>
+         <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" 
+                    usefile="${junit.formatter.usefile}" 
+                    extension="-tests-jbossmx-implementation.xml"/>
 
          <batchtest todir="${build.reports}"
             haltonerror="${junit.batchtest.haltonerror}"
@@ -1751,7 +1815,11 @@
             <path refid="tests.classpath"/>
          </classpath>
 
-         <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+         <!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
+         <sysproperty key="jboss-junit-configuration" value="tests-jbossmx-performance"/>
+         <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" 
+                    usefile="${junit.formatter.usefile}" 
+                    extension="-tests-jbossmx-performance.xml"/>
 
          <batchtest todir="${build.reports}"
             haltonerror="${junit.batchtest.haltonerror}"
@@ -1791,7 +1859,11 @@
             <path refid="tests.classpath"/>
          </classpath>
 
-         <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+         <!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
+         <sysproperty key="jboss-junit-configuration" value="tests-jbossmx-compliance"/>
+         <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" 
+                    usefile="${junit.formatter.usefile}" 
+                    extension="-tests-jbossmx-compliance.xml"/>
 
          <batchtest todir="${build.reports}"
             haltonerror="${junit.batchtest.haltonerror}"
@@ -1849,7 +1921,11 @@
             <path refid="jboss.iiop.classpath"/>
          </classpath>
 
-         <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+         <!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
+         <sysproperty key="jboss-junit-configuration" value="tests-iiop"/>
+         <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" 
+                    usefile="${junit.formatter.usefile}" 
+                    extension="-tests-iiop.xml"/>
 
          <batchtest todir="${build.reports}"
             haltonerror="${junit.batchtest.haltonerror}"
@@ -1892,7 +1968,11 @@
             <path refid="wutka.dtdparser.classpath"/>
          </classpath>
 
-         <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+         <!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
+         <sysproperty key="jboss-junit-configuration" value="tests-xml"/>
+         <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" 
+                    usefile="${junit.formatter.usefile}" 
+                    extension="-tests-xml.xml"/>
 
          <batchtest todir="${build.reports}"
             haltonerror="${junit.batchtest.haltonerror}"
@@ -1949,8 +2029,12 @@
             <path refid="tests.classpath"/>
          </classpath>
 
-         <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+         <!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
          <formatter type="plain" usefile="${junit.formatter.usefile}"/>
+         <sysproperty key="jboss-junit-configuration" value="tests-jbossnet"/>
+         <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" 
+                    usefile="${junit.formatter.usefile}" 
+                    extension="-tests-jbossnet.xml"/>
 
          <batchtest todir="${build.reports}"
             haltonerror="${junit.batchtest.haltonerror}"
@@ -2005,8 +2089,12 @@
             <path refid="tests.classpath"/>
          </classpath>
 
-         <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+         <!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
          <formatter type="plain" usefile="${junit.formatter.usefile}"/>
+         <sysproperty key="jboss-junit-configuration" value="tests-webservice"/>
+         <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" 
+                    usefile="${junit.formatter.usefile}" 
+                    extension="-tests-webservice.xml"/>
 
          <batchtest todir="${build.reports}"
             haltonerror="${junit.batchtest.haltonerror}"
@@ -2075,7 +2163,11 @@
             </fileset>
          </classpath>
 
-         <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+         <!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
+         <sysproperty key="jboss-junit-configuration" value="tests-jaxr"/>
+         <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" 
+                    usefile="${junit.formatter.usefile}" 
+                    extension="-tests-jaxr.xml"/>
 
          <batchtest todir="${build.reports}"
             haltonerror="${junit.batchtest.haltonerror}"
@@ -2123,7 +2215,11 @@
             <path refid="tests.classpath"/>
          </classpath>
 
-         <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+         <!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
+         <sysproperty key="jboss-junit-configuration" value="tests-txtimer"/>
+         <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" 
+                    usefile="${junit.formatter.usefile}" 
+                    extension="-tests-txtimer.xml"/>
 
          <batchtest todir="${build.reports}"
             haltonerror="${junit.batchtest.haltonerror}"
@@ -2165,7 +2261,11 @@
             <path refid="tests.classpath"/>
          </classpath>
 
-         <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+         <!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
+         <sysproperty key="jboss-junit-configuration" value="tests-db"/>
+         <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" 
+                    usefile="${junit.formatter.usefile}" 
+                    extension="-tests-db.xml"/>
 
          <batchtest todir="${build.reports}"
             haltonerror="${junit.batchtest.haltonerror}"
@@ -2332,7 +2432,11 @@
             <path refid="tests.classpath"/>
          </classpath>
 
-         <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+         <!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
+         <sysproperty key="jboss-junit-configuration" value="tests-objectweb-jms"/>
+         <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" 
+                    usefile="${junit.formatter.usefile}" 
+                    extension="-tests-objectweb-jms.xml"/>
 
          <batchtest todir="${build.reports}"
             haltonerror="${junit.batchtest.haltonerror}"
@@ -2503,4 +2607,104 @@
       </style>
    </target>
 
+    <target name="tests-matrix"
+      description="Executes only the version check compatibility suite. Use -Dmatrix-versions=[version container] for this task" depends="maybejars" if="matrix-versions">
+      <start-jboss conf="all" jvmargs="-Xmx128m"/>
+      <wait-on-host/>
+      <antcall target="tests-standard-unit-matrix"/>
+      <stop-jboss/>
+      <wait-on-shutdown conf="all"/>
+    </target>
+
+   <target name="define-matrix-task">
+       <taskdef name="matrixtask" classname="org.jboss.ant.taskdefs.AntCallOnDirectoryList">
+           <classpath>
+             <pathelement location="${build.classes}"/>
+           </classpath>
+       </taskdef>
+   </target>
+
+    <target name="tests-standard-unit-matrix" depends="define-matrix-task" if="matrix-versions">
+        <matrixtask targetToExecute="tests-standard-unit-matrix-version" directoryProperty="current-version-dir" versionNameProperty="matrix-configuration">
+            <dirset dir="${matrix-versions}"/>
+        </matrixtask>
+    </target>
+
+
+    <macrodef name="execute-matrix-unit">
+        <attribute name="test-name"/>
+        <attribute name="parameter-filter"/>
+        <sequential>
+            <!-- this requires antcall as a property can't be redefined -->
+            <antcall target="execute-matrix-unit-target">
+                <param name="test-name" value="@{test-name}"/>
+                <param name="parameter-filter" value="@{parameter-filter}"/>
+            </antcall>
+        </sequential>
+    </macrodef>
+
+    <target name="execute-matrix-unit-target">
+            <echo message=">>>>>> Executing test=${test-name} filter=${parameter-filter}"/>
+            <pathconvert pathSep="," dirSep="/" property="jbosstest.hometest">
+                <path location="${build.classes}"/>
+            </pathconvert>
+
+            <pathconvert pathSep="," dirSep="/" property="jbosstest.executionlist">
+                <path >
+                    <fileset dir="${build.classes}">
+                        <include name="${parameter-filter}"/>
+                   </fileset>
+                </path>
+            </pathconvert>
+
+            <junit dir="${module.output}"
+              printsummary="${junit.printsummary}"
+              haltonerror="${junit.haltonerror}"
+              haltonfailure="${junit.haltonfailure}"
+              fork="true"
+              timeout="${junit.timeout}"
+              jvm="${junit.jvm}">
+
+              <jvmarg value="${junit.jvm.options}"/>
+              <!-- Used for JGroups -->
+              <jvmarg value="-Dbind.address=${node0}"/>
+              <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
+              <sysproperty key="build.testlog" value="${build.testlog}"/>
+              <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
+              <sysproperty key="jboss-junit-configuration" value="${test-name}_${matrix-configuration}"/>
+              <!-- Pass along any jbosstest.* system properties -->
+              <syspropertyset>
+                <propertyref prefix="jbosstest."/>
+              </syspropertyset>
+              <classpath>
+                <pathelement location="${build.classes}"/>
+                <pathelement location="${build.resources}"/>
+                <fileset dir="${current-version-dir}" includes="*.jar"/>
+                <path refid="library.classpath" />
+              </classpath>
+                <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
+                  usefile="${junit.formatter.usefile}"
+                  extension="-${test-name}_${matrix-configuration}.xml"/>
+
+              <batchtest todir="${build.reports}"
+                haltonerror="${junit.batchtest.haltonerror}"
+                haltonfailure="${junit.batchtest.haltonfailure}"
+                fork="${junit.batchtest.fork}">
+
+                <fileset dir="${build.classes}">
+                  <include name="org/jboss/test/compatibility/test/matrix/MatrixTestContainer.class"/>
+                </fileset>
+              </batchtest>
+            </junit>
+
+    </target>
+
+    <target name="tests-standard-unit-matrix-version">
+        <execute-matrix-unit test-name="client" parameter-filter="org/jboss/test/client/**/*TestCase.class"/>
+        <execute-matrix-unit test-name="WebService" parameter-filter="org/jboss/test/webservice/**/*TestCase.class"/>
+        <execute-matrix-unit test-name="BMP" parameter-filter="org/jboss/test/bmp/**/*TestCase.class"/>
+        <execute-matrix-unit test-name="CMP" parameter-filter="org/jboss/test/cmp2/**/*TestCase.class"/>
+        <execute-matrix-unit test-name="JBossMX" parameter-filter="org/jboss/test/jbossmx/**/*TestCase.class"/>
+        <execute-matrix-unit test-name="JMS" parameter-filter="org/objectweb/jtests/jms/**/*Test.class"/>
+    </target>
 </project>

Added: branches/JBoss_4_0_1_SP1_CP/testsuite/src/main/org/jboss/ant/taksdefs/XMLJUnitMultipleResultFormatter.java
===================================================================
--- branches/JBoss_4_0_1_SP1_CP/testsuite/src/main/org/jboss/ant/taksdefs/XMLJUnitMultipleResultFormatter.java	                        (rev 0)
+++ branches/JBoss_4_0_1_SP1_CP/testsuite/src/main/org/jboss/ant/taksdefs/XMLJUnitMultipleResultFormatter.java	2007-04-16 16:44:43 UTC (rev 62370)
@@ -0,0 +1,35 @@
+/*
+ * JBoss, the OpenSource J2EE webOS
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package org.jboss.ant.taskdefs;
+
+
+import org.apache.tools.ant.taskdefs.optional.junit.JUnitTest;
+import org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter;
+
+/**
+ * This class only serves the proposite of keep multiple JUnit runnings between different configurations.
+ * For example, if you run a testcase as cluster, and the same testcase as singlenode, we want to keep both results in the JUnitReport.
+ * This is a simple implementation that uses a variable defined jboss-configuration and put that as part of the name.
+ * @author Clebert Suconic
+ */
+public class XMLJUnitMultipleResultFormatter extends XMLJUnitResultFormatter 
+{
+	
+    public void startTestSuite(JUnitTest test) 
+    { 
+        String configuration = (String)System.getProperties().get("jboss-junit-configuration");
+    	
+    	if (configuration!=null && !configuration.trim().equals("")) 
+        {
+                test.setName(test.getName() + "(" + configuration + ")");
+        }
+
+        super.startTestSuite(test);    	
+    }
+
+}
+

Modified: branches/JBoss_4_0_1_SP1_CP/tools/etc/buildmagic/buildmagic.ent
===================================================================
--- branches/JBoss_4_0_1_SP1_CP/tools/etc/buildmagic/buildmagic.ent	2007-04-16 15:50:13 UTC (rev 62369)
+++ branches/JBoss_4_0_1_SP1_CP/tools/etc/buildmagic/buildmagic.ent	2007-04-16 16:44:43 UTC (rev 62370)
@@ -99,10 +99,10 @@
   <property name="version.major" value="4"/>
   <property name="version.minor" value="0"/>
   <property name="version.revision" value="1"/>
-  <property name="version.tag" value="sp1"/>
+  <property name="version.tag" value=".SP1_CP01"/>
   <property name="version.name" value="Zion"/>
   <!-- This must be set to the CVS tag for any release -->
-  <property name="version.cvstag" value="JBoss_4_0_1_SP1"/>
+  <property name="version.cvstag" value="https://svn.jboss.org/repos/jbossas/tags/JBoss_4_0_1_SP1_CP01"/>
 
   <!-- Manifest version info -->
   <property name="specification.title" value="JBoss"/>

Modified: branches/JBoss_4_0_1_SP1_CP/tools/etc/buildmagic/version-info.xml
===================================================================
--- branches/JBoss_4_0_1_SP1_CP/tools/etc/buildmagic/version-info.xml	2007-04-16 15:50:13 UTC (rev 62369)
+++ branches/JBoss_4_0_1_SP1_CP/tools/etc/buildmagic/version-info.xml	2007-04-16 16:44:43 UTC (rev 62370)
@@ -17,10 +17,10 @@
     <property name="version.major" value="4"/>
     <property name="version.minor" value="0"/>
     <property name="version.revision" value="1"/>
-    <property name="version.tag" value="sp1"/>
+    <property name="version.tag" value=".SP1_CP01"/>
     <property name="version.name" value="Zion"/>
     <!-- This must be set to the CVS tag for any release -->
-    <property name="version.cvstag" value="JBoss_4_0_1_SP1"/>
+    <property name="version.cvstag" value="https://svn.jboss.org/repos/jbossas/tags/JBoss_4_0_1_SP1_CP01"/>
 
     <!-- Manifest version info -->
     <property name="specification.title" value="JBoss"/>




More information about the jboss-cvs-commits mailing list