From 2aa7cd18d96b77c6b94ba0f50c08be6af7b258f3 Mon Sep 17 00:00:00 2001 From: Amos Feng Date: Mon, 22 Jul 2013 12:45:55 +0800 Subject: [PATCH] JBTM-1847 Update to start jboss-as with standalone-blacktie.xml configration --- blacktie/test/blacktie-linux.sh | 14 +++++++------- blacktie/test/blacktie-vc9x32.bat | 2 +- blacktie/test/initializeBlackTie.xml | 18 +++++++++--------- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/blacktie/test/blacktie-linux.sh b/blacktie/test/blacktie-linux.sh index 2b2dbef56d..7c9aae37ef 100755 --- a/blacktie/test/blacktie-linux.sh +++ b/blacktie/test/blacktie-linux.sh @@ -15,7 +15,7 @@ fi # KILL ANY PREVIOUS BUILD REMNANTS ps -f -for i in `ps -eaf | grep java | grep "standalone-full.xml" | grep -v grep | cut -c10-15`; do kill -9 $i; done +for i in `ps -eaf | grep java | grep "standalone.*xml" | grep -v grep | cut -c10-15`; do kill -9 $i; done killall -9 testsuite killall -9 server killall -9 client @@ -35,7 +35,7 @@ fi ant -f $WORKSPACE/blacktie/test/initializeBlackTie.xml -Dbasedir=.. -DJBOSS_HOME=$JBOSS_HOME -DBT_HOME=$WORKSPACE/blacktie/target/dist/ -DVERSION=5.0.0.M4-SNAPSHOT -DMACHINE_ADDR=`hostname` -DJBOSSAS_IP_ADDR=$JBOSSAS_IP_ADDR -DBLACKTIE_DIST_HOME=$BLACKTIE_DIST_HOME initializeJBoss initializeBlackTie -debug if [ "$?" != "0" ]; then ps -f - for i in `ps -eaf | grep java | grep "standalone-full.xml" | grep -v grep | cut -c10-15`; do kill -9 $i; done + for i in `ps -eaf | grep java | grep "standalone.*xml" | grep -v grep | cut -c10-15`; do kill -9 $i; done killall -9 testsuite killall -9 server killall -9 client @@ -47,14 +47,14 @@ export JBOSS_HOME= chmod u+x $WORKSPACE/jboss-as/bin/standalone.sh # START JBOSS -$WORKSPACE/jboss-as/bin/standalone.sh -c standalone-full.xml -Djboss.bind.address=$JBOSSAS_IP_ADDR -Djboss.bind.address.unsecure=$JBOSSAS_IP_ADDR& +$WORKSPACE/jboss-as/bin/standalone.sh -c standalone-blacktie.xml -Djboss.bind.address=$JBOSSAS_IP_ADDR -Djboss.bind.address.unsecure=$JBOSSAS_IP_ADDR& sleep 20 # TWEAK txfooapp FOR THIS NODE ant -f $WORKSPACE/blacktie/test/initializeBlackTie.xml tweak-txfooapp-for-environment if [ "$?" != "0" ]; then ps -f - for i in `ps -eaf | grep java | grep "standalone-full.xml" | grep -v grep | cut -c10-15`; do kill -9 $i; done + for i in `ps -eaf | grep java | grep "standalone.*xml" | grep -v grep | cut -c10-15`; do kill -9 $i; done killall -9 testsuite killall -9 server killall -9 client @@ -68,7 +68,7 @@ chmod u+x $WORKSPACE/blacktie/target/dist/blacktie-5.0.0.M4-SNAPSHOT/setenv.sh . $WORKSPACE/blacktie/target/dist/blacktie-5.0.0.M4-SNAPSHOT/setenv.sh if [ "$?" != "0" ]; then ps -f - for i in `ps -eaf | grep java | grep "standalone-full.xml" | grep -v grep | cut -c10-15`; do kill -9 $i; done + for i in `ps -eaf | grep java | grep "standalone.*xml" | grep -v grep | cut -c10-15`; do kill -9 $i; done killall -9 testsuite killall -9 server killall -9 client @@ -84,7 +84,7 @@ cd $WORKSPACE/blacktie/ ./run_all_quickstarts.sh if [ "$?" != "0" ]; then ps -f - for i in `ps -eaf | grep java | grep "standalone-full.xml" | grep -v grep | cut -c10-15`; do kill -9 $i; done + for i in `ps -eaf | grep java | grep "standalone.*xml" | grep -v grep | cut -c10-15`; do kill -9 $i; done killall -9 testsuite killall -9 server killall -9 client @@ -95,7 +95,7 @@ fi # KILL ANY BUILD REMNANTS ps -f -for i in `ps -eaf | grep java | grep "standalone-full.xml" | grep -v grep | cut -c10-15`; do kill -9 $i; done +for i in `ps -eaf | grep java | grep "standalone.*xml" | grep -v grep | cut -c10-15`; do kill -9 $i; done killall -9 testsuite killall -9 server killall -9 client diff --git a/blacktie/test/blacktie-vc9x32.bat b/blacktie/test/blacktie-vc9x32.bat index 0bf615293a..f8de940425 100644 --- a/blacktie/test/blacktie-vc9x32.bat +++ b/blacktie/test/blacktie-vc9x32.bat @@ -23,7 +23,7 @@ set JBOSS_HOME= rem START JBOSS cd %WORKSPACE%\jboss-as\bin -start /B standalone.bat -c standalone-full.xml -Djboss.bind.address=%JBOSSAS_IP_ADDR% -Djboss.bind.address.unsecure=%JBOSSAS_IP_ADDR% +start /B standalone.bat -c standalone-blacktie.xml -Djboss.bind.address=%JBOSSAS_IP_ADDR% -Djboss.bind.address.unsecure=%JBOSSAS_IP_ADDR% echo "Started server" @ping 127.0.0.1 -n 20 -w 1000 > nul diff --git a/blacktie/test/initializeBlackTie.xml b/blacktie/test/initializeBlackTie.xml index fe488b8bc9..55048ea5c6 100755 --- a/blacktie/test/initializeBlackTie.xml +++ b/blacktie/test/initializeBlackTie.xml @@ -22,27 +22,28 @@ + set "JAVA_OPTS=%JAVA_OPTS% -DOrbPortabilityEnvironmentBean.resolveService=NAME_SERVICE" JAVA_OPTS="$JAVA_OPTS -DOrbPortabilityEnvironmentBean.resolveService=NAME_SERVICE" - + - + - + - + - + - + - + - + @@ -89,7 +90,6 @@ dynsub=guest,blacktie,dynsub" file="jboss-as/standalone/configuration/applicatio -