[jboss-cvs] JBossAS SVN: r61428 - in branches/Branch_4_0/testsuite: imports and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Mon Mar 19 06:31:31 EDT 2007
Author: mvecera at redhat.com
Date: 2007-03-19 06:31:30 -0400 (Mon, 19 Mar 2007)
New Revision: 61428
Modified:
branches/Branch_4_0/testsuite/build.xml
branches/Branch_4_0/testsuite/imports/old-test-jars.xml
branches/Branch_4_0/testsuite/imports/sections/classloader.xml
branches/Branch_4_0/testsuite/imports/sections/cts.xml
branches/Branch_4_0/testsuite/imports/sections/tx.xml
Log:
JBAS-3993 patch for Branch_4_0
Modified: branches/Branch_4_0/testsuite/build.xml
===================================================================
--- branches/Branch_4_0/testsuite/build.xml 2007-03-19 10:27:20 UTC (rev 61427)
+++ branches/Branch_4_0/testsuite/build.xml 2007-03-19 10:31:30 UTC (rev 61428)
@@ -240,8 +240,21 @@
<path refid="webservice.classpath"/>
</path>
- <!-- 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"/>
@@ -258,7 +271,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 -->
@@ -365,7 +378,7 @@
-->
<path id="annotations.classpath">
<pathelement path="${jboss.aspects.lib}/jboss-aspect-library-jdk50.jar"/>
- <path refid="tests.classpath"/>
+ <path refid="tests.compile.classpath"/>
</path>
<javac destdir="${build.classes}"
optimize="${javac.optimize}"
@@ -400,7 +413,7 @@
<src path="${build.gen-src}"/>
<exclude name="org/jboss/test/aop/bean/Annotated*" if="HAVE_JDK_1.5"/>
<exclude name="org/jboss/test/xml/JaxpXPathBaseTestCase*" if="HAVE_JDK_1.4"/>
- <classpath refid="tests.classpath"/>
+ <classpath refid="tests.compile.classpath"/>
</javac>
</target>
@@ -415,7 +428,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_4_0/testsuite/imports/old-test-jars.xml
===================================================================
--- branches/Branch_4_0/testsuite/imports/old-test-jars.xml 2007-03-19 10:27:20 UTC (rev 61427)
+++ branches/Branch_4_0/testsuite/imports/old-test-jars.xml 2007-03-19 10:31:30 UTC (rev 61428)
@@ -785,7 +785,7 @@
source="${javac.source}" target="${javac.target}" 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">
@@ -820,7 +820,7 @@
source="${javac.source}" target="${javac.target}" 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">
@@ -1605,7 +1605,7 @@
source="${javac.source}" target="${javac.target}" 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">
@@ -1669,7 +1669,7 @@
source="${javac.source}" target="${javac.target}" 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">
@@ -4901,7 +4901,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"/>
Modified: branches/Branch_4_0/testsuite/imports/sections/classloader.xml
===================================================================
--- branches/Branch_4_0/testsuite/imports/sections/classloader.xml 2007-03-19 10:27:20 UTC (rev 61427)
+++ branches/Branch_4_0/testsuite/imports/sections/classloader.xml 2007-03-19 10:31:30 UTC (rev 61428)
@@ -230,7 +230,7 @@
source="${javac.source}" target="${javac.target}" 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">
@@ -265,7 +265,7 @@
source="${javac.source}" target="${javac.target}" 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_4_0/testsuite/imports/sections/cts.xml
===================================================================
--- branches/Branch_4_0/testsuite/imports/sections/cts.xml 2007-03-19 10:27:20 UTC (rev 61427)
+++ branches/Branch_4_0/testsuite/imports/sections/cts.xml 2007-03-19 10:31:30 UTC (rev 61428)
@@ -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_4_0/testsuite/imports/sections/tx.xml
===================================================================
--- branches/Branch_4_0/testsuite/imports/sections/tx.xml 2007-03-19 10:27:20 UTC (rev 61427)
+++ branches/Branch_4_0/testsuite/imports/sections/tx.xml 2007-03-19 10:31:30 UTC (rev 61428)
@@ -31,7 +31,7 @@
<mkdir dir="${build.lib}"/>
<rmic base="${build.classes}" verify="true" iiop="true" debug="true">
- <classpath refid="tests.classpath"/>
+ <classpath refid="tests.compile.classpath"/>
<include
name="org/jboss/test/txpropiiop/interfaces/a/SessionAHome.class"/>
<include
More information about the jboss-cvs-commits
mailing list