Index: build.xml
===================================================================
--- build.xml	(revision 111681)
+++ build.xml	(working copy)
@@ -32,7 +32,7 @@
   <property name="module.root" value="${basedir}"/>
   <property file="${module.root}/local.properties"/>
   <property name="module.source" value="${module.root}/src"/>
-  <property name="module.output" value="${module.root}/output"/>
+  <property name="module.output" location="${module.root}/output"/>
   
   <property name="/" value="${file.separator}"/>
 
@@ -61,7 +61,7 @@
        <contains string="${ant.version}"
              substring="Ant version ${ant17.baseversion}"/>
        <contains string="${ant.version}"
-             substring="Ant version ${ant18.baseversion}"/>
+             substring="${ant18.baseversion}"/>
      </or>
    </condition>
 
@@ -273,12 +273,43 @@
     <path id="org.jboss.jbossas.tomcat.classpath">
       <fileset refid="org.jboss.jbossas:jboss-as-tomcat:jar:jboss-web-deployer"/>
       <fileset refid="org.jboss.jbossas:jboss-as-tomcat:jar:jboss-web-service"/>
+      <!-- Can't find this resource
       <pathelement path="${project.root}/tomcat/target/jbossweb-cluster.aop"/>
+      -->
       <pathelement path="${project.root}/tomcat/target/resources"/>
     </path>
     <path id="org.jboss.jbossas.cluster.resources">
       <pathelement path="${project.root}/cluster/target/resources"/>
     </path>
+  	
+  	<!-- JBoss Java EE APIs classpath -->
+   <path id="jboss.javaee.api.classpath">
+     <fileset refid="org.jboss.spec.javax.annotation:jboss-annotations-api_1.1_spec:jar"/>
+     <fileset refid="org.jboss.spec.javax.ejb:jboss-ejb-api_3.1_spec:jar"/>
+     <fileset refid="org.jboss.spec.javax.el:jboss-el-api_2.2_spec:jar"/>
+     <fileset refid="org.jboss.spec.javax.enterprise.deploy:jboss-jad-api_1.2_spec:jar"/>
+     <fileset refid="org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.1_spec:jar"/>
+     <fileset refid="org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec:jar"/>
+     <fileset refid="org.jboss.spec.javax.resource:jboss-connector-api_1.5_spec:jar"/>
+     <fileset refid="org.jboss.spec.javax.security.jacc:jboss-jacc-api_1.4_spec:jar"/>
+     <fileset refid="org.jboss.spec.javax.security.auth.message:jboss-jaspi-api_1.0_spec:jar"/>
+     <fileset refid="org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:jar"/>
+     <fileset refid="org.jboss.spec.javax.servlet.jsp:jboss-jsp-api_2.2_spec:jar"/>
+     <fileset refid="org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:jar"/>
+     <fileset refid="org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.2_spec:jar"/>
+     <fileset refid="org.jboss.spec.javax.xml.rpc:jboss-jaxrpc-api_1.1_spec:jar"/>
+     <fileset refid="org.jboss.spec.javax.xml.soap:jboss-saaj-api_1.3_spec:jar"/>
+     <fileset refid="org.jboss.spec.javax.xml.ws:jboss-jaxws-api_2.2_spec:jar"/>
+     <fileset refid="org.jboss.spec.javax.xml.registry:jboss-jaxr-api_1.0_spec:jar"/>
+     <fileset refid="org.hibernate.javax.persistence:hibernate-jpa-2.0-api:jar"/>
+     <fileset refid="javax.enterprise:cdi-api:jar"/>
+     <fileset refid="javax.inject:javax.inject:jar"/>
+     <fileset refid="javax.activation:activation:jar"/>
+     <fileset refid="javax.mail:mail:jar"/>
+     <fileset refid="stax:stax-api:jar"/>
+     <fileset refid="com.sun.faces:jsf-api:jar"/>
+     <fileset refid="javax.validation:validation-api:jar"/>
+   </path>
     
     <!-- The combined library classpath -->
     <path id="library.classpath">
