[jboss-cvs] JBossAS SVN: r91579 - in trunk/testsuite: imports/sections and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Jul 22 16:39:51 EDT 2009
Author: pgier
Date: 2009-07-22 16:39:51 -0400 (Wed, 22 Jul 2009)
New Revision: 91579
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-22 20:06:15 UTC (rev 91578)
+++ trunk/testsuite/build.xml 2009-07-22 20:39:51 UTC (rev 91579)
@@ -130,11 +130,25 @@
<fileset refid="org.jboss.aop:jrockit-pluggable-instrumentor:jar"/>
<fileset refid="org.jboss.aop:pluggable-instrumentor:jar"/>
</path>
+ <path id="org.springframework.classpath">
+ <fileset refid="org.springframework:spring-aop:jar"/>
+ <fileset refid="org.springframework:spring-beans:jar"/>
+ <fileset refid="org.springframework:spring-context:jar"/>
+ <fileset refid="org.springframework:spring-core:jar"/>
+ <fileset refid="org.springframework:spring-web:jar"/>
+ <fileset refid="org.springframework:spring-webmvc:jar"/>
+ </path>
<!-- The combined library classpath -->
<path id="library.classpath">
<fileset refid="apache-avalon:avalon-framework:jar"/>
- <path refid="apache.commons.classpath"/>
+ <!-- apache commons classpath -->
+ <fileset refid="commons-collections:commons-collections:jar"/>
+ <fileset refid="commons-logging:commons-logging:jar"/>
+ <fileset refid="apache-discovery:commons-discovery:jar"/>
+ <fileset refid="commons-fileupload:commons-fileupload:jar"/>
+ <fileset refid="commons-lang:commons-lang:jar"/>
+
<fileset refid="apache-httpclient:commons-httpclient:jar"/>
<fileset refid="commons-codec:commons-codec:jar"/>
<fileset refid="log4j:log4j:jar"/>
@@ -162,25 +176,29 @@
<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"/>
+ <fileset refid="oswego-concurrent:concurrent:jar"/>
+ <fileset refid="sleepycat:je:jar"/>
+ <fileset refid="javax.activation:activation:jar"/>
+ <fileset refid="javax.mail:mail:jar"/>
+ <fileset refid="sun-jaxb:jaxb-api:jar"/>
+ <fileset refid="sun-jaxb:jaxb-impl:jar"/>
+ <fileset refid="sun-jaxb:jaxb-xjc:jar"/>
+ <fileset refid="javax.faces:jsf-api:jar"/>
+ <fileset refid="javax.faces:jsf-impl:jar"/>
<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"/>
+ <fileset refid="trove:trove:jar"/>
+ <fileset refid="wutka-dtdparser:dtdparser:jar"/>
+ <fileset refid="org.codehaus.woodstox:wstx-lgpl:jar"/>
<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.jaxr:juddi-saaj:jar"/>
+ <fileset refid="org.jboss.jaxr:juddi-service:sar"/>
<fileset refid="org.jboss.remoting:jboss-remoting:jar"/>
<fileset refid="jboss:jboss-serialization:jar"/>
<fileset refid="org.jboss.ejb3:jboss-ejb3-core:jar"/>
@@ -189,9 +207,20 @@
<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"/>
+ <fileset refid="org.hibernate:ejb3-persistence:jar"/>
+ <fileset refid="org.hibernate:hibernate-annotations:jar"/>
+ <fileset refid="org.hibernate:hibernate-entitymanager:jar"/>
+ <fileset refid="org.jboss.ws:jbossws-common:jar"/>
+ <fileset refid="org.jboss.ws:jbossws-framework:jar"/>
+ <fileset refid="org.jboss.ws:jbossws-spi:jar"/>
+ <fileset refid="org.jboss.ws.native:jbossws-native-client:jar"/>
+ <fileset refid="org.jboss.ws.native:jbossws-native-core:jar"/>
+ <fileset refid="org.jboss.ws.native:jbossws-native-jaxrpc:jar"/>
+ <fileset refid="org.jboss.ws.native:jbossws-native-jaxws-ext:jar"/>
+ <fileset refid="org.jboss.ws.native:jbossws-native-jaxws:jar"/>
+ <fileset refid="org.jboss.ws.native:jbossws-native-management:war"/>
+ <fileset refid="org.jboss.ws.native:jbossws-native-resources:jar"/>
+ <fileset refid="org.jboss.ws.native:jbossws-native-saaj:jar"/>
<fileset refid="org.jboss:jbossxb:jar"/>
<fileset refid="org.jboss.metadata:jboss-metadata:jar"/>
<fileset refid="org.jboss.integration:jboss-classloading-spi:jar"/>
@@ -200,8 +229,9 @@
<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"/>
+ <fileset refid="org.jboss.service.binding:jboss-service-binding-core:jar"/>
+ <fileset refid="org.jboss.service.binding:jboss-service-binding-mgmt:jar"/>
+ <fileset refid="stax:stax-api:jar"/>
<!-- needed for messaging JMS provider tests -->
<fileset refid="jboss.messaging:jboss-messaging:jar"/>
<fileset refid="jboss.messaging:jboss-messaging-client:jar"/>
@@ -210,14 +240,15 @@
<!-- needed for security login module tests -->
<fileset refid="hsqldb:hsqldb:jar"/>
<!-- Need hibernate jar for hibernate-based tests -->
- <path refid="hibernate3.classpath"/>
- <path refid="odmg.classpath"/>
- <path refid="cglib.classpath"/>
+ <fileset refid="org.hibernate:hibernate-core:jar"/>
+ <fileset refid="org.hibernate:hibernate-jmx:jar"/>
+ <fileset refid="odmg:odmg:jar"/>
+ <fileset refid="cglib:cglib:jar"/>
<!-- Need spring jar for spring-based tests -->
- <path refid="spring.classpath"/>
+ <path refid="org.springframework.classpath"/>
<!-- xml binding -->
- <path refid="xmlunit.xmlunit.classpath"/>
+ <fileset refid="xmlunit:xmlunit:jar"/>
<fileset refid="org.jboss:jboss-reflect:jar"/>
<fileset refid="org.jboss:jboss-mdr:jar"/>
<fileset refid="org.jboss.man:jboss-managed:jar"/>
Modified: trunk/testsuite/imports/sections/aop.xml
===================================================================
--- trunk/testsuite/imports/sections/aop.xml 2009-07-22 20:06:15 UTC (rev 91578)
+++ trunk/testsuite/imports/sections/aop.xml 2009-07-22 20:39:51 UTC (rev 91579)
@@ -6,8 +6,8 @@
classpathref="org.jboss.aop.classpath"/>
<path id="aop.task.classpath">
<fileset refid="javassist:javassist:jar"/>
- <path refid="qdox.classpath"/>
- <path refid="trove.classpath"/>
+ <fileset refid="qdox:qdox:jar"/>
+ <fileset refid="trove:trove:jar"/>
<path refid="org.jboss.aop.classpath"/>
<fileset refid="org.jboss:jboss-common-core:jar"/>
<fileset refid="org.jboss.logging:jboss-logging-spi:jar"/>
Modified: trunk/testsuite/imports/sections/classloader.xml
===================================================================
--- trunk/testsuite/imports/sections/classloader.xml 2009-07-22 20:06:15 UTC (rev 91578)
+++ trunk/testsuite/imports/sections/classloader.xml 2009-07-22 20:39:51 UTC (rev 91579)
@@ -505,8 +505,8 @@
classpathref="org.jboss.aop.classpath"/>
<path id="aop.task.classpath">
<fileset refid="javassist:javassist:jar"/>
- <path refid="qdox.classpath"/>
- <path refid="trove.classpath"/>
+ <fileset refid="qdox:qdox:jar"/>
+ <fileset refid="trove:trove:jar"/>
<path refid="org.jboss.aop.classpath"/>
<fileset refid="org.jboss:jboss-common-core:jar"/>
<fileset refid="org.jboss.logging:jboss-logging-spi:jar"/>
Modified: trunk/testsuite/imports/sections/cluster.xml
===================================================================
--- trunk/testsuite/imports/sections/cluster.xml 2009-07-22 20:06:15 UTC (rev 91578)
+++ trunk/testsuite/imports/sections/cluster.xml 2009-07-22 20:39:51 UTC (rev 91579)
@@ -287,8 +287,8 @@
classpathref="org.jboss.aop.classpath"/>
<path id="aop.task.classpath">
<fileset refid="javassist:javassist:jar"/>
- <path refid="qdox.classpath"/>
- <path refid="trove.classpath"/>
+ <fileset refid="qdox:qdox:jar"/>
+ <fileset refid="trove:trove:jar"/>
<path refid="org.jboss.aop.classpath"/>
<fileset refid="org.jboss:jboss-common-core:jar"/>
<fileset refid="org.jboss.logging:jboss-logging-spi:jar"/>
@@ -848,7 +848,7 @@
<fileset refid="org.jboss.logging:jboss-logging-log4j:jar"/>
<fileset refid="org.jboss.logging:jboss-logging-jdk:jar"/>
<fileset refid="javassist:javassist:jar"/>
- <path refid="trove.classpath"/>
+ <fileset refid="trove:trove:jar"/>
</path>
<aopc compilerclasspathref="aop.task.classpath">
More information about the jboss-cvs-commits
mailing list