[jbossws-commits] JBossWS SVN: r3175 - in trunk: integration/jbws/ant-import and 1 other directories.

Author: thomas.diesler(a)jboss.com Date: 2007-05-22 04:06:27 -0400 (Tue, 22 May 2007) New Revision: 3175 Modified: trunk/build/ant-import/build-setup.xml trunk/integration/jbws/ant-import/build-testsuite.xml trunk/integration/jbws/src/test/resources/excludes-jboss42.txt Log: Fix jboss42 test classpath Modified: trunk/build/ant-import/build-setup.xml =================================================================== --- trunk/build/ant-import/build-setup.xml 2007-05-22 07:40:33 UTC (rev 3174) +++ trunk/build/ant-import/build-setup.xml 2007-05-22 08:06:27 UTC (rev 3175) @@ -44,7 +44,9 @@ <property name="jboss42.server.lib" value="${jboss42.server}/lib"/> <property name="jboss42.server.deploy" value="${jboss42.server}/deploy"/> <property name="jboss42.thirdparty" value="${jboss42.home}/../../../thirdparty"/> - + + <property name="jbossws.integration.${jbossws.integration.target}" value="true"/> + <property name="jboss50.available.file" value="${jboss50.client}/jboss-ejb3-client.jar"/> <property name="jboss42.available.file" value="${jboss42.client}/jboss-client.jar"/> Modified: trunk/integration/jbws/ant-import/build-testsuite.xml =================================================================== --- trunk/integration/jbws/ant-import/build-testsuite.xml 2007-05-22 07:40:33 UTC (rev 3174) +++ trunk/integration/jbws/ant-import/build-testsuite.xml 2007-05-22 08:06:27 UTC (rev 3175) @@ -23,8 +23,7 @@ <!-- Init the various classpaths --> - <target name="tests-init" depends="tests-prepare"> - + <target name="tests-init" depends="tests-init-jboss50,tests-init-jboss42"> <path id="jbossws.classpath"> <pathelement location="${core.dir}/output/lib/jboss-jaxrpc.jar"/> <pathelement location="${core.dir}/output/lib/jboss-jaxws.jar"/> @@ -32,8 +31,9 @@ <pathelement location="${core.dir}/output/lib/jbossws-core.jar"/> <pathelement location="${core.dir}/output/lib/jbossws-client.jar"/> </path> - - <!-- The combined compile classpath --> + </target> + + <target name="tests-init-jboss50" depends="tests-prepare" if="jbossws.integration.jboss50"> <path id="javac.classpath"> <path refid="jbossws.classpath"/> <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> @@ -47,8 +47,6 @@ <pathelement location="${jboss.server.lib}/jboss-javaee.jar"/> <pathelement location="${jboss.server.lib}/jbosssx.jar"/> </path> - - <!-- The test client classpath --> <path id="tests.client.classpath"> <pathelement location="${jboss.client}/javassist.jar"/> <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/> @@ -59,7 +57,30 @@ <pathelement location="${jboss.client}/jbossall-client.jar"/> <path refid="javac.classpath"/> </path> - </target> + <target name="tests-init-jboss42" depends="tests-prepare" if="jbossws.integration.jboss42"> + <path id="javac.classpath"> + <path refid="jbossws.classpath"/> + <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> + <pathelement location="${jboss.client}/activation.jar"/> + <pathelement location="${jboss.client}/jaxb-api.jar"/> + <pathelement location="${jboss.client}/jaxb-impl.jar"/> + <pathelement location="${jboss.client}/jboss-common-client.jar"/> + <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> + <pathelement location="${jboss.client}/jboss-ejb3x.jar"/> + <pathelement location="${jboss.client}/jbosssx-client.jar"/> + </path> + <path id="tests.client.classpath"> + <pathelement location="${jboss.client}/javassist.jar"/> + <pathelement location="${jboss.client}/jboss-annotations-ejb3.jar"/> + <pathelement location="${jboss.client}/jboss-xml-binding.jar"/> + <pathelement location="${jboss.client}/mail.jar"/> + <pathelement location="${jboss.client}/wsdl4j.jar"/> + <pathelement location="${jboss.client}/log4j.jar"/> + <pathelement location="${jboss.client}/jbossall-client.jar"/> + <path refid="javac.classpath"/> + </path> + </target> + </project> Modified: trunk/integration/jbws/src/test/resources/excludes-jboss42.txt =================================================================== --- trunk/integration/jbws/src/test/resources/excludes-jboss42.txt 2007-05-22 07:40:33 UTC (rev 3174) +++ trunk/integration/jbws/src/test/resources/excludes-jboss42.txt 2007-05-22 08:06:27 UTC (rev 3175) @@ -1,2 +1,12 @@ -# Nothing to exclude +org/jboss/test/ws/jaxws/samples/context/** +org/jboss/test/ws/jaxws/samples/handlerchain/** +org/jboss/test/ws/jaxws/samples/httpbinding/** +org/jboss/test/ws/jaxws/samples/jaxr/** +org/jboss/test/ws/jaxws/samples/jsr181ejb/** +org/jboss/test/ws/jaxws/samples/logicalhandler/** +org/jboss/test/ws/jaxws/samples/provider/** +org/jboss/test/ws/jaxws/samples/retail/** +org/jboss/test/ws/jaxws/samples/webservice/** +org/jboss/test/ws/jaxws/samples/webserviceref/** +org/jboss/test/ws/jaxws/samples/wssecurity/**