[jboss-cvs] JBossAS SVN: r100087 - branches/JBPAPP_4_2_0_GA_CP/ejb3.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Jan 28 17:00:20 EST 2010


Author: rachmatowicz at jboss.com
Date: 2010-01-28 17:00:19 -0500 (Thu, 28 Jan 2010)
New Revision: 100087

Modified:
   branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml
Log:
Update EJB3 testsuite to pass java.net.preferIPv4Stack and java.net.preferIPv6Addresses system properties to <junit> test targets and server startups (JBPAPP-2997).


Modified: branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml
===================================================================
--- branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml	2010-01-28 20:57:33 UTC (rev 100086)
+++ branches/JBPAPP_4_2_0_GA_CP/ejb3/build-test.xml	2010-01-28 22:00:19 UTC (rev 100087)
@@ -20,360 +20,383 @@
 
 
 <project default="main" name="JBoss/EJB3 Tests">
-   <import file="../tools/etc/buildmagic/build-common.xml"/>
+	<import file="../tools/etc/buildmagic/build-common.xml"/>
    &libraries;
    &modules;
 
    <!-- ======================================================== -->
-   <!-- Initialization                                           -->
-   <!-- ======================================================== -->
-   <tstamp>
-      <format property="TIMENOW" pattern="yyyy-MM-dd.HH-mm" timezone="GMT"/>
-   </tstamp>
-   <echo message="${TIMENOW}" file="run.tstamp"/>
+	<!-- Initialization                                           -->
+	<!-- ======================================================== -->
+	<tstamp>
+		<format property="TIMENOW" pattern="yyyy-MM-dd.HH-mm" timezone="GMT"/>
+	</tstamp>
+	<echo message="${TIMENOW}" file="run.tstamp"/>
 
-   <property name="results_web" value="http://jboss.sourceforge.net/junit-results/32"/>
-   <property name="buildlog.level" value="info" />
-   <property environment="env"/>
+	<property name="results_web" value="http://jboss.sourceforge.net/junit-results/32"/>
+	<property name="buildlog.level" value="info" />
+	<property environment="env"/>
 
 
-   <!-- Check if we need to build soa -->
-   <condition property="build.soa.bits" value="true">
-      <equals arg1="${build.soa}" arg2="true"/>
-   </condition>
+	<!-- Check if we need to build soa -->
+	<condition property="build.soa.bits" value="true">
+		<equals arg1="${build.soa}" arg2="true"/>
+	</condition>
 
-   <!-- Some properties are set for ws 2.x that aren't for 1.2.x. We therefore
+	<!-- Some properties are set for ws 2.x that aren't for 1.2.x. We therefore
      make the classpathrefid dynamic. This is a hack and can probably solved 
      better..
     -->
-   <condition property="jboss.jbossws.common.classpath.refid.name" value="jboss.jbossws.common.classpath" else="jboss.jbossws.classpath">
-      <isset property="build.soa.bits"/>
-   </condition>
+	<condition property="jboss.jbossws.common.classpath.refid.name" value="jboss.jbossws.common.classpath" else="jboss.jbossws.classpath">
+		<isset property="build.soa.bits"/>
+	</condition>
 
-   <condition property="jboss.jbossws.spi.classpath.refid.name" value="jboss.jbossws.spi.classpath" else="jboss.jbossws.classpath">
-      <isset property="build.soa.bits"/>
-   </condition>
+	<condition property="jboss.jbossws.spi.classpath.refid.name" value="jboss.jbossws.spi.classpath" else="jboss.jbossws.classpath">
+		<isset property="build.soa.bits"/>
+	</condition>
 
-   <!-- TODO: integrate jboss.jms.provider and jboss.jms.product -->
+	<!-- TODO: integrate jboss.jms.provider and jboss.jms.product -->
 
-   <condition property="jboss.jms.provider" value="jbm" else="mq">
-      <isset property="build.soa.bits"/>
-   </condition>
+	<condition property="jboss.jms.provider" value="jbm" else="mq">
+		<isset property="build.soa.bits"/>
+	</condition>
 
-   <condition property="jboss.jms.product" value="messaging" else="mq">
-      <isset property="build.soa.bits"/>
-   </condition>
+	<condition property="jboss.jms.product" value="messaging" else="mq">
+		<isset property="build.soa.bits"/>
+	</condition>
 
-   <!-- Set a hostname property based on COMPUTERNAME for win32, HOSTNAME
+	<!-- Set a hostname property based on COMPUTERNAME for win32, HOSTNAME
    otherwise and initialize the node0/node1 cluster hostnames to localhost
    and ${hostname} by default. If you cannot route multicast traffic between
    localhost and hostname, then you need to specify node0 and node1 binding
    in the local.properties that can in order to be able to run the clustering
    tests.
    -->
-   <condition property="hostname" value="${env.COMPUTERNAME}">
-      <os family="windows"/>
-   </condition>
-   <condition property="hostname" value="${env.HOSTNAME}">
-      <not>
-         <os family="windows"/>
-      </not>
-   </condition>
+	<condition property="hostname" value="${env.COMPUTERNAME}">
+		<os family="windows"/>
+	</condition>
+	<condition property="hostname" value="${env.HOSTNAME}">
+		<not>
+			<os family="windows"/>
+		</not>
+	</condition>
 
-   <!--We will use local.properties file to provide some configuration
+	<!--We will use local.properties file to provide some configuration
        to the testsuite mainly for the Clustering framework. Please
        do not checkin your local.properties file into CVS-->
-   <property file="local.properties"/>
+	<property file="local.properties"/>
 
-   <!-- Cluster node defaults -->
-   <property name="node0" value="localhost" />
-   <!-- node0.url is a hostname or IP literal suitable for embedding in URLs -->
-   <condition property="node0.url" value="[${node0}]" else="${node0}">
-	 <contains string="${node0}" substring=":"/>
-   </condition>
-   <property name="node0.http.url" value="http://${node0.url}:8080" />
-   <property name="node0.jndi.url" value="jnp://${node0.url}:1099" />
-   <property name="node0.jndi.port1.url" value="jnp://${node0.url}:1199" />
-   <property name="node0.http.port1.url" value="http://${node0.url}:8180" />
-   <property name="node0.jgroups.bind_addr" value="${node0}" />
-	
-   <property name="node1" value="${hostname}" />
-   <!-- node0.url is a hostname or IP literal suitable for embedding in URLs -->
-   <condition property="node1.url" value="[${node1}]" else="${node1}">
-     <contains string="${node1}" substring=":"/>
-   </condition>
-   <property name="node1.http.url" value="http://${node1.url}:8080" />
-   <property name="node1.jndi.url" value="jnp://${node1.url}:1099" />
-   <property name="node1.jgroups.bind_addr" value="${node1}" />
+	<!-- Cluster node defaults -->
+	<property name="node0" value="localhost" />
+	<!-- node0.url is a hostname or IP literal suitable for embedding in URLs -->
+	<condition property="node0.url" value="[${node0}]" else="${node0}">
+		<contains string="${node0}" substring=":"/>
+	</condition>
+	<property name="node0.http.url" value="http://${node0.url}:8080" />
+	<property name="node0.jndi.url" value="jnp://${node0.url}:1099" />
+	<property name="node0.jndi.port1.url" value="jnp://${node0.url}:1199" />
+	<property name="node0.http.port1.url" value="http://${node0.url}:8180" />
+	<property name="node0.jgroups.bind_addr" value="${node0}" />
 
+	<property name="node1" value="${hostname}" />
+	<!-- node0.url is a hostname or IP literal suitable for embedding in URLs -->
+	<condition property="node1.url" value="[${node1}]" else="${node1}">
+		<contains string="${node1}" substring=":"/>
+	</condition>
+	<property name="node1.http.url" value="http://${node1.url}:8080" />
+	<property name="node1.jndi.url" value="jnp://${node1.url}:1099" />
+	<property name="node1.jgroups.bind_addr" value="${node1}" />
 
-   <!-- Import the jboss server run targets -->
-   <import file="../testsuite/imports/server-config.xml"/>
-   <!-- Propagate the dist directory as a jbosstest system property -->
-   <property name="ejb3.dist" value="${jboss.dist}"/>
+	<!-- IP stack preference -->
+	<!-- The value of java.net.preferIPv4Stack determines which IP version to test against. -->
+	<!-- Setting the system property to true, or not setting at all, forces use of IPv4 IP stack in the JVM. -->
+	<!--, or not setting at all,  Setting the system property to falseforces use of IPv6 stack -->
+	<!-- This ant property is used in server-config.xml when starting all server configurations -->
+	<!-- It is also used on the client side targets to make sure that client and server are using the same stack -->
+	<condition property="java.net.preferIPv4Stack" value="true" else="false">
+		<or>
+			<not>
+				<isset property="java.net.preferIPv4Stack" />
+			</not>
+			<and>
+				<isset property="java.net.preferIPv4Stack" />
+				<istrue value="${java.net.preferIPv4Stack}" />
+			</and>
+		</or>
+	</condition>
+	<!-- IP address preference -->
+	<!-- The value of java.net.preferIPv6Addresses determines which version of an IP address to return -->
+	<!-- when a single hostname maps to both an IPv4 and an IPv6 address -->
+	<!-- Setting the system property to true indicates a preference for IPv6 addresses. -->
+	<property name="java.net.preferIPv6Addresses" value="true" />
+	<echo message="Using java.net.preferIPv4Stack=${java.net.preferIPv4Stack},java.net.preferIPv6Addresses=${java.net.preferIPv6Addresses}" />
 
-   <echo message="${ejb3.dist}"/>
-   <property name="jbosstest.dist" value="${ejb3.dist}"/>
+	<!-- Import the jboss server run targets -->
+	<import file="../testsuite/imports/server-config.xml" />
+	<!-- Propagate the dist directory as a jbosstest system property -->
+	<property name="ejb3.dist" value="${jboss.dist}" />
 
-   <property name="ejb3.jboss.jvmargs" value="-Xmx128m"/>
+	<echo message="${ejb3.dist}" />
+	<property name="jbosstest.dist" value="${ejb3.dist}"/>
 
-   <property name="ejbthree1504.jboss.jvmargs" value="-Dcom.sun.management.jmxremote"/>
+	<!-- JVM args passed to the JVM when using start-jboss -->
+	<property name="ejb3.jboss.jvmargs" value="-Xmx128m -Djava.net.preferIPv4Stack=${java.net.preferIPv4Stack} -Djava.net.preferIPv6Addresses=${java.net.preferIPv6Addresses}"/>
+	<property name="ejbthree1504.jboss.jvmargs" value="-Dcom.sun.management.jmxremote"/>
 
-   <property name="endorsed.dirs" value="${ejb3.dist}/lib/endorsed/"/>
+	<property name="endorsed.dirs" value="${ejb3.dist}/lib/endorsed/"/>
 
-   <macrodef name="wait-on-host">
-      <attribute name="seconds" default="${jboss.startup.timeout}"/>
-      <attribute name="host" default="${node0}"/>
-      <attribute name="hostforurl" default="${node0.url}"/>
-      <sequential>
-         <echo>Waiting for @{host} to start (max wait @{seconds} seconds)...</echo>
-         <waitfor maxwait="@{seconds}" maxwaitunit="second"
+	<macrodef name="wait-on-host">
+		<attribute name="seconds" default="${jboss.startup.timeout}"/>
+		<attribute name="host" default="${node0}"/>
+		<attribute name="hostforurl" default="${node0.url}"/>
+		<sequential>
+			<echo>Waiting for @{host} to start (max wait @{seconds} seconds)...</echo>
+			<waitfor maxwait="@{seconds}" maxwaitunit="second"
             checkevery="5" checkeveryunit="second" timeoutproperty="startup.timeout">
-            <http url="http://@{hostforurl}:8080/"/>
-         </waitfor>
-         <fail message="Timeout waiting for nodes to start" if="startup.timeout"/>
-      </sequential>
-   </macrodef>
+				<http url="http://@{hostforurl}:8080/"/>
+			</waitfor>
+			<fail message="Timeout waiting for nodes to start" if="startup.timeout"/>
+		</sequential>
+	</macrodef>
 
-   <macrodef name="wait-on-shutdown">
-      <attribute name="seconds" default="60"/>
-      <attribute name="conf"/>
-      <sequential>
-         <echo message="Waiting for '@{conf}' server to stop..."/>
-         <waitfor maxwait="@{seconds}" maxwaitunit="second"
+	<macrodef name="wait-on-shutdown">
+		<attribute name="seconds" default="60"/>
+		<attribute name="conf"/>
+		<sequential>
+			<echo message="Waiting for '@{conf}' server to stop..."/>
+			<waitfor maxwait="@{seconds}" maxwaitunit="second"
             checkevery="5" checkeveryunit="second" timeoutproperty="shutdown.timeout">
-            <available file="server.log">
-               <filepath>
-                  <fileset dir="${ejb3.dist}/server/@{conf}/log/" includes="server.log">
-                     <!-- Removed first part so that cases when thread information is logged can be caught -->
-                     <contains text="Shutdown complete"/>
-                  </fileset>
-               </filepath>
-            </available>
-         </waitfor>
-         <fail message="Timeout waiting for '@{conf}' server to shutdown." if="shutdown.timeout"/>
-      </sequential>
-   </macrodef>
+				<available file="server.log">
+					<filepath>
+						<fileset dir="${ejb3.dist}/server/@{conf}/log/" includes="server.log">
+							<!-- Removed first part so that cases when thread information is logged can be caught -->
+							<contains text="Shutdown complete"/>
+						</fileset>
+					</filepath>
+				</available>
+			</waitfor>
+			<fail message="Timeout waiting for '@{conf}' server to shutdown." if="shutdown.timeout"/>
+		</sequential>
+	</macrodef>
 
-   <!-- =================== -->
-   <!-- Basic Configuration -->
-   <!-- =================== -->
+	<!-- =================== -->
+	<!-- Basic Configuration -->
+	<!-- =================== -->
 
-   <!-- Module name(s) & version -->
-   <property name="module.name" value="ejb3"/>
-   <property name="module.Name" value="JBoss Testsuite"/>
-   <property name="module.version" value="DEV"/>
+	<!-- Module name(s) & version -->
+	<property name="module.name" value="ejb3"/>
+	<property name="module.Name" value="JBoss Testsuite"/>
+	<property name="module.version" value="DEV"/>
 
 
-   <!-- ========= -->
-   <!-- Libraries -->
-   <!-- ========= -->
+	<!-- ========= -->
+	<!-- Libraries -->
+	<!-- ========= -->
 
-   <!-- The combined library classpath -->
-   <path id="library.classpath">
-      <path refid="glassfish.jaf.classpath"/>
-      <path refid="sun.servlet.classpath"/>
-      <path refid="javassist.classpath"/>
-      <path refid="qdox.classpath"/>
-      <path refid="hibernate3.classpath"/>
-      <path refid="ejb3-persistence.classpath"/>
-      <path refid="dom4j.dom4j.classpath"/>
-      <path refid="javassist.classpath"/>
-      <path refid="trove.classpath"/>
-      <path refid="xdoclet.xdoclet.classpath"/>
-      <path refid="apache.ant.classpath"/>
-      <path refid="oswego.concurrent.classpath"/>
-      <path refid="junit.junit.classpath"/>
-      <path refid="apache.log4j.classpath"/>
-      <path refid="apache.xerces.classpath"/>
-      <path refid="jboss.remoting.classpath"/>
-      <path refid="jgroups.jgroups.classpath"/>
-      <path refid="apache.httpclient.classpath"/>
-      <path refid="apache.logging.classpath"/>
-      <path refid="glassfish.javamail.classpath"/>
-      <path refid="jboss.serialization.classpath"/>
-      <path refid="jboss.jbossws.classpath"/>
-      <path refid="quartz.quartz.classpath"/>
-      <path refid="jboss.microcontainer.classpath"/>
-      <path refid="jboss.jbossxb.classpath"/>
-      <path refid="hsqldb.hsqldb.classpath"/>
+	<!-- The combined library classpath -->
+	<path id="library.classpath">
+		<path refid="glassfish.jaf.classpath"/>
+		<path refid="sun.servlet.classpath"/>
+		<path refid="javassist.classpath"/>
+		<path refid="qdox.classpath"/>
+		<path refid="hibernate3.classpath"/>
+		<path refid="ejb3-persistence.classpath"/>
+		<path refid="dom4j.dom4j.classpath"/>
+		<path refid="javassist.classpath"/>
+		<path refid="trove.classpath"/>
+		<path refid="xdoclet.xdoclet.classpath"/>
+		<path refid="apache.ant.classpath"/>
+		<path refid="oswego.concurrent.classpath"/>
+		<path refid="junit.junit.classpath"/>
+		<path refid="apache.log4j.classpath"/>
+		<path refid="apache.xerces.classpath"/>
+		<path refid="jboss.remoting.classpath"/>
+		<path refid="jgroups.jgroups.classpath"/>
+		<path refid="apache.httpclient.classpath"/>
+		<path refid="apache.logging.classpath"/>
+		<path refid="glassfish.javamail.classpath"/>
+		<path refid="jboss.serialization.classpath"/>
+		<path refid="jboss.jbossws.classpath"/>
+		<path refid="quartz.quartz.classpath"/>
+		<path refid="jboss.microcontainer.classpath"/>
+		<path refid="jboss.jbossxb.classpath"/>
+		<path refid="hsqldb.hsqldb.classpath"/>
 
-      <!-- For jbossws -->
-      <path refid="ibm.wsdl4j.classpath"/>
-   </path>
+		<!-- For jbossws -->
+		<path refid="ibm.wsdl4j.classpath"/>
+	</path>
 
-   <!-- ======= -->
-   <!-- Modules -->
-   <!-- ======= -->
+	<!-- ======= -->
+	<!-- Modules -->
+	<!-- ======= -->
 
-   <!-- ======= -->
-   <!-- Modules -->
-   <!-- ======= -->
-   <!-- InternalServer -->
-   <!-- This could be a mistake.  Perhaps, though, it would be a good idea to separate
+	<!-- ======= -->
+	<!-- Modules -->
+	<!-- ======= -->
+	<!-- InternalServer -->
+	<!-- This could be a mistake.  Perhaps, though, it would be a good idea to separate
    tests that need internal jboss classes from those that don't.  When I put it in, only
    the jca XATxConnectionManagerUnitTestCase needed an internal class (the tx manager)-->
-   <property name="jboss.internal-server.root" value="${project.root}/server/output"/>
-   <property name="jboss.internal-server.lib" value="${jboss.internal-server.root}/lib"/>
-   <path id="jboss.internal-server.classpath">
-      <pathelement path="${jboss.server.lib}/jboss.jar"/>
-      <pathelement path="${jboss.server.lib}/jboss-system.jar"/>
-   </path>
+	<property name="jboss.internal-server.root" value="${project.root}/server/output"/>
+	<property name="jboss.internal-server.lib" value="${jboss.internal-server.root}/lib"/>
+	<path id="jboss.internal-server.classpath">
+		<pathelement path="${jboss.server.lib}/jboss.jar"/>
+		<pathelement path="${jboss.server.lib}/jboss-system.jar"/>
+	</path>
 
-   <!-- The combined dependent module classpath -->
-   <path id="dependentmodule.classpath">
-      <path refid="jboss.j2ee.classpath"/>
-      <path refid="jboss.jmx.classpath"/>
-      <path refid="jboss.aop.classpath"/>
-      <path refid="jboss.aspects.classpath"/>
-      <path refid="jboss.ejb3x.classpath"/>
-      <path refid="jboss.common.classpath"/>
-      <path refid="jboss.cache.classpath"/>
-      <path refid="jboss.cluster.classpath"/>
-      <path refid="jboss.system.classpath"/>
-      <path refid="jboss.naming.classpath"/>
-      <path refid="jboss.transaction.classpath"/>
-      <path refid="jboss.security.classpath"/>
-      <!-- this is for the NonSerializableFactory -->
-      <path refid="jboss.server.classpath"/>
-      <path refid="jboss.messaging-mq.classpath"/>
-      <path refid="jboss.test.classpath"/>
-      <path refid="jboss.ejb3.classpath"/>
-      <!--path refid="jboss.webservices.classpath"/-->
-      <path refid="jboss.jca.classpath"/>
-   </path>
+	<!-- The combined dependent module classpath -->
+	<path id="dependentmodule.classpath">
+		<path refid="jboss.j2ee.classpath"/>
+		<path refid="jboss.jmx.classpath"/>
+		<path refid="jboss.aop.classpath"/>
+		<path refid="jboss.aspects.classpath"/>
+		<path refid="jboss.ejb3x.classpath"/>
+		<path refid="jboss.common.classpath"/>
+		<path refid="jboss.cache.classpath"/>
+		<path refid="jboss.cluster.classpath"/>
+		<path refid="jboss.system.classpath"/>
+		<path refid="jboss.naming.classpath"/>
+		<path refid="jboss.transaction.classpath"/>
+		<path refid="jboss.security.classpath"/>
+		<!-- this is for the NonSerializableFactory -->
+		<path refid="jboss.server.classpath"/>
+		<path refid="jboss.messaging-mq.classpath"/>
+		<path refid="jboss.test.classpath"/>
+		<path refid="jboss.ejb3.classpath"/>
+		<!--path refid="jboss.webservices.classpath"/-->
+		<path refid="jboss.jca.classpath"/>
+	</path>
 
-   <!-- RMI Stub generation -->
+	<!-- RMI Stub generation -->
 
-   <!-- ===== -->
-   <!-- Tasks -->
-   <!-- ===== -->
+	<!-- ===== -->
+	<!-- Tasks -->
+	<!-- ===== -->
 
-   <!-- Where source files live -->
-   <property name="source.java" value="${module.source}/test"/>
-   <property name="source.etc" value="${module.source}/etc"/>
-   <property name="resources" value="${module.source}/resources"/>
-   <property name="source.stylesheets" value="../testsuite/src/stylesheets"/>
+	<!-- Where source files live -->
+	<property name="source.java" value="${module.source}/test"/>
+	<property name="source.etc" value="${module.source}/etc"/>
+	<property name="resources" value="${module.source}/resources"/>
+	<property name="source.stylesheets" value="../testsuite/src/stylesheets"/>
 
-   <!-- Where build generated files will go -->
-   <property name="build.reports" value="${module.output}/reports"/>
-   <property name="build.testlog" value="${module.output}/log"/>
-   <property name="build.classes" value="${module.output}/test-classes"/>
-   <property name="build.lib" value="${module.output}/test-lib"/>
-   <property name="build.ejb3.lib" value="${module.output}/lib"/>
-   <property name="build.api" value="${module.output}/api"/>
-   <property name="build.etc" value="${module.output}/etc"/>
-   <property name="build.stylesheets" value="${module.output}/stylesheets"/>
-   <!-- build.resources is needed for the test-configs directory used by the create-config macro -->
-   <property name="build.resources" value="${module.source}/resources"/>
-   <property name="target.resources" value="${module.output}/resources"/>
+	<!-- Where build generated files will go -->
+	<property name="build.reports" value="${module.output}/reports"/>
+	<property name="build.testlog" value="${module.output}/log"/>
+	<property name="build.classes" value="${module.output}/test-classes"/>
+	<property name="build.lib" value="${module.output}/test-lib"/>
+	<property name="build.ejb3.lib" value="${module.output}/lib"/>
+	<property name="build.api" value="${module.output}/api"/>
+	<property name="build.etc" value="${module.output}/etc"/>
+	<property name="build.stylesheets" value="${module.output}/stylesheets"/>
+	<!-- build.resources is needed for the test-configs directory used by the create-config macro -->
+	<property name="build.resources" value="${module.source}/resources"/>
+	<property name="target.resources" value="${module.output}/resources"/>
 
-   <!-- Install/Release structure -->
-   <property name="install.id" value="${module.name}-${module.version}"/>
-   <property name="release.id" value="${install.id}"/>
-   <property name="install.root" value="${module.output}/${install.id}"/>
+	<!-- Install/Release structure -->
+	<property name="install.id" value="${module.name}-${module.version}"/>
+	<property name="release.id" value="${install.id}"/>
+	<property name="install.root" value="${module.output}/${install.id}"/>
 
-   <!-- The combined thirdparty classpath -->
-   <path id="thirdparty.classpath">
-      <path refid="library.classpath"/>
-      <path refid="dependentmodule.classpath"/>
-   </path>
+	<!-- The combined thirdparty classpath -->
+	<path id="thirdparty.classpath">
+		<path refid="library.classpath"/>
+		<path refid="dependentmodule.classpath"/>
+	</path>
 
-   <!-- This module is based on Java 1.2 -->
-   <property name="javac.target" value="1.2"/>
+	<!-- This module is based on Java 1.2 -->
+	<property name="javac.target" value="1.2"/>
 
-   <!-- classpath and local.classpath must have a value using with a path -->
-   <property name="classpath" value=""/>
-   <property name="local.classpath" value=""/>
+	<!-- classpath and local.classpath must have a value using with a path -->
+	<property name="classpath" value=""/>
+	<property name="local.classpath" value=""/>
 
-   <!-- The classpath required to build classes. -->
-   <path id="javac.classpath">
-      <pathelement path="${classpath}"/>
-      <!--pathelement path="${resources}/test/seam/jboss-seam.jar"/-->
-      <pathelement path="${local.classpath}"/>
-      <path refid="thirdparty.classpath"/>
-   </path>
+	<!-- The classpath required to build classes. -->
+	<path id="javac.classpath">
+		<pathelement path="${classpath}"/>
+		<!--pathelement path="${resources}/test/seam/jboss-seam.jar"/-->
+		<pathelement path="${local.classpath}"/>
+		<path refid="thirdparty.classpath"/>
+	</path>
 
-   <path id="client.classpath">
-      <path refid="apache.log4j.classpath"/>
-      <path refid="apache.logging.classpath"/>
-      <path refid="jboss.test.classpath"/>
-      <pathelement path="${ejb3.dist}/client/jbossall-client.jar"/>
-      <pathelement path="${ejb3.dist}/client/jboss-annotations-ejb3.jar"/>
-      <pathelement path="${ejb3.dist}/client/jboss-ejb3-client.jar"/>
-      <pathelement path="${ejb3.dist}/client/jboss-ejb3x.jar"/>
-      <pathelement path="${ejb3.dist}/client/hibernate-client.jar"/>
-      <pathelement path="${ejb3.dist}/client/jboss-aop-jdk50-client.jar"/>
-      <pathelement path="${ejb3.dist}/client/jboss-aspect-jdk50-client.jar"/>
-      <pathelement path="${ejb3.dist}/client/ejb3-persistence.jar"/>
-      <pathelement path="${ejb3.dist}/client/hibernate-annotations.jar"/>
-      <pathelement path="${ejb3.dist}/client/trove.jar"/>
-      <pathelement path="${ejb3.dist}/client/antlr.jar"/>
+	<path id="client.classpath">
+		<path refid="apache.log4j.classpath"/>
+		<path refid="apache.logging.classpath"/>
+		<path refid="jboss.test.classpath"/>
+		<pathelement path="${ejb3.dist}/client/jbossall-client.jar"/>
+		<pathelement path="${ejb3.dist}/client/jboss-annotations-ejb3.jar"/>
+		<pathelement path="${ejb3.dist}/client/jboss-ejb3-client.jar"/>
+		<pathelement path="${ejb3.dist}/client/jboss-ejb3x.jar"/>
+		<pathelement path="${ejb3.dist}/client/hibernate-client.jar"/>
+		<pathelement path="${ejb3.dist}/client/jboss-aop-jdk50-client.jar"/>
+		<pathelement path="${ejb3.dist}/client/jboss-aspect-jdk50-client.jar"/>
+		<pathelement path="${ejb3.dist}/client/ejb3-persistence.jar"/>
+		<pathelement path="${ejb3.dist}/client/hibernate-annotations.jar"/>
+		<pathelement path="${ejb3.dist}/client/trove.jar"/>
+		<pathelement path="${ejb3.dist}/client/antlr.jar"/>
 
-      <!-- For jbossws -->
-      <pathelement path="${ejb3.dist}/client/jaxb-api.jar"/>
-      <pathelement path="${ejb3.dist}/client/jaxb-impl.jar"/>
-      <pathelement path="${ejb3.dist}/client/wsdl4j.jar"/>
-      <pathelement path="${ejb3.dist}/client/jbossws-client.jar"/>
+		<!-- For jbossws -->
+		<pathelement path="${ejb3.dist}/client/jaxb-api.jar"/>
+		<pathelement path="${ejb3.dist}/client/jaxb-impl.jar"/>
+		<pathelement path="${ejb3.dist}/client/wsdl4j.jar"/>
+		<pathelement path="${ejb3.dist}/client/jbossws-client.jar"/>
 
-      <!-- JBAS-4365 -->
-      <path refid="apache.codec.classpath"/>
+		<!-- JBAS-4365 -->
+		<path refid="apache.codec.classpath"/>
 
-      <!-- FIXME: Tempory hack for JBM not being in jbossall-client.jar -->
-      <pathelement path="${ejb3.dist}/server/all/lib/jboss-messaging-client.jar"/>
+		<!-- FIXME: Tempory hack for JBM not being in jbossall-client.jar -->
+		<pathelement path="${ejb3.dist}/server/all/lib/jboss-messaging-client.jar"/>
 
-   </path>
+	</path>
 
-   <!-- The "security" test needs JaasSecurityManagerServiceMBean -->
-   <path id="security.client.classpath">
-      <path refid="client.classpath"/>
-      <path refid="jboss.security.classpath"/>
-      <path refid="jboss.jmx.classpath"/>
-   </path>
+	<!-- The "security" test needs JaasSecurityManagerServiceMBean -->
+	<path id="security.client.classpath">
+		<path refid="client.classpath"/>
+		<path refid="jboss.security.classpath"/>
+		<path refid="jboss.jmx.classpath"/>
+	</path>
 
-   <path id="dd.classpath">
-      <path refid="client.classpath"/>
-      <!-- This test accesses some ejb3 classes directly -->
-      <path refid="jboss.ejb3.classpath"/>
-   </path>
+	<path id="dd.classpath">
+		<path refid="client.classpath"/>
+		<!-- This test accesses some ejb3 classes directly -->
+		<path refid="jboss.ejb3.classpath"/>
+	</path>
 
-   <path id="dd.web.client.classpath">
-      <path refid="client.classpath"/>
-      <path refid="apache.httpclient.classpath"/>
-   </path>
+	<path id="dd.web.client.classpath">
+		<path refid="client.classpath"/>
+		<path refid="apache.httpclient.classpath"/>
+	</path>
 
-   <path id="iiop.client.classpath">
-      <pathelement path="${resources}/test/iiop"/>
-      <path refid="client.classpath"/>
-   </path>
+	<path id="iiop.client.classpath">
+		<pathelement path="${resources}/test/iiop"/>
+		<path refid="client.classpath"/>
+	</path>
 
-   <!-- The classpath required to build javadocs. -->
-   <path id="javadoc.classpath">
-      <path refid="javac.classpath"/>
-   </path>
+	<!-- The classpath required to build javadocs. -->
+	<path id="javadoc.classpath">
+		<path refid="javac.classpath"/>
+	</path>
 
-   <!-- Packages to include when generating api documentation -->
-   <property name="javadoc.packages" value="javax.*"/>
+	<!-- Packages to include when generating api documentation -->
+	<property name="javadoc.packages" value="javax.*"/>
 
-   <!-- Override JUnit defaults -->
-   <property name="jbosstest.iterationcount" value="10"/>
-   <property name="jbosstest.threadcount" value="5"/>
-   <property name="jbosstest.beancount" value="5"/>
-   <property name="jbosstest.nodeploy" value="false"/>
+	<!-- Override JUnit defaults -->
+	<property name="jbosstest.iterationcount" value="10"/>
+	<property name="jbosstest.threadcount" value="5"/>
+	<property name="jbosstest.beancount" value="5"/>
+	<property name="jbosstest.nodeploy" value="false"/>
 
-   <import file="imports/build-mq2jbm.xml"/>
-   <import file="imports/build-simple.xml"/>
+	<import file="imports/build-mq2jbm.xml"/>
+	<import file="imports/build-simple.xml"/>
 
-   <target name="init">
-      <record name="${basedir}/build.log" append="yes" action="start" loglevel="error"/>
-      <!-- Setup the version 1 classes so the tests compile -->
-   </target>
+	<target name="init">
+		<record name="${basedir}/build.log" append="yes" action="start" loglevel="error"/>
+		<!-- Setup the version 1 classes so the tests compile -->
+	</target>
 
-   <!-- ================================================================== -->
-   <!-- Compile                                                            -->
-   <!-- ================================================================== -->
+	<!-- ================================================================== -->
+	<!-- Compile                                                            -->
+	<!-- ================================================================== -->
 
-   <!--
+	<!--
       | Compile everything.
       |
       | This target should depend on other compile-* targets for each
@@ -381,10 +404,10 @@
       | documentation compiles.
     -->
 
-   <!-- Compile all class files -->
-   <target name="compile-classes" depends="copy-resources,init">
-      <mkdir dir="${build.classes}"/>
-      <javac destdir="${build.classes}"
+	<!-- Compile all class files -->
+	<target name="compile-classes" depends="copy-resources,init">
+		<mkdir dir="${build.classes}"/>
+		<javac destdir="${build.classes}"
          optimize="${javac.optimize}"
          debug="${javac.debug}"
          source="1.5"
@@ -395,11 +418,11 @@
          includeAntRuntime="${javac.include.ant.runtime}"
          includeJavaRuntime="${javac.include.java.runtime}"
          failonerror="${javac.fail.onerror}">
-         <src path="${project.root}/testsuite/src/main"/>
-         <classpath refid="javac.classpath"/>
-         <include name="org/jboss/test/*.java"/>
-      </javac>
-      <javac destdir="${build.classes}"
+			<src path="${project.root}/testsuite/src/main"/>
+			<classpath refid="javac.classpath"/>
+			<include name="org/jboss/test/*.java"/>
+		</javac>
+		<javac destdir="${build.classes}"
          optimize="${javac.optimize}"
          debug="${javac.debug}"
          source="1.5"
@@ -410,28 +433,28 @@
          includeAntRuntime="${javac.include.ant.runtime}"
          includeJavaRuntime="${javac.include.java.runtime}"
          failonerror="${javac.fail.onerror}">
