Menu
▾
▴
jboss-cvs-commits
|
From: Adrian B. <ej...@us...> - 2004-12-22 17:47:09
|
User: ejort Date: 04/12/22 09:46:46 Modified: . Tag: Branch_3_2 build.xml Log: [JBAS-75] Add a test for running two jboss servers on the same machine with ports-01 and ports-02 from the example binding service. Currently it just tests that it can reach Tomcat on the overriden ports. Revision Changes Path No revision No revision 1.165.2.175 +25 -1 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.165.2.174 retrieving revision 1.165.2.175 diff -u -r1.165.2.174 -r1.165.2.175 --- build.xml 17 Dec 2004 10:41:21 -0000 1.165.2.174 +++ build.xml 22 Dec 2004 17:46:43 -0000 1.165.2.175 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.165.2.174 2004/12/17 10:41:21 tdiesler Exp $ --> +<!-- $Id: build.xml,v 1.165.2.175 2004/12/22 17:46:43 ejort Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -519,6 +519,7 @@ <antcall target="tomcat-ssl-tests" /> <antcall target="tomcat-sso-tests" /> <antcall target="tomcat-sso-clustered-tests"/> + <antcall target="test-example-binding-manager"/> <antcall target="tests-report" /> <record name="${basedir}/build.log" action="stop"/> </target> @@ -790,6 +791,29 @@ | Standard tests that should run successfully against a default JBoss | server distribution build. --> + + <target name="test-example-binding-manager" + description="Test the example binding configuration" + depends="maybejars"> + <create-all-cluster-node conf="binding-manager1" ports="ports-01"/> + <create-all-cluster-node conf="binding-manager2" ports="ports-02"/> + <start-jboss conf="binding-manager1"/> + <waitfor maxwait="300" maxwaitunit="second" + checkevery="5" checkeveryunit="second" timeoutproperty="cluster.timeout"> + <and> + <http url="http://localhost:8180"/> + </and> + </waitfor> + <start-jboss conf="binding-manager2"/> + <waitfor maxwait="300" maxwaitunit="second" + checkevery="5" checkeveryunit="second" timeoutproperty="cluster.timeout"> + <and> + <http url="http://localhost:8280"/> + </and> + </waitfor> + <stop-jboss url="jnp://localhost:1299"/> + <stop-jboss url="jnp://localhost:1199"/> + </target> <target name="tests-standard-unit" depends="maybejars"> <echo><![CDATA[ |
|
From: Adrian B. <ej...@us...> - 2004-12-22 18:46:07
|
User: ejort Date: 04/12/22 10:46:01 Modified: . Tag: Branch_3_2 build.xml Log: Actually test the failure to lookup the tomcat url. Revision Changes Path No revision No revision 1.165.2.176 +5 -1 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.165.2.175 retrieving revision 1.165.2.176 diff -u -r1.165.2.175 -r1.165.2.176 --- build.xml 22 Dec 2004 17:46:43 -0000 1.165.2.175 +++ build.xml 22 Dec 2004 18:45:58 -0000 1.165.2.176 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.165.2.175 2004/12/22 17:46:43 ejort Exp $ --> +<!-- $Id: build.xml,v 1.165.2.176 2004/12/22 18:45:58 ejort Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -798,19 +798,23 @@ <create-all-cluster-node conf="binding-manager1" ports="ports-01"/> <create-all-cluster-node conf="binding-manager2" ports="ports-02"/> <start-jboss conf="binding-manager1"/> + <echo>Waiting for http://localhost:8180</echo> <waitfor maxwait="300" maxwaitunit="second" checkevery="5" checkeveryunit="second" timeoutproperty="cluster.timeout"> <and> <http url="http://localhost:8180"/> </and> </waitfor> + <fail message="Timeout waiting for binding-manager1 to start" if="cluster.timeout"/> <start-jboss conf="binding-manager2"/> + <echo>Waiting for http://localhost:8280</echo> <waitfor maxwait="300" maxwaitunit="second" checkevery="5" checkeveryunit="second" timeoutproperty="cluster.timeout"> <and> <http url="http://localhost:8280"/> </and> </waitfor> + <fail message="Timeout waiting for binding-manager2 to start" if="cluster.timeout"/> <stop-jboss url="jnp://localhost:1299"/> <stop-jboss url="jnp://localhost:1199"/> </target> |
|
From: Scott M S. <st...@us...> - 2004-12-22 19:55:14
|
User: starksm
Date: 04/12/22 11:55:06
Modified: . Tag: Branch_4_0 build.xml
Log:
Include -Djava.endorsed.dirs=${jboss.dist}/lib/endorsed in the jvmargs passed to the start-jboss conf="all" of the jboss-all-config-tests target.
Revision Changes Path
No revision
No revision
1.406.2.30 +3 -3 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.406.2.29
retrieving revision 1.406.2.30
diff -u -r1.406.2.29 -r1.406.2.30
--- build.xml 21 Dec 2004 02:25:48 -0000 1.406.2.29
+++ build.xml 22 Dec 2004 19:55:05 -0000 1.406.2.30
@@ -6,7 +6,7 @@
<!-- See terms of license at http://www.gnu.org. -->
<!-- ============================================================ -->
-<!-- $Id: build.xml,v 1.406.2.29 2004/12/21 02:25:48 starksm Exp $ -->
+<!-- $Id: build.xml,v 1.406.2.30 2004/12/22 19:55:05 starksm Exp $ -->
<project default="main" name="JBoss/Testsuite">
<import file="../tools/etc/buildmagic/build-common.xml"/>
@@ -584,8 +584,9 @@
<target name="jboss-all-config-tests"
description="The units tests which are run against the jboss all config">
- <start-jboss conf="all" jvmargs="-Xmx128m"/>
+ <start-jboss conf="all" jvmargs="-Djava.endorsed.dirs=${jboss.dist}/lib/endorsed -Xmx128m"/>
<wait-on-host/>
+ <antcall target="tests-jaxr"/>
<antcall target="tests-standard-unit"/>
<antcall target="tests-client-unit"/>
<antcall target="tests-security-basic-unit"/>
@@ -594,7 +595,6 @@
<antcall target="tests-jbossmx-implementation"/>
<antcall target="tests-jbossmx-performance"/>
<antcall target="tests-iiop"/>
- <antcall target="tests-jaxr"/>
<antcall target="tests-webservice"/>
<antcall target="tests-txtimer"/>
<stop-jboss/>
|
|
From: Adrian B. <ej...@us...> - 2004-12-22 20:31:06
|
User: ejort Date: 04/12/22 12:30:59 Modified: . Tag: Branch_4_0 build.xml Log: [JBAS-75] - Port binding manager regression test from 3.2.x Revision Changes Path No revision No revision 1.406.2.31 +30 -2 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.30 retrieving revision 1.406.2.31 diff -u -r1.406.2.30 -r1.406.2.31 --- build.xml 22 Dec 2004 19:55:05 -0000 1.406.2.30 +++ build.xml 22 Dec 2004 20:30:37 -0000 1.406.2.31 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.30 2004/12/22 19:55:05 starksm Exp $ --> +<!-- $Id: build.xml,v 1.406.2.31 2004/12/22 20:30:37 ejort Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -555,6 +555,7 @@ <antcall target="tomcat-ssl-tests"/> <antcall target="tomcat-sso-tests"/> <antcall target="tomcat-sso-clustered-tests"/> + <antcall target="test-example-binding-manager"/> <antcall target="tests-jacc-security"/> <antcall target="tests-report"/> <record name="${basedir}/build.log" action="stop"/> @@ -584,9 +585,8 @@ <target name="jboss-all-config-tests" description="The units tests which are run against the jboss all config"> - <start-jboss conf="all" jvmargs="-Djava.endorsed.dirs=${jboss.dist}/lib/endorsed -Xmx128m"/> + <start-jboss conf="all" jvmargs="-Xmx128m"/> <wait-on-host/> - <antcall target="tests-jaxr"/> <antcall target="tests-standard-unit"/> <antcall target="tests-client-unit"/> <antcall target="tests-security-basic-unit"/> @@ -595,6 +595,7 @@ <antcall target="tests-jbossmx-implementation"/> <antcall target="tests-jbossmx-performance"/> <antcall target="tests-iiop"/> + <antcall target="tests-jaxr"/> <antcall target="tests-webservice"/> <antcall target="tests-txtimer"/> <stop-jboss/> @@ -924,6 +925,33 @@ <stop-jboss url="${node0.jndi.url}"/> <stop-jboss url="${node1.jndi.url}"/> </target> + + <target name="test-example-binding-manager" + description="Test the example binding configuration" + depends="maybejars"> + <create-all-cluster-node conf="binding-manager1" ports="ports-01"/> + <create-all-cluster-node conf="binding-manager2" ports="ports-02"/> + <start-jboss conf="binding-manager1"/> + <echo>Waiting for http://localhost:8180</echo> + <waitfor maxwait="300" maxwaitunit="second" + checkevery="5" checkeveryunit="second" timeoutproperty="cluster.timeout"> + <and> + <http url="http://localhost:8180"/> + </and> + </waitfor> + <fail message="Timeout waiting for binding-manager1 to start" if="cluster.timeout"/> + <start-jboss conf="binding-manager2"/> + <echo>Waiting for http://localhost:8280</echo> + <waitfor maxwait="300" maxwaitunit="second" + checkevery="5" checkeveryunit="second" timeoutproperty="cluster.timeout"> + <and> + <http url="http://localhost:8280"/> + </and> + </waitfor> + <fail message="Timeout waiting for binding-manager2 to start" if="cluster.timeout"/> + <stop-jboss url="jnp://localhost:1299"/> + <stop-jboss url="jnp://localhost:1199"/> + </target> <!-- | Standard tests that should run successfully against a default JBoss |
|
From: Scott M S. <st...@us...> - 2004-12-22 20:32:01
|
User: starksm
Date: 04/12/22 12:31:40
Modified: . build.xml
Log:
Include -Djava.endorsed.dirs=${jboss.dist}/lib/endorsed in the jvmargs passed to the start-jboss conf="all" of the jboss-all-config-tests target.
Revision Changes Path
1.432 +2 -3 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.431
retrieving revision 1.432
diff -u -r1.431 -r1.432
--- build.xml 20 Dec 2004 17:56:51 -0000 1.431
+++ build.xml 22 Dec 2004 20:31:40 -0000 1.432
@@ -6,7 +6,7 @@
<!-- See terms of license at http://www.gnu.org. -->
<!-- ============================================================ -->
-<!-- $Id: build.xml,v 1.431 2004/12/20 17:56:51 starksm Exp $ -->
+<!-- $Id: build.xml,v 1.432 2004/12/22 20:31:40 starksm Exp $ -->
<project default="main" name="JBoss/Testsuite">
<import file="../tools/etc/buildmagic/build-common.xml"/>
@@ -576,7 +576,7 @@
<target name="jboss-all-config-tests"
description="The units tests which are run against the jboss all config">
- <start-jboss conf="all" jvmargs="-Xmx128m"/>
+ <start-jboss conf="all" jvmargs="-Djava.endorsed.dirs=${jboss.dist}/lib/endorsed -Xmx128m"/>
<wait-on-host/>
<antcall target="tests-standard-unit"/>
<antcall target="tests-client-unit"/>
@@ -587,7 +587,6 @@
<antcall target="tests-jbossmx-performance"/>
<antcall target="tests-iiop"/>
<antcall target="tests-webservice" />
-<!-- <antcall target="tests-jaxr" />-->
<stop-jboss/>
<wait-on-shutdown conf="all" />
</target>
|
|
From: Scott M S. <st...@us...> - 2004-12-23 04:58:20
|
User: starksm Date: 04/12/22 20:58:14 Modified: . Tag: Branch_4_0 build.xml Log: Add the SecureTimerUnitTestCase to the security.includes Revision Changes Path No revision No revision 1.406.2.32 +3 -1 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.31 retrieving revision 1.406.2.32 diff -u -r1.406.2.31 -r1.406.2.32 --- build.xml 22 Dec 2004 20:30:37 -0000 1.406.2.31 +++ build.xml 23 Dec 2004 04:58:13 -0000 1.406.2.32 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.31 2004/12/22 20:30:37 ejort Exp $ --> +<!-- $Id: build.xml,v 1.406.2.32 2004/12/23 04:58:13 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -439,6 +439,7 @@ <include name="**/test/jmx/test/Secure*TestCase.class"/> <include name="**/test/jrmp/test/DynLoadingUnitTestCase.class"/> <include name="**/test/perf/test/SecurePerfStressTestCase.class"/> + <include name="**/test/timer/test/SecureTimerUnitTestCase.class"/> </patternset> <patternset id="security.excludes"> <exclude name="**/test/naming/test/Security*"/> @@ -446,6 +447,7 @@ <exclude name="**/test/jmx/test/Secure*"/> <exclude name="**/test/jrmp/test/DynLoadingUnitTestCase.class"/> <exclude name="**/test/perf/test/SecurePerfStressTestCase.class"/> + <exclude name="**/test/timer/test/SecureTimerUnitTestCase.class"/> </patternset> <!-- A patternset that requires jboss to run with a security manager --> <patternset id="securitymgr.includes"> |
|
From: Scott M S. <st...@us...> - 2004-12-23 21:59:12
|
User: starksm Date: 04/12/23 13:59:05 Modified: . build.xml Log: Add the SecureTimerUnitTestCase to the security.includes Revision Changes Path 1.433 +3 -1 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.432 retrieving revision 1.433 diff -u -r1.432 -r1.433 --- build.xml 22 Dec 2004 20:31:40 -0000 1.432 +++ build.xml 23 Dec 2004 21:59:04 -0000 1.433 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.432 2004/12/22 20:31:40 starksm Exp $ --> +<!-- $Id: build.xml,v 1.433 2004/12/23 21:59:04 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -439,6 +439,7 @@ <include name="**/test/jmx/test/Secure*TestCase.class"/> <include name="**/test/jrmp/test/DynLoadingUnitTestCase.class"/> <include name="**/test/perf/test/SecurePerfStressTestCase.class"/> + <include name="**/test/timer/test/SecureTimerUnitTestCase.class"/> </patternset> <patternset id="security.excludes"> <exclude name="**/test/naming/test/Security*"/> @@ -446,6 +447,7 @@ <exclude name="**/test/jmx/test/Secure*"/> <exclude name="**/test/jrmp/test/DynLoadingUnitTestCase.class"/> <exclude name="**/test/perf/test/SecurePerfStressTestCase.class"/> + <exclude name="**/test/timer/test/SecureTimerUnitTestCase.class"/> </patternset> <!-- A patternset that requires jboss to run with a security manager --> <patternset id="securitymgr.includes"> |
|
From: Scott M S. <st...@us...> - 2004-12-29 23:09:50
|
User: starksm Date: 04/12/29 15:09:41 Modified: . Tag: Branch_3_2 build.xml Log: Include org/jboss/test/jmx/invoker/BadListener.class in the rmic.includes patternset Revision Changes Path No revision No revision 1.165.2.177 +2 -1 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.165.2.176 retrieving revision 1.165.2.177 diff -u -r1.165.2.176 -r1.165.2.177 --- build.xml 22 Dec 2004 18:45:58 -0000 1.165.2.176 +++ build.xml 29 Dec 2004 23:09:38 -0000 1.165.2.177 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.165.2.176 2004/12/22 18:45:58 ejort Exp $ --> +<!-- $Id: build.xml,v 1.165.2.177 2004/12/29 23:09:38 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -141,6 +141,7 @@ <include name="org/jboss/test/cluster/test/DRMTestCase$TestListener.class"/> <include name="org/jboss/test/cts/test/ClientCallbackImpl.class"/> <include name="org/jboss/test/jmx/invoker/Listener.class"/> + <include name="org/jboss/test/jmx/invoker/BadListener.class"/> </patternset> <!-- ===== --> |
|
From: Anil S. <osd...@us...> - 2005-01-05 01:03:37
|
User: osdchicago Date: 05/01/04 17:03:22 Modified: . build.xml Log: New target tests-scout-jaxr Revision Changes Path 1.434 +69 -2 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.433 retrieving revision 1.434 diff -u -r1.433 -r1.434 --- build.xml 23 Dec 2004 21:59:04 -0000 1.433 +++ build.xml 5 Jan 2005 01:03:17 -0000 1.434 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.433 2004/12/23 21:59:04 starksm Exp $ --> +<!-- $Id: build.xml,v 1.434 2005/01/05 01:03:17 osdchicago Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -499,7 +499,7 @@ <exclude name="org/jboss/test/xml/*TestCase.class"/> </patternset> <patternset id="jaxr.includes"> - <include name="org/jboss/test/jaxr/**/*TestCase.class"/> + <include name="org/jboss/test/jaxr/scout/**/*TestCase.class"/> </patternset> <!-- Tests that are currently broken --> @@ -1748,6 +1748,73 @@ </junit> </target> + + <!-- Test for JAXR under the Web Services Umbrella --> + <target name="tests-scout-jaxr" depends="maybejars"> + <mkdir dir="${build.reports}"/> + <mkdir dir="${build.testlog}"/> + <junit dir="${module.output}" + printsummary="${junit.printsummary}" + haltonerror="${junit.haltonerror}" + haltonfailure="${junit.haltonfailure}" + fork="${junit.fork}" + timeout="${junit.timeout}" + jvm="${junit.jvm}" + failureProperty="tests.failure"> + + <jvmarg value="-Djava.endorsed.dirs=${jboss.server.lib}/endorsed"/> + <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="javax.xml.registry.ConnectionFactoryClass" + value="org.apache.ws.scout.registry.ConnectionFactoryImpl"/> + <sysproperty key="jaxr.query.url" + value="http://localhost:8080/juddi/inquiry"/> + <sysproperty key="jaxr.publish.url" + value="http://localhost:8080/juddi/publish"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> + <!-- Classpath to build and run the Jaxr tests. Jaxr is quite brittle + with heavy reliance on xml security, castor etc. Any changes to the + dependencies/classpath drives the tester crazy. Please retain this + until Jaxr has a permanent solution with juddi/Scout.--> + <classpath> + <pathelement location="${build.classes}"/> + + <path refid="apache.xerces.classpath"/> + <path refid="dom4j.dom4j.classpath"/> + <path refid="sun.javamail.classpath"/> + <path refid="sun.jaf.classpath"/> + <path refid="jboss.jaxrpc.classpath"/> + <path refid="apache.commons.classpath"/> + <path refid="juddi.juddi.classpath"/> + <path refid="apache.scout.classpath"/> + + <fileset dir="${jboss.dist}/client"> + <include name="jbossall-client.jar"/> + <include name="jboss-j2ee.jar"/> + <include name="axis-ws4ee.jar"/> + <include name="jboss-juddiaxis.jar"/> + </fileset> + </classpath> + + <formatter type="xml" usefile="${junit.formatter.usefile}"/> + + <batchtest todir="${build.reports}" + haltonerror="${junit.batchtest.haltonerror}" + haltonfailure="${junit.batchtest.haltonfailure}" + fork="${junit.batchtest.fork}"> + + <fileset dir="${build.classes}"> + <patternset refid="jaxr.includes"/> + </fileset> + </batchtest> + </junit> + </target> + + <!-- Test for JAXR under the Web Services Umbrella --> <target name="tests-jaxr" depends="maybejars"> <mkdir dir="${build.reports}"/> |
|
From: Bill B. <pat...@us...> - 2005-01-06 22:54:07
|
User: patriot1burke Date: 05/01/06 14:54:00 Modified: . build.xml Log: finish recovery prototype Revision Changes Path 1.435 +2 -1 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.434 retrieving revision 1.435 diff -u -r1.434 -r1.435 --- build.xml 5 Jan 2005 01:03:17 -0000 1.434 +++ build.xml 6 Jan 2005 22:53:59 -0000 1.435 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.434 2005/01/05 01:03:17 osdchicago Exp $ --> +<!-- $Id: build.xml,v 1.435 2005/01/06 22:53:59 patriot1burke Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -288,6 +288,7 @@ failonerror="${javac.fail.onerror}"> <src path="${source.java}"/> <src path="${build.gen-src}"/> + <exclude name="org/jboss/test/recover/oracle/**"/> <classpath refid="tests.classpath"/> </javac> </target> |
|
From: Ben W. <bw...@us...> - 2005-01-08 19:15:14
|
User: bwang00 Date: 05/01/08 11:15:07 Modified: . build.xml Log: Used -Dbind.address=node0 to be able to run under machine with multiple IP addresses. Note that node0 can be override in loca.properties but with default of localhost Revision Changes Path 1.436 +15 -8 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.435 retrieving revision 1.436 diff -u -r1.435 -r1.436 --- build.xml 6 Jan 2005 22:53:59 -0000 1.435 +++ build.xml 8 Jan 2005 19:15:02 -0000 1.436 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.435 2005/01/06 22:53:59 patriot1burke Exp $ --> +<!-- $Id: build.xml,v 1.436 2005/01/08 19:15:02 bwang00 Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -40,6 +40,12 @@ <os family="windows"/> </not> </condition> + + <!--We will use local.properties file to provide some configuration + to the testsuite mainly for the Clustering framework. Please + do not checkin your local.properties file into CVS--> + <property file="local.properties"/> + <!-- Cluster node0 defaults --> <property name="node0" value="localhost" /> <property name="node0.http.url" value="http://${node0}:8080" /> @@ -49,11 +55,6 @@ <property name="node1.http.url" value="http://${node1}:8080" /> <property name="node1.jndi.url" value="jnp://${node1}:1099" /> - <!--We will use local.properties file to provide some configuration to the testsuite - mainly for the Clustering framework. Please do not checkin your local.properties file - into CVS--> - <property file="local.properties"/> - <!-- =================== --> <!-- Basic Configuration --> <!-- =================== --> @@ -562,14 +563,14 @@ <target name="jboss-minimal-tests" description="Validate the minimal config"> - <start-jboss conf="minimal" host="${node0}" /> + <start-jboss conf="minimal" host="localhost" /> <copy file="${build.lib}/shutdown.sar" todir="${jboss.dist}/server/minimal/deploy" /> <!-- Wait for the 1099 jndi port --> <waitfor maxwait="30" maxwaitunit="second" checkevery="5" checkeveryunit="second" timeoutproperty="minimal.timeout"> <and> - <socket server="${node0}" port="1099" /> + <socket server="localhost" port="1099" /> </and> </waitfor> <fail message="Timeout waiting for minimal to start" if="minimal.timeout"/> @@ -855,6 +856,8 @@ 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"/> @@ -1954,6 +1957,8 @@ <jvmarg value="${junit.jvm.options}"/> <jvmarg value="-Djava.security.manager"/> <jvmarg value="-Djava.security.policy==${build.resources}/client.policy"/> + <!-- Used for JGroups --> + <jvmarg value="-Dbind.address=${node0}"/> <sysproperty key="jbosstest.deploy.dir" value="${build.lib}"/> <sysproperty key="build.testlog" value="${build.testlog}"/> <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/> @@ -2110,6 +2115,8 @@ 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"/> |
|
From: Ben W. <bw...@us...> - 2005-01-08 19:29:34
|
User: bwang00 Date: 05/01/08 11:29:27 Modified: . Tag: Branch_4_0 build.xml Log: Used -Dbind.address=node0 to be able to run under machine with multiple IP addresses. Note that node0 can be override in loca.properties but with default of localhost Revision Changes Path No revision No revision 1.406.2.33 +14 -7 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.32 retrieving revision 1.406.2.33 diff -u -r1.406.2.32 -r1.406.2.33 --- build.xml 23 Dec 2004 04:58:13 -0000 1.406.2.32 +++ build.xml 8 Jan 2005 19:29:25 -0000 1.406.2.33 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.32 2004/12/23 04:58:13 starksm Exp $ --> +<!-- $Id: build.xml,v 1.406.2.33 2005/01/08 19:29:25 bwang00 Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -23,7 +23,6 @@ <property name="results_web" value="http://jboss.sourceforge.net/junit-results/32"/> <property name="buildlog.level" value="info"/> - <property environment="env"/> <!-- Set a hostname property based on COMPUTERNAME for win32, HOSTNAME otherwise and initialize the node0/node1 cluster hostnames to localhost @@ -40,6 +39,12 @@ <os family="windows"/> </not> </condition> + + <!--We will use local.properties file to provide some configuration + to the testsuite mainly for the Clustering framework. Please + do not checkin your local.properties file into CVS--> + <property file="local.properties"/> + <!-- Cluster node0 defaults --> <property name="node0" value="localhost"/> <property name="node0.http.url" value="http://${node0}:8080"/> @@ -49,11 +54,6 @@ <property name="node1.http.url" value="http://${node1}:8080"/> <property name="node1.jndi.url" value="jnp://${node1}:1099"/> - <!--We will use local.properties file to provide some configuration to the testsuite - mainly for the Clustering framework. Please do not checkin your local.properties file - into CVS--> - <property file="local.properties"/> - <!-- =================== --> <!-- Basic Configuration --> <!-- =================== --> @@ -978,6 +978,8 @@ 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"/> @@ -2126,7 +2128,10 @@ <jvmarg value="${junit.jvm.options}"/> <jvmarg value="-Djava.security.manager"/> + <jvmarg value="-Dbind.address=${env.MYTESTIP_1}"/> <jvmarg value="-Djava.security.policy==${build.resources}/client.policy"/> + <!-- Used for JGroups --> + <jvmarg value="-Dbind.address=${node0}"/> <sysproperty key="jbosstest.deploy.dir" value="${build.lib}"/> <sysproperty key="build.testlog" value="${build.testlog}"/> <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/> @@ -2283,6 +2288,8 @@ jvm="${junit.jvm}"> <jvmarg value="${junit.jvm.options}"/> + <!-- Used for JGroups --> + <jvmarg value="-Dbind.address=${node0}"/> <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed"/> <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/> <sysproperty key="build.testlog" value="${build.testlog}"/> |
|
From: Ben W. <bw...@us...> - 2005-01-08 19:49:37
|
User: bwang00 Date: 05/01/08 11:49:29 Modified: . Tag: Branch_3_2 build.xml Log: Used -Dbind.address=node0 to be able to run under machine with multiple IP addresses. Note that node0 can be override in loca.properties but with default of localhost Revision Changes Path No revision No revision 1.165.2.178 +10 -7 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.165.2.177 retrieving revision 1.165.2.178 diff -u -r1.165.2.177 -r1.165.2.178 --- build.xml 29 Dec 2004 23:09:38 -0000 1.165.2.177 +++ build.xml 8 Jan 2005 19:49:25 -0000 1.165.2.178 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.165.2.177 2004/12/29 23:09:38 starksm Exp $ --> +<!-- $Id: build.xml,v 1.165.2.178 2005/01/08 19:49:25 bwang00 Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -23,7 +23,6 @@ <property name="results_web" value="http://jboss.sourceforge.net/junit-results/32"/> <property name="buildlog.level" value="info" /> - <property environment="env"/> <!-- Set a hostname property based on COMPUTERNAME for win32, HOSTNAME otherwise and initialize the node0/node1 cluster hostnames to localhost @@ -40,6 +39,12 @@ <os family="windows"/> </not> </condition> + + <!--We will use local.properties file to provide some configuration to the testsuite + mainly for the Clustering framework. Please do not checkin your local.properties file + into CVS--> + <property file="local.properties"/> + <!-- Cluster node0 defaults --> <property name="node0" value="localhost" /> <property name="node0.http.url" value="http://${node0}:8080" /> @@ -49,11 +54,6 @@ <property name="node1.http.url" value="http://${node1}:8080" /> <property name="node1.jndi.url" value="jnp://${node1}:1099" /> - <!--We will use local.properties file to provide some configuration to the testsuite - mainly for the Clustering framework. Please do not checkin your local.properties file - into CVS--> - <property file="local.properties"/> - <!-- =================== --> <!-- Basic Configuration --> <!-- =================== --> @@ -838,6 +838,7 @@ jvm="${junit.jvm}"> <jvmarg value="${junit.jvm.options}"/> + <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"/> @@ -1530,6 +1531,7 @@ <jvmarg value="${junit.jvm.options}"/> <jvmarg value="-Djava.security.manager"/> <jvmarg value="-Djava.security.policy==${build.resources}/client.policy"/> + <jvmarg value="-Dbind.address=${node0}"/> <sysproperty key="jbosstest.deploy.dir" value="${build.lib}"/> <sysproperty key="build.testlog" value="${build.testlog}"/> <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/> @@ -1683,6 +1685,7 @@ jvm="${junit.jvm}"> <jvmarg value="${junit.jvm.options}"/> + <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"/> |
|
From: Scott M S. <st...@us...> - 2005-01-10 15:48:08
|
User: starksm Date: 05/01/10 07:47:58 Modified: . Tag: Branch_3_2 build.xml Log: Only run the tests-security-manager target if jdk 1.4 is used as the jboss jaas impl only support the authentication part and Subject.doAs invocations fail. Revision Changes Path No revision No revision 1.165.2.179 +4 -3 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.165.2.178 retrieving revision 1.165.2.179 diff -u -r1.165.2.178 -r1.165.2.179 --- build.xml 8 Jan 2005 19:49:25 -0000 1.165.2.178 +++ build.xml 10 Jan 2005 15:47:52 -0000 1.165.2.179 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.165.2.178 2005/01/08 19:49:25 bwang00 Exp $ --> +<!-- $Id: build.xml,v 1.165.2.179 2005/01/10 15:47:52 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -549,7 +549,7 @@ <target name="jboss-all-config-tests" description="The units tests which are run against the jboss all config"> - <start-jboss conf="all" jvmargs="-Xmx128m"/> + <start-jboss conf="all" jvmargs="-XX:MaxPermSize=70m -Xmx128m"/> <wait-on-host /> <antcall target="tests-standard-unit" /> <antcall target="tests-client-unit" /> @@ -1117,7 +1117,8 @@ <!-- Tests of Java2 permissions. The JBoss server must be running with a security manager for this test --> <target name="tests-security-manager" - description="Tests run against a jboss server with a security manager"> + description="Tests run against a jboss server with a security manager" + if="HAVE_JDK_1.4"> <start-securitymgr/> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> |
|
From: Scott M S. <st...@us...> - 2005-01-10 16:49:34
|
User: starksm Date: 05/01/10 08:49:28 Modified: . Tag: Branch_3_2 build.xml Log: Include the org/jboss/test/ha package in the cluster.includes patternset Revision Changes Path No revision No revision 1.165.2.180 +4 -2 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.165.2.179 retrieving revision 1.165.2.180 diff -u -r1.165.2.179 -r1.165.2.180 --- build.xml 10 Jan 2005 15:47:52 -0000 1.165.2.179 +++ build.xml 10 Jan 2005 16:49:24 -0000 1.165.2.180 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.165.2.179 2005/01/10 15:47:52 starksm Exp $ --> +<!-- $Id: build.xml,v 1.165.2.180 2005/01/10 16:49:24 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -418,7 +418,9 @@ <!-- patternsets for that require clustering to be enabled --> <patternset id="cluster.includes"> <include name="org/jboss/test/cluster/test/*TestCase.class"/> - <include name="org/jboss/test/testbeancluster/test/*TestCase.class"/> + <include name="org/jboss/test/testbeancluster/test/*TestCase.class"/> + <include name="org/jboss/test/ha/jmx/test/*TestCase.class"/> + <include name="org/jboss/test/ha/singleton/test/*TestCase.class"/> </patternset> <patternset id="cluster.excludes"> <exclude name="org/jboss/test/cluster/test/*TestCase.class"/> |
|
From: Ben W. <bw...@us...> - 2005-01-14 06:05:35
|
User: bwang00 Date: 05/01/13 22:05:27 Modified: . build.xml Log: Run tests-cluester with different config settings Revision Changes Path 1.437 +41 -12 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.436 retrieving revision 1.437 diff -u -r1.436 -r1.437 --- build.xml 8 Jan 2005 19:15:02 -0000 1.436 +++ build.xml 14 Jan 2005 06:05:25 -0000 1.437 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.436 2005/01/08 19:15:02 bwang00 Exp $ --> +<!-- $Id: build.xml,v 1.437 2005/01/14 06:05:25 bwang00 Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -635,16 +635,7 @@ <target name="tests-clustering" description="Execute clustering tests requiring two nodes."> <antcall target="tests-clustering-startup" /> - <echo message="Waiting for nodes to start..."/> - <waitfor maxwait="120" maxwaitunit="second" - checkevery="5" checkeveryunit="second" timeoutproperty="cluster.timeout"> - <and> - <http url="${node0.http.url}"/> - <http url="${node1.http.url}"/> - </and> - </waitfor> - <fail message="Timeout waiting for nodes to start" if="cluster.timeout"/> - <echo message="Nodes have started, waiting for cluster to stablize..."/> + <antcall target="tests-clustering-wait" /> <!-- Need a custom condition that queries for the node membership == 2 --> <echo message="Going to call target tests-clustering-unit"/> @@ -653,17 +644,55 @@ <param name="cluster.includes.refid" value="cluster.includes"/> </antcall> <antcall target="tests-clustering-shutdown" /> + + <sleep seconds="4"/> + + <echo message="Going to call target tests-clustering-unit again with new configuration"/> + + <antcall target="tests-clustering-startup-with-config-change" /> + <antcall target="tests-clustering-wait" /> + + <antcall target="tests-clustering-unit"> + <param name="cluster.includes.refid" value="cluster.includes"/> + </antcall> + <antcall target="tests-clustering-shutdown" /> </target> + <target name="tests-clustering-startup" unless="${tests.clustering.skip.startup}"> <create-cluster-node conf="node0"/> <start-jboss conf="node0" host="${node0}"/> <create-cluster-node conf="node1"/> - <start-jboss conf="node1" host="${node1}"/> + <start-jboss conf="node1" host="${node1}"/> + </target> + + <target name="tests-clustering-startup-with-config-change" unless="${tests.clustering.skip.startup}"> + <create-cluster-node conf="node0"/> + <create-cluster-node conf="node1"/> + + <echo message="Modifying the node0 and node1 Tomcat configuration"/> + <http-cluster-node-config-change conf="node0"/> + <http-cluster-node-config-change conf="node1"/> + + <start-jboss conf="node0" host="${node0}"/> + <start-jboss conf="node1" host="${node1}"/> </target> + <target name="tests-clustering-shutdown" unless="${tests.clustering.skip.startup}"> <stop-jboss url="${node0.jndi.url}"/> <stop-jboss url="${node1.jndi.url}"/> </target> + <target name="tests-clustering-wait" unless="${tests.clustering.skip.startup}"> + <echo message="Waiting for nodes to start..."/> + <waitfor maxwait="120" maxwaitunit="second" + checkevery="5" checkeveryunit="second" timeoutproperty="cluster.timeout"> + <and> + <http url="${node0.http.url}"/> + <http url="${node1.http.url}"/> + </and> + </waitfor> + <fail message="Timeout waiting for nodes to start" if="cluster.timeout"/> + <echo message="Nodes have started, waiting for cluster to stablize..."/> + </target> <!-- Tests of tomcat needing a ssl connector --> |
|
From: Ben W. <bw...@us...> - 2005-01-14 06:17:32
|
User: bwang00 Date: 05/01/13 22:17:25 Modified: . Tag: Branch_4_0 build.xml Log: Run tests-clustering with different config settings Revision Changes Path No revision No revision 1.406.2.34 +44 -15 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.33 retrieving revision 1.406.2.34 diff -u -r1.406.2.33 -r1.406.2.34 --- build.xml 8 Jan 2005 19:29:25 -0000 1.406.2.33 +++ build.xml 14 Jan 2005 06:17:24 -0000 1.406.2.34 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.33 2005/01/08 19:29:25 bwang00 Exp $ --> +<!-- $Id: build.xml,v 1.406.2.34 2005/01/14 06:17:24 bwang00 Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -729,17 +729,8 @@ <target name="tests-clustering" description="Execute clustering tests requiring two nodes."> - <antcall target="tests-clustering-startup"/> - <echo message="Waiting for nodes to start..."/> - <waitfor maxwait="120" maxwaitunit="second" - checkevery="5" checkeveryunit="second" timeoutproperty="cluster.timeout"> - <and> - <http url="${node0.http.url}"/> - <http url="${node1.http.url}"/> - </and> - </waitfor> - <fail message="Timeout waiting for nodes to start" if="cluster.timeout"/> - <echo message="Nodes have started, waiting for cluster to stablize..."/> + <antcall target="tests-clustering-startup" /> + <antcall target="tests-clustering-wait" /> <!-- Need a custom condition that queries for the node membership == 2 --> <echo message="Going to call target tests-clustering-unit"/> @@ -747,18 +738,56 @@ <antcall target="tests-clustering-unit"> <param name="cluster.includes.refid" value="cluster.includes"/> </antcall> - <antcall target="tests-clustering-shutdown"/> + <antcall target="tests-clustering-shutdown" /> + + <sleep seconds="4"/> + + <echo message="Going to call target tests-clustering-unit again with new configuration"/> + + <antcall target="tests-clustering-startup-with-config-change" /> + <antcall target="tests-clustering-wait" /> + + <antcall target="tests-clustering-unit"> + <param name="cluster.includes.refid" value="cluster.includes"/> + </antcall> + <antcall target="tests-clustering-shutdown" /> </target> + <target name="tests-clustering-startup" unless="${tests.clustering.skip.startup}"> <create-cluster-node conf="node0"/> - <start-jboss conf="node0" host="${node0}"/> + <start-jboss conf="node0" host="${node0}"/> <create-cluster-node conf="node1"/> - <start-jboss conf="node1" host="${node1}"/> + <start-jboss conf="node1" host="${node1}"/> + </target> + + <target name="tests-clustering-startup-with-config-change" unless="${tests.clustering.skip.startup}"> + <create-cluster-node conf="node0"/> + <create-cluster-node conf="node1"/> + + <echo message="Modifying the node0 and node1 Tomcat configuration"/> + <http-cluster-node-config-change conf="node0"/> + <http-cluster-node-config-change conf="node1"/> + + <start-jboss conf="node0" host="${node0}"/> + <start-jboss conf="node1" host="${node1}"/> </target> + <target name="tests-clustering-shutdown" unless="${tests.clustering.skip.startup}"> <stop-jboss url="${node0.jndi.url}"/> <stop-jboss url="${node1.jndi.url}"/> </target> + <target name="tests-clustering-wait" unless="${tests.clustering.skip.startup}"> + <echo message="Waiting for nodes to start..."/> + <waitfor maxwait="120" maxwaitunit="second" + checkevery="5" checkeveryunit="second" timeoutproperty="cluster.timeout"> + <and> + <http url="${node0.http.url}"/> + <http url="${node1.http.url}"/> + </and> + </waitfor> + <fail message="Timeout waiting for nodes to start" if="cluster.timeout"/> + <echo message="Nodes have started, waiting for cluster to stablize..."/> + </target> <!-- Tests of tomcat needing a ssl connector --> |
|
From: Thomas D. <tdi...@us...> - 2005-01-19 13:24:42
|
User: tdiesler Date: 05/01/19 05:24:33 Modified: . build.xml Log: Synchronize webservice testsuite with JB401 Revision Changes Path 1.438 +2 -1 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.437 retrieving revision 1.438 diff -u -r1.437 -r1.438 --- build.xml 14 Jan 2005 06:05:25 -0000 1.437 +++ build.xml 19 Jan 2005 13:24:29 -0000 1.438 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.437 2005/01/14 06:05:25 bwang00 Exp $ --> +<!-- $Id: build.xml,v 1.438 2005/01/19 13:24:29 tdiesler Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -2169,6 +2169,7 @@ </classpath> <formatter type="xml" usefile="${junit.formatter.usefile}"/> + <formatter type="plain" usefile="${junit.formatter.usefile}"/> <test todir="${build.reports}" name="${test}" haltonerror="${junit.batchtest.haltonerror}" |
|
From: Scott M S. <st...@us...> - 2005-01-23 07:12:19
|
User: starksm Date: 05/01/22 23:12:12 Modified: . Tag: Branch_3_2 build.xml Log: Add the ha singleton to the cluster.excludes to avoid running them twice Revision Changes Path No revision No revision 1.165.2.181 +3 -1 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.165.2.180 retrieving revision 1.165.2.181 diff -u -r1.165.2.180 -r1.165.2.181 --- build.xml 10 Jan 2005 16:49:24 -0000 1.165.2.180 +++ build.xml 23 Jan 2005 07:12:10 -0000 1.165.2.181 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.165.2.180 2005/01/10 16:49:24 starksm Exp $ --> +<!-- $Id: build.xml,v 1.165.2.181 2005/01/23 07:12:10 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -425,6 +425,8 @@ <patternset id="cluster.excludes"> <exclude name="org/jboss/test/cluster/test/*TestCase.class"/> <exclude name="org/jboss/test/testbeancluster/test/*TestCase.class"/> + <exclude name="org/jboss/test/ha/jmx/test/*TestCase.class"/> + <exclude name="org/jboss/test/ha/singleton/test/*TestCase.class"/> </patternset> <patternset id="apache_tomcat.cluster.includes"> <include name="org/jboss/test/cluster/apache_tomcat/*TestCase.class"/> |
|
From: Scott M S. <st...@us...> - 2005-01-26 08:21:07
|
User: starksm Date: 05/01/26 00:20:59 Modified: . Tag: Branch_3_2 build.xml Log: Exclude tomcat-ssl-tests when running under jdk1.3 Revision Changes Path No revision No revision 1.165.2.182 +3 -2 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.165.2.181 retrieving revision 1.165.2.182 diff -u -r1.165.2.181 -r1.165.2.182 --- build.xml 23 Jan 2005 07:12:10 -0000 1.165.2.181 +++ build.xml 26 Jan 2005 08:20:55 -0000 1.165.2.182 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.165.2.181 2005/01/23 07:12:10 starksm Exp $ --> +<!-- $Id: build.xml,v 1.165.2.182 2005/01/26 08:20:55 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -641,7 +641,8 @@ <!-- Tests of tomcat needing a ssl connector --> <target name="tomcat-ssl-tests" - description="Tomcat tests requiring an SSL connector"> + description="Tomcat tests requiring an SSL connector" + if="HAVE_JDK_1.4"> <!-- Create the ssl enabled tomcat config --> <create-config baseconf="default" newconf="tomcat-ssl"> <patternset> |
|
From: Clebert R. S. <cl...@us...> - 2005-01-26 20:03:23
|
User: clebert Date: 05/01/26 12:03:16 Modified: . build.xml Log: Implementing multiple configurations into JUNIT-Clusters Revision Changes Path 1.439 +8 -2 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.438 retrieving revision 1.439 diff -u -r1.438 -r1.439 --- build.xml 19 Jan 2005 13:24:29 -0000 1.438 +++ build.xml 26 Jan 2005 20:03:12 -0000 1.439 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.438 2005/01/19 13:24:29 tdiesler Exp $ --> +<!-- $Id: build.xml,v 1.439 2005/01/26 20:03:12 clebert Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -620,6 +620,7 @@ <antcall target="tests-clustering-unit"> <param name="cluster.includes.refid" value="apache_tomcat.cluster.includes"/> + <param name="jboss-junit-configuration" value="Tomcat Clustering"/> </antcall> <stop-jboss url="${node0.jndi.url}"/> <stop-jboss url="${node1.jndi.url}"/> @@ -642,6 +643,7 @@ <antcall target="tests-clustering-unit"> <param name="cluster.includes.refid" value="cluster.includes"/> + <param name="jboss-junit-configuration" value="Two Nodes"/> </antcall> <antcall target="tests-clustering-shutdown" /> @@ -654,6 +656,7 @@ <antcall target="tests-clustering-unit"> <param name="cluster.includes.refid" value="cluster.includes"/> + <param name="jboss-junit-configuration" value="New Configuration tests-clustering"/> </antcall> <antcall target="tests-clustering-shutdown" /> </target> @@ -856,6 +859,7 @@ <sleep seconds="10" /> <antcall target="tests-clustering-unit"> <param name="cluster.includes.refid" value="tc-sso-clustered.includes"/> + <param name="jboss-junit-configuration" value="tomcat-sso-cluster"/> </antcall> <stop-jboss url="${node0.jndi.url}"/> @@ -1007,7 +1011,9 @@ <path refid="tests.classpath"/> </classpath> - <formatter type="xml" usefile="${junit.formatter.usefile}"/> + <!-- definition of the property for keeping results between configuration --> + <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/> + <formatter classname="com.jboss.testsuite.junit.XMLJUnitMultipleResultFormatter" usefile="${junit.formatter.usefile}" extension="-${jboss-junit-configuration}.xml" /> <batchtest todir="${build.reports}" haltonerror="${junit.batchtest.haltonerror}" |
|
From: Clebert R. S. <cl...@us...> - 2005-01-26 22:37:39
|
User: clebert Date: 05/01/26 14:37:32 Modified: . build.xml Log: Changing package name of JUnitXMLFormatter Revision Changes Path 1.440 +2 -2 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.439 retrieving revision 1.440 diff -u -r1.439 -r1.440 --- build.xml 26 Jan 2005 20:03:12 -0000 1.439 +++ build.xml 26 Jan 2005 22:37:31 -0000 1.440 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.439 2005/01/26 20:03:12 clebert Exp $ --> +<!-- $Id: build.xml,v 1.440 2005/01/26 22:37:31 clebert Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -1013,7 +1013,7 @@ <!-- definition of the property for keeping results between configuration --> <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/> - <formatter classname="com.jboss.testsuite.junit.XMLJUnitMultipleResultFormatter" usefile="${junit.formatter.usefile}" extension="-${jboss-junit-configuration}.xml" /> + <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="${junit.formatter.usefile}" extension="-${jboss-junit-configuration}.xml" /> <batchtest todir="${build.reports}" haltonerror="${junit.batchtest.haltonerror}" |
|
From: Clebert R. S. <cl...@us...> - 2005-01-26 23:01:50
|
User: clebert Date: 05/01/26 15:01:44 Modified: . Tag: Branch_4_0 build.xml Log: Merge with changes on Head for doing multiple JUnit configurations Revision Changes Path No revision No revision 1.406.2.35 +8 -2 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.34 retrieving revision 1.406.2.35 diff -u -r1.406.2.34 -r1.406.2.35 --- build.xml 14 Jan 2005 06:17:24 -0000 1.406.2.34 +++ build.xml 26 Jan 2005 23:01:25 -0000 1.406.2.35 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.34 2005/01/14 06:17:24 bwang00 Exp $ --> +<!-- $Id: build.xml,v 1.406.2.35 2005/01/26 23:01:25 clebert Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -715,6 +715,7 @@ <antcall target="tests-clustering-unit"> <param name="cluster.includes.refid" value="apache_tomcat.cluster.includes"/> + <param name="jboss-junit-configuration" value="Tomcat Clustering"/> </antcall> <stop-jboss url="${node0.jndi.url}"/> <stop-jboss url="${node1.jndi.url}"/> @@ -737,6 +738,7 @@ <antcall target="tests-clustering-unit"> <param name="cluster.includes.refid" value="cluster.includes"/> + <param name="jboss-junit-configuration" value="Two Nodes"/> </antcall> <antcall target="tests-clustering-shutdown" /> @@ -749,6 +751,7 @@ <antcall target="tests-clustering-unit"> <param name="cluster.includes.refid" value="cluster.includes"/> + <param name="jboss-junit-configuration" value="New Configuration tests-clustering"/> </antcall> <antcall target="tests-clustering-shutdown" /> </target> @@ -951,6 +954,7 @@ <sleep seconds="10"/> <antcall target="tests-clustering-unit"> <param name="cluster.includes.refid" value="tc-sso-clustered.includes"/> + <param name="jboss-junit-configuration" value="tomcat-sso-cluster"/> </antcall> <stop-jboss url="${node0.jndi.url}"/> @@ -1129,7 +1133,9 @@ <path refid="tests.classpath"/> </classpath> - <formatter type="xml" usefile="${junit.formatter.usefile}"/> + <!-- definition of the property for keeping results between configuration --> + <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/> + <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="${junit.formatter.usefile}" extension="-${jboss-junit-configuration}.xml" /> <batchtest todir="${build.reports}" haltonerror="${junit.batchtest.haltonerror}" |
|
From: Tom E. <te...@us...> - 2005-01-27 20:20:17
|
User: telrod Date: 05/01/27 12:20:04 Modified: . build.xml Log: JBREM-15 & JBREM-50 - Adding UnifiedInvoker to server module and testsuite. Also some minor updates to socket invoker and marshaller code to support unified invoker. Revision Changes Path 1.441 +92 -8 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.440 retrieving revision 1.441 diff -u -r1.440 -r1.441 --- build.xml 26 Jan 2005 22:37:31 -0000 1.440 +++ build.xml 27 Jan 2005 20:20:00 -0000 1.441 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.440 2005/01/26 22:37:31 clebert Exp $ --> +<!-- $Id: build.xml,v 1.441 2005/01/27 20:20:00 telrod Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -42,7 +42,7 @@ </condition> <!--We will use local.properties file to provide some configuration - to the testsuite mainly for the Clustering framework. Please + to the testsuite mainly for the Clustering framework. Please do not checkin your local.properties file into CVS--> <property file="local.properties"/> @@ -94,8 +94,8 @@ <!-- needed for proxy tests --> <path refid="apache.bcel.classpath"/> <!-- needed for security login module tests --> - <path refid="hsqldb.hsqldb.classpath"/> - + <path refid="hsqldb.hsqldb.classpath"/> + <!-- Need hibernate jar for hibernate-based tests --> <path refid="hibernate2.classpath"/> <path refid="odmg.classpath"/> @@ -342,7 +342,7 @@ <!-- Import the test jars build targets --> - <import file="imports/test-jars.xml"/> + <import file="imports/test-jars.xml"/> <!-- Import the jboss server run targets --> <import file="imports/server-config.xml"/> @@ -416,7 +416,7 @@ </waitfor> <fail message="Timeout waiting for '@{conf}' server to shutdown." if="shutdown.timeout"/> </sequential> - </macrodef> + </macrodef> <!-- patternsets for that require clustering to be enabled --> <patternset id="cluster.includes"> @@ -493,6 +493,28 @@ <patternset id="iiop.excludes"> <exclude name="org/jboss/test/*iiop/test/*"/> </patternset> + <!-- Tests needing unified invoker --> + <patternset id="unified-invoker.includes"> + <include name="org/jboss/test/cts/test/BmpUnitTestCase.class"/> + <include name="org/jboss/test/cts/test/ClientCallbackImpl.class"/> + <include name="org/jboss/test/cts/test/CmpUnitTestCase.class"/> + <include name="org/jboss/test/cts/test/CtsCmp2UnitTestCase.class"/> + <include name="org/jboss/test/cts/test/IndependentJarsUnitTestCase.class"/> + <include name="org/jboss/test/cts/test/LocalEjbTestCase.class"/> + <include name="org/jboss/test/cts/test/LongWaitStatefulSessionUnitTestCase.class"/> + <include name="org/jboss/test/cts/test/MDBInvoker.class"/> + <include name="org/jboss/test/cts/test/MDBUnitTestCase.class"/> + <include name="org/jboss/test/cts/test/SessionInvoker.class"/> + <include name="org/jboss/test/cts/test/StatefulSessionLocalUnitTestCase.class"/> + <include name="org/jboss/test/cts/test/StatefulSessionUnitTestCase.class"/> + <include name="org/jboss/test/cts/test/StatelessSessionStressTestCase.class"/> + <include name="org/jboss/test/cts/test/StatelessSessionUnitTestCase.class"/> + <include name="org/jboss/test/bank/test/BankEJB20StressTestCase.class"/> + <include name="org/jboss/test/testbean/test/BeanUnitTestCase.class"/> + </patternset> + <patternset id="unified-invoker.excludes"> + <exclude name="org/jboss/test/bank/test/*"/> + </patternset> <!-- Tests needing xml binding setup --> <patternset id="jbossxb.includes"> <include name="org/jboss/test/xml/*TestCase.class"/> @@ -529,7 +551,7 @@ </patternset> <!-- A target that allows for conditional dependency on the compilation and - + --> <target name="maybejars" unless="nojars"> @@ -552,6 +574,7 @@ <antcall target="tomcat-sso-tests"/> <antcall target="tomcat-sso-clustered-tests"/> <antcall target="tests-jacc-security"/> + <antcall target="unified-invoker-tests"/> <antcall target="tests-report"/> <record name="${basedir}/build.log" action="stop"/> </target> @@ -828,7 +851,7 @@ <include name="lib/**"/> </patternset> </create-config> - <create-config baseconf="all" newconf="tomcat-sso-cluster1" + <create-config baseconf="all" newconf="tomcat-sso-cluster1" newconf-src="tomcat-sso-cluster"> <patternset> <include name="conf/**"/> @@ -866,6 +889,67 @@ <stop-jboss url="${node1.jndi.url}"/> </target> + + <!-- + | Tests ejb calls using the unified invoker + --> + <target name="unified-invoker-tests" + description="EJB tests using the unified invoker"> + <!-- Create the unified invoker enabled config --> + <create-config baseconf="default" newconf="unified-invoker"> + <patternset> + <include name="conf/**"/> + <include name="deploy/**"/> + <include name="lib/**"/> + </patternset> + </create-config> + <start-jboss-os conf="unified-invoker"/> + <wait-on-host/> + + <antcall target="unified-invoker-unit-tests"> + <param name="jboss-junit-configuration" value="UnifiedInvoker"/> + </antcall> + + <stop-jboss/> + </target> + + <target name="unified-invoker-unit-tests"> + <junit dir="${module.output}" + printsummary="${junit.printsummary}" + haltonerror="${junit.haltonerror}" + haltonfailure="${junit.haltonfailure}" + fork="${junit.fork}" + timeout="${junit.timeout}" + jvm="${junit.jvm}"> + + <jvmarg value="${junit.jvm.options}"/> + <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="${jboss-junit-configuration}"/> + + <classpath> + <pathelement location="${build.classes}"/> + <pathelement location="${build.resources}"/> + <path refid="tests.classpath"/> + </classpath> + + <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" + usefile="${junit.formatter.usefile}" + extension="-${jboss-junit-configuration}.xml"/> + + <batchtest todir="${build.reports}" + haltonerror="${junit.batchtest.haltonerror}" + haltonfailure="${junit.batchtest.haltonfailure}" + fork="${junit.batchtest.fork}"> + + <fileset dir="${build.classes}"> + <patternset refid="unified-invoker.includes"/> + </fileset> + </batchtest> + </junit> + + </target> <!-- | Standard tests that should run successfully against a default JBoss | server distribution build. |
|
From: Tom E. <te...@us...> - 2005-01-29 04:23:34
|
User: telrod Date: 05/01/28 20:23:28 Modified: . build.xml Log: Changed the unified-invoker-tests to use start-jboss task instead of start-jboss-os task in effort to fix automated testsuite run. Revision Changes Path 1.442 +3 -2 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.441 retrieving revision 1.442 diff -u -r1.441 -r1.442 --- build.xml 27 Jan 2005 20:20:00 -0000 1.441 +++ build.xml 29 Jan 2005 04:23:27 -0000 1.442 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.441 2005/01/27 20:20:00 telrod Exp $ --> +<!-- $Id: build.xml,v 1.442 2005/01/29 04:23:27 telrod Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -903,7 +903,8 @@ <include name="lib/**"/> </patternset> </create-config> - <start-jboss-os conf="unified-invoker"/> +<!-- <start-jboss-os conf="unified-invoker"/>--> + <start-jboss conf="unified-invoker"/> <wait-on-host/> <antcall target="unified-invoker-unit-tests"> |
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X