[jboss-cvs] JBossAS SVN: r99254 - in trunk/testsuite: src/resources/jbossts/jts-propagation/ejb2/META-INF and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Jan 11 18:50:30 EST 2010
Author: istudens at redhat.com
Date: 2010-01-11 18:50:30 -0500 (Mon, 11 Jan 2010)
New Revision: 99254
Modified:
trunk/testsuite/imports/config/tests-crash-recovery.xml
trunk/testsuite/imports/config/tests-jts-propagation.xml
trunk/testsuite/src/resources/jbossts/jts-propagation/ejb2/META-INF/ejb-jar.xml
trunk/testsuite/src/resources/jbossts/jts-propagation/ejb2/META-INF/jboss.xml
trunk/testsuite/src/resources/jbossts/scripts/as-tests.xml
Log:
fixed the header of ejb2/jboss.xml file, JBQA-2604
Modified: trunk/testsuite/imports/config/tests-crash-recovery.xml
===================================================================
--- trunk/testsuite/imports/config/tests-crash-recovery.xml 2010-01-11 23:14:52 UTC (rev 99253)
+++ trunk/testsuite/imports/config/tests-crash-recovery.xml 2010-01-11 23:50:30 UTC (rev 99254)
@@ -33,14 +33,14 @@
<target name="tests-ts-crash-recovery" depends="init-dependencies"
description="Runs JBossTS crash recovery tests">
- <!--available file="${jboss.dist}/server/crashrecovery-jta" property="have.crashrecovery.jta.profile" value="true"/>
+ <available file="${jboss.dist}/server/crashrecovery-jta" property="have.crashrecovery.jta.profile" value="true"/>
<available file="${jboss.dist}/server/crashrecovery-jts" property="have.crashrecovery.jts.profile" value="true"/>
<condition property="have.crash.recovery.profiles">
<and>
<istrue value="${have.crashrecovery.jta.profile}"/>
<istrue value="${have.crashrecovery.jts.profile}"/>
</and>
- </condition-->
+ </condition>
<antcall target="prepare-crashrec-profiles" />
Modified: trunk/testsuite/imports/config/tests-jts-propagation.xml
===================================================================
--- trunk/testsuite/imports/config/tests-jts-propagation.xml 2010-01-11 23:14:52 UTC (rev 99253)
+++ trunk/testsuite/imports/config/tests-jts-propagation.xml 2010-01-11 23:50:30 UTC (rev 99254)
@@ -30,14 +30,14 @@
<target name="tests-jts-propagation" depends="init-dependencies"
description="Runs JBossTS JTS propagation tests">
- <!--FIXME odkomentovat available file="${jboss.dist}/server/jts-propagation-node0" property="have.jts.propag.node0.profile" value="true"/>
+ <available file="${jboss.dist}/server/jts-propagation-node0" property="have.jts.propag.node0.profile" value="true"/>
<available file="${jboss.dist}/server/jts-propagation-node1" property="have.jts.propag.node1.profile" value="true"/>
<condition property="have.jts.propag.profiles">
<and>
<istrue value="${have.jts.propag.node0.profile}"/>
<istrue value="${have.jts.propag.node1.profile}"/>
</and>
- </condition-->
+ </condition>
<antcall target="prepare-jts-propogation-profiles" />
Modified: trunk/testsuite/src/resources/jbossts/jts-propagation/ejb2/META-INF/ejb-jar.xml
===================================================================
--- trunk/testsuite/src/resources/jbossts/jts-propagation/ejb2/META-INF/ejb-jar.xml 2010-01-11 23:14:52 UTC (rev 99253)
+++ trunk/testsuite/src/resources/jbossts/jts-propagation/ejb2/META-INF/ejb-jar.xml 2010-01-11 23:50:30 UTC (rev 99254)
@@ -35,8 +35,10 @@
<method-param>java.lang.String</method-param>
<method-param>java.lang.String</method-param>
<method-param>java.lang.String</method-param>
- <method-param>java.lang.boolean</method-param>
- <method-param>java.lang.boolean</method-param>
+ <method-param>boolean</method-param>
+ <method-param>boolean</method-param>
+ <method-param>int</method-param>
+ <method-param>int</method-param>
</method-params>
</method>
<trans-attribute>Required</trans-attribute>
@@ -64,8 +66,10 @@
<method-param>java.lang.String</method-param>
<method-param>java.lang.String</method-param>
<method-param>java.lang.String</method-param>
- <method-param>java.lang.boolean</method-param>
- <method-param>java.lang.boolean</method-param>
+ <method-param>boolean</method-param>
+ <method-param>boolean</method-param>
+ <method-param>int</method-param>
+ <method-param>int</method-param>
</method-params>
</method>
<trans-attribute>Required</trans-attribute>
Modified: trunk/testsuite/src/resources/jbossts/jts-propagation/ejb2/META-INF/jboss.xml
===================================================================
--- trunk/testsuite/src/resources/jbossts/jts-propagation/ejb2/META-INF/jboss.xml 2010-01-11 23:14:52 UTC (rev 99253)
+++ trunk/testsuite/src/resources/jbossts/jts-propagation/ejb2/META-INF/jboss.xml 2010-01-11 23:50:30 UTC (rev 99254)
@@ -1,4 +1,5 @@
<?xml version="1.0"?>
+<!DOCTYPE jboss PUBLIC "-//JBoss//DTD JBOSS 4.0//EN" "http://www.jboss.org/j2ee/dtd/jboss_4_0.dtd">
<jboss>
<enterprise-beans>
<session>
Modified: trunk/testsuite/src/resources/jbossts/scripts/as-tests.xml
===================================================================
--- trunk/testsuite/src/resources/jbossts/scripts/as-tests.xml 2010-01-11 23:14:52 UTC (rev 99253)
+++ trunk/testsuite/src/resources/jbossts/scripts/as-tests.xml 2010-01-11 23:50:30 UTC (rev 99254)
@@ -423,6 +423,10 @@
<fileset file="${jboss.home}/server/crashrecovery-${tstype}/log/server.log"/>
</zip>
<delete file="${jboss.home}/server/crashrecovery-${tstype}/log/server.log"/>
+ <zip destfile="${jboss.home}/server/crashrecovery-${tstype}/log/boot-${dbname}-${testname}.log.zip">
+ <fileset file="${jboss.home}/server/crashrecovery-${tstype}/log/boot.log"/>
+ </zip>
+ <delete file="${jboss.home}/server/crashrecovery-${tstype}/log/boot.log"/>
<copy todir="${jboss.home}/server/crashrecovery-${tstype}/data/tx-object-store-${dbname}-${testname}">
<fileset dir="${jboss.home}/server/crashrecovery-${tstype}/data/tx-object-store" />
</copy>
More information about the jboss-cvs-commits
mailing list