-         <src path="${source.java}"/>
-         <classpath refid="javac.classpath"/>
-         <exclude name="org/jboss/ejb3/test/**/*EmbeddedTest.java"/>
-         <exclude name="org/jboss/ejb3/test/appclient/**"/>
-         <exclude name="org/jboss/ejb3/test/jaxws/**"/>
-         <exclude name="org/jboss/ejb3/test/webservices/**"/>
-         <exclude name="org/jboss/ejb3/test/standalone/**"/>
-         <exclude name="org/jboss/ejb3/test/invoker/**"/>
-      </javac>
-	
-	  <!-- special treatment for org.jboss.ejb3.test.invoker.unit.InvokerTestCase -->
-	  <!-- classes need an EJB3 annotation URL to be adjusted (JBPAPP-2997) -->
-	  <mkdir dir="${module.output}/tmpdir"/>
-	  <copy todir="${module.output}/tmpdir">
-        <fileset dir="${source.java}">
-          <include name="org/jboss/ejb3/test/invoker/**/*.java"/>
-        </fileset>
-        <filterset>
-          <filter token="JBOSS_BIND_URL_ADDRESS" value="${node0.url}"/>
-        </filterset>
-      </copy>
-      <javac destdir="${build.classes}"
+			<src path="${source.java}"/>
+			<classpath refid="javac.classpath"/>
+			<exclude name="org/jboss/ejb3/test/**/*EmbeddedTest.java"/>
+			<exclude name="org/jboss/ejb3/test/appclient/**"/>
+			<exclude name="org/jboss/ejb3/test/jaxws/**"/>
+			<exclude name="org/jboss/ejb3/test/webservices/**"/>
+			<exclude name="org/jboss/ejb3/test/standalone/**"/>
+			<exclude name="org/jboss/ejb3/test/invoker/**"/>
+		</javac>
+
+		<!-- special treatment for org.jboss.ejb3.test.invoker.unit.InvokerTestCase -->
+		<!-- classes need an EJB3 annotation URL to be adjusted (JBPAPP-2997) -->
+		<mkdir dir="${module.output}/tmpdir"/>
+		<copy todir="${module.output}/tmpdir">
+			<fileset dir="${source.java}">
+				<include name="org/jboss/ejb3/test/invoker/**/*.java"/>
+			</fileset>
+			<filterset>
+				<filter token="JBOSS_BIND_URL_ADDRESS" value="${node0.url}"/>
+			</filterset>
+		</copy>
+		<javac destdir="${build.classes}"
          optimize="${javac.optimize}"
          debug="${javac.debug}"
          source="1.5"
@@ -442,961 +465,961 @@
          includeAntRuntime="${javac.include.ant.runtime}"
          includeJavaRuntime="${javac.include.java.runtime}"
          failonerror="${javac.fail.onerror}">
-         <src path="${module.output}/tmpdir"/>
-         <classpath refid="javac.classpath"/>
-      </javac>
-	  <delete dir="${module.output}/tmpdir"/>
+			<src path="${module.output}/tmpdir"/>
+			<classpath refid="javac.classpath"/>
+		</javac>
+		<delete dir="${module.output}/tmpdir"/>
 
-   </target>
+	</target>
 
-   <target name="compile-stylesheets">
-      <mkdir dir="${build.stylesheets}"/>
-      <copy todir="${build.stylesheets}" filtering="yes">
-         <fileset dir="${source.stylesheets}">
-            <include name="**/*"/>
-         </fileset>
-      </copy>
-   </target>
+	<target name="compile-stylesheets">
+		<mkdir dir="${build.stylesheets}"/>
+		<copy todir="${build.stylesheets}" filtering="yes">
+			<fileset dir="${source.stylesheets}">
+				<include name="**/*"/>
+			</fileset>
+		</copy>
+	</target>
 
-   <!--
+	<!--
       Make sure the schemas are on the classpath during unit testing.
    -->
-   <target name="copy-resources" depends="init">
-      <mkdir dir="${build.classes}"/>
-      <copy todir="${build.classes}/schema">
-         <fileset dir="${resources}/schema"/>
-      </copy>
-   </target>
+	<target name="copy-resources" depends="init">
+		<mkdir dir="${build.classes}"/>
+		<copy todir="${build.classes}/schema">
+			<fileset dir="${resources}/schema"/>
+		</copy>
+	</target>
 
-   <!-- ================================================================== -->
-   <!-- Archives                                                           -->
-   <!-- ================================================================== -->
+	<!-- ================================================================== -->
+	<!-- Archives                                                           -->
+	<!-- ================================================================== -->
 
-   <target name="initial"
+	<target name="initial"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/initial-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/initial/Test.class"/>
-            <include name="org/jboss/ejb3/test/initial/TestLocal.class"/>
-            <include name="org/jboss/ejb3/test/initial/TestRemote.class"/>
-            <include name="org/jboss/ejb3/test/initial/TestBean.class"/>
-            <include name="org/jboss/ejb3/test/initial/StatefulTest.class"/>
-            <include name="org/jboss/ejb3/test/initial/StatefulTestBean.class"/>
-            <include name="org/jboss/ejb3/test/initial/StatefulTestLocal.class"/>
-            <include name="org/jboss/ejb3/test/initial/StatefulTestRemote.class"/>
-            <include name="org/jboss/ejb3/test/initial/SecuredTest.class"/>
-            <include name="org/jboss/ejb3/test/initial/SecuredTestRemote.class"/>
-            <include name="org/jboss/ejb3/test/initial/SecuredTestLocal.class"/>
-            <include name="org/jboss/ejb3/test/initial/SecuredTestBean.class"/>
+		<jar jarfile="${build.lib}/initial-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/initial/Test.class"/>
+				<include name="org/jboss/ejb3/test/initial/TestLocal.class"/>
+				<include name="org/jboss/ejb3/test/initial/TestRemote.class"/>
+				<include name="org/jboss/ejb3/test/initial/TestBean.class"/>
+				<include name="org/jboss/ejb3/test/initial/StatefulTest.class"/>
+				<include name="org/jboss/ejb3/test/initial/StatefulTestBean.class"/>
+				<include name="org/jboss/ejb3/test/initial/StatefulTestLocal.class"/>
+				<include name="org/jboss/ejb3/test/initial/StatefulTestRemote.class"/>
+				<include name="org/jboss/ejb3/test/initial/SecuredTest.class"/>
+				<include name="org/jboss/ejb3/test/initial/SecuredTestRemote.class"/>
+				<include name="org/jboss/ejb3/test/initial/SecuredTestLocal.class"/>
+				<include name="org/jboss/ejb3/test/initial/SecuredTestBean.class"/>
 
-            <include name="org/jboss/ejb3/test/initial/FirstInterceptor.class"/>
-            <include name="org/jboss/ejb3/test/initial/InterceptedSFTest.class"/>
-            <include name="org/jboss/ejb3/test/initial/InterceptedSFTestBean.class"/>
-            <include name="org/jboss/ejb3/test/initial/InterceptedSLTest.class"/>
-            <include name="org/jboss/ejb3/test/initial/InterceptedSLTestBean.class"/>
-            <include name="org/jboss/ejb3/test/initial/SecondInterceptor.class"/>
-            <include name="org/jboss/ejb3/test/initial/TestStatus.class"/>
-            <include name="org/jboss/ejb3/test/initial/TestStatusBean.class"/>
-            <include name="org/jboss/ejb3/test/initial/ExternalCallbackListener.class"/>
-            <include name="org/jboss/ejb3/test/initial/ClassInjected.class"/>
-            <include name="org/jboss/ejb3/test/initial/ClassInjectedBean.class"/>
-         </fileset>
-         <fileset dir="${resources}/test">
-            <include name="users.properties"/>
-            <include name="roles.properties"/>
-         </fileset>
-      </jar>
+				<include name="org/jboss/ejb3/test/initial/FirstInterceptor.class"/>
+				<include name="org/jboss/ejb3/test/initial/InterceptedSFTest.class"/>
+				<include name="org/jboss/ejb3/test/initial/InterceptedSFTestBean.class"/>
+				<include name="org/jboss/ejb3/test/initial/InterceptedSLTest.class"/>
+				<include name="org/jboss/ejb3/test/initial/InterceptedSLTestBean.class"/>
+				<include name="org/jboss/ejb3/test/initial/SecondInterceptor.class"/>
+				<include name="org/jboss/ejb3/test/initial/TestStatus.class"/>
+				<include name="org/jboss/ejb3/test/initial/TestStatusBean.class"/>
+				<include name="org/jboss/ejb3/test/initial/ExternalCallbackListener.class"/>
+				<include name="org/jboss/ejb3/test/initial/ClassInjected.class"/>
+				<include name="org/jboss/ejb3/test/initial/ClassInjectedBean.class"/>
+			</fileset>
+			<fileset dir="${resources}/test">
+				<include name="users.properties"/>
+				<include name="roles.properties"/>
+			</fileset>
+		</jar>
 
 
-      <jar jarfile="${build.lib}/initial-ejb3-test.sar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/initial/Tester*.class"/>
-            <include name="org/jboss/ejb3/test/initial/TxTester*.class"/>
-            <include name="org/jboss/ejb3/test/initial/SecurityTester*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test">
-            <include name="META-INF/jboss-service.xml"/>
-         </fileset>
-         <fileset dir="${build.lib}">
-            <include name="initial-test.jar"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/initial-ejb3-test.sar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/initial/Tester*.class"/>
+				<include name="org/jboss/ejb3/test/initial/TxTester*.class"/>
+				<include name="org/jboss/ejb3/test/initial/SecurityTester*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test">
+				<include name="META-INF/jboss-service.xml"/>
+			</fileset>
+			<fileset dir="${build.lib}">
+				<include name="initial-test.jar"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="jca/inflowmdb"
+	<target name="jca/inflowmdb"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/quartzmdb.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/jca/inflowmdb/Quartz*.class"/>
-            <include name="org/jboss/ejb3/test/jca/inflowmdb/unit/*.class"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/quartzmdb.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/jca/inflowmdb/Quartz*.class"/>
+				<include name="org/jboss/ejb3/test/jca/inflowmdb/unit/*.class"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/jcainflowmdb.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/jca/inflowmdb/Test*.class"/>
-            <include name="org/jboss/ejb3/test/jca/inflowmdb/unit/*.class"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/jcainflowmdb.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/jca/inflowmdb/Test*.class"/>
+				<include name="org/jboss/ejb3/test/jca/inflowmdb/unit/*.class"/>
+			</fileset>
+		</jar>
 
-      <build-jms-dd name="jca/inflow" descriptor="jmsmdbtest-service.xml"/>
+		<build-jms-dd name="jca/inflow" descriptor="jmsmdbtest-service.xml"/>
 
-      <jar jarfile="${build.lib}/jmsinflowmdb.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/jca/inflowmdb/JMS*.class"/>
-            <include name="org/jboss/ejb3/test/jca/inflowmdb/Stateless*.class"/>
-            <include name="org/jboss/ejb3/test/jca/inflowmdb/unit/*.class"/>
-         </fileset>
-         <fileset dir="${target.resources}/test/jca/inflow">
-            <include name="jmsmdbtest-service.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/jmsinflowmdb.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/jca/inflowmdb/JMS*.class"/>
+				<include name="org/jboss/ejb3/test/jca/inflowmdb/Stateless*.class"/>
+				<include name="org/jboss/ejb3/test/jca/inflowmdb/unit/*.class"/>
+			</fileset>
+			<fileset dir="${target.resources}/test/jca/inflow">
+				<include name="jmsmdbtest-service.xml"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/jcainflowmdb_dd.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/jca/inflowmdb/DeploymentDescriptorTest*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/jca/inflow">
-            <include name="META-INF/ejb-jar.xml"/>
-            <include name="META-INF/jboss.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/jcainflowmdb_dd.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/jca/inflowmdb/DeploymentDescriptorTest*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/jca/inflow">
+				<include name="META-INF/ejb-jar.xml"/>
+				<include name="META-INF/jboss.xml"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/jcainflow.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/jca/inflow/*.class"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/jcainflow.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/jca/inflow/*.class"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/jcainflow.rar">
-         <fileset dir="${build.lib}">
-            <include name="jcainflow.jar"/>
-         </fileset>
-         <fileset dir="${resources}/test/jca/inflow">
-            <include name="META-INF/ra.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/jcainflow.rar">
+			<fileset dir="${build.lib}">
+				<include name="jcainflow.jar"/>
+			</fileset>
+			<fileset dir="${resources}/test/jca/inflow">
+				<include name="META-INF/ra.xml"/>
+			</fileset>
+		</jar>
 
-      <copy todir="${build.lib}">
-         <fileset dir="${resources}/test/jca/inflow">
-            <include name="*.xml"/>
-         </fileset>
-      </copy>
+		<copy todir="${build.lib}">
+			<fileset dir="${resources}/test/jca/inflow">
+				<include name="*.xml"/>
+			</fileset>
+		</copy>
 
-   </target>
+	</target>
 
-   <target name="cache"
+	<target name="cache"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/cache-test.sar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/cache/Tester*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/cache">
-            <include name="META-INF/jboss-service.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/cache-test.sar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/cache/Tester*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/cache">
+				<include name="META-INF/jboss-service.xml"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/cache-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/cache/**/*.class"/>
-            <exclude name="org/jboss/ejb3/test/cache/unit/*"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/cache-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/cache/**/*.class"/>
+				<exclude name="org/jboss/ejb3/test/cache/unit/*"/>
+			</fileset>
+		</jar>
 
-      <copy todir="${build.lib}">
-         <fileset dir="${resources}/test/cache">
-            <include name="*.xml"/>
-         </fileset>
-      </copy>
+		<copy todir="${build.lib}">
+			<fileset dir="${resources}/test/cache">
+				<include name="*.xml"/>
+			</fileset>
+		</copy>
 
 
-   </target>
+	</target>
 
-   <target name="factory"
+	<target name="factory"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/session1.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/factory/*1*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/factory/session1">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/session1.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/factory/*1*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/factory/session1">
+				<include name="META-INF/persistence.xml"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/session2.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/factory/*2*.class"/>
-            <include name="org/jboss/ejb3/test/factory/MyService*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/factory/session2">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/session2.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/factory/*2*.class"/>
+				<include name="org/jboss/ejb3/test/factory/MyService*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/factory/session2">
+				<include name="META-INF/persistence.xml"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/util.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/factory/Util.class"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/util.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/factory/Util.class"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/factory-test.ear">
-         <fileset dir="${build.lib}">
-            <include name="session1.jar"/>
-            <include name="session2.jar"/>
-            <include name="util.jar"/>
-         </fileset>
-         <fileset dir="${resources}/test/factory">
-            <include name="META-INF/application.xml"/>
-            <include name="META-INF/jboss-app.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/factory-test.ear">
+			<fileset dir="${build.lib}">
+				<include name="session1.jar"/>
+				<include name="session2.jar"/>
+				<include name="util.jar"/>
+			</fileset>
+			<fileset dir="${resources}/test/factory">
+				<include name="META-INF/application.xml"/>
+				<include name="META-INF/jboss-app.xml"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/session1xml.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/factoryxml/*1*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/factoryxml/session1">
-            <include name="META-INF/persistence.xml"/>
-            <include name="META-INF/ejb-jar.xml"/>
-            <include name="META-INF/jboss.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/session1xml.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/factoryxml/*1*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/factoryxml/session1">
+				<include name="META-INF/persistence.xml"/>
+				<include name="META-INF/ejb-jar.xml"/>
+				<include name="META-INF/jboss.xml"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/session2xml.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/factoryxml/*2*.class"/>
-            <include name="org/jboss/ejb3/test/factoryxml/MyService*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/factoryxml/session2">
-            <include name="META-INF/persistence.xml"/>
-            <include name="META-INF/ejb-jar.xml"/>
-            <include name="META-INF/jboss.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/session2xml.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/factoryxml/*2*.class"/>
+				<include name="org/jboss/ejb3/test/factoryxml/MyService*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/factoryxml/session2">
+				<include name="META-INF/persistence.xml"/>
+				<include name="META-INF/ejb-jar.xml"/>
+				<include name="META-INF/jboss.xml"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/utilxml.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/factoryxml/Util.class"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/utilxml.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/factoryxml/Util.class"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/factoryxml-test.ear">
-         <fileset dir="${build.lib}">
-            <include name="session1xml.jar"/>
-            <include name="session2xml.jar"/>
-            <include name="utilxml.jar"/>
-         </fileset>
-         <fileset dir="${resources}/test/factoryxml">
-            <include name="META-INF/application.xml"/>
-            <include name="META-INF/jboss-app.xml"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/factoryxml-test.ear">
+			<fileset dir="${build.lib}">
+				<include name="session1xml.jar"/>
+				<include name="session2xml.jar"/>
+				<include name="utilxml.jar"/>
+			</fileset>
+			<fileset dir="${resources}/test/factoryxml">
+				<include name="META-INF/application.xml"/>
+				<include name="META-INF/jboss-app.xml"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="ear"
+	<target name="ear"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/ear-session.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/ear/Facade*.class"/>
-            <include name="org/jboss/ejb3/test/ear/Queue*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/ear/ejbref">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/ear-session.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/ear/Facade*.class"/>
+				<include name="org/jboss/ejb3/test/ear/Queue*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/ear/ejbref">
+				<include name="META-INF/persistence.xml"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/earpu.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/ear/LibEntity.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/ear/earlib">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/earpu.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/ear/LibEntity.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/ear/earlib">
+				<include name="META-INF/persistence.xml"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/ref.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/ear/ReferencedEntity.class"/>
-         </fileset>
-      </jar>
-      <ear earfile="${build.lib}/ear-test.ear" appxml="${resources}/test/ear/application.xml">
-         <zipfileset dir="${build.lib}">
-            <include name="ear-session.jar"/>
-         </zipfileset>
-         <zipfileset dir="${build.lib}" prefix="lib">
-            <include name="ref.jar"/>
-            <include name="earpu.jar"/>
-         </zipfileset>
-      </ear>
+		<jar jarfile="${build.lib}/ref.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/ear/ReferencedEntity.class"/>
+			</fileset>
+		</jar>
+		<ear earfile="${build.lib}/ear-test.ear" appxml="${resources}/test/ear/application.xml">
+			<zipfileset dir="${build.lib}">
+				<include name="ear-session.jar"/>
+			</zipfileset>
+			<zipfileset dir="${build.lib}" prefix="lib">
+				<include name="ref.jar"/>
+				<include name="earpu.jar"/>
+			</zipfileset>
+		</ear>
 
-      <mq2jbm basedir="${resources}/test/ear"/>
+		<mq2jbm basedir="${resources}/test/ear"/>
 
-      <copy todir="${build.lib}">
-         <fileset dir="${resources}/test/ear">
-            <include name="*-service.xml"/>
-         </fileset>
-      </copy>
+		<copy todir="${build.lib}">
+			<fileset dir="${resources}/test/ear">
+				<include name="*-service.xml"/>
+			</fileset>
+		</copy>
 
-   </target>
+	</target>
 
-   <target name="dependency"
+	<target name="dependency"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/ejbjar.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/dependency/Has*.class"/>
-            <include name="org/jboss/ejb3/test/dependency/No*.class"/>
-            <include name="org/jboss/ejb3/test/dependency/Customer.class"/>
-            <include name="org/jboss/ejb3/test/dependency/Stateless*.class"/>
-            <include name="org/jboss/ejb3/test/dependency/AnotherDependedOnMBean.class"/>
-            <exclude name="org/jboss/ejb3/test/dependency/*2*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/dependency">
-            <include name="META-INF/persistence.xml"/>
-            <include name="META-INF/jboss.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/ejbjar.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/dependency/Has*.class"/>
+				<include name="org/jboss/ejb3/test/dependency/No*.class"/>
+				<include name="org/jboss/ejb3/test/dependency/Customer.class"/>
+				<include name="org/jboss/ejb3/test/dependency/Stateless*.class"/>
+				<include name="org/jboss/ejb3/test/dependency/AnotherDependedOnMBean.class"/>
+				<exclude name="org/jboss/ejb3/test/dependency/*2*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/dependency">
+				<include name="META-INF/persistence.xml"/>
+				<include name="META-INF/jboss.xml"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/A.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/dependency/ABean.class"/>
-            <include name="org/jboss/ejb3/test/dependency/A.class"/>
-            <include name="org/jboss/ejb3/test/dependency/B.class"/>
-            <!--exclude name="org/jboss/ejb3/test/dependency/Another*.class"/-->
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/A.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/dependency/ABean.class"/>
+				<include name="org/jboss/ejb3/test/dependency/A.class"/>
+				<include name="org/jboss/ejb3/test/dependency/B.class"/>
+				<!--exclude name="org/jboss/ejb3/test/dependency/Another*.class"/-->
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/B.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/dependency/BBean.class"/>
-            <include name="org/jboss/ejb3/test/dependency/B.class"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/B.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/dependency/BBean.class"/>
+				<include name="org/jboss/ejb3/test/dependency/B.class"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/ejbdepends.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/dependency/*2*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/dependency/session2">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/ejbdepends.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/dependency/*2*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/dependency/session2">
+				<include name="META-INF/persistence.xml"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/dependedon.sar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/dependency/Depended*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/dependency/dependedon">
-            <include name="META-INF/jboss-service.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/dependedon.sar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/dependency/Depended*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/dependency/dependedon">
+				<include name="META-INF/jboss-service.xml"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/anotherdependedon.sar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/dependency/Another*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/dependency/another">
-            <include name="META-INF/jboss-service.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/anotherdependedon.sar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/dependency/Another*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/dependency/another">
+				<include name="META-INF/jboss-service.xml"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/yetanother.sar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/dependency/Another*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/dependency/session2">
-            <include name="META-INF/jboss-service.xml"/>
-         </fileset>
-      </jar>
-      <jar jarfile="${build.lib}/dependency-test.ear">
-         <fileset dir="${build.lib}">
-            <include name="ejbjar.jar"/>
-         </fileset>
-         <fileset dir="${resources}/test/dependency">
-            <include name="mydatasource-ds.xml"/>
-            <include name="META-INF/application.xml"/>
-            <include name="META-INF/jboss-app.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/yetanother.sar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/dependency/Another*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/dependency/session2">
+				<include name="META-INF/jboss-service.xml"/>
+			</fileset>
+		</jar>
+		<jar jarfile="${build.lib}/dependency-test.ear">
+			<fileset dir="${build.lib}">
+				<include name="ejbjar.jar"/>
+			</fileset>
+			<fileset dir="${resources}/test/dependency">
+				<include name="mydatasource-ds.xml"/>
+				<include name="META-INF/application.xml"/>
+				<include name="META-INF/jboss-app.xml"/>
+			</fileset>
+		</jar>
 
 
 
-   </target>
+	</target>
 
-   <target name="benchmark"
+	<target name="benchmark"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/benchmark.ejb3">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/microbench/StatelessBean.class"/>
-            <include name="org/jboss/ejb3/test/microbench/StatelessRemote.class"/>
-            <include name="org/jboss/ejb3/test/microbench/StatelessLocal.class"/>
-            <include name="org/jboss/ejb3/test/microbench/StatelessTest.class"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/benchmark.ejb3">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/microbench/StatelessBean.class"/>
+				<include name="org/jboss/ejb3/test/microbench/StatelessRemote.class"/>
+				<include name="org/jboss/ejb3/test/microbench/StatelessLocal.class"/>
+				<include name="org/jboss/ejb3/test/microbench/StatelessTest.class"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/benchmark.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/microbench/StatelessBean21.class"/>
-            <include name="org/jboss/ejb3/test/microbench/StatelessRemote21.class"/>
-            <include name="org/jboss/ejb3/test/microbench/StatelessLocal21.class"/>
-            <include name="org/jboss/ejb3/test/microbench/StatelessHomeRemote.class"/>
-            <include name="org/jboss/ejb3/test/microbench/StatelessHomeLocal.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/microbench">
-            <include name="META-INF/ejb-jar.xml"/>
-            <include name="META-INF/jboss.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/benchmark.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/microbench/StatelessBean21.class"/>
+				<include name="org/jboss/ejb3/test/microbench/StatelessRemote21.class"/>
+				<include name="org/jboss/ejb3/test/microbench/StatelessLocal21.class"/>
+				<include name="org/jboss/ejb3/test/microbench/StatelessHomeRemote.class"/>
+				<include name="org/jboss/ejb3/test/microbench/StatelessHomeLocal.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/microbench">
+				<include name="META-INF/ejb-jar.xml"/>
+				<include name="META-INF/jboss.xml"/>
+			</fileset>
+		</jar>
 
 
-      <jar jarfile="${build.lib}/benchmark-ejb3-test.sar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/microbench/Bench*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/microbench">
-            <include name="META-INF/jboss-service.xml"/>
-         </fileset>
-         <fileset dir="${build.lib}">
-            <include name="benchmark.ejb3"/>
-            <include name="benchmark.jar"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/benchmark-ejb3-test.sar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/microbench/Bench*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/microbench">
+				<include name="META-INF/jboss-service.xml"/>
+			</fileset>
+			<fileset dir="${build.lib}">
+				<include name="benchmark.ejb3"/>
+				<include name="benchmark.jar"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="asynchronous"
+	<target name="asynchronous"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/asynchronous-test.sar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/asynchronous/Tester*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/asynchronous">
-            <include name="META-INF/jboss-service.xml"/>
-         </fileset>
-      </jar>
-      <jar jarfile="${build.lib}/asynchronous-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/asynchronous/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test">
-            <include name="users.properties"/>
-            <include name="roles.properties"/>
-         </fileset>
-         <fileset dir="${resources}/test/asynchronous">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/asynchronous-test.sar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/asynchronous/Tester*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/asynchronous">
+				<include name="META-INF/jboss-service.xml"/>
+			</fileset>
+		</jar>
+		<jar jarfile="${build.lib}/asynchronous-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/asynchronous/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test">
+				<include name="users.properties"/>
+				<include name="roles.properties"/>
+			</fileset>
+			<fileset dir="${resources}/test/asynchronous">
+				<include name="META-INF/persistence.xml"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="localcall"
+	<target name="localcall"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/localcall-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/localcall/*.class"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/localcall-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/localcall/*.class"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="webservices"
+	<target name="webservices"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/webservices-ejb3.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/webservices/*.class"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/webservices-ejb3.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/webservices/*.class"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/jsr181.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/webservices/jsr181/EJB3*.class"/>
-            <include name="org/jboss/ejb3/test/webservices/jsr181/Stateless*.class"/>
-            <include name="org/jboss/ejb3/test/webservices/jsr181/Injected*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/webservices">
-            <include name="META-INF/ejb-jar.xml"/>
-            <!-- TODO: Wolf: This is plain silly. I have to include the wsdl the container is about to generate to get injection to work. -->
-            <!--include name="META-INF/wsdl/*.wsdl"/-->
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/jsr181.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/webservices/jsr181/EJB3*.class"/>
+				<include name="org/jboss/ejb3/test/webservices/jsr181/Stateless*.class"/>
+				<include name="org/jboss/ejb3/test/webservices/jsr181/Injected*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/webservices">
+				<include name="META-INF/ejb-jar.xml"/>
+				<!-- TODO: Wolf: This is plain silly. I have to include the wsdl the container is about to generate to get injection to work. -->
+				<!--include name="META-INF/wsdl/*.wsdl"/-->
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/jsr181-client.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/webservices/jsr181/EndpointInterface.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/webservices">
-            <include name="META-INF/application-client.xml"/>
-            <include name="META-INF/jaxrpc-mapping.xml"/>
-            <include name="META-INF/jboss-client.xml"/>
-            <include name="META-INF/wsdl/*.wsdl"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/jsr181-client.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/webservices/jsr181/EndpointInterface.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/webservices">
+				<include name="META-INF/application-client.xml"/>
+				<include name="META-INF/jaxrpc-mapping.xml"/>
+				<include name="META-INF/jboss-client.xml"/>
+				<include name="META-INF/wsdl/*.wsdl"/>
+			</fileset>
+		</jar>
 
-      <ear earfile="${build.lib}/jsr181.ear" appxml="${resources}/test/webservices/application.xml">
-         <zipfileset dir="${build.lib}">
-            <include name="jsr181.jar"/>
-            <include name="jsr181-client.jar"/>
-         </zipfileset>
-      </ear>
-   </target>
+		<ear earfile="${build.lib}/jsr181.ear" appxml="${resources}/test/webservices/application.xml">
+			<zipfileset dir="${build.lib}">
+				<include name="jsr181.jar"/>
+				<include name="jsr181-client.jar"/>
+			</zipfileset>
+		</ear>
+	</target>
 
-   <target name="interceptors"
+	<target name="interceptors"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/interceptors-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/interceptors/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/interceptors">
-            <include name="META-INF/ejb-jar.xml"/>
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/interceptors-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/interceptors/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/interceptors">
+				<include name="META-INF/ejb-jar.xml"/>
+				<include name="META-INF/persistence.xml"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="interceptors2"
+	<target name="interceptors2"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/interceptors2-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/interceptors2/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/interceptors2">
-            <include name="META-INF/ejb-jar.xml"/>
-            <include name="META-INF/jboss.xml"/>
-         </fileset>
-      </jar>
-      <copy todir="${build.lib}">
-         <fileset dir="${resources}/test/interceptors2">
-            <include name="*.xml"/>
-         </fileset>
-      </copy>
+		<jar jarfile="${build.lib}/interceptors2-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/interceptors2/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/interceptors2">
+				<include name="META-INF/ejb-jar.xml"/>
+				<include name="META-INF/jboss.xml"/>
+			</fileset>
+		</jar>
+		<copy todir="${build.lib}">
+			<fileset dir="${resources}/test/interceptors2">
+				<include name="*.xml"/>
+			</fileset>
+		</copy>
 
-      <mq2jbm basedir="${resources}/test/interceptors2"/>
-   </target>
+		<mq2jbm basedir="${resources}/test/interceptors2"/>
+	</target>
 
-   <target name="interceptors3"
+	<target name="interceptors3"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/interceptors3-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/interceptors3/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/interceptors3">
-            <include name="META-INF/ejb-jar.xml"/>
-            <include name="META-INF/jboss.xml"/>
-         </fileset>
-      </jar>
-      <copy todir="${build.lib}">
-         <fileset dir="${resources}/test/interceptors3">
-            <include name="*.xml"/>
-         </fileset>
-      </copy>
+		<jar jarfile="${build.lib}/interceptors3-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/interceptors3/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/interceptors3">
+				<include name="META-INF/ejb-jar.xml"/>
+				<include name="META-INF/jboss.xml"/>
+			</fileset>
+		</jar>
+		<copy todir="${build.lib}">
+			<fileset dir="${resources}/test/interceptors3">
+				<include name="*.xml"/>
+			</fileset>
+		</copy>
 
-   </target>
+	</target>
 
-   <target name="clientinterceptor"
+	<target name="clientinterceptor"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/clientinterceptor-test.ejb3">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/clientinterceptor/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/clientinterceptor">
-            <include name="*.xml"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/clientinterceptor-test.ejb3">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/clientinterceptor/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/clientinterceptor">
+				<include name="*.xml"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="threadlocal" depends="compile-classes">
-   </target>
+	<target name="threadlocal" depends="compile-classes">
+	</target>
 
-   <target name="timer"
+	<target name="timer"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/timer-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/timer/*.class"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/timer-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/timer/*.class"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="timerdependency"
+	<target name="timerdependency"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/timerdependency.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/timerdependency/*.class"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/timerdependency.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/timerdependency/*.class"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="pkg"
+	<target name="pkg"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/pkg-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/pkg/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/entity">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/pkg-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/pkg/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/entity">
+				<include name="META-INF/persistence.xml"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="txexceptions"
+	<target name="txexceptions"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/txexceptions-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/txexceptions/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/txexceptions">
-            <include name="META-INF/persistence.xml"/>
-            <include name="META-INF/ejb-jar.xml"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/txexceptions-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/txexceptions/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/txexceptions">
+				<include name="META-INF/persistence.xml"/>
+				<include name="META-INF/ejb-jar.xml"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="dd"
+	<target name="dd"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/dd.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/dd/*.class"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/dd.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/dd/*.class"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="pool"
+	<target name="pool"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/pool.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/pool/*.class"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/pool.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/pool/*.class"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="naming"
+	<target name="naming"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <delete file="${resources}/test/naming/META-INF/jboss.xml"/>
-      <copy file="${resources}/test/naming/META-INF/jboss1.xml" tofile="${resources}/test/naming/META-INF/jboss.xml"/>
-      <jar jarfile="${build.lib}/naming.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/naming/Test*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/naming">
-            <include name="*.properties"/>
-         </fileset>
-         <fileset dir="${resources}/test/naming">
-            <include name="META-INF/ejb-jar.xml"/>
-            <include name="META-INF/jboss.xml"/>
-         </fileset>
-      </jar>
+		<delete file="${resources}/test/naming/META-INF/jboss.xml"/>
+		<copy file="${resources}/test/naming/META-INF/jboss1.xml" tofile="${resources}/test/naming/META-INF/jboss.xml"/>
+		<jar jarfile="${build.lib}/naming.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/naming/Test*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/naming">
+				<include name="*.properties"/>
+			</fileset>
+			<fileset dir="${resources}/test/naming">
+				<include name="META-INF/ejb-jar.xml"/>
+				<include name="META-INF/jboss.xml"/>
+			</fileset>
+		</jar>
 
-      <delete file="${resources}/test/naming/META-INF/jboss.xml"/>
-      <copy file="${resources}/test/naming/META-INF/jboss2.xml" tofile="${resources}/test/naming/META-INF/jboss.xml"/>
-      <jar jarfile="${build.lib}/naming-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/naming/Stateful.class"/>
-            <include name="org/jboss/ejb3/test/naming/StatefulOverrideBean.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/naming">
-            <include name="META-INF/jboss.xml"/>
-         </fileset>
-      </jar>
+		<delete file="${resources}/test/naming/META-INF/jboss.xml"/>
+		<copy file="${resources}/test/naming/META-INF/jboss2.xml" tofile="${resources}/test/naming/META-INF/jboss.xml"/>
+		<jar jarfile="${build.lib}/naming-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/naming/Stateful.class"/>
+				<include name="org/jboss/ejb3/test/naming/StatefulOverrideBean.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/naming">
+				<include name="META-INF/jboss.xml"/>
+			</fileset>
+		</jar>
 
-      <delete file="${resources}/test/naming/META-INF/jboss.xml"/>
-      <jar jarfile="${build.lib}/bind-failure-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/naming/Stateful*.class"/>
-            <exclude name="org/jboss/ejb3/test/naming/StatefulOverrideBean.class"/>
-         </fileset>
-      </jar>
+		<delete file="${resources}/test/naming/META-INF/jboss.xml"/>
+		<jar jarfile="${build.lib}/bind-failure-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/naming/Stateful*.class"/>
+				<exclude name="org/jboss/ejb3/test/naming/StatefulOverrideBean.class"/>
+			</fileset>
+		</jar>
 
-      <!-- bad-field-method.jar -->
-      <jar destfile="${build.lib}/bad-field-method.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/naming/bad/BadInjector.class"/>
-            <include name="org/jboss/ejb3/test/naming/bad/BadFieldMethodBean.class"/>
-         </fileset>
-         <zipfileset dir="${resources}/test/naming-errors"
+		<!-- bad-field-method.jar -->
+		<jar destfile="${build.lib}/bad-field-method.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/naming/bad/BadInjector.class"/>
+				<include name="org/jboss/ejb3/test/naming/bad/BadFieldMethodBean.class"/>
+			</fileset>
+			<zipfileset dir="${resources}/test/naming-errors"
             fullpath="META-INF/ejb-jar.xml">
-            <include name="ejb-jar-method-field.xml"/>
-         </zipfileset>
-      </jar>
-   </target>
+				<include name="ejb-jar-method-field.xml"/>
+			</zipfileset>
+		</jar>
+	</target>
 
-   <target name="bmt"
+	<target name="bmt"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/bmt-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/bmt/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/bmt">
-            <include name="META-INF/*.xml"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/bmt-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/bmt/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/bmt">
+				<include name="META-INF/*.xml"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="schema"
+	<target name="schema"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/ejbjar-validation.jar">
-         <fileset dir="${resources}/test/schema">
-            <include name="META-INF/ejb-jar.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/ejbjar-validation.jar">
+			<fileset dir="${resources}/test/schema">
+				<include name="META-INF/ejb-jar.xml"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/jboss-validation.jar">
-         <fileset dir="${resources}/test/schema">
-            <include name="META-INF/jboss.xml"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/jboss-validation.jar">
+			<fileset dir="${resources}/test/schema">
+				<include name="META-INF/jboss.xml"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="bank"
+	<target name="bank"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/bank.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/bank/*.class"/>
-         </fileset>
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/bank/ejbutil/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/bank">
-            <include name="META-INF/*.xml"/>
-            <include name="bank-ejb3-interceptors-aop.xml"/>
-            <include name="users.properties"/>
-            <include name="roles.properties"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/bank.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/bank/*.class"/>
+			</fileset>
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/bank/ejbutil/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/bank">
+				<include name="META-INF/*.xml"/>
+				<include name="bank-ejb3-interceptors-aop.xml"/>
+				<include name="users.properties"/>
+				<include name="roles.properties"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="mail"
+	<target name="mail"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/mail-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/mail/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/mail">
-            <include name="META-INF/*.xml"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/mail-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/mail/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/mail">
+				<include name="META-INF/*.xml"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="securitydomain"
+	<target name="securitydomain"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/securitydomain.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/securitydomain/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/securitydomain">
-            <include name="META-INF/*.xml"/>
-            <include name="users.properties"/>
-            <include name="roles.properties"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/securitydomain.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/securitydomain/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/securitydomain">
+				<include name="META-INF/*.xml"/>
+				<include name="users.properties"/>
+				<include name="roles.properties"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="unauthenticatedprincipal"
+	<target name="unauthenticatedprincipal"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/unauthenticatedprincipal.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/unauthenticatedprincipal/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/unauthenticatedprincipal">
-            <include name="META-INF/*.xml"/>
-            <include name="users.properties"/>
-            <include name="roles.properties"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/unauthenticatedprincipal.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/unauthenticatedprincipal/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/unauthenticatedprincipal">
+				<include name="META-INF/*.xml"/>
+				<include name="users.properties"/>
+				<include name="roles.properties"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="reference21_30"
+	<target name="reference21_30"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <delete file="${resources}/test/reference21_30/META-INF/ejb-jar.xml"/>
-      <copy file="${resources}/test/reference21_30/META-INF/global-ejb-jar.xml" tofile="${resources}/test/reference21_30/META-INF/ejb-jar.xml"/>
-      <delete file="${resources}/test/reference21_30/META-INF/jboss.xml"/>
-      <copy file="${resources}/test/reference21_30/META-INF/jboss-reference.xml" tofile="${resources}/test/reference21_30/META-INF/jboss.xml"/>
+		<delete file="${resources}/test/reference21_30/META-INF/ejb-jar.xml"/>
+		<copy file="${resources}/test/reference21_30/META-INF/global-ejb-jar.xml" tofile="${resources}/test/reference21_30/META-INF/ejb-jar.xml"/>
+		<delete file="${resources}/test/reference21_30/META-INF/jboss.xml"/>
+		<copy file="${resources}/test/reference21_30/META-INF/jboss-reference.xml" tofile="${resources}/test/reference21_30/META-INF/jboss.xml"/>
 
-      <jar jarfile="${build.lib}/globalReference.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/reference21_30/*21*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/reference21_30">
-            <include name="META-INF/ejb-jar.xml"/>
-            <include name="META-INF/jboss.xml"/>
-            <include name="users.properties"/>
-            <include name="roles.properties"/>
-         </fileset>
-      </jar>
-      <jar jarfile="${build.lib}/globalReference-ejb3.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/reference21_30/GlobalSession30Bean.class"/>
-            <include name="org/jboss/ejb3/test/reference21_30/Session30.class"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/globalReference.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/reference21_30/*21*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/reference21_30">
+				<include name="META-INF/ejb-jar.xml"/>
+				<include name="META-INF/jboss.xml"/>
+				<include name="users.properties"/>
+				<include name="roles.properties"/>
+			</fileset>
+		</jar>
+		<jar jarfile="${build.lib}/globalReference-ejb3.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/reference21_30/GlobalSession30Bean.class"/>
+				<include name="org/jboss/ejb3/test/reference21_30/Session30.class"/>
+			</fileset>
+		</jar>
 
-      <delete file="${resources}/test/reference21_30/META-INF/ejb-jar.xml"/>
-      <copy file="${resources}/test/reference21_30/META-INF/reference-ejb-jar.xml" tofile="${resources}/test/reference21_30/META-INF/ejb-jar.xml"/>
-      <delete file="${resources}/test/reference21_30/META-INF/jboss.xml"/>
-      <copy file="${resources}/test/reference21_30/META-INF/jboss-reference2.xml" tofile="${resources}/test/reference21_30/META-INF/jboss.xml"/>
-      <jar jarfile="${build.lib}/reference.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/reference21_30/Local*.class"/>
-            <include name="org/jboss/ejb3/test/reference21_30/Homed*.class"/>
-            <include name="org/jboss/ejb3/test/reference21_30/Session*.class"/>
-            <include name="org/jboss/ejb3/test/reference21_30/StatefulSession*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/reference21_30">
-            <include name="META-INF/ejb-jar.xml"/>
-            <include name="META-INF/jboss.xml"/>
-            <include name="users.properties"/>
-            <include name="roles.properties"/>
-         </fileset>
-      </jar>
+		<delete file="${resources}/test/reference21_30/META-INF/ejb-jar.xml"/>
+		<copy file="${resources}/test/reference21_30/META-INF/reference-ejb-jar.xml" tofile="${resources}/test/reference21_30/META-INF/ejb-jar.xml"/>
+		<delete file="${resources}/test/reference21_30/META-INF/jboss.xml"/>
+		<copy file="${resources}/test/reference21_30/META-INF/jboss-reference2.xml" tofile="${resources}/test/reference21_30/META-INF/jboss.xml"/>
+		<jar jarfile="${build.lib}/reference.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/reference21_30/Local*.class"/>
+				<include name="org/jboss/ejb3/test/reference21_30/Homed*.class"/>
+				<include name="org/jboss/ejb3/test/reference21_30/Session*.class"/>
+				<include name="org/jboss/ejb3/test/reference21_30/StatefulSession*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/reference21_30">
+				<include name="META-INF/ejb-jar.xml"/>
+				<include name="META-INF/jboss.xml"/>
+				<include name="users.properties"/>
+				<include name="roles.properties"/>
+			</fileset>
+		</jar>
 
-      <delete file="${resources}/test/reference21_30/META-INF/ejb-jar.xml"/>
-      <copy file="${resources}/test/reference21_30/META-INF/ejb-jar2.xml" tofile="${resources}/test/reference21_30/META-INF/ejb-jar.xml"/>
-      <delete file="${resources}/test/reference21_30/META-INF/jboss.xml"/>
-      <copy file="${resources}/test/reference21_30/META-INF/jboss2.xml" tofile="${resources}/test/reference21_30/META-INF/jboss.xml"/>
-      <jar jarfile="${build.lib}/multideploy.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/reference21_30/Test2*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/reference21_30">
-            <include name="META-INF/ejb-jar.xml"/>
-            <include name="META-INF/jboss.xml"/>
-         </fileset>
-      </jar>
+		<delete file="${resources}/test/reference21_30/META-INF/ejb-jar.xml"/>
+		<copy file="${resources}/test/reference21_30/META-INF/ejb-jar2.xml" tofile="${resources}/test/reference21_30/META-INF/ejb-jar.xml"/>
+		<delete file="${resources}/test/reference21_30/META-INF/jboss.xml"/>
+		<copy file="${resources}/test/reference21_30/META-INF/jboss2.xml" tofile="${resources}/test/reference21_30/META-INF/jboss.xml"/>
+		<jar jarfile="${build.lib}/multideploy.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/reference21_30/Test2*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/reference21_30">
+				<include name="META-INF/ejb-jar.xml"/>
+				<include name="META-INF/jboss.xml"/>
+			</fileset>
+		</jar>
 
-      <delete file="${resources}/test/reference21_30/META-INF/ejb-jar.xml"/>
-      <copy file="${resources}/test/reference21_30/META-INF/ejb-jar3.xml" tofile="${resources}/test/reference21_30/META-INF/ejb-jar.xml"/>
-      <delete file="${resources}/test/reference21_30/META-INF/jboss.xml"/>
-      <copy file="${resources}/test/reference21_30/META-INF/jboss3.xml" tofile="${resources}/test/reference21_30/META-INF/jboss.xml"/>
-      <jar jarfile="${build.lib}/multideploy-ejb3.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/reference21_30/Test3*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/reference21_30">
-            <include name="META-INF/ejb-jar.xml"/>
-            <include name="META-INF/jboss.xml"/>
-         </fileset>
-      </jar>
+		<delete file="${resources}/test/reference21_30/META-INF/ejb-jar.xml"/>
+		<copy file="${resources}/test/reference21_30/META-INF/ejb-jar3.xml" tofile="${resources}/test/reference21_30/META-INF/ejb-jar.xml"/>
+		<delete file="${resources}/test/reference21_30/META-INF/jboss.xml"/>
+		<copy file="${resources}/test/reference21_30/META-INF/jboss3.xml" tofile="${resources}/test/reference21_30/META-INF/jboss.xml"/>
+		<jar jarfile="${build.lib}/multideploy-ejb3.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/reference21_30/Test3*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/reference21_30">
+				<include name="META-INF/ejb-jar.xml"/>
+				<include name="META-INF/jboss.xml"/>
+			</fileset>
+		</jar>
 
 
-      <delete file="${resources}/test/reference21_30/META-INF/ejb-jar.xml"/>
-      <delete file="${resources}/test/reference21_30/META-INF/jboss.xml"/>
+		<delete file="${resources}/test/reference21_30/META-INF/ejb-jar.xml"/>
+		<delete file="${resources}/test/reference21_30/META-INF/jboss.xml"/>
 
-      <ear earfile="${build.lib}/multideploy.ear"
+		<ear earfile="${build.lib}/multideploy.ear"
 			appxml="${build.resources}/test/reference21_30/META-INF/application.xml">
-         <fileset dir="${build.lib}">
-            <include name="multideploy.jar"/>
-            <include name="multideploy-ejb3.jar"/>
-         </fileset>
-      </ear>
-   </target>
+			<fileset dir="${build.lib}">
+				<include name="multideploy.jar"/>
+				<include name="multideploy-ejb3.jar"/>
+			</fileset>
+		</ear>
+	</target>
 
-   <!--target name="jca"
+	<!--target name="jca"
       description="Builds all jar files."
       depends="compile-classes">
 
@@ -1423,75 +1446,75 @@
       </jar>
    </target-->
 
-   <target name="dd/mdb"
+	<target name="dd/mdb"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/dd-mdb.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/dd/mdb/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/dd/mdb">
-            <include name="META-INF/*.xml"/>
-         </fileset>
-      </jar>
-      <copy todir="${build.lib}">
-         <fileset dir="${resources}/test/dd/mdb">
-            <include name="*.xml"/>
-         </fileset>
-      </copy>
+		<jar jarfile="${build.lib}/dd-mdb.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/dd/mdb/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/dd/mdb">
+				<include name="META-INF/*.xml"/>
+			</fileset>
+		</jar>
+		<copy todir="${build.lib}">
+			<fileset dir="${resources}/test/dd/mdb">
+				<include name="*.xml"/>
+			</fileset>
+		</copy>
 
-      <mq2jbm basedir="${resources}/test/dd/mdb"/>
-   </target>
+		<mq2jbm basedir="${resources}/test/dd/mdb"/>
+	</target>
 
-   <target name="jms"
+	<target name="jms"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/jms.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/jms/*.class"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/jms.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/jms/*.class"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="jms/managed"
+	<target name="jms/managed"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/jms-managed.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/jms/managed/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/jms/managed">
-            <include name="META-INF/*.xml"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/jms-managed.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/jms/managed/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/jms/managed">
+				<include name="META-INF/*.xml"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="enventry"
+	<target name="enventry"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/enventry.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/enventry/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/enventry">
-            <include name="META-INF/*.xml"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/enventry.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/enventry/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/enventry">
+				<include name="META-INF/*.xml"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <!--target name="loginmodule"
+	<!--target name="loginmodule"
       description="Builds all jar files."
       depends="compile-classes">
 
@@ -1516,1613 +1539,1613 @@
       </war>
    </target-->
 
-   <target name="dd/web"
+	<target name="dd/web"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/dd-web-ejbs.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/dd/web/ejb/*.class"/>
-            <include name="org/jboss/ejb3/test/dd/web/interfaces/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/dd/web">
-            <include name="META-INF/ejb-jar.xml"/>
-            <include name="META-INF/jboss.xml"/>
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-         <fileset dir="${resources}/test/dd/web">
-            <include name="users.properties"/>
-            <include name="roles.properties"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/dd-web-ejbs.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/dd/web/ejb/*.class"/>
+				<include name="org/jboss/ejb3/test/dd/web/interfaces/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/dd/web">
+				<include name="META-INF/ejb-jar.xml"/>
+				<include name="META-INF/jboss.xml"/>
+				<include name="META-INF/persistence.xml"/>
+			</fileset>
+			<fileset dir="${resources}/test/dd/web">
+				<include name="users.properties"/>
+				<include name="roles.properties"/>
+			</fileset>
+		</jar>
 
-      <war warfile="${build.lib}/dd-web.war"
+		<war warfile="${build.lib}/dd-web.war"
          webxml="${build.resources}/test/dd/web/WEB-INF/jbosstest-web.xml">
-         <webinf dir="${build.resources}/test/dd/web/html/jbosstest/WEB-INF">
-            <include name="*"/>
-         </webinf>
-         <lib dir="${build.resources}/test/dd/web/WEB-INF/lib">
-            <!--    <include name="jbosstest-web-util.jar"/> -->
-            <include name="resources.jar"/>
-         </lib>
-         <classes dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/dd/web/servlets/**"/>
-            <include name="org/jboss/ejb3/test/dd/web/util/*.class"/>
-         </classes>
-         <fileset dir="${build.resources}/test/dd/web/html/jbosstest">
-            <include name="**/*.jsp"/>
-            <include name="**/*.html"/>
-         </fileset>
-         <fileset dir="${source.java}/org/jboss/ejb3/test/dd/web/jsp">
-            <include name="*.jsp"/>
-         </fileset>
-      </war>
+			<webinf dir="${build.resources}/test/dd/web/html/jbosstest/WEB-INF">
+				<include name="*"/>
+			</webinf>
+			<lib dir="${build.resources}/test/dd/web/WEB-INF/lib">
+				<!--    <include name="jbosstest-web-util.jar"/> -->
+				<include name="resources.jar"/>
+			</lib>
+			<classes dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/dd/web/servlets/**"/>
+				<include name="org/jboss/ejb3/test/dd/web/util/*.class"/>
+			</classes>
+			<fileset dir="${build.resources}/test/dd/web/html/jbosstest">
+				<include name="**/*.jsp"/>
+				<include name="**/*.html"/>
+			</fileset>
+			<fileset dir="${source.java}/org/jboss/ejb3/test/dd/web/jsp">
+				<include name="*.jsp"/>
+			</fileset>
+		</war>
 