@@ -425,6 +456,15 @@
       <!-- Java EE APIs -->
       <path refid="jboss.javaee.api.classpath"/>
     </path>
+    <copy todir="${module.output}${file.separator}library.dir" flatten="true">
+      <path refid="library.classpath" />
+    </copy>
+    <!-- create a path that points to the jars in library.dir/*, Java 6 style -->
+    <path id="library.classpath.short">
+      <path location="${module.output}${file.separator}library.dir${file.separator}*"/>
+    </path>
+    <property name="library.classpath.property" refid="library.classpath.short"/>
+    <echo message="library.classpath.property.short: ${library.classpath.property}"/>
 
     <!-- ======= -->
     <!-- InternalServer -->
@@ -439,35 +479,6 @@
       <pathelement path="${jboss.dist}/lib/jboss-system.jar"/>
     </path>
 
-    <!-- JBoss Java EE APIs classpath -->
-    <path id="jboss.javaee.api.classpath">
-      <fileset refid="org.jboss.spec.javax.annotation:jboss-annotations-api_1.1_spec:jar"/>
-      <fileset refid="org.jboss.spec.javax.ejb:jboss-ejb-api_3.1_spec:jar"/>
-      <fileset refid="org.jboss.spec.javax.el:jboss-el-api_2.2_spec:jar"/>
-      <fileset refid="org.jboss.spec.javax.enterprise.deploy:jboss-jad-api_1.2_spec:jar"/>
-      <fileset refid="org.jboss.spec.javax.interceptor:jboss-interceptors-api_1.1_spec:jar"/>
-      <fileset refid="org.jboss.spec.javax.jms:jboss-jms-api_1.1_spec:jar"/>
-      <fileset refid="org.jboss.spec.javax.resource:jboss-connector-api_1.5_spec:jar"/>
-      <fileset refid="org.jboss.spec.javax.security.jacc:jboss-jacc-api_1.4_spec:jar"/>
-      <fileset refid="org.jboss.spec.javax.security.auth.message:jboss-jaspi-api_1.0_spec:jar"/>
-      <fileset refid="org.jboss.spec.javax.servlet:jboss-servlet-api_3.0_spec:jar"/>
-      <fileset refid="org.jboss.spec.javax.servlet.jsp:jboss-jsp-api_2.2_spec:jar"/>
-      <fileset refid="org.jboss.spec.javax.transaction:jboss-transaction-api_1.1_spec:jar"/>
-      <fileset refid="org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.2_spec:jar"/>
-      <fileset refid="org.jboss.spec.javax.xml.rpc:jboss-jaxrpc-api_1.1_spec:jar"/>
-      <fileset refid="org.jboss.spec.javax.xml.soap:jboss-saaj-api_1.3_spec:jar"/>
-      <fileset refid="org.jboss.spec.javax.xml.ws:jboss-jaxws-api_2.2_spec:jar"/>
-      <fileset refid="org.jboss.spec.javax.xml.registry:jboss-jaxr-api_1.0_spec:jar"/>
-      <fileset refid="org.hibernate.javax.persistence:hibernate-jpa-2.0-api:jar"/>
-      <fileset refid="javax.enterprise:cdi-api:jar"/>
-      <fileset refid="javax.inject:javax.inject:jar"/>
-      <fileset refid="javax.activation:activation:jar"/>
-      <fileset refid="javax.mail:mail:jar"/>
-      <fileset refid="stax:stax-api:jar"/>
-      <fileset refid="com.sun.faces:jsf-api:jar"/>
-      <fileset refid="javax.validation:validation-api:jar"/>
-    </path>
-
     <!-- The combined dependant module classpath -->
     <path id="dependentmodule.classpath">
       <path refid="org.jboss.aop.classpath"/>
@@ -508,12 +519,25 @@
       <fileset refid="org.jboss.web:jasper-jdt:jar"/>
       <fileset refid="org.jboss.web:jbossweb:jar"/>
     </path>
+    <copy todir="${module.output}${file.separator}dependentmodule.dir" flatten="true" >
+      <path refid="dependentmodule.classpath" />
+    </copy>
+    <!-- create a path that points to the jars in dependentmodule.dir/*, Java 6 style -->
+    <path id="dependentmodule.classpath.short">
+      <path location="${module.output}${file.separator}dependentmodule.dir${file.separator}*"/>
+    </path>
+    <property name="dependentmodule.classpath.property" refid="dependentmodule.classpath.short"/>
+    <echo message="dependentmodule.classpath.property.short: ${dependentmodule.classpath.property}"/>
 
     <!-- The combined thirdparty classpath -->
     <path id="thirdparty.classpath">
       <path refid="library.classpath"/>
       <path refid="dependentmodule.classpath"/>
     </path>
+    <path id="thirdparty.classpath.short">
+      <path refid="library.classpath.short"/>
+      <path refid="dependentmodule.classpath.short"/>
+    </path>
 
     <path id="javac.classpath">
       <path refid="thirdparty.classpath"/>
@@ -581,12 +605,29 @@
       <fileset refid="org.jboss.kernel:jboss-dependency:jar"/>
       <fileset refid="org.jboss.kernel:jboss-kernel:jar"/>
     </path>
+    <!-- copy all the jar for smoketest to output/smoketests.dir -->
+    <copy todir="${module.output}${file.separator}smoketests.dir" flatten="true">
+      <path refid="smoketests.classpath"/>
+    </copy>
+    <!-- create a path that points to the jars in smoketests.dir/*, Java 6 style -->
+    <path id="smoketests.classpath.short">
+      <path location="${module.output}${file.separator}smoketests.dir${file.separator}*"/>
+      <fileset refid="junit:junit:jar"/>
+    </path>
+    <!-- The two lines belong are only for debugging purposes -->
+    <property name="smoketests.classpath.short.property" refid="smoketests.classpath.short"/>
+    <echo message="smoketests.classpath.property.short: ${smoketests.classpath.short.property}"/>
 
-<!-- Classpath to build and run the tests -->
-  <path id="tests.classpath">
+    <!-- Classpath to build and run the tests -->
+    <path id="tests.classpath">
       <path refid="smoketests.classpath"/>
       <path refid="thirdparty.classpath"/>
     </path>
+    <path id="tests.classpath.short">
+      <path refid="smoketests.classpath.short"/>
+      <path refid="thirdparty.classpath.short"/>
+    </path>
+    <property name="tests.classpath.short.property" refid="tests.classpath.short"/>
 
     <!-- The classpath required to build javadocs. -->
     <path id="javadoc.classpath">
@@ -820,6 +861,10 @@
    </target>
 
    <target name="compile-classes-only" depends="compile-annotated-classes-50">
+   	<!--
+	<property name="test.compile.classpath.property" refid="tests.compile.classpath"/>
+	<echo message="test.compile.classpath.property: ${test.compile.classpath.property}"/>
+	-->
       <mkdir dir="${build.classes}"/>
       <javac destdir="${build.classes}"
          listfiles="yes"
@@ -1642,6 +1687,8 @@
    jbosstest.iterationcount:   ${jbosstest.iterationcount}
    jbosstest.threadcount:      ${jbosstest.threadcount}
    jbosstest.beancount:        ${jbosstest.beancount}
+   smoketests.classpath.short: ${smoketests.classpath.short.property}
+   ant.version                 ${ant.version}
          ]]></echo>
       <mkdir dir="${build.reports}"/>
       <mkdir dir="${build.testlog}"/>
@@ -1676,7 +1723,7 @@
          <classpath>
             <pathelement location="${build.classes}"/>
             <pathelement location="${build.resources}"/>
-            <path refid="smoketests.classpath"/>
+            <path refid="smoketests.classpath.short"/>
          </classpath>
 
          <formatter type="plain" usefile="${junit.formatter.usefile}"/>
@@ -1727,6 +1774,7 @@
    jbosstest.iterationcount:   ${jbosstest.iterationcount}
    jbosstest.threadcount:      ${jbosstest.threadcount}
    jbosstest.beancount:        ${jbosstest.beancount}
+   tests.classpath.short:      ${tests.classpath.short.property}
          ]]></echo>
       <mkdir dir="${build.reports}"/>
       <mkdir dir="${build.testlog}"/>
@@ -1761,7 +1809,7 @@
          <classpath>
             <pathelement location="${build.classes}"/>
             <pathelement location="${build.resources}"/>
-            <path refid="tests.classpath"/>
+            <path refid="tests.classpath.short"/>
          </classpath>
 
          <sysproperty key="jboss-junit-configuration" value="web-profile"/>
@@ -1794,6 +1842,7 @@
    jbosstest.iterationcount:   ${jbosstest.iterationcount}
    jbosstest.threadcount:      ${jbosstest.threadcount}
    jbosstest.beancount:        ${jbosstest.beancount}
+   tests.classpath.short:      ${tests.classpath.short.property}
          ]]></echo>
       <mkdir dir="${build.reports}"/>
       <mkdir dir="${build.testlog}"/>
@@ -1828,7 +1877,7 @@
          <classpath>
             <pathelement location="${build.classes}"/>
             <pathelement location="${build.resources}"/>
-            <path refid="tests.classpath"/>
+            <path refid="tests.classpath.short"/>
          </classpath>
 
          <formatter type="xml" usefile="${junit.formatter.usefile}"/>
@@ -1848,6 +1897,7 @@
    </target>
 
    <target name="tests-standard-stress" depends="init">
+      <echo message="tests.classpath.short: ${tests.classpath.short.property}"/>
       <mkdir dir="${build.reports}"/>
       <mkdir dir="${build.testlog}"/>
       <junit dir="${module.output}"
@@ -1875,7 +1925,8 @@
          <classpath>
             <pathelement location="${build.classes}"/>
             <pathelement location="${build.resources}"/>
-            <path refid="tests.classpath"/>
+            <fileset refid="org.jboss.test:jboss-test:jar"/>
+            <path refid="tests.classpath.short"/>
          </classpath>
 
          <!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
@@ -1904,6 +1955,7 @@
       | control how classes are loaded.
     -->
    <target name="tests-client-unit">
+      <echo message="tests.classpath.short: ${tests.classpath.short.property}"/>
       <mkdir dir="${build.reports}"/>
       <mkdir dir="${build.testlog}"/>
       <junit dir="${module.output}"
@@ -1938,7 +1990,7 @@
          <classpath>
             <pathelement path="${build.lib}/jrmp-dl-client.jar"/>
             <pathelement location="${build.resources}"/>
-            <path refid="tests.classpath"/>
+            <path refid="tests.classpath.short"/>
          </classpath>
 
          <!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
@@ -1983,6 +2035,7 @@
     a security manager for this test -->
    <target name="tests-security-manager" depends="init"
       description="Tests run against a jboss server with a security manager">
+      <echo message="tests.classpath.short: ${tests.classpath.short.property}"/>
 
       <create-config baseconf="default" newconf="secmgr">
         <patternset>
@@ -2030,7 +2083,7 @@
          <classpath>
             <pathelement location="${build.resources}"/>
             <pathelement location="${build.classes}"/>
-            <path refid="tests.classpath"/>
+            <path refid="tests.classpath.short"/>
          </classpath>
 
          <sysproperty key="jboss-junit-configuration" value="tests-security-manager"/>
@@ -2311,6 +2364,7 @@
 
 
    <target name="tests-treecacheaop-unit" depends="init">
+      <echo message="tests.classpath.short: ${tests.classpath.short.property}"/>
       <mkdir dir="${build.reports}"/>
       <mkdir dir="${build.testlog}"/>
       <junit dir="${module.output}"
@@ -2337,7 +2391,7 @@
          <classpath>
             <pathelement location="${build.classes}"/>
             <pathelement location="${build.resources}/cache/standalone"/>
-            <path refid="tests.classpath"/>
+            <path refid="tests.classpath.short"/>
          </classpath>
 
          <!-- formatter type="xml" usefile="${junit.formatter.usefile}"/-->
@@ -2359,6 +2413,7 @@
    </target>
 
    <target name="tests-treecacheaopc-unit" depends="init">
+      <echo message="tests.classpath.short: ${tests.classpath.short.property}"/>
       <!-- pre-compile the aop classes -->
       <taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="org.jboss.aop.classpath"/>
       <path id="aop.task.classpath">
@@ -2401,7 +2456,7 @@
          <classpath>
             <pathelement location="${build.classes}"/>
             <pathelement location="${build.resources}/cache/standalone"/>
-            <path refid="tests.classpath"/>
+            <path refid="tests.classpath.short"/>
          </classpath>
 
          <!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
@@ -2424,6 +2479,7 @@
 
 
    <target name="tests-baseaop-unit" depends="init">
+      <echo message="tests.classpath.short: ${tests.classpath.short.property}"/>
       <mkdir dir="${build.reports}"/>
       <mkdir dir="${build.testlog}"/>
       <junit dir="${module.output}"
@@ -2449,7 +2505,7 @@
 
          <classpath>
             <pathelement location="${build.classes}"/>
-            <path refid="tests.classpath"/>
+            <path refid="tests.classpath.short"/>
          </classpath>
 
          <!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
@@ -2474,6 +2530,7 @@
       | JBossMX implementation tests that should run correctly.
     -->
    <target name="tests-jbossmx-implementation">
+      <echo message="tests.classpath.short: ${tests.classpath.short.property}"/>
       <mkdir dir="${build.reports}"/>
       <mkdir dir="${build.testlog}"/>
       <junit dir="${module.output}"
@@ -2494,7 +2551,7 @@
          <classpath>
             <pathelement location="${build.classes}"/>
             <pathelement location="${build.resources}"/>
-            <path refid="tests.classpath"/>
+            <path refid="tests.classpath.short"/>
          </classpath>
 
          <!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
@@ -2522,6 +2579,7 @@
       | JBossMX performance tests that should run correctly.
     -->
    <target name="tests-jbossmx-performance">
+      <echo message="tests.classpath.short: ${tests.classpath.short.property}"/>
       <mkdir dir="${build.reports}"/>
       <mkdir dir="${build.testlog}"/>
       <junit dir="${module.output}"
@@ -2542,7 +2600,7 @@
          <classpath>
             <pathelement location="${build.classes}"/>
             <pathelement location="${build.resources}"/>
-            <path refid="tests.classpath"/>
+            <path refid="tests.classpath.short"/>
          </classpath>
 
          <!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
@@ -2569,6 +2627,7 @@
       | JBossMX compliance tests that should run correctly.
     -->
    <target name="tests-jbossmx-compliance">
+      <echo message="tests.classpath.short: ${tests.classpath.short.property}"/>
       <mkdir dir="${build.reports}"/>
       <mkdir dir="${build.testlog}"/>
       <junit dir="${module.output}"
@@ -2589,7 +2648,7 @@
          <classpath>
             <pathelement location="${build.classes}"/>
             <pathelement location="${build.resources}"/>
-            <path refid="tests.classpath"/>
+            <path refid="tests.classpath.short"/>
          </classpath>
 
          <!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
@@ -2616,6 +2675,7 @@
       | IIOP test cases that should run successfully
     -->
    <target name="tests-iiop" depends="init">
+      <echo message="tests.classpath.short: ${tests.classpath.short.property}"/>
       <mkdir dir="${build.reports}"/>
       <mkdir dir="${build.testlog}"/>
       <junit dir="${module.output}"
@@ -2655,7 +2715,7 @@
          <classpath>
             <pathelement location="${build.classes}"/>
             <pathelement location="${build.resources}"/>
-            <path refid="tests.classpath"/>
+            <path refid="tests.classpath.short"/>
             <fileset refid="org.jboss.jbossas:jboss-as-iiop:jar"/>
          </classpath>
 
@@ -2679,6 +2739,7 @@
 
   <!-- Test the XML binding framework -->
   <target name="tests-xml-unit">
+    <echo message="tests.classpath.short: ${tests.classpath.short.property}"/>
     <mkdir dir="${build.reports}"/>
     <mkdir dir="${build.testlog}"/>
     <junit dir="${module.output}"
@@ -2703,7 +2764,7 @@
       <classpath>
         <pathelement location="${build.classes}"/>
         <pathelement location="${build.resources}"/>
-        <path refid="tests.classpath"/>
+        <path refid="tests.classpath.short"/>
       </classpath>
 
       <!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
@@ -2726,6 +2787,7 @@
 
    <!-- Test StAX JAS-173  -->
    <target name="tests-stax" depends="maybejars">
+     <echo message="tests.classpath.short: ${tests.classpath.short.property}"/>
      <mkdir dir="${build.reports}"/>
      <mkdir dir="${build.testlog}"/>
      <junit dir="${module.output}"
@@ -2750,7 +2812,7 @@
        <classpath>
          <pathelement location="${build.classes}"/>
          <pathelement location="${build.resources}"/>
-         <path refid="tests.classpath"/>
+         <path refid="tests.classpath.short"/>
        </classpath>
 
        <!-- formatter type="xml" usefile="${junit.formatter.usefile}"/-->
@@ -2774,6 +2836,7 @@
     <!-- Run the Web Services Tests-->
    <target name="tests-webservice" depends="init" 
       description="Execute Web Services Related Tests">
+     <echo message="tests.classpath.short: ${tests.classpath.short.property}"/>
 
       <junit dir="${module.output}"
          printsummary="${junit.printsummary}"
@@ -2813,7 +2876,7 @@
             <pathelement location="${build.classes}"/>
             <pathelement location="${build.resources}/security"/>
             <pathelement location="${build.resources}"/>
-            <path refid="tests.classpath"/>
+            <path refid="tests.classpath.short"/>
          </classpath>
 
          <!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
@@ -2840,6 +2903,7 @@
    <target name="tests-ws"
       description="Execute Web Services JAX-WS Related Tests"
    	depends="init">
+     <echo message="tests.classpath.short: ${tests.classpath.short.property}"/>
 
       <junit dir="${module.output}"
          printsummary="${junit.printsummary}"
@@ -2876,7 +2940,7 @@
             <pathelement location="${build.classes}"/>
             <pathelement location="${build.resources}/security"/>
             <pathelement location="${build.resources}"/>
-            <path refid="tests.classpath"/>
+            <path refid="tests.classpath.short"/>
          </classpath>
 
          <!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
@@ -2904,6 +2968,7 @@
    -->
    <!-- Test for JAXR under the Web Services Umbrella -->
    <target name="tests-scout-jaxr" >
+      <echo message="tests.classpath.short: ${tests.classpath.short.property}"/>
       <mkdir dir="${build.reports}"/>
       <mkdir dir="${build.testlog}"/>
       <junit dir="${module.output}"
@@ -2948,7 +3013,7 @@
 
          <classpath>
            <pathelement location="${build.classes}"/>
-	   <path refid="tests.classpath"/>
+	   <path refid="tests.classpath.short"/>
          </classpath>
 
          <!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
@@ -3087,6 +3152,7 @@
    
   <!-- Test the Messaging JMS provider -->
   <target name="exec-jbmcluster">
+    <echo message="tests.classpath.short: ${tests.classpath.short.property}"/>
     <mkdir dir="${build.reports}"/>
     <mkdir dir="${build.testlog}"/>
     <junit dir="${module.output}"
@@ -3128,7 +3194,7 @@
         <pathelement location="${build.resources}"/>
         <pathelement location="${build.resources}/jbossmessaging"/>
         <pathelement location="${build.lib}/jbossmessagingtest.jar"/>
-        <path refid="tests.classpath"/>
+        <path refid="tests.classpath.short"/>
       </classpath>
 
       <!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
@@ -3172,6 +3238,7 @@
 
   <!-- Test the Messaging JMS provider -->
   <target name="tests-hornetq-unit" depends="init">
+    <echo message="tests.classpath.short: ${tests.classpath.short.property}"/>
     <mkdir dir="${build.reports}"/>
     <mkdir dir="${build.testlog}"/>
     <junit dir="${module.output}"
@@ -3203,7 +3270,7 @@
         <pathelement location="${build.resources}"/>
         <pathelement location="${build.resources}/jbossmessaging"/>
         <pathelement location="${build.lib}/jbossmessagingtest.jar"/>
-        <path refid="tests.classpath"/>
+        <path refid="tests.classpath.short"/>
       </classpath>
 
       <!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
@@ -3235,6 +3302,7 @@
 
 	<!-- Single-node classloader leak tests -->
 	<target name="tests-classloader-leak" depends="init">
+    <echo message="tests.classpath.short: ${tests.classpath.short.property}"/>
 
     <mkdir dir="${build.reports}"/>
     <mkdir dir="${build.testlog}"/>
@@ -3270,7 +3338,7 @@
       <classpath>
         <pathelement location="${build.classes}"/>
         <pathelement location="${build.resources}"/>
-        <path refid="tests.classpath"/>
+        <path refid="tests.classpath.short"/>
       </classpath>
       
       <!--sysproperty key="jboss-junit-configuration" value="classloader-leak"/-->
@@ -3291,6 +3359,7 @@
 
   <!-- script tests -->
  <target name="tests-scripts" depends="init">
+    <echo message="tests.classpath.short: ${tests.classpath.short.property}"/>
     <mkdir dir="${build.reports}"/>
     <mkdir dir="${build.testlog}"/>
     
@@ -3330,7 +3399,7 @@
       <classpath>
 		<pathelement location="${build.classes}"/>
 		<pathelement location="${build.resources}"/>
-		<path refid="tests.classpath"/>
+		<path refid="tests.classpath.short"/>
       </classpath>
 	      
       <!--sysproperty key="jboss-junit-configuration" value="classloader-leak"/-->
@@ -3349,6 +3418,7 @@
    </target>
 		
  <target name="tests-scripts-noserver" depends="init">
+    <echo message="tests.classpath.short: ${tests.classpath.short.property}"/>
     <mkdir dir="${build.reports}"/>
     <mkdir dir="${build.testlog}"/>
 	    
@@ -3385,7 +3455,7 @@
       <classpath>
 		<pathelement location="${build.classes}"/>
 		<pathelement location="${build.resources}"/>
-		<path refid="tests.classpath"/>
+		<path refid="tests.classpath.short"/>
       </classpath>
 	      
       <!--sysproperty key="jboss-junit-configuration" value="classloader-leak"/-->
@@ -3410,6 +3480,7 @@
    <target name="tests-db" depends="run-db-tests, tests-report-html"/>
 
    <target name="run-db-tests" depends="init-paths, maybejars">
+      <echo message="tests.classpath.short: ${tests.classpath.short.property}"/>
       <mkdir dir="${build.reports}"/>
       <mkdir dir="${build.testlog}"/>
       <junit dir="${module.output}"
@@ -3431,7 +3502,7 @@
          <classpath>
             <pathelement location="${build.classes}"/>
             <pathelement location="${build.resources}"/>
-            <path refid="tests.classpath"/>
+            <path refid="tests.classpath.short"/>
          </classpath>
 
          <!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
@@ -3468,6 +3539,7 @@
     -->
    <target name="test" if="test" depends="init"
       description="Execute a single test.">
+      <echo message="tests.classpath.short: ${tests.classpath.short.property}"/>
       <mkdir dir="${build.reports}"/>
       <mkdir dir="${build.testlog}"/>
       <!-- Remove the test.log so each run has a fresh log -->
@@ -3507,7 +3579,7 @@
             <pathelement location="${build.resources}"/>
             <!-- Include for those tests that need common security resources -->
             <pathelement location="${build.resources}/security"/>
-            <path refid="tests.classpath"/>
+            <path refid="tests.classpath.short"/>
          </classpath>
 
          <formatter type="xml" usefile="${junit.formatter.usefile}"/>
@@ -3532,6 +3604,7 @@
     -->
    <target name="iiop-test" depends="maybejars" if="test"
       description="Execute a single test.">
+      <echo message="tests.classpath.short: ${tests.classpath.short.property}"/>
       <mkdir dir="${build.reports}"/>
       <mkdir dir="${build.testlog}"/>
       <!-- Remove the test.log so each run has a fresh log -->
@@ -3573,7 +3646,7 @@
          <classpath>
             <pathelement location="${build.classes}"/>
             <pathelement location="${build.resources}"/>
-            <path refid="tests.classpath"/>
+            <path refid="tests.classpath.short"/>
             <fileset refid="org.jboss.jbossas:jboss-as-iiop:jar"/>
          </classpath>
 
@@ -3618,6 +3691,7 @@
     -->
    <target name="one-test" depends="init" if="test"
       description="Execute a single test.">
+      <echo message="tests.classpath.short: ${tests.classpath.short.property}"/>
       <mkdir dir="${build.reports}"/>
       <mkdir dir="${build.testlog}"/>
       <!-- Remove the test.log so each test has a fresh log -->
@@ -3672,7 +3746,7 @@
             <pathelement location="${build.resources}"/>
             <!-- Include for those tests that need common security resources -->
             <pathelement location="${build.resources}/security"/>
-            <path refid="tests.classpath"/>
+            <path refid="tests.classpath.short"/>
          </classpath>
 
          <formatter type="xml" usefile="${junit.formatter.usefile}"/>
@@ -3687,6 +3761,7 @@
 
    <target name="one-test-debug" if="test"
       description="Execute a single test.">
+      <echo message="tests.classpath.short: ${tests.classpath.short.property}"/>
       <mkdir dir="${build.reports}"/>
       <mkdir dir="${build.testlog}"/>
       <!-- Remove the test.log so each test has a fresh log -->
@@ -3737,7 +3812,7 @@
           <pathelement location="${build.resources}"/>
           <!-- Include for those tests that need common security resources -->
           <pathelement location="${build.resources}/security"/>
-          <path refid="tests.classpath"/>
+          <path refid="tests.classpath.short"/>
         </classpath>
 
         <formatter type="plain" usefile="${junit.formatter.usefile}"/>
@@ -3758,6 +3833,7 @@
     -->
    <target name="one-iiop-test" if="test"
       description="Execute a single test.">
+      <echo message="tests.classpath.short: ${tests.classpath.short.property}"/>
       <mkdir dir="${build.reports}"/>
       <mkdir dir="${build.testlog}"/>
       <!-- Remove the test.log so each test has a fresh log -->
@@ -3817,7 +3893,7 @@
             <pathelement location="${build.resources}"/>
             <!-- Include for those tests that need common security resources -->
             <pathelement location="${build.resources}/security"/>
-            <path refid="tests.classpath"/>
+            <path refid="tests.classpath.short"/>
          </classpath>
 
          <formatter type="xml" usefile="${junit.formatter.usefile}"/>
@@ -4087,6 +4163,7 @@
  
    <target name="execute-matrix-unit-target">
      <echo message=">>>>>> Executing test=${test-name} filter=${parameter-filter}"/>
+     <echo message="tests.classpath.short: ${tests.classpath.short.property}"/>
      <pathconvert pathSep="," dirSep="/" property="jbosstest.hometest">
        <path location="${build.classes}"/>
      </pathconvert>
@@ -4130,7 +4207,7 @@
          <pathelement location="${build.classes}"/>
          <pathelement location="${build.resources}"/>
          <fileset dir="${current-version-dir}" includes="*.jar"/>
-         <path refid="tests.classpath"/>
+         <path refid="tests.classpath.short"/>
          <path refid="tests.compile.classpath"/>
        </classpath>
        <formatter classname="org.jboss.ant.taskdefs.XMLJUnitMultipleResultFormatter" usefile="${junit.formatter.usefile}"