[jboss-cvs] JBossAS SVN: r109079 - in branches/JBPAPP_5_1/testsuite: imports/sections and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Nov 2 19:35:04 EDT 2010
Author: pskopek at redhat.com
Date: 2010-11-02 19:35:04 -0400 (Tue, 02 Nov 2010)
New Revision: 109079
Added:
branches/JBPAPP_5_1/testsuite/src/resources/cc/jta/
branches/JBPAPP_5_1/testsuite/src/resources/cc/jta/test-config.xml
Modified:
branches/JBPAPP_5_1/testsuite/imports/config/tests-crash-recovery.xml
branches/JBPAPP_5_1/testsuite/imports/sections/jbossts.xml
branches/JBPAPP_5_1/testsuite/src/resources/jbossts/scripts/imports/test-config.xml
Log:
cc: transaction recovery tests enabled
Modified: branches/JBPAPP_5_1/testsuite/imports/config/tests-crash-recovery.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/imports/config/tests-crash-recovery.xml 2010-11-02 18:56:02 UTC (rev 109078)
+++ branches/JBPAPP_5_1/testsuite/imports/config/tests-crash-recovery.xml 2010-11-02 23:35:04 UTC (rev 109079)
@@ -11,6 +11,8 @@
<property name="jbossts.crash.recovery.test.dir" value="jbossts" />
<property name="jbossts.crash.recovery.test.script.dir" value="${jbossts.crash.recovery.test.dir}/scripts" />
<property name="jbossts.crash.recovery.test.resource.dir" value="${jbossts.crash.recovery.test.dir}/resources" />
+ <property name="jbossts.base.jta.server.profile" value="default" />
+ <property name="jbossts.base.jts.server.profile" value="all" />
<!--
| Targets
@@ -161,6 +163,11 @@
<sysproperty key="jbossts.hornetq" value="${jbossts.hornetq}" />
<sysproperty key="jbossts.hornetq.netty" value="${jbossts.hornetq.netty}" />
<sysproperty key="testTime" value="${jbossts.max.time}" />
+ <syspropertyset>
+ <propertyref prefix="jboss.test.deploy.dir"/>
+ <propertyref prefix="cc."/>
+ </syspropertyset>
+
<env key="JBOSS_HOME" value="${jbosstest.dist}" />
<arg value="-f"/>
<arg value="${build.resources}/${jbossts.crash.recovery.test.script.dir}/as-tests.xml"/>
@@ -174,12 +181,17 @@
<target name="prepare-crashrec-profile-jta" unless="have.crash.recovery.jta.profile">
<delete dir="${jboss.dist}/server/crashrecovery-jta" />
- <create-config baseconf="default" newconf="crashrecovery-jta">
- <patternset>
- <include name="conf/**"/>
- <include name="deploy/**"/>
- <include name="deployers/**"/>
- <include name="lib/**"/>
+ <create-config baseconf="${jbossts.base.jta.server.profile}" newconf="crashrecovery-jta">
+ <patternset> <!-- necessary for CC tests -->
+ <include name="conf/**" />
+ <include name="deployers/**" />
+ <include name="deploy/**" />
+ <include name="deploy-hasingleton/**" />
+ <include name="farm/**" />
+ <include name="lib/**" />
+ <include name="cc.*"/>
+ <include name="ssl.*"/>
+ <include name="localhost.*"/>
</patternset>
</create-config>
@@ -188,7 +200,7 @@
<target name="prepare-crashrec-profile-jts" unless="have.crash.recovery.jts.profile">
<delete dir="${jboss.dist}/server/crashrecovery-jts" />
- <create-config baseconf="all" newconf="crashrecovery-jts">
+ <create-config baseconf="${jbossts.base.jts.server.profile}" newconf="crashrecovery-jts">
<patternset>
<include name="conf/**"/>
<include name="deploy/**"/>
Modified: branches/JBPAPP_5_1/testsuite/imports/sections/jbossts.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/imports/sections/jbossts.xml 2010-11-02 18:56:02 UTC (rev 109078)
+++ branches/JBPAPP_5_1/testsuite/imports/sections/jbossts.xml 2010-11-02 23:35:04 UTC (rev 109079)
@@ -18,6 +18,9 @@
<include name="org/jboss/test/jbossts/taskdefs/*.class"/>
</fileset>
</jar>
+ <antcall target="sign-file">
+ <param name="file" value="crashrecovery-astest.jar"/>
+ </antcall>
</target>
<target name="jbqa3370" depends="compile">
Added: branches/JBPAPP_5_1/testsuite/src/resources/cc/jta/test-config.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/cc/jta/test-config.xml (rev 0)
+++ branches/JBPAPP_5_1/testsuite/src/resources/cc/jta/test-config.xml 2010-11-02 23:35:04 UTC (rev 109079)
@@ -0,0 +1,97 @@
+<project name="crashrecovery-tests-server-config"
+ xmlns:astest="http://jboss.org/ns/test/ant/astest">
+
+ <taskdef name="config" classname="org.jboss.test.jbossts.taskdefs.ASTestConfig"
+ uri="http://jboss.org/ns/test/ant/astest" loaderref="astest.loader">
+ </taskdef>
+
+ <!--
+ - Task to start/stop servers with attribute for deploying and undeploying artifacts
+ -->
+ <taskdef name="server" classname="org.jboss.test.jbossts.taskdefs.ServerTask"
+ uri="http://jboss.org/ns/test/ant/astest" loaderref="astest.loader">
+ </taskdef>
+
+ <!--
+ - Task to perform an arbitary action. The action will have access to the test configuration
+ - specified in the configuration.
+ -->
+ <taskdef name="action" classname="org.jboss.test.jbossts.taskdefs.ASClientTask"
+ uri="http://jboss.org/ns/test/ant/astest" loaderref="astest.loader">
+ </taskdef>
+
+ <!--
+ - a spec is specification of how to inject faults into the XA protocol operations
+ -->
+ <typedef name="spec" classname="org.jboss.test.jbossts.recovery.ASFailureSpec"
+ uri="http://jboss.org/ns/test/ant/astest" loaderref="astest.loader">
+ </typedef>
+
+
+ <!--
+ - If the product directory where this test is running from contains an AS installation then use it,
+ - otherwise use the value of the JBOSS_HOME environment variable
+ -->
+ <!--
+ - The framework detects whether a server is running via the httpPort if the server has a web server,
+ - otherwise it uses the servers rmi port.
+ - To specify the http port use the httpPort attribute in the server definition.
+ - To specify the rmi port in the server definition use the rmiPort attribute together with hasWebServer="false"
+ -
+ - The port numbers must match the ports used by the actual server. Note that the default port bindings for a
+ - server can be changed via the server.binding.name and server.binding.location properties.
+ -->
+ <astest:config javaHome="${env.JAVA_HOME}" debug="false">
+ <spec name= "none" mode="NONE" type="NONE" />
+ <spec name= "prepare_ex" mode="XAEXCEPTION" type="XARES_PREPARE" modeArg="XAER_RMFAIL" />
+ <spec name= "prepare_halt" mode="HALT" type="XARES_PREPARE" />
+ <spec name= "commit_halt" mode="HALT" type="XARES_COMMIT" />
+
+ <!--
+ Profiles for JBossAS Testsuite integration
+ -->
+ <server name="crashrecovery-jta" host="${node0}">
+ <jvmarg value="-Xms128m" />
+ <jvmarg value="-Xmx512m" />
+ <jvmarg value="-XX:MaxPermSize=512m" />
+ <jvmarg value="-server" />
+ <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="org.jboss.resolver.warning" value="true" />
+ <sysproperty key="sun.rmi.dgc.client.gcInterval" value="3600000" />
+ <sysproperty key="sun.rmi.dgc.server.gcInterval" value="3600000" />
+ <sysproperty key="xb.builder.useUnorderedSequence" value="true" />
+ <jvmarg value="-Djboss.home.dir=${jboss.dist}" />
+ <jvmarg value="-Djboss.server.home.dir=${jboss.dist}/server/crashrecovery-jta" />
+ <jvmarg value="-Djboss.test.deploy.dir=${jboss.test.deploy.dir}" />
+ <jvmarg value="-Djava.security.manager"/>
+ <jvmarg value="-Djava.security.policy==${jboss.dist}/server/crashrecovery-jta/cc.policy"/>
+ <jvmarg value="-D${cc.java.security.debug}=access,failure"/>
+ <jvmarg value="-D${cc.prop.java.library.path}=${cc.java.library.path}"/>
+ <jvmarg value="-Dcc.jdbc.driver=${cc.jdbc.driver}"/>
+ <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.handlers.stub"/>
+
+ <!-- Replace for security manager debug verbose info
+ <jvmarg value="-Djava.security.debug=access,failure,policy"/>
+ -->
+
+ <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
+
+ <!--jvmarg value="-Xdebug"/>
+ <jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/-->
+ </server>
+
+ <server name="crashrecovery-jts" host="${node0}">
+ <jvmarg value="-Xms128m" />
+ <jvmarg value="-Xmx512m" />
+ <jvmarg value="-XX:MaxPermSize=512m" />
+ <jvmarg value="-server" />
+ <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="org.jboss.resolver.warning" value="true" />
+ <sysproperty key="sun.rmi.dgc.client.gcInterval" value="3600000" />
+ <sysproperty key="sun.rmi.dgc.server.gcInterval" value="3600000" />
+ <sysproperty key="xb.builder.useUnorderedSequence" value="true" />
+ </server>
+
+ </astest:config>
+</project>
Modified: branches/JBPAPP_5_1/testsuite/src/resources/jbossts/scripts/imports/test-config.xml
===================================================================
--- branches/JBPAPP_5_1/testsuite/src/resources/jbossts/scripts/imports/test-config.xml 2010-11-02 18:56:02 UTC (rev 109078)
+++ branches/JBPAPP_5_1/testsuite/src/resources/jbossts/scripts/imports/test-config.xml 2010-11-02 23:35:04 UTC (rev 109079)
@@ -60,6 +60,23 @@
<sysproperty key="sun.rmi.dgc.client.gcInterval" value="3600000" />
<sysproperty key="sun.rmi.dgc.server.gcInterval" value="3600000" />
<sysproperty key="xb.builder.useUnorderedSequence" value="true" />
+ <jvmarg value="-Djboss.home.dir=${jboss.dist}" />
+ <jvmarg value="-Djboss.server.home.dir=${jboss.dist}${/}server${/}cc" />
+ <jvmarg value="-Djboss.test.deploy.dir=${jboss.test.deploy.dir}" />
+ <jvmarg value="-Djava.security.manager"/>
+ <jvmarg value="-Djava.security.policy==${jboss.dist}${/}server${/}cc/cc.policy"/>
+ <jvmarg value="-D${cc.java.security.debug}=access,failure"/>
+ <jvmarg value="-D${cc.prop.java.library.path}=${cc.java.library.path}"/>
+ <jvmarg value="-Dcc.jdbc.driver=${cc.jdbc.driver}"/>
+ <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.handlers.stub"/>
+
+ <!-- Replace for security manager debug verbose info
+ <jvmarg value="-Djava.security.debug=access,failure,policy"/>
+ -->
+
+ <sysproperty key="java.net.preferIPv4Stack" value="true" />
+ <sysproperty key="java.endorsed.dirs" value="${jboss.dist}/lib/endorsed" />
+
<!--jvmarg value="-Xdebug"/>
<jvmarg value="-Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"/-->
</server>
More information about the jboss-cvs-commits
mailing list