-      <ear earfile="${build.lib}/dd-web.ear"
+		<ear earfile="${build.lib}/dd-web.ear"
          appxml="${build.resources}/test/dd/web/META-INF/application.xml">
-         <metainf dir="${build.resources}/test/dd/web/META-INF">
-            <include name="jboss-app.xml"/>
-         </metainf>
-         <fileset dir="${build.lib}">
-            <include name="dd-web-ejbs.jar"/>
-            <include name="dd-web.war"/>
-         </fileset>
-         <fileset dir="${build.resources}/test/dd/web">
-            <include name="scripts/*"/>
-         </fileset>
-      </ear>
-   </target>
+			<metainf dir="${build.resources}/test/dd/web/META-INF">
+				<include name="jboss-app.xml"/>
+			</metainf>
+			<fileset dir="${build.lib}">
+				<include name="dd-web-ejbs.jar"/>
+				<include name="dd-web.war"/>
+			</fileset>
+			<fileset dir="${build.resources}/test/dd/web">
+				<include name="scripts/*"/>
+			</fileset>
+		</ear>
+	</target>
 
-   <target name="jsp"
+	<target name="jsp"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/jsp-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/jsp/*.class"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/jsp-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/jsp/*.class"/>
+			</fileset>
+		</jar>
 
-      <war warfile="${build.lib}/jsp-test.war"
+		<war warfile="${build.lib}/jsp-test.war"
          webxml="${build.resources}/test/jsp/WEB-INF/jbosstest-jsp.xml">
-         <fileset dir="${build.resources}/test/jsp">
-            <include name="**/*.jsp"/>
-         </fileset>
-      </war>
+			<fileset dir="${build.resources}/test/jsp">
+				<include name="**/*.jsp"/>
+			</fileset>
+		</war>
 
-      <ear earfile="${build.lib}/jsp-test.ear"
+		<ear earfile="${build.lib}/jsp-test.ear"
          appxml="${build.resources}/test/jsp/META-INF/application.xml">
-         <fileset dir="${build.lib}">
-            <include name="jsp-test.jar"/>
-            <include name="jsp-test.war"/>
-         </fileset>
-      </ear>
-   </target>
+			<fileset dir="${build.lib}">
+				<include name="jsp-test.jar"/>
+				<include name="jsp-test.war"/>
+			</fileset>
+		</ear>
+	</target>
 
-   <target name="classloader"
+	<target name="classloader"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/classloader.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/classloader/Session30*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/classloader">
-            <include name="META-INF/jboss.xml"/>
-            <include name="*.jar"/>
-            <include name="*.properties"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/classloader.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/classloader/Session30*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/classloader">
+				<include name="META-INF/jboss.xml"/>
+				<include name="*.jar"/>
+				<include name="*.properties"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/classloader-shared.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/classloader/Shared*.class"/>
-            <include name="org/jboss/ejb3/test/classloader/Session30.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/classloader">
-            <include name="META-INF/jboss.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/classloader-shared.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/classloader/Shared*.class"/>
+				<include name="org/jboss/ejb3/test/classloader/Session30.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/classloader">
+				<include name="META-INF/jboss.xml"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/classloader-unshared.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/classloader/Unshared*.class"/>
-            <include name="org/jboss/ejb3/test/classloader/Session30.class"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/classloader-unshared.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/classloader/Unshared*.class"/>
+				<include name="org/jboss/ejb3/test/classloader/Session30.class"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="classloader2" depends="compile-classes">
-      <mkdir dir="${build.lib}"/>
+	<target name="classloader2" depends="compile-classes">
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/classloader2.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/classloader2/**/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/classloader2">
-            <include name="META-INF/jboss.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/classloader2.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/classloader2/**/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/classloader2">
+				<include name="META-INF/jboss.xml"/>
+			</fileset>
+		</jar>
 
-      <ear earfile="${build.lib}/classloader2.ear"
+		<ear earfile="${build.lib}/classloader2.ear"
          appxml="${build.resources}/test/classloader2/META-INF/application.xml">
-         <fileset dir="${build.lib}">
-            <include name="classloader2.jar"/>
-         </fileset>
-         <fileset dir="${resources}/test/classloader2">
-            <include name="META-INF/jboss-app.xml"/>
-            <include name="lib/xercesImpl-2.6.2.jar"/>
-         </fileset>
-      </ear>
-   </target>
+			<fileset dir="${build.lib}">
+				<include name="classloader2.jar"/>
+			</fileset>
+			<fileset dir="${resources}/test/classloader2">
+				<include name="META-INF/jboss-app.xml"/>
+				<include name="lib/xercesImpl-2.6.2.jar"/>
+			</fileset>
+		</ear>
+	</target>
 
-   <target name="clusteredservice"
+	<target name="clusteredservice"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/clusteredservice.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/clusteredservice/*.class"/>
-            <exclude name="org/jboss/ejb3/test/clusteredservice/ServiceWeb.class"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/clusteredservice.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/clusteredservice/*.class"/>
+				<exclude name="org/jboss/ejb3/test/clusteredservice/ServiceWeb.class"/>
+			</fileset>
+		</jar>
 
-      <war warfile="${build.lib}/clusteredservice.war"
+		<war warfile="${build.lib}/clusteredservice.war"
          webxml="${build.resources}/test/clusteredservice/WEB-INF/web.xml">
-         <classes dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/clusteredservice/servlets/*.class"/>
-            <include name="org/jboss/ejb3/test/clusteredservice/ServiceRemote.class"/>
-            <include name="org/jboss/ejb3/test/clusteredservice/ServiceWeb.class"/>
-         </classes>
-      </war>
-   </target>
+			<classes dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/clusteredservice/servlets/*.class"/>
+				<include name="org/jboss/ejb3/test/clusteredservice/ServiceRemote.class"/>
+				<include name="org/jboss/ejb3/test/clusteredservice/ServiceWeb.class"/>
+			</classes>
+		</war>
+	</target>
 
-   <target name="clusteredjms"
+	<target name="clusteredjms"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/clusteredjms-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/clusteredjms/*.class"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/clusteredjms-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/clusteredjms/*.class"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="jaccpropagation"
+	<target name="jaccpropagation"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/jaccpropagation-ejbs.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/jaccpropagation/*.class"/>
-            <exclude name="org/jboss/ejb3/test/jaccpropagation/War*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/jaccpropagation">
-            <include name="*.properties"/>
-            <include name="META-INF/jboss.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/jaccpropagation-ejbs.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/jaccpropagation/*.class"/>
+				<exclude name="org/jboss/ejb3/test/jaccpropagation/War*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/jaccpropagation">
+				<include name="*.properties"/>
+				<include name="META-INF/jboss.xml"/>
+			</fileset>
+		</jar>
 
-      <war warfile="${build.lib}/jaccpropagation.war"
+		<war warfile="${build.lib}/jaccpropagation.war"
          webxml="${build.resources}/test/jaccpropagation/WEB-INF/test-web.xml">
-         <webinf dir="${build.resources}/test/jaccpropagation/WEB-INF">
-            <include name="jboss-web.xml"/>
-         </webinf>
-         <classes dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/jaccpropagation/servlets/**"/>
-         </classes>
-      </war>
+			<webinf dir="${build.resources}/test/jaccpropagation/WEB-INF">
+				<include name="jboss-web.xml"/>
+			</webinf>
+			<classes dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/jaccpropagation/servlets/**"/>
+			</classes>
+		</war>
 
-      <copy todir="${build.lib}">
-         <fileset dir="${resources}/test/jaccpropagation">
-            <include name="jaccpropagation-security-service.xml"/>
-         </fileset>
-      </copy>
-   </target>
+		<copy todir="${build.lib}">
+			<fileset dir="${resources}/test/jaccpropagation">
+				<include name="jaccpropagation-security-service.xml"/>
+			</fileset>
+		</copy>
+	</target>
 
-   <target name="servlet"
+	<target name="servlet"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/servlet-ejbs.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/servlet/*.class"/>
-            <exclude name="org/jboss/ejb3/test/servlet/War*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/servlet">
-            <include name="*.properties"/>
-            <include name="META-INF/jboss.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/servlet-ejbs.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/servlet/*.class"/>
+				<exclude name="org/jboss/ejb3/test/servlet/War*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/servlet">
+				<include name="*.properties"/>
+				<include name="META-INF/jboss.xml"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/servlet-client.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/servlet/War*.class"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/servlet-client.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/servlet/War*.class"/>
+			</fileset>
+		</jar>
 
-      <war warfile="${build.lib}/servlet.war"
+		<war warfile="${build.lib}/servlet.war"
          webxml="${build.resources}/test/servlet/WEB-INF/test-web.xml">
-         <webinf dir="${build.resources}/test/servlet/WEB-INF">
-            <include name="jboss-web.xml"/>
-         </webinf>
-         <classes dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/servlet/servlets/**"/>
-         </classes>
-         <lib dir="${build.lib}">
-            <include name="servlet-client.jar"/>
-         </lib>
-      </war>
+			<webinf dir="${build.resources}/test/servlet/WEB-INF">
+				<include name="jboss-web.xml"/>
+			</webinf>
+			<classes dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/servlet/servlets/**"/>
+			</classes>
+			<lib dir="${build.lib}">
+				<include name="servlet-client.jar"/>
+			</lib>
+		</war>
 
-      <ear earfile="${build.lib}/servlet.ear"
+		<ear earfile="${build.lib}/servlet.ear"
          appxml="${build.resources}/test/servlet/META-INF/application.xml"
          manifest="${build.resources}/test/servlet/META-INF/MANIFEST.MF">
-         <fileset dir="${build.lib}">
-            <include name="servlet-ejbs.jar"/>
-            <include name="servlet.war"/>
-            <include name="servlet-client.jar"/>
-         </fileset>
-         <fileset dir="${resources}/test/servlet">
-            <include name="META-INF/jboss-app.xml"/>
-            <include name="servlet-security-service.xml"/>
-         </fileset>
-      </ear>
+			<fileset dir="${build.lib}">
+				<include name="servlet-ejbs.jar"/>
+				<include name="servlet.war"/>
+				<include name="servlet-client.jar"/>
+			</fileset>
+			<fileset dir="${resources}/test/servlet">
+				<include name="META-INF/jboss-app.xml"/>
+				<include name="servlet-security-service.xml"/>
+			</fileset>
+		</ear>
 
-      <copy todir="${build.lib}">
-         <fileset dir="${resources}/test/servlet">
-            <include name="servlet-security-service.xml"/>
-         </fileset>
-      </copy>
-   </target>
+		<copy todir="${build.lib}">
+			<fileset dir="${resources}/test/servlet">
+				<include name="servlet-security-service.xml"/>
+			</fileset>
+		</copy>
+	</target>
 
-   <target name="ejbthree440"
+	<target name="ejbthree440"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/ejbthree440.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/regression/ejbthree440/session/**/*.class"/>
-            <include name="org/jboss/ejb3/test/regression/ejbthree440/model/*.class"/>
-         </fileset>
-         <fileset dir="${build.resources}/test/regression/ejbthree440">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/ejbthree440.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/regression/ejbthree440/session/**/*.class"/>
+				<include name="org/jboss/ejb3/test/regression/ejbthree440/model/*.class"/>
+			</fileset>
+			<fileset dir="${build.resources}/test/regression/ejbthree440">
+				<include name="META-INF/persistence.xml"/>
+			</fileset>
+		</jar>
 
-      <ear earfile="${build.lib}/ejbthree440.ear"
+		<ear earfile="${build.lib}/ejbthree440.ear"
          appxml="${build.resources}/test/regression/ejbthree440/META-INF/application.xml">
-         <fileset dir="${build.lib}">
-            <include name="ejbthree440.jar"/>
-         </fileset>
-      </ear>
+			<fileset dir="${build.lib}">
+				<include name="ejbthree440.jar"/>
+			</fileset>
+		</ear>
 
-   </target>
+	</target>
 
 
-   <target name="ejbthree454"
+	<target name="ejbthree454"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/shared-a-ejb.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/regression/ejbthree454/Shared*.class"/>
-         </fileset>
-         <fileset dir="${build.resources}/test/regression/ejbthree454/a">
-            <include name="META-INF/ejb-jar.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/shared-a-ejb.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/regression/ejbthree454/Shared*.class"/>
+			</fileset>
+			<fileset dir="${build.resources}/test/regression/ejbthree454/a">
+				<include name="META-INF/ejb-jar.xml"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/shared-b-ejb.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/regression/ejbthree454/Shared*.class"/>
-         </fileset>
-         <fileset dir="${build.resources}/test/regression/ejbthree454/b">
-            <include name="META-INF/ejb-jar.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/shared-b-ejb.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/regression/ejbthree454/Shared*.class"/>
+			</fileset>
+			<fileset dir="${build.resources}/test/regression/ejbthree454/b">
+				<include name="META-INF/ejb-jar.xml"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/a-ejb.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/regression/ejbthree454/A*.class"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/a-ejb.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/regression/ejbthree454/A*.class"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/b-ejb.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/regression/ejbthree454/B*.class"/>
-         </fileset>
-      </jar>
-      <ear earfile="${build.lib}/ejbthree454-a.ear"
+		<jar jarfile="${build.lib}/b-ejb.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/regression/ejbthree454/B*.class"/>
+			</fileset>
+		</jar>
+		<ear earfile="${build.lib}/ejbthree454-a.ear"
          appxml="${build.resources}/test/regression/ejbthree454/a/META-INF/application.xml">
-         <fileset dir="${build.lib}">
-            <include name="a-ejb.jar"/>
-            <include name="shared-a-ejb.jar"/>
-         </fileset>
-      </ear>
-      <ear earfile="${build.lib}/ejbthree454-b.ear"
+			<fileset dir="${build.lib}">
+				<include name="a-ejb.jar"/>
+				<include name="shared-a-ejb.jar"/>
+			</fileset>
+		</ear>
+		<ear earfile="${build.lib}/ejbthree454-b.ear"
          appxml="${build.resources}/test/regression/ejbthree454/b/META-INF/application.xml">
-         <fileset dir="${build.lib}">
-            <include name="b-ejb.jar"/>
-            <include name="shared-b-ejb.jar"/>
-         </fileset>
-      </ear>
-   </target>
+			<fileset dir="${build.lib}">
+				<include name="b-ejb.jar"/>
+				<include name="shared-b-ejb.jar"/>
+			</fileset>
+		</ear>
+	</target>
 
