[jboss-cvs] JBossAS SVN: r91514 - in trunk/testsuite: imports and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Jul 21 16:48:04 EDT 2009
Author: pgier
Date: 2009-07-21 16:48:04 -0400 (Tue, 21 Jul 2009)
New Revision: 91514
Modified:
trunk/testsuite/build.xml
trunk/testsuite/imports/sections/aop.xml
trunk/testsuite/imports/sections/classloader.xml
trunk/testsuite/imports/sections/cluster.xml
trunk/testsuite/imports/sections/cmp.xml
trunk/testsuite/imports/sections/cts.xml
trunk/testsuite/imports/sections/exception.xml
trunk/testsuite/imports/sections/jca.xml
trunk/testsuite/imports/sections/naming.xml
trunk/testsuite/imports/sections/timer.xml
trunk/testsuite/imports/sections/tm.xml
trunk/testsuite/imports/sections/web.xml
trunk/testsuite/imports/server-config.xml
Log:
[JBBUILD-531] Use refIds from maven ant tasks instead of libraries.ent.
Modified: trunk/testsuite/build.xml
===================================================================
--- trunk/testsuite/build.xml 2009-07-21 19:48:28 UTC (rev 91513)
+++ trunk/testsuite/build.xml 2009-07-21 20:48:04 UTC (rev 91514)
@@ -143,7 +143,7 @@
<fileset refid="apache-xerces:resolver:jar"/>
<fileset refid="xerces:xercesImpl:jar"/>
<fileset refid="apache-xerces:xml-apis:jar"/>
- <path refid="org.apache.classpath"/>
+ <fileset refid="org.apache:xmlsec:jar"/>
<fileset refid="dom4j:dom4j:jar"/>
<fileset refid="httpunit:httpunit:jar"/>
<fileset refid="wsdl4j:wsdl4j:jar"/>
@@ -153,26 +153,33 @@
<fileset refid="jacorb:jacorb_g:jar"/>
<fileset refid="org.jboss.cache:jbosscache-core:jar"/>
<fileset refid="org.jboss.cache:jbosscache-pojo:jar"/>
- <path refid="jgroups.jgroups.classpath"/>
- <path refid="joesnmp.joesnmp.classpath"/>
- <path refid="junit.junit.classpath"/>
- <path refid="org.easymock.classpath"/>
- <path refid="javassist.classpath"/>
- <path refid="juddi.juddi.classpath"/>
- <path refid="nekohtml.nekohtml.classpath"/>
- <path refid="objectweb.joramtests.classpath"/>
- <path refid="opensaml.opensaml.classpath"/>
+ <fileset refid="jgroups:jgroups:jar"/>
+ <fileset refid="joesnmp:joesnmp:jar"/>
+ <fileset refid="junit:junit:jar"/>
+ <fileset refid="org.easymock:easymock:jar"/>
+ <fileset refid="javassist:javassist:jar"/>
+ <fileset refid="juddi:juddi:jar"/>
+ <fileset refid="nekohtml:nekohtml:jar"/>
+ <fileset refid="objectweb-joramtests:joramtests:jar"/>
+ <fileset refid="opensaml:opensaml:jar"/>
<path refid="oswego.concurrent.classpath"/>
<path refid="sleepycat.classpath"/>
<path refid="sun.jaf.classpath"/>
<path refid="sun.javamail.classpath"/>
<path refid="sun.jaxb.classpath"/>
<path refid="sun.jsf.classpath"/>
- <path refid="jboss.web.classpath"/>
+ <fileset refid="jboss.web:el-api:jar"/>
+ <fileset refid="jboss.web:jasper-jdt:jar"/>
+ <fileset refid="jboss.web:jbossweb:jar"/>
+ <fileset refid="jboss.web:jsp-api:jar"/>
+ <fileset refid="jboss.web:servlet-api:jar"/>
<path refid="trove.classpath"/>
<path refid="wutka.dtdparser.classpath"/>
<path refid="woodstox.woodstox.classpath"/>
- <path refid="org.jboss.cluster.classpath"/>
+ <fileset refid="org.jboss.cluster:jboss-ha-client:jar"/>
+ <fileset refid="org.jboss.cluster:jboss-ha-server-api:jar"/>
+ <fileset refid="org.jboss.cluster:jboss-ha-server-cache-jbc:jar"/>
+ <fileset refid="org.jboss.cluster:jboss-ha-server-cache-spi:jar"/>
<path refid="org.jboss.jaxr.classpath"/>
<fileset refid="org.jboss.remoting:jboss-remoting:jar"/>
<fileset refid="jboss:jboss-serialization:jar"/>
@@ -235,9 +242,13 @@
<fileset refid="jboss.profiler.jvmti:jboss-profiler-jvmti:jar"/>
<!-- org.jboss.aspects:jboss-aspects -->
- <path refid="org.jboss.aspects.classpath"/>
+ <fileset refid="org.jboss.aspects:jboss-current-invocation-aspects:jar"/>
+ <fileset refid="org.jboss.aspects:jboss-remoting-aspects:jar"/>
+ <fileset refid="org.jboss.aspects:jboss-security-aspects:jar"/>
+ <fileset refid="org.jboss.aspects:jboss-transaction-aspects:jar"/>
+
<!-- JBAS-6934 -->
- <path refid="net.jcip.classpath"/>
+ <fileset refid="net.jcip:jcip-annotations:jar"/>
</path>
@@ -300,7 +311,11 @@
<fileset refid="org.jboss.test:jboss-test:jar"/>
<path refid="jboss.tomcat.classpath"/>
<path refid="jboss.varia.classpath"/>
- <path refid="jboss.web.classpath"/>
+ <fileset refid="jboss.web:el-api:jar"/>
+ <fileset refid="jboss.web:jasper-jdt:jar"/>
+ <fileset refid="jboss.web:jbossweb:jar"/>
+ <fileset refid="jboss.web:jsp-api:jar"/>
+ <fileset refid="jboss.web:servlet-api:jar"/>
<path refid="jboss.spring.classpath"/>
</path>
@@ -2200,7 +2215,7 @@
<!-- pre-compile the aop classes -->
<taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="org.jboss.aop.classpath"/>
<path id="aop.task.classpath">
- <path refid="javassist.classpath"/>
+ <fileset refid="javassist:javassist:jar"/>
<path refid="trove.classpath"/>
<path refid="org.jboss.aop.classpath"/>
<fileset refid="org.jboss:jboss-common-core:jar"/>
Modified: trunk/testsuite/imports/sections/aop.xml
===================================================================
--- trunk/testsuite/imports/sections/aop.xml 2009-07-21 19:48:28 UTC (rev 91513)
+++ trunk/testsuite/imports/sections/aop.xml 2009-07-21 20:48:04 UTC (rev 91514)
@@ -5,7 +5,7 @@
<taskdef name="aopc" classname="org.jboss.aop.ant.AopC"
classpathref="org.jboss.aop.classpath"/>
<path id="aop.task.classpath">
- <path refid="javassist.classpath"/>
+ <fileset refid="javassist:javassist:jar"/>
<path refid="qdox.classpath"/>
<path refid="trove.classpath"/>
<path refid="org.jboss.aop.classpath"/>
Modified: trunk/testsuite/imports/sections/classloader.xml
===================================================================
--- trunk/testsuite/imports/sections/classloader.xml 2009-07-21 19:48:28 UTC (rev 91513)
+++ trunk/testsuite/imports/sections/classloader.xml 2009-07-21 20:48:04 UTC (rev 91514)
@@ -504,7 +504,7 @@
<taskdef name="aopc" classname="org.jboss.aop.ant.AopC"
classpathref="org.jboss.aop.classpath"/>
<path id="aop.task.classpath">
- <path refid="javassist.classpath"/>
+ <fileset refid="javassist:javassist:jar"/>
<path refid="qdox.classpath"/>
<path refid="trove.classpath"/>
<path refid="org.jboss.aop.classpath"/>
Modified: trunk/testsuite/imports/sections/cluster.xml
===================================================================
--- trunk/testsuite/imports/sections/cluster.xml 2009-07-21 19:48:28 UTC (rev 91513)
+++ trunk/testsuite/imports/sections/cluster.xml 2009-07-21 20:48:04 UTC (rev 91514)
@@ -286,7 +286,7 @@
<taskdef name="aopc" classname="org.jboss.aop.ant.AopC"
classpathref="org.jboss.aop.classpath"/>
<path id="aop.task.classpath">
- <path refid="javassist.classpath"/>
+ <fileset refid="javassist:javassist:jar"/>
<path refid="qdox.classpath"/>
<path refid="trove.classpath"/>
<path refid="org.jboss.aop.classpath"/>
@@ -847,7 +847,7 @@
<fileset refid="org.jboss.logging:jboss-logging-spi:jar"/>
<fileset refid="org.jboss.logging:jboss-logging-log4j:jar"/>
<fileset refid="org.jboss.logging:jboss-logging-jdk:jar"/>
- <path refid="javassist.classpath"/>
+ <fileset refid="javassist:javassist:jar"/>
<path refid="trove.classpath"/>
</path>
@@ -882,9 +882,7 @@
<jar destfile="${build.lib}/cachetest.sar">
<fileset refid="org.jboss.cache:jbosscache-core:jar"/>
- <fileset dir="${jgroups.jgroups.lib}">
- <include name="jgroups.jar"/>
- </fileset>
+ <fileset refid="jgroups:jgroups:jar"/>
<fileset dir="${build.resources}/cluster/cache">
<include name="META-INF/jboss-service.xml"/>
</fileset>
@@ -897,9 +895,7 @@
<jar destfile="${build.lib}/cacheAoptest.sar">
<fileset refid="org.jboss.cache:jbosscache-core:jar"/>
- <fileset dir="${jgroups.jgroups.lib}">
- <include name="jgroups.jar"/>
- </fileset>
+ <fileset refid="jgroups:jgroups:jar"/>
<fileset dir="${build.resources}/cluster/cache">
<include name="META-INF/jboss-service.xml"/>
</fileset>
Modified: trunk/testsuite/imports/sections/cmp.xml
===================================================================
--- trunk/testsuite/imports/sections/cmp.xml 2009-07-21 19:48:28 UTC (rev 91513)
+++ trunk/testsuite/imports/sections/cmp.xml 2009-07-21 20:48:04 UTC (rev 91514)
@@ -14,7 +14,7 @@
</fileset>
<zipfileset src="${jboss.test.lib}/jboss-test.jar"
includes="org/jboss/**/*.*"/>
- <zipfileset src="${junit.junit.lib}/junit.jar"
+ <zipfileset src="${junit:junit:jar}"
includes="junit/**/*.*"/>
</jar>
@@ -29,7 +29,7 @@
</fileset>
<zipfileset src="${jboss.test.lib}/jboss-test.jar"
includes="org/jboss/**/*.*"/>
- <zipfileset src="${junit.junit.lib}/junit.jar"
+ <zipfileset src="${junit:junit:jar}"
includes="junit/**/*.*"/>
</jar>
@@ -44,7 +44,7 @@
</fileset>
<zipfileset src="${jboss.test.lib}/jboss-test.jar"
includes="org/jboss/**/*.*"/>
- <zipfileset src="${junit.junit.lib}/junit.jar"
+ <zipfileset src="${junit:junit:jar}"
includes="junit/**/*.*"/>
</jar>
@@ -91,7 +91,7 @@
</fileset>
<zipfileset src="${jboss.test.lib}/jboss-test.jar"
includes="org/jboss/**/*.*"/>
- <zipfileset src="${junit.junit.lib}/junit.jar"
+ <zipfileset src="${junit:junit:jar}"
includes="junit/**/*.*"/>
</jar>
@@ -106,7 +106,7 @@
</fileset>
<zipfileset src="${jboss.test.lib}/jboss-test.jar"
includes="org/jboss/**/*.*"/>
- <zipfileset src="${junit.junit.lib}/junit.jar"
+ <zipfileset src="${junit:junit:jar}"
includes="junit/**/*.*"/>
</jar>
<copy file="${build.resources}/cmp2/ejbselect/META-INF/jboss.xml"
@@ -124,7 +124,7 @@
</fileset>
<zipfileset src="${jboss.test.lib}/jboss-test.jar"
includes="org/jboss/**/*.*"/>
- <zipfileset src="${junit.junit.lib}/junit.jar"
+ <zipfileset src="${junit:junit:jar}"
includes="junit/**/*.*"/>
</jar>
<copy
@@ -150,7 +150,7 @@
<fileset dir="${build.resources}/cmp2/ageout">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${junit.junit.lib}/junit.jar">
+ <zipfileset src="${junit:junit:jar}">
<patternset refid="ejbrunner.set"/>
</zipfileset>
<zipfileset src="${jboss.test.lib}/jboss-test.jar">
@@ -181,7 +181,7 @@
</fileset>
<zipfileset src="${jboss.test.lib}/jboss-test.jar"
includes="org/jboss/**/*.*"/>
- <zipfileset src="${junit.junit.lib}/junit.jar"
+ <zipfileset src="${junit:junit:jar}"
includes="junit/**/*.*"/>
</jar>
@@ -196,7 +196,7 @@
</fileset>
<zipfileset src="${jboss.test.lib}/jboss-test.jar"
includes="org/jboss/**/*.*"/>
- <zipfileset src="${junit.junit.lib}/junit.jar"
+ <zipfileset src="${junit:junit:jar}"
includes="junit/**/*.*"/>
</jar>
@@ -211,7 +211,7 @@
</fileset>
<zipfileset src="${jboss.test.lib}/jboss-test.jar"
includes="org/jboss/**/*.*"/>
- <zipfileset src="${junit.junit.lib}/junit.jar"
+ <zipfileset src="${junit:junit:jar}"
includes="junit/**/*.*"/>
</jar>
@@ -226,7 +226,7 @@
</fileset>
<zipfileset src="${jboss.test.lib}/jboss-test.jar"
includes="org/jboss/**/*.*"/>
- <zipfileset src="${junit.junit.lib}/junit.jar"
+ <zipfileset src="${junit:junit:jar}"
includes="junit/**/*.*"/>
</jar>
@@ -241,7 +241,7 @@
</fileset>
<zipfileset src="${jboss.test.lib}/jboss-test.jar"
includes="org/jboss/**/*.*"/>
- <zipfileset src="${junit.junit.lib}/junit.jar"
+ <zipfileset src="${junit:junit:jar}"
includes="junit/**/*.*"/>
</jar>
@@ -256,7 +256,7 @@
</fileset>
<zipfileset src="${jboss.test.lib}/jboss-test.jar"
includes="org/jboss/**/*.*"/>
- <zipfileset src="${junit.junit.lib}/junit.jar"
+ <zipfileset src="${junit:junit:jar}"
includes="junit/**/*.*"/>
</jar>
@@ -271,7 +271,7 @@
</fileset>
<zipfileset src="${jboss.test.lib}/jboss-test.jar"
includes="org/jboss/**/*.*"/>
- <zipfileset src="${junit.junit.lib}/junit.jar"
+ <zipfileset src="${junit:junit:jar}"
includes="junit/**/*.*"/>
</jar>
@@ -297,7 +297,7 @@
</fileset>
<zipfileset src="${jboss.test.lib}/jboss-test.jar"
includes="org/jboss/**/*.*"/>
- <zipfileset src="${junit.junit.lib}/junit.jar"
+ <zipfileset src="${junit:junit:jar}"
includes="junit/**/*.*"/>
</jar>
@@ -312,7 +312,7 @@
</fileset>
<zipfileset src="${jboss.test.lib}/jboss-test.jar"
includes="org/jboss/**/*.*"/>
- <zipfileset src="${junit.junit.lib}/junit.jar"
+ <zipfileset src="${junit:junit:jar}"
includes="junit/**/*.*"/>
</jar>
@@ -327,7 +327,7 @@
</fileset>
<zipfileset src="${jboss.test.lib}/jboss-test.jar"
includes="org/jboss/**/*.*"/>
- <zipfileset src="${junit.junit.lib}/junit.jar"
+ <zipfileset src="${junit:junit:jar}"
includes="junit/**/*.*"/>
</jar>
@@ -342,7 +342,7 @@
</fileset>
<zipfileset src="${jboss.test.lib}/jboss-test.jar"
includes="org/jboss/**/*.*"/>
- <zipfileset src="${junit.junit.lib}/junit.jar"
+ <zipfileset src="${junit:junit:jar}"
includes="junit/**/*.*"/>
</jar>
@@ -357,7 +357,7 @@
</fileset>
<zipfileset src="${jboss.test.lib}/jboss-test.jar"
includes="org/jboss/**/*.*"/>
- <zipfileset src="${junit.junit.lib}/junit.jar"
+ <zipfileset src="${junit:junit:jar}"
includes="junit/**/*.*"/>
</jar>
<copy file="${build.resources}/cmp2/jbas3541/META-INF/jboss.xml"
@@ -375,7 +375,7 @@
</fileset>
<zipfileset src="${jboss.test.lib}/jboss-test.jar"
includes="org/jboss/**/*.*"/>
- <zipfileset src="${junit.junit.lib}/junit.jar"
+ <zipfileset src="${junit:junit:jar}"
includes="junit/**/*.*"/>
</jar>
<copy
@@ -394,7 +394,7 @@
</fileset>
<zipfileset src="${jboss.test.lib}/jboss-test.jar"
includes="org/jboss/**/*.*"/>
- <zipfileset src="${junit.junit.lib}/junit.jar"
+ <zipfileset src="${junit:junit:jar}"
includes="junit/**/*.*"/>
</jar>
@@ -409,7 +409,7 @@
</fileset>
<zipfileset src="${jboss.test.lib}/jboss-test.jar"
includes="org/jboss/**/*.*"/>
- <zipfileset src="${junit.junit.lib}/junit.jar"
+ <zipfileset src="${junit:junit:jar}"
includes="junit/**/*.*"/>
</jar>
@@ -435,7 +435,7 @@
</fileset>
<zipfileset src="${jboss.test.lib}/jboss-test.jar"
includes="org/jboss/**/*.*"/>
- <zipfileset src="${junit.junit.lib}/junit.jar"
+ <zipfileset src="${junit:junit:jar}"
includes="junit/**/*.*"/>
</jar>
@@ -454,7 +454,7 @@
<zipfileset src="${jboss.test.lib}/jboss-test.jar"
includes="org/jboss/**/*.*"/>
- <zipfileset src="${junit.junit.lib}/junit.jar"
+ <zipfileset src="${junit:junit:jar}"
includes="junit/**/*.*"/>
</jar>
@@ -469,7 +469,7 @@
</fileset>
<zipfileset src="${jboss.test.lib}/jboss-test.jar"
includes="org/jboss/**/*.*"/>
- <zipfileset src="${junit.junit.lib}/junit.jar"
+ <zipfileset src="${junit:junit:jar}"
includes="junit/**/*.*"/>
</jar>
<copy file="${build.resources}/cmp2/enums/META-INF/jboss.xml"
@@ -487,7 +487,7 @@
</fileset>
<zipfileset src="${jboss.test.lib}/jboss-test.jar"
includes="org/jboss/**/*.*"/>
- <zipfileset src="${junit.junit.lib}/junit.jar"
+ <zipfileset src="${junit:junit:jar}"
includes="junit/**/*.*"/>
</jar>
<copy
@@ -517,7 +517,7 @@
</fileset>
<zipfileset src="${jboss.test.lib}/jboss-test.jar"
includes="org/jboss/**/*.*"/>
- <zipfileset src="${junit.junit.lib}/junit.jar"
+ <zipfileset src="${junit:junit:jar}"
includes="junit/**/*.*"/>
</jar>
@@ -532,7 +532,7 @@
</fileset>
<zipfileset src="${jboss.test.lib}/jboss-test.jar"
includes="org/jboss/**/*.*"/>
- <zipfileset src="${junit.junit.lib}/junit.jar" includes="junit/**/*.*"/>
+ <zipfileset src="${junit:junit:jar}" includes="junit/**/*.*"/>
</jar>
<jar destfile="${build.lib}/cmp2-jbas3717.ear">
<fileset dir="${build.lib}">
@@ -553,7 +553,7 @@
<include name="**/*.*"/>
</fileset>
<zipfileset src="${jboss.test.lib}/jboss-test.jar" includes="org/jboss/**/*.*"/>
- <zipfileset src="${junit.junit.lib}/junit.jar" includes="junit/**/*.*"/>
+ <zipfileset src="${junit:junit:jar}" includes="junit/**/*.*"/>
</jar>
</target>
</project>
Modified: trunk/testsuite/imports/sections/cts.xml
===================================================================
--- trunk/testsuite/imports/sections/cts.xml 2009-07-21 19:48:28 UTC (rev 91513)
+++ trunk/testsuite/imports/sections/cts.xml 2009-07-21 20:48:04 UTC (rev 91514)
@@ -36,7 +36,7 @@
<include name="org/jboss/test/cts/test/*_Stub*.class"/>
<include name="org/jboss/test/util/ejb/*"/>
</fileset>
- <zipfileset src="${junit.junit.lib}/junit.jar">
+ <zipfileset src="${junit:junit:jar}">
<patternset refid="ejbrunner.set"/>
</zipfileset>
<zipfileset src="${jboss.test.lib}/jboss-test.jar">
Modified: trunk/testsuite/imports/sections/exception.xml
===================================================================
--- trunk/testsuite/imports/sections/exception.xml 2009-07-21 19:48:28 UTC (rev 91513)
+++ trunk/testsuite/imports/sections/exception.xml 2009-07-21 20:48:04 UTC (rev 91514)
@@ -41,7 +41,7 @@
<fileset dir="${build.resources}/exception">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${junit.junit.lib}/junit.jar">
+ <zipfileset src="${junit:junit:jar}">
<patternset refid="ejbrunner.set"/>
</zipfileset>
<zipfileset src="${jboss.test.lib}/jboss-test.jar">
Modified: trunk/testsuite/imports/sections/jca.xml
===================================================================
--- trunk/testsuite/imports/sections/jca.xml 2009-07-21 19:48:28 UTC (rev 91513)
+++ trunk/testsuite/imports/sections/jca.xml 2009-07-21 20:48:04 UTC (rev 91514)
@@ -252,7 +252,7 @@
<fileset dir="${build.resources}/jca/executejmsrollback">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${junit.junit.lib}/junit.jar">
+ <zipfileset src="${junit:junit:jar}">
<patternset refid="ejbrunner.set"/>
</zipfileset>
<zipfileset src="${jboss.test.lib}/jboss-test.jar">
@@ -269,7 +269,7 @@
<fileset dir="${build.resources}/jca/test">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${junit.junit.lib}/junit.jar">
+ <zipfileset src="${junit:junit:jar}">
<patternset refid="ejbrunner.set"/>
</zipfileset>
<zipfileset src="${jboss.test.lib}/jboss-test.jar">
Modified: trunk/testsuite/imports/sections/naming.xml
===================================================================
--- trunk/testsuite/imports/sections/naming.xml 2009-07-21 19:48:28 UTC (rev 91513)
+++ trunk/testsuite/imports/sections/naming.xml 2009-07-21 20:48:04 UTC (rev 91514)
@@ -19,7 +19,7 @@
<zipfileset dir="${build.resources}/naming" prefix="security">
<include name="*.properties"/>
</zipfileset>
- <zipfileset src="${junit.junit.lib}/junit.jar">
+ <zipfileset src="${junit:junit:jar}">
<patternset refid="ejbrunner.set"/>
</zipfileset>
<zipfileset src="${jboss.test.lib}/jboss-test.jar">
Modified: trunk/testsuite/imports/sections/timer.xml
===================================================================
--- trunk/testsuite/imports/sections/timer.xml 2009-07-21 19:48:28 UTC (rev 91513)
+++ trunk/testsuite/imports/sections/timer.xml 2009-07-21 20:48:04 UTC (rev 91514)
@@ -43,7 +43,7 @@
<fileset dir="${build.resources}/txtimer/test">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${junit.junit.lib}/junit.jar">
+ <zipfileset src="${junit:junit:jar}">
<patternset refid="ejbrunner.set"/>
</zipfileset>
<zipfileset src="${jboss.test.lib}/jboss-test.jar">
Modified: trunk/testsuite/imports/sections/tm.xml
===================================================================
--- trunk/testsuite/imports/sections/tm.xml 2009-07-21 19:48:28 UTC (rev 91513)
+++ trunk/testsuite/imports/sections/tm.xml 2009-07-21 20:48:04 UTC (rev 91514)
@@ -75,7 +75,7 @@
<fileset dir="${build.resources}/tm/test">
<include name="**/*.*"/>
</fileset>
- <zipfileset src="${junit.junit.lib}/junit.jar">
+ <zipfileset src="${junit:junit:jar}">
<patternset refid="ejbrunner.set"/>
</zipfileset>
<zipfileset src="${jboss.test.lib}/jboss-test.jar">
Modified: trunk/testsuite/imports/sections/web.xml
===================================================================
--- trunk/testsuite/imports/sections/web.xml 2009-07-21 19:48:28 UTC (rev 91513)
+++ trunk/testsuite/imports/sections/web.xml 2009-07-21 20:48:04 UTC (rev 91514)
@@ -779,9 +779,7 @@
<!-- WAR with servlet classes -->
<war destfile="${build.lib}/servlet-classes.war"
webxml="${build.resources}/web/servlet-classes/web.xml">
- <lib dir="${jboss.web.lib}">
- <include name="servlet-api.jar" />
- </lib>
+ <lib refid="jboss.web:servlet-api:jar"/>
<lib dir="${build.lib}">
<include name="jbosstest-web-util.jar"/>
<include name="resources.jar"/>
Modified: trunk/testsuite/imports/server-config.xml
===================================================================
--- trunk/testsuite/imports/server-config.xml 2009-07-21 19:48:28 UTC (rev 91513)
+++ trunk/testsuite/imports/server-config.xml 2009-07-21 20:48:04 UTC (rev 91514)
@@ -1072,9 +1072,7 @@
</fileset>
<fileset refid="org.jboss.cache:jbosscache-core:jar"/>
<fileset refid="org.jboss.cache:jbosscache-pojo:jar"/>
- <fileset dir="${net.jcip.lib}">
- <include name="jcip-annotations.jar"/>
- </fileset>
+ <fileset refid="net.jcip:jcip-annotations:jar"/>
</copy>
</sequential>
</macrodef>
More information about the jboss-cvs-commits
mailing list