[Jboss-cvs] JBoss Messaging SVN: r1182 - in trunk: . tests tests/src/org/jboss/test/messaging/tools/jmx
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Aug 2 20:33:10 EDT 2006
Author: ovidiu.feodorov at jboss.com
Date: 2006-08-02 20:33:07 -0400 (Wed, 02 Aug 2006)
New Revision: 1182
Modified:
trunk/messaging.iml
trunk/tests/build.properties
trunk/tests/build.sh
trunk/tests/build.xml
trunk/tests/src/org/jboss/test/messaging/tools/jmx/ClassLoaderJMXWrapper.java
Log:
various test configuration optimizations, related to http://jira.jboss.org/jira/browse/JBMESSAGING-473
Modified: trunk/messaging.iml
===================================================================
--- trunk/messaging.iml 2006-08-02 22:16:03 UTC (rev 1181)
+++ trunk/messaging.iml 2006-08-03 00:33:07 UTC (rev 1182)
@@ -19,7 +19,6 @@
<sourceFolder url="file://$MODULE_DIR$/src/main" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/tests/src" isTestSource="false" />
- <excludeFolder url="file://$MODULE_DIR$/output" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
@@ -43,6 +42,107 @@
</SOURCES>
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/javassist/lib/javassist.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES>
+ <root url="file://$MODULE_DIR$/../../javassist-3.2/src/main" />
+ </SOURCES>
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/jboss-j2se.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/thirdparty/hsqldb/lib/hsqldb.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/jboss-transaction.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/jboss-remoting.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/jboss-system.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/tests/lib/jboss-jca.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/tests/lib/jboss-local-jdbc.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/tests/lib/jms-ra.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/tests/lib/jboss-common-jdbc-wrapper.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/lib/jboss.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
</module>
Modified: trunk/tests/build.properties
===================================================================
--- trunk/tests/build.properties 2006-08-02 22:16:03 UTC (rev 1181)
+++ trunk/tests/build.properties 2006-08-03 00:33:07 UTC (rev 1182)
@@ -2,16 +2,3 @@
# Local overrides for the builds initiated by build.sh
#
-
-junit.formatter.usefile=true
-junit.haltonerror=false
-junit.haltonfailure=false
-junit.batchtest.haltonerror=false
-junit.batchtest.haltonfailure=false
-junit.test.haltonerror=false
-junit.test.haltonfailure=false
-
-junit.fork=true
-junit.batchtest.fork=true
-junit.timeout=1200000
-
Modified: trunk/tests/build.sh
===================================================================
--- trunk/tests/build.sh 2006-08-02 22:16:03 UTC (rev 1181)
+++ trunk/tests/build.sh 2006-08-03 00:33:07 UTC (rev 1182)
@@ -3,6 +3,6 @@
reldir=`dirname $0`
-#export ANT_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_shmem,server=y,suspend=y,address=rmiserver"
+#export ANT_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_shmem,server=y,suspend=y,address=ant"
$ANT_HOME/bin/ant -lib $reldir/../thirdparty/junit/lib/junit.jar "$@"
Modified: trunk/tests/build.xml
===================================================================
--- trunk/tests/build.xml 2006-08-02 22:16:03 UTC (rev 1181)
+++ trunk/tests/build.xml 2006-08-03 00:33:07 UTC (rev 1182)
@@ -48,6 +48,8 @@
<!-- Configuration -->
<!-- ======================================================================================== -->
+ <property file="build.properties"/>
+
<property name="build.tests.remote" value="false"/>
<property name="test.bind.address" value="localhost"/>
@@ -81,15 +83,15 @@
<property name="build.tests.ejbarchive" value="jboss-messaging-tests-ejb.jar"/>
<!--
- JUnit configuration
+ JUnit configuration (values specified in ./build.properties have priority)
-->
<property name="junit.printsummary" value="true"/>
<property name="junit.haltonerror" value="false"/>
<property name="junit.haltonfailure" value="false"/>
- <property name="junit.fork" value="false"/>
+ <property name="junit.fork" value="true"/>
<property name="junit.includeantruntime" value="true"/>
- <property name="junit.timeout" value="600000"/>
+ <property name="junit.timeout" value="1200000"/>
<property name="junit.timeout2" value="300000"/>
<property name="stress.timeout" value="4800000"/>
@@ -101,7 +103,7 @@
<property name="junit.batchtest.todir" value="${build.tests.reports}"/>
<property name="junit.batchtest.haltonerror" value="false"/>
<property name="junit.batchtest.haltonfailure" value="false"/>
- <property name="junit.batchtest.fork" value="false"/>
+ <property name="junit.batchtest.fork" value="true"/>
<property name="junit.test.haltonfailure" value="false"/>
<property name="junit.test.haltonerror" value="false"/>
@@ -279,7 +281,6 @@
<target name="stop-rmi-server" depends="init"
description="Stops the RMI server used by remote tests">
- <!-- <display-path path="test.execution.classpath"/> -->
<java classname="org.jboss.test.messaging.tools.jmx.rmi.StopRMIServer"
classpathref="test.execution.classpath"/>
</target>
@@ -302,7 +303,9 @@
<target name="invm-tests" depends="tests-jar, prepare-testdirs, clear-test-logs"
description="Runs all available tests an in-VM configuration">
- <display-path path="test.execution.classpath"/>
+ <echo message=""/>
+ <echo message="Running invm tests, fork=${junit.fork}, junit.batchtest.fork=${junit.batchtest.fork}"/>
+ <echo message=""/>
<junit printsummary="${junit.printsummary}"
fork="${junit.fork}"
@@ -330,14 +333,9 @@
haltonerror="${junit.batchtest.haltonerror}">
<formatter type="plain" usefile="${junit.formatter.usefile}"/>
<fileset dir="${build.tests.classes}">
- <!-- <include name="org/jboss/test/messaging/jms/JMSTest.class"/> -->
-
-
<!--
- <include name="**/messaging/core/paging/**/*Test.class"/>
- <include name="**/messaging/core/plugin/**/*Test.class"/>
+ <include name="org/jboss/test/messaging/jms/JMSTest.class"/>
-->
-
<include name="**/messaging/core/**/*Test.class"/>
<include name="**/messaging/jms/**/*Test.class"/>
<exclude name="**/jms/stress/**"/>
@@ -354,7 +352,6 @@
description="Runs memory-leak tests using JBossProfiler in-VM configuration">
<property name="ostarget" value="windows"/>
- <display-path path="test.execution.classpath"/>
<junit printsummary="${junit.printsummary}"
fork="${junit.fork}"
@@ -395,8 +392,6 @@
<target name="ref-test" depends="tests-jar, prepare-testdirs, clear-test-logs"
description="Runs all available tests an in-VM configuration">
- <display-path path="test.execution.classpath"/>
-
<junit printsummary="${junit.printsummary}"
fork="${junit.fork}"
includeantruntime="${junit.includeantruntime}"
@@ -438,8 +433,6 @@
<target name="invm-stress-tests" depends="tests-jar, prepare-testdirs, clear-test-logs"
description="Runs all stress tests in an in-VM configuration">
- <display-path path="test.execution.classpath"/>
-
<junit printsummary="${junit.printsummary}"
fork="${junit.fork}"
includeantruntime="${junit.includeantruntime}"
@@ -478,9 +471,13 @@
<antcall target="stop-rmi-server"/>
<antcall target="start-rmi-server"/>
+
<mkdir dir="${build.tests.reports}"/>
- <display-path path="test.execution.classpath"/>
+ <echo message=""/>
+ <echo message="Running remote tests, fork=${junit.fork}, junit.batchtest.fork=${junit.batchtest.fork}"/>
+ <echo message=""/>
+
<junit printsummary="${junit.printsummary}"
fork="${junit.fork}"
includeantruntime="yes"
@@ -500,7 +497,6 @@
-->
<classpath>
<path refid="test.execution.classpath"/>
- <pathelement location="${tests.root}/output/classes"/>
<!-- Add this when http://jira.jboss.org/jira/browse/JBAS-2554 is done -->
<!--
@@ -525,7 +521,9 @@
haltonerror="${junit.batchtest.haltonerror}">
<formatter type="plain" usefile="${junit.formatter.usefile}"/>
<fileset dir="${build.tests.classes}">
- <!-- <include name="org/jboss/test/messaging/jms/JMSTest.class"/> -->
+ <!--
+ <include name="org/jboss/test/messaging/jms/JMSTest.class"/>
+ -->
<include name="org/jboss/test/messaging/jms/**/*Test.class"/>
<exclude name="org/jboss/test/messaging/jms/stress/**"/>
<exclude name="org/jboss/test/messaging/jms/server/**"/>
@@ -551,7 +549,6 @@
<antcall target="stop-rmi-server"/>
<antcall target="start-rmi-server-stress"/>
<mkdir dir="${build.tests.reports}"/>
- <display-path path="test.execution.classpath"/>
<junit printsummary="${junit.printsummary}"
fork="${junit.fork}"
@@ -570,8 +567,6 @@
<!-- <jvmarg line="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_shmem,server=y,suspend=y,address=unittest"/> -->
<classpath>
<path refid="stress.test.execution.classpath"/>
- <pathelement location="${tests.root}/output/classes"/>
-
<!-- Add this when http://jira.jboss.org/jira/browse/JBAS-2554 is done -->
<!--
<path refid="jboss.test.classpath"/>
@@ -662,7 +657,6 @@
-->
<classpath>
<path refid="test.execution.classpath"/>
- <pathelement location="${tests.root}/output/classes"/>
<!-- Add this when http://jira.jboss.org/jira/browse/JBAS-2554 is done -->
<!--
@@ -696,7 +690,6 @@
<target name="jmstests" depends="tests-jar, prepare-testdirs, clear-test-logs"
description="Runs the jms tests only">
- <display-path path="test.execution.classpath"/>
<antcall target="start-rmi-server"/>
<junit printsummary="${junit.printsummary}"
@@ -734,8 +727,6 @@
<target name="messagetests" depends="tests-jar, prepare-testdirs, clear-test-logs"
description="Runs the jms tests only">
- <display-path path="test.execution.classpath"/>
-
<junit printsummary="${junit.printsummary}"
fork="${junit.fork}"
includeantruntime="${junit.includeantruntime}"
@@ -769,8 +760,6 @@
<target name="coretests" depends="tests-jar, prepare-testdirs, clear-test-logs"
description="Runs the jms tests only">
- <display-path path="test.execution.classpath"/>
-
<junit printsummary="${junit.printsummary}"
fork="${junit.fork}"
includeantruntime="${junit.includeantruntime}"
@@ -882,7 +871,11 @@
<target name="clean">
<delete dir="${tests.output}"/>
- <delete file="./bin/.test.execution.classpath"/>
+ <delete quiet="true">
+ <fileset dir="./bin">
+ <include name=".*.classpath"/>
+ </fileset>
+ </delete>
</target>
<!-- ======================================================================================== -->
@@ -931,11 +924,5 @@
<delete file="${ENV.JBOSS_HOME}/server/default/deploy/${build.tests.ejbarchive}"/>
</target>
- <target name="x">
- <display-path path="test.execution.classpath"/>
- </target>
-
-
-
</project>
Modified: trunk/tests/src/org/jboss/test/messaging/tools/jmx/ClassLoaderJMXWrapper.java
===================================================================
--- trunk/tests/src/org/jboss/test/messaging/tools/jmx/ClassLoaderJMXWrapper.java 2006-08-02 22:16:03 UTC (rev 1181)
+++ trunk/tests/src/org/jboss/test/messaging/tools/jmx/ClassLoaderJMXWrapper.java 2006-08-03 00:33:07 UTC (rev 1182)
@@ -59,6 +59,13 @@
return delegate.loadClass(name);
}
+ // ClassLoader overrides -----------------------------------------
+
+ public URL getResource(String name)
+ {
+ return delegate.getResource(name);
+ }
+
// Public --------------------------------------------------------
// Package protected ---------------------------------------------
More information about the jboss-cvs-commits
mailing list