-   <target name="ejbthree485"
+	<target name="ejbthree485"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/ejbthree485.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/regression/ejbthree485/*.class"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/ejbthree485.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/regression/ejbthree485/*.class"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="ejbthree620"
+	<target name="ejbthree620"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/ejbthree620.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/regression/ejbthree620/*.class"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/ejbthree620.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/regression/ejbthree620/*.class"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="ejbthree653"
+	<target name="ejbthree653"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/ejbthree653.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/regression/ejbthree653/*.class"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/ejbthree653.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/regression/ejbthree653/*.class"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="ejbthree670"
+	<target name="ejbthree670"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/ejbthree670.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/regression/ejbthree670/*.class"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/ejbthree670.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/regression/ejbthree670/*.class"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="ejbthree712"
+	<target name="ejbthree712"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/ejbthree712.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/ejbthree712/*.class"/>
-         </fileset>
-         <zipfileset dir="${build.resources}/test/ejbthree712" prefix="META-INF" includes="*"/>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/ejbthree712.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/ejbthree712/*.class"/>
+			</fileset>
+			<zipfileset dir="${build.resources}/test/ejbthree712" prefix="META-INF" includes="*"/>
+		</jar>
+	</target>
 
-   <target name="ejbthree724"
+	<target name="ejbthree724"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/ejbthree724-persistence.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/ejbthree724/Person.class"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/ejbthree724-persistence.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/ejbthree724/Person.class"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/ejbthree724-session.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/ejbthree724/MyStateless*.class"/>
-         </fileset>
-         <zipfileset dir="${build.resources}/test/ejbthree724" includes="META-INF/persistence.xml"/>
-      </jar>
+		<jar jarfile="${build.lib}/ejbthree724-session.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/ejbthree724/MyStateless*.class"/>
+			</fileset>
+			<zipfileset dir="${build.resources}/test/ejbthree724" includes="META-INF/persistence.xml"/>
+		</jar>
 
-      <ear earfile="${build.lib}/ejbthree724.ear" appxml="${build.resources}/test/ejbthree724/META-INF/application.xml">
-         <fileset dir="${build.lib}" includes="ejbthree724-*.jar"/>
-      </ear>
-   </target>
+		<ear earfile="${build.lib}/ejbthree724.ear" appxml="${build.resources}/test/ejbthree724/META-INF/application.xml">
+			<fileset dir="${build.lib}" includes="ejbthree724-*.jar"/>
+		</ear>
+	</target>
 
-   <target name="ejbthree751"
+	<target name="ejbthree751"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/ejbthree751-fail.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/ejbthree751/fail/*.class"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/ejbthree751-fail.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/ejbthree751/fail/*.class"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/ejbthree751-pass.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/ejbthree751/pass/*.class"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/ejbthree751-pass.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/ejbthree751/pass/*.class"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="ejbthree785" depends="compile-classes">
-      <build-simple-jar name="ejbthree785"/>
-   </target>
+	<target name="ejbthree785" depends="compile-classes">
+		<build-simple-jar name="ejbthree785"/>
+	</target>
 
-   <!--target name="ejbthree786" depends="compile-classes">
+	<!--target name="ejbthree786" depends="compile-classes">
       <build-simple-jar name="ejbthree786"/>
    </target-->
 
-   <target name="ejbthree832"
+	<target name="ejbthree832"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/ejbthree832.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/ejbthree832/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/ejbthree832"/>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/ejbthree832.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/ejbthree832/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/ejbthree832"/>
+		</jar>
+	</target>
 
-   <target name="ejbthree921"
+	<target name="ejbthree921"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/ejbthree921.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/ejbthree921/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/ejbthree921"/>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/ejbthree921.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/ejbthree921/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/ejbthree921"/>
+		</jar>
+	</target>
 
-   <target name="epcpropagation"
+	<target name="epcpropagation"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/epcpropagation-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/epcpropagation/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/epcpropagation"/>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/epcpropagation-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/epcpropagation/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/epcpropagation"/>
+		</jar>
+	</target>
 
-   <target name="ejbthree879"
+	<target name="ejbthree879"
       description="Builds simple jar file."
       depends="compile-classes">
 
-      <build-simple-jar name="ejbthree879"/>
-   </target>
+		<build-simple-jar name="ejbthree879"/>
+	</target>
 
-   <target name="ejbthree959"
+	<target name="ejbthree959"
       description="Builds simple jar file."
       depends="compile-classes">
 
-      <build-simple-jar name="ejbthree959"/>
-   </target>
+		<build-simple-jar name="ejbthree959"/>
+	</target>
 
-   <target name="ejbthree963"
+	<target name="ejbthree963"
       description="Builds a simple jar files."
       depends="compile-classes">
 
-      <build-simple-jar name="ejbthree963"/>
-   </target>
+		<build-simple-jar name="ejbthree963"/>
+	</target>
 
-   <target name="ejbthree986"
+	<target name="ejbthree986"
       description="Builds a simple jar files."
       depends="compile-classes">
 
-      <build-simple-jar name="ejbthree986"/>
-   </target>
+		<build-simple-jar name="ejbthree986"/>
+	</target>
 
-   <target name="ejbthree987"
+	<target name="ejbthree987"
       description="Builds a simple jar files."
       depends="compile-classes">
 
-      <build-simple-jar name="ejbthree987"/>
-   </target>
+		<build-simple-jar name="ejbthree987"/>
+	</target>
 
-   <target name="ejbthree994"
+	<target name="ejbthree994"
       description="Builds a simple jar files."
       depends="compile-classes">
 
-      <build-simple-jar name="ejbthree994"/>
+		<build-simple-jar name="ejbthree994"/>
 
-      <copy todir="${build.lib}">
-         <fileset dir="${resources}/test/ejbthree994">
-            <include name="ejbthree994-connectors-service.xml"/>
-         </fileset>
-      </copy>
-   </target>
+		<copy todir="${build.lib}">
+			<fileset dir="${resources}/test/ejbthree994">
+				<include name="ejbthree994-connectors-service.xml"/>
+			</fileset>
+		</copy>
+	</target>
 
-   <target name="ejbthree1023"
+	<target name="ejbthree1023"
       description="Builds a simple jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/ejbthree1023.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/ejbthree1023/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/ejbthree1023">
-            <include name="*.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/ejbthree1023.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/ejbthree1023/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/ejbthree1023">
+				<include name="*.xml"/>
+			</fileset>
+		</jar>
 
-   </target>
+	</target>
 
-   <target name="ejbthree1025"
+	<target name="ejbthree1025"
       description="Builds a simple jar files."
       depends="compile-classes">
 
-      <build-simple-jar name="ejbthree1025"/>
-   </target>
-	
-   <target name="ejbthree1028" description="Builds a simple jar file.">
-      <build-simple-jar name="ejbthree1028"/>
-   </target>
-   
-   <!--target name="ejbthree1057" depends="compile-classes">
+		<build-simple-jar name="ejbthree1025"/>
+	</target>
+
+	<target name="ejbthree1028" description="Builds a simple jar file.">
+		<build-simple-jar name="ejbthree1028"/>
+	</target>
+
+	<!--target name="ejbthree1057" depends="compile-classes">
       <build-simple-jar name="ejbthree1057"/>
    </target-->
 
-   <target name="ejbthree1062" depends="compile-classes">
-      <build-simple-jar name="ejbthree1062"/>
-   </target>
+	<target name="ejbthree1062" depends="compile-classes">
+		<build-simple-jar name="ejbthree1062"/>
+	</target>
 
-   <target name="ejbthree1109"
+	<target name="ejbthree1109"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/ejbthree1109.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/ejbthree1109/*.class"/>
-         </fileset>
-         <zipfileset dir="${build.resources}/test/ejbthree1109" includes="*"/>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/ejbthree1109.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/ejbthree1109/*.class"/>
+			</fileset>
+			<zipfileset dir="${build.resources}/test/ejbthree1109" includes="*"/>
+		</jar>
+	</target>
 
-   <target name="ejbthree1122" depends="compile-classes">
-      <build-simple-jar name="ejbthree1122"/>
-   </target>
+	<target name="ejbthree1122" depends="compile-classes">
+		<build-simple-jar name="ejbthree1122"/>
+	</target>
 
-   <target name="ejbthree1239"
+	<target name="ejbthree1239"
       description="Builds a simple jar files."
       depends="compile-classes">
 
-      <build-simple-jar name="ejbthree1239"/>
-   </target>
+		<build-simple-jar name="ejbthree1239"/>
+	</target>
 
-   <target name="ejbthree1358" depends="compile-classes">
-      <build-simple-jar name="ejbthree1358"/>
-   </target>
+	<target name="ejbthree1358" depends="compile-classes">
+		<build-simple-jar name="ejbthree1358"/>
+	</target>
 
-   <target name="ejbthree1504"
+	<target name="ejbthree1504"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/ejbthree1504.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/ejbthree1504/*.class"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/ejbthree1504.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/ejbthree1504/*.class"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="ejbthree1876"
+	<target name="ejbthree1876"
       description="Builds the ear and jar file(s) needed for testing EJBTHREE-1876."
       >
 
-      <mkdir dir="${build.lib}"/>
-      <!--  First build the jar file containing the EJBs -->
-      <jar jarfile="${build.lib}/ejbthree1876.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/ejbthree1876/*.class"/>
-         </fileset>
-      </jar>
+		<mkdir dir="${build.lib}"/>
+		<!--  First build the jar file containing the EJBs -->
+		<jar jarfile="${build.lib}/ejbthree1876.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/ejbthree1876/*.class"/>
+			</fileset>
+		</jar>
 
-      <!--  Now build the EAR and include the EJB jar and the queue-service.xml -->
-      <jar jarfile="${build.lib}/ejbthree1876.ear">
-         <fileset dir="${build.lib}">
-            <include name="ejbthree1876.jar"/>
-         </fileset>
-         <fileset dir="${resources}/test/ejbthree1876">
-            <include name="META-INF/application.xml"/>
-            <include name="META-INF/jboss-app.xml"/>
-         </fileset>
-      </jar>
-   </target>
+		<!--  Now build the EAR and include the EJB jar and the queue-service.xml -->
+		<jar jarfile="${build.lib}/ejbthree1876.ear">
+			<fileset dir="${build.lib}">
+				<include name="ejbthree1876.jar"/>
+			</fileset>
+			<fileset dir="${resources}/test/ejbthree1876">
+				<include name="META-INF/application.xml"/>
+				<include name="META-INF/jboss-app.xml"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="jbas4489"
+	<target name="jbas4489"
       description="Builds a simple jar files."
       depends="compile-classes">
 
-      <build-simple-jar name="jbas4489"/>
-   </target>
+		<build-simple-jar name="jbas4489"/>
+	</target>
 
-   <target name="jbpapp584" depends="compile-classes">
-      <mkdir dir="${build.lib}"/>
-      
-      <jar jarfile="${build.lib}/jbpapp584-jaas.sar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/jbpapp584/jaas/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/jbpapp584" includes="META-INF/*.xml"/>
-      </jar>
-      
-      <jar jarfile="${build.lib}/jbpapp584.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/jbpapp584/*.class"/>
-         </fileset>
-         <!-- fileset dir="${resources}/test/jbpapp584"/ -->
-      </jar>
-      
-      <jar jarfile="${build.lib}/jbpapp584.war">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/jbpapp584/web/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/jbpapp584/web"/>
-      </jar>
-      
-   </target>
-   
-   <target name="jbpapp999" depends="compile-classes">
-      <mkdir dir="${build.lib}"/>
+	<target name="jbpapp584" depends="compile-classes">
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/jbpapp999-ejb.jar">
-         <metainf dir="${build.resources}/test/jbpapp999">
-            <include name="ejb-jar.xml"/>
-         </metainf>
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/jbpapp999/Greeter*.class"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/jbpapp584-jaas.sar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/jbpapp584/jaas/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/jbpapp584" includes="META-INF/*.xml"/>
+		</jar>
 
-      <jar jarfile="${build.lib}/jbpapp999-lib.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/jbpapp999/*Interceptor.class"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/jbpapp584.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/jbpapp584/*.class"/>
+			</fileset>
+			<!-- fileset dir="${resources}/test/jbpapp584"/ -->
+		</jar>
 
-      <ear earfile="${build.lib}/jbpapp999.ear" appxml="${build.resources}/test/jbpapp999/application.xml">
-         <metainf dir="${build.resources}/test/jbpapp999">
-            <include name="jboss-app.xml"/>
-         </metainf>
-         <fileset dir="${build.lib}" includes="jbpapp999-*.jar"/>
-      </ear>
-   </target>
+		<jar jarfile="${build.lib}/jbpapp584.war">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/jbpapp584/web/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/jbpapp584/web"/>
+		</jar>
 
-   <target name="jbpapp1186"
+	</target>
+
+	<target name="jbpapp999" depends="compile-classes">
+		<mkdir dir="${build.lib}"/>
+
+		<jar jarfile="${build.lib}/jbpapp999-ejb.jar">
+			<metainf dir="${build.resources}/test/jbpapp999">
+				<include name="ejb-jar.xml"/>
+			</metainf>
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/jbpapp999/Greeter*.class"/>
+			</fileset>
+		</jar>
+
+		<jar jarfile="${build.lib}/jbpapp999-lib.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/jbpapp999/*Interceptor.class"/>
+			</fileset>
+		</jar>
+
+		<ear earfile="${build.lib}/jbpapp999.ear" appxml="${build.resources}/test/jbpapp999/application.xml">
+			<metainf dir="${build.resources}/test/jbpapp999">
+				<include name="jboss-app.xml"/>
+			</metainf>
+			<fileset dir="${build.lib}" includes="jbpapp999-*.jar"/>
+		</ear>
+	</target>
+
+	<target name="jbpapp1186"
       description="Builds a simple jar files."
       depends="compile-classes">
 
-      <build-simple-jar name="jbpapp1186"/>
-   </target>
+		<build-simple-jar name="jbpapp1186"/>
+	</target>
 
-   <target name="jbpapp1224"
+	<target name="jbpapp1224"
       description="Builds a simple jar files."
       depends="compile-classes">
 
-      <build-simple-jar name="jbpapp1224"/>
-   </target>
+		<build-simple-jar name="jbpapp1224"/>
+	</target>
 
-   <target name="jbpapp1668"
+	<target name="jbpapp1668"
       description="Builds a simple jar files."
       depends="compile-classes">
 
-      <jar jarfile="${build.lib}/jbpapp1668.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/common/*.class"/>
-            <include name="org/jboss/ejb3/test/jbpapp1668/*.class"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/jbpapp1668.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/common/*.class"/>
+				<include name="org/jboss/ejb3/test/jbpapp1668/*.class"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="jbpapp1951" depends="compile-classes">
-      <mkdir dir="${build.lib}"/>
-      <jar jarfile="${build.lib}/jbpapp1951.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/jbpapp1951/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/jbpapp1951"/>
-      </jar>
-   </target>
-   
-   <target name="jbpapp2260"
+	<target name="jbpapp1951" depends="compile-classes">
+		<mkdir dir="${build.lib}"/>
+		<jar jarfile="${build.lib}/jbpapp1951.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/jbpapp1951/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/jbpapp1951"/>
+		</jar>
+	</target>
+
+	<target name="jbpapp2260"
       description="Builds a simple jar files."
       depends="compile-classes">
 
-      <jar jarfile="${build.lib}/jbpapp2260.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/common/*.class"/>
-            <include name="org/jboss/ejb3/test/jbpapp2260/*.class"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/jbpapp2260.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/common/*.class"/>
+				<include name="org/jboss/ejb3/test/jbpapp2260/*.class"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="jaxws"
+	<target name="jaxws"
       description="Builds a simple jar."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/jaxws-context.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/jaxws/*.class"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/jaxws-context.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/jaxws/*.class"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="wolfc"
+	<target name="wolfc"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/wolfc.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/wolfc/*.class"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/wolfc.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/wolfc/*.class"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="scopedclassloader"
+	<target name="scopedclassloader"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/search-ejbs.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/regression/scopedclassloader/StatelessBean.class"/>
-            <include name="org/jboss/ejb3/test/regression/scopedclassloader/StatelessRemote.class"/>
-            <include name="org/jboss/ejb3/test/regression/scopedclassloader/ValueObject.class"/>
-            <include name="org/jboss/ejb3/test/regression/scopedclassloader/Customer.class"/>
-            <include name="org/jboss/ejb3/test/regression/scopedclassloader/ScopedException.class"/>
-         </fileset>
-         <fileset dir="${build.resources}/test/scopedclassloader/ejbear">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/search-ejbs.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/regression/scopedclassloader/StatelessBean.class"/>
+				<include name="org/jboss/ejb3/test/regression/scopedclassloader/StatelessRemote.class"/>
+				<include name="org/jboss/ejb3/test/regression/scopedclassloader/ValueObject.class"/>
+				<include name="org/jboss/ejb3/test/regression/scopedclassloader/Customer.class"/>
+				<include name="org/jboss/ejb3/test/regression/scopedclassloader/ScopedException.class"/>
+			</fileset>
+			<fileset dir="${build.resources}/test/scopedclassloader/ejbear">
+				<include name="META-INF/persistence.xml"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/sf-clientejb.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/regression/scopedclassloader/Client*.class"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/sf-clientejb.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/regression/scopedclassloader/Client*.class"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/search-ejbs-client.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/regression/scopedclassloader/ValueObject.class"/>
-            <include name="org/jboss/ejb3/test/regression/scopedclassloader/StatelessRemote.class"/>
-            <include name="org/jboss/ejb3/test/regression/scopedclassloader/Customer.class"/>
-            <include name="org/jboss/ejb3/test/regression/scopedclassloader/ScopedException.class"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/search-ejbs-client.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/regression/scopedclassloader/ValueObject.class"/>
+				<include name="org/jboss/ejb3/test/regression/scopedclassloader/StatelessRemote.class"/>
+				<include name="org/jboss/ejb3/test/regression/scopedclassloader/Customer.class"/>
+				<include name="org/jboss/ejb3/test/regression/scopedclassloader/ScopedException.class"/>
+			</fileset>
+		</jar>
 
-      <war warfile="${build.lib}/webtools.war"
+		<war warfile="${build.lib}/webtools.war"
               manifest="${build.resources}/test/scopedclassloader/webtools/META-INF/MANIFEST.MF"
          webxml="${build.resources}/test/scopedclassloader/webtools/WEB-INF/web.xml">
-         <fileset dir="${build.resources}/test/scopedclassloader/webtools">
-            <include name="*.jsp"/>
-         </fileset>
-      </war>
+			<fileset dir="${build.resources}/test/scopedclassloader/webtools">
+				<include name="*.jsp"/>
+			</fileset>
+		</war>
 
-      <ear earfile="${build.lib}/scopedclassloader-web.ear"
+		<ear earfile="${build.lib}/scopedclassloader-web.ear"
          appxml="${build.resources}/test/scopedclassloader/webear/META-INF/application.xml">
-         <metainf dir="${build.resources}/test/scopedclassloader/webear/META-INF">
-            <include name="jboss-app.xml"/>
-         </metainf>
-         <fileset dir="${build.lib}">
-            <include name="sf-clientejb.jar"/>
-            <include name="search-ejbs-client.jar"/>
-            <include name="webtools.war"/>
-         </fileset>
-      </ear>
+			<metainf dir="${build.resources}/test/scopedclassloader/webear/META-INF">
+				<include name="jboss-app.xml"/>
+			</metainf>
+			<fileset dir="${build.lib}">
+				<include name="sf-clientejb.jar"/>
+				<include name="search-ejbs-client.jar"/>
+				<include name="webtools.war"/>
+			</fileset>
+		</ear>
 
-      <ear earfile="${build.lib}/scopedclassloader-ejb.ear"
+		<ear earfile="${build.lib}/scopedclassloader-ejb.ear"
          appxml="${build.resources}/test/scopedclassloader/ejbear/META-INF/application.xml">
-         <metainf dir="${build.resources}/test/scopedclassloader/ejbear/META-INF">
-            <include name="jboss-app.xml"/>
-         </metainf>
-         <fileset dir="${build.lib}">
-            <include name="search-ejbs.jar"/>
-         </fileset>
-      </ear>
+			<metainf dir="${build.resources}/test/scopedclassloader/ejbear/META-INF">
+				<include name="jboss-app.xml"/>
+			</metainf>
+			<fileset dir="${build.lib}">
+				<include name="search-ejbs.jar"/>
+			</fileset>
+		</ear>
 
-   </target>
+	</target>
 
-   <target name="exception"
+	<target name="exception"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/exception.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/exception/*.class"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/exception.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/exception/*.class"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="dd/override"
+	<target name="dd/override"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <copy file="${resources}/test/dd/override/META-INF/ejb-jarB.xml" tofile="${resources}/test/dd/override/META-INF/ejb-jar.xml"/>
+		<copy file="${resources}/test/dd/override/META-INF/ejb-jarB.xml" tofile="${resources}/test/dd/override/META-INF/ejb-jar.xml"/>
 
-      <jar jarfile="${build.lib}/dd-override1B.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/dd/override/FooBean1.class"/>
-            <include name="org/jboss/ejb3/test/dd/override/Foo.class"/>
-            <include name="org/jboss/ejb3/test/dd/override/LocalFoo.class"/>
-            <include name="org/jboss/ejb3/test/dd/override/LocalFooBean.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/dd/override">
-            <include name="META-INF/ejb-jar.xml"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/dd-override1B.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/dd/override/FooBean1.class"/>
+				<include name="org/jboss/ejb3/test/dd/override/Foo.class"/>
+				<include name="org/jboss/ejb3/test/dd/override/LocalFoo.class"/>
+				<include name="org/jboss/ejb3/test/dd/override/LocalFooBean.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/dd/override">
+				<include name="META-INF/ejb-jar.xml"/>
+			</fileset>
+		</jar>
+	</target>
 
 
-   <target name="hbm"
+	<target name="hbm"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/hbm-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/hbm/*.class"/>
-            <exclude name="org/jboss/ejb3/test/hbm/HBM2.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/hbm">
-            <include name="META-INF/hbm.hbm.xml"/>
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
-      <jar jarfile="${build.lib}/hbm2-test.par">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/hbm/HBM2.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/hbm">
-            <include name="META-INF/hbm2.hbm.xml"/>
-         </fileset>
-         <fileset dir="${resources}/test/hbm/hbm2">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/hbm-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/hbm/*.class"/>
+				<exclude name="org/jboss/ejb3/test/hbm/HBM2.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/hbm">
+				<include name="META-INF/hbm.hbm.xml"/>
+				<include name="META-INF/persistence.xml"/>
+			</fileset>
+		</jar>
+		<jar jarfile="${build.lib}/hbm2-test.par">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/hbm/HBM2.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/hbm">
+				<include name="META-INF/hbm2.hbm.xml"/>
+			</fileset>
+			<fileset dir="${resources}/test/hbm/hbm2">
+				<include name="META-INF/persistence.xml"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="regressionHHH275"
+	<target name="regressionHHH275"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/regressionHHH275-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/regressionHHH275/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/regressionHHH275">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/regressionHHH275-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/regressionHHH275/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/regressionHHH275">
+				<include name="META-INF/persistence.xml"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="regression"
+	<target name="regression"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/salesforce-7123.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/regression/salesforce7123/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/regression/salesforce7123">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
-      <jar jarfile="${build.lib}/regression-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/regression/*.class"/>
-         </fileset>
-      </jar>
-      <jar jarfile="${build.lib}/regression-ejbthree249-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/regression/ejbthree249/*.class"/>
-         </fileset>
-      </jar>
-      <jar jarfile="${build.lib}/regression-ejbthree290-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/regression/ejbthree290/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/regression/ejbthree290">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
-      <jar jarfile="${build.lib}/regression-ejbthree625-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/regression/ejbthree625/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/regression/ejbthree625">
-            <include name="META-INF/ejb-jar.xml"/>
-         </fileset>
-      </jar>
-      <jar jarfile="${build.lib}/regression-ejbthree231.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/regression/ejbthree231/*.class"/>
-         </fileset>
-      </jar>
-      <jar jarfile="${build.lib}/regression-ejbthree315.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/regression/ejbthree315/*.class"/>
-         </fileset>
-      </jar>
-      <jar jarfile="${build.lib}/regression-ejbthree316.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/regression/ejbthree316/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/regression/ejbthree316">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
-      <jar jarfile="${build.lib}/regression-ejbthree376.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/regression/ejbthree376/*.class"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/salesforce-7123.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/regression/salesforce7123/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/regression/salesforce7123">
+				<include name="META-INF/persistence.xml"/>
+			</fileset>
+		</jar>
+		<jar jarfile="${build.lib}/regression-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/regression/*.class"/>
+			</fileset>
+		</jar>
+		<jar jarfile="${build.lib}/regression-ejbthree249-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/regression/ejbthree249/*.class"/>
+			</fileset>
+		</jar>
+		<jar jarfile="${build.lib}/regression-ejbthree290-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/regression/ejbthree290/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/regression/ejbthree290">
+				<include name="META-INF/persistence.xml"/>
+			</fileset>
+		</jar>
+		<jar jarfile="${build.lib}/regression-ejbthree625-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/regression/ejbthree625/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/regression/ejbthree625">
+				<include name="META-INF/ejb-jar.xml"/>
+			</fileset>
+		</jar>
+		<jar jarfile="${build.lib}/regression-ejbthree231.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/regression/ejbthree231/*.class"/>
+			</fileset>
+		</jar>
+		<jar jarfile="${build.lib}/regression-ejbthree315.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/regression/ejbthree315/*.class"/>
+			</fileset>
+		</jar>
+		<jar jarfile="${build.lib}/regression-ejbthree316.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/regression/ejbthree316/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/regression/ejbthree316">
+				<include name="META-INF/persistence.xml"/>
+			</fileset>
+		</jar>
+		<jar jarfile="${build.lib}/regression-ejbthree376.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/regression/ejbthree376/*.class"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="strictpool"
+	<target name="strictpool"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/strictpool-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/strictpool/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/strictpool">
-            <include name="META-INF/*.xml"/>
-         </fileset>
-      </jar>
-      <copy todir="${build.lib}">
-         <fileset dir="${resources}/test/strictpool">
-            <include name="*.xml"/>
-         </fileset>
-      </copy>
+		<jar jarfile="${build.lib}/strictpool-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/strictpool/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/strictpool">
+				<include name="META-INF/*.xml"/>
+			</fileset>
+		</jar>
+		<copy todir="${build.lib}">
+			<fileset dir="${resources}/test/strictpool">
+				<include name="*.xml"/>
+			</fileset>
+		</copy>
 
-      <mq2jbm basedir="${resources}/test/strictpool"/>
-   </target>
+		<mq2jbm basedir="${resources}/test/strictpool"/>
+	</target>
 
-   <target name="relationships"
+	<target name="relationships"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/relationships-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/relationships/*.class"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/relationships-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/relationships/*.class"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="ssl"
+	<target name="ssl"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/ssl-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/ssl/*.class"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/ssl-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/ssl/*.class"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="arjuna"
+	<target name="arjuna"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/arjuna-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/arjuna/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/arjuna">
-            <include name="META-INF/*.xml"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/arjuna-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/arjuna/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/arjuna">
+				<include name="META-INF/*.xml"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="ssladvanced"
+	<target name="ssladvanced"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/ssladvanced-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/ssladvanced/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/ssladvanced">
-            <include name="META-INF/jboss.xml"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/ssladvanced-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/ssladvanced/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/ssladvanced">
+				<include name="META-INF/jboss.xml"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="entity"
+	<target name="entity"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/entity-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/entity/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/entity">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/entity-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/entity/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/entity">
+				<include name="META-INF/persistence.xml"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="entityoptimisticlocking"
+	<target name="entityoptimisticlocking"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/entityoptimisticlocking-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/entity/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/entityoptimisticlocking">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/entityoptimisticlocking-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/entity/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/entityoptimisticlocking">
+				<include name="META-INF/persistence.xml"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="persistenceunits"
+	<target name="persistenceunits"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/persistenceunits-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/persistenceunits/Entity*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/persistenceunits">
-            <include name="META-INF/persistence.xml"/>
-            <include name="*.xml"/>
-            <include name="*.jar"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/persistenceunits-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/persistenceunits/Entity*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/persistenceunits">
+				<include name="META-INF/persistence.xml"/>
+				<include name="*.xml"/>
+				<include name="*.jar"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/persistenceunitscope.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/persistenceunits/Entity*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/persistenceunits">
-            <include name="entity2-ds.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/persistenceunitscope.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/persistenceunits/Entity*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/persistenceunits">
+				<include name="entity2-ds.xml"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/persistenceunitscope1.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/persistenceunits/Entity1.class"/>
-            <include name="org/jboss/ejb3/test/persistenceunits/Entity2.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/persistenceunits">
-            <include name="entity2-ds.xml"/>
-         </fileset>
-         <!--fileset dir="${resources}/test/persistenceunits">
+		<jar jarfile="${build.lib}/persistenceunitscope1.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/persistenceunits/Entity1.class"/>
+				<include name="org/jboss/ejb3/test/persistenceunits/Entity2.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/persistenceunits">
+				<include name="entity2-ds.xml"/>
+			</fileset>
+			<!--fileset dir="${resources}/test/persistenceunits">
             <include name="META-INF/persistence.xml"/>
          </fileset-->
-      </jar>
+		</jar>
 
-      <jar jarfile="${build.lib}/persistenceunitscope2.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/persistenceunits/Entity1.class"/>
-            <include name="org/jboss/ejb3/test/persistenceunits/Entity2.class"/>
-         </fileset>
-         <!--fileset dir="${resources}/test/persistenceunits">
+		<jar jarfile="${build.lib}/persistenceunitscope2.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/persistenceunits/Entity1.class"/>
+				<include name="org/jboss/ejb3/test/persistenceunits/Entity2.class"/>
+			</fileset>
+			<!--fileset dir="${resources}/test/persistenceunits">
             <include name="META-INF/persistence.xml"/>
          </fileset-->
-      </jar>
+		</jar>
 
-      <jar jarfile="${build.lib}/persistenceunitscope-slsb.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/persistenceunits/EntityTest*.class"/>
-         </fileset>
-         <!--fileset dir="${resources}/test/persistenceunits">
+		<jar jarfile="${build.lib}/persistenceunitscope-slsb.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/persistenceunits/EntityTest*.class"/>
+			</fileset>
+			<!--fileset dir="${resources}/test/persistenceunits">
             <include name="META-INF/persistence.xml"/>
          </fileset-->
-      </jar>
+		</jar>
 
-      <ear earfile="${build.lib}/persistenceunitscope-test.ear" appxml="${resources}/test/persistenceunits/application.xml">
-         <zipfileset dir="${build.lib}" prefix="lib">
-            <include name="persistenceunitscope.jar"/>
-         </zipfileset>
-         <fileset dir="${resources}/test/persistenceunits">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </ear>
+		<ear earfile="${build.lib}/persistenceunitscope-test.ear" appxml="${resources}/test/persistenceunits/application.xml">
+			<zipfileset dir="${build.lib}" prefix="lib">
+				<include name="persistenceunitscope.jar"/>
+			</zipfileset>
+			<fileset dir="${resources}/test/persistenceunits">
+				<include name="META-INF/persistence.xml"/>
+			</fileset>
+		</ear>
 
-      <ear earfile="${build.lib}/persistenceunitscope-test1.ear" appxml="${resources}/test/persistenceunits/application1.xml">
-         <zipfileset dir="${build.lib}" prefix="lib">
-            <include name="persistenceunitscope1.jar"/>
-            <include name="persistenceunitscope-slsb.jar"/>
-         </zipfileset>
-         <fileset dir="${resources}/test/persistenceunits">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </ear>
+		<ear earfile="${build.lib}/persistenceunitscope-test1.ear" appxml="${resources}/test/persistenceunits/application1.xml">
+			<zipfileset dir="${build.lib}" prefix="lib">
+				<include name="persistenceunitscope1.jar"/>
+				<include name="persistenceunitscope-slsb.jar"/>
+			</zipfileset>
+			<fileset dir="${resources}/test/persistenceunits">
+				<include name="META-INF/persistence.xml"/>
+			</fileset>
+		</ear>
 
-      <ear earfile="${build.lib}/persistenceunitscope-test2.ear" appxml="${resources}/test/persistenceunits/application2.xml">
-         <zipfileset dir="${build.lib}" prefix="lib">
-            <include name="persistenceunitscope2.jar"/>
-            <include name="persistenceunitscope-slsb.jar"/>
-         </zipfileset>
-         <!--fileset dir="${resources}/test/persistenceunits">
+		<ear earfile="${build.lib}/persistenceunitscope-test2.ear" appxml="${resources}/test/persistenceunits/application2.xml">
+			<zipfileset dir="${build.lib}" prefix="lib">
+				<include name="persistenceunitscope2.jar"/>
+				<include name="persistenceunitscope-slsb.jar"/>
+			</zipfileset>
+			<!--fileset dir="${resources}/test/persistenceunits">
             <include name="META-INF/persistence.xml"/>
          </fileset-->
-      </ear>
+		</ear>
 
-      <jar jarfile="${build.lib}/persistenceunitsharedentity1.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/persistenceunits/Entity*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/persistenceunits">
-            <include name="entity2-ds.xml"/>
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/persistenceunitsharedentity1.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/persistenceunits/Entity*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/persistenceunits">
+				<include name="entity2-ds.xml"/>
+				<include name="META-INF/persistence.xml"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/persistenceunitsharedentity2.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/persistenceunits/Service*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/persistenceunits">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/persistenceunitsharedentity2.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/persistenceunits/Service*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/persistenceunits">
+				<include name="META-INF/persistence.xml"/>
+			</fileset>
+		</jar>
 
-      <ear earfile="${build.lib}/persistenceunitsharedentity-test.ear" appxml="${resources}/test/persistenceunits/sharedEntityApplication.xml">
-         <zipfileset dir="${build.lib}" prefix="lib">
-            <include name="persistenceunitsharedentity1.jar"/>
-            <include name="persistenceunitsharedentity2.jar"/>
-         </zipfileset>
-      </ear>
-   	
-   	<!-- Build the book manager application ear -->
-   	<!-- first the entity jar file -->
-   		<jar jarfile="${build.lib}/bookmanager-entities.jar">
-   	         <fileset dir="${build.classes}">
-   	            <include name="org/jboss/ejb3/test/persistenceunits/Book.class"/>
-   	         </fileset>
+		<ear earfile="${build.lib}/persistenceunitsharedentity-test.ear" appxml="${resources}/test/persistenceunits/sharedEntityApplication.xml">
+			<zipfileset dir="${build.lib}" prefix="lib">
+				<include name="persistenceunitsharedentity1.jar"/>
+				<include name="persistenceunitsharedentity2.jar"/>
+			</zipfileset>
+		</ear>
+
+		<!-- Build the book manager application ear -->
+		<!-- first the entity jar file -->
+		<jar jarfile="${build.lib}/bookmanager-entities.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/persistenceunits/Book.class"/>
+			</fileset>
 		</jar>
-   	<!-- the ejbs -->
+		<!-- the ejbs -->
 		<jar jarfile="${build.lib}/bookmanager-beans.jar">
-	         <fileset dir="${build.classes}">
-	            <include name="org/jboss/ejb3/test/persistenceunits/BookManager.class"/>
-	         	<include name="org/jboss/ejb3/test/persistenceunits/BookManagerBean.class"/>
-	         </fileset>
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/persistenceunits/BookManager.class"/>
+				<include name="org/jboss/ejb3/test/persistenceunits/BookManagerBean.class"/>
+			</fileset>
 		</jar>
-   	<!-- finally collect them in a ear -->
-   		<ear earfile="${build.lib}/bookmanager.ear" appxml="${resources}/test/persistenceunits/bookmanager/META-INF/application.xml">
-   	         <zipfileset dir="${build.lib}" prefix="lib">
-   	            <include name="bookmanager-entities.jar"/>
-   	         </zipfileset>
-  	         <zipfileset dir="${build.lib}">
-  	            <include name="bookmanager-beans.jar"/>
-  	         </zipfileset>
-  	         <zipfileset dir="${resources}/test/persistenceunits/bookmanager/META-INF" prefix="META-INF">
-  	            <include name="persistence.xml"/>
-  	         </zipfileset>
-   	      </ear>
+		<!-- finally collect them in a ear -->
+		<ear earfile="${build.lib}/bookmanager.ear" appxml="${resources}/test/persistenceunits/bookmanager/META-INF/application.xml">
+			<zipfileset dir="${build.lib}" prefix="lib">
+				<include name="bookmanager-entities.jar"/>
+			</zipfileset>
+			<zipfileset dir="${build.lib}">
+				<include name="bookmanager-beans.jar"/>
+			</zipfileset>
+			<zipfileset dir="${resources}/test/persistenceunits/bookmanager/META-INF" prefix="META-INF">
+				<include name="persistence.xml"/>
+			</zipfileset>
+		</ear>
 
-   	<!-- Build the user manager application ear -->
-   	   	<!-- first the entity jar file -->
-   	   		<jar jarfile="${build.lib}/usermanager-entities.jar">
-   	   	         <fileset dir="${build.classes}">
-   	   	            <include name="org/jboss/ejb3/test/persistenceunits/User.class"/>
-   	   	         </fileset>
-   			</jar>
-   	   	<!-- the ejbs -->
-   			<jar jarfile="${build.lib}/usermanager-beans.jar">
-   		         <fileset dir="${build.classes}">
-   		            <include name="org/jboss/ejb3/test/persistenceunits/UserManager.class"/>
-   		         	<include name="org/jboss/ejb3/test/persistenceunits/UserManagerBean.class"/>
-   		         </fileset>
-   			</jar>
-   	   	<!-- finally collect them in a ear -->
-   	   		<ear earfile="${build.lib}/usermanager.ear" appxml="${resources}/test/persistenceunits/usermanager/META-INF/application.xml">
-   	   	         <zipfileset dir="${build.lib}" prefix="lib">
-   	   	            <include name="usermanager-entities.jar"/>
-   	   	         </zipfileset>
-   	  	         <zipfileset dir="${build.lib}">
-   	  	            <include name="usermanager-beans.jar"/>
-   	  	         </zipfileset>
-   	  	         <zipfileset dir="${resources}/test/persistenceunits/usermanager/META-INF" prefix="META-INF">
-   	  	            <include name="persistence.xml"/>
-   	  	         </zipfileset>
-   	   	      </ear>
-   </target>
+		<!-- Build the user manager application ear -->
+		<!-- first the entity jar file -->
+		<jar jarfile="${build.lib}/usermanager-entities.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/persistenceunits/User.class"/>
+			</fileset>
+		</jar>
+		<!-- the ejbs -->
+		<jar jarfile="${build.lib}/usermanager-beans.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/persistenceunits/UserManager.class"/>
+				<include name="org/jboss/ejb3/test/persistenceunits/UserManagerBean.class"/>
+			</fileset>
+		</jar>
+		<!-- finally collect them in a ear -->
+		<ear earfile="${build.lib}/usermanager.ear" appxml="${resources}/test/persistenceunits/usermanager/META-INF/application.xml">
+			<zipfileset dir="${build.lib}" prefix="lib">
+				<include name="usermanager-entities.jar"/>
+			</zipfileset>
+			<zipfileset dir="${build.lib}">
+				<include name="usermanager-beans.jar"/>
+			</zipfileset>
+			<zipfileset dir="${resources}/test/persistenceunits/usermanager/META-INF" prefix="META-INF">
+				<include name="persistence.xml"/>
+			</zipfileset>
+		</ear>
+	</target>
 
-   <target name="externalpersistenceunit"
+	<target name="externalpersistenceunit"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/externalpersistenceunit-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/externalpersistenceunit/*.class"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/externalpersistenceunit-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/externalpersistenceunit/*.class"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/externalpersistenceunit-pu.jar">
-         <fileset dir="${resources}/test/externalpersistenceunit">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
-   </target>
-	
+		<jar jarfile="${build.lib}/externalpersistenceunit-pu.jar">
+			<fileset dir="${resources}/test/externalpersistenceunit">
+				<include name="META-INF/persistence.xml"/>
+			</fileset>
+		</jar>
+	</target>
+
 	<target name="jbpapp1307"
 	      description="Builds jar files required for testing JBPAPP-1307."
 	      depends="compile-classes">
 
-	      <mkdir dir="${build.lib}"/>
-		
+		<mkdir dir="${build.lib}"/>
+
 		<!-- Build a dummy jar file to be used as a nested jar in a persistence
 		unit jar -->
 		<jar jarfile="${build.lib}/jbpapp-1307-dummy.jar">
-	         <fileset dir="${build.classes}">
-	            <include name="org/jboss/ejb3/test/jbpapp1307/Dummy.class"/>
-	         </fileset>
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/jbpapp1307/Dummy.class"/>
+			</fileset>
 		</jar>
 
-      <jar jarfile="${build.lib}/jbpapp1307.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/jbpapp1307/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/jbpapp1307">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-         <fileset dir="${build.lib}">
-            <include name="jbpapp-1307-dummy.jar"/>
-         </fileset>
+		<jar jarfile="${build.lib}/jbpapp1307.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/jbpapp1307/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/jbpapp1307">
+				<include name="META-INF/persistence.xml"/>
+			</fileset>
+			<fileset dir="${build.lib}">
+				<include name="jbpapp-1307-dummy.jar"/>
+			</fileset>
 
-      </jar>
+		</jar>
 	</target>
 
-   <target name="mdbtransactions"
+	<target name="mdbtransactions"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/mdbtransactions-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/mdbtransactions/*.class"/>
-            <exclude name="org/jboss/ejb3/test/mdbtransactions/*21.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/mdbtransactions">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/mdbtransactions-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/mdbtransactions/*.class"/>
+				<exclude name="org/jboss/ejb3/test/mdbtransactions/*21.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/mdbtransactions">
+				<include name="META-INF/persistence.xml"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/mdbtransactions21-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/mdbtransactions/*21.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/mdbtransactions">
-            <include name="META-INF/ejb-jar.xml"/>
-            <include name="META-INF/jboss.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/mdbtransactions21-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/mdbtransactions/*21.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/mdbtransactions">
+				<include name="META-INF/ejb-jar.xml"/>
+				<include name="META-INF/jboss.xml"/>
+			</fileset>
+		</jar>
 
-      <copy todir="${build.lib}">
-         <fileset dir="${resources}/test/mdbtransactions">
-            <include name="*.xml"/>
-         </fileset>
-      </copy>
+		<copy todir="${build.lib}">
+			<fileset dir="${resources}/test/mdbtransactions">
+				<include name="*.xml"/>
+			</fileset>
+		</copy>
 
-      <mq2jbm basedir="${resources}/test/mdbtransactions"/>
-   </target>
+		<mq2jbm basedir="${resources}/test/mdbtransactions"/>
+	</target>
 
-   <target name="longlived"
+	<target name="longlived"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/longlived-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/longlived/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/longlived">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/longlived-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/longlived/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/longlived">
+				<include name="META-INF/persistence.xml"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="entityexception"
+	<target name="entityexception"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/entityexception-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/entityexception/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/entityexception">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/entityexception-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/entityexception/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/entityexception">
+				<include name="META-INF/persistence.xml"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="composite"
+	<target name="composite"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/composite-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/composite/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/composite">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/composite-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/composite/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/composite">
+				<include name="META-INF/persistence.xml"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="composite2"
+	<target name="composite2"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/composite2-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/composite2/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/composite2">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/composite2-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/composite2/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/composite2">
+				<include name="META-INF/persistence.xml"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="lob"
+	<target name="lob"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/lob-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/lob/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/lob">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/lob-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/lob/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/lob">
+				<include name="META-INF/persistence.xml"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="manytomany"
+	<target name="manytomany"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/manytomany-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/manytomany/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/manytomany">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/manytomany-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/manytomany/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/manytomany">
+				<include name="META-INF/persistence.xml"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="joininheritance"
+	<target name="joininheritance"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/join-inheritance-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/joininheritance/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/joininheritance">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/join-inheritance-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/joininheritance/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/joininheritance">
+				<include name="META-INF/persistence.xml"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="singletable"
+	<target name="singletable"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/single-table-inheritance-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/singletableinheritance/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/singletable">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/single-table-inheritance-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/singletableinheritance/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/singletable">
+				<include name="META-INF/persistence.xml"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="invalidtxmdb"
+	<target name="invalidtxmdb"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/invalidtxmdb-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/invalidtxmdb/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/invalidtxmdb">
-            <include name="*.xml"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/invalidtxmdb-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/invalidtxmdb/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/invalidtxmdb">
+				<include name="*.xml"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="mdbsessionpoolclear"
+	<target name="mdbsessionpoolclear"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/mdbsessionpoolclear-test.ejb3">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/mdbsessionpoolclear/TestStatus*.class"/>
-            <include name="org/jboss/ejb3/test/mdbsessionpoolclear/Ejb3*.class"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/mdbsessionpoolclear-test.ejb3">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/mdbsessionpoolclear/TestStatus*.class"/>
+				<include name="org/jboss/ejb3/test/mdbsessionpoolclear/Ejb3*.class"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/mdbsessionpoolclear-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/mdbsessionpoolclear/Ejb21*.class"/>
-            <include name="org/jboss/ejb3/test/mdbsessionpoolclear/TestStatus.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/mdbsessionpoolclear">
-            <include name="META-INF/ejb-jar.xml"/>
-            <include name="META-INF/jboss.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/mdbsessionpoolclear-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/mdbsessionpoolclear/Ejb21*.class"/>
+				<include name="org/jboss/ejb3/test/mdbsessionpoolclear/TestStatus.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/mdbsessionpoolclear">
+				<include name="META-INF/ejb-jar.xml"/>
+				<include name="META-INF/jboss.xml"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${resources}/test-configs/mdbsessionpoolclear/lib/mdbsessionpoolclear.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/mdbsessionpoolclear/TestServer*.class"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${resources}/test-configs/mdbsessionpoolclear/lib/mdbsessionpoolclear.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/mdbsessionpoolclear/TestServer*.class"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/test-jms-ra.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/mdbsessionpoolclear/adapter/**/*.class"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/test-jms-ra.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/mdbsessionpoolclear/adapter/**/*.class"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${resources}/test-configs/mdbsessionpoolclear/deploy/jms/test-jms-ra.rar">
-         <fileset dir="${build.lib}">
-            <include name="test-jms-ra.jar"/>
-         </fileset>
-         <fileset dir="${resources}/test/mdbsessionpoolclear">
-            <include name="META-INF/ra.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${resources}/test-configs/mdbsessionpoolclear/deploy/jms/test-jms-ra.rar">
+			<fileset dir="${build.lib}">
+				<include name="test-jms-ra.jar"/>
+			</fileset>
+			<fileset dir="${resources}/test/mdbsessionpoolclear">
+				<include name="META-INF/ra.xml"/>
+			</fileset>
+		</jar>
 
