[Jboss-cvs] JBoss Messaging SVN: r1181 - trunk/tests/bin
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Aug 2 18:16:05 EDT 2006
Author: ovidiu.feodorov at jboss.com
Date: 2006-08-02 18:16:03 -0400 (Wed, 02 Aug 2006)
New Revision: 1181
Modified:
trunk/tests/bin/
trunk/tests/bin/runtest
trunk/tests/bin/start-rmi-server
trunk/tests/bin/stop-rmi-server
Log:
http://jira.jboss.org/jira/browse/JBMESSAGING-470
Property changes on: trunk/tests/bin
___________________________________________________________________
Name: svn:ignore
- .test.execution.classpath
.testrc
+ .test.execution.classpath
.startrmi.execution.classpath
.stoprmi.execution.classpath
.testrc
Modified: trunk/tests/bin/runtest
===================================================================
--- trunk/tests/bin/runtest 2006-08-02 21:24:56 UTC (rev 1180)
+++ trunk/tests/bin/runtest 2006-08-02 22:16:03 UTC (rev 1181)
@@ -102,7 +102,7 @@
if [ "$isRemote" = "true" ]; then
export TEST_DATABASE TEST_SERIALIZATION
- $reldir/start-rmi-server $REMOTE_DEBUG_FLAG
+ $reldir/start-rmi-server $REMOTE_DEBUG_FLAG -use-existent-test-classpath-file
fi
@@ -110,6 +110,6 @@
org.jboss.test.messaging.tools.junit.SelectiveTestRunner $TARGET_CLASS $TARGET_TEST
if [ "$isRemote" = "true" ]; then
- $reldir/stop-rmi-server
+ $reldir/stop-rmi-server -use-existent-test-classpath-file
fi
Modified: trunk/tests/bin/start-rmi-server
===================================================================
--- trunk/tests/bin/start-rmi-server 2006-08-02 21:24:56 UTC (rev 1180)
+++ trunk/tests/bin/start-rmi-server 2006-08-02 22:16:03 UTC (rev 1181)
@@ -27,6 +27,8 @@
else
JAVA_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_shmem,server=n,suspend=y,address=rmiserver"
fi
+ elif [ "$1" = "-use-existent-test-classpath-file" ]; then
+ USE_EXISTENT_TEST_CLASSPATH_FILE=true;
fi
shift
done
@@ -38,62 +40,27 @@
if [ "$TEST_DATABASE" != "" ]; then
JAVA_OPTS="$JAVA_OPTS -Dtest.database=$TEST_DATABASE"
fi
+
if [ "$TEST_SERIALIZATION" != "" ]; then
JAVA_OPTS="$JAVA_OPTS -Dtest.serialization=$TEST_SERIALIZATION"
fi
-#
-# Local path overrides
-#
+if [ "$USE_EXISTENT_TEST_CLASSPATH_FILE" = "true" ]; then
+ CLASSPATH_FILE="$reldir/.test.execution.classpath"
+else
+ ant -Dtest.execution.classpath.file=bin/.startrmi.execution.classpath -f $reldir/../build.xml get-test-execution-classpath
+ CLASSPATH_FILE="$reldir/.startrmi.execution.classpath"
+fi
-#REMOTING_LIB=$reldir/../../../thirdparty/jboss/remoting/lib/jboss-remoting.jar
-REMOTING_LIB=$reldir/../../src/resources/jboss-remoting.jar
+if [ ! -f $CLASSPATH_FILE ]; then
+ echo "No such classpath file: $CLASSPATH_FILE"
+ exit 1
+fi
-#SERIALIZATION_LIB=$reldir/../../../thirdparty/jboss/serialization/lib/jboss-serialization.jar
-SERIALIZATION_LIB=$reldir/../../src/resources/jboss-serialization.jar
+CLASSPATH=`cat $CLASSPATH_FILE`
-#AOP_LIB=$reldir/../../../aop/output/lib/jboss-aop.jar
-AOP_LIB=$reldir/../../src/resources/jboss-aop.jar
-
# for stress testing
JAVA_OPTS="$JAVA_OPTS -Xmx768M"
-java $JAVA_OPTS -cp \
-$reldir/../etc${SEP}\
-$reldir/../../src/etc${SEP}\
-$reldir/../output/classes${SEP}\
-$reldir/../../output/classes${SEP}\
-$reldir/../../../j2ee/output/lib/jboss-j2ee.jar${SEP}\
-$reldir/../../../j2se/output/lib/jboss-j2se.jar${SEP}\
-$reldir/../../../jmx/output/lib/jboss-jmx.jar${SEP}\
-$reldir/../../../mbeans/output/lib/jboss-mbeans.jar${SEP}\
-$reldir/../../src/resources/mysql-connector-java-3.0.17-ga-bin.jar${SEP}\
-$reldir/../../src/resources/ojdbc14.jar${SEP}\
-$reldir/../../src/resources/postgresql-8.1-405.jdbc3.jar${SEP}\
-${REMOTING_LIB}${SEP}\
-${SERIALIZATION_LIB}${SEP}\
-${AOP_LIB}${SEP}\
-$reldir/../../../thirdparty/apache-log4j/lib/log4j.jar${SEP}\
-$reldir/../../../thirdparty/apache-logging/lib/commons-logging.jar${SEP}\
-$reldir/../../../thirdparty/junit/lib/junit.jar${SEP}\
-$reldir/../../../thirdparty/oswego-concurrent/lib/concurrent.jar${SEP}\
-$reldir/../../../thirdparty/javassist/lib/javassist.jar${SEP}\
-$reldir/../../../thirdparty/trove/lib/trove.jar${SEP}\
-$reldir/../../../thirdparty/apache-httpclient/lib/commons-httpclient.jar${SEP}\
-$reldir/../../../thirdparty/dom4j/lib/dom4j.jar${SEP}\
-$reldir/../../../thirdparty/sun-servlet/lib/servlet-api.jar${SEP}\
-$reldir/../../../common/output/lib/jboss-common.jar${SEP}\
-$reldir/../../../common/output/lib/jboss-xml-binding.jar${SEP}\
-$reldir/../../../system/output/lib/jboss-system.jar${SEP}\
-$reldir/../../../transaction/output/lib/jboss-transaction.jar${SEP}\
-$reldir/../../../security/output/lib/jbosssx.jar${SEP}\
-$reldir/../../src/resources/hsqldb.jar${SEP}\
-$reldir/../../../connector/output/lib/jboss-local-jdbc.jar${SEP}\
-$reldir/../../../connector/output/lib/jboss-common-jdbc-wrapper.jar${SEP}\
-$reldir/../../../connector/output/lib/jboss-jca.jar${SEP}\
-$reldir/../../../thirdparty/jgroups/lib/jgroups.jar${SEP}\
-$reldir/../../../server/output/lib/jboss.jar${SEP}\
-$reldir/../../../naming/output/lib/jnpserver.jar${SEP}\
-$reldir/../../../connector/output/lib/jms-ra.jar${SEP} \
--Dtest.bind.address=localhost \
+java $JAVA_OPTS -cp $CLASSPATH -Dtest.bind.address=localhost \
org.jboss.test.messaging.tools.jmx.rmi.RMITestServer &
Modified: trunk/tests/bin/stop-rmi-server
===================================================================
--- trunk/tests/bin/stop-rmi-server 2006-08-02 21:24:56 UTC (rev 1180)
+++ trunk/tests/bin/stop-rmi-server 2006-08-02 22:16:03 UTC (rev 1181)
@@ -25,32 +25,25 @@
else
JAVA_OPTS="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_shmem,server=y,suspend=y,address=stoprmi"
fi
+ elif [ "$1" = "-use-existent-test-classpath-file" ]; then
+ USE_EXISTENT_TEST_CLASSPATH_FILE=true;
fi
shift
done
-#
-# Local path overrides
-#
+if [ "$USE_EXISTENT_TEST_CLASSPATH_FILE" = "true" ]; then
+ CLASSPATH_FILE="$reldir/.test.execution.classpath"
+else
+ ant -Dtest.execution.classpath.file=bin/.stoprmi.execution.classpath -f $reldir/../build.xml get-test-execution-classpath
+ CLASSPATH_FILE="$reldir/.stoprmi.execution.classpath"
+fi
-#REMOTING_LIB=$reldir/../../../thirdparty/jboss/remoting/lib/jboss-remoting.jar
-REMOTING_LIB=$reldir/../../src/resources/jboss-remoting.jar
+if [ ! -f $CLASSPATH_FILE ]; then
+ echo "No such classpath file: $CLASSPATH_FILE"
+ exit 1
+fi
-#SERIALIZATION_LIB=$reldir/../../../thirdparty/jboss/serialization/lib/jboss-serialization.jar
-SERIALIZATION_LIB=$reldir/../../src/resources/jboss-serialization.jar
+CLASSPATH=`cat $CLASSPATH_FILE`
-java $JAVA_OPTS -cp \
-$reldir/../etc${SEP}\
-$reldir/../output/classes${SEP}\
-$reldir/../../output/classes${SEP}\
-$reldir/../../../thirdparty/apache-log4j/lib/log4j.jar${SEP}\
-$reldir/../../../thirdparty/apache-logging/lib/commons-logging.jar${SEP}\
-${REMOTING_LIB}${SEP}\
-${SERIALIZATION_LIB}${SEP}\
-$reldir/../../../j2se/output/lib/jboss-j2se.jar${SEP}\
-$reldir/../../../system/output/lib/jboss-system.jar${SEP}\
-$reldir/../../../common/output/lib/jboss-common.jar${SEP}\
-$reldir/../../../j2ee/output/lib/jboss-j2ee.jar${SEP}\
-$reldir/../../../common/output/lib/jboss-xml-binding.jar${SEP} \
--Dtest.bind.address=localhost \
+java $JAVA_OPTS -cp $CLASSPATH -Dtest.bind.address=localhost \
org.jboss.test.messaging.tools.jmx.rmi.StopRMIServer
More information about the jboss-cvs-commits
mailing list