[jboss-cvs] JBossAS SVN: r91357 - in trunk/testsuite: imports/sections and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Jul 16 17:10:49 EDT 2009
Author: pgier
Date: 2009-07-16 17:10:48 -0400 (Thu, 16 Jul 2009)
New Revision: 91357
Modified:
trunk/testsuite/build.xml
trunk/testsuite/imports/sections/aop.xml
trunk/testsuite/imports/sections/classloader.xml
trunk/testsuite/imports/sections/cluster.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-16 21:07:04 UTC (rev 91356)
+++ trunk/testsuite/build.xml 2009-07-16 21:10:48 UTC (rev 91357)
@@ -174,23 +174,30 @@
<path refid="woodstox.woodstox.classpath"/>
<path refid="org.jboss.cluster.classpath"/>
<path refid="org.jboss.jaxr.classpath"/>
- <path refid="jboss.remoting.classpath"/>
- <path refid="jboss.serialization.classpath"/>
- <path refid="jboss.jboss.ejb3.core.classpath" />
- <path refid="jboss.jboss.ejb3.ext.api.classpath" />
- <path refid="jboss.jboss.ejb3.proxy.impl.classpath" />
- <path refid="jboss.jboss.ejb3.proxy.spi.classpath" />
+ <fileset refid="org.jboss.remoting:jboss-remoting:jar"/>
+ <fileset refid="jboss:jboss-serialization:jar"/>
+ <fileset refid="org.jboss.ejb3:jboss-ejb3-core:jar"/>
+ <fileset refid="org.jboss.ejb3:jboss-ejb3-core:jar:client"/>
+ <fileset refid="org.jboss.ejb3:jboss-ejb3-ext-api:jar"/>
+ <fileset refid="org.jboss.ejb3:jboss-ejb3-proxy-impl:jar"/>
+ <fileset refid="org.jboss.ejb3:jboss-ejb3-proxy-impl:jar:client"/>
+ <fileset refid="org.jboss.ejb3:jboss-ejb3-proxy-spi:jar:client"/>
<path refid="ejb3-persistence.classpath"/>
<path refid="org.jboss.ws.native.classpath"/>
<path refid="org.jboss.ws.classpath"/>
- <path refid="jboss.jbossxb.classpath"/>
- <path refid="jboss.metadata.classpath"/>
- <path refid="jboss.integration.classpath"/>
- <path refid="jboss.profileservice.spi.classpath"/>
+ <fileset refid="org.jboss:jbossxb:jar"/>
+ <fileset refid="org.jboss.metadata:jboss-metadata:jar"/>
+ <fileset refid="org.jboss.integration:jboss-classloading-spi:jar"/>
+ <fileset refid="org.jboss.integration:jboss-corba-ots-spi:jar"/>
+ <fileset refid="org.jboss.integration:jboss-deployment-spi:jar"/>
+ <fileset refid="org.jboss.integration:jboss-integration:jar"/>
+ <fileset refid="org.jboss.integration:jboss-transaction-spi:jar"/>
+ <fileset refid="org.jboss.integration:jboss-profileservice-spi:jar"/>
<path refid="org.jboss.service.binding.classpath"/>
<path refid="stax.api.classpath"/>
<!-- needed for messaging JMS provider tests -->
- <path refid="jboss.messaging.classpath"/>
+ <fileset refid="jboss.messaging:jboss-messaging:jar"/>
+ <fileset refid="jboss.messaging:jboss-messaging-client:jar"/>
<!-- needed for proxy tests -->
<fileset refid="bcel:bcel:jar"/>
<!-- needed for security login module tests -->
@@ -204,15 +211,28 @@
<!-- xml binding -->
<path refid="xmlunit.xmlunit.classpath"/>
- <path refid="jboss.jboss.reflect.classpath"/>
- <path refid="jboss.jboss.mdr.classpath"/>
- <path refid="jboss.jboss.man.classpath"/>
- <path refid="jboss.jboss.deployers.classpath"/>
- <path refid="jboss.jboss.cl.classpath"/>
- <path refid="jboss.microcontainer.classpath"/>
+ <fileset refid="org.jboss:jboss-reflect:jar"/>
+ <fileset refid="org.jboss:jboss-mdr:jar"/>
+ <fileset refid="org.jboss.man:jboss-managed:jar"/>
+ <fileset refid="org.jboss.man:jboss-metatype:jar"/>
+ <fileset refid="org.jboss.deployers:jboss-deployers-client:jar"/>
+ <fileset refid="org.jboss.deployers:jboss-deployers-client-spi:jar"/>
+ <fileset refid="org.jboss.deployers:jboss-deployers-core:jar"/>
+ <fileset refid="org.jboss.deployers:jboss-deployers-core-spi:jar"/>
+ <fileset refid="org.jboss.deployers:jboss-deployers-impl:jar"/>
+ <fileset refid="org.jboss.deployers:jboss-deployers-spi:jar"/>
+ <fileset refid="org.jboss.deployers:jboss-deployers-structure-spi:jar"/>
+ <fileset refid="org.jboss.deployers:jboss-deployers-vfs-spi:jar"/>
+ <fileset refid="org.jboss.deployers:jboss-deployers-vfs:jar"/>
+ <fileset refid="org.jboss.cl:jboss-classloader:jar"/>
+ <fileset refid="org.jboss.cl:jboss-classloading:jar"/>
+ <fileset refid="org.jboss.cl:jboss-classloading-vfs:jar"/>
+ <fileset refid="org.jboss.microcontainer:jboss-aop-mc-int:jar"/>
+ <fileset refid="org.jboss.microcontainer:jboss-dependency:jar"/>
+ <fileset refid="org.jboss.microcontainer:jboss-kernel:jar"/>
<!-- For classloader leak tests -->
- <path refid="jboss.profiler.jvmti.classpath"/>
+ <fileset refid="jboss.profiler.jvmti:jboss-profiler-jvmti:jar"/>
<!-- org.jboss.aspects:jboss-aspects -->
<path refid="org.jboss.aspects.classpath"/>
@@ -239,38 +259,45 @@
<path refid="org.jboss.aop.classpath"/>
<path refid="jboss.aspects.classpath"/>
<path refid="jboss.cluster.classpath"/>
- <path refid="jboss.common.core.classpath"/>
- <path refid="jboss.common.logging.spi.classpath"/>
- <path refid="jboss.common.logging.log4j.classpath"/>
- <path refid="jboss.common.logging.jdk.classpath"/>
+ <fileset refid="org.jboss:jboss-common-core:jar"/>
+ <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="jboss.deployment.classpath"/>
<path refid="jboss.hibernate.classpath"/>
<path refid="jboss.iiop.classpath"/>
<path refid="jboss.internal-server.classpath"/>
- <path refid="jboss.mx.classpath"/>
- <path refid="jboss.jboss.jaspi.api.classpath"/>
- <path refid="jboss.jboss.javaee.classpath"/>
- <path refid="org.jboss.javaee.classpath"/>
- <path refid="jboss.jboss.vfs.classpath"/>
+ <fileset refid="org.jboss.mx:jboss-j2se:jar"/>
+ <fileset refid="org.jboss.mx:jboss-jmx:jar"/>
+ <fileset refid="org.jboss.mx:jboss-mbeans:jar"/>
+ <fileset refid="org.jboss.javaee:jboss-jaspi-api:jar"/>
+ <fileset refid="org.jboss.javaee:jboss-javaee:jar"/>
+ <fileset refid="org.jboss.javaee:jboss-ejb-api:jar"/>
+ <fileset refid="org.jboss.javaee:jboss-jacc-api:jar"/>
+ <fileset refid="org.jboss.javaee:jboss-jad-api:jar"/>
+ <fileset refid="org.jboss.javaee:jboss-jca-api:jar"/>
+ <fileset refid="org.jboss.javaee:jboss-jms-api:jar"/>
+ <fileset refid="org.jboss.javaee:jboss-transaction-api:jar"/>
+ <fileset refid="org.jboss:jboss-vfs:jar"/>
<path refid="jboss.jca.classpath"/>
<path refid="jboss.jmx-remoting.classpath"/>
<path refid="jboss.management.classpath"/>
- <path refid="jboss.jnpserver.classpath"/>
+ <fileset refid="org.jboss.naming:jnpserver:jar"/>
<path refid="jboss.profileservice.classpath"/>
- <path refid="jboss.jboss.security.spi.classpath"/>
- <path refid="jboss.jbosssx.classpath"/>
+ <fileset refid="org.jboss.security:jboss-security-spi:jar"/>
+ <fileset refid="org.jboss.security:jbosssx:jar"/>
<path refid="jboss.security.int.classpath"/>
<path refid="jboss.server.classpath"/>
<path refid="jboss.main.classpath"/>
- <path refid="jboss.jboss.bootstrap.spi.classpath"/>
- <path refid="jboss.jboss.bootstrap.spi.as.classpath"/>
- <path refid="jboss.jboss.bootstrap.spi.mc.classpath"/>
- <path refid="jboss.jboss.bootstrap.impl.base.classpath"/>
- <path refid="jboss.jboss.bootstrap.impl.as.classpath"/>
- <path refid="jboss.jboss.bootstrap.impl.mc.classpath"/>
+ <fileset refid="org.jboss.bootstrap:jboss-bootstrap-spi:jar"/>
+ <fileset refid="org.jboss.bootstrap:jboss-bootstrap-spi-as:jar"/>
+ <fileset refid="org.jboss.bootstrap:jboss-bootstrap-spi-mc:jar"/>
+ <fileset refid="org.jboss.bootstrap:jboss-bootstrap-impl-base:jar"/>
+ <fileset refid="org.jboss.bootstrap:jboss-bootstrap-impl-as:jar"/>
+ <fileset refid="org.jboss.bootstrap:jboss-bootstrap-impl-mc:jar"/>
<path refid="jboss.system.classpath"/>
<path refid="jboss.systemjmx.classpath"/>
- <path refid="jboss.test.classpath"/>
+ <fileset refid="org.jboss.test:jboss-test:jar"/>
<path refid="jboss.tomcat.classpath"/>
<path refid="jboss.varia.classpath"/>
<path refid="jboss.web.classpath"/>
@@ -299,7 +326,7 @@
<pathelement path="${project.tools}/lib/ant-junit.jar"/>
<path refid="jboss.ejb3.classpath"/>
<path refid="jboss.jmx-remoting.classpath"/>
- <path refid="jboss.test.classpath"/>
+ <fileset refid="org.jboss.test:jboss-test:jar"/>
<path refid="jboss.tomcat.classpath"/>
<path refid="thirdparty.classpath"/>
</path>
@@ -318,7 +345,7 @@
<pathelement path="${project.tools}/lib/ant-junit.jar"/>
<path refid="jboss.ejb3.classpath"/>
<path refid="jboss.jmx-remoting.classpath"/>
- <path refid="jboss.test.classpath"/>
+ <fileset refid="org.jboss.test:jboss-test:jar"/>
<path refid="thirdparty.classpath"/>
</path>
@@ -2101,7 +2128,7 @@
<classpath>
<pathelement location="${build.classes}"/>
<pathelement location="${build.resources}"/>
- <path refid="jboss.test.classpath"/>
+ <fileset refid="org.jboss.test:jboss-test:jar"/>
<path refid="jboss.varia.classpath"/>
</classpath>
@@ -2176,10 +2203,10 @@
<path refid="javassist.classpath"/>
<path refid="trove.classpath"/>
<path refid="org.jboss.aop.classpath"/>
- <path refid="jboss.common.core.classpath"/>
- <path refid="jboss.common.logging.spi.classpath"/>
- <path refid="jboss.common.logging.log4j.classpath"/>
- <path refid="jboss.common.logging.jdk.classpath"/>
+ <fileset refid="org.jboss:jboss-common-core:jar"/>
+ <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>
<aopc compilerclasspathref="aop.task.classpath">
Modified: trunk/testsuite/imports/sections/aop.xml
===================================================================
--- trunk/testsuite/imports/sections/aop.xml 2009-07-16 21:07:04 UTC (rev 91356)
+++ trunk/testsuite/imports/sections/aop.xml 2009-07-16 21:10:48 UTC (rev 91357)
@@ -9,10 +9,10 @@
<path refid="qdox.classpath"/>
<path refid="trove.classpath"/>
<path refid="org.jboss.aop.classpath"/>
- <path refid="jboss.common.core.classpath"/>
- <path refid="jboss.common.logging.spi.classpath"/>
- <path refid="jboss.common.logging.log4j.classpath"/>
- <path refid="jboss.common.logging.jdk.classpath"/>
+ <fileset refid="org.jboss:jboss-common-core:jar"/>
+ <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>
<antcall target="compile-aop-annotatations"/>
<!-- build aopest.jar -->
Modified: trunk/testsuite/imports/sections/classloader.xml
===================================================================
--- trunk/testsuite/imports/sections/classloader.xml 2009-07-16 21:07:04 UTC (rev 91356)
+++ trunk/testsuite/imports/sections/classloader.xml 2009-07-16 21:10:48 UTC (rev 91357)
@@ -292,9 +292,7 @@
<fileset dir="${build.classes}">
<include name="org/jboss/test/classloader/leak/clstore/*"/>
</fileset>
- <fileset dir="${jboss.profiler.jvmti.lib}">
- <include name="jboss-profiler-jvmti.jar"/>
- </fileset>
+ <fileset refid="jboss.profiler.jvmti:jboss-profiler-jvmti:jar"/>
</jar>
<war destfile="${build.lib}/classloader-leak-simple.war"
@@ -510,10 +508,10 @@
<path refid="qdox.classpath"/>
<path refid="trove.classpath"/>
<path refid="org.jboss.aop.classpath"/>
- <path refid="jboss.common.core.classpath"/>
- <path refid="jboss.common.logging.spi.classpath"/>
- <path refid="jboss.common.logging.log4j.classpath"/>
- <path refid="jboss.common.logging.jdk.classpath"/>
+ <fileset refid="org.jboss:jboss-common-core:jar"/>
+ <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"/>
<fileset refid="org.jboss.cache:jbosscache-core:jar"/>
<fileset refid="org.jboss.cache:jbosscache-pojo:jar"/>
</path>
Modified: trunk/testsuite/imports/sections/cluster.xml
===================================================================
--- trunk/testsuite/imports/sections/cluster.xml 2009-07-16 21:07:04 UTC (rev 91356)
+++ trunk/testsuite/imports/sections/cluster.xml 2009-07-16 21:10:48 UTC (rev 91357)
@@ -290,10 +290,10 @@
<path refid="qdox.classpath"/>
<path refid="trove.classpath"/>
<path refid="org.jboss.aop.classpath"/>
- <path refid="jboss.common.core.classpath"/>
- <path refid="jboss.common.logging.spi.classpath"/>
- <path refid="jboss.common.logging.log4j.classpath"/>
- <path refid="jboss.common.logging.jdk.classpath"/>
+ <fileset refid="org.jboss:jboss-common-core:jar"/>
+ <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"/>
<fileset refid="org.jboss.cache:jbosscache-core:jar"/>
<fileset refid="org.jboss.cache:jbosscache-pojo:jar"/>
</path>
@@ -821,13 +821,13 @@
<taskdef name="aopc" classname="org.jboss.aop.ant.AopC"
classpathref="org.jboss.aop.classpath"/>
<path id="aop.task.classpath">
+ <path refid="org.jboss.aop.classpath"/>
+ <fileset refid="org.jboss:jboss-common-core:jar"/>
+ <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"/>
<path refid="trove.classpath"/>
- <path refid="org.jboss.aop.classpath"/>
- <path refid="jboss.common.core.classpath"/>
- <path refid="jboss.common.logging.spi.classpath"/>
- <path refid="jboss.common.logging.log4j.classpath"/>
- <path refid="jboss.common.logging.jdk.classpath"/>
</path>
<aopc compilerclasspathref="aop.task.classpath">
More information about the jboss-cvs-commits
mailing list