[jboss-cvs] JBossAS SVN: r61432 - in branches/Branch_3_2/testsuite: imports and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: mvecera at redhat.com
Date: 2007-03-19 07:14:06 -0400 (Mon, 19 Mar 2007)
New Revision: 61432

Modified:
   branches/Branch_3_2/testsuite/build.xml
   branches/Branch_3_2/testsuite/imports/old-test-jars.xml
   branches/Branch_3_2/testsuite/imports/sections/classloader.xml
   branches/Branch_3_2/testsuite/imports/sections/cts.xml
   branches/Branch_3_2/testsuite/imports/sections/tm.xml
Log:
JBAS-3993 patch for Branch_3_2

Modified: branches/Branch_3_2/testsuite/build.xml
===================================================================
--- branches/Branch_3_2/testsuite/build.xml	2007-03-19 11:00:49 UTC (rev 61431)
+++ branches/Branch_3_2/testsuite/build.xml	2007-03-19 11:14:06 UTC (rev 61432)
@@ -200,8 +200,21 @@
    <property name="classpath" value=""/>
    <property name="local.classpath" value=""/>
 
-   <!-- Classpath to build and run the tests -->
+   <!-- Classpath to build the tests -->
+   <path id="tests.compile.classpath">
+      <pathelement path="${classpath}"/>
+      <pathelement path="${local.classpath}"/>
+      <pathelement path="${project.tools}/lib/ant.jar"/>
+      <pathelement path="${project.tools}/lib/ant-junit.jar"/>
+      <path refid="jboss.jmx.classpath"/>
+      <path refid="thirdparty.classpath"/>
+   </path>
+
+   <!-- Classpath to run the tests -->
    <path id="tests.classpath">
+      <fileset dir="${jboss.dist}/client">                                                                                                                     
+         <include name="**/*.jar"/>                                                                                                                             
+      </fileset>
       <pathelement path="${classpath}"/>
       <pathelement path="${local.classpath}"/>
       <pathelement path="${project.tools}/lib/ant.jar"/>
@@ -212,7 +225,7 @@
 
    <!-- The classpath required to build javadocs. -->
    <path id="javadoc.classpath">
-      <path refid="tests.classpath"/>
+      <path refid="tests.compile.classpath"/>
    </path>
 
    <!-- Packages to include when generating api documentation -->
@@ -233,7 +246,7 @@
 
    <!-- xdoclet -->
    <path id="xdoclet.task.classpath">
-      <path refid="tests.classpath"/>
+      <path refid="tests.compile.classpath"/>
       <fileset dir="${xdoclet.xdoclet.lib}">
          <include name="**/*.jar"/>
       </fileset>
@@ -293,7 +306,7 @@
          failonerror="${javac.fail.onerror}">
          <src path="${source.java}"/>
          <src path="${build.gen-src}"/>
-         <classpath refid="tests.classpath"/>
+         <classpath refid="tests.compile.classpath"/>
       </javac>
    </target>
 
@@ -308,7 +321,7 @@
          debug="${rmic.debug}"
          stubVersion="${rmic.stubVersion}"
          >
-         <classpath refid="tests.classpath"/>
+         <classpath refid="tests.compile.classpath"/>
          <patternset refid="rmic.includes" />
       </rmic>
    </target>

Modified: branches/Branch_3_2/testsuite/imports/old-test-jars.xml
===================================================================
--- branches/Branch_3_2/testsuite/imports/old-test-jars.xml	2007-03-19 11:00:49 UTC (rev 61431)
+++ branches/Branch_3_2/testsuite/imports/old-test-jars.xml	2007-03-19 11:14:06 UTC (rev 61432)
@@ -540,7 +540,7 @@
              debug="${javac.debug}">
          <src path="${build.gen-src}"/>
          <src path="${source.java}"/>
-         <classpath refid="tests.classpath"/>
+         <classpath refid="tests.compile.classpath"/>
          <include name="org/jboss/test/classloader/scoping/singleton/**"/>
       </javac>
       <jar destfile="${build.lib}/singleton1.sar">
@@ -578,7 +578,7 @@
              debug="${javac.debug}">
          <src path="${build.gen-src}"/>
          <src path="${source.java}"/>