-      <mq2jbm basedir="${resources}/test/mdbsessionpoolclear"/>
+		<mq2jbm basedir="${resources}/test/mdbsessionpoolclear"/>
 
-      <copy todir="${build.lib}">
-         <fileset dir="${resources}/test/mdbsessionpoolclear">
-            <include name="*.xml"/>
-         </fileset>
-      </copy>
+		<copy todir="${build.lib}">
+			<fileset dir="${resources}/test/mdbsessionpoolclear">
+				<include name="*.xml"/>
+			</fileset>
+		</copy>
 
-   </target>
+	</target>
 
-   <target name="mdb"
+	<target name="mdb"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/mdb-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/mdb/*.class"/>
-            <include name="org/jboss/ejb3/test/mdb/unit/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/mdb">
-            <include name="users.properties"/>
-            <include name="roles.properties"/>
-         </fileset>
-         <fileset dir="${resources}/test/mdb">
-            <include name="META-INF/*.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/mdb-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/mdb/*.class"/>
+				<include name="org/jboss/ejb3/test/mdb/unit/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/mdb">
+				<include name="users.properties"/>
+				<include name="roles.properties"/>
+			</fileset>
+			<fileset dir="${resources}/test/mdb">
+				<include name="META-INF/*.xml"/>
+			</fileset>
+		</jar>
 
-      <mq2jbm basedir="${resources}/test/mdb"/>
+		<mq2jbm basedir="${resources}/test/mdb"/>
 
-      <copy todir="${build.lib}">
-         <fileset dir="${resources}/test/mdb">
-            <include name="*.xml"/>
-         </fileset>
-      </copy>
+		<copy todir="${build.lib}">
+			<fileset dir="${resources}/test/mdb">
+				<include name="*.xml"/>
+			</fileset>
+		</copy>
 
-   </target>
+	</target>
 
-   <target name="mdbtopic"
+	<target name="mdbtopic"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/mdbtopic-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/mdbtopic/*.class"/>
-            <include name="org/jboss/ejb3/test/mdbtopic/unit/*.class"/>
-         </fileset>
-         <!--
+		<jar jarfile="${build.lib}/mdbtopic-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/mdbtopic/*.class"/>
+				<include name="org/jboss/ejb3/test/mdbtopic/unit/*.class"/>
+			</fileset>
+			<!--
          <fileset dir="${resources}/test/mdb">
             <include name="users.properties"/>
             <include name="roles.properties"/>
@@ -3131,84 +3154,84 @@
             <include name="META-INF/*.xml"/>
          </fileset>
          -->
-      </jar>
+		</jar>
 
-      <!--
+		<!--
       <copy todir="${build.lib}/embeddable/standalone">
          <fileset dir="${build.lib}">
             <include name="mdbtopic-test.jar"/>
          </fileset>
       </copy>
       -->
-   </target>
+	</target>
 
-   <target name="concurrent"
+	<target name="concurrent"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/concurrent.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/concurrent/*.class"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/concurrent.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/concurrent/*.class"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="consumer"
+	<target name="consumer"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/consumer-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/consumer/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/consumer">
-            <include name="META-INF/jboss.xml"/>
-         </fileset>
-      </jar>
-      <copy todir="${build.lib}">
-         <fileset dir="${resources}/test/consumer">
-            <include name="*.xml"/>
-         </fileset>
-      </copy>
-   </target>
+		<jar jarfile="${build.lib}/consumer-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/consumer/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/consumer">
+				<include name="META-INF/jboss.xml"/>
+			</fileset>
+		</jar>
+		<copy todir="${build.lib}">
+			<fileset dir="${resources}/test/consumer">
+				<include name="*.xml"/>
+			</fileset>
+		</copy>
+	</target>
 
-   <target name="tableperclass"
+	<target name="tableperclass"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/table-per-class-inheritance-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/tableperinheritance/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/tableperinheritance">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/table-per-class-inheritance-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/tableperinheritance/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/tableperinheritance">
+				<include name="META-INF/persistence.xml"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="dependent"
+	<target name="dependent"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/dependent-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/dependent/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/dependent">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/dependent-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/dependent/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/dependent">
+				<include name="META-INF/persistence.xml"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <!--target name="concurrent"
+	<!--target name="concurrent"
       description="Builds all jar files."
       depends="compile-classes">
       
@@ -3222,44 +3245,44 @@
       </jar>
    </target-->
 
-   <target name="descriptortypo"
+	<target name="descriptortypo"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/descriptortypo-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/descriptortypo/**/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/descriptortypo">
-            <include name="META-INF/*.xml"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/descriptortypo-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/descriptortypo/**/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/descriptortypo">
+				<include name="META-INF/*.xml"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="stateful"
+	<target name="stateful"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/stateful-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/stateful/**/*.class"/>
-            <include name="org/jboss/ejb3/test/stateful/unit/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/stateful">
-            <include name="META-INF/*.xml"/>
-         </fileset>
-         <fileset dir="${resources}/test/stateful">
-            <include name="*.xml"/>
-            <include name="*.properties"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/stateful-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/stateful/**/*.class"/>
+				<include name="org/jboss/ejb3/test/stateful/unit/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/stateful">
+				<include name="META-INF/*.xml"/>
+			</fileset>
+			<fileset dir="${resources}/test/stateful">
+				<include name="*.xml"/>
+				<include name="*.properties"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <!--target name="seam"
+	<!--target name="seam"
       description="Builds all jar files."
       depends="compile-classes">
 
@@ -3276,391 +3299,391 @@
       </jar>
    </target-->
 
-   <target name="aspectdomain"
+	<target name="aspectdomain"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/aspectdomain.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/aspectdomain/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/aspectdomain">
-            <include name="*.xml"/>
-            <include name="META-INF/jboss.xml"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/aspectdomain.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/aspectdomain/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/aspectdomain">
+				<include name="*.xml"/>
+				<include name="META-INF/jboss.xml"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="ejbthree1090"
+	<target name="ejbthree1090"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/ejbthree1090-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/ejbthree1090/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/ejbthree1090">
-            <include name="*.xml"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/ejbthree1090-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/ejbthree1090/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/ejbthree1090">
+				<include name="*.xml"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="ejbcontext"
+	<target name="ejbcontext"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/ejbcontext.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/ejbcontext/*.class"/>
-         </fileset>
-         <!--fileset dir="${resources}/test/ejbcontext">
+		<jar jarfile="${build.lib}/ejbcontext.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/ejbcontext/*.class"/>
+			</fileset>
+			<!--fileset dir="${resources}/test/ejbcontext">
             <include name="META-INF/ejb-jar.xml"/>
          </fileset-->
-      </jar>
-   </target>
+		</jar>
+	</target>
 
-   <target name="iiop"
+	<target name="iiop"
       description="Builds iiop.jar."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/iiop.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/iiop/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test">
-            <include name="users.properties"/>
-            <include name="roles.properties"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/iiop.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/iiop/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test">
+				<include name="users.properties"/>
+				<include name="roles.properties"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="security"
+	<target name="security"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/security.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/security/*.class"/>
-            <exclude name="org/jboss/ejb3/test/security/UncheckedStateless*.class"/>
-            <exclude name="org/jboss/ejb3/test/security/Timer*.class"/>
-            <exclude name="org/jboss/ejb3/test/security/Unauthenticated*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/security">
-            <include name="users.properties"/>
-            <include name="roles.properties"/>
-            <include name="security-spec.sar"/>
-         </fileset>
-         <fileset dir="${resources}/test/security">
-            <include name="META-INF/ejb-jar.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/security.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/security/*.class"/>
+				<exclude name="org/jboss/ejb3/test/security/UncheckedStateless*.class"/>
+				<exclude name="org/jboss/ejb3/test/security/Timer*.class"/>
+				<exclude name="org/jboss/ejb3/test/security/Unauthenticated*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/security">
+				<include name="users.properties"/>
+				<include name="roles.properties"/>
+				<include name="security-spec.sar"/>
+			</fileset>
+			<fileset dir="${resources}/test/security">
+				<include name="META-INF/ejb-jar.xml"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/timer-runas-security.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/security/UncheckedStateless*.class"/>
-            <include name="org/jboss/ejb3/test/security/Timer*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/security">
-            <include name="jboss-service.xml"/>
-         </fileset>
-         <fileset dir="${resources}/test/security">
-            <include name="META-INF/jaas-test-config.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/timer-runas-security.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/security/UncheckedStateless*.class"/>
+				<include name="org/jboss/ejb3/test/security/Timer*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/security">
+				<include name="jboss-service.xml"/>
+			</fileset>
+			<fileset dir="${resources}/test/security">
+				<include name="META-INF/jaas-test-config.xml"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/security-extensions.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/security/Unauthenticated*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/security">
-            <include name="META-INF/jboss.xml"/>
-         </fileset>
-         <fileset dir="${resources}/test/security">
-            <include name="users.properties"/>
-            <include name="roles.properties"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/security-extensions.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/security/Unauthenticated*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/security">
+				<include name="META-INF/jboss.xml"/>
+			</fileset>
+			<fileset dir="${resources}/test/security">
+				<include name="users.properties"/>
+				<include name="roles.properties"/>
+			</fileset>
+		</jar>
 
-      <copy file="${resources}/test/security/META-INF/jaas-test-config.xml" tofile="${build.classes}/jaas-test-config.xml"/>
+		<copy file="${resources}/test/security/META-INF/jaas-test-config.xml" tofile="${build.classes}/jaas-test-config.xml"/>
 
-      <war warfile="${build.lib}/security-web.war"
+		<war warfile="${build.lib}/security-web.war"
          webxml="${build.resources}/test/security/WEB-INF/web.xml">
-         <webinf dir="${build.resources}/test/security/WEB-INF">
-            <include name="jboss-web.xml"/>
-         </webinf>
-         <classes dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/security/servlets/**"/>
-         </classes>
-      </war>
-   </target>
+			<webinf dir="${build.resources}/test/security/WEB-INF">
+				<include name="jboss-web.xml"/>
+			</webinf>
+			<classes dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/security/servlets/**"/>
+			</classes>
+		</war>
+	</target>
 
-   <target name="homeinterface"
+	<target name="homeinterface"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/homeinterface-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/homeinterface/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/homeinterface">
-            <include name="META-INF/jboss.xml"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/homeinterface-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/homeinterface/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/homeinterface">
+				<include name="META-INF/jboss.xml"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="libdeployment"
+	<target name="libdeployment"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/libdeployment-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/libdeployment/Stateless*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/libdeployment">
-            <include name="META-INF/*.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/libdeployment-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/libdeployment/Stateless*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/libdeployment">
+				<include name="META-INF/*.xml"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/libdeployment.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/libdeployment/Stateful*.class"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/libdeployment.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/libdeployment/Stateful*.class"/>
+			</fileset>
+		</jar>
 
-      <copy todir="${resources}/test-configs/libdeployment/lib">
-         <fileset dir="${build.lib}">
-            <include name="libdeployment.jar"/>
-         </fileset>
-      </copy>
-   </target>
+		<copy todir="${resources}/test-configs/libdeployment/lib">
+			<fileset dir="${build.lib}">
+				<include name="libdeployment.jar"/>
+			</fileset>
+		</copy>
+	</target>
 
-   <target name="stateless"
+	<target name="stateless"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/stateless-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/stateless/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test">
-            <include name="users.properties"/>
-            <include name="roles.properties"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/stateless-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/stateless/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test">
+				<include name="users.properties"/>
+				<include name="roles.properties"/>
+			</fileset>
+		</jar>
 
-      <copy file="${build.lib}/stateless-test.jar" tofile="${build.lib}/stateless-test.ejb3"/>
-   </target>
+		<copy file="${build.lib}/stateless-test.jar" tofile="${build.lib}/stateless-test.ejb3"/>
+	</target>
 
-   <target name="ejbthree1092"
+	<target name="ejbthree1092"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/ejbthree1092-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/ejbthree1092/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/ejbthree1092">
-            <include name="META-INF/*.xml"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/ejbthree1092-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/ejbthree1092/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/ejbthree1092">
+				<include name="META-INF/*.xml"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="statelesscreation"
+	<target name="statelesscreation"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/statelesscreation-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/statelesscreation/*.class"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/statelesscreation-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/statelesscreation/*.class"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="removedislocal"
+	<target name="removedislocal"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/removedislocal-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/removedislocal/*.class"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/removedislocal-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/removedislocal/*.class"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="defaultremotebindings"
+	<target name="defaultremotebindings"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/defaultremotebindings-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/defaultremotebindings/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/defaultremotebindings">
-            <include name="*.xml"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/defaultremotebindings-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/defaultremotebindings/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/defaultremotebindings">
+				<include name="*.xml"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="localfromremote"
+	<target name="localfromremote"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <copy file="${resources}/test/localfromremote/jndi1.properties" tofile="${resources}/test/localfromremote/jndi.properties"/>
-      <!-- adjust the hostname in jndi.properties to our bind address-->
-      <replace file="${resources}/test/localfromremote/jndi.properties" token="JBOSS_BIND_URL_ADDRESS" value="${node0.url}"/>
+		<copy file="${resources}/test/localfromremote/jndi1.properties" tofile="${resources}/test/localfromremote/jndi.properties"/>
+		<!-- adjust the hostname in jndi.properties to our bind address-->
+		<replace file="${resources}/test/localfromremote/jndi.properties" token="JBOSS_BIND_URL_ADDRESS" value="${node0.url}"/>
 
-      <jar jarfile="${build.lib}/localfromremote-test1.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/localfromremote/*.class"/>
-         </fileset>
+		<jar jarfile="${build.lib}/localfromremote-test1.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/localfromremote/*.class"/>
+			</fileset>
 
-         <fileset dir="${resources}/test/localfromremote">
-            <include name="jndi.properties"/>
-         </fileset>
-      </jar>
-      <delete file="${resources}/test/localfromremote/jndi.properties"/>
-      <copy file="${build.lib}/localfromremote-test1.jar" tofile="${resources}/test-configs/localfromremote1/deploy/localfromremote-test.jar"/>
+			<fileset dir="${resources}/test/localfromremote">
+				<include name="jndi.properties"/>
+			</fileset>
+		</jar>
+		<delete file="${resources}/test/localfromremote/jndi.properties"/>
+		<copy file="${build.lib}/localfromremote-test1.jar" tofile="${resources}/test-configs/localfromremote1/deploy/localfromremote-test.jar"/>
 
-      <copy file="${resources}/test/localfromremote/jndi2.properties" tofile="${resources}/test/localfromremote/jndi.properties"/>
-      <!-- adjust the hostname in jndi.properties to our bind address-->
-      <replace file="${resources}/test/localfromremote/jndi.properties" token="JBOSS_BIND_URL_ADDRESS" value="${node0.url}"/>
+		<copy file="${resources}/test/localfromremote/jndi2.properties" tofile="${resources}/test/localfromremote/jndi.properties"/>
+		<!-- adjust the hostname in jndi.properties to our bind address-->
+		<replace file="${resources}/test/localfromremote/jndi.properties" token="JBOSS_BIND_URL_ADDRESS" value="${node0.url}"/>
 
-      <jar jarfile="${build.lib}/localfromremote-test2.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/localfromremote/*.class"/>
-         </fileset>
+		<jar jarfile="${build.lib}/localfromremote-test2.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/localfromremote/*.class"/>
+			</fileset>
 
-         <fileset dir="${resources}/test/localfromremote">
-            <include name="jndi.properties"/>
-         </fileset>
-      </jar>
-      <delete file="${resources}/test/localfromremote/jndi.properties"/>
-      <copy file="${build.lib}/localfromremote-test2.jar" tofile="${resources}/test-configs/localfromremote2/deploy/localfromremote-test.jar"/>
-   </target>
+			<fileset dir="${resources}/test/localfromremote">
+				<include name="jndi.properties"/>
+			</fileset>
+		</jar>
+		<delete file="${resources}/test/localfromremote/jndi.properties"/>
+		<copy file="${build.lib}/localfromremote-test2.jar" tofile="${resources}/test-configs/localfromremote2/deploy/localfromremote-test.jar"/>
+	</target>
 
-   <target name="concurrentnaming"
+	<target name="concurrentnaming"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/concurrentnaming-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/concurrentnaming/*.class"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/concurrentnaming-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/concurrentnaming/*.class"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="propertyreplacement"
+	<target name="propertyreplacement"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/propertyreplacement-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/propertyreplacement/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/propertyreplacement">
-            <include name="META-INF/*.xml"/>
-            <include name="*.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/propertyreplacement-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/propertyreplacement/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/propertyreplacement">
+				<include name="META-INF/*.xml"/>
+				<include name="*.xml"/>
+			</fileset>
+		</jar>
 
-      <copy todir="${build.lib}">
-         <fileset dir="${resources}/test/propertyreplacement">
-            <include name="*.xml"/>
-         </fileset>
-      </copy>
-   </target>
+		<copy todir="${build.lib}">
+			<fileset dir="${resources}/test/propertyreplacement">
+				<include name="*.xml"/>
+			</fileset>
+		</copy>
+	</target>
 
-   <target name="invoker"
+	<target name="invoker"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/invoker-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/invoker/*.class"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/invoker-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/invoker/*.class"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="circulardependency"
+	<target name="circulardependency"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/circulardependency-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/circulardependency/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/circulardependency">
-            <include name="META-INF/jboss.xml"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/circulardependency-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/circulardependency/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/circulardependency">
+				<include name="META-INF/jboss.xml"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="servicedependency"
+	<target name="servicedependency"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/servicedependency.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/servicedependency/*.class"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/servicedependency.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/servicedependency/*.class"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="stateless14"
+	<target name="stateless14"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/stateless14-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/stateless14/*.class"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/stateless14-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/stateless14/*.class"/>
+			</fileset>
+		</jar>
 
-      <delete>
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/stateless14/**/*.class"/>
-         </fileset>
-      </delete>
+		<delete>
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/stateless14/**/*.class"/>
+			</fileset>
+		</delete>
 
-      <javac destdir="${build.classes}"
+		<javac destdir="${build.classes}"
          optimize="${javac.optimize}"
          debug="${javac.debug}"
          source="1.4"
@@ -3671,35 +3694,35 @@
          includeAntRuntime="${javac.include.ant.runtime}"
          includeJavaRuntime="${javac.include.java.runtime}"
          failonerror="${javac.fail.onerror}">
-         <src path="${source.java}"/>
-         <classpath refid="javac.classpath"/>
-         <include name="org/jboss/ejb3/test/stateless14/**/*.java"/>
-         <exclude name="org/jboss/ejb3/test/stateless14/**/*Bean.java"/>
-      </javac>
-   </target>
+			<src path="${source.java}"/>
+			<classpath refid="javac.classpath"/>
+			<include name="org/jboss/ejb3/test/stateless14/**/*.java"/>
+			<exclude name="org/jboss/ejb3/test/stateless14/**/*Bean.java"/>
+		</javac>
+	</target>
 
-   <!-- TODO use the other jacc target once the jars from hibernate are updated (changes already made to hibernate) -->
-   <target name="jacc"
+	<!-- TODO use the other jacc target once the jars from hibernate are updated (changes already made to hibernate) -->
+	<target name="jacc"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/jacc-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/jacc/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test">
-            <include name="users.properties"/>
-            <include name="roles.properties"/>
-         </fileset>
-         <fileset dir="${resources}/test/jacc">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/jacc-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/jacc/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test">
+				<include name="users.properties"/>
+				<include name="roles.properties"/>
+			</fileset>
+			<fileset dir="${resources}/test/jacc">
+				<include name="META-INF/persistence.xml"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <!--
+	<!--
    <target name="jacc"
       description="Builds all jar files."
       depends="compile-classes">
@@ -3731,327 +3754,327 @@
    </target>
 -->
 
-   <target name="service"
+	<target name="service"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/service-test.sar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/service/Tester*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/service">
-            <include name="META-INF/jboss-service.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/service-test.sar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/service/Tester*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/service">
+				<include name="META-INF/jboss-service.xml"/>
+			</fileset>
+		</jar>
 
-      <build-jms-dd name="service" descriptor="test-destination-service.xml"/>
+		<build-jms-dd name="service" descriptor="test-destination-service.xml"/>
 
-      <mkdir dir="${target.resources}/test/service/META-INF"/>
-      <copy file="${resources}/test/service/META-INF/jboss.xml" todir="${target.resources}/test/service/META-INF"/>
-      <replace file="${target.resources}/test/service/META-INF/jboss.xml" token="@@jboss.jms.product@@" value="${jboss.jms.product}"/>
+		<mkdir dir="${target.resources}/test/service/META-INF"/>
+		<copy file="${resources}/test/service/META-INF/jboss.xml" todir="${target.resources}/test/service/META-INF"/>
+		<replace file="${target.resources}/test/service/META-INF/jboss.xml" token="@@jboss.jms.product@@" value="${jboss.jms.product}"/>
 
-      <jar jarfile="${build.lib}/service-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/service/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/service">
-            <include name="META-INF/ejb-jar.xml"/>
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-         <fileset dir="${target.resources}/test/service">
-            <include name="META-INF/jboss.xml"/>
-            <include name="test-destination-service.xml"/>
-         </fileset>
-         <fileset dir="${resources}/test">
-            <include name="users.properties"/>
-            <include name="roles.properties"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/service-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/service/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/service">
+				<include name="META-INF/ejb-jar.xml"/>
+				<include name="META-INF/persistence.xml"/>
+			</fileset>
+			<fileset dir="${target.resources}/test/service">
+				<include name="META-INF/jboss.xml"/>
+				<include name="test-destination-service.xml"/>
+			</fileset>
+			<fileset dir="${resources}/test">
+				<include name="users.properties"/>
+				<include name="roles.properties"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="servicexmbean"
+	<target name="servicexmbean"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/service-xmbean-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/servicexmbean/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/servicexmbean">
-            <include name="service-xmbean.xml"/>
-         </fileset>
-         <fileset dir="${resources}/test/servicexmbean">
-            <include name="META-INF/jboss.xml"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/service-xmbean-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/servicexmbean/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/servicexmbean">
+				<include name="service-xmbean.xml"/>
+			</fileset>
+			<fileset dir="${resources}/test/servicexmbean">
+				<include name="META-INF/jboss.xml"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="entitycallback"
+	<target name="entitycallback"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/entitycallback-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/entitycallback/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/entitycallback">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/entitycallback-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/entitycallback/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/entitycallback">
+				<include name="META-INF/persistence.xml"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="secondary"
+	<target name="secondary"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/secondary-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/secondary/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/secondary">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/secondary-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/secondary/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/secondary">
+				<include name="META-INF/persistence.xml"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="xmlcfg"
+	<target name="xmlcfg"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/xmlcfg-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/xmlcfg/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/xmlcfg">
-            <include name="META-INF/**"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/xmlcfg-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/xmlcfg/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/xmlcfg">
+				<include name="META-INF/**"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="clusteredentity"
+	<target name="clusteredentity"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/clusteredentity-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/clusteredentity/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/clusteredentity">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/clusteredentity-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/clusteredentity/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/clusteredentity">
+				<include name="META-INF/persistence.xml"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/clusteredentity-optimistic-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/clusteredentity/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/clusteredentity/optimistic">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/clusteredentity-optimistic-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/clusteredentity/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/clusteredentity/optimistic">
+				<include name="META-INF/persistence.xml"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/clusteredentity-classloader-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/clusteredentity/classloader/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/clusteredentity/classloader">
-            <include name="META-INF/persistence.xml"/>
-            <!--include name="META-INF/jboss.xml"/-->
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/clusteredentity-classloader-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/clusteredentity/classloader/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/clusteredentity/classloader">
+				<include name="META-INF/persistence.xml"/>
+				<!--include name="META-INF/jboss.xml"/-->
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/clusteredentity-classloader-optimistic-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/clusteredentity/classloader/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/clusteredentity/classloader/optimistic">
-            <include name="META-INF/persistence.xml"/>
-            <!--include name="META-INF/jboss.xml"/-->
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/clusteredentity-classloader-optimistic-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/clusteredentity/classloader/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/clusteredentity/classloader/optimistic">
+				<include name="META-INF/persistence.xml"/>
+				<!--include name="META-INF/jboss.xml"/-->
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/clusteredentity-classloader-test.ear">
-         <fileset dir="${build.lib}">
-            <include name="clusteredentity-classloader-test.jar"/>
-         </fileset>
-         <fileset dir="${resources}/test/clusteredentity/classloader">
-            <include name="META-INF/application.xml"/>
-            <include name="META-INF/jboss-app.xml"/>
-            <include name="clusteredentity-ds.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/clusteredentity-classloader-test.ear">
+			<fileset dir="${build.lib}">
+				<include name="clusteredentity-classloader-test.jar"/>
+			</fileset>
+			<fileset dir="${resources}/test/clusteredentity/classloader">
+				<include name="META-INF/application.xml"/>
+				<include name="META-INF/jboss-app.xml"/>
+				<include name="clusteredentity-ds.xml"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/clusteredentity-classloader-optimistic-test.ear">
-         <fileset dir="${build.lib}">
-            <include name="clusteredentity-classloader-optimistic-test.jar"/>
-         </fileset>
-         <fileset dir="${resources}/test/clusteredentity/classloader">
-            <include name="META-INF/jboss-app.xml"/>
-            <include name="clusteredentity-ds.xml"/>
-         </fileset>
-         <fileset dir="${resources}/test/clusteredentity/classloader/optimistic">
-            <include name="META-INF/application.xml"/>
-            <include name="META-INF/jboss-app.xml"/>
-            <include name="clusteredentity-ds.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/clusteredentity-classloader-optimistic-test.ear">
+			<fileset dir="${build.lib}">
+				<include name="clusteredentity-classloader-optimistic-test.jar"/>
+			</fileset>
+			<fileset dir="${resources}/test/clusteredentity/classloader">
+				<include name="META-INF/jboss-app.xml"/>
+				<include name="clusteredentity-ds.xml"/>
+			</fileset>
+			<fileset dir="${resources}/test/clusteredentity/classloader/optimistic">
+				<include name="META-INF/application.xml"/>
+				<include name="META-INF/jboss-app.xml"/>
+				<include name="clusteredentity-ds.xml"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/clusteredentity-providedprefix-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/clusteredentity/classloader/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/clusteredentity/providedprefix">
-            <include name="META-INF/persistence.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/clusteredentity-providedprefix-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/clusteredentity/classloader/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/clusteredentity/providedprefix">
+				<include name="META-INF/persistence.xml"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/clusteredentity-providedprefix-test.ear">
-         <fileset dir="${build.lib}">
-            <include name="clusteredentity-providedprefix-test.jar"/>
-         </fileset>
-         <fileset dir="${resources}/test/clusteredentity/providedprefix">
-            <include name="META-INF/application.xml"/>
-            <include name="META-INF/jboss-app.xml"/>
-            <include name="clusteredentity-ds.xml"/>
-         </fileset>
-         <fileset dir="${resources}/test/clusteredentity/classloader">
-            <include name="clusteredentity-ds.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/clusteredentity-providedprefix-test.ear">
+			<fileset dir="${build.lib}">
+				<include name="clusteredentity-providedprefix-test.jar"/>
+			</fileset>
+			<fileset dir="${resources}/test/clusteredentity/providedprefix">
+				<include name="META-INF/application.xml"/>
+				<include name="META-INF/jboss-app.xml"/>
+				<include name="clusteredentity-ds.xml"/>
+			</fileset>
+			<fileset dir="${resources}/test/clusteredentity/classloader">
+				<include name="clusteredentity-ds.xml"/>
+			</fileset>
+		</jar>
 
 
-      <jar jarfile="${build.lib}/clusteredentity-embeddedid-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/clusteredentity/embeddedid/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/clusteredentity/classloader">
-            <include name="META-INF/persistence.xml"/>
-            <!--include name="META-INF/jboss.xml"/-->
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/clusteredentity-embeddedid-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/clusteredentity/embeddedid/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/clusteredentity/classloader">
+				<include name="META-INF/persistence.xml"/>
+				<!--include name="META-INF/jboss.xml"/-->
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/clusteredentity-embeddedid-optimistic-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/clusteredentity/embeddedid/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/clusteredentity/classloader/optimistic">
-            <include name="META-INF/persistence.xml"/>
-            <!--include name="META-INF/jboss.xml"/-->
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/clusteredentity-embeddedid-optimistic-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/clusteredentity/embeddedid/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/clusteredentity/classloader/optimistic">
+				<include name="META-INF/persistence.xml"/>
+				<!--include name="META-INF/jboss.xml"/-->
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/clusteredentity-embeddedid-test.ear">
-         <fileset dir="${build.lib}">
-            <include name="clusteredentity-embeddedid-test.jar"/>
-         </fileset>
-         <fileset dir="${resources}/test/clusteredentity/classloader">
-            <include name="META-INF/jboss-app.xml"/>
-            <include name="clusteredentity-ds.xml"/>
-         </fileset>
-         <fileset dir="${resources}/test/clusteredentity/embeddedid">
-            <include name="META-INF/application.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/clusteredentity-embeddedid-test.ear">
+			<fileset dir="${build.lib}">
+				<include name="clusteredentity-embeddedid-test.jar"/>
+			</fileset>
+			<fileset dir="${resources}/test/clusteredentity/classloader">
+				<include name="META-INF/jboss-app.xml"/>
+				<include name="clusteredentity-ds.xml"/>
+			</fileset>
+			<fileset dir="${resources}/test/clusteredentity/embeddedid">
+				<include name="META-INF/application.xml"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/clusteredentity-embeddedid-optimistic-test.ear">
-         <fileset dir="${build.lib}">
-            <include name="clusteredentity-embeddedid-optimistic-test.jar"/>
-         </fileset>
-         <fileset dir="${resources}/test/clusteredentity/classloader">
-            <include name="META-INF/jboss-app.xml"/>
-            <include name="clusteredentity-ds.xml"/>
-         </fileset>
-         <fileset dir="${resources}/test/clusteredentity/embeddedid/optimistic">
-            <include name="META-INF/application.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/clusteredentity-embeddedid-optimistic-test.ear">
+			<fileset dir="${build.lib}">
+				<include name="clusteredentity-embeddedid-optimistic-test.jar"/>
+			</fileset>
+			<fileset dir="${resources}/test/clusteredentity/classloader">
+				<include name="META-INF/jboss-app.xml"/>
+				<include name="clusteredentity-ds.xml"/>
+			</fileset>
+			<fileset dir="${resources}/test/clusteredentity/embeddedid/optimistic">
+				<include name="META-INF/application.xml"/>
+			</fileset>
+		</jar>
 
