Author: alessio.soldano(a)jboss.com Date: 2011-11-09 09:42:17 -0500 (Wed, 09 Nov 2011) New Revision: 15225 Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml Log: Split test-client-classpath declarations for jboss700 and jboss710 Modified: shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml =================================================================== --- shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2011-11-09 12:55:29 UTC (rev 15224) +++ shared-testsuite/trunk/testsuite/src/test/ant-import/build-testsuite.xml 2011-11-09 14:42:17 UTC (rev 15225) @@ -108,7 +108,7 @@ </tstamp> </target> - <target name="tests-classpath" depends="tests-classpath-jboss70,tests-classpath-jboss60"> + <target name="tests-classpath" depends="tests-classpath-jboss710,tests-classpath-jboss700,tests-classpath-jboss60"> <path id="tests.javac.classpath"> <path refid="ws.stack.classpath"/> <path refid="integration.target.javac.classpath"/> @@ -199,7 +199,7 @@ </path> </target> - <target name="tests-classpath-jboss70" depends="tests-prepare" if="jbossws.integration.jboss70"> + <target name="tests-classpath-jboss700" depends="tests-prepare" if="jbossws.integration.jboss700"> <path id="integration.target.javac.classpath"> <fileset dir="${jboss.home}/modules/javax/activation/api/main/"> @@ -309,6 +309,127 @@ <fileset dir="${jboss.home}/modules/org/jboss/sasl/main/"> <include name="jboss-sasl-*.jar"/> </fileset> + <fileset dir="${jboss.home}/modules/org/jboss/xnio/main/"> + <include name="xnio-api-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/jboss/xnio/nio/main/"> + <include name="xnio-nio-*.jar"/> + </fileset> + <pathelement location="${tools.jar}"/> + </path> + </target> + + + <target name="tests-classpath-jboss710" depends="tests-prepare" if="jbossws.integration.jboss710"> + + <path id="integration.target.javac.classpath"> + <fileset dir="${jboss.home}/modules/javax/activation/api/main/"> + <include name="activation-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/javax/mail/api/main/"> + <include name="mail-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/jboss/common-core/main/"> + <include name="jboss-common-core-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/jboss/logging/main/"> + <include name="jboss-logging-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/javax/ejb/api/main/"> + <include name="jboss-ejb-api_3.1_spec-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/jboss/ejb3/main/"> + <include name="jboss-ejb3-ext-api-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/javax/servlet/api/main/"> + <include name="jboss-servlet-api_3.0_spec-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/javax/annotation/api/main/"> + <include name="jboss-annotations-api_1.1_spec-*.jar"/> + </fileset> + </path> + + <!-- + The 's.client.classpath' contains jars that are available in the target container's client directory. + There jars apply to all supported stacks. It MUST NOT contains jars from a local thirdparty dir. + + The 'ws.stack.classpath' contains jars that come with a specific stack distribution. + The 's.extra.classpath' contains stack specific jars that are needed to run the stack specific tests. + --> + <path id="integration.target.client.classpath"> + <pathelement location="${thirdparty.dir}/jboss-as-webservices-tests-integration.jar"/> <!-- included from thirdparty local dir as it's not installed on AS --> + <pathelement location="${thirdparty.dir}/jbossws-shared-testsuite.jar"/> <!-- included from thirdparty local dir as it's not installed on AS --> + <pathelement location="${thirdparty.dir}/jnp-client.jar"/> <!-- included from thirdparty local dir as it's not installed on AS --> + <pathelement location="${jboss.home}/jboss-modules.jar"/> + <fileset dir="${jboss.home}/modules/org/jboss/logging/main/"> + <include name="jboss-logging-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/jboss/as/controller/main/"> + <include name="jboss-as-controller-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/jboss/as/controller-client/main/"> + <include name="jboss-as-controller-client-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/jboss/as/server/main/"> + <include name="jboss-as-server-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/jboss/as/protocol/main/"> + <include name="jboss-as-protocol-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/jboss/dmr/main/"> + <include name="jboss-dmr-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/jboss/marshalling/main/"> + <include name="jboss-marshalling-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/slf4j/main/"> + <include name="slf4j-api-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/slf4j/jcl-over-slf4j/main/"> + <include name="jcl-over-slf4j-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/slf4j/impl/main/"> + <include name="slf4j-jboss-logmanager-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/jboss/logmanager/main/"> + <include name="jboss-logmanager-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/apache/log4j/main/"> + <include name="log4j-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/javax/mail/api/main/"> + <include name="mail-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/javax/servlet/api/main/"> + <include name="jboss-servlet-api_3.0_spec-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/jboss/threads/main/"> + <include name="jboss-threads-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/picketbox/main/"> + <include name="picketbox-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/javax/ejb/api/main/"> + <include name="jboss-ejb-api_3.1_spec-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/apache/xerces/main/"> + <include name="xercesImpl-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/jboss/common-core/main/"> + <include name="jboss-common-core-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/javassist/main/"> + <include name="javassist-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/javax/security/jacc/api/main/"> + <include name="jboss-jacc-api*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/jboss/remoting3/main/"> + <include name="jboss-remoting-*.jar"/> + </fileset> + <fileset dir="${jboss.home}/modules/org/jboss/sasl/main/"> + <include name="jboss-sasl-*.jar"/> + </fileset> <!-- START ## jaxrpc tests ## --> <fileset dir="${jboss.home}/modules/org/jboss/netty/main/"> <include name="netty-*.jar"/>