[jboss-cvs] JBossAS SVN: r92615 - in branches/JBPAPP_5_0/testsuite: imports and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Aug 20 13:44:58 EDT 2009
Author: rachmatowicz at jboss.com
Date: 2009-08-20 13:44:58 -0400 (Thu, 20 Aug 2009)
New Revision: 92615
Modified:
branches/JBPAPP_5_0/testsuite/build.xml
branches/JBPAPP_5_0/testsuite/imports/sections/classloader.xml
branches/JBPAPP_5_0/testsuite/imports/sections/cts.xml
branches/JBPAPP_5_0/testsuite/imports/server-config.xml
Log:
Modify tests.classpath so that all tests pick up jars from the distribution (jboss.dist) wherever possible (JBPAPP-2348).
Modified: branches/JBPAPP_5_0/testsuite/build.xml
===================================================================
--- branches/JBPAPP_5_0/testsuite/build.xml 2009-08-20 16:45:42 UTC (rev 92614)
+++ branches/JBPAPP_5_0/testsuite/build.xml 2009-08-20 17:44:58 UTC (rev 92615)
@@ -103,6 +103,19 @@
<property name="module.Name" value="JBoss Testsuite"/>
<property name="module.version" value="DEV"/>
+ <!-- distribution to test against - use the default build if -Djboss.dist is not defined -->
+ <!-- Use the ${/} platform seperator in jboss.dist, jboss.test.deploy.dir as
+ this is used in the security policy file property references and needs to
+ be valid for the platform.
+ -->
+ <property name="version" value="${version.major}.${version.minor}.${version.revision}.${version.tag}"/>
+ <property name="jboss.dist.default" value="${project.root}${/}build${/}output${/}jboss-${version}"/>
+ <condition property="jboss.dist" value="${jboss.dist.default}">
+ <not>
+ <isset property="jboss.dist"/>
+ </not>
+ </condition>
+
<!-- ========= -->
<!-- Libraries -->
<!-- ========= -->
@@ -110,7 +123,7 @@
&libraries;
&testsuite-libraries;
- <!-- The combined library classpath -->
+ <!-- The combined library classpath (for building the testsuite) -->
<path id="library.classpath">
<path refid="apache.commons.classpath"/>
<path refid="apache.codec.classpath"/>
@@ -198,6 +211,235 @@
</path>
+ <property name="jboss.dist.client" value="${jboss.dist}/client" />
+ <property name="jboss.dist.lib" value="${jboss.dist}/lib" />
+ <property name="jboss.dist.lib.endorsed" value="${jboss.dist.lib}/endorsed" />
+ <property name="jboss.dist.common.lib" value="${jboss.dist}/common/lib" />
+ <property name="jboss.dist.server" value="${jboss.dist}/server" />
+
+ <!-- the combined library classpath (for executing the testsuite) -->
+ <path id="distribution.jars.library.classpath">
+ <!-- path refid="apache.commons.classpath"/ -->
+ <pathelement path="${jboss.dist.server}/all/deploy/admin-console.war/WEB-INF/lib/commons-collections-3.2.jar" />
+ <pathelement path="${jboss.dist.client}/commons-logging.jar" />
+ <pathelement path="${apache.httpclient.lib}/commons-httpclient.jar" />
+ <pathelement path="${apache.discovery.lib}/commons-discovery.jar" />
+ <pathelement path="${apache.fileupload.lib}/commons-fileupload.jar" />
+ <pathelement path="${apache.lang.lib}/commons-lang.jar" />
+ <!-- path refid="apache.codec.classpath"/ -->
+ <pathelement path="${apache.codec.lib}/commons-codec.jar" />
+ <!-- path refid="apache.log4j.classpath"/ -->
+ <pathelement path="${jboss.dist.client}/log4j.jar" />
+ <!-- path refid="apache.jaxme.classpath"/ -->
+ <pathelement path="${apache.jaxme.lib}/jaxmexs.jar" />
+ <!-- path refid="apache.scout.classpath"/ -->
+ <pathelement path="${jboss.dist.client}/scout.jar" />
+ <!-- path refid="apache.xerces.classpath"/ -->
+ <pathelement path="${jboss.dist.lib.endorsed}/resolver.jar" />
+ <pathelement path="${jboss.dist.lib.endorsed}/xercesImpl.jar" />
+ <pathelement path="${apache.xerxes.lib}/xml-apis.jar" />
+ <!-- path refid="org.apache.classpath"/ -->
+ <pathelement path="${jboss.dist.client}/xmlsec.jar" />
+ <!-- path refid="dom4j.dom4j.classpath"/ -->
+ <pathelement path="${jboss.dist.lib}/dom4j.jar" />
+ <!-- path refid="httpunit.httpunit.classpath"/ -->
+ <pathelement path="${httpunit.httpunit.lib}/httpunit.jar" />
+ <!-- path refid="ibm.wsdl4j.classpath"/ -->
+ <pathelement path="${jboss.dist.client}/wsdl4j.jar" />
+ <!-- path refid="jacorb.jacorb.classpath"/ -->
+ <pathelement path="${jacorb.jacorb.lib}/idl.jar" />
+ <pathelement path="${jacorb.jacorb.lib}/idl_g.jar" />
+ <pathelement path="${jboss.dist.client}/jacorb.jar" />
+ <pathelement path="${jacorb.jacorb.lib}/jacorb_g.jar" />
+ <!-- path refid="jboss.cache.jbosscache.core.classpath"/ -->
+ <pathelement path="${jboss.dist.server}/all/lib/jbosscache-core.jar" />
+ <!-- path refid="jboss.cache.jbosscache.pojo.classpath"/ -->
+ <pathelement path="${jboss.dist.server}/all/lib/jbosscache-pojo.jar" />
+ <!-- path refid="jgroups.jgroups.classpath"/ -->
+ <pathelement path="${jboss.dist.server}/all/lib/jgroups.jar" />
+ <!-- path refid="joesnmp.joesnmp.classpath"/ -->
+ <pathelement path="${jboss.dist.common.lib}/joesnmp.jar" />
+ <!-- path refid="junit.junit.classpath"/ -->
+ <pathelement path="${junit.junit.lib}/junit.jar" />
+ <!-- path refid="org.easymock.classpath"/ -->
+ <pathelement path="${org.easymock.lib}/easymock.jar" />
+ <!-- path refid="javassist.classpath"/ -->
+ <pathelement path="${jboss.dist.client}/javaassist.jar" />
+ <!-- path refid="juddi.juddi.classpath"/ -->
+ <pathelement path="${jboss.dist.server}/all/deploy/juddi-service.sar/juddi.jar" />
+ <!-- path refid="nekohtml.nekohtml.classpath"/ -->
+ <pathelement path="${nekohtml.nekohtml.lib}/nekohtml.jar" />
+ <!-- path refid="objectweb.joramtests.classpath"/ -->
+ <pathelement path="${objectweb.joramtests.lib}/joramtests.jar" />
+ <!-- path refid="opensaml.opensaml.classpath"/ -->
+ <pathelement path="${opensaml.opensaml.lib}/opensaml.jar" />
+ <!-- path refid="oswego.concurrent.classpath"/ -->
+ <pathelement path="${jboss.dist.client}/concurrent.jar" />
+ <!-- path refid="sleepycat.classpath"/ -->
+ <pathelement path="${sleepycat.sleepycat.lib}/je.jar" />
+ <!-- path refid="sun.jaf.classpath"/ -->
+ <pathelement path="${jboss.dist.client}/activation.jar" />
+ <!-- path refid="sun.javamail.classpath"/ -->
+ <pathelement path="${jboss.dist.client}/mail.jar" />
+ <!-- path refid="sun.jaxb.classpath"/ -->
+ <pathelement path="${jboss.dist.client}/jaxb-api.jar" />
+ <pathelement path="${jboss.dist.client}/jaxb-impl.jar" />
+ <pathelement path="${jboss.dist.client}/jaxb-xjc.jar" />
+ <!-- path refid="sun.jsf.classpath"/ -->
+ <pathelement path="${jboss.dist.server}/all/deploy/jbossweb.sar/jsf-libs/jsf-api.jar" />
+ <pathelement path="${jboss.dist}/all/deploy/jbossweb.sar/jsf-libs/jsf-impl.jar" />
+ <!-- jboss.web.classpath -->
+ <pathelement path="${jboss.dist.common.lib}/el-api.jar" />
+ <pathelement path="${jboss.dist}/all/deploy/jbossweb.sar/jasper-jdt.jar" />
+ <pathelement path="${jboss.dist}/all/deploy/jbossweb.sar/jbossweb.jar" />
+ <pathelement path="${jboss.dist.common.lib}/jsp-api.jar" />
+ <pathelement path="${jboss.dist.common.lib}/servlet-api.jar" />
+ <!-- path refid="trove.classpath"/ -->
+ <pathelement path="${jboss.dist.client}/trove.jar" />
+ <!-- path refid="wutka.dtdparser.classpath"/ -->
+ <pathelement path="${wutka.dtdparser.lib}/dtdparser.jar" />
+ <pathelement path="${jboss.dist.common.lib}/dtdparser121.jar" />
+ <!-- path refid="woodstox.woodstox.classpath"/ -->
+ <pathelement path="${jboss.dist.client}/wstx.jar" />
+ <!-- path refid="org.jboss.cluster.classpath" -->
+ <pathelement path="${jboss.dist.client}/jboss-ha-client.jar" />
+ <pathelement path="${jboss.dist.common.lib}/jboss-ha-server-api.jar" />
+ <pathelement path="${jboss.dist.common.lib}/jboss-ha-server-cache-jbc.jar" />
+ <pathelement path="${jboss.dist.common.lib}/jboss-ha-server-cache-spi.jar" />
+ <!-- path refid="org.jboss.jaxr.classpath"/ -->
+ <pathelement path="${jboss.dist.server}/all/deploy/juddi-service.sar/juddi-saaj.jar" />
+ <pathelement path="${jboss.dist.server}/all/deploy/juddi-service.sar/juddi-service.jar" />
+ <!-- path refid="jboss.remoting.classpath"/ -->
+ <pathelement path="${jboss.dist.client}/jboss-remoting.jar" />
+ <!-- path refid="jboss.serialization.classpath"/ -->
+ <pathelement path="${jboss.dist.client}/jboss-serialization.jar" />
+ <!-- path refid="jboss.jboss.ejb3.core.classpath" / -->
+ <pathelement path="${jboss.dist.client}/jboss-ejb3-core-client.jar" />
+ <pathelement path="${jboss.dist.common.lib}/jboss-ejb3-core.jar" />
+ <!-- path refid="jboss.jboss.ejb3.ext.api.classpath" / -->
+ <pathelement path="${jboss.dist.client}/jboss-ejb3-ext-api.jar" />
+ <!-- path refid="jboss.jboss.ejb3.proxy.impl.classpath" / -->
+ <pathelement path="${jboss.dist.client}/jboss-ejb3-proxy-impl-client.jar" />
+ <pathelement path="${jboss.dist.common.lib}/jboss-ejb3-proxy-impl.jar" />
+ <!-- path refid="jboss.jboss.ejb3.proxy.spi.classpath" / -->
+ <pathelement path="${jboss.dist.client}/jboss-ejb3-proxy-spi-client.jar" />
+ <pathelement path="${jboss.dist.common.lib}/jboss-ejb3-proxy-spi.jar" />
+ <!-- path refid="ejb3-persistence.classpath"/ -->
+ <pathelement path="${jboss.dist.client}/hibernate-annotations.jar" />
+ <pathelement path="${jboss.dist.client}/ejb3-persistence.jar" />
+ <pathelement path="${jboss.dist.common.lib}/hibernate-entitymanager.jar" />
+ <!-- path refid="org.jboss.ws.native.classpath"/ -->
+ <pathelement path="${jboss.dist.client}/jbossws-native-client.jar" />
+ <pathelement path="${jboss.dist.client}/jbossws-native-core.jar" />
+ <pathelement path="${jboss.dist.client}/jbossws-native-jaxrpc.jar" />
+ <pathelement path="${jboss.dist.client}/jbossws-native-jaxws-ext.jar" />
+ <pathelement path="${jboss.dist.client}/jbossws-native-jaxws.jar" />
+ <pathelement path="${org.jboss.ws.native.lib}/jbossws-native-management.war" />
+ <pathelement path="${org.jboss.ws.native.lib}/jbossws-native-resources.jar" />
+ <pathelement path="${jboss.dist.client}/jbossws-native-saaj.jar" />
+ <!-- path refid="org.jboss.ws.classpath"/ -->
+ <pathelement path="${jboss.dist.client}/jbossws-common.jar" />
+ <pathelement path="${jboss.dist.client}/jbossws-framework.jar" />
+ <pathelement path="${jboss.dist.client}/jbossws-spi.jar" />
+ <!-- path refid="jboss.jbossxb.classpath"/ -->
+ <pathelement path="${jboss.dist.client}/jboss-xml-binding.jar" />
+ <!-- path refid="jboss.metadata.classpath"/ -->
+ <pathelement path="${jboss.dist.client}/jboss-metadata.jar" />
+ <!-- path refid="jboss.integration.classpath"/ -->
+ <pathelement path="${jboss.dist.lib}/jboss-classloading.jar" />
+ <pathelement path="${jboss.integration.lib}/jboss-corba-ots-spi.jar" />
+ <pathelement path="${jboss.integration.lib}/jboss-deployment-spi.jar" />
+ <pathelement path="${jboss.dist.client}/jboss-integration.jar" />
+ <pathelement path="${jboss.integration.lib}/jboss-transaction-spi.jar" />
+ <!-- path refid="jboss.profileservice.spi.classpath"/ -->
+ <pathelement path="${jboss.dist.lib}/jboss-profileservice-spi.jar" />
+ <!-- path refid="stax.api.classpath"/ -->
+ <pathelement path="${jboss.dist.lib.endorsed}/stax-api.jar" />
+ <!-- needed for messaging JMS provider tests -->
+ <!-- path refid="jboss.messaging.classpath"/ -->
+ <pathelement path="${jboss.dist.client}/jboss-messaging-client.jar" />
+ <pathelement path="${jboss.dist.common.lib}/jboss-messaging.jar" />
+ <!-- needed for proxy tests -->
+ <!-- path refid="apache.bcel.classpath"/ -->
+ <pathelement path="${jboss.dist.common.lib}/bcel.jar" />
+ <!-- needed for security login module tests -->
+ <!-- path refid="hsqldb.hsqldb.classpath"/ -->
+ <pathelement path="${jboss.dist.common.lib}/hsqldb.jar" />
+ <!-- Need hibernate jar for hibernate-based tests -->
+ <!-- same as hibernate classpath -->
+ <!-- path refid="hibernate3.classpath"/ -->
+ <pathelement path="${jboss.dist.common.lib}/hibernate-core.jar" />
+ <pathelement path="${jboss.dist.common.lib}/hibernate-jmx.jar" />
+ <!-- path refid="odmg.classpath"/ -->
+ <pathelement path="${odmg.odmg.lib}/odmg-3.0.jar" />
+ <!-- path refid="cglib.classpath"/ -->
+ <pathelement path="${cglib.cglib.lib}/cglib.jar" />
+ <!-- Need spring jar for spring-based tests -->
+ <!-- same as spring.spring.classpath -->
+ <!-- path refid="spring.classpath"/ -->
+ <pathelement path="${spring.spring.lib}/spring-aop.jar" />
+ <pathelement path="${spring.spring.lib}/spring-beans.jar" />
+ <pathelement path="${spring.spring.lib}/spring-context.jar" />
+ <pathelement path="${spring.spring.lib}/spring-core.jar" />
+ <pathelement path="${spring.spring.lib}/spring-web.jar" />
+ <pathelement path="${spring.spring.lib}/spring-webmvc.jar" />
+ <!-- xml binding -->
+ <!-- path refid="xmlunit.xmlunit.classpath"/ -->
+ <pathelement path="${xmlunit.xmlunit.lib}/xmlunit1.0.jar" />
+ <!-- path refid="jboss.jboss.reflect.classpath"/ -->
+ <pathelement path="${jboss.dist.lib}/jboss-reflect.jar" />
+ <!-- path refid="jboss.jboss.mdr.classpath"/ -->
+ <pathelement path="${jboss.dist.client}/jboss-mdr.jar" />
+ <!-- path refid="jboss.jboss.man.classpath"/ -->
+ <pathelement path="${jboss.dist.lib}/jboss-managed.jar" />
+ <pathelement path="${jboss.dist.lib}/jboss-metatype.jar" />
+ <!-- path refid="jboss.jboss.deployers.classpath"/ -->
+ <pathelement path="${jboss.dist.client}/jboss-deployers-client-spi.jar" />
+ <pathelement path="${jboss.dist.client}/jboss-deployers-client.jar" />
+ <pathelement path="${jboss.dist.client}/jboss-deployers-core-spi.jar" />
+ <pathelement path="${jboss.dist.client}/jboss-deployers-core.jar" />
+ <pathelement path="${jboss.dist.lib}/jboss-deployers-impl.jar" />
+ <pathelement path="${jboss.dist.lib}/jboss-deployers-spi.jar" />
+ <pathelement path="${jboss.dist.lib}/jboss-deployers-structure-spi.jar" />
+ <pathelement path="${jboss.dist.client}/jboss-deployers-vfs-spi.jar" />
+ <pathelement path="${jboss.dist.client}/jboss-deployers-vfs.jar" />
+ <!-- path refid="jboss.jboss.cl.classpath"/ -->
+ <pathelement path="${jboss.dist.lib}/jboss-classloader.jar" />
+ <pathelement path="${jboss.dist.lib}/jboss-classloading-vfs.jar" />
+ <pathelement path="${jboss.dist.lib}/jboss-classloading.jar" />
+ <!-- path refid="jboss.microcontainer.classpath"/ -->
+ <pathelement path="${jboss.dist.lib}/jboss-aop-mc-int.jar" />
+ <pathelement path="${jboss.dist.lib}/jboss-dependency.jar" />
+ <pathelement path="${jboss.dist.lib}/jboss-kernel.jar" />
+ <!-- For classloader leak tests -->
+ <!-- path refid="jboss.profiler.jvmti.classpath"/ -->
+ <pathelement path="${jboss.profiler.jvmti.lib}/jboss-profiler-jvmti.jar" />
+ <!-- org.jboss.aspects:jboss-aspects -->
+ <!-- path refid="org.jboss.aspects.classpath"/ -->
+ <pathelement path="${jboss.dist.common.lib}/jboss-current-invocation-aspects.jar" />
+ <pathelement path="${jboss.dist.common.lib}/jboss-remoting-aspects.jar" />
+ <pathelement path="${jboss.dist.common.lib}/jboss-security-aspects.jar" />
+ <pathelement path="${jboss.dist.common.lib}/jboss-transaction-aspects.jar" />
+ <!-- hibernate tests need slfj4 -->
+ <!-- path refid="org.jboss.slf4j.classpath"/ -->
+ <pathelement path="${jboss.dist.client}/slf4j-jboss-logging.jar" />
+ <!-- path refid="org.slf4j.classpath"/ -->
+ <pathelement path="${jboss.dist.client}/slf4j-api.jar" />
+ <!-- JBAS-6934 -->
+ <!-- path refid="net.jcip.classpath"/ -->
+ <pathelement path="${jboss.dist.server}/all/lib/jcip-annotations.jar" />
+ <!-- jbossts crash recovery tests need server manager -->
+ <!-- path refid="jboss.server.manager.classpath"/ -->
+ <pathelement path="${jboss.server.manager.lib}/jboss-server-manager.jar" />
+ <!-- path refid="jboss.jbossts.classpath"/ -->
+ <pathelement path="${jboss.jbossts.lib}/jbossts-integration.jar" />
+ <pathelement path="${jboss.jbossts.lib}/jbossts-jacorb.jar" />
+ <pathelement path="${jboss.jbossts.lib}/jbossts-jts.jar" />
+ <pathelement path="${jboss.jbossts.lib}/jbossts-common.jar" />
+ <pathelement path="${jboss.jbossts.lib}/jbossts-tools.sar" />
+ <pathelement path="${jboss.jbossts.lib}/jbossxts.sar" />
+ </path>
+
<!-- ======= -->
<!-- Modules -->
@@ -216,7 +458,7 @@
<pathelement path="${jboss.server.lib}/jboss-system.jar"/>
</path>
- <!-- The combined dependant module classpath -->
+ <!-- The combined dependant module classpath (for building the testsuite) -->
<path id="dependentmodule.classpath">
<path refid="jboss.aop.classpath"/>
<path refid="jboss.aspects.classpath"/>
@@ -257,6 +499,121 @@
<path refid="jboss.spring.classpath"/>
</path>
+ <!-- the combined dependent modules classpath (for executing the testsuite) -->
+ <path id="distribution.jars.dependentmodule.classpath">
+ <!-- path refid="jboss.aop.classpath"/ -->
+ <pathelement path="${jboss.dist.lib}/jboss-aop-asintegration-core.jar" />
+ <pathelement path="${jboss.dist.lib}/jboss-aop-asintegration-jmx.jar" />
+ <pathelement path="${jboss.dist.lib}/jboss-aop-asintegration-mc.jar" />
+ <pathelement path="${jboss.dist.server}/all/deployers/jboss-aop-jboss5.deployer/jboss-aop-aspects.jar" />
+ <pathelement path="${jboss.dist.client}/jboss-aop-client.jar" />
+ <pathelement path="${jboss.dist.lib}/jboss-aop-deployers.jar" />
+ <pathelement path="${jboss.dist.lib}/jboss-aop.jar" />
+ <pathelement path="${jboss.dist.server}/all/deployers/jboss-aop-jboss5.deployer/jrockit-pluggable-instrumentor.jar" />
+ <pathelement path="${jboss.dist.server}/all/deployers/jboss-aop-jboss5.deployer/pluggable-instrumentor.jar" />
+ <!-- path refid="jboss.aspects.classpath"/ -->
+ <pathelement path="${jboss.dist.server}/all/deployers/jboss-aop-jboss5.deployer/jboss-aspect-library.jar" />
+ <!-- jbossha-httpsession.jar, jbossha-singleton.jar, <some resources> no longer exist -->
+ <!-- path refid="jboss.cluster.classpath"/ -->
+ <pathelement path="${jboss.dist.common.lib}/jbossha.jar" />
+ <!-- path refid="jboss.common.core.classpath"/ -->
+ <pathelement path="${jboss.dist.client}/jboss-common-core.jar" />
+ <!-- path refid="jboss.common.logging.spi.classpath"/ -->
+ <pathelement path="${jboss.dist.client}/jboss-logging-spi.jar" />
+ <!-- path refid="jboss.common.logging.log4j.classpath"/ -->
+ <pathelement path="${jboss.dist.client}/jboss-logging-log4j.jar" />
+ <!-- path refid="jboss.common.logging.jdk.classpath"/ -->
+ <pathelement path="${jboss.dist.client}/jboss-logging-jdk.jar" />
+ <!-- path refid="jboss.deployment.classpath"/ -->
+ <pathelement path="${jboss.dist.client}/jboss-deployment.jar" />
+ <pathelement path="${jboss.dist.common.lib}/jboss-jsr88.jar" />
+ <!-- path refid="jboss.hibernate.classpath"/ -->
+ <pathelement path="${jboss.dist.common.lib}/jboss-hibernate.jar" />
+ <!-- path refid="jboss.iiop.classpath"/ -->
+ <pathelement path="${jboss.dist.common.lib}/jboss-iiop.jar" />
+ <!-- jboss.jar no longer exists-->
+ <!-- path refid="jboss.internal-server.classpath" / -->
+ <pathelement path="${jboss.dist.common.lib}/jboss.jar" />
+ <pathelement path="${jboss.dist.lib}/jboss-main.jar" />
+ <pathelement path="${jboss.dist.lib}/jboss-system.jar" />
+ <!-- path refid="jboss.j2se.classpath"/ -->
+ <pathelement path="${jboss.dist.client}/jboss-j2se.jar" />
+ <!-- path refid="jboss.jboss.jaspi.api.classpath"/ -->
+ <pathelement path="${jboss.dist.client}/jboss-jaspi-api.jar" />
+ <!-- path refid="jboss.jboss.javaee.classpath"/ -->
+ <pathelement path="${jboss.dist.client}/jboss-javaee.jar" />
+ <!-- jboss-ejb-api.jar, jboss-jacc-api.jar, jboss-jad-api.jar, jboss-jca-api.jar, jboss-jms-api.jar, jboss-transaction-api.jar -->
+ <!-- path refid="org.jboss.javaee.classpath" / -->
+ <pathelement path="${org.jboss.javaee.lib}/jboss-ejb-api.jar" />
+ <pathelement path="${org.jboss.javaee.lib}/jboss-jacc-api.jar" />
+ <pathelement path="${org.jboss.javaee.lib}/jboss-jad-api.jar" />
+ <pathelement path="${org.jboss.javaee.lib}/jboss-jca-api.jar" />
+ <pathelement path="${org.jboss.javaee.lib}/jboss-jms-api.jar" />
+ <pathelement path="${org.jboss.javaee.lib}/jboss-transaction-api.jar" />
+ <!-- path refid="jboss.jboss.vfs.classpath"/ -->
+ <pathelement path="${jboss.dist.lib}/jboss-vfs.jar" />
+ <!-- path refid="jboss.jca.classpath"/ -->
+ <pathelement path="${jboss.dist.common.lib}/jboss-jca.jar" />
+ <pathelement path="${jboss.dist.server}/all/deployers/jboss-jca.deployer/jboss-jca-deployer.jar" />
+ <pathelement path="${jboss.jca.lib}/jboss-local-jdbc.jar" />
+ <pathelement path="${jboss.jca.lib.lib}/jboss-ha-local-jdbc.jar" />
+ <pathelement path="${jboss.dist.common.lib}/jboss-common-jdbc-wrapper.jar" />
+ <!-- path refid="jboss.jmx.classpath"/ -->
+ <pathelement path="${jboss.dist.lib}/jboss-jmx.jar" />
+ <!-- path refid="jboss.jmx-remoting.classpath"/ -->
+ <pathelement path="${jboss.dist.common.lib}/jboss-jmx-remoting.jar" />
+ <!-- path refid="jboss.management.classpath"/ -->
+ <pathelement path="${jboss.dist.client}/jboss-jsr77-client.jar" />
+ <pathelement path="${jboss.dist.common.lib}/jboss-jsr77.jar" />
+ <pathelement path="${jboss.dist.common.lib}/jboss-management.jar" />
+ <!-- path refid="jboss.mbeans.classpath"/ -->
+ <pathelement path="${jboss.dist.lib}/jboss-mbeans.jar" />
+ <!-- jbossmq.jar no longer exists -->
+ <!-- path refid="jboss.mq.classpath"/ -->
+ <!-- path refid="jboss.jnpserver.classpath"/ -->
+ <pathelement path="${jboss.dist.common.lib}/jnpserver.jar" />
+ <!-- path refid="jboss.profileservice.classpath"/ -->
+ <pathelement path="${jboss.dist.common.lib}/jboss-profileservice.jar" />
+ <!-- path refid="jboss.jboss.security.spi.classpath"/ -->
+ <pathelement path="${jboss.dist.client}/jboss-security-spi.jar" />
+ <!-- jbosssx.jar -->
+ <!-- path refid="jboss.jbosssx.classpath"/ -->
+ <pathelement path="${jboss.dist.common.lib}/jbosssx.jar" />
+ <!-- path refid="jboss.security.int.classpath"/ -->
+ <pathelement path="${jboss.dist.common.lib}/jbosssx-server.jar" />
+ <!-- path refid="jboss.server.classpath"/ -->
+ <pathelement path="${jboss.dist.common.lib}/jboss.jar" />
+ <pathelement path="${jboss.dist.common.lib}/jmx-adaptor-plugin.jar" />
+ <!-- path refid="jboss.main.classpath"/ -->
+ <pathelement path="${jboss.dist.lib}/jboss-main.jar" />
+ <!-- jboss-bootstrap.jar <from thirdparty> -->
+ <!-- path refid="jboss.jboss.bootstrap.classpath"/ -->
+ <pathelement path="${jboss.dist.lib}/jboss-bootstrap.jar" />
+ <!-- path refid="jboss.system.classpath"/ -->
+ <pathelement path="${jboss.dist.lib}/jboss-system.jar" />
+ <pathelement path="${jboss.dist.lib}/jboss-profileservice-spi.jar" />
+ <!-- path refid="jboss.systemjmx.classpath"/ -->
+ <pathelement path="${jboss.dist.client}/jboss-system-jmx-client.jar" />
+ <pathelement path="${jboss.dist.lib}/jboss-system-jmx.jar" />
+ <!-- path refid="jboss.test.classpath"/ -->
+ <pathelement path="${jboss.test.lib}/jboss-test.jar" />
+ <!-- path refid="jboss.tomcat.classpath"/ -->
+ <pathelement path="${jboss.dist.server}/all/deploy/cluster/jbossweb-cluster.aop" />
+ <pathelement path="${jboss.dist.server}/all/deploy/jbossweb.sar/jboss-web-service.jar" />
+ <pathelement path="${jboss.dist.server}/all/deployers/jbossweb.deployer/jboss-web-deployer.jar" />
+ <!-- path refid="jboss.varia.classpath"/ -->
+ <pathelement path="${jboss.varia.root}/classes"/>
+ <!-- path refid="jboss.web.classpath"/ -->
+ <pathelement path="${jboss.dist.common.lib}/el-api.jar" />
+ <pathelement path="${jboss.dist.server}/all/deploy/jbossweb.sar/jasper-jdt.jar" />
+ <pathelement path="${jboss.dist.server}/all/deploy/jbossweb.sar/jbossweb.jar" />
+ <pathelement path="${jboss.dist.common.lib}/jsp-api.jar" />
+ <pathelement path="${jboss.dist.common.lib}/servlet-api.jar" />
+ <!-- jboss-spring.jar (not copied into distro) -->
+ <!-- path refid="jboss.spring.classpath"/ -->
+ </path>
+
+
<!-- RMI Stub generation -->
<patternset id="rmic.includes"
description="The patternset passed to the compile-stubs target">
@@ -329,7 +686,7 @@
<import file="imports/server-config.xml"/>
<!-- Classpath to build and run the tests -->
- <path id="tests.classpath">
+ <path id="tests.classpath.old">
<fileset dir="${jboss.dist}/client">
<include name="**/*.jar"/>
<exclude name="jaxws-rt.jar"/>
@@ -347,6 +704,29 @@
<path refid="thirdparty.classpath"/>
</path>
+ <!-- Classpath to build and run the tests against the distribution jars-->
+ <path id="tests.classpath">
+ <fileset dir="${jboss.dist}/client">
+ <include name="**/*.jar" />
+ <exclude name="jaxws-rt.jar" />
+ <exclude name="jaxws-tools.jar" />
+ </fileset>
+ <pathelement path="${classpath}" />
+ <pathelement path="${local.classpath}" />
+ <pathelement path="${project.tools}/lib/ant.jar" />
+ <pathelement path="${project.tools}/lib/ant-junit.jar" />
+ <!-- this next path does not exist -->
+ <!-- path refid="jboss.ejb3.classpath"/ -->
+ <!-- path refid="jboss.jmx.classpath"/ -->
+ <pathelement path="${jboss.dist.lib}/jboss-jmx.jar" />
+ <!-- path refid="jboss.jmx-remoting.classpath"/ -->
+ <pathelement path="${jboss.dist.common.lib}/jboss-jmx-remoting.jar" />
+ <path refid="jboss.test.classpath" />
+ <path refid="distribution.jars.library.classpath" />
+ <path refid="distribution.jars.dependentmodule.classpath" />
+ </path>
+
+
<!-- The classpath required to build javadocs. -->
<path id="javadoc.classpath">
<path refid="tests.compile.classpath"/>
@@ -2442,7 +2822,8 @@
<pathelement location="${build.classes}"/>
<pathelement location="${build.resources}"/>
<path refid="tests.classpath"/>
- <path refid="jboss.iiop.classpath"/>
+ <!-- path refid="jboss.iiop.classpath"/ -->
+ <pathelement path="${jboss.dist.common.lib}/jboss-iiop.jar"/>
</classpath>
<!-- formatter type="xml" usefile="${junit.formatter.usefile}"/ -->
@@ -3213,7 +3594,8 @@
<pathelement location="${build.classes}"/>
<pathelement location="${build.resources}"/>
<path refid="tests.classpath"/>
- <path refid="jboss.iiop.classpath"/>
+ <!-- path refid="jboss.iiop.classpath"/ -->
+ <pathelement path="${jboss.dist.common.lib}/jboss-iiop.jar"/>
</classpath>
<formatter type="xml" usefile="${junit.formatter.usefile}"/>
Modified: branches/JBPAPP_5_0/testsuite/imports/sections/classloader.xml
===================================================================
--- branches/JBPAPP_5_0/testsuite/imports/sections/classloader.xml 2009-08-20 16:45:42 UTC (rev 92614)
+++ branches/JBPAPP_5_0/testsuite/imports/sections/classloader.xml 2009-08-20 17:44:58 UTC (rev 92615)
@@ -130,7 +130,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">
@@ -165,7 +165,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/JBPAPP_5_0/testsuite/imports/sections/cts.xml
===================================================================
--- branches/JBPAPP_5_0/testsuite/imports/sections/cts.xml 2009-08-20 16:45:42 UTC (rev 92614)
+++ branches/JBPAPP_5_0/testsuite/imports/sections/cts.xml 2009-08-20 17:44:58 UTC (rev 92615)
@@ -86,7 +86,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">
@@ -153,7 +153,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/JBPAPP_5_0/testsuite/imports/server-config.xml
===================================================================
--- branches/JBPAPP_5_0/testsuite/imports/server-config.xml 2009-08-20 16:45:42 UTC (rev 92614)
+++ branches/JBPAPP_5_0/testsuite/imports/server-config.xml 2009-08-20 17:44:58 UTC (rev 92615)
@@ -5,13 +5,10 @@
<project name="server-config" default="help"
xmlns:server="http://jboss.org/ns/test/ant/server">
- <property name="version" value="${version.major}.${version.minor}.${version.revision}.${version.tag}"/>
<!-- Use the ${/} platform seperator in jboss.dist, jboss.test.deploy.dir as
this is used in the security policy file property references and needs to
be valid for the platform.
-->
- <property name="jboss.dist"
- value="${project.root}${/}build${/}output${/}jboss-${version}"/>
<property name="jboss.test.deploy.dir"
value="${project.root}${/}testsuite${/}output${/}lib"/>
<!-- Override for non-Sun compatible JDK layouts -->
More information about the jboss-cvs-commits
mailing list