-      <!-- Copy the optimistic locking JBC config to ${build.lib} so we can deploy it -->
-      <copy todir="${build.lib}">
-         <fileset dir="${resources}/test/clusteredentity/optimistic">
-            <include name="optimistic-entity-cache-*.xml"/>
-         </fileset>
-      </copy>
+		<!-- Copy the optimistic locking JBC config to ${build.lib} so we can deploy it -->
+		<copy todir="${build.lib}">
+			<fileset dir="${resources}/test/clusteredentity/optimistic">
+				<include name="optimistic-entity-cache-*.xml"/>
+			</fileset>
+		</copy>
 
-   </target>
+	</target>
 
-   <target name="clusteredsession"
+	<target name="clusteredsession"
       description="Builds all jar files."
       depends="compile-classes">
 
-      <mkdir dir="${build.lib}"/>
+		<mkdir dir="${build.lib}"/>
 
-      <jar jarfile="${build.lib}/clusteredsession-test.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/clusteredsession/**/*.class"/>
-         </fileset>
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/stateful/nested/base/**/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/clusteredsession">
-            <include name="META-INF/*.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/clusteredsession-test.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/clusteredsession/**/*.class"/>
+			</fileset>
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/stateful/nested/base/**/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/clusteredsession">
+				<include name="META-INF/*.xml"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/clusteredsession-test-scoped.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/clusteredsession/**/*.class"/>
-         </fileset>
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/stateful/nested/base/**/*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/clusteredsession">
-            <include name="META-INF/*.xml"/>
-            <exclude name="META-INF/jboss.xml"/>
-         </fileset>
-         <fileset dir="${resources}/test/clusteredsession/scoped">
-            <include name="META-INF/*.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/clusteredsession-test-scoped.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/clusteredsession/**/*.class"/>
+			</fileset>
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/stateful/nested/base/**/*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/clusteredsession">
+				<include name="META-INF/*.xml"/>
+				<exclude name="META-INF/jboss.xml"/>
+			</fileset>
+			<fileset dir="${resources}/test/clusteredsession/scoped">
+				<include name="META-INF/*.xml"/>
+			</fileset>
+		</jar>
 
-      <jar jarfile="${build.lib}/clusteredsession-local.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/clusteredsession/VMTester*.class"/>
-         </fileset>
-         <fileset dir="${resources}/test/clusteredsession/islocal">
-            <include name="META-INF/*.xml"/>
-         </fileset>
-      </jar>
+		<jar jarfile="${build.lib}/clusteredsession-local.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/clusteredsession/VMTester*.class"/>
+			</fileset>
+			<fileset dir="${resources}/test/clusteredsession/islocal">
+				<include name="META-INF/*.xml"/>
+			</fileset>
+		</jar>
 
-      <copy todir="${build.lib}">
-         <fileset dir="${resources}/test/clusteredsession/islocal/foreign">
-            <include name="testlocal-service.xml"/>
-         </fileset>
-      </copy>
+		<copy todir="${build.lib}">
+			<fileset dir="${resources}/test/clusteredsession/islocal/foreign">
+				<include name="testlocal-service.xml"/>
+			</fileset>
+		</copy>
 
-      <jar jarfile="${build.lib}/ejbthree1136.jar">
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/ejbthree1136/DoNothing*.class"/>
-         </fileset>
-      </jar>
-      <jar destfile="${build.lib}/ejbthree1136.sar">
-         <metainf dir="${build.resources}/test/ejbthree1136">
-            <include name="jboss-service.xml"/>
-         </metainf>
-         <fileset dir="${build.classes}">
-            <include name="org/jboss/ejb3/test/ejbthree1136/SFSB*.class"/>
-         </fileset>
-      </jar>
-   </target>
+		<jar jarfile="${build.lib}/ejbthree1136.jar">
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/ejbthree1136/DoNothing*.class"/>
+			</fileset>
+		</jar>
+		<jar destfile="${build.lib}/ejbthree1136.sar">
+			<metainf dir="${build.resources}/test/ejbthree1136">
+				<include name="jboss-service.xml"/>
+			</metainf>
+			<fileset dir="${build.classes}">
+				<include name="org/jboss/ejb3/test/ejbthree1136/SFSB*.class"/>
+			</fileset>
+		</jar>
+	</target>
 
-   <target name="jars" depends="ejbthree1090, mdbsessionpoolclear, ejbthree1092, removedislocal, statelesscreation, defaultremotebindings, localfromremote, clusteredjms, entityoptimisticlocking, concurrentnaming, propertyreplacement, persistenceunits, invalidtxmdb, descriptortypo, libdeployment, homeinterface, servicexmbean, arjuna, mdbtransactions, unauthenticatedprincipal, clusteredservice, invoker, classloader, 
+	<target name="jars" depends="ejbthree1090, mdbsessionpoolclear, ejbthree1092, removedislocal, statelesscreation, defaultremotebindings, localfromremote, clusteredjms, entityoptimisticlocking, concurrentnaming, propertyreplacement, persistenceunits, invalidtxmdb, descriptortypo, libdeployment, homeinterface, servicexmbean, arjuna, mdbtransactions, unauthenticatedprincipal, clusteredservice, invoker, classloader, 
       circulardependency, jsp, timerdependency, servicedependency, servlet, stateless14, webservices, ear, ejbthree440, 
       ejbthree454, ejbthree653, ejbthree670, ejbthree712, ejbthree724, ejbthree751, ejbthree785, ejbthree832,
       ejbthree879,
@@ -4082,1374 +4105,1384 @@
       timer, benchmark, entity, joininheritance, singletable, tableperclass, dependent, mdb, manytomany, regression, 
       composite, composite2, entitycallback, relationships, ssl, ssladvanced, clusteredsession, strictpool, jacc, 
       localcall, interceptors, interceptors2, interceptors3, iiop, clientinterceptor, jbpapp1307"/>
-	
+
 	<!-- ================================================================== -->
 	<!-- Test cases                                                           -->
 	<!-- ================================================================== -->
 
-   <target name="test" depends="init" if="test"
+	<target name="test" depends="init" if="test"
       description="Execute all tests in the given test directory.">
-      <!-- For use when we do not need to pass in any special jvmargs; forks the test process -->
-      <antcall target="test-with-jvmargs" inheritRefs="true">
-         <param name="test" value="${test}"/>
-         <param name="jvmargs" value=""/>
-      </antcall>
-   </target>
+		<!-- For use when we do not need to pass in any special jvmargs; forks the test process -->
+		<antcall target="test-with-jvmargs" inheritRefs="true">
+			<param name="test" value="${test}"/>
+			<param name="jvmargs" value=""/>
+		</antcall>
+	</target>
 
-   <target name="test-with-jvmargs" if="test">
-      <!-- For use when we need to pass in special jvmargs -->
+	<target name="test-with-jvmargs" if="test">
+		<!-- For use when we need to pass in special jvmargs -->
 
-      <mkdir dir="${build.reports}"/>
-      <mkdir dir="${build.testlog}"/>
-      <!-- Remove the test.log so each run has a fresh log -->
-      <!-- <delete file="${build.testlog}/test.log"/> -->
+		<mkdir dir="${build.reports}"/>
+		<mkdir dir="${build.testlog}"/>
+		<!-- Remove the test.log so each run has a fresh log -->
+		<!-- <delete file="${build.testlog}/test.log"/> -->
 
-      <!-- These tests need extra stuff on classpath -->
-      <condition property="client.run.classpath" value="security.client.classpath">
-         <equals arg1="${test}" arg2="jaccpropagation"/>
-      </condition>
-      <condition property="client.run.classpath" value="security.client.classpath">
-         <equals arg1="${test}" arg2="security"/>
-      </condition>
-      <condition property="client.run.classpath" value="dd.web.client.classpath">
-         <equals arg1="${test}" arg2="dd/web"/>
-      </condition>
-      <condition property="client.run.classpath" value="dd.classpath">
-         <equals arg1="${test}" arg2="dd"/>
-      </condition>
-      <condition property="client.run.classpath" value="iiop.client.classpath">
-         <equals arg1="${test}" arg2="iiop"/>
-      </condition>
-      <condition property="client.run.classpath" value="dd.classpath">
-         <equals arg1="${test}" arg2="threadlocal"/>
-      </condition>
-      <condition property="client.run.classpath" value="client.classpath">
-         <not>
-            <isset property="client.run.classpath"/>
-         </not>
-      </condition>
+		<!-- These tests need extra stuff on classpath -->
+		<condition property="client.run.classpath" value="security.client.classpath">
+			<equals arg1="${test}" arg2="jaccpropagation"/>
+		</condition>
+		<condition property="client.run.classpath" value="security.client.classpath">
+			<equals arg1="${test}" arg2="security"/>
+		</condition>
+		<condition property="client.run.classpath" value="dd.web.client.classpath">
+			<equals arg1="${test}" arg2="dd/web"/>
+		</condition>
+		<condition property="client.run.classpath" value="dd.classpath">
+			<equals arg1="${test}" arg2="dd"/>
+		</condition>
+		<condition property="client.run.classpath" value="iiop.client.classpath">
+			<equals arg1="${test}" arg2="iiop"/>
+		</condition>
+		<condition property="client.run.classpath" value="dd.classpath">
+			<equals arg1="${test}" arg2="threadlocal"/>
+		</condition>
+		<condition property="client.run.classpath" value="client.classpath">
+			<not>
+				<isset property="client.run.classpath"/>
+			</not>
+		</condition>
 
-      <condition property="test.jndi.url" value="${node0.jndi.url}">
-         <not>
-            <isset property="test.jndi.url"/>
-         </not>
-      </condition>
+		<condition property="test.jndi.url" value="${node0.jndi.url}">
+			<not>
+				<isset property="test.jndi.url"/>
+			</not>
+		</condition>
 
-      <condition property="jboss-junit-configuration" value="${test.extension}">
-         <isset property="test.extension"/>
-      </condition>
+		<condition property="jboss-junit-configuration" value="${test.extension}">
+			<isset property="test.extension"/>
+		</condition>
 
-      <condition property="jboss-junit-configuration" value="">
-         <not>
-            <isset property="test.extension"/>
-         </not>
-      </condition>
+		<condition property="jboss-junit-configuration" value="">
+			<not>
+				<isset property="test.extension"/>
+			</not>
+		</condition>
 
-      <junit dir="${module.output}"
+		<junit dir="${module.output}"
          printsummary="yes"
          haltonerror="false"
          haltonfailure="false"
          showoutput="yes"
          fork="true">
 
-         <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/>
-         <sysproperty key="jbosstest.deploy.dir" value="${build.lib}"/>
-         <sysproperty key="build.testlog" value="${build.testlog}"/>
-         <sysproperty key="log4j.configuration" value="file:${resources}/test/log4j.xml"/>
-         <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/>
-         <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/>
-         <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/>
-         <sysproperty key="java.security.auth.login.config" value="${resources}/test/security/auth.conf"/>
-         <sysproperty key="jbosstest.server.host" value="${node0}"/>
-         <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
+			<sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/>
+			<sysproperty key="jbosstest.deploy.dir" value="${build.lib}"/>
+			<sysproperty key="build.testlog" value="${build.testlog}"/>
+			<sysproperty key="log4j.configuration" value="file:${resources}/test/log4j.xml"/>
+			<sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/>
+			<sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/>
+			<sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/>
+			<sysproperty key="java.security.auth.login.config" value="${resources}/test/security/auth.conf"/>
+			<sysproperty key="jbosstest.server.host" value="${node0}"/>
+			<sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
 
-         <!-- properties needed for clustering -->
-         <sysproperty key="jbosstest.cluster.node0" value="${node0}"/>
-         <sysproperty key="jbosstest.cluster.node0.url" value="${node0.url}"/>
-         <sysproperty key="jbosstest.cluster.node0.http.url" value="${node0.http.url}"/>
-         <sysproperty key="jbosstest.cluster.node0.jndi.url" value="${node0.jndi.url}"/>
-         <sysproperty key="jbosstest.cluster.node1" value="${node1}"/>
-         <sysproperty key="jbosstest.cluster.node1.url" value="${node1.url}"/>
-         <sysproperty key="jbosstest.cluster.node1.http.url" value="${node1.http.url}"/>
-         <sysproperty key="jbosstest.cluster.node1.jndi.url" value="${node1.jndi.url}"/>
-         <sysproperty key="java.naming.provider.url" value="${test.jndi.url}"/>
+			<!-- properties needed for clustering -->
+			<sysproperty key="jbosstest.cluster.node0" value="${node0}"/>
+			<sysproperty key="jbosstest.cluster.node0.url" value="${node0.url}"/>
+			<sysproperty key="jbosstest.cluster.node0.http.url" value="${node0.http.url}"/>
+			<sysproperty key="jbosstest.cluster.node0.jndi.url" value="${node0.jndi.url}"/>
+			<sysproperty key="jbosstest.cluster.node1" value="${node1}"/>
+			<sysproperty key="jbosstest.cluster.node1.url" value="${node1.url}"/>
+			<sysproperty key="jbosstest.cluster.node1.http.url" value="${node1.http.url}"/>
+			<sysproperty key="jbosstest.cluster.node1.jndi.url" value="${node1.jndi.url}"/>
+			<sysproperty key="java.naming.provider.url" value="${test.jndi.url}"/>
 
-         <!-- for EAP 4.3, jboss.jms.provider must either be jbm or mq -->
-         <sysproperty key="jboss.jms.provider" value="${jboss.jms.provider}"/>
+			<!-- for EAP 4.3, jboss.jms.provider must either be jbm or mq -->
+			<sysproperty key="jboss.jms.provider" value="${jboss.jms.provider}"/>
 
-         <!-- MultiUnitBindTestCase needs to know the bind address to correctly
+			<!-- MultiUnitBindTestCase needs to know the bind address to correctly
 		test the assertion -->
-         <sysproperty key="jboss.bind.address" value="${node0}"/>
-         <sysproperty key="jboss.bind.url.address" value="${node0.url}"/>
+			<sysproperty key="jboss.bind.address" value="${node0}"/>
+			<sysproperty key="jboss.bind.url.address" value="${node0.url}"/>
+	
+	        <!-- set IP stack preference -->
+            <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+            <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
 
-         <jvmarg line="${jvmargs}" />
+			<jvmarg line="${jvmargs}" />
 
-         <classpath>
-            <path refid="hibernate.hibernate.classpath"/>
-            <pathelement location="${build.classes}"/>
-            <path refid="${client.run.classpath}"/>
-            <pathelement location="${resources}/test"/>
-            <path refid="jboss.jbossws.classpath"/>
-            <path refid="apache.xerces.classpath"/>
-            <path refid="glassfish.jaf.classpath"/>
-            <path refid="glassfish.javamail.classpath"/>
-            <path refid="apache.httpclient.classpath"/>
-            <path refid="jboss.server.classpath"/>
-            <path refid="jboss.naming.classpath"/>
-            <path refid="trove.classpath"/>
-            <path refid="jboss.common.classpath"/>
-            <path refid="jboss.aop.classpath"/>
-            <path refid="jboss.aspects.classpath"/>
-            <path refid="jboss.jbossxb.classpath"/>
-            <!-- for Corba -->
-            <path refid="jboss.iiop.classpath"/>
-            <path refid="jacorb.jacorb.classpath"/>
-            <path refid="apache.avalon.classpath"/>
-            <path refid="apache.avalon.logkit.classpath"/>
+			<classpath>
+				<path refid="hibernate.hibernate.classpath"/>
+				<pathelement location="${build.classes}"/>
+				<path refid="${client.run.classpath}"/>
+				<pathelement location="${resources}/test"/>
+				<path refid="jboss.jbossws.classpath"/>
+				<path refid="apache.xerces.classpath"/>
+				<path refid="glassfish.jaf.classpath"/>
+				<path refid="glassfish.javamail.classpath"/>
+				<path refid="apache.httpclient.classpath"/>
+				<path refid="jboss.server.classpath"/>
+				<path refid="jboss.naming.classpath"/>
+				<path refid="trove.classpath"/>
+				<path refid="jboss.common.classpath"/>
+				<path refid="jboss.aop.classpath"/>
+				<path refid="jboss.aspects.classpath"/>
+				<path refid="jboss.jbossxb.classpath"/>
+				<!-- for Corba -->
+				<path refid="jboss.iiop.classpath"/>
+				<path refid="jacorb.jacorb.classpath"/>
+				<path refid="apache.avalon.classpath"/>
+				<path refid="apache.avalon.logkit.classpath"/>
 
-            <!-- EJBTHREE-485 needs javassist -->
-            <path refid="javassist.classpath"/>
+				<!-- EJBTHREE-485 needs javassist -->
+				<path refid="javassist.classpath"/>
 
-            <!-- For clustered entities -->
-            <path refid="hsqldb.hsqldb.classpath"/>
-         </classpath>
+				<!-- For clustered entities -->
+				<path refid="hsqldb.hsqldb.classpath"/>
+			</classpath>
 
-         <formatter type="plain" usefile="true"/>
-         <formatter type="xml" usefile="true" unless="test.extension"/>
-         <!--formatter type="xml" extension="-${test.extension}.xml" usefile="true" if="test.extension"/-->
-         <sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
-         <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" 
+			<formatter type="plain" usefile="true"/>
+			<formatter type="xml" usefile="true" unless="test.extension"/>
+			<!--formatter type="xml" extension="-${test.extension}.xml" usefile="true" if="test.extension"/-->
+			<sysproperty key="jboss-junit-configuration" value="${jboss-junit-configuration}"/>
+			<formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" 
                     extension="-${test.extension}.xml" usefile="true" if="test.extension"/>
 
-         <batchtest todir="${build.reports}"
+			<batchtest todir="${build.reports}"
             haltonerror="false"
             haltonfailure="false"
             fork="true">
 
-            <fileset dir="${build.classes}">
-               <include name="org/jboss/ejb3/test/${test}/unit/*TestCase.class"/>
-            </fileset>
-         </batchtest>
-      </junit>
-   </target>
+				<fileset dir="${build.classes}">
+					<include name="org/jboss/ejb3/test/${test}/unit/*TestCase.class"/>
+				</fileset>
+			</batchtest>
+		</junit>
+	</target>
 
-   <!-- Single unit test -->
-   <target name="one-test-with-jvmargs" if="test">
-      <!-- For use when we need to pass in special jvmargs -->
+	<!-- Single unit test -->
+	<target name="one-test-with-jvmargs" if="test">
+		<!-- For use when we need to pass in special jvmargs -->
 
-      <mkdir dir="${build.reports}"/>
-      <mkdir dir="${build.testlog}"/>
-      <!-- Remove the test.log so each run has a fresh log -->
-      <delete file="${build.testlog}/test.log"/>
+		<mkdir dir="${build.reports}"/>
+		<mkdir dir="${build.testlog}"/>
+		<!-- Remove the test.log so each run has a fresh log -->
+		<delete file="${build.testlog}/test.log"/>
 
-      <!-- These tests need extra stuff on classpath -->
-      <condition property="client.run.classpath" value="client.classpath">
-         <not>
-            <isset property="client.run.classpath"/>
-         </not>
-      </condition>
+		<!-- These tests need extra stuff on classpath -->
+		<condition property="client.run.classpath" value="client.classpath">
+			<not>
+				<isset property="client.run.classpath"/>
+			</not>
+		</condition>
 
-      <junit dir="${module.output}"
+		<junit dir="${module.output}"
          printsummary="yes"
          haltonerror="false"
          haltonfailure="false"
          showoutput="yes"
          fork="true">
 
-         <sysproperty key="jbosstest.deploy.dir" value="${build.lib}"/>
-         <sysproperty key="build.testlog" value="${build.testlog}"/>
-         <sysproperty key="log4j.configuration" value="file:${resources}/test/log4j.xml"/>
-         <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/>
-         <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/>
-         <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/>
-         <sysproperty key="java.security.auth.login.config" value="${resources}/test/security/auth.conf"/>
-         <sysproperty key="jbosstest.server.host" value="${node0}"/>
-         <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
+			<sysproperty key="jbosstest.deploy.dir" value="${build.lib}"/>
+			<sysproperty key="build.testlog" value="${build.testlog}"/>
+			<sysproperty key="log4j.configuration" value="file:${resources}/test/log4j.xml"/>
+			<sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/>
+			<sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/>
+			<sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/>
+			<sysproperty key="java.security.auth.login.config" value="${resources}/test/security/auth.conf"/>
+			<sysproperty key="jbosstest.server.host" value="${node0}"/>
+			<sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
 
-         <!-- properties needed for clustering -->
-         <sysproperty key="jbosstest.cluster.node0" value="${node0}"/>
-         <sysproperty key="jbosstest.cluster.node0.url" value="${node0.url}"/>
-         <sysproperty key="jbosstest.cluster.node0.http.url" value="${node0.http.url}"/>
-         <sysproperty key="jbosstest.cluster.node0.jndi.url" value="${node0.jndi.url}"/>
-         <sysproperty key="jbosstest.cluster.node1" value="${node1}"/>
-         <sysproperty key="jbosstest.cluster.node1.url" value="${node1.url}"/>
-         <sysproperty key="jbosstest.cluster.node1.http.url" value="${node1.http.url}"/>
-         <sysproperty key="jbosstest.cluster.node1.jndi.url" value="${node1.jndi.url}"/>
-         <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
+			<!-- properties needed for clustering -->
+			<sysproperty key="jbosstest.cluster.node0" value="${node0}"/>
+			<sysproperty key="jbosstest.cluster.node0.url" value="${node0.url}"/>
+			<sysproperty key="jbosstest.cluster.node0.http.url" value="${node0.http.url}"/>
+			<sysproperty key="jbosstest.cluster.node0.jndi.url" value="${node0.jndi.url}"/>
+			<sysproperty key="jbosstest.cluster.node1" value="${node1}"/>
+			<sysproperty key="jbosstest.cluster.node1.url" value="${node1.url}"/>
+			<sysproperty key="jbosstest.cluster.node1.http.url" value="${node1.http.url}"/>
+			<sysproperty key="jbosstest.cluster.node1.jndi.url" value="${node1.jndi.url}"/>
+			<sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/>
 
-         <!-- for EAP 4.3, jboss.jms.provider must either be jbm or mq -->
-         <sysproperty key="jboss.jms.provider" value="${jboss.jms.provider}"/>
+			<!-- for EAP 4.3, jboss.jms.provider must either be jbm or mq -->
+			<sysproperty key="jboss.jms.provider" value="${jboss.jms.provider}"/>
 
-         <!-- MultiUnitBindTestCase needs to know the bind address to correctly
+			<!-- MultiUnitBindTestCase needs to know the bind address to correctly
 		test the assertion -->
-         <sysproperty key="jboss.bind.address" value="${node0}"/>
-         <sysproperty key="jboss.bind.url.address" value="${node0.url}"/>
+			<sysproperty key="jboss.bind.address" value="${node0}"/>
+			<sysproperty key="jboss.bind.url.address" value="${node0.url}"/>
+	        <!-- set IP stack preference -->
+            <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+            <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
 
-         <jvmarg line="${ejb3.jboss.jvmargs}" />
+			<jvmarg line="${ejb3.jboss.jvmargs}" />
 
-         <classpath>
-            <!--path refid="asm.asm.classpath"/-->
-            <path refid="hibernate.hibernate.classpath"/>
-            <pathelement location="${build.classes}"/>
-            <pathelement location="${resources}/test"/>
-            <path refid="${client.run.classpath}"/>
-            <path refid="jboss.jbossws.classpath"/>
-            <path refid="apache.xerces.classpath"/>
-            <path refid="glassfish.jaf.classpath"/>
-            <path refid="glassfish.javamail.classpath"/>
-            <path refid="apache.httpclient.classpath"/>
-            <path refid="hsqldb.hsqldb.classpath"/>
-            <path refid="jboss.aop.classpath"/>
-         </classpath>
+			<classpath>
+				<!--path refid="asm.asm.classpath"/-->
+				<path refid="hibernate.hibernate.classpath"/>
+				<pathelement location="${build.classes}"/>
+				<pathelement location="${resources}/test"/>
+				<path refid="${client.run.classpath}"/>
+				<path refid="jboss.jbossws.classpath"/>
+				<path refid="apache.xerces.classpath"/>
+				<path refid="glassfish.jaf.classpath"/>
+				<path refid="glassfish.javamail.classpath"/>
+				<path refid="apache.httpclient.classpath"/>
+				<path refid="hsqldb.hsqldb.classpath"/>
+				<path refid="jboss.aop.classpath"/>
+			</classpath>
 
-         <formatter type="plain" usefile="true"/>
-         <formatter type="xml" usefile="true" unless="test.extension"/>
-         <formatter type="xml" extension="-${test.extension}.xml" usefile="true" if="test.extension"/>
+			<formatter type="plain" usefile="true"/>
+			<formatter type="xml" usefile="true" unless="test.extension"/>
+			<formatter type="xml" extension="-${test.extension}.xml" usefile="true" if="test.extension"/>
 
-         <test name="${test}" todir="${build.reports}"/>
-      </junit>
-   </target>
+			<test name="${test}" todir="${build.reports}"/>
+		</junit>
+	</target>
 
-   <target name="client14-tests" depends="init"
+	<target name="client14-tests" depends="init"
       description="Execute all tests for Java1.4 client compatibility.">
-      <mkdir dir="${build.reports}"/>
-      <mkdir dir="${build.testlog}"/>
+		<mkdir dir="${build.reports}"/>
+		<mkdir dir="${build.testlog}"/>
 
-      <junit dir="${module.output}"
+		<junit dir="${module.output}"
          printsummary="yes"
          haltonerror="false"
          haltonfailure="false"
          jvm="java"
          fork="true">
 
-         <sysproperty key="jbosstest.deploy.dir" value="${build.lib}"/>
-         <sysproperty key="build.testlog" value="${build.testlog}"/>
-         <sysproperty key="log4j.configuration" value="file:${resources}/test/log4j.xml"/>
-         <sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/>
-         <sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/>
-         <sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/>
-         <sysproperty key="jbosstest.server.host" value="${node0}"/>
-         <sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
+			<sysproperty key="jbosstest.deploy.dir" value="${build.lib}"/>
+			<sysproperty key="build.testlog" value="${build.testlog}"/>
+			<sysproperty key="log4j.configuration" value="file:${resources}/test/log4j.xml"/>
+			<sysproperty key="jbosstest.threadcount" value="${jbosstest.threadcount}"/>
+			<sysproperty key="jbosstest.iterationcount" value="${jbosstest.iterationcount}"/>
+			<sysproperty key="jbosstest.beancount" value="${jbosstest.beancount}"/>
+			<sysproperty key="jbosstest.server.host" value="${node0}"/>
+			<sysproperty key="jbosstest.server.host.url" value="${node0.url}"/>
+	        <!-- set IP stack preference -->
+            <sysproperty key="java.net.preferIPv4Stack" value="${java.net.preferIPv4Stack}" />
+            <sysproperty key="java.net.preferIPv6Addresses" value="${java.net.preferIPv6Addresses}" />
 
-         <classpath>
-            <pathelement location="${build.classes}"/>
-            <pathelement location="${resources}/test"/>
-            <path refid="jboss.test.classpath"/>
-            <path refid="client.classpath"/>
-         </classpath>
+			<classpath>
+				<pathelement location="${build.classes}"/>
+				<pathelement location="${resources}/test"/>
+				<path refid="jboss.test.classpath"/>
+				<path refid="client.classpath"/>
+			</classpath>
 
-         <formatter type="plain" usefile="true"/>
-         <formatter type="xml" usefile="true"/>
+			<formatter type="plain" usefile="true"/>
+			<formatter type="xml" usefile="true"/>
 
-         <batchtest todir="${build.reports}"
+			<batchtest todir="${build.reports}"
             haltonerror="false"
             haltonfailure="false"
             fork="true">
 
-            <fileset dir="${build.classes}">
-               <include name="org/jboss/ejb3/test/stateless14/unit/*TestCase.class"/>
-            </fileset>
-         </batchtest>
-      </junit>
-   </target>
+				<fileset dir="${build.classes}">
+					<include name="org/jboss/ejb3/test/stateless14/unit/*TestCase.class"/>
+				</fileset>
+			</batchtest>
+		</junit>
+	</target>
 
-   <target name="run-clusteredentity" depends="init"
+	<target name="run-clusteredentity" depends="init"
       description="Runs the clusteredentity stuff in a cluster">
 
-      <!-- clusteredentity-test.ejb3 file needs to be deployed manually-->
+		<!-- clusteredentity-test.ejb3 file needs to be deployed manually-->
 
-      <!-- IP:port of the two nodes in the cluster -->
-      <property name="naming1" value="192.168.1.1:1099"/>
-      <property name="naming1" value="192.168.1.2:1099"/>
+		<!-- IP:port of the two nodes in the cluster -->
+		<property name="naming1" value="192.168.1.1:1099"/>
+		<property name="naming1" value="192.168.1.2:1099"/>
 
-      <java fork="yes" className="org.jboss.ejb3.test.clusteredentity.unit.CachedEntityRun">
-         <arg value="${naming1}"/>
-         <arg value="${naming2}"/>
-         <classpath>
-            <pathelement location="${build.classes}"/>
-            <pathelement location="${resources}/test"/>
-            <path refid="javac.classpath"/>
-         </classpath>
-      </java>
-   </target>
+		<java fork="yes" className="org.jboss.ejb3.test.clusteredentity.unit.CachedEntityRun">
+			<arg value="${naming1}"/>
+			<arg value="${naming2}"/>
+			<classpath>
+				<pathelement location="${build.classes}"/>
+				<pathelement location="${resources}/test"/>
+				<path refid="javac.classpath"/>
+			</classpath>
+		</java>
+	</target>
 
 
 
-   <target name="run" depends="init" if="class"
+	<target name="run" depends="init" if="class"
       description="Execute all tests in the given test directory.">
-      <java fork="true" classname="${class}">
-         <classpath>
-            <pathelement location="${build.classes}"/>
-            <pathelement location="${resources}/test"/>
-            <path refid="javac.classpath"/>
-         </classpath>
-      </java>
-   </target>
+		<java fork="true" classname="${class}">
+			<classpath>
+				<pathelement location="${build.classes}"/>
+				<pathelement location="${resources}/test"/>
+				<path refid="javac.classpath"/>
+			</classpath>
+		</java>
+	</target>
 
-   <target name="tests" depends="init" description="Execute all tests">
-      <antcall target="simple-tests" inheritRefs="true"/>
-      <antcall target="ejb-tests" inheritRefs="true"/>
-      <antcall target="entity-tests" inheritRefs="true"/>
-      <antcall target="ssl-simple-test"  inheritRefs="true"/>
-      <antcall target="ssl-advanced-test"  inheritRefs="true"/>
-      <antcall target="jacc-test" inheritRefs="true"/>
-      <antcall target="clustered-tests" inheritRefs="true"/>
-      <antcall target="clustered-jms-test" inheritRefs="true"/>
-      <antcall target="invoker-test"  inheritRefs="true"/>
-      <antcall target="iiop-tests"  inheritRefs="true"/>
-      <antcall target="libdeployment-test"  inheritRefs="true"/>
-      <antcall target="externalpersistenceunit-test"  inheritRefs="true"/>
-      <antcall target="multi-instance-localfromremote-test"  inheritRefs="true"/>
-      <antcall target="statelesscreation-test"  inheritRefs="true"/>
-      <antcall target="removedislocal-test"  inheritRefs="true"/>
-      <antcall target="mdbsessionpoolclear-test"  inheritRefs="true"/>
-      <antcall target="ejbthree1504-test"  inheritRefs="true"/>
-   </target>
+	<target name="tests" depends="init" description="Execute all tests">
+		<antcall target="simple-tests" inheritRefs="true"/>
+		<antcall target="ejb-tests" inheritRefs="true"/>
+		<antcall target="entity-tests" inheritRefs="true"/>
+		<antcall target="ssl-simple-test"  inheritRefs="true"/>
+		<antcall target="ssl-advanced-test"  inheritRefs="true"/>
+		<antcall target="jacc-test" inheritRefs="true"/>
+		<antcall target="clustered-tests" inheritRefs="true"/>
+		<antcall target="clustered-jms-test" inheritRefs="true"/>
+		<antcall target="invoker-test"  inheritRefs="true"/>
+		<antcall target="iiop-tests"  inheritRefs="true"/>
+		<antcall target="libdeployment-test"  inheritRefs="true"/>
+		<antcall target="externalpersistenceunit-test"  inheritRefs="true"/>
+		<antcall target="multi-instance-localfromremote-test"  inheritRefs="true"/>
+		<antcall target="statelesscreation-test"  inheritRefs="true"/>
+		<antcall target="removedislocal-test"  inheritRefs="true"/>
+		<antcall target="mdbsessionpoolclear-test"  inheritRefs="true"/>
+		<antcall target="ejbthree1504-test"  inheritRefs="true"/>
+	</target>
 
-   <target name="no-start-jboss-tests" depends="init" description="Execute all tests">
-      <antcall target="no-start-jboss-ejb-tests" inheritRefs="true"/>
-      <antcall target="no-start-jboss-entity-tests" inheritRefs="true"/>
-      <antcall target="no-start-jboss-iiop-tests" inheritRefs="true"/>
-   </target>
+	<target name="no-start-jboss-tests" depends="init" description="Execute all tests">
+		<antcall target="no-start-jboss-ejb-tests" inheritRefs="true"/>
+		<antcall target="no-start-jboss-entity-tests" inheritRefs="true"/>
+		<antcall target="no-start-jboss-iiop-tests" inheritRefs="true"/>
+	</target>
 
-   <target name="simple-tests" depends="init">
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="threadlocal"/>
-      </antcall>
-   </target>
+	<target name="simple-tests" depends="init">
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="threadlocal"/>
+		</antcall>
+	</target>
 
 
-   <target name="ejb-tests" depends="init" description="Execute all tests">
-	  <!-- create custom configuration -->
-      <create-config baseconf="all" newconf="ejb" jboss.dist="${ejb3.dist}">
-        <patternset>
-           <include name="conf/**"/>
-           <include name="deploy*/**"/>
-           <include name="lib/**"/>
-           <include name="farm/**"/>
-        </patternset>
-      </create-config>
+	<target name="ejb-tests" depends="init" description="Execute all tests">
+		<!-- create custom configuration -->
+		<create-config baseconf="all" newconf="ejb" jboss.dist="${ejb3.dist}">
+			<patternset>
+				<include name="conf/**"/>
+				<include name="deploy*/**"/>
+				<include name="lib/**"/>
+				<include name="farm/**"/>
+			</patternset>
+		</create-config>
 
-      <start-jboss conf="ejb" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
-      <wait-on-host/>
+		<start-jboss conf="ejb" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
+		<wait-on-host/>
 
-      <antcall target="no-start-jboss-ejb-tests" inheritRefs="true"/>
+		<antcall target="no-start-jboss-ejb-tests" inheritRefs="true"/>
 
