[jboss-svn-commits] JBL Code SVN: r38153 - in labs/jbosstm/branches/JBOSSTS_4_16: XTS/demo-test/src/test/resources and 8 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Jul 27 07:47:40 EDT 2012
Author: zhfeng
Date: 2012-07-27 07:47:39 -0400 (Fri, 27 Jul 2012)
New Revision: 38153
Modified:
labs/jbosstm/branches/JBOSSTS_4_16/XTS/demo-test/
labs/jbosstm/branches/JBOSSTS_4_16/XTS/demo-test/src/test/resources/arquillian.xml
labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/crash-recovery-tests/src/test/java/com/arjuna/qa/junit/BaseCrashTest.java
labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/crash-recovery-tests/src/test/resources/arquillian.xml
labs/jbosstm/branches/JBOSSTS_4_16/scripts/hudson/narayana.sh
labs/jbosstm/branches/JBOSSTS_4_16/txbridge/demo-test/src/test/resources/arquillian.xml
labs/jbosstm/branches/JBOSSTS_4_16/txbridge/tests/
labs/jbosstm/branches/JBOSSTS_4_16/txbridge/tests/build.xml
labs/jbosstm/branches/JBOSSTS_4_16/txbridge/tests/src/test/java/org/jboss/jbossts/txbridge/tests/inbound/junit/InboundCrashRecoveryTests.java
labs/jbosstm/branches/JBOSSTS_4_16/txbridge/tests/src/test/java/org/jboss/jbossts/txbridge/tests/outbound/junit/OutboundCrashRecoveryTests.java
labs/jbosstm/branches/JBOSSTS_4_16/txbridge/tests/src/test/resources/arquillian.xml
Log:
JBTM-1199 update arquillian to use standalone-xts.xml from <jboss_home>/standalone/configuration and copy this file from docs/examples/config
Property changes on: labs/jbosstm/branches/JBOSSTS_4_16/XTS/demo-test
___________________________________________________________________
Added: svn:ignore
+ target
Modified: labs/jbosstm/branches/JBOSSTS_4_16/XTS/demo-test/src/test/resources/arquillian.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/XTS/demo-test/src/test/resources/arquillian.xml 2012-07-20 16:41:35 UTC (rev 38152)
+++ labs/jbosstm/branches/JBOSSTS_4_16/XTS/demo-test/src/test/resources/arquillian.xml 2012-07-27 11:47:39 UTC (rev 38153)
@@ -3,7 +3,7 @@
<container qualifier="jboss" default="true">
<configuration>
- <property name="serverConfig">../../docs/examples/configs/standalone-xts.xml</property>
+ <property name="serverConfig">standalone-xts.xml</property>
<property name="javaVmArguments">${server.jvm.args}</property>
<property name="managementAddress">${node0:127.0.0.1}</property>
</configuration>
Modified: labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/crash-recovery-tests/src/test/java/com/arjuna/qa/junit/BaseCrashTest.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/crash-recovery-tests/src/test/java/com/arjuna/qa/junit/BaseCrashTest.java 2012-07-20 16:41:35 UTC (rev 38152)
+++ labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/crash-recovery-tests/src/test/java/com/arjuna/qa/junit/BaseCrashTest.java 2012-07-27 11:47:39 UTC (rev 38153)
@@ -129,7 +129,7 @@
//redeploy xtstest
//deployer.undeploy("xtstest");
- deployer.deploy("xtstest");
+ //deployer.deploy("xtstest");
//Waiting for recovery
//Thread.sleep(waitForRecovery * 60 * 1000);
Modified: labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/crash-recovery-tests/src/test/resources/arquillian.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/crash-recovery-tests/src/test/resources/arquillian.xml 2012-07-20 16:41:35 UTC (rev 38152)
+++ labs/jbosstm/branches/JBOSSTS_4_16/XTS/sar/crash-recovery-tests/src/test/resources/arquillian.xml 2012-07-27 11:47:39 UTC (rev 38153)
@@ -12,7 +12,7 @@
<property name="executionType">REMOTE</property>
</protocol>
<configuration>
- <property name="serverConfig">../../docs/examples/configs/standalone-xts.xml</property>
+ <property name="serverConfig">standalone-xts.xml</property>
<!--
<property name="javaVmArguments">-Djboss.modules.system.pkgs=org.jboss.byteman -Dorg.jboss.byteman.transform.all -javaagent:target/test-classes/lib/byteman.jar=script:target/test-classes/scripts/Running.txt,boot:target/test-classes/lib/byteman.jar,listener:true</property>
Modified: labs/jbosstm/branches/JBOSSTS_4_16/scripts/hudson/narayana.sh
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/scripts/hudson/narayana.sh 2012-07-20 16:41:35 UTC (rev 38152)
+++ labs/jbosstm/branches/JBOSSTS_4_16/scripts/hudson/narayana.sh 2012-07-27 11:47:39 UTC (rev 38153)
@@ -44,7 +44,8 @@
JBOSS_VERSION=`ls -1 ${WORKSPACE}/jboss-as/build/target | grep jboss-as`
export JBOSS_HOME=${WORKSPACE}/jboss-as/build/target/${JBOSS_VERSION}
-$JBOSS_HOME/bin/standalone.sh --server-config=../../docs/examples/configs/standalone-xts.xml&
+cp ${JBOSS_HOME}/docs/examples/configs/standalone-xts.xml ${JBOSS_HOME}/standalone/configuration
+$JBOSS_HOME/bin/standalone.sh --server-config=standalone-xts.xml&
sleep 10
#RUN XTS UNIT TESTS
Modified: labs/jbosstm/branches/JBOSSTS_4_16/txbridge/demo-test/src/test/resources/arquillian.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/txbridge/demo-test/src/test/resources/arquillian.xml 2012-07-20 16:41:35 UTC (rev 38152)
+++ labs/jbosstm/branches/JBOSSTS_4_16/txbridge/demo-test/src/test/resources/arquillian.xml 2012-07-27 11:47:39 UTC (rev 38153)
@@ -3,7 +3,7 @@
<container qualifier="jboss" default="true">
<configuration>
- <property name="serverConfig">../../docs/examples/configs/standalone-xts.xml</property>
+ <property name="serverConfig">standalone-xts.xml</property>
<property name="javaVmArguments">${server.jvm.args}</property>
<property name="managementAddress">${node0:127.0.0.1}</property>
</configuration>
Property changes on: labs/jbosstm/branches/JBOSSTS_4_16/txbridge/tests
___________________________________________________________________
Modified: svn:ignore
- transaction.log
target
+ transaction.log
target
build
Modified: labs/jbosstm/branches/JBOSSTS_4_16/txbridge/tests/build.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/txbridge/tests/build.xml 2012-07-20 16:41:35 UTC (rev 38152)
+++ labs/jbosstm/branches/JBOSSTS_4_16/txbridge/tests/build.xml 2012-07-27 11:47:39 UTC (rev 38153)
@@ -7,7 +7,7 @@
<property name="jbossts.version" value="4.16.5.Final-SNAPSHOT"/>
<property name="groupid" value="org.jboss.jbossts"/>
<property name="jboss.home" value="/tmp/jboss-as-7.1.0-SNAPSHOT"/>
- <property name="standalone.xts.conf.path" value="${jboss.home}/docs/examples/configs/standalone-xts.xml"/>
+ <property name="standalone.xts.conf.path" value="${jboss.home}/standalone/configuration/standalone-xts.xml"/>
<target name="clean">
<mvn.macro>
Modified: labs/jbosstm/branches/JBOSSTS_4_16/txbridge/tests/src/test/java/org/jboss/jbossts/txbridge/tests/inbound/junit/InboundCrashRecoveryTests.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/txbridge/tests/src/test/java/org/jboss/jbossts/txbridge/tests/inbound/junit/InboundCrashRecoveryTests.java 2012-07-20 16:41:35 UTC (rev 38152)
+++ labs/jbosstm/branches/JBOSSTS_4_16/txbridge/tests/src/test/java/org/jboss/jbossts/txbridge/tests/inbound/junit/InboundCrashRecoveryTests.java 2012-07-27 11:47:39 UTC (rev 38153)
@@ -134,9 +134,6 @@
rebootServer(controller);
- deployer.deploy(INBOUND_SERVICE_DEPLOYMENT_NAME);
- deployer.deploy(INBOUND_CLIENT_DEPLOYMENT_NAME);
-
doRecovery();
doRecovery();
@@ -172,9 +169,6 @@
rebootServer(controller);
- deployer.deploy(INBOUND_SERVICE_DEPLOYMENT_NAME);
- deployer.deploy(INBOUND_CLIENT_DEPLOYMENT_NAME);
-
doRecovery();
doRecovery();
@@ -210,9 +204,6 @@
rebootServer(controller);
- deployer.deploy(INBOUND_SERVICE_DEPLOYMENT_NAME);
- deployer.deploy(INBOUND_CLIENT_DEPLOYMENT_NAME);
-
doRecovery();
doRecovery();
Modified: labs/jbosstm/branches/JBOSSTS_4_16/txbridge/tests/src/test/java/org/jboss/jbossts/txbridge/tests/outbound/junit/OutboundCrashRecoveryTests.java
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/txbridge/tests/src/test/java/org/jboss/jbossts/txbridge/tests/outbound/junit/OutboundCrashRecoveryTests.java 2012-07-20 16:41:35 UTC (rev 38152)
+++ labs/jbosstm/branches/JBOSSTS_4_16/txbridge/tests/src/test/java/org/jboss/jbossts/txbridge/tests/outbound/junit/OutboundCrashRecoveryTests.java 2012-07-27 11:47:39 UTC (rev 38153)
@@ -132,9 +132,6 @@
rebootServer(controller);
- deployer.deploy(OUTBOUND_SERVICE_DEPLOYMENT_NAME);
- deployer.deploy(OUTBOUND_CLIENT_DEPLOYMENT_NAME);
-
doRecovery();
doRecovery();
@@ -166,9 +163,6 @@
rebootServer(controller);
- deployer.deploy(OUTBOUND_SERVICE_DEPLOYMENT_NAME);
- deployer.deploy(OUTBOUND_CLIENT_DEPLOYMENT_NAME);
-
doRecovery();
doRecovery();
Modified: labs/jbosstm/branches/JBOSSTS_4_16/txbridge/tests/src/test/resources/arquillian.xml
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/txbridge/tests/src/test/resources/arquillian.xml 2012-07-20 16:41:35 UTC (rev 38152)
+++ labs/jbosstm/branches/JBOSSTS_4_16/txbridge/tests/src/test/resources/arquillian.xml 2012-07-27 11:47:39 UTC (rev 38153)
@@ -4,7 +4,7 @@
<container qualifier="jboss" default="true" mode="manual">
<configuration>
<property name="javaVmArguments">${server.jvm.args}</property>
- <property name="serverConfig">../../docs/examples/configs/standalone-xts.xml</property>
+ <property name="serverConfig">standalone-xts.xml</property>
</configuration>
</container>
</arquillian>
\ No newline at end of file
More information about the jboss-svn-commits
mailing list