-         <classpath refid="tests.classpath"/>
+         <classpath refid="tests.compile.classpath"/>
          <include name="org/jboss/test/classloader/scoping/singleton/**"/>
       </javac>
       <jar destfile="${build.lib}/singleton2.sar">
@@ -1253,7 +1253,7 @@
              debug="${javac.debug}">
          <src path="${build.gen-src}"/>
          <src path="${source.java}"/>
-         <classpath refid="tests.classpath"/>
+         <classpath refid="tests.compile.classpath"/>
          <include name="org/jboss/test/cts/**"/>
       </javac>
       <jar destfile="${build.lib}/cts-v1cmp.sar">
@@ -1320,7 +1320,7 @@
              debug="${javac.debug}">
          <src path="${build.gen-src}"/>
          <src path="${source.java}"/>
-         <classpath refid="tests.classpath"/>
+         <classpath refid="tests.compile.classpath"/>
          <include name="org/jboss/test/cts/**"/>
       </javac>
       <jar destfile="${build.lib}/cts-v2cmp.sar">

Modified: branches/Branch_3_2/testsuite/imports/sections/classloader.xml
===================================================================
--- branches/Branch_3_2/testsuite/imports/sections/classloader.xml	2007-03-19 11:00:49 UTC (rev 61431)
+++ branches/Branch_3_2/testsuite/imports/sections/classloader.xml	2007-03-19 11:14:06 UTC (rev 61432)
@@ -233,7 +233,7 @@
              debug="${javac.debug}">
          <src path="${build.gen-src}"/>
          <src path="${source.java}"/>
-         <classpath refid="tests.classpath"/>
+         <classpath refid="tests.compile.classpath"/>
          <include name="org/jboss/test/classloader/scoping/singleton/**"/>
       </javac>
       <jar destfile="${build.lib}/singleton1.sar">
@@ -271,7 +271,7 @@
              debug="${javac.debug}">
          <src path="${build.gen-src}"/>
          <src path="${source.java}"/>
-         <classpath refid="tests.classpath"/>
+         <classpath refid="tests.compile.classpath"/>
          <include name="org/jboss/test/classloader/scoping/singleton/**"/>
       </javac>
       <jar destfile="${build.lib}/singleton2.sar">

Modified: branches/Branch_3_2/testsuite/imports/sections/cts.xml
===================================================================
--- branches/Branch_3_2/testsuite/imports/sections/cts.xml	2007-03-19 11:00:49 UTC (rev 61431)
+++ branches/Branch_3_2/testsuite/imports/sections/cts.xml	2007-03-19 11:14:06 UTC (rev 61432)
@@ -75,7 +75,7 @@
              debug="${javac.debug}">
          <src path="${build.gen-src}"/>
          <src path="${source.java}"/>
-         <classpath refid="tests.classpath"/>
+         <classpath refid="tests.compile.classpath"/>
          <include name="org/jboss/test/cts/**"/>
       </javac>
       <jar destfile="${build.lib}/cts-v1cmp.sar">
@@ -142,7 +142,7 @@
              debug="${javac.debug}">
          <src path="${build.gen-src}"/>
          <src path="${source.java}"/>
-         <classpath refid="tests.classpath"/>
+         <classpath refid="tests.compile.classpath"/>
          <include name="org/jboss/test/cts/**"/>
       </javac>
       <jar destfile="${build.lib}/cts-v2cmp.sar">

Modified: branches/Branch_3_2/testsuite/imports/sections/tm.xml
===================================================================
--- branches/Branch_3_2/testsuite/imports/sections/tm.xml	2007-03-19 11:00:49 UTC (rev 61431)
+++ branches/Branch_3_2/testsuite/imports/sections/tm.xml	2007-03-19 11:14:06 UTC (rev 61432)
@@ -79,7 +79,7 @@
          iiop="true"
          debug="true"
          >
-         <classpath refid="tests.classpath"/>
+         <classpath refid="tests.compile.classpath"/>
          <include name="org/jboss/test/txpropiiop/interfaces/a/SessionAHome.class"/>
          <include name="org/jboss/test/txpropiiop/interfaces/a/SessionA.class"/>
          <include name="org/jboss/test/txpropiiop/interfaces/b/SessionBHome.class"/>