-      <stop-jboss jboss.dist="${ejb3.dist}"/>
-      <wait-on-shutdown conf="ejb"/>
-   </target>
+		<stop-jboss jboss.dist="${ejb3.dist}"/>
+		<wait-on-shutdown conf="ejb"/>
+	</target>
 
 
-   <target name="start-stop-jboss" depends="init" description="Start and stop jboss">
+	<target name="start-stop-jboss" depends="init" description="Start and stop jboss">
 
-      <start-jboss conf="all" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
-      <wait-on-host/>
+		<start-jboss conf="all" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
+		<wait-on-host/>
 
-      <stop-jboss jboss.dist="${ejb3.dist}"/>
-      <wait-on-shutdown conf="all"/>
-   </target>
+		<stop-jboss jboss.dist="${ejb3.dist}"/>
+		<wait-on-shutdown conf="all"/>
+	</target>
 
-   <target name="no-start-jboss-ejb-tests" depends="init" description="Execute all tests">
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="ejbthree1090"/>
-      </antcall>
-      <!--antcall target="test" inheritRefs="true">
+	<target name="no-start-jboss-ejb-tests" depends="init" description="Execute all tests">
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="ejbthree1090"/>
+		</antcall>
+		<!--antcall target="test" inheritRefs="true">
          <param name="test" value="jaccpropagation"/>
       </antcall-->
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="ejbthree1092"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="arjuna"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="webservices"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="regression/ejbthree454"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="regression/ejbthree670"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="regression/salesforce7123"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="regression/scopedclassloader"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="dependency"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="bmt"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="regression/ejbthree249"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="regression/ejbthree316"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="regression/ejbthree231"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="clientinterceptors"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="interceptors2"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="interceptors3"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="interceptors"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="jaxws"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="txexceptions"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="localcall"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="service"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="servicexmbean"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="stateful"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="descriptortypo"/>
-      </antcall>
-      <!--antcall target="test" inheritRefs="true">
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="ejbthree1092"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="arjuna"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="webservices"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="regression/ejbthree454"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="regression/ejbthree670"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="regression/salesforce7123"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="regression/scopedclassloader"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="dependency"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="bmt"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="regression/ejbthree249"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="regression/ejbthree316"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="regression/ejbthree231"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="clientinterceptors"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="interceptors2"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="interceptors3"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="interceptors"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="jaxws"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="txexceptions"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="localcall"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="service"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="servicexmbean"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="stateful"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="descriptortypo"/>
+		</antcall>
+		<!--antcall target="test" inheritRefs="true">
          <param name="test" value="concurrent"/>
       </antcall-->
-      <!--antcall target="test" inheritRefs="true">
+		<!--antcall target="test" inheritRefs="true">
          <param name="test" value="seam"/>
       </antcall-->
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="aspectdomain"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="ejbcontext"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="initial"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="timer"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="timerdependency"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="classloader"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="asynchronous"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="mdb"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="invalidtxmdb"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="mdbtransactions"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="consumer"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="cache"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="strictpool"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="stateless"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="defaultremotebindings"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="concurrentnaming"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="homeinterface"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="propertyreplacement"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="deployer"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="container"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="circulardependency"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="servicedependency"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="security"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="dd"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="bank"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="schema"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="mail"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="unauthenticatedprincipal"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="securitydomain"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="naming"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="pool"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="reference21_30"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="dd/mdb"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="jca/inflowmdb"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="jms"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="jms/managed"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="enventry"/>
-      </antcall>
-      <!--antcall target="test" inheritRefs="true">
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="aspectdomain"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="ejbcontext"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="initial"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="timer"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="timerdependency"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="classloader"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="asynchronous"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="mdb"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="invalidtxmdb"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="mdbtransactions"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="consumer"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="cache"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="strictpool"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="stateless"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="defaultremotebindings"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="concurrentnaming"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="homeinterface"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="propertyreplacement"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="deployer"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="container"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="circulardependency"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="servicedependency"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="security"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="dd"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="bank"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="schema"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="mail"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="unauthenticatedprincipal"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="securitydomain"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="naming"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="pool"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="reference21_30"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="dd/mdb"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="jca/inflowmdb"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="jms"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="jms/managed"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="enventry"/>
+		</antcall>
+		<!--antcall target="test" inheritRefs="true">
          <param name="test" value="jca"/>
       </antcall-->
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="dd/override"/>
+		</antcall>
+		<!-- Wolf: disabled web integration, needs JavaEE 5
       <antcall target="test" inheritRefs="true">
-         <param name="test" value="dd/override"/>
-      </antcall>
-      <!-- Wolf: disabled web integration, needs JavaEE 5
-      <antcall target="test" inheritRefs="true">
          <param name="test" value="dd/web"/>
       </antcall>
       -->
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="jsp"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="servlet"/>
-      </antcall>
-      <!--antcall target="test" inheritRefs="true">
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="jsp"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="servlet"/>
+		</antcall>
+		<!--antcall target="test" inheritRefs="true">
          <param name="test" value="loginmodule"/>
       </antcall-->
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="exception"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="microbench"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="ejbthree712"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="ejbthree724"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="ejbthree751"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="ejbthree785"/>
-      </antcall>
-      <!--antcall target="test" inheritRefs="true">
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="exception"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="microbench"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="ejbthree712"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="ejbthree724"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="ejbthree751"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="ejbthree785"/>
+		</antcall>
+		<!--antcall target="test" inheritRefs="true">
          <param name="test" value="ejbthree786"/>
       </antcall-->
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="ejbthree832"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="ejbthree879"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="ejbthree959"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="ejbthree963"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="ejbthree987"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="ejbthree994"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="ejbthree1023"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="ejbthree1025"/>
-      </antcall>
-      <!--antcall target="test" inheritRefs="true">
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="ejbthree832"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="ejbthree879"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="ejbthree959"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="ejbthree963"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="ejbthree987"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="ejbthree994"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="ejbthree1023"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="ejbthree1025"/>
+		</antcall>
+		<!--antcall target="test" inheritRefs="true">
          <param name="test" value="ejbthree1057"/>
       </antcall-->
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="ejbthree1058"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="ejbthree1060"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="ejbthree1062"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="ejbthree1122"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="ejbthree1239"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="ejbthree1876"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="jbas4489"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="jbpapp584"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="jbpapp999"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="jbpapp1186"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="jbpapp1224"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="jbpapp1668"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="jbpapp1951"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="jbpapp2260"/>
-      </antcall>
-   </target>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="ejbthree1058"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="ejbthree1060"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="ejbthree1062"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="ejbthree1122"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="ejbthree1239"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="ejbthree1876"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="jbas4489"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="jbpapp584"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="jbpapp999"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="jbpapp1186"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="jbpapp1224"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="jbpapp1668"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="jbpapp1951"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="jbpapp2260"/>
+		</antcall>
+	</target>
 
-   <target name="entity-tests" depends="init" description="Execute all tests">
-	  <!-- create custom configuration -->
-      <create-config baseconf="all" newconf="entity" jboss.dist="${ejb3.dist}">
-        <patternset>
-           <include name="conf/**"/>
-           <include name="deploy*/**"/>
-           <include name="lib/**"/>
-           <include name="farm/**"/>
-        </patternset>
-      </create-config>
+	<target name="entity-tests" depends="init" description="Execute all tests">
+		<!-- create custom configuration -->
+		<create-config baseconf="all" newconf="entity" jboss.dist="${ejb3.dist}">
+			<patternset>
+				<include name="conf/**"/>
+				<include name="deploy*/**"/>
+				<include name="lib/**"/>
+				<include name="farm/**"/>
+			</patternset>
+		</create-config>
 
-      <start-jboss conf="entity" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
-      <wait-on-host/>
+		<start-jboss conf="entity" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
+		<wait-on-host/>
 
-      <antcall target="no-start-jboss-entity-tests" inheritRefs="true"/>
+		<antcall target="no-start-jboss-entity-tests" inheritRefs="true"/>
 
-      <stop-jboss jboss.dist="${ejb3.dist}"/>
-      <wait-on-shutdown conf="entity"/>
-   </target>
+		<stop-jboss jboss.dist="${ejb3.dist}"/>
+		<wait-on-shutdown conf="entity"/>
+	</target>
 
-   <target name="no-start-jboss-entity-tests" depends="init" description="Execute all tests">
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="epcpropagation"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="regression/ejbthree440"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="regression/ejbthree290"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="ejbthree1028"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="longlived"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="factory"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="ear"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="factoryxml"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="hbm"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="pkg"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="entityexception"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="secondary"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="xmlcfg"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="lob"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="composite"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="composite2"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="entity"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="entityoptimisticlocking"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="persistenceunits"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="manytomany"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="joininheritance"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="singletableinheritance"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="tableperinheritance"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="dependent"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="entitycallback"/>
-      </antcall>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="regressionHHH275"/>
-      </antcall>
+	<target name="no-start-jboss-entity-tests" depends="init" description="Execute all tests">
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="epcpropagation"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="regression/ejbthree440"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="regression/ejbthree290"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="ejbthree1028"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="longlived"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="factory"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="ear"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="factoryxml"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="hbm"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="pkg"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="entityexception"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="secondary"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="xmlcfg"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="lob"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="composite"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="composite2"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="entity"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="entityoptimisticlocking"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="persistenceunits"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="manytomany"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="joininheritance"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="singletableinheritance"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="tableperinheritance"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="dependent"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="entitycallback"/>
+		</antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="regressionHHH275"/>
+		</antcall>
 
-   </target>
+	</target>
 
-   <target name="clustered-test" depends="init">
-      <antcall target="tests-clustering-startup"/>
-      <antcall target="tests-clustering-wait"/>
+	<target name="clustered-test" depends="init">
+		<antcall target="tests-clustering-startup"/>
+		<antcall target="tests-clustering-wait"/>
 
-      <antcall target="test-with-jvmargs" inheritRefs="true">
-         <param name="jvmargs" value=""/>
-         <!--
+		<antcall target="test-with-jvmargs" inheritRefs="true">
+			<param name="jvmargs" value=""/>
+			<!--
          <param name="jvmargs"
                 value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=/dt_socket,address=8787,server=n,suspend=n"/>
          -->
-      </antcall>
+		</antcall>
 
-      <antcall target="tests-clustering-shutdown"/>
-   </target>
+		<antcall target="tests-clustering-shutdown"/>
+	</target>
 
-   <target name="clustered-one-test" depends="init, clusteredsession, clusteredentity, ejbthree921, ejbthree1109">
-      <!--
+	<target name="clustered-one-test" depends="init, clusteredsession, clusteredentity, ejbthree921, ejbthree1109">
+		<!--
 -->
-      <antcall target="tests-clustering-startup"/>
-      <antcall target="tests-clustering-wait"/>
+		<antcall target="tests-clustering-startup"/>
+		<antcall target="tests-clustering-wait"/>
 
-      <antcall target="one-test-with-jvmargs" inheritRefs="true">
-         <!--param name="test" value="clusteredsession"/-->
-         <param name="jvmargs" value=""/>
-         <!--
+		<antcall target="one-test-with-jvmargs" inheritRefs="true">
+			<!--param name="test" value="clusteredsession"/-->
+			<param name="jvmargs" value=""/>
+			<!--
          <param name="jvmargs"
                 value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=/dt_socket,address=8787,server=n,suspend=n"/>
          -->
-      </antcall>
+		</antcall>
 
-      <!--
+		<!--
          Test in test-cluster-session shuts down both nodes. It needs to shut down one
          anyway as part of the tests, so simplest is to shut down the other from within
          the test rather than figure out what to shut down here.
       -->
-      <!--
+		<!--
 -->
-      <antcall target="tests-clustering-shutdown"/>
+		<antcall target="tests-clustering-shutdown"/>
 
-   </target>
+	</target>
 
-   <target name="clustered-tests" depends="init, clusteredsession, clusteredentity, ejbthree921">
-      <antcall target="tests-clustering-startup"/>
-      <antcall target="tests-clustering-wait"/>
+	<target name="clustered-tests" depends="init, clusteredsession, clusteredentity, ejbthree921">
+		<antcall target="tests-clustering-startup"/>
+		<antcall target="tests-clustering-wait"/>
 
-      <antcall target="test-clustered-entity"/>
-      <antcall target="test-cluster-session"/>
+		<antcall target="test-clustered-entity"/>
+		<antcall target="test-cluster-session"/>
 
-      <antcall target="tests-clustering-shutdown"/>
+		<antcall target="tests-clustering-shutdown"/>
 
-      <!-- Rerun the tests with buddy replication turned off -->
-      <antcall target="clustered-buddyrepl-test"/>
+		<!-- Rerun the tests with buddy replication turned off -->
+		<antcall target="clustered-buddyrepl-test"/>
 
-   </target>
+	</target>
 
-   <target name="libdeployment-test" depends="init">
-      <create-config baseconf="all" newconf="libdeployment" jboss.dist="${ejb3.dist}">
-         <patternset>
-            <include name="conf/**"/>
-            <include name="deploy*/**"/>
-            <include name="lib/**"/>
-         </patternset>
-      </create-config>
+	<target name="libdeployment-test" depends="init">
+		<create-config baseconf="all" newconf="libdeployment" jboss.dist="${ejb3.dist}">
+			<patternset>
+				<include name="conf/**"/>
+				<include name="deploy*/**"/>
+				<include name="lib/**"/>
+			</patternset>
+		</create-config>
 
-      <start-jboss conf="libdeployment" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
-      <wait-on-host/>
+		<start-jboss conf="libdeployment" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
+		<wait-on-host/>
 
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="libdeployment"/>
-      </antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="libdeployment"/>
+		</antcall>
 
-      <stop-jboss jboss.dist="${ejb3.dist}"/>
-      <wait-on-shutdown conf="libdeployment"/>
-   </target>
+		<stop-jboss jboss.dist="${ejb3.dist}"/>
+		<wait-on-shutdown conf="libdeployment"/>
+	</target>
 
-   <target name="externalpersistenceunit-test" depends="init">
-      <create-config baseconf="all" newconf="externalpersistenceunit" jboss.dist="${ejb3.dist}">
-         <patternset>
-            <include name="conf/**"/>
-            <include name="deploy*/**"/>
-            <include name="lib/**"/>
-         </patternset>
-      </create-config>
+	<target name="externalpersistenceunit-test" depends="init">
+		<create-config baseconf="all" newconf="externalpersistenceunit" jboss.dist="${ejb3.dist}">
+			<patternset>
+				<include name="conf/**"/>
+				<include name="deploy*/**"/>
+				<include name="lib/**"/>
+			</patternset>
+		</create-config>
 
-      <start-jboss conf="externalpersistenceunit" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
-      <wait-on-host/>
+		<start-jboss conf="externalpersistenceunit" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
+		<wait-on-host/>
 
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="externalpersistenceunit"/>
-      </antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="externalpersistenceunit"/>
+		</antcall>
 
-      <stop-jboss jboss.dist="${ejb3.dist}"/>
-      <wait-on-shutdown conf="externalpersistenceunit"/>
-   </target>
+		<stop-jboss jboss.dist="${ejb3.dist}"/>
+		<wait-on-shutdown conf="externalpersistenceunit"/>
+	</target>
 
-   <target name="mdbsessionpoolclear-test" depends="init">
-      <create-config baseconf="all" newconf="mdbsessionpoolclear" jboss.dist="${ejb3.dist}">
-         <patternset>
-            <include name="conf/**"/>
-            <include name="deploy*/**"/>
-            <include name="lib/**"/>
-         </patternset>
-      </create-config>
+	<target name="mdbsessionpoolclear-test" depends="init">
+		<create-config baseconf="all" newconf="mdbsessionpoolclear" jboss.dist="${ejb3.dist}">
+			<patternset>
+				<include name="conf/**"/>
+				<include name="deploy*/**"/>
+				<include name="lib/**"/>
+			</patternset>
+		</create-config>
 
-      <start-jboss conf="mdbsessionpoolclear" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
-      <wait-on-host/>
+		<start-jboss conf="mdbsessionpoolclear" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
+		<wait-on-host/>
 
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="mdbsessionpoolclear"/>
-      </antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="mdbsessionpoolclear"/>
+		</antcall>
 
-      <stop-jboss jboss.dist="${ejb3.dist}"/>
-      <wait-on-shutdown conf="mdbsessionpoolclear"/>
-   </target>
+		<stop-jboss jboss.dist="${ejb3.dist}"/>
+		<wait-on-shutdown conf="mdbsessionpoolclear"/>
+	</target>
 
-   <target name="ejbthree1504-test" depends="init">
-      <create-config baseconf="all" newconf="ejbthree1504" jboss.dist="${ejb3.dist}">
-         <patternset>
-            <include name="conf/**"/>
-            <include name="deploy*/**"/>
-            <include name="lib/**"/>
-         </patternset>
-      </create-config>
+	<target name="ejbthree1504-test" depends="init">
+		<create-config baseconf="all" newconf="ejbthree1504" jboss.dist="${ejb3.dist}">
+			<patternset>
+				<include name="conf/**"/>
+				<include name="deploy*/**"/>
+				<include name="lib/**"/>
+			</patternset>
+		</create-config>
 
-      <start-jboss conf="ejbthree1504" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejbthree1504.jboss.jvmargs}"/>
-      <wait-on-host/>
+		<start-jboss conf="ejbthree1504" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejbthree1504.jboss.jvmargs}"/>
+		<wait-on-host/>
 
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="ejbthree1504"/>
-      </antcall>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="ejbthree1504"/>
+		</antcall>
 
-      <stop-jboss jboss.dist="${ejb3.dist}"/>
-      <wait-on-shutdown conf="ejbthree1504"/>
-   </target>
+		<stop-jboss jboss.dist="${ejb3.dist}"/>
+		<wait-on-shutdown conf="ejbthree1504"/>
+	</target>
 
-   <target name="ssl-simple-test" depends="init">
-      <create-config baseconf="all" newconf="ejb3-ssl" jboss.dist="${ejb3.dist}">
-         <patternset>
-            <include name="conf/**"/>
-            <include name="deploy*/**"/>
-            <include name="lib/**"/>
-         </patternset>
-      </create-config>
+	<target name="ssl-simple-test" depends="init">
+		<create-config baseconf="all" newconf="ejb3-ssl" jboss.dist="${ejb3.dist}">
+			<patternset>
+				<include name="conf/**"/>
+				<include name="deploy*/**"/>
+				<include name="lib/**"/>
+			</patternset>
+		</create-config>
 
-      <!--
+		<!--
          We are using the simplest remoting sslsocket configuration possible, we
          need to tell JBoss to use the supplied keystore via system properties
       -->
-      <property name="ssl-args" value="-Djavax.net.ssl.keyStore=${ejb3.dist}/server/ejb3-ssl/conf/localhost.keystore -Djavax.net.ssl.keyStorePassword=opensource ${ejb3.jboss.jvmargs}"/>
-      <start-jboss conf="ejb3-ssl" host="${node0}" jvmargs="${ssl-args}" jboss.dist="${ejb3.dist}"/>
-      <wait-on-host/>
+		<property name="ssl-args" value="-Djavax.net.ssl.keyStore=${ejb3.dist}/server/ejb3-ssl/conf/localhost.keystore -Djavax.net.ssl.keyStorePassword=opensource ${ejb3.jboss.jvmargs}"/>
+		<start-jboss conf="ejb3-ssl" host="${node0}" jvmargs="${ssl-args}" jboss.dist="${ejb3.dist}"/>
+		<wait-on-host/>
 
-      <antcall target="no-start-jboss-ssl-tests" inheritRefs="true"/>
+		<antcall target="no-start-jboss-ssl-tests" inheritRefs="true"/>
 
-      <stop-jboss jboss.dist="${ejb3.dist}"/>
-      <wait-on-shutdown conf="ejb3-ssl"/>
-   </target>
+		<stop-jboss jboss.dist="${ejb3.dist}"/>
+		<wait-on-shutdown conf="ejb3-ssl"/>
+	</target>
 
-   <target name="no-start-jboss-ssl-tests" depends="init" description="Execute all ssl tests">
-      <property name="jvmargs" value="-Djavax.net.ssl.trustStore=${resources}/test/ssl/localhost.truststore -Djavax.net.ssl.trustStorePassword=opensource"/>
+	<target name="no-start-jboss-ssl-tests" depends="init" description="Execute all ssl tests">
+		<property name="jvmargs" value="-Djavax.net.ssl.trustStore=${resources}/test/ssl/localhost.truststore -Djavax.net.ssl.trustStorePassword=opensource"/>
 
-      <antcall target="test-with-jvmargs" inheritRefs="true">
-         <param name="test" value="ssl"/>
-         <param name="jvmargs" value="${jvmargs}"/>
-      </antcall>
-   </target>
+		<antcall target="test-with-jvmargs" inheritRefs="true">
+			<param name="test" value="ssl"/>
+			<param name="jvmargs" value="${jvmargs}"/>
+		</antcall>
+	</target>
 
-   <target name="ssl-advanced-test" depends="init">
-      <create-config baseconf="all" newconf="ejb3-ssl-advanced" jboss.dist="${ejb3.dist}">
-         <patternset>
-            <include name="conf/**"/>
-            <include name="deploy*/**"/>
-            <include name="lib/**"/>
-         </patternset>
-      </create-config>
+	<target name="ssl-advanced-test" depends="init">
+		<create-config baseconf="all" newconf="ejb3-ssl-advanced" jboss.dist="${ejb3.dist}">
+			<patternset>
+				<include name="conf/**"/>
+				<include name="deploy*/**"/>
+				<include name="lib/**"/>
+			</patternset>
+		</create-config>
 
-      <!--
+		<!--
          "Advanced" remoting sslsocket configuration contains keystore info
       -->
-      <start-jboss conf="ejb3-ssl-advanced" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
-      <wait-on-host/>
+		<start-jboss conf="ejb3-ssl-advanced" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
+		<wait-on-host/>
 
-      <!-- Tell client to use the supplied truststore -->
-      <property name="jvmargs" value="-Djavax.net.ssl.trustStore=${resources}/test/ssl/localhost.truststore -Djavax.net.ssl.trustStorePassword=opensource"/>
+		<!-- Tell client to use the supplied truststore -->
+		<property name="jvmargs" value="-Djavax.net.ssl.trustStore=${resources}/test/ssl/localhost.truststore -Djavax.net.ssl.trustStorePassword=opensource"/>
 
-      <antcall target="test-with-jvmargs" inheritRefs="true">
-         <param name="test" value="ssladvanced"/>
-         <param name="jvmargs" value="${jvmargs}"/>
-      </antcall>
+		<antcall target="test-with-jvmargs" inheritRefs="true">
+			<param name="test" value="ssladvanced"/>
+			<param name="jvmargs" value="${jvmargs}"/>
+		</antcall>
 
-      <stop-jboss jboss.dist="${ejb3.dist}"/>
-      <wait-on-shutdown conf="ejb3-ssl-advanced"/>
-   </target>
+		<stop-jboss jboss.dist="${ejb3.dist}"/>
+		<wait-on-shutdown conf="ejb3-ssl-advanced"/>
+	</target>
 
-   <target name="invoker-test" depends="init">
-      <create-config baseconf="all" newconf="invoker" jboss.dist="${ejb3.dist}">
-         <patternset>
-            <include name="conf/**"/>
-            <include name="deploy*/**"/>
-            <include name="lib/**"/>
-         </patternset>
-      </create-config>
+	<target name="invoker-test" depends="init">
+		<create-config baseconf="all" newconf="invoker" jboss.dist="${ejb3.dist}">
+			<patternset>
+				<include name="conf/**"/>
+				<include name="deploy*/**"/>
+				<include name="lib/**"/>
+			</patternset>
+		</create-config>
 
-      <property name="ssl-args" value="-Djavax.net.ssl.keyStore=${ejb3.dist}/server/invoker/conf/localhost.keystore -Djavax.net.ssl.keyStorePassword=opensource -Djava.protocol.handler.pkgs=javax.net.ssl ${ejb3.jboss.jvmargs}"/>
+		<property name="ssl-args" value="-Djavax.net.ssl.keyStore=${ejb3.dist}/server/invoker/conf/localhost.keystore -Djavax.net.ssl.keyStorePassword=opensource -Djava.protocol.handler.pkgs=javax.net.ssl ${ejb3.jboss.jvmargs}"/>
 
-      <start-jboss conf="invoker" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ssl-args}"/>
-      <wait-on-host/>
+		<start-jboss conf="invoker" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ssl-args}"/>
+		<wait-on-host/>
 
-      <!-- Tell client to use the supplied truststore -->
-      <property name="jvmargs" value="-Djavax.net.ssl.trustStore=${resources}/test/ssl/localhost.truststore -Djavax.net.ssl.trustStorePassword=opensource -Djava.protocol.handler.pkgs=javax.net.ssl"/>
+		<!-- Tell client to use the supplied truststore -->
+		<property name="jvmargs" value="-Djavax.net.ssl.trustStore=${resources}/test/ssl/localhost.truststore -Djavax.net.ssl.trustStorePassword=opensource -Djava.protocol.handler.pkgs=javax.net.ssl"/>
 
-      <antcall target="test-with-jvmargs" inheritRefs="true">
-         <param name="test" value="invoker"/>
-         <param name="jvmargs" value="${jvmargs}"/>
-      </antcall>
+		<antcall target="test-with-jvmargs" inheritRefs="true">
+			<param name="test" value="invoker"/>
+			<param name="jvmargs" value="${jvmargs}"/>
+		</antcall>
 
-      <stop-jboss jboss.dist="${ejb3.dist}"/>
-      <wait-on-shutdown conf="invoker"/>
-   </target>
+		<stop-jboss jboss.dist="${ejb3.dist}"/>
+		<wait-on-shutdown conf="invoker"/>
+	</target>
 
-   <target name="jacc-test" depends="init">
-      <create-config baseconf="all" newconf="ejb3-jacc" jboss.dist="${ejb3.dist}">
-         <patternset>
-            <include name="conf/**"/>
-            <include name="deploy*/**"/>
-            <include name="lib/**"/>
-         </patternset>
-      </create-config>
-      <start-jboss conf="ejb3-jacc" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
-      <wait-on-host/>
-      <antcall target="test" inheritRefs="true">
-         <param name="test" value="jacc"/>
-      </antcall>
-      <stop-jboss jboss.dist="${ejb3.dist}"/>
-      <wait-on-shutdown conf="ejb3-jacc" />
-   </target>
+	<target name="jacc-test" depends="init">
+		<create-config baseconf="all" newconf="ejb3-jacc" jboss.dist="${ejb3.dist}">
+			<patternset>
+				<include name="conf/**"/>
+				<include name="deploy*/**"/>
+				<include name="lib/**"/>
+			</patternset>
+		</create-config>
+		<start-jboss conf="ejb3-jacc" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
+		<wait-on-host/>
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="jacc"/>
+		</antcall>
+		<stop-jboss jboss.dist="${ejb3.dist}"/>
+		<wait-on-shutdown conf="ejb3-jacc" />
+	</target>
 
-   <!-- ================================================================== -->
-   <!-- Clustering                                                         -->
-   <!-- ================================================================== -->
+	<!-- ================================================================== -->
+	<!-- Clustering                                                         -->
+	<!-- ================================================================== -->
 
-   <!-- Stuff needed for clustering -->
+	<!-- Stuff needed for clustering -->
 
-   <target name="test-clustered-entity">
-      <antcall target="test-with-jvmargs" inheritRefs="true">
-         <param name="test" value="clusteredentity"/>
-         <param name="jvmargs" value=""/>
-      </antcall>
+	<target name="test-clustered-entity">
+		<antcall target="test-with-jvmargs" inheritRefs="true">
+			<param name="test" value="clusteredentity"/>
+			<param name="jvmargs" value=""/>
+		</antcall>
 
-   </target>
+	</target>
 
-   <target name="test-cluster-session">
+	<target name="test-cluster-session">
 
-      <property name="buddy-replication-extension" value="BR-disabled"/>
+		<property name="buddy-replication-extension" value="BR-disabled"/>
 
-      <antcall target="test-with-jvmargs" inheritRefs="true">
-         <param name="test" value="clusteredsession"/>
-         <param name="jvmargs" value=""/>
-         <param name="test.extension" value="${buddy-replication-extension}"/>
-         <!--
+		<antcall target="test-with-jvmargs" inheritRefs="true">
+			<param name="test" value="clusteredsession"/>
+			<param name="jvmargs" value=""/>
+			<param name="test.extension" value="${buddy-replication-extension}"/>
+			<!--
 	      <param name="jvmargs"
 	             value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,address=8787,server=n,suspend=n"/>
 	      -->
-      </antcall>
+		</antcall>
 
-      <antcall target="test-with-jvmargs" inheritRefs="true">
-         <param name="test" value="ejbthree921"/>
-         <param name="jvmargs" value=""/>
-         <param name="test.extension" value="${buddy-replication-extension}"/>
-      </antcall>
+		<antcall target="test-with-jvmargs" inheritRefs="true">
+			<param name="test" value="ejbthree921"/>
+			<param name="jvmargs" value=""/>
+			<param name="test.extension" value="${buddy-replication-extension}"/>
+		</antcall>
 
-      <antcall target="test-with-jvmargs" inheritRefs="true">
-         <param name="test" value="ejbthree1136"/>
-         <param name="jvmargs" value=""/>
-         <param name="test.extension" value="${buddy-replication-extension}"/>
-      </antcall>
+		<antcall target="test-with-jvmargs" inheritRefs="true">
+			<param name="test" value="ejbthree1136"/>
+			<param name="jvmargs" value=""/>
+			<param name="test.extension" value="${buddy-replication-extension}"/>
+		</antcall>
 
-      <antcall target="test-with-jvmargs" inheritRefs="true">
-         <param name="test" value="ejbthree1109"/>
-         <param name="jvmargs" value=""/>
-         <param name="test.extension" value="${buddy-replication-extension}"/>
-      </antcall>
+		<antcall target="test-with-jvmargs" inheritRefs="true">
+			<param name="test" value="ejbthree1109"/>
+			<param name="jvmargs" value=""/>
+			<param name="test.extension" value="${buddy-replication-extension}"/>
+		</antcall>
 
-   </target>
+	</target>
 
-   <target name="statelesscreation-test">
-      <create-config baseconf="all" newconf="statelesscreation">
-         <patternset>
-            <include name="conf/**"/>
-            <include name="deploy*/**"/>
-            <include name="lib/**"/>
-         </patternset>
-      </create-config>
+	<target name="statelesscreation-test">
+		<create-config baseconf="all" newconf="statelesscreation">
+			<patternset>
+				<include name="conf/**"/>
+				<include name="deploy*/**"/>
+				<include name="lib/**"/>
+			</patternset>
+		</create-config>
 
-      <start-jboss conf="statelesscreation" host="${node0}" jvmargs="${ejb3.jboss.jvmargs}"/>
-      <wait-on-host/>
+		<start-jboss conf="statelesscreation" host="${node0}" jvmargs="${ejb3.jboss.jvmargs}"/>
+		<wait-on-host/>
 
-      <antcall target="test-with-jvmargs" inheritRefs="true">
-         <param name="test" value="statelesscreation"/>
-         <param name="jvmargs" value=""/>
-      </antcall>
+		<antcall target="test-with-jvmargs" inheritRefs="true">
+			<param name="test" value="statelesscreation"/>
+			<param name="jvmargs" value=""/>
+		</antcall>
 
-      <stop-jboss url="${node0.jndi.url}" jboss.dist="${ejb3.dist}"/>
-      <wait-on-shutdown conf="statelesscreation"/>
-   </target>
+		<stop-jboss url="${node0.jndi.url}" jboss.dist="${ejb3.dist}"/>
+		<wait-on-shutdown conf="statelesscreation"/>
+	</target>
 
-   <target name="removedislocal-test">
-      <create-config baseconf="all" newconf="removedislocal">
-         <patternset>
-            <include name="conf/**"/>
-            <include name="deploy*/**"/>
-            <include name="lib/**"/>
-         </patternset>
-      </create-config>
+	<target name="removedislocal-test">
+		<create-config baseconf="all" newconf="removedislocal">
+			<patternset>
+				<include name="conf/**"/>
+				<include name="deploy*/**"/>
+				<include name="lib/**"/>
+			</patternset>
+		</create-config>
 
-      <start-jboss conf="removedislocal" host="${node0}" jvmargs="${ejb3.jboss.jvmargs}"/>
-      <wait-on-host/>
+		<start-jboss conf="removedislocal" host="${node0}" jvmargs="${ejb3.jboss.jvmargs}"/>
+		<wait-on-host/>
 
-      <antcall target="test-with-jvmargs" inheritRefs="true">
-         <param name="test" value="removedislocal"/>
-         <param name="jvmargs" value=""/>
-      </antcall>
+		<antcall target="test-with-jvmargs" inheritRefs="true">
+			<param name="test" value="removedislocal"/>
+			<param name="jvmargs" value=""/>
+		</antcall>
 
-      <stop-jboss url="${node0.jndi.url}" jboss.dist="${ejb3.dist}"/>
-      <wait-on-shutdown conf="removedislocal"/>
-   </target>
+		<stop-jboss url="${node0.jndi.url}" jboss.dist="${ejb3.dist}"/>
+		<wait-on-shutdown conf="removedislocal"/>
+	</target>
 
-   <target name="multi-instance-localfromremote-test">
-      <create-config baseconf="default" newconf="localfromremote1">
-         <patternset>
-            <include name="conf/**"/>
-            <include name="deploy*/**"/>
-            <include name="lib/**"/>
-         </patternset>
-      </create-config>
-      <create-config baseconf="default" newconf="localfromremote2">
-         <patternset>
-            <include name="conf/**"/>
-            <include name="deploy*/**"/>
-            <include name="lib/**"/>
-         </patternset>
-      </create-config>
+	<target name="multi-instance-localfromremote-test">
+		<create-config baseconf="default" newconf="localfromremote1">
+			<patternset>
+				<include name="conf/**"/>
+				<include name="deploy*/**"/>
+				<include name="lib/**"/>
+			</patternset>
+		</create-config>
+		<create-config baseconf="default" newconf="localfromremote2">
+			<patternset>
+				<include name="conf/**"/>
+				<include name="deploy*/**"/>
+				<include name="lib/**"/>
+			</patternset>
+		</create-config>
 
-      <start-jboss conf="localfromremote1" host="${node0}" jvmargs="${ejb3.jboss.jvmargs}"/>
-      <start-jboss conf="localfromremote2" host="${node0}" jvmargs="${ejb3.jboss.jvmargs}"/>
+		<start-jboss conf="localfromremote1" host="${node0}" jvmargs="${ejb3.jboss.jvmargs}"/>
+		<start-jboss conf="localfromremote2" host="${node0}" jvmargs="${ejb3.jboss.jvmargs}"/>
 
-      <antcall target="tests-multi-instance-wait"/>
+		<antcall target="tests-multi-instance-wait"/>
 
-      <antcall target="test-with-jvmargs" inheritRefs="true">
-         <param name="test" value="localfromremote"/>
-         <param name="jvmargs" value=""/>
-      </antcall>
+		<antcall target="test-with-jvmargs" inheritRefs="true">
+			<param name="test" value="localfromremote"/>
+			<param name="jvmargs" value=""/>
+		</antcall>
 
-      <stop-jboss url="${node0.jndi.url}" jboss.dist="${ejb3.dist}"/>
-      <stop-jboss url="${node0.jndi.port1.url}" jboss.dist="${ejb3.dist}"/>
+		<stop-jboss url="${node0.jndi.url}" jboss.dist="${ejb3.dist}"/>
+		<stop-jboss url="${node0.jndi.port1.url}" jboss.dist="${ejb3.dist}"/>
 
