Menu
▾
▴
jboss-cvs-commits
|
From: Adrian B. <adr...@jb...> - 2005-08-29 17:53:05
|
User: adrian Date: 05/08/29 13:53:04 Modified: jbosstest .classpath Log: Exclude duplicate classes from eclipse compilation Revision Changes Path 1.50 +1 -1 jbosstest/.classpath (In the diff below, changes in quantity of whitespace are not shown.) Index: .classpath =================================================================== RCS file: /cvsroot/jboss/jbosstest/.classpath,v retrieving revision 1.49 retrieving revision 1.50 diff -u -b -r1.49 -r1.50 --- .classpath 29 Aug 2005 17:47:13 -0000 1.49 +++ .classpath 29 Aug 2005 17:53:04 -0000 1.50 @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry excluding="org/jboss/test/recover/oracle/**" kind="src" path="src/main"/> + <classpathentry excluding="org/jboss/test/aop/bean/AnnotatedSecuredPOJO.java|org/jboss/test/aop/bean/AnnotatedTxLockedPOJO.java|org/jboss/test/aop/bean/AnnotatedTxPOJO.java|org/jboss/test/recover/oracle/**" kind="src" path="src/main"/> <classpathentry kind="src" path="src/jdk15"/> <classpathentry kind="src" path="output/gen-src"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> |
|
From: Thomas D. <tho...@jb...> - 2005-08-30 08:28:57
|
User: tdiesler Date: 05/08/30 04:28:53 Modified: jbosstest build.xml Log: Fix testsuite build Revision Changes Path 1.500 +7 -3 jbosstest/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.499 retrieving revision 1.500 diff -u -b -r1.499 -r1.500 --- build.xml 29 Aug 2005 16:10:52 -0000 1.499 +++ build.xml 30 Aug 2005 08:28:53 -0000 1.500 @@ -10,7 +10,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.499 2005/08/29 16:10:52 reverbel Exp $ --> +<!-- $Id: build.xml,v 1.500 2005/08/30 08:28:53 tdiesler Exp $ --> <project default="main" name="JBoss/Testsuite" xmlns:server="http://jboss.org/ns/test/ant/server"> @@ -321,6 +321,10 @@ includeJavaRuntime="${javac.include.java.runtime}" failonerror="${javac.fail.onerror}"> <src path="${source.java.5}"/> + + <!-- TDI: fix testsuite build --> + <exclude name="org/jboss/test/recover/test/**"/> + <classpath refid="annotations.classpath"/> </javac> </target> |
|
From: Francisco R. <rev...@im...> - 2005-08-30 18:08:45
|
User: reverbel
Date: 05/08/30 14:08:30
Modified: jbosstest build.xml
Log:
- Remote the annotations from StatelessFooBean as they force too much
recovery testing code to be moved do src/jdk15. Use xml descriptors instead.
- Move all recovery testing code in src/jdk15 back to src/main.
- Re-enable the compilation of recovery tests.
Revision Changes Path
1.501 +1 -5 jbosstest/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.500
retrieving revision 1.501
diff -u -b -r1.500 -r1.501
--- build.xml 30 Aug 2005 08:28:53 -0000 1.500
+++ build.xml 30 Aug 2005 18:08:30 -0000 1.501
@@ -10,7 +10,7 @@
<!-- See terms of license at http://www.gnu.org. -->
<!-- ============================================================ -->
-<!-- $Id: build.xml,v 1.500 2005/08/30 08:28:53 tdiesler Exp $ -->
+<!-- $Id: build.xml,v 1.501 2005/08/30 18:08:30 reverbel Exp $ -->
<project default="main" name="JBoss/Testsuite"
xmlns:server="http://jboss.org/ns/test/ant/server">
@@ -321,10 +321,6 @@
includeJavaRuntime="${javac.include.java.runtime}"
failonerror="${javac.fail.onerror}">
<src path="${source.java.5}"/>
-
- <!-- TDI: fix testsuite build -->
- <exclude name="org/jboss/test/recover/test/**"/>
-
<classpath refid="annotations.classpath"/>
</javac>
</target>
|
|
From: Francisco R. <rev...@im...> - 2005-08-30 19:33:34
|
User: reverbel Date: 05/08/30 15:33:27 Modified: jbosstest build.xml Log: Change the "before tx committed" and "after tx committed" tests to inject a failure through the logger rather than through the XA resources. This makes those tests independent from the ordering of the calls from the TM to the XA resources. Revision Changes Path 1.502 +10 -3 jbosstest/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.501 retrieving revision 1.502 diff -u -b -r1.501 -r1.502 --- build.xml 30 Aug 2005 18:08:30 -0000 1.501 +++ build.xml 30 Aug 2005 19:33:27 -0000 1.502 @@ -10,7 +10,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.501 2005/08/30 18:08:30 reverbel Exp $ --> +<!-- $Id: build.xml,v 1.502 2005/08/30 19:33:27 reverbel Exp $ --> <project default="main" name="JBoss/Testsuite" xmlns:server="http://jboss.org/ns/test/ant/server"> @@ -940,8 +940,12 @@ </filterset> </copy> - <copy todir="${jboss.dist}/server/dtmrec0/lib" overwrite="true" - file="${build.lib}/recover-dummyrecoverableproxy.jar"/> + <copy todir="${jboss.dist}/server/dtmrec0/lib" overwrite="true"> + <fileset dir="${build.lib}"> + <include name="recover-dummyrecoverableproxy.jar"/> + <include name="recover-loggerwrapper.jar"/> + </fileset> + </copy> <copy todir="${jboss.dist}/server/dtmrec0/deploy" overwrite="true" file="${build.resources}/recover/dummyrecoverableproxy-service.xml"> @@ -953,6 +957,9 @@ <copy todir="${jboss.dist}/server/dtmrec1/deploy" overwrite="true" file="${build.lib}/recover-dummyrecoverable.sar"/> + <copy todir="${jboss.dist}/server/dtmrec1/lib" overwrite="true" + file="${build.lib}/recover-loggerwrapper.jar"/> + <!-- Deploy EJB that will be used across server restarts --> <copy todir="${jboss.dist}/server/dtmrec0/deploy" overwrite="true"> <fileset dir="${build.lib}"> |
|
From: Adrian B. <adr...@jb...> - 2005-08-30 22:00:59
|
User: adrian Date: 05/08/30 18:00:55 Modified: jbosstest build.xml Log: Remove the dynloading tests from the security section. They don't work there and there is little point running them twice? Revision Changes Path 1.503 +1 -4 jbosstest/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.502 retrieving revision 1.503 diff -u -b -r1.502 -r1.503 --- build.xml 30 Aug 2005 19:33:27 -0000 1.502 +++ build.xml 30 Aug 2005 22:00:55 -0000 1.503 @@ -10,7 +10,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.502 2005/08/30 19:33:27 reverbel Exp $ --> +<!-- $Id: build.xml,v 1.503 2005/08/30 22:00:55 adrian Exp $ --> <project default="main" name="JBoss/Testsuite" xmlns:server="http://jboss.org/ns/test/ant/server"> @@ -576,9 +576,6 @@ <include name="**/test/security/test/*UnitTestCase.class"/> <include name="**/test/jca/test/SecurityContextUnitTestCase.class"/> <include name="**/test/jmx/test/Secure*TestCase.class"/> - <include name="**/test/jrmp/test/DynLoadingUnitTestCase.class"/> - <include name="**/test/jrmp/test/DynLoadingFromSARUnitTestCase.class"/> - <include name="**/test/jrmp/test/DynLoadingFromSARUnpackedUnitTestCase.class"/> <include name="**/test/perf/test/SecurePerfStressTestCase.class"/> <include name="**/test/timer/test/SecureTimerUnitTestCase.class"/> </patternset> |
|
From: Adrian B. <adr...@jb...> - 2005-08-30 22:01:03
|
User: adrian
Date: 05/08/30 18:01:00
Modified: jbosstest Tag: Branch_4_0 build.xml
Log:
Remove the dynloading tests from the security section.
They don't work there and there is little point running them twice?
Revision Changes Path
No revision
No revision
1.406.2.109 +1 -4 jbosstest/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.406.2.108
retrieving revision 1.406.2.109
diff -u -b -r1.406.2.108 -r1.406.2.109
--- build.xml 15 Aug 2005 08:06:07 -0000 1.406.2.108
+++ build.xml 30 Aug 2005 22:01:00 -0000 1.406.2.109
@@ -12,7 +12,7 @@
<!-- ============================================================ -->
-<!-- $Id: build.xml,v 1.406.2.108 2005/08/15 08:06:07 bwang Exp $ -->
+<!-- $Id: build.xml,v 1.406.2.109 2005/08/30 22:01:00 adrian Exp $ -->
<project default="main" name="JBoss/Testsuite">
<import file="../tools/etc/buildmagic/build-common.xml"/>
@@ -497,9 +497,6 @@
<include name="**/test/security/test/*UnitTestCase.class"/>
<include name="**/test/jca/test/SecurityContextUnitTestCase.class"/>
<include name="**/test/jmx/test/Secure*TestCase.class"/>
- <include name="**/test/jrmp/test/DynLoadingUnitTestCase.class"/>
- <include name="**/test/jrmp/test/DynLoadingFromSARUnitTestCase.class"/>
- <include name="**/test/jrmp/test/DynLoadingFromSARUnpackedUnitTestCase.class"/>
<include name="**/test/perf/test/SecurePerfStressTestCase.class"/>
<include name="**/test/timer/test/SecureTimerUnitTestCase.class"/>
</patternset>
|
|
From: Ruel L. <rue...@jb...> - 2005-08-30 22:52:49
|
User: rloehr
Date: 05/08/30 18:52:47
Modified: jbosstest Tag: Branch_4_0 build.xml
Log:
change classpath for failing test to include dependent modules classpath
Revision Changes Path
No revision
No revision
1.406.2.110 +2 -2 jbosstest/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.406.2.109
retrieving revision 1.406.2.110
diff -u -b -r1.406.2.109 -r1.406.2.110
--- build.xml 30 Aug 2005 22:01:00 -0000 1.406.2.109
+++ build.xml 30 Aug 2005 22:52:47 -0000 1.406.2.110
@@ -12,7 +12,7 @@
<!-- ============================================================ -->
-<!-- $Id: build.xml,v 1.406.2.109 2005/08/30 22:01:00 adrian Exp $ -->
+<!-- $Id: build.xml,v 1.406.2.110 2005/08/30 22:52:47 rloehr Exp $ -->
<project default="main" name="JBoss/Testsuite">
<import file="../tools/etc/buildmagic/build-common.xml"/>
@@ -2814,7 +2814,7 @@
<pathelement location="${build.classes}"/>
<pathelement location="${build.resources}"/>
<fileset dir="${current-version-dir}" includes="*.jar"/>
- <path refid="library.classpath" />
+ <path refid="thirdparty.classpath" />
</classpath>
<formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter"
usefile="${junit.formatter.usefile}"
|
|
From: Ruel L. <rue...@jb...> - 2005-09-01 13:41:30
|
User: rloehr Date: 05/09/01 09:27:39 Modified: jbosstest Tag: Branch_3_2 build.xml Log: rename hibernate module in 3.2 branch Revision Changes Path No revision No revision 1.165.2.186 +2 -2 jbosstest/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.165.2.185 retrieving revision 1.165.2.186 diff -u -b -r1.165.2.185 -r1.165.2.186 --- build.xml 30 Jun 2005 17:22:07 -0000 1.165.2.185 +++ build.xml 1 Sep 2005 13:27:38 -0000 1.165.2.186 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.165.2.185 2005/06/30 17:22:07 adrian Exp $ --> +<!-- $Id: build.xml,v 1.165.2.186 2005/09/01 13:27:38 rloehr Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -132,7 +132,7 @@ <path refid="jboss.varia.classpath"/> <path refid="jboss.jbossnet.classpath"/> <path refid="jboss.cache.classpath"/> - <path refid="jboss.hibernate.classpath" /> + <path refid="jboss.hibernate-int.classpath" /> </path> <!-- RMI Stub generation --> |
|
From: Ryan C. <rca...@jb...> - 2005-09-01 14:14:36
|
User: rcampbell Date: 05/09/01 10:14:32 Modified: jbosstest Tag: Branch_4_0 build.xml Log: merge server controller tasks in to 4.0 Revision Changes Path No revision No revision 1.406.2.111 +57 -136 jbosstest/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.406.2.110 retrieving revision 1.406.2.111 diff -u -b -r1.406.2.110 -r1.406.2.111 --- build.xml 30 Aug 2005 22:52:47 -0000 1.406.2.110 +++ build.xml 1 Sep 2005 14:14:31 -0000 1.406.2.111 @@ -12,9 +12,11 @@ <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.406.2.110 2005/08/30 22:52:47 rloehr Exp $ --> +<!-- $Id: build.xml,v 1.406.2.111 2005/09/01 14:14:31 rcampbell Exp $ --> + +<project default="main" name="JBoss/Testsuite" + xmlns:server="http://jboss.org/ns/test/ant/server"> -<project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -672,27 +674,20 @@ <target name="jboss-minimal-tests" description="Validate the minimal config"> - <start-jboss conf="minimal" host="${node0}"/> + <server:start name="minimal"/> <!-- Deploy a service that calls System.exit(0) in its stop --> <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"/> - </and> - </waitfor> - <fail message="Timeout waiting for minimal to start" if="minimal.timeout"/> <echo message="Minimal server started, stopping"/> + <sleep seconds="5"/> <!-- Remove the service to trigger a System.exit(0) --> <delete file="${jboss.dist}/server/minimal/deploy/shutdown.sar"/> + <sleep seconds="7"/> </target> <target name="jboss-all-config-tests" description="The units tests which are run against the jboss all config"> - <start-jboss conf="all" jvmargs="-verbose:gc -Xmx128m" host="${node0}"/> - <wait-on-host host="${node0}"/> + <server:start name="all"/> <!-- It requires -Dmatrix-versions=defined if you want to execute this task. More information at http://wiki.jboss.org/wiki/Wiki.jsp?page=HowToExecuteMatrixTests --> @@ -708,8 +703,7 @@ <antcall target="tests-scout-jaxr"/> <antcall target="tests-webservice"/> <antcall target="tests-txtimer"/> - <stop-jboss url="${node0.jndi.url}"/> - <wait-on-shutdown conf="all"/> + <server:stop name="all"/> </target> <!-- Test netbooting a subset of the default configuration @@ -775,18 +769,9 @@ <!-- Definition of apache is in imports/server-config.xml --> <apache location="${apache.location}" action-type="start"/> <create-cluster-node conf="node0"/> - <start-jboss conf="node0" host="${node0}"/> + <server:start name="node0" /> <create-cluster-node conf="node1"/> - <start-jboss conf="node1" host="${node1}"/> - <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"/> + <server:start name="node1"/> <echo message="Nodes have started, waiting for cluster to stablize..."/> <!-- Need a custom condition that queries for the node membership == 2 --> @@ -796,8 +781,8 @@ <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}"/> + <server:stop name="node0"/> + <server:stop name="node1"/> <apache location="${apache.location}" action-type="stop"/> </target> @@ -826,8 +811,10 @@ <!-- Depending on the value of the ${jgroups-stack} variable, uses different JGroups stacks --> <target name="tests-clustering" description="Execute clustering tests requiring two nodes."> - <antcall target="tests-clustering-startup"/> - <antcall target="tests-clustering-wait"/> + <antcall target="tests-clustering-configure" inheritRefs="true"/> + + <server:start name="node0"/> + <server:start name="node1"/> <!-- Need a custom condition that queries for the node membership == 2 --> <echo message="Going to call target tests-clustering-unit"/> @@ -836,27 +823,30 @@ <param name="cluster.includes.refid" value="cluster.includes"/> <param name="jboss-junit-configuration" value="Default-${jboss-junit-configuration}"/> </antcall> - <antcall target="tests-clustering-shutdown"/> + + <server:stop name="node0"/> + <server:stop name="node1"/> <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"/> + + <server:start name="node0"/> + <server:start name="node1"/> <antcall target="tests-clustering-unit"> <param name="cluster.includes.refid" value="cluster.includes"/> <param name="jboss-junit-configuration" value="SyncModeNUseJvm-${jboss-junit-configuration}"/> </antcall> - <antcall target="tests-clustering-shutdown"/> + <server:stop name="node0"/> + <server:stop name="node1"/> </target> - <target name="tests-clustering-startup" unless="${tests.clustering.skip.startup}"> + <target name="tests-clustering-configure" unless="${tests.clustering.skip.startup}"> <create-cluster-node conf="node0" host="${node0}"/> - <start-jboss conf="node0" host="${node0}"/> <create-cluster-node conf="node1" host="${node1}"/> - <start-jboss conf="node1" host="${node1}"/> </target> <target name="tests-clustering-startup-with-config-change" unless="${tests.clustering.skip.startup}"> @@ -866,28 +856,6 @@ <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}"/> - <wait-on-shutdown conf="node0"/> - <wait-on-shutdown conf="node1"/> - </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 @@ -903,8 +871,8 @@ <include name="lib/**"/> </patternset> </create-config> - <start-jboss conf="tomcat-ssl"/> - <wait-on-host/> + <server:start name="tomcat-ssl"/> + <!-- Specify the JSSE properties --> <property name="javax.net.ssl.keyStore" value="${build.resources}/test-configs/tomcat-ssl/conf/client.keystore"/> @@ -918,8 +886,8 @@ </propertyset> <run-junit junit.patternset="tc-ssl.includes" junit.syspropertyset="tomcat-ssl-tests-props" /> - <stop-jboss/> - <wait-on-shutdown conf="tomcat-ssl"/> + + <server:stop name="tomcat-ssl"/> </target> <!-- Tests of tomcat requiring SSO configured @@ -941,11 +909,9 @@ <include name="lib/**"/> </patternset> </create-config> - <start-jboss conf="tomcat-sso"/> - <wait-on-host/> + <server:start name="tomcat-sso"/> <run-junit junit.patternset="tc-sso.includes" /> - <stop-jboss/> - <wait-on-shutdown conf="tomcat-sso"/> + <server:stop name="tomcat-sso"/> </target> <target name="tomcat-sso-clustered-tests" @@ -985,16 +951,8 @@ </patternset> </create-config> - <start-jboss conf="tomcat-sso-cluster0" host="${node0}"/> - <start-jboss conf="tomcat-sso-cluster1" host="${node1}"/> - <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"/> + <server:start name="tomcat-sso-cluster0"/> + <server:start name="tomcat-sso-cluster1"/> <echo message="Nodes have started, waiting for cluster to stablize..."/> <sleep seconds="10"/> <antcall target="tests-clustering-unit"> @@ -1002,10 +960,8 @@ <param name="jboss-junit-configuration" value="tomcat-sso-cluster"/> </antcall> - <stop-jboss url="${node0.jndi.url}"/> - <stop-jboss url="${node1.jndi.url}"/> - <wait-on-shutdown conf="tomcat-sso-cluster0"/> - <wait-on-shutdown conf="tomcat-sso-cluster1"/> + <server:stop name="tomcat-sso-cluster0"/> + <server:stop name="tomcat-sso-cluster1"/> </target> <target name="test-example-binding-manager" @@ -1013,27 +969,13 @@ > <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://${node0}:8180</echo> - <waitfor maxwait="300" maxwaitunit="second" - checkevery="5" checkeveryunit="second" timeoutproperty="cluster.timeout"> - <and> - <http url="http://${node0}:8180"/> - </and> - </waitfor> - <fail message="Timeout waiting for binding-manager1 to start" if="cluster.timeout"/> - <start-jboss conf="binding-manager2"/> - <echo>Waiting for http://${node0}:8280</echo> - <waitfor maxwait="300" maxwaitunit="second" - checkevery="5" checkeveryunit="second" timeoutproperty="cluster.timeout"> - <and> - <http url="http://${node0}:8280"/> - </and> - </waitfor> - <fail message="Timeout waiting for binding-manager2 to start" if="cluster.timeout"/> + <server:start name="binding-manager1"/> + <server:start name="binding-manager2"/> + <run-junit junit.patternset="binding-manager.includes" /> - <stop-jboss url="jnp://${node0}:1299"/> - <stop-jboss url="jnp://${node0}:1199"/> + + <server:stop name="binding-manager1"/> + <server:stop name="binding-manager2"/> </target> <!-- @@ -1064,13 +1006,11 @@ <include name="deployment-service.sar"/> </fileset> </copy> - <start-jboss-os conf="deployment-service"/> - <wait-on-host/> + <server:start name="deployment-service"/> <antcall target="deployment-service-unit-tests"> <param name="jboss-junit-configuration" value="DeploymentService"/> </antcall> - <stop-jboss/> - <wait-on-shutdown conf="deployment-service"/> + <server:stop name="deployment-service"/> </target> <target name="deployment-service-unit-tests"> @@ -1243,11 +1183,6 @@ </fileset> </batchtest> </junit> - <antcall target="cleanup-clustering"></antcall> - </target> - <!-- Target stops the cluster when junit fails.--> - <target name="cleanup-clustering" if="test.failure"> - <stop-cluster/> </target> <target name="tests-ha-unit"> @@ -1369,15 +1304,8 @@ a security manager for this test --> <target name="tests-security-manager" description="Tests run against a jboss server with a security manager"> - <start-securitymgr - security.debug="access,failure" - /> - <waitfor maxwait="60" maxwaitunit="second" - checkevery="5" checkeveryunit="second" timeoutproperty="startup.timeout"> - <http url="http://${node0}:8080/"/> - </waitfor> - <fail message="Timeout waiting for server to start" if="startup.timeout"/> + <server:start name="securitymgr"/> <property name="jboss.home" location="${project.root}"/> <property name="jboss.thirdparty.dir" location="${project.root}/thirdparty"/> <property name="jboss.tools.dir" location="${project.root}/tools"/> @@ -1396,8 +1324,8 @@ <run-junit junit.patternset="test.includes" junit.syspropertyset="tests-security-manager-props" /> - <stop-jboss/> - <wait-on-shutdown conf="default"/> + <echo>Waiting for server to shutdown...</echo> + <server:stop name="securitymgr"/> </target> <!-- Tests of the JACC security implementation --> @@ -1422,15 +1350,10 @@ <include name="lib/**"/> </patternset> </create-config> - <start-jboss conf="jacc"/> + <server:start name="jacc"/> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> - <waitfor maxwait="60" maxwaitunit="second" - checkevery="5" checkeveryunit="second" timeoutproperty="startup.timeout"> - <http url="http://${node0}:8080/"/> - </waitfor> - <fail message="Timeout waiting for server to start" if="startup.timeout"/> <property name="jbosstest.secure" value="true"/> <property name="java.security.auth.login.config" @@ -1443,8 +1366,7 @@ junit.configuration="JACC" junit.syspropertyset="jacc-tests-props" /> - <stop-jboss/> - <wait-on-shutdown conf="jacc"/> + <server:stop name="jacc"/> </target> <target name="tests-jacc-securitymgr" @@ -1468,7 +1390,7 @@ <include name="lib/**"/> </patternset> </create-config> - <start-securitymgr conf="jacc"/> + <server:start name="jacc-securitymgr"/> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> @@ -1544,8 +1466,7 @@ junit.configuration="JACC+SecurityMgr" junit.syspropertyset="jacc-tests-props" /> - <stop-jboss/> - <wait-on-shutdown conf="jacc"/> + <server:stop name="jacc-securitymgr"/> </target> <target name="tests-standalone-aop-unit"> @@ -2200,8 +2121,7 @@ <include name="**/*"/> </patternset> </create-config> - <start-jboss conf="webservice-ssl"/> - <wait-on-host/> + <server:start name="webservice-ssl"/> <!-- Specify the JSSE properties --> <property name="javax.net.ssl.keyStore" value="${build.resources}/test-configs/webservice-ssl/conf/client.keystore"/> @@ -2216,8 +2136,7 @@ </propertyset> <run-junit junit.patternset="webservice-ssl.includes" junit.syspropertyset="tests-webservice-ssl-props" /> - <stop-jboss/> - <wait-on-shutdown conf="webservice-ssl"/> + <server:stop name="webservice-ssl"/> </target> <!-- @@ -2702,9 +2621,11 @@ <target name="tests-jboss-cluster" description="Test that two jboss cluster nodes can be started/stopped from ant"> - <start-cluster/> + <server:start name="node0"/> + <server:start name="node1"/> <start-sleep seconds="60"/> - <stop-cluster/> + <server:stop name="node0"/> + <server:stop name="node1"/> </target> <!-- Reporting targets that generate reports from JUnit output. |
|
From: Ruel L. <rue...@jb...> - 2005-09-01 17:21:35
|
User: rloehr Date: 05/09/01 13:21:30 Modified: jbosstest Tag: Branch_3_2 build.xml Log: JBAS-2200 - rename of hibernate module breaks older tagged builds, revert changes for legacy module defintions Revision Changes Path No revision No revision 1.165.2.187 +2 -2 jbosstest/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.165.2.186 retrieving revision 1.165.2.187 diff -u -b -r1.165.2.186 -r1.165.2.187 --- build.xml 1 Sep 2005 13:27:38 -0000 1.165.2.186 +++ build.xml 1 Sep 2005 17:21:29 -0000 1.165.2.187 @@ -6,7 +6,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.165.2.186 2005/09/01 13:27:38 rloehr Exp $ --> +<!-- $Id: build.xml,v 1.165.2.187 2005/09/01 17:21:29 rloehr Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> @@ -132,7 +132,7 @@ <path refid="jboss.varia.classpath"/> <path refid="jboss.jbossnet.classpath"/> <path refid="jboss.cache.classpath"/> - <path refid="jboss.hibernate-int.classpath" /> + <path refid="jboss.hibernate.classpath" /> </path> <!-- RMI Stub generation --> |
|
From: Ruel L. <rue...@jb...> - 2005-09-02 13:59:42
|
User: rloehr Date: 05/09/02 09:59:38 Modified: jbosstest Tag: REPO_BRANCH_3_2 build.xml Log: JBBUILD-138 - merge repository build into existing buildmagic build Revision Changes Path No revision No revision 1.165.2.186.2.1 +10 -7 jbosstest/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.165.2.186 retrieving revision 1.165.2.186.2.1 diff -u -b -r1.165.2.186 -r1.165.2.186.2.1 --- build.xml 1 Sep 2005 13:27:38 -0000 1.165.2.186 +++ build.xml 2 Sep 2005 13:59:38 -0000 1.165.2.186.2.1 @@ -1,4 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE project [ + <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent"> + <!ENTITY modules SYSTEM "../tools/etc/buildmagic/modules.ent"> +]> <!-- ============================================================ --> <!-- JBoss, the OpenSource J2EE webOS --> @@ -6,12 +10,10 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.165.2.186 2005/09/01 13:27:38 rloehr Exp $ --> +<!-- $Id: build.xml,v 1.165.2.186.2.1 2005/09/02 13:59:38 rloehr Exp $ --> <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> - <import file="../tools/etc/buildmagic/libraries.xml"/> - <import file="../tools/etc/buildmagic/modules.xml"/> <!-- ======================================================== --> <!-- Initialization --> @@ -63,8 +65,9 @@ <property name="module.Name" value="JBoss Testsuite"/> <property name="module.version" value="DEV"/> - <!-- ========= --> - <!-- Libraries --> + + &libraries; + &modules; <!-- ========= --> <!-- The combined library classpath --> <path id="library.classpath"> @@ -230,7 +233,7 @@ <!-- xdoclet --> <path id="xdoclet.task.classpath"> <path refid="tests.classpath"/> - <fileset dir="${project.thirdparty}/xdoclet/xdoclet/lib"> + <fileset dir="${xdoclet.xdoclet.lib}"> <include name="**/*.jar"/> </fileset> <fileset dir="${project.root}/jboss.net"> |
|
From: Francisco R. <rev...@im...> - 2005-09-05 15:51:51
|
User: reverbel Date: 05/09/05 11:51:47 Modified: jbosstest build.xml Log: Add tx recovery test for the distributed case (multiple appservers). Revision Changes Path 1.504 +63 -16 jbosstest/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.503 retrieving revision 1.504 diff -u -b -r1.503 -r1.504 --- build.xml 30 Aug 2005 22:00:55 -0000 1.503 +++ build.xml 5 Sep 2005 15:51:47 -0000 1.504 @@ -10,7 +10,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.503 2005/08/30 22:00:55 adrian Exp $ --> +<!-- $Id: build.xml,v 1.504 2005/09/05 15:51:47 reverbel Exp $ --> <project default="main" name="JBoss/Testsuite" xmlns:server="http://jboss.org/ns/test/ant/server"> @@ -909,8 +909,8 @@ <!-- DTM recovery tests --> - <target name="dtm-recovery-tests" description="DTM two-phase commit tests"> - <!-- Create configs dtmrec0 and dtmrec1 with EJB3, DTM, and OTS --> + <target name="dtm-recovery-tests" description="DTM recovery tests"> + <!-- Create configs dtmrec0-dtmrec3 with EJB3, DTM, and OTS --> <create-ejb3-dtm-config conf="dtmrec0"/> <copy todir="${jboss.dist}/server/dtmrec0/conf" overwrite="true" file="${source.resources}/dtm/jacorb.properties"> @@ -925,6 +925,20 @@ <filter token="HOST" value="${node1}"/> </filterset> </copy> + <create-ejb3-dtm-config conf="dtmrec2"/> + <copy todir="${jboss.dist}/server/dtmrec2/conf" overwrite="true" + file="${source.resources}/dtm/jacorb.properties"> + <filterset> + <filter token="HOST" value="${node2}"/> + </filterset> + </copy> + <create-ejb3-dtm-config conf="dtmrec3"/> + <copy todir="${jboss.dist}/server/dtmrec3/conf" overwrite="true" + file="${source.resources}/dtm/jacorb.properties"> + <filterset> + <filter token="HOST" value="${node3}"/> + </filterset> + </copy> <!-- make jndi.properties files available to clients of node0 --> <copy todir="${build.resources}" overwrite="true"> @@ -937,35 +951,65 @@ </filterset> </copy> + <!-- deploy dummy recoverable and logger wrapper services to node1 --> + <copy todir="${jboss.dist}/server/dtmrec1/deploy" overwrite="true" + file="${build.lib}/recover-dummyrecoverable.sar"/> + <copy todir="${jboss.dist}/server/dtmrec1/lib" overwrite="true" + file="${build.lib}/recover-loggerwrapper.jar"/> + + <!-- deploy dummy recoverable proxy and logger wrapper services + to node0, node2 and node3 --> <copy todir="${jboss.dist}/server/dtmrec0/lib" overwrite="true"> <fileset dir="${build.lib}"> <include name="recover-dummyrecoverableproxy.jar"/> <include name="recover-loggerwrapper.jar"/> </fileset> </copy> - <copy todir="${jboss.dist}/server/dtmrec0/deploy" overwrite="true" file="${build.resources}/recover/dummyrecoverableproxy-service.xml"> <filterset> <filter token="HOST1" value="${node1}"/> </filterset> </copy> - - <copy todir="${jboss.dist}/server/dtmrec1/deploy" overwrite="true" - file="${build.lib}/recover-dummyrecoverable.sar"/> - - <copy todir="${jboss.dist}/server/dtmrec1/lib" overwrite="true" - file="${build.lib}/recover-loggerwrapper.jar"/> - - <!-- Deploy EJB that will be used across server restarts --> - <copy todir="${jboss.dist}/server/dtmrec0/deploy" overwrite="true"> + <copy todir="${jboss.dist}/server/dtmrec2/lib" overwrite="true"> + <fileset dir="${build.lib}"> + <include name="recover-dummyrecoverableproxy.jar"/> + <include name="recover-loggerwrapper.jar"/> + </fileset> + </copy> + <copy todir="${jboss.dist}/server/dtmrec2/deploy" overwrite="true" + file="${build.resources}/recover/dummyrecoverableproxy-service.xml"> + <filterset> + <filter token="HOST1" value="${node1}"/> + </filterset> + </copy> + <copy todir="${jboss.dist}/server/dtmrec3/lib" overwrite="true"> <fileset dir="${build.lib}"> - <include name="recover-stateless.ejb3"/> + <include name="recover-dummyrecoverableproxy.jar"/> + <include name="recover-loggerwrapper.jar"/> </fileset> </copy> + <copy todir="${jboss.dist}/server/dtmrec3/deploy" overwrite="true" + file="${build.resources}/recover/dummyrecoverableproxy-service.xml"> + <filterset> + <filter token="HOST1" value="${node1}"/> + </filterset> + </copy> + + <!-- Deploy EJBs that will be used across server restarts --> + <copy todir="${jboss.dist}/server/dtmrec0/deploy" overwrite="true" + file="${build.lib}/recover-stateless.ejb3"/> + <copy todir="${jboss.dist}/server/dtmrec0/deploy" overwrite="true" + file="${build.lib}/recover-xaresenlistercaller.jar"/> + <copy todir="${jboss.dist}/server/dtmrec2/deploy" overwrite="true" + file="${build.lib}/recover-xaresenlister.jar"/> + <copy todir="${jboss.dist}/server/dtmrec3/deploy" overwrite="true" + file="${build.lib}/recover-xaresenlister.jar"/> <!-- Start DTM nodes --> <server:start name="dtmrec1"/> + <server:start name="dtmrec2"/> + <server:start name="dtmrec3"/> <server:start name="dtmrec0"/> <echo message="Nodes have started, waiting for node set to stablize..."/> @@ -978,9 +1022,12 @@ <run-dtm-recovery-test test="CrashAfterOneResourceButNotAllHaveCommitted"/> <run-dtm-recovery-test test="CrashAfterTxCommittedWithSuccessfulXARetryAtRecoveryTime"/> <run-dtm-recovery-test test="CrashAfterTxCommittedWithFailedXARetryAtRecoveryTime"/> + <run-dtm-recovery-test test="CrashAfterDistributedTxCommitted"/> <!-- Stop DTM nodes --> <server:stop name="dtmrec0"/> + <server:stop name="dtmrec3"/> + <server:stop name="dtmrec2"/> <server:stop name="dtmrec1"/> </target> @@ -988,10 +1035,10 @@ <attribute name="test" description="the name of the test to run"/> <sequential> <run-dtm-test test="@{test}TestCase"/> - <echo message="Server crashed as expected. Restarting it..."/> + <echo message="Server should have crashed. Restarting it..."/> <server:start name="dtmrec0"/> <echo message="Waiting for restarted server to perform transaction recovery..."/> - <sleep seconds="1" /> + <sleep seconds="2" /> <run-dtm-test test="RecoveryFrom@{test}TestCase"/> </sequential> </macrodef> |
|
From: Francisco R. <rev...@im...> - 2005-09-05 22:50:11
|
User: reverbel Date: 05/09/05 18:50:02 Modified: jbosstest build.xml Log: Set jbosstest.server.host and java.naming.provider.url when running DTM recovery tests. Revision Changes Path 1.505 +3 -1 jbosstest/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.504 retrieving revision 1.505 diff -u -b -r1.504 -r1.505 --- build.xml 5 Sep 2005 15:51:47 -0000 1.504 +++ build.xml 5 Sep 2005 22:50:02 -0000 1.505 @@ -10,7 +10,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.504 2005/09/05 15:51:47 reverbel Exp $ --> +<!-- $Id: build.xml,v 1.505 2005/09/05 22:50:02 reverbel Exp $ --> <project default="main" name="JBoss/Testsuite" xmlns:server="http://jboss.org/ns/test/ant/server"> @@ -1074,6 +1074,8 @@ <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="java.naming.provider.url" value="${node0.jndi.url}"/> + <sysproperty key="jbosstest.server.host" value="${node0}"/> <!-- Pass along any jbosstest.* system properties --> <syspropertyset> <propertyref prefix="jbosstest."/> |
|
From: Francisco R. <rev...@im...> - 2005-09-06 15:59:48
|
User: reverbel Date: 05/09/06 11:59:37 Modified: jbosstest build.xml Log: Add tests for recovery from a coordinator crash before a prepared transaction involving multiple appservers commits. Revision Changes Path 1.506 +2 -1 jbosstest/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.505 retrieving revision 1.506 diff -u -b -r1.505 -r1.506 --- build.xml 5 Sep 2005 22:50:02 -0000 1.505 +++ build.xml 6 Sep 2005 15:59:37 -0000 1.506 @@ -10,7 +10,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.505 2005/09/05 22:50:02 reverbel Exp $ --> +<!-- $Id: build.xml,v 1.506 2005/09/06 15:59:37 reverbel Exp $ --> <project default="main" name="JBoss/Testsuite" xmlns:server="http://jboss.org/ns/test/ant/server"> @@ -1023,6 +1023,7 @@ <run-dtm-recovery-test test="CrashAfterTxCommittedWithSuccessfulXARetryAtRecoveryTime"/> <run-dtm-recovery-test test="CrashAfterTxCommittedWithFailedXARetryAtRecoveryTime"/> <run-dtm-recovery-test test="CrashAfterDistributedTxCommitted"/> + <run-dtm-recovery-test test="CrashBeforeDistributedTxCommitted"/> <!-- Stop DTM nodes --> <server:stop name="dtmrec0"/> |
|
From: Adrian B. <adr...@jb...> - 2005-09-06 17:34:09
|
User: adrian Date: 05/09/06 13:33:59 Modified: jbosstest .classpath Log: Fix the eclipse build. Revision Changes Path 1.51 +1 -0 jbosstest/.classpath (In the diff below, changes in quantity of whitespace are not shown.) Index: .classpath =================================================================== RCS file: /cvsroot/jboss/jbosstest/.classpath,v retrieving revision 1.50 retrieving revision 1.51 diff -u -b -r1.50 -r1.51 --- .classpath 29 Aug 2005 17:53:04 -0000 1.50 +++ .classpath 6 Sep 2005 17:33:59 -0000 1.51 @@ -52,5 +52,6 @@ <classpathentry kind="lib" path="/thirdparty/jboss/cache/lib/jboss-cache.jar"/> <classpathentry combineaccessrules="false" kind="src" path="/ejb3x"/> <classpathentry combineaccessrules="false" kind="src" path="/ejb3"/> + <classpathentry kind="lib" path="/thirdparty/apache-xalan/lib/xalan.jar"/> <classpathentry kind="output" path="output/eclipse-classes"/> </classpath> |
|
From: Adrian B. <adr...@jb...> - 2005-09-06 17:45:07
|
User: adrian Date: 05/09/06 13:45:00 Modified: jbosstest Tag: Branch_4_0 .classpath Log: Fix the eclipse build Revision Changes Path No revision No revision 1.24.2.19 +1 -0 jbosstest/.classpath (In the diff below, changes in quantity of whitespace are not shown.) Index: .classpath =================================================================== RCS file: /cvsroot/jboss/jbosstest/.classpath,v retrieving revision 1.24.2.18 retrieving revision 1.24.2.19 diff -u -b -r1.24.2.18 -r1.24.2.19 --- .classpath 22 Aug 2005 18:00:23 -0000 1.24.2.18 +++ .classpath 6 Sep 2005 17:44:59 -0000 1.24.2.19 @@ -46,5 +46,6 @@ <classpathentry kind="lib" path="/tools/lib/ant.jar"/> <classpathentry kind="lib" path="/tools/lib/ant-junit.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss/cache/lib/jboss-cache.jar"/> + <classpathentry kind="lib" path="/thirdparty/apache-xalan/lib/xalan.jar"/> <classpathentry kind="output" path="output/eclipse-classes"/> </classpath> |
|
From: Ruel L. <rue...@jb...> - 2005-09-06 19:01:06
|
User: rloehr Date: 05/09/06 15:00:58 Modified: jbosstest Tag: Branch_3_2 build.xml Log: JBBUILD-89 - merge repository work into 3.2 Revision Changes Path No revision No revision 1.165.2.188 +13 -8 jbosstest/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.165.2.187 retrieving revision 1.165.2.188 diff -u -b -r1.165.2.187 -r1.165.2.188 --- build.xml 1 Sep 2005 17:21:29 -0000 1.165.2.187 +++ build.xml 6 Sep 2005 19:00:58 -0000 1.165.2.188 @@ -1,4 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE project [ + <!ENTITY libraries SYSTEM "../thirdparty/libraries.ent"> + <!ENTITY modules SYSTEM "../tools/etc/buildmagic/modules.ent"> +]> <!-- ============================================================ --> <!-- JBoss, the OpenSource J2EE webOS --> @@ -6,12 +10,12 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.165.2.187 2005/09/01 17:21:29 rloehr Exp $ --> + +<!-- $Id: build.xml,v 1.165.2.188 2005/09/06 19:00:58 rloehr Exp $ --> + <project default="main" name="JBoss/Testsuite"> <import file="../tools/etc/buildmagic/build-common.xml"/> - <import file="../tools/etc/buildmagic/libraries.xml"/> - <import file="../tools/etc/buildmagic/modules.xml"/> <!-- ======================================================== --> <!-- Initialization --> @@ -63,8 +67,9 @@ <property name="module.Name" value="JBoss Testsuite"/> <property name="module.version" value="DEV"/> - <!-- ========= --> - <!-- Libraries --> + + &libraries; + &modules; <!-- ========= --> <!-- The combined library classpath --> <path id="library.classpath"> @@ -132,7 +137,7 @@ <path refid="jboss.varia.classpath"/> <path refid="jboss.jbossnet.classpath"/> <path refid="jboss.cache.classpath"/> - <path refid="jboss.hibernate.classpath" /> + <path refid="jboss.hibernate-int.classpath" /> </path> <!-- RMI Stub generation --> @@ -230,7 +235,7 @@ <!-- xdoclet --> <path id="xdoclet.task.classpath"> <path refid="tests.classpath"/> - <fileset dir="${project.thirdparty}/xdoclet/xdoclet/lib"> + <fileset dir="${xdoclet.xdoclet.lib}"> <include name="**/*.jar"/> </fileset> <fileset dir="${project.root}/jboss.net"> |
|
From: Adrian B. <adr...@jb...> - 2005-09-06 20:33:09
|
User: adrian Date: 05/09/06 16:33:02 Modified: jbosstest Tag: Branch_3_2 .classpath Log: Fix the eclipse build now we are using the repository, still a problem with hibernate2? Revision Changes Path No revision No revision 1.6.2.10 +10 -10 jbosstest/.classpath (In the diff below, changes in quantity of whitespace are not shown.) Index: .classpath =================================================================== RCS file: /cvsroot/jboss/jbosstest/.classpath,v retrieving revision 1.6.2.9 retrieving revision 1.6.2.10 diff -u -b -r1.6.2.9 -r1.6.2.10 --- .classpath 31 May 2005 19:01:31 -0000 1.6.2.9 +++ .classpath 6 Sep 2005 20:33:02 -0000 1.6.2.10 @@ -5,18 +5,18 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="src" path="/tools"/> <classpathentry kind="lib" path="/tools/lib/ant.jar"/> - <classpathentry kind="lib" path="/thirdparty/junit/junit/lib/junit.jar"/> - <classpathentry kind="lib" path="/thirdparty/apache/log4j/lib/log4j.jar"/> + <classpathentry kind="lib" path="/thirdparty/junit/lib/junit.jar"/> + <classpathentry kind="lib" path="/thirdparty/apache-log4j/lib/log4j.jar"/> <classpathentry kind="src" path="/j2ee"/> <classpathentry kind="src" path="/management"/> <classpathentry kind="src" path="/jmx"/> <classpathentry kind="src" path="/common"/> <classpathentry kind="src" path="/system"/> - <classpathentry kind="lib" path="/thirdparty/oswego/concurrent/lib/concurrent.jar"/> - <classpathentry kind="lib" path="/thirdparty/sun/servlet/lib/servlet.jar"/> - <classpathentry kind="lib" path="/thirdparty/sun/javamail/lib/mail.jar"/> + <classpathentry kind="lib" path="/thirdparty/oswego-concurrent/lib/concurrent.jar"/> + <classpathentry kind="lib" path="/thirdparty/sun-servlet/lib/servlet.jar"/> + <classpathentry kind="lib" path="/thirdparty/sun-javamail/lib/mail.jar"/> <classpathentry kind="src" path="/varia"/> - <classpathentry kind="lib" path="/thirdparty/junitejb/junitejb/lib/junitejb.jar"/> + <classpathentry kind="lib" path="/thirdparty/junitejb/lib/junitejb.jar"/> <classpathentry kind="src" path="/server"/> <classpathentry kind="src" path="/cluster"/> <classpathentry kind="src" path="/messaging"/> @@ -24,12 +24,12 @@ <classpathentry kind="src" path="/connector"/> <classpathentry kind="src" path="/security"/> <classpathentry kind="src" path="/transaction"/> - <classpathentry kind="lib" path="/thirdparty/apache/commons/lib/commons-httpclient.jar"/> + <classpathentry kind="lib" path="/thirdparty/apache-httpclient/lib/commons-httpclient.jar"/> <classpathentry kind="src" path="/jboss.net"/> - <classpathentry kind="lib" path="/thirdparty/ibm/wsdl4j/lib/wsdl4j.jar"/> + <classpathentry kind="lib" path="/thirdparty/ibm-wsdl4j/lib/wsdl4j.jar"/> <classpathentry kind="src" path="/cache"/> - <classpathentry kind="lib" path="/thirdparty/javagroups/javagroups/lib/jgroups.jar"/> - <classpathentry kind="lib" path="/thirdparty/hsqldb/hsqldb/lib/hsqldb.jar"/> + <classpathentry kind="lib" path="/thirdparty/jgroups/lib/jgroups.jar"/> + <classpathentry kind="lib" path="/thirdparty/hsqldb/lib/hsqldb.jar"/> <classpathentry kind="src" path="/hibernate"/> <classpathentry kind="lib" path="/thirdparty/hibernate/lib/hibernate2.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss/axis/lib/axis-ws4ee.jar"/> |
|
From: Adrian B. <adr...@jb...> - 2005-09-06 20:40:18
|
User: adrian Date: 05/09/06 16:40:12 Modified: jbosstest Tag: Branch_3_2 .classpath Log: hibernate -> hibernate-int for eclispe build Revision Changes Path No revision No revision 1.6.2.11 +1 -1 jbosstest/.classpath (In the diff below, changes in quantity of whitespace are not shown.) Index: .classpath =================================================================== RCS file: /cvsroot/jboss/jbosstest/.classpath,v retrieving revision 1.6.2.10 retrieving revision 1.6.2.11 diff -u -b -r1.6.2.10 -r1.6.2.11 --- .classpath 6 Sep 2005 20:33:02 -0000 1.6.2.10 +++ .classpath 6 Sep 2005 20:40:12 -0000 1.6.2.11 @@ -30,8 +30,8 @@ <classpathentry kind="src" path="/cache"/> <classpathentry kind="lib" path="/thirdparty/jgroups/lib/jgroups.jar"/> <classpathentry kind="lib" path="/thirdparty/hsqldb/lib/hsqldb.jar"/> - <classpathentry kind="src" path="/hibernate"/> <classpathentry kind="lib" path="/thirdparty/hibernate/lib/hibernate2.jar"/> <classpathentry kind="lib" path="/thirdparty/jboss/axis/lib/axis-ws4ee.jar"/> + <classpathentry combineaccessrules="false" kind="src" path="/hibernate-int"/> <classpathentry kind="output" path="output/eclipse-classes"/> </classpath> |
|
From: Francisco R. <rev...@im...> - 2005-09-06 21:45:23
|
User: reverbel Date: 05/09/06 17:45:18 Modified: jbosstest build.xml Log: Add IIOP version of tests for recovery from a coordinator crash after a transaction involving multiple appservers commits. Revision Changes Path 1.507 +2 -1 jbosstest/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.506 retrieving revision 1.507 diff -u -b -r1.506 -r1.507 --- build.xml 6 Sep 2005 15:59:37 -0000 1.506 +++ build.xml 6 Sep 2005 21:45:18 -0000 1.507 @@ -10,7 +10,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.506 2005/09/06 15:59:37 reverbel Exp $ --> +<!-- $Id: build.xml,v 1.507 2005/09/06 21:45:18 reverbel Exp $ --> <project default="main" name="JBoss/Testsuite" xmlns:server="http://jboss.org/ns/test/ant/server"> @@ -1024,6 +1024,7 @@ <run-dtm-recovery-test test="CrashAfterTxCommittedWithFailedXARetryAtRecoveryTime"/> <run-dtm-recovery-test test="CrashAfterDistributedTxCommitted"/> <run-dtm-recovery-test test="CrashBeforeDistributedTxCommitted"/> + <run-dtm-recovery-test test="CrashAfterDistributedTxCommittedIIOP"/> <!-- Stop DTM nodes --> <server:stop name="dtmrec0"/> |
|
From: Clebert S. <csu...@jb...> - 2005-09-08 15:30:21
|
User: csuconic
Date: 05/09/08 11:30:04
Modified: jbosstest Tag: Branch_4_0_call_by_value_optimizations
build.xml
Log:
Fixes on classpath for allowing dependencies with Remoting
Revision Changes Path
No revision
No revision
1.406.2.108.2.1 +136 -69 jbosstest/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.406.2.108
retrieving revision 1.406.2.108.2.1
diff -u -b -r1.406.2.108 -r1.406.2.108.2.1
--- build.xml 15 Aug 2005 08:06:07 -0000 1.406.2.108
+++ build.xml 8 Sep 2005 15:30:04 -0000 1.406.2.108.2.1
@@ -12,7 +12,7 @@
<!-- ============================================================ -->
-<!-- $Id: build.xml,v 1.406.2.108 2005/08/15 08:06:07 bwang Exp $ -->
+<!-- $Id: build.xml,v 1.406.2.108.2.1 2005/09/08 15:30:04 csuconic Exp $ -->
<project default="main" name="JBoss/Testsuite">
<import file="../tools/etc/buildmagic/build-common.xml"/>
@@ -158,6 +158,7 @@
<path refid="jboss.transaction.classpath"/>
<path refid="jboss.varia.classpath"/>
<path refid="jboss.webservice.classpath"/>
+ <path refid="jboss.serialization.classpath"/>
</path>
<!-- RMI Stub generation -->
@@ -2582,6 +2583,66 @@
-->
<target name="one-test" if="test"
description="Execute a single test.">
+ <mkdir dir="${build.reports}/${thread}"/>
+ <mkdir dir="${build.testlog}"/>
+ <!-- Remove the test.log so each test has a fresh log -->
+ <delete file="${build.testlog}/test.log"/>
+ <junit dir="${module.output}"
+ printsummary="${junit.printsummary}"
+ haltonerror="${junit.haltonerror}"
+ haltonfailure="${junit.haltonfailure}"
+ fork="${junit.fork}"
+ timeout="3600000"
+ jvm="${junit.jvm}">
+
+ <!-- Used for JGroups -->
+ <jvmarg value="-Dbind.address=${node0}"/>
+ <jvmarg value="-verbose:gc"/>
+ <jvmarg value="-XX:CompileThreshold=100"/>
+ <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed"/>
+ <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
+ <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
+ <sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="build.testlog" value="${build.testlog}"/>
+ <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
+ <sysproperty key="jbosstest.secure" value="true"/>
+ <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
+ <sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <!-- Pass along any jbosstest.* system properties -->
+ <syspropertyset>
+ <propertyref prefix="jbosstest."/>
+ <propertyref prefix="java.rmi."/>
+ <propertyref prefix="node0"/>
+ <propertyref prefix="node1"/>
+ </syspropertyset>
+ <sysproperty key="SERIALIZATION"
+ value="org.jboss.invocation.JBossSerializationManager"/>
+ <sysproperty key="java.security.auth.login.config"
+ value="${build.resources}/security/auth.conf"/>
+ <sysproperty key="javax.net.ssl.trustStore"
+ value="${build.resources}/security/tst.keystore"/>
+ <sysproperty key="org.jboss.security.ignoreHttpsHost" value="true"/>
+
+ <classpath>
+ <pathelement location="${build.classes}"/>
+ <pathelement location="${build.resources}"/>
+ <!-- Include for those tests that need common security resources -->
+ <pathelement location="${build.resources}/security"/>
+ <path refid="tests.classpath"/>
+ </classpath>
+
+ <formatter type="plain" usefile="${junit.formatter.usefile}"/>
+ <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+
+ <test todir="${build.reports}/${thread}" name="${test}"
+ haltonerror="${junit.batchtest.haltonerror}"
+ haltonfailure="${junit.batchtest.haltonfailure}"
+ fork="${junit.batchtest.fork}"/>
+ </junit>
+ </target>
+
+ <target name="one-test-debug" if="test"
+ description="Execute a single test.">
<mkdir dir="${build.reports}"/>
<mkdir dir="${build.testlog}"/>
<!-- Remove the test.log so each test has a fresh log -->
@@ -2591,10 +2652,14 @@
haltonerror="${junit.haltonerror}"
haltonfailure="${junit.haltonfailure}"
fork="${junit.fork}"
- timeout="${junit.timeout}"
+ timeout="3600000"
jvm="${junit.jvm}">
+ <jvmarg value="-Xdebug"/>
+ <jvmarg value="-Xnoagent"/>
+ <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8686"/>
<jvmarg value="${junit.jvm.options}"/>
+
<!-- Used for JGroups -->
<jvmarg value="-Dbind.address=${node0}"/>
<sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed"/>
@@ -2613,6 +2678,8 @@
<propertyref prefix="node0"/>
<propertyref prefix="node1"/>
</syspropertyset>
+ <sysproperty key="SERIALIZATION"
+ value="org.jboss.invocation.JBossSerializationManager"/>
<sysproperty key="java.security.auth.login.config"
value="${build.resources}/security/auth.conf"/>
<sysproperty key="javax.net.ssl.trustStore"
|
|
From: Clebert S. <csu...@jb...> - 2005-09-08 16:10:23
|
User: csuconic
Date: 05/09/08 12:10:20
Modified: jbosstest Tag: Branch_4_0_call_by_value_optimizations
build.xml
Log:
Adding one-test for serialization
Revision Changes Path
No revision
No revision
1.406.2.108.2.2 +62 -1 jbosstest/build.xml
(In the diff below, changes in quantity of whitespace are not shown.)
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.406.2.108.2.1
retrieving revision 1.406.2.108.2.2
diff -u -b -r1.406.2.108.2.1 -r1.406.2.108.2.2
--- build.xml 8 Sep 2005 15:30:04 -0000 1.406.2.108.2.1
+++ build.xml 8 Sep 2005 16:10:19 -0000 1.406.2.108.2.2
@@ -12,7 +12,7 @@
<!-- ============================================================ -->
-<!-- $Id: build.xml,v 1.406.2.108.2.1 2005/09/08 15:30:04 csuconic Exp $ -->
+<!-- $Id: build.xml,v 1.406.2.108.2.2 2005/09/08 16:10:19 csuconic Exp $ -->
<project default="main" name="JBoss/Testsuite">
<import file="../tools/etc/buildmagic/build-common.xml"/>
@@ -2641,6 +2641,67 @@
</junit>
</target>
+ <target name="one-test-serialization" if="test"
+ description="Execute a single test.">
+ <mkdir dir="${build.reports}/${thread}"/>
+ <mkdir dir="${build.testlog}"/>
+ <!-- Remove the test.log so each test has a fresh log -->
+ <delete file="${build.testlog}/test.log"/>
+ <junit dir="${module.output}"
+ printsummary="${junit.printsummary}"
+ haltonerror="${junit.haltonerror}"
+ haltonfailure="${junit.haltonfailure}"
+ fork="${junit.fork}"
+ timeout="3600000"
+ jvm="${junit.jvm}">
+
+ <!-- Used for JGroups -->
+ <jvmarg value="-Dbind.address=${node0}"/>
+ <jvmarg value="-verbose:gc"/>
+ <jvmarg value="-XX:CompileThreshold=100"/>
+ <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed"/>
+ <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/>
+ <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
+ <sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <sysproperty key="build.testlog" value="${build.testlog}"/>
+ <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/>
+ <sysproperty key="jbosstest.secure" value="true"/>
+ <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
+ <sysproperty key="jbosstest.server.host" value="${node0}"/>
+ <!-- Pass along any jbosstest.* system properties -->
+ <syspropertyset>
+ <propertyref prefix="jbosstest."/>
+ <propertyref prefix="java.rmi."/>
+ <propertyref prefix="node0"/>
+ <propertyref prefix="node1"/>
+ </syspropertyset>
+ <sysproperty key="SERIALIZATION"
+ value="org.jboss.invocation.JBossSerializationManager"/>
+ <sysproperty key="java.security.auth.login.config"
+ value="${build.resources}/security/auth.conf"/>
+ <sysproperty key="javax.net.ssl.trustStore"
+ value="${build.resources}/security/tst.keystore"/>
+ <sysproperty key="org.jboss.security.ignoreHttpsHost" value="true"/>
+
+ <classpath>
+ <pathelement location="${build.classes}"/>
+ <pathelement location="${build.resources}"/>
+ <!-- Include for those tests that need common security resources -->
+ <pathelement location="${build.resources}/security"/>
+ <path refid="tests.classpath"/>
+ </classpath>
+
+ <formatter type="plain" usefile="${junit.formatter.usefile}"/>
+ <formatter type="xml" usefile="${junit.formatter.usefile}"/>
+
+ <test todir="${build.reports}/${thread}" name="${test}"
+ haltonerror="${junit.batchtest.haltonerror}"
+ haltonfailure="${junit.batchtest.haltonfailure}"
+ fork="${junit.batchtest.fork}"/>
+ </junit>
+ </target>
+
+
<target name="one-test-debug" if="test"
description="Execute a single test.">
<mkdir dir="${build.reports}"/>
|
|
From: Francisco R. <rev...@im...> - 2005-09-08 20:53:10
|
User: reverbel Date: 05/09/08 16:52:38 Modified: jbosstest build.xml Log: Fixes on DTM recovery testcases. Revision Changes Path 1.508 +2 -1 jbosstest/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.507 retrieving revision 1.508 diff -u -b -r1.507 -r1.508 --- build.xml 6 Sep 2005 21:45:18 -0000 1.507 +++ build.xml 8 Sep 2005 20:52:38 -0000 1.508 @@ -10,7 +10,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.507 2005/09/06 21:45:18 reverbel Exp $ --> +<!-- $Id: build.xml,v 1.508 2005/09/08 20:52:38 reverbel Exp $ --> <project default="main" name="JBoss/Testsuite" xmlns:server="http://jboss.org/ns/test/ant/server"> @@ -1025,6 +1025,7 @@ <run-dtm-recovery-test test="CrashAfterDistributedTxCommitted"/> <run-dtm-recovery-test test="CrashBeforeDistributedTxCommitted"/> <run-dtm-recovery-test test="CrashAfterDistributedTxCommittedIIOP"/> + <run-dtm-recovery-test test="CrashBeforeDistributedTxCommittedIIOP"/> <!-- Stop DTM nodes --> <server:stop name="dtmrec0"/> |
|
From: Francisco R. <rev...@im...> - 2005-09-10 18:28:18
|
User: reverbel Date: 05/09/10 14:28:13 Modified: jbosstest build.xml Log: Add test for recovery from a remote resource crash. Revision Changes Path 1.509 +121 -27 jbosstest/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.508 retrieving revision 1.509 diff -u -b -r1.508 -r1.509 --- build.xml 8 Sep 2005 20:52:38 -0000 1.508 +++ build.xml 10 Sep 2005 18:28:13 -0000 1.509 @@ -10,7 +10,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.508 2005/09/08 20:52:38 reverbel Exp $ --> +<!-- $Id: build.xml,v 1.509 2005/09/10 18:28:13 reverbel Exp $ --> <project default="main" name="JBoss/Testsuite" xmlns:server="http://jboss.org/ns/test/ant/server"> @@ -1015,17 +1015,30 @@ <echo message="Nodes have started, waiting for node set to stablize..."/> <sleep seconds="2" /> - <!-- Run DTM recovery unit tests --> - <run-dtm-recovery-test test="CrashBeforeTxCommitted"/> - <run-dtm-recovery-test test="CrashAfterTxCommitted"/> - <run-dtm-recovery-test test="CrashAfterOneResourceButNotAllHavePrepared"/> - <run-dtm-recovery-test test="CrashAfterOneResourceButNotAllHaveCommitted"/> - <run-dtm-recovery-test test="CrashAfterTxCommittedWithSuccessfulXARetryAtRecoveryTime"/> - <run-dtm-recovery-test test="CrashAfterTxCommittedWithFailedXARetryAtRecoveryTime"/> - <run-dtm-recovery-test test="CrashAfterDistributedTxCommitted"/> - <run-dtm-recovery-test test="CrashBeforeDistributedTxCommitted"/> - <run-dtm-recovery-test test="CrashAfterDistributedTxCommittedIIOP"/> - <run-dtm-recovery-test test="CrashBeforeDistributedTxCommittedIIOP"/> + <!-- Run XA recovery tests --> + <run-dtm-recovery-test test="CrashBeforeTxCommitted" + restart="dtmrec0"/> + <run-dtm-recovery-test test="CrashAfterTxCommitted" + restart="dtmrec0"/> + <run-dtm-recovery-test test="CrashAfterOneResourceButNotAllHavePrepared" + restart="dtmrec0"/> + <run-dtm-recovery-test test="CrashAfterOneResourceButNotAllHaveCommitted" + restart="dtmrec0"/> + <run-dtm-recovery-test test="CrashAfterTxCommittedWithSuccessfulXARetryAtRecoveryTime" + restart="dtmrec0"/> + <run-dtm-recovery-test test="CrashAfterTxCommittedWithFailedXARetryAtRecoveryTime" + restart="dtmrec0"/> + <!-- Run DTM/OTS recovery tests --> + <run-dtm-recovery-test test="CrashAfterDistributedTxCommitted" + restart="dtmrec0"/> + <run-dtm-recovery-test test="CrashBeforeDistributedTxCommitted" + restart="dtmrec0"/> + <run-dtm-recovery-test test="CrashAfterDistributedTxCommittedIIOP" + restart="dtmrec0"/> + <run-dtm-recovery-test test="CrashBeforeDistributedTxCommittedIIOP" + restart="dtmrec0"/> + <run-dtm-recovery-test test="CrashOfFirstRemoteResourceBeforeItAnswersPrepare" + restart="dtmrec2"/> <!-- Stop DTM nodes --> <server:stop name="dtmrec0"/> @@ -1036,19 +1049,22 @@ <macrodef name="run-dtm-recovery-test"> <attribute name="test" description="the name of the test to run"/> + <attribute name="restart" + description="the server that will crash and will need a restart "/> <sequential> - <run-dtm-test test="@{test}TestCase"/> - <echo message="Server should have crashed. Restarting it..."/> - <server:start name="dtmrec0"/> + <run-dtm-test test="org.jboss.test.recover.test.@{test}TestCase"/> + <echo message="Server @{restart} should have crashed. Restarting it..."/> + <server:start name="@{restart}"/> <echo message="Waiting for restarted server to perform transaction recovery..."/> <sleep seconds="2" /> - <run-dtm-test test="RecoveryFrom@{test}TestCase"/> + <run-dtm-test test="org.jboss.test.recover.test.RecoveryFrom@{test}TestCase"/> </sequential> </macrodef> <macrodef name="run-dtm-test" - description="run a dtm test given its name"> - <attribute name="test" description="the name of the test to run"/> + description="run a dtm test given its full class name"> + <attribute name="test" + description="the fully qualified class name of the test to run"/> <sequential> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> @@ -1058,6 +1074,7 @@ haltonfailure="${junit.haltonfailure}" fork="${junit.fork}" timeout="${junit.timeout}" + showoutput="${junit.showoutput}" jvm="${junit.jvm}"> <jvmarg value="${junit.jvm.options}"/> @@ -1079,6 +1096,8 @@ <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/> <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/> <sysproperty key="jbosstest.server.host" value="${node0}"/> + <sysproperty key="jbosstest.resource1.server.host" value="${node2}"/> + <sysproperty key="jbosstest.resource2.server.host" value="${node3}"/> <!-- Pass along any jbosstest.* system properties --> <syspropertyset> <propertyref prefix="jbosstest."/> @@ -1091,16 +1110,13 @@ </classpath> <formatter type="xml" usefile="${junit.formatter.usefile}"/> + <formatter type="plain" usefile="${junit.formatter.usefile}"/> - <batchtest todir="${build.reports}" + <test todir="${build.reports}" + name="@{test}" haltonerror="${junit.batchtest.haltonerror}" haltonfailure="${junit.batchtest.haltonfailure}" - fork="${junit.batchtest.fork}"> - - <fileset dir="${build.classes}"> - <include name="**/@{test}.class"/> - </fileset> - </batchtest> + fork="${junit.batchtest.fork}"/> </junit> </sequential> </macrodef> @@ -2804,6 +2820,84 @@ <sysproperty key="jbosstest.secure" value="true"/> <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/> <sysproperty key="jbosstest.server.host" value="${node0}"/> + <sysproperty key="jbosstest.resource1.server.host" value="${node2}"/> + <sysproperty key="jbosstest.resource2.server.host" value="${node3}"/> + <!-- Pass along any jbosstest.* system properties --> + <syspropertyset> + <propertyref prefix="jbosstest."/> + </syspropertyset> + <sysproperty key="java.security.auth.login.config" + value="${build.resources}/security/auth.conf"/> + <sysproperty key="javax.net.ssl.trustStore" + value="${build.resources}/security/tst.keystore"/> + <sysproperty key="org.jboss.security.ignoreHttpsHost" value="true"/> + + <classpath> + <pathelement location="${build.classes}"/> + <pathelement location="${build.resources}"/> + <!-- Include for those tests that need common security resources --> + <pathelement location="${build.resources}/security"/> + <path refid="tests.classpath"/> + </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}" + haltonfailure="${junit.batchtest.haltonfailure}" + fork="${junit.batchtest.fork}"/> + </junit> + </target> + + <!-- + | Run a single testcase by specifing the fully qualified class name + | of the unit test using the test property, -Dtest=org.jboss.test.... + | Here you specify the testcase class, not the directory + --> + <target name="one-iiop-test" if="test" + description="Execute a single test."> + <mkdir dir="${build.reports}"/> + <mkdir dir="${build.testlog}"/> + <!-- Remove the test.log so each test has a fresh log --> + <delete file="${build.testlog}/test.log"/> + <junit dir="${module.output}" + printsummary="${junit.printsummary}" + haltonerror="${junit.haltonerror}" + haltonfailure="${junit.haltonfailure}" + fork="${junit.fork}" + timeout="${junit.timeout}" + showoutput="${junit.showoutput}" + jvm="${junit.jvm}"> + + <jvmarg value="${junit.jvm.options}"/> +<!-- <jvmarg value="-Xdebug"/>--> +<!-- <jvmarg value="-Xnoagent"/>--> +<!-- <jvmarg value="-Djava.compiler=NONE"/>--> +<!-- <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/>--> + <!-- Used for JGroups --> + <jvmarg value="-Dbind.address=${node0}"/> + <jvmarg value="-Dorg.omg.CORBA.ORBClass=org.jacorb.orb.ORB"/> + <jvmarg value="-Dorg.omg.CORBA.ORBSingletonClass=org.jacorb.orb.ORBSingleton"/> + <jvmarg value="-Djacorb.orb.print_version=off"/> + <jvmarg value="-Djacorb.log.default.verbosity=0"/> + <jvmarg value="-Djacorb.interop.strict_check_on_tc_creation=off"/> + <jvmarg value="-Djacorb.log.loggerFactory=org.jboss.util.Log4jLoggerFactory"/> + <jvmarg value="-Djacorb.security.ssl.client.supported_options=0"/> + <jvmarg value="-Djacorb.security.ssl.client.required_options=0"/> + <jvmarg value="-DORBInitRef.NameService=corbaloc::${node0}:3528/JBoss/Naming/root"/> + <jvmarg value="-Dorg.omg.PortableInterceptor.ORBInitializerClass.org.jboss.tm.iiop.TxClientInterceptorInitializer"/> + <jvmarg value="-Djava.security.manager"/> + <jvmarg value="-Djava.security.policy==${build.resources}/iiop/client.policy"/> + <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}"/> + <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/> + <sysproperty key="jbosstest.secure" value="true"/> + <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/> + <sysproperty key="jbosstest.server.host" value="${node0}"/> + <sysproperty key="jbosstest.resource1.server.host" value="${node2}"/> + <sysproperty key="jbosstest.resource2.server.host" value="${node3}"/> <!-- Pass along any jbosstest.* system properties --> <syspropertyset> <propertyref prefix="jbosstest."/> |
|
From: Francisco R. <rev...@im...> - 2005-09-10 20:23:20
|
User: reverbel Date: 05/09/10 16:23:14 Modified: jbosstest build.xml Log: Test recovery from a crash of the first remote resource before the resource had a chance to save the prepare decsion. Revision Changes Path 1.510 +3 -1 jbosstest/build.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.509 retrieving revision 1.510 diff -u -b -r1.509 -r1.510 --- build.xml 10 Sep 2005 18:28:13 -0000 1.509 +++ build.xml 10 Sep 2005 20:23:14 -0000 1.510 @@ -10,7 +10,7 @@ <!-- See terms of license at http://www.gnu.org. --> <!-- ============================================================ --> -<!-- $Id: build.xml,v 1.509 2005/09/10 18:28:13 reverbel Exp $ --> +<!-- $Id: build.xml,v 1.510 2005/09/10 20:23:14 reverbel Exp $ --> <project default="main" name="JBoss/Testsuite" xmlns:server="http://jboss.org/ns/test/ant/server"> @@ -1037,6 +1037,8 @@ restart="dtmrec0"/> <run-dtm-recovery-test test="CrashBeforeDistributedTxCommittedIIOP" restart="dtmrec0"/> + <run-dtm-recovery-test test="CrashOfFirstRemoteResourceBeforeItPrepares" + restart="dtmrec2"/> <run-dtm-recovery-test test="CrashOfFirstRemoteResourceBeforeItAnswersPrepare" restart="dtmrec2"/> |
Thanks for helping keep SourceForge clean.
X