-      <wait-on-shutdown conf="localfromremote1"/>
-      <wait-on-shutdown conf="localfromremote2"/>
-   </target>
+		<wait-on-shutdown conf="localfromremote1"/>
+		<wait-on-shutdown conf="localfromremote2"/>
+	</target>
 
-   <target name="clustered-jms-test">
-      <create-config baseconf="all" newconf="clusteredjms" jboss.dist="${ejb3.dist}">
-         <patternset>
-            <include name="conf/**"/>
-            <include name="deploy*/**"/>
-            <include name="lib/**"/>
-            <include name="deploy-hasingleton/**"/>
-         </patternset>
-      </create-config>
-      <create-config baseconf="clusteredjms" newconf="clusteredjms2" jboss.dist="${ejb3.dist}">
-         <patternset>
-            <include name="conf/**"/>
-            <include name="deploy*/**"/>
-            <include name="lib/**"/>
-            <include name="deploy-hasingleton/**"/>
-         </patternset>
-      </create-config>
+	<target name="clustered-jms-test">
+		<create-config baseconf="all" newconf="clusteredjms" jboss.dist="${ejb3.dist}">
+			<patternset>
+				<include name="conf/**"/>
+				<include name="deploy*/**"/>
+				<include name="lib/**"/>
+				<include name="deploy-hasingleton/**"/>
+			</patternset>
+		</create-config>
+		<create-config baseconf="clusteredjms" newconf="clusteredjms2" jboss.dist="${ejb3.dist}">
+			<patternset>
+				<include name="conf/**"/>
+				<include name="deploy*/**"/>
+				<include name="lib/**"/>
+				<include name="deploy-hasingleton/**"/>
+			</patternset>
+		</create-config>
 
-      <start-jboss conf="clusteredjms2" host="${node1}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs} -Djgroups.bind_addr=${node1.jgroups.bind_addr}"/>
-      <antcall target="tests-clusteredjms2-wait"/>
-      <start-jboss conf="clusteredjms" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs} -Djgroups.bind_addr=${node0.jgroups.bind_addr}"/>
-      <antcall target="tests-clusteredjms-wait"/>
+		<start-jboss conf="clusteredjms2" host="${node1}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs} -Djgroups.bind_addr=${node1.jgroups.bind_addr}"/>
+		<antcall target="tests-clusteredjms2-wait"/>
+		<start-jboss conf="clusteredjms" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs} -Djgroups.bind_addr=${node0.jgroups.bind_addr}"/>
+		<antcall target="tests-clusteredjms-wait"/>
 
-      <antcall target="test-with-jvmargs" inheritRefs="true">
-         <param name="test" value="clusteredjms"/>
-         <param name="jvmargs" value=""/>
-      </antcall>
+		<antcall target="test-with-jvmargs" inheritRefs="true">
+			<param name="test" value="clusteredjms"/>
+			<param name="jvmargs" value=""/>
+		</antcall>
 
-      <stop-jboss url="${node0.jndi.url}" jboss.dist="${ejb3.dist}"/>
-      <stop-jboss url="${node1.jndi.url}" jboss.dist="${ejb3.dist}"/>
+		<stop-jboss url="${node0.jndi.url}" jboss.dist="${ejb3.dist}"/>
+		<stop-jboss url="${node1.jndi.url}" jboss.dist="${ejb3.dist}"/>
 
-      <wait-on-shutdown conf="clusteredjms"/>
-      <wait-on-shutdown conf="clusteredjms2"/>
-   </target>
+		<wait-on-shutdown conf="clusteredjms"/>
+		<wait-on-shutdown conf="clusteredjms2"/>
+	</target>
 
-   <target name="tests-multi-instance-wait" unless="${tests.clustering.skip.startup}">
-      <echo message="Waiting for nodes to start..."/>
-      <waitfor maxwait="120" maxwaitunit="second"
+	<target name="tests-multi-instance-wait" unless="${tests.clustering.skip.startup}">
+		<echo message="Waiting for nodes to start..."/>
+		<waitfor maxwait="120" maxwaitunit="second"
          checkevery="5" checkeveryunit="second" timeoutproperty="cluster.timeout">
-         <and>
-            <http url="${node0.http.url}"/>
-            <http url="${node0.http.port1.url}"/>
-         </and>
-      </waitfor>
-      <fail message="Timeout waiting for nodes to start" if="cluster.timeout"/>
-      <echo message="Nodes have started, waiting for cluster to stablize..."/>
-   </target>
+			<and>
+				<http url="${node0.http.url}"/>
+				<http url="${node0.http.port1.url}"/>
+			</and>
+		</waitfor>
+		<fail message="Timeout waiting for nodes to start" if="cluster.timeout"/>
+		<echo message="Nodes have started, waiting for cluster to stablize..."/>
+	</target>
 
-   <target name="tests-clustering-wait" unless="${tests.clustering.skip.startup}">
-      <echo message="Waiting for nodes to start..."/>
-      <waitfor maxwait="120" maxwaitunit="second"
+	<target name="tests-clustering-wait" unless="${tests.clustering.skip.startup}">
+		<echo message="Waiting for nodes to start..."/>
+		<waitfor maxwait="120" maxwaitunit="second"
          checkevery="5" checkeveryunit="second" timeoutproperty="cluster.timeout">
-         <and>
-            <http url="${node0.http.url}"/>
-            <http url="${node1.http.url}"/>
-         </and>
-      </waitfor>
-      <fail message="Timeout waiting for nodes to start" if="cluster.timeout"/>
-      <echo message="Nodes have started, waiting for cluster to stablize..."/>
-   </target>
+			<and>
+				<http url="${node0.http.url}"/>
+				<http url="${node1.http.url}"/>
+			</and>
+		</waitfor>
+		<fail message="Timeout waiting for nodes to start" if="cluster.timeout"/>
+		<echo message="Nodes have started, waiting for cluster to stablize..."/>
+	</target>
 
-   <target name="tests-clusteredjms-wait" unless="${tests.clustering.skip.startup}">
-      <echo message="Waiting for node to start..."/>
-      <waitfor maxwait="120" maxwaitunit="second"
+	<target name="tests-clusteredjms-wait" unless="${tests.clustering.skip.startup}">
+		<echo message="Waiting for node to start..."/>
+		<waitfor maxwait="120" maxwaitunit="second"
          checkevery="5" checkeveryunit="second" timeoutproperty="cluster.timeout">
-         <and>
-            <http url="${node0.http.url}"/>
-         </and>
-      </waitfor>
-      <fail message="Timeout waiting for nodes to start" if="cluster.timeout"/>
-      <echo message="Nodes have started, waiting for cluster to stablize..."/>
-   </target>
+			<and>
+				<http url="${node0.http.url}"/>
+			</and>
+		</waitfor>
+		<fail message="Timeout waiting for nodes to start" if="cluster.timeout"/>
+		<echo message="Nodes have started, waiting for cluster to stablize..."/>
+	</target>
 
-   <target name="tests-clusteredjms2-wait" unless="${tests.clustering.skip.startup}">
-      <echo message="Waiting for node to start..."/>
-      <waitfor maxwait="120" maxwaitunit="second"
+	<target name="tests-clusteredjms2-wait" unless="${tests.clustering.skip.startup}">
+		<echo message="Waiting for node to start..."/>
+		<waitfor maxwait="120" maxwaitunit="second"
          checkevery="5" checkeveryunit="second" timeoutproperty="cluster.timeout">
-         <and>
-            <http url="${node1.http.url}"/>
-         </and>
-      </waitfor>
-      <fail message="Timeout waiting for nodes to start" if="cluster.timeout"/>
-      <echo message="Nodes have started, waiting for cluster to stablize..."/>
-   </target>
+			<and>
+				<http url="${node1.http.url}"/>
+			</and>
+		</waitfor>
+		<fail message="Timeout waiting for nodes to start" if="cluster.timeout"/>
+		<echo message="Nodes have started, waiting for cluster to stablize..."/>
+	</target>
 
-   <macrodef name="create-ejb3-cluster-node"
+	<macrodef name="create-ejb3-cluster-node"
       description="Create a simplified cluster configuration for ejb3 testing">
-      <attribute name="conf"/>
-      <attribute name="conf-src" description="The name of the tests-config to copy or the baseconf" default="@{conf}"/>
-      <attribute name="host" default="${node0}"/>
-      <attribute name="jboss.dist" default="${jboss.dist}"
+		<attribute name="conf"/>
+		<attribute name="conf-src" description="The name of the tests-config to copy or the baseconf" default="@{conf}"/>
+		<attribute name="host" default="${node0}"/>
+		<attribute name="jboss.dist" default="${jboss.dist}"
          description="The jboss dist root directory" />
-      <sequential>
-         <!-- Start with the standard cluster node from the testsuite -->
-         <create-cluster-node conf="@{conf}" jboss.dist="@{jboss.dist}"/>
-         <echo message="Adding ejb3 artifacts to @{conf} config, jboss.dist=@{jboss.dist}"/>
-         <copy todir="@{jboss.dist}/server/@{conf}">
-            <fileset dir="@{jboss.dist}/server/all">
-               <include name="deploy/ejb3.deployer/**"/>
-               <include name="deploy/ejb3-clustered-sfsbcache-service.xml"/>
-               <include name="deploy/ejb3-entity-cache-service.xml"/>
-               <include name="deploy/ejb3-interceptors-aop.xml"/>
-            </fileset>
-         </copy>
-         <echo message="Overwriting config descriptors" />
-         <copy todir="@{jboss.dist}/server/@{conf}" overwrite="true" failonerror="false">
-            <fileset dir="${build.resources}/test-configs/@{conf-src}" />
-         </copy>
-         <antcall target="modify-ejb3-repl_sync">
-            <param name="file_" value="${jboss.dist}/server/@{conf}/deploy/ejb3-clustered-sfsbcache-service.xml"/>
-         </antcall>
-      </sequential>
-   </macrodef>
+		<sequential>
+			<!-- Start with the standard cluster node from the testsuite -->
+			<create-cluster-node conf="@{conf}" jboss.dist="@{jboss.dist}"/>
+			<echo message="Adding ejb3 artifacts to @{conf} config, jboss.dist=@{jboss.dist}"/>
+			<copy todir="@{jboss.dist}/server/@{conf}">
+				<fileset dir="@{jboss.dist}/server/all">
+					<include name="deploy/ejb3.deployer/**"/>
+					<include name="deploy/ejb3-clustered-sfsbcache-service.xml"/>
+					<include name="deploy/ejb3-entity-cache-service.xml"/>
+					<include name="deploy/ejb3-interceptors-aop.xml"/>
+				</fileset>
+			</copy>
+			<echo message="Overwriting config descriptors" />
+			<copy todir="@{jboss.dist}/server/@{conf}" overwrite="true" failonerror="false">
+				<fileset dir="${build.resources}/test-configs/@{conf-src}" />
+			</copy>
+			<antcall target="modify-ejb3-repl_sync">
+				<param name="file_" value="${jboss.dist}/server/@{conf}/deploy/ejb3-clustered-sfsbcache-service.xml"/>
+			</antcall>
+		</sequential>
+	</macrodef>
 
-   <target name="modify-ejb3-repl_sync">
-      <echo message="Replacing the cache mode to REPL_SYNC in ${file_}"/>
-      <replaceregexp file="${file_}" byline="yes" flags="is"
+	<target name="modify-ejb3-repl_sync">
+		<echo message="Replacing the cache mode to REPL_SYNC in ${file_}"/>
+		<replaceregexp file="${file_}" byline="yes" flags="is"
            match="REPL_ASYNC"
            replace="REPL_SYNC"/>
-   </target>
+	</target>
 
-   <target name="clustered-buddyrepl-test">
-      <create-ejb3-cluster-node conf="clustered-ejb3-BR-0" conf-src="buddy-repl" jboss.dist="${ejb3.dist}"/>
-      <create-ejb3-cluster-node conf="clustered-ejb3-BR-1" conf-src="buddy-repl"  jboss.dist="${ejb3.dist}"/>
+	<target name="clustered-buddyrepl-test">
+		<create-ejb3-cluster-node conf="clustered-ejb3-BR-0" conf-src="buddy-repl" jboss.dist="${ejb3.dist}"/>
+		<create-ejb3-cluster-node conf="clustered-ejb3-BR-1" conf-src="buddy-repl"  jboss.dist="${ejb3.dist}"/>
 
-      <start-jboss conf="clustered-ejb3-BR-0" host="${node0}" jvmargs="${ejb3.jboss.jvmargs} -Djgroups.bind_addr=${node0.jgroups.bind_addr}"/>
-      <start-jboss conf="clustered-ejb3-BR-1" host="${node1}" jvmargs="${ejb3.jboss.jvmargs} -Djgroups.bind_addr=${node1.jgroups.bind_addr}"/>
+		<start-jboss conf="clustered-ejb3-BR-0" host="${node0}" jvmargs="${ejb3.jboss.jvmargs} -Djgroups.bind_addr=${node0.jgroups.bind_addr}"/>
+		<start-jboss conf="clustered-ejb3-BR-1" host="${node1}" jvmargs="${ejb3.jboss.jvmargs} -Djgroups.bind_addr=${node1.jgroups.bind_addr}"/>
 
-      <antcall target="tests-clustering-wait"/>
+		<antcall target="tests-clustering-wait"/>
 
-      <antcall target="test-cluster-session" inheritRefs="true">
-         <param name="buddy-replication-extension" value="BR-enabled"/>
-      </antcall>
+		<antcall target="test-cluster-session" inheritRefs="true">
+			<param name="buddy-replication-extension" value="BR-enabled"/>
+		</antcall>
 
-      <stop-jboss url="${node0.jndi.url}"/>
-      <stop-jboss url="${node1.jndi.url}"/>
+		<stop-jboss url="${node0.jndi.url}"/>
+		<stop-jboss url="${node1.jndi.url}"/>
 
-      <wait-on-shutdown conf="clustered-ejb3-BR-0"/>
-      <wait-on-shutdown conf="clustered-ejb3-BR-1"/>
+		<wait-on-shutdown conf="clustered-ejb3-BR-0"/>
+		<wait-on-shutdown conf="clustered-ejb3-BR-1"/>
 
-   </target>
+	</target>
 
-   <target name="tests-clustering-startup" unless="${tests.clustering.skip.startup}">
-      <create-ejb3-cluster-node conf="node0" jboss.dist="${ejb3.dist}"/>
-      <start-jboss conf="node0" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs} -Djgroups.bind_addr=${node0.jgroups.bind_addr}"/>
-      <create-ejb3-cluster-node conf="node1" jboss.dist="${ejb3.dist}"/>
-      <start-jboss conf="node1" host="${node1}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs} -Djgroups.bind_addr=${node1.jgroups.bind_addr}"/>
-   </target>
+	<target name="tests-clustering-startup" unless="${tests.clustering.skip.startup}">
+		<create-ejb3-cluster-node conf="node0" jboss.dist="${ejb3.dist}"/>
+		<start-jboss conf="node0" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs} -Djgroups.bind_addr=${node0.jgroups.bind_addr}"/>
+		<create-ejb3-cluster-node conf="node1" jboss.dist="${ejb3.dist}"/>
+		<start-jboss conf="node1" host="${node1}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs} -Djgroups.bind_addr=${node1.jgroups.bind_addr}"/>
+	</target>
 
-   <target name="tests-clustering-shutdown" unless="${tests.clustering.skip.startup}">
-      <stop-jboss url="${node0.jndi.url}" jboss.dist="${ejb3.dist}"/>
-      <stop-jboss url="${node1.jndi.url}" jboss.dist="${ejb3.dist}"/>
-      <wait-on-shutdown conf="node0"/>
-      <wait-on-shutdown conf="node1"/>
-   </target>
+	<target name="tests-clustering-shutdown" unless="${tests.clustering.skip.startup}">
+		<stop-jboss url="${node0.jndi.url}" jboss.dist="${ejb3.dist}"/>
+		<stop-jboss url="${node1.jndi.url}" jboss.dist="${ejb3.dist}"/>
+		<wait-on-shutdown conf="node0"/>
+		<wait-on-shutdown conf="node1"/>
+	</target>
 
-   <!-- ================================================================== -->
-   <!-- Cleaning                                                           -->
-   <!-- ================================================================== -->
+	<!-- ================================================================== -->
+	<!-- Cleaning                                                           -->
+	<!-- ================================================================== -->
 
-   <!-- Clean up all build output -->
-   <target name="clean"
+	<!-- Clean up all build output -->
+	<target name="clean"
       description="Cleans up most generated files." depends="init">
-      <delete dir="${build.classes}/org/jboss/test"/>
-      <delete dir="${build.classes}/org/jboss/ejb3/test"/>
-   </target>
+		<delete dir="${build.classes}/org/jboss/test"/>
+		<delete dir="${build.classes}/org/jboss/ejb3/test"/>
+	</target>
 
-   <!-- ================================================================== -->
-   <!-- Misc.                                                              -->
-   <!-- ================================================================== -->
+	<!-- ================================================================== -->
+	<!-- Misc.                                                              -->
+	<!-- ================================================================== -->
 
-   <target name="main"
+	<target name="main"
       description="Executes the default target (most)."
       depends="jars"/>
 
-   <target name="reports"
+	<target name="reports"
 	  description="Produces test reports in html and text."
 	  depends="tests-report-html, tests-report-text"/>
 
-   <target name="tests-report-html" depends="compile-stylesheets">
-      <mkdir dir="${build.reports}/html"/>
+	<target name="tests-report-html" depends="compile-stylesheets">
+		<mkdir dir="${build.reports}/html"/>
 
-      <junitreport todir="${build.reports}">
-         <fileset dir="${build.reports}">
-            <include name="TEST-*.xml"/>
-         </fileset>
-         <report format="frames"
+		<junitreport todir="${build.reports}">
+			<fileset dir="${build.reports}">
+				<include name="TEST-*.xml"/>
+			</fileset>
+			<report format="frames"
             todir="${build.reports}/html"
             styledir="${build.stylesheets}"
             />
-      </junitreport>
-   </target>
+		</junitreport>
+	</target>
 
-   <target name="tests-report-text" depends="tests-report-html">
-      <mkdir dir="${build.reports}/text"/>
+	<target name="tests-report-text" depends="tests-report-html">
+		<mkdir dir="${build.reports}/text"/>
 
-      <style basedir="${build.reports}"
+		<style basedir="${build.reports}"
       destdir="${build.reports}/text"
       extension=".txt"
       style="${build.stylesheets}/summary1b.xsl"
       includes="TESTS-TestSuites.xml">
-         <param name="thedate" expression="${TIMENOW}"/>
-         <param name="java_version" expression="${java.version}"/>
-         <param name="java_vendor" expression="${java.vendor}"/>
-         <param name="java_vm_specification_version" expression="${java.vm.specification.version}"/>
-         <param name="java_vm_version" expression="${java.vm.version}"/>
-         <param name="java_vm_name" expression="${java.vm.name}"/>
-         <param name="java_vm_info" expression="${java.vm.info}"/>
-         <param name="java_specification_version" expression="${java.specification.version}"/>
-         <param name="java_class_version" expression="${java.class.version}"/>
-         <param name="os_name" expression="${os.name}"/>
-         <param name="os_arch" expression="${os.arch}"/>
-         <param name="os_version" expression="${os.version}"/>
-         <param name="builduid" expression="${TIMENOW}"/>
-         <param name="results_web" expression="${results_web}"/>
-      </style>
-   </target>
+			<param name="thedate" expression="${TIMENOW}"/>
+			<param name="java_version" expression="${java.version}"/>
+			<param name="java_vendor" expression="${java.vendor}"/>
+			<param name="java_vm_specification_version" expression="${java.vm.specification.version}"/>
+			<param name="java_vm_version" expression="${java.vm.version}"/>
+			<param name="java_vm_name" expression="${java.vm.name}"/>
+			<param name="java_vm_info" expression="${java.vm.info}"/>
+			<param name="java_specification_version" expression="${java.specification.version}"/>
+			<param name="java_class_version" expression="${java.class.version}"/>
+			<param name="os_name" expression="${os.name}"/>
+			<param name="os_arch" expression="${os.arch}"/>
+			<param name="os_version" expression="${os.version}"/>
+			<param name="builduid" expression="${TIMENOW}"/>
+			<param name="results_web" expression="${results_web}"/>
+		</style>
+	</target>
 
 
-   <target name="tests-report-clean">
-      <delete dir="${build.reports}"/>
-   </target>
+	<target name="tests-report-clean">
+		<delete dir="${build.reports}"/>
+	</target>
 
-   <target name="jacorb-test" depends="init" if="test"
+	<target name="jacorb-test" depends="init" if="test"
       description="Execute all tests in the given test directory using JacORB.">
-      <!--property name="debugFlags" value="-Xdebug -Xrunjdwp:transport=dt_socket,address=8888,server=y,suspend=y"/-->
-      <property name="debugFlags" value=""/>
-      <!-- For use when we do not need to pass in any special jvmargs; forks the test process -->
-      <antcall target="test-with-jvmargs" inheritRefs="true">
-         <param name="test" value="${test}"/>
-         <param name="test.extension" value="jacorb"/>
-         <param name="test.jndi.url" value="corbaloc::${node0.url}:3528/JBoss/Naming/root"/>
-         <!-- using jacorb -->
-         <param name="jvmargs" value="${debugFlags} 
+		<!--property name="debugFlags" value="-Xdebug -Xrunjdwp:transport=dt_socket,address=8888,server=y,suspend=y"/-->
+		<property name="debugFlags" value=""/>
+		<!-- For use when we do not need to pass in any special jvmargs; forks the test process -->
+		<antcall target="test-with-jvmargs" inheritRefs="true">
+			<param name="test" value="${test}"/>
+			<param name="test.extension" value="jacorb"/>
+			<param name="test.jndi.url" value="corbaloc::${node0.url}:3528/JBoss/Naming/root"/>
+			<!-- using jacorb -->
+			<param name="jvmargs" value="${debugFlags} 
             -Djava.security.manager 
             -Djava.security.policy=${resources}/security/tst.policy 
             -Dorg.omg.CORBA.ORBClass=org.jacorb.orb.ORB 
@@ -5459,148 +5492,148 @@
             -DORBInitRef.NameService=corbaloc::${node0.url}:3528/JBoss/Naming/root 
             -Djacorb.log.default.verbosity=10 
             -Djacorb.log.loggerFactory=org.jboss.util.Log4jLoggerFactory" />
-      </antcall>
-   </target>
+		</antcall>
+	</target>
 
-   <target name="sunorb-test" depends="init" if="test"
+	<target name="sunorb-test" depends="init" if="test"
       description="Execute all tests in the given test directory using Sun ORB.">
-      <!--property name="debugFlags" value="-Xdebug -Xrunjdwp:transport=dt_socket,address=8888,server=y,suspend=y"/-->
-      <property name="debugFlags" value=""/>
-      <!-- For use when we do not need to pass in any special jvmargs; forks the test process -->
-      <antcall target="test-with-jvmargs" inheritRefs="true">
-         <param name="test" value="${test}"/>
-         <param name="test.extension" value="sunorb"/>
-         <!-- using sun jdk -->
-         <param name="jvmargs" value="-Djava.security.manager 
+		<!--property name="debugFlags" value="-Xdebug -Xrunjdwp:transport=dt_socket,address=8888,server=y,suspend=y"/-->
+		<property name="debugFlags" value=""/>
+		<!-- For use when we do not need to pass in any special jvmargs; forks the test process -->
+		<antcall target="test-with-jvmargs" inheritRefs="true">
+			<param name="test" value="${test}"/>
+			<param name="test.extension" value="sunorb"/>
+			<!-- using sun jdk -->
+			<param name="jvmargs" value="-Djava.security.manager 
 				-Djava.security.policy=${resources}/security/tst.policy 
 				-Dorg.omg.PortableInterceptor.ORBInitializerClass.org.jboss.tm.iiop.TxClientInterceptorInitializer 
 				-Dorg.omg.CORBA.ORBInitRef.NameService=corbaloc::${node0.url}:3528/JBoss/Naming/root"/>
-      </antcall>
-   </target>
+		</antcall>
+	</target>
 
-   <target name="iiop-tests" depends="init" description="Execute all tests">
-	  <!-- create custom configuration -->
-      <create-config baseconf="all" newconf="iiop" jboss.dist="${ejb3.dist}">
-        <patternset>
-           <include name="conf/**"/>
-           <include name="deploy*/**"/>
-           <include name="lib/**"/>
-           <include name="farm/**"/>
-        </patternset>
-      </create-config>
-	
-      <start-jboss conf="iiop" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
-      <wait-on-host/>
+	<target name="iiop-tests" depends="init" description="Execute all tests">
+		<!-- create custom configuration -->
+		<create-config baseconf="all" newconf="iiop" jboss.dist="${ejb3.dist}">
+			<patternset>
+				<include name="conf/**"/>
+				<include name="deploy*/**"/>
+				<include name="lib/**"/>
+				<include name="farm/**"/>
+			</patternset>
+		</create-config>
 
-      <antcall target="no-start-jboss-iiop-tests" inheritRefs="true"/>
+		<start-jboss conf="iiop" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
+		<wait-on-host/>
 
-      <stop-jboss jboss.dist="${ejb3.dist}"/>
-      <wait-on-shutdown conf="iiop"/>
-   </target>
+		<antcall target="no-start-jboss-iiop-tests" inheritRefs="true"/>
 
-   <target name="no-start-jboss-iiop-tests" depends="init" description="Execute all iiop tests">
-      <antcall target="jacorb-test" inheritRefs="true">
-         <param name="test" value="iiop"/>
-      </antcall>
-      <!-- TODO: call sunorb-test, but the report gets overwritten -->
-   </target>
+		<stop-jboss jboss.dist="${ejb3.dist}"/>
+		<wait-on-shutdown conf="iiop"/>
+	</target>
 
-   <target name="tests-cc" description="Executes tests related to CC certification">
-      <antcall target="tests-report-clean" inheritRefs="true"/>
+	<target name="no-start-jboss-iiop-tests" depends="init" description="Execute all iiop tests">
+		<antcall target="jacorb-test" inheritRefs="true">
+			<param name="test" value="iiop"/>
+		</antcall>
+		<!-- TODO: call sunorb-test, but the report gets overwritten -->
+	</target>
 
-      <antcall target="main" inheritRefs="true"/>
+	<target name="tests-cc" description="Executes tests related to CC certification">
+		<antcall target="tests-report-clean" inheritRefs="true"/>
 
-      <antcall target="calculate-md5"/>
+		<antcall target="main" inheritRefs="true"/>
 
-      <antcall target="run-cc-tests" inheritRefs="true">
-         <!-- This parameter controls junitreport to produce CC testify section. -->
-         <param name="cc-testify" value="true"/>
-      </antcall>
+		<antcall target="calculate-md5"/>
 
-      <antcall target="tests-report-html" inheritRefs="true"/>
-   </target>
+		<antcall target="run-cc-tests" inheritRefs="true">
+			<!-- This parameter controls junitreport to produce CC testify section. -->
+			<param name="cc-testify" value="true"/>
+		</antcall>
 
-   <target name="run-cc-tests">
-      <!--<antcall target="ejb-tests" inheritRefs="true"/>-->
-      <antcall target="cc-tests" inheritRefs="true"/>
-   </target>
+		<antcall target="tests-report-html" inheritRefs="true"/>
+	</target>
 
-   <target name="cc-tests" depends="init" description="Execute all tests">
+	<target name="run-cc-tests">
+		<!--<antcall target="ejb-tests" inheritRefs="true"/>-->
+		<antcall target="cc-tests" inheritRefs="true"/>
+	</target>
 
-      <antcall target="create-cc-config">
-         <param name="alternate-config" value="cc-none"/>
-      </antcall>
+	<target name="cc-tests" depends="init" description="Execute all tests">
 
-      <start-jboss conf="cc" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
-      <wait-on-host/>
+		<antcall target="create-cc-config">
+			<param name="alternate-config" value="cc-none"/>
+		</antcall>
 
-      <antcall target="no-start-jboss-cc-tests" inheritRefs="true"/>
+		<start-jboss conf="cc" host="${node0}" jboss.dist="${ejb3.dist}" jvmargs="${ejb3.jboss.jvmargs}"/>
+		<wait-on-host/>
 
-      <stop-jboss jboss.dist="${ejb3.dist}"/>
-      <wait-on-shutdown conf="cc"/>
+		<antcall target="no-start-jboss-cc-tests" inheritRefs="true"/>
 
-   </target>
+		<stop-jboss jboss.dist="${ejb3.dist}"/>
+		<wait-on-shutdown conf="cc"/>
 
-   <!-- Calculates MD5 sums for all libraries used while testing.
+	</target>
+
+	<!-- Calculates MD5 sums for all libraries used while testing.
 	    This will be used as proof of testing for CC evaluation.
    -->
-   <target name="calculate-md5">
-      <mkdir dir="${build.reports}/html"/>
+	<target name="calculate-md5">
+		<mkdir dir="${build.reports}/html"/>
 
-      <java classname="org.jboss.test.util.CheckSumCalculator">
-         <classpath>
-            <pathelement location="${basedir}/../test/output/classes"/>
-         </classpath>
-         <arg line="-base ${jboss.dist}/ -output ${build.reports}/html/allmd5sum.txt -d ${jboss.dist}/lib -d ${jboss.dist}/server/production/lib -d ${jboss.dist}/server/production/deploy"/>
-      </java>
+		<java classname="org.jboss.test.util.CheckSumCalculator">
+			<classpath>
+				<pathelement location="${basedir}/../test/output/classes"/>
+			</classpath>
+			<arg line="-base ${jboss.dist}/ -output ${build.reports}/html/allmd5sum.txt -d ${jboss.dist}/lib -d ${jboss.dist}/server/production/lib -d ${jboss.dist}/server/production/deploy"/>
+		</java>
 
-   </target>
+	</target>
 
-   <!-- This target creates CC configuration -->
-   <target name="create-cc-config" description="Creates CC configuration">
-      <!-- Create the CC config starting with the pruduction config -->
-      <create-config baseconf="production" newconf="cc" newconf-src="cc">
-         <patternset>
-            <include name="**/*"/>
-         </patternset>
-      </create-config>
+	<!-- This target creates CC configuration -->
+	<target name="create-cc-config" description="Creates CC configuration">
+		<!-- Create the CC config starting with the pruduction config -->
+		<create-config baseconf="production" newconf="cc" newconf-src="cc">
+			<patternset>
+				<include name="**/*"/>
+			</patternset>
+		</create-config>
 
-      <!-- delete SNMP adapter, because it is not allowed in CC config --> 
-      <delete dir="${jboss.dist}/server/cc/deploy/snmp-adaptor.sar"/>
-      
-      <!-- delete HSQL DB which is not allowed in CC config 
+		<!-- delete SNMP adapter, because it is not allowed in CC config -->
+		<delete dir="${jboss.dist}/server/cc/deploy/snmp-adaptor.sar"/>
+
+		<!-- delete HSQL DB which is not allowed in CC config 
            Alternate configuration at test-configs/cc/deploy contains DefaultDS 
            file called oracle-ds.xml for default Oracle DB. 
-      --> 
-      <delete file="${jboss.dist}/server/cc/lib/hsqldb.jar"/>
-      <delete file="${jboss.dist}/server/cc/lib/hsqldb-plugin.jar"/>
-      <delete file="${jboss.dist}/server/cc/deploy/hsqldb-ds.xml"/>
-      <delete file="${jboss.dist}/server/cc/deploy/jboss-messaging.sar/clustered-hsqldb-persistence-service.xml"/>
+      -->
+		<delete file="${jboss.dist}/server/cc/lib/hsqldb.jar"/>
+		<delete file="${jboss.dist}/server/cc/lib/hsqldb-plugin.jar"/>
+		<delete file="${jboss.dist}/server/cc/deploy/hsqldb-ds.xml"/>
+		<delete file="${jboss.dist}/server/cc/deploy/jboss-messaging.sar/clustered-hsqldb-persistence-service.xml"/>
 
-      <!-- Disable Remote Method Invocation (RMI) under the Internet Inter-ORB Protocol (IIOP) -->  
-      <delete file="${jboss.dist}/server/cc/conf/jacorb.properties"/>
-      <delete file="${jboss.dist}/server/cc/deploy/iiop-service.xml"/>
-      <delete file="${jboss.dist}/server/cc/lib/jacorb.jar"/>
-      <delete file="${jboss.dist}/server/cc/lib/jboss-iiop.jar"/>
+		<!-- Disable Remote Method Invocation (RMI) under the Internet Inter-ORB Protocol (IIOP) -->
+		<delete file="${jboss.dist}/server/cc/conf/jacorb.properties"/>
+		<delete file="${jboss.dist}/server/cc/deploy/iiop-service.xml"/>
+		<delete file="${jboss.dist}/server/cc/lib/jacorb.jar"/>
+		<delete file="${jboss.dist}/server/cc/lib/jboss-iiop.jar"/>
 
-      <!-- copy alternate part of configuration (cc-none, cc-db, cc-ldap) -->
-      <copy todir="${jboss.dist}/server/cc" overwrite="true">
-        <fileset dir="${build.resources}/test-configs/${alternate-config}">
-          <include name="**/*"/>
-        </fileset>
-      </copy>
+		<!-- copy alternate part of configuration (cc-none, cc-db, cc-ldap) -->
+		<copy todir="${jboss.dist}/server/cc" overwrite="true">
+			<fileset dir="${build.resources}/test-configs/${alternate-config}">
+				<include name="**/*"/>
+			</fileset>
+		</copy>
 
-    	<!-- DB config patch (copy JDBC driver library) -->    
-      <copy todir="${jboss.dist}/server/cc/lib" overwrite="true" failonerror="false">
-        <fileset dir="/qa/tools/opt/opt/jdbc-drivers">
-          <include name="${jdbc-driver.pattern}"/>
-        </fileset>
-      </copy>
+		<!-- DB config patch (copy JDBC driver library) -->
+		<copy todir="${jboss.dist}/server/cc/lib" overwrite="true" failonerror="false">
+			<fileset dir="/qa/tools/opt/opt/jdbc-drivers">
+				<include name="${jdbc-driver.pattern}"/>
+			</fileset>
+		</copy>
 
-   </target>
+	</target>
 
-   <target name="no-start-jboss-cc-tests" depends="init" description="Execute CC tests">
-      <!--
+	<target name="no-start-jboss-cc-tests" depends="init" description="Execute CC tests">
+		<!--
       <antcall target="test" inheritRefs="true">
          <param name="test" value="security" />
       </antcall>
@@ -5613,11 +5646,11 @@
          <param name="test" value="clientinterceptors" />
       </antcall>
       -->
+		<antcall target="test" inheritRefs="true">
+			<param name="test" value="interceptors2" />
+		</antcall>
+		<!--
       <antcall target="test" inheritRefs="true">
-         <param name="test" value="interceptors2" />
-      </antcall>
-      <!--
-      <antcall target="test" inheritRefs="true">
          <param name="test" value="interceptors3" />
       </antcall>
       <antcall target="test" inheritRefs="true">
@@ -5694,6 +5727,6 @@
          <param name="test" value="servlet" />
       </antcall>
       -->
-   </target>
+	</target>
 
 </project>




More information about the jboss-cvs-commits mailing list