[jbossws-commits] JBossWS SVN: r1738 - in trunk/jbossws: . src/test src/test/ant

Author: thomas.diesler(a)jboss.com Date: 2006-12-22 08:51:18 -0500 (Fri, 22 Dec 2006) New Revision: 1738 Modified: trunk/jbossws/.classpath trunk/jbossws/build.xml trunk/jbossws/src/test/ant/build-jars-jaxrpc.xml trunk/jbossws/src/test/ant/build-jars-jaxws.xml trunk/jbossws/src/test/build.xml Log: restructure test build Modified: trunk/jbossws/.classpath =================================================================== --- trunk/jbossws/.classpath 2006-12-22 13:51:13 UTC (rev 1737) +++ trunk/jbossws/.classpath 2006-12-22 13:51:18 UTC (rev 1738) @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> <classpathentry kind="src" path="src/main/java"/> - <classpathentry kind="src" path="src/test/java"/> + <classpathentry kind="src" path="output/tests/wstools/java"/> + <classpathentry excluding="org/jboss/test/ws/interop/" kind="src" path="src/test/java"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/jboss-5.0.x"/> <classpathentry combineaccessrules="false" kind="src" path="/build"/> Modified: trunk/jbossws/build.xml =================================================================== --- trunk/jbossws/build.xml 2006-12-22 13:51:13 UTC (rev 1737) +++ trunk/jbossws/build.xml 2006-12-22 13:51:18 UTC (rev 1738) @@ -25,11 +25,6 @@ <property name="jbossws.output.classes14.dir" value="${jbossws.output.dir}/classes14"/> <property name="jbossws.output.lib.dir" value="${jbossws.output.dir}/lib"/> - <property name="test.dir" value="${basedir}/src/test"/> - <property name="test.etc.dir" value="${test.dir}/etc"/> - <property name="test.jbossws.java.dir" value="${test.dir}/java"/> - <property name="test.jbossws.resources.dir" value="${test.dir}/resources"/> - <target name="jbossws-init" depends="prepare, thirdparty"> </target> Modified: trunk/jbossws/src/test/ant/build-jars-jaxrpc.xml =================================================================== --- trunk/jbossws/src/test/ant/build-jars-jaxrpc.xml 2006-12-22 13:51:13 UTC (rev 1737) +++ trunk/jbossws/src/test/ant/build-jars-jaxrpc.xml 2006-12-22 13:51:18 UTC (rev 1738) @@ -19,59 +19,59 @@ <target name="build-jars" description="Build the jaxrpc deployments"> <!-- jaxrpc-anonymous --> - <war warfile="${build.tests.dir}/libs/jaxrpc-anonymous.war" webxml="${build.tests.dir}/resources/jaxrpc/anonymous/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-anonymous.war" webxml="${test.output.dir}/resources/jaxrpc/anonymous/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestBean.class"/> <include name="org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestService.class"/> <include name="org/jboss/test/ws/jaxrpc/anonymous/ComplexTypeRoot.class"/> <include name="org/jboss/test/ws/jaxrpc/anonymous/ElementTypeRoot.class"/> <include name="org/jboss/test/ws/jaxrpc/anonymous/ElementTypeInside.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/anonymous/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/anonymous/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${build.tests.dir}/libs/jaxrpc-anonymous-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar destfile="${test.output.dir}/libs/jaxrpc-anonymous-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/anonymous/AnonymousTypesTestService.class"/> <include name="org/jboss/test/ws/jaxrpc/anonymous/ComplexTypeRoot.class"/> <include name="org/jboss/test/ws/jaxrpc/anonymous/ElementTypeRoot.class"/> <include name="org/jboss/test/ws/jaxrpc/anonymous/ElementTypeInside.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/anonymous/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/anonymous/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/anonymous/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/anonymous/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> </jar> <!-- jaxrpc-benchmark --> - <war warfile="${build.tests.dir}/libs/jaxrpc-benchmark-rpclit.war" webxml="${build.tests.dir}/resources/jaxrpc/benchmark/rpclit/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-benchmark-rpclit.war" webxml="${test.output.dir}/resources/jaxrpc/benchmark/rpclit/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*_*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*EJBEndpoint.class"/> <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*TestCase.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/benchmark/rpclit/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/benchmark/rpclit/WEB-INF"> <include name="jboss-web.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-benchmark-rpclit.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-benchmark-rpclit.jar"> + <fileset dir="${test.output.dir}/classes"> <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*_*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*JSEEndpoint.class"/> <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*TestCase.class"/> <include name="org/jboss/test/ws/jaxrpc/benchmark/**/*"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/benchmark/rpclit/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/benchmark/rpclit/META-INF"> <include name="ejb-jar.xml"/> <include name="jboss.xml"/> <include name="jaxrpc-mapping.xml"/> @@ -79,42 +79,42 @@ <include name="wsdl/**"/> </metainf> </jar> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-benchmark-rpclit-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-benchmark-rpclit-client.jar"> + <fileset dir="${test.output.dir}/classes"> <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*_*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*JSEEndpoint.class"/> <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*EJBEndpoint.class"/> <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*TestCase.class"/> <include name="org/jboss/test/ws/jaxrpc/benchmark/**/*"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/benchmark/rpclit/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/benchmark/rpclit/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> </jar> - <war warfile="${build.tests.dir}/libs/jaxrpc-benchmark-doclit.war" webxml="${build.tests.dir}/resources/jaxrpc/benchmark/doclit/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-benchmark-doclit.war" webxml="${test.output.dir}/resources/jaxrpc/benchmark/doclit/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*_arr*/**"/> <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*EJBEndpoint.class"/> <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*TestCase.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/benchmark/doclit/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/benchmark/doclit/WEB-INF"> <include name="jboss-web.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-benchmark-doclit.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-benchmark-doclit.jar"> + <fileset dir="${test.output.dir}/classes"> <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*_arr*/**"/> <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*JSEEndpoint.class"/> <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*TestCase.class"/> <include name="org/jboss/test/ws/jaxrpc/benchmark/**/*"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/benchmark/doclit/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/benchmark/doclit/META-INF"> <include name="ejb-jar.xml"/> <include name="jboss.xml"/> <include name="jaxrpc-mapping.xml"/> @@ -122,15 +122,15 @@ <include name="wsdl/**"/> </metainf> </jar> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-benchmark-doclit-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-benchmark-doclit-client.jar"> + <fileset dir="${test.output.dir}/classes"> <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*_arr*/**"/> <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*JSEEndpoint.class"/> <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*EJBEndpoint.class"/> <exclude name="org/jboss/test/ws/jaxrpc/benchmark/*TestCase.class"/> <include name="org/jboss/test/ws/jaxrpc/benchmark/**/*"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/benchmark/doclit/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/benchmark/doclit/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="jaxrpc-mapping.xml"/> @@ -139,245 +139,245 @@ </jar> <!-- jaxrpc-encoded-marshalltest.war --> - <war warfile="${build.tests.dir}/libs/jaxrpc-encoded-marshalltest.war" webxml="${build.tests.dir}/resources/jaxrpc/encoded/marshalltest/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-encoded-marshalltest.war" webxml="${test.output.dir}/resources/jaxrpc/encoded/marshalltest/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/encoded/marshalltest/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/encoded/marshalltest/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/encoded/marshalltest/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-encoded-marshalltest-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-encoded-marshalltest-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/encoded/marshalltest/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestImpl.class"/> <exclude name="org/jboss/test/ws/jaxrpc/encoded/marshalltest/MarshallTestCase.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/encoded/marshalltest/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/encoded/marshalltest/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/encoded/marshalltest/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/encoded/marshalltest/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> </jar> <!-- jaxrpc-encoded-parametermode.war --> - <war warfile="${build.tests.dir}/libs/jaxrpc-encoded-parametermode.war" webxml="${build.tests.dir}/resources/jaxrpc/encoded/parametermode/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-encoded-parametermode.war" webxml="${test.output.dir}/resources/jaxrpc/encoded/parametermode/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/encoded/parametermode/*.class"/> <include name="org/jboss/test/ws/jaxrpc/encoded/parametermode/holders/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/encoded/parametermode/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/encoded/parametermode/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-encoded-parametermode-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-encoded-parametermode-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/encoded/parametermode/*.class"/> <include name="org/jboss/test/ws/jaxrpc/encoded/parametermode/holders/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestImpl.class"/> <exclude name="org/jboss/test/ws/jaxrpc/encoded/parametermode/ParameterModeTestCase.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/encoded/parametermode/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/encoded/parametermode/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/encoded/parametermode/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/encoded/parametermode/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> </jar> <!-- jaxrpc-enventry.war --> - <war warfile="${build.tests.dir}/libs/jaxrpc-enventry.war" webxml="${build.tests.dir}/resources/jaxrpc/enventry/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-enventry.war" webxml="${test.output.dir}/resources/jaxrpc/enventry/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryTestService.class"/> <include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryBeanJSE.class"/> <include name="org/jboss/test/ws/jaxrpc/enventry/ServerSideHandler.class"/> <include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryHandler.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/enventry/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/enventry/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-enventry.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-enventry.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryTestService.class"/> <include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryBeanEJB.class"/> <include name="org/jboss/test/ws/jaxrpc/enventry/ServerSideHandler.class"/> <include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryHandler.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/enventry/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/enventry/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/enventry/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/enventry/META-INF"> <include name="ejb-jar.xml"/> <include name="webservices.xml"/> </metainf> </jar> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-enventry-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-enventry-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryTestService.class"/> <include name="org/jboss/test/ws/jaxrpc/enventry/ClientSideHandler.class"/> <include name="org/jboss/test/ws/jaxrpc/enventry/EnvEntryHandler.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/enventry/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/enventry/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/enventry/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/enventry/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> </jar> <!-- jaxrpc-jbws231 --> - <war warfile="${build.tests.dir}/libs/jaxrpc-jbws231.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws231/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-jbws231.war" webxml="${test.output.dir}/resources/jaxrpc/jbws231/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws231/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws231/TestEndpointImpl.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws231/EyeColorType.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws231/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/jbws231/WEB-INF"> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws231-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar destfile="${test.output.dir}/libs/jaxrpc-jbws231-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws231/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws231/EyeColorType.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws231/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/jbws231/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws231/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/jbws231/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> </jar> <!-- jaxrpc-jbws434 --> - <war warfile="${build.tests.dir}/libs/jaxrpc-jbws434.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws434/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-jbws434.war" webxml="${test.output.dir}/resources/jaxrpc/jbws434/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws434/TestServiceEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws434/TestServiceEndpointImpl.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws434/ArrayOfAny*.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws434/TypeOfAny*.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws434/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/jbws434/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws434-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar destfile="${test.output.dir}/libs/jaxrpc-jbws434-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws434/TestServiceEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws434/ArrayOfAny*.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws434/TypeOfAny*.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws434/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/jbws434/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws434/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/jbws434/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> </jar> <!-- jaxrpc-jbws718 --> - <war warfile="${build.tests.dir}/libs/jaxrpc-jbws718.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws718/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-jbws718.war" webxml="${test.output.dir}/resources/jaxrpc/jbws718/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws718/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws718/*TestCase.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws718/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/jbws718/WEB-INF"> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws718-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar destfile="${test.output.dir}/libs/jaxrpc-jbws718-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws718/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws718/*TestCase.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws718/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/jbws718/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws718/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/jbws718/WEB-INF"> <include name="wsdl/**"/> <include name="jaxrpc-mapping.xml"/> </metainf> </jar> <!-- jaxrpc-jbws720 --> - <war warfile="${build.tests.dir}/libs/jaxrpc-jbws720.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws720/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-jbws720.war" webxml="${test.output.dir}/resources/jaxrpc/jbws720/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws720/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws720/*TestCase.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws720/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/jbws720/WEB-INF"> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws720-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar destfile="${test.output.dir}/libs/jaxrpc-jbws720-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws720/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws720/*Impl.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws720/*TestCase.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws720/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/jbws720/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws720/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/jbws720/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> </jar> <!-- jaxrpc-jbws732 --> - <war warfile="${build.tests.dir}/libs/jaxrpc-jbws732.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws732/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-jbws732.war" webxml="${test.output.dir}/resources/jaxrpc/jbws732/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws732/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws732/*TestCase.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws732/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/jbws732/WEB-INF"> <include name="bare-mapping.xml"/> <include name="wrapped-mapping.xml"/> <include name="webservices.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws732-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar destfile="${test.output.dir}/libs/jaxrpc-jbws732-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws732/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws732/*TestCase.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws732/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/jbws732/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws732/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/jbws732/WEB-INF"> <include name="bare-mapping.xml"/> <include name="wrapped-mapping.xml"/> <include name="wsdl/**"/> @@ -385,40 +385,40 @@ </jar> <!-- jaxrpc-jws775 --> - <war destfile="${build.tests.dir}/libs/jaxrpc-jbws775.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws775/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war destfile="${test.output.dir}/libs/jaxrpc-jbws775.war" webxml="${test.output.dir}/resources/jaxrpc/jbws775/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws775/*"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws775/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/jbws775/WEB-INF"> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws775-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar destfile="${test.output.dir}/libs/jaxrpc-jbws775-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws775/*"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws775/*Impl.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws775/JBWS775TestCase.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws775/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/jbws775/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws775/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/jbws775/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> </jar> <!-- jaxrpc-jbws801 --> - <war warfile="${build.tests.dir}/libs/jaxrpc-jbws801.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws801/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-jbws801.war" webxml="${test.output.dir}/resources/jaxrpc/jbws801/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws801/LargeAttachmentImpl.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws801/LargeAttachment.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws801/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/jbws801/WEB-INF"> <include name="wsdl/LargeAttachment.wsdl"/> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> @@ -426,67 +426,67 @@ </war> <!-- jaxrpc-jbws807 --> - <war warfile="${build.tests.dir}/libs/jaxrpc-jbws807.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws807/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-jbws807.war" webxml="${test.output.dir}/resources/jaxrpc/jbws807/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws807/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws807/*TestCase.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws807/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/jbws807/WEB-INF"> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws807-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar destfile="${test.output.dir}/libs/jaxrpc-jbws807-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws807/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws807/*TestCase.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws807/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/jbws807/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws807/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/jbws807/WEB-INF"> <include name="wsdl/**"/> <include name="jaxrpc-mapping.xml"/> </metainf> </jar> <!-- jaxrpc-jbws812 --> - <war warfile="${build.tests.dir}/libs/jaxrpc-jbws812.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws812/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-jbws812.war" webxml="${test.output.dir}/resources/jaxrpc/jbws812/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws812/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws812/TestEndpointImpl.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws812/ServerHandler.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws812/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/jbws812/WEB-INF"> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws812-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar destfile="${test.output.dir}/libs/jaxrpc-jbws812-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws812/TestEndpoint.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws812/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/jbws812/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws812/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/jbws812/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> </jar> <!-- jaxrpc-jbws950 --> - <war warfile="${build.tests.dir}/libs/jaxrpc-jbws950.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws950/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-jbws950.war" webxml="${test.output.dir}/resources/jaxrpc/jbws950/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws950/TestEndpointImpl.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws950/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws950/UserType.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws950/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/jbws950/WEB-INF"> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> @@ -494,14 +494,14 @@ </war> <!-- jaxrpc-jbws956 --> - <war warfile="${build.tests.dir}/libs/jaxrpc-jbws956.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws956/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-jbws956.war" webxml="${test.output.dir}/resources/jaxrpc/jbws956/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws956/TestEndpointImpl.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws956/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws956/StringArray.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws956/StringArrayArray.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws956/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/jbws956/WEB-INF"> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> @@ -509,43 +509,43 @@ </war> <!-- jaxrpc-jbws1010 --> - <war warfile="${build.tests.dir}/libs/jaxrpc-jbws1010.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws1010/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-jbws1010.war" webxml="${test.output.dir}/resources/jaxrpc/jbws1010/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1010/InheritenceChildInterface.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1010/InheritenceParentInterface.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1010/TestEndpointImpl.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1010/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/jbws1010/WEB-INF"> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws1010-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar destfile="${test.output.dir}/libs/jaxrpc-jbws1010-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1010/InheritenceChildInterface.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1010/InheritenceParentInterface.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1010/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/jbws1010/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1010/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/jbws1010/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> </jar> <!-- jaxrpc-jbws1011 --> - <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws1011.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar destfile="${test.output.dir}/libs/jaxrpc-jbws1011.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1011/SimpleEntityLocal.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1011/SimpleEntityHome.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1011/SimpleEntityBean.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1011/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1011/TestEndpointBean.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1011/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/jbws1011/META-INF"> <include name="ejb-jar.xml"/> <include name="jbosscmp-jdbc.xml"/> <include name="jaxrpc-mapping.xml"/> @@ -553,11 +553,11 @@ <include name="wsdl/TestService.wsdl"/> </metainf> </jar> - <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws1011-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar destfile="${test.output.dir}/libs/jaxrpc-jbws1011-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1011/TestEndpoint.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1011/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/jbws1011/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="jaxrpc-mapping.xml"/> @@ -566,106 +566,106 @@ </jar> <!-- jbossws-jbws1093 --> - <war warfile="${build.tests.dir}/libs/jaxrpc-jbws1093.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws1093/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-jbws1093.war" webxml="${test.output.dir}/resources/jaxrpc/jbws1093/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1093/ServletTest.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1093/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1093/TestEndpointImpl.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1093/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/jbws1093/WEB-INF"> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws1093-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar destfile="${test.output.dir}/libs/jaxrpc-jbws1093-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jbws1093/TestEndpoint.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1093/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/jbws1093/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1093/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/jbws1093/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> </jar> <!-- jaxrpc-jbws1107 --> - <war warfile="${build.tests.dir}/libs/jaxrpc-jbws1107.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws1107/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-jbws1107.war" webxml="${test.output.dir}/resources/jaxrpc/jbws1107/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1107/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1107/TestEndpointImpl.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1107/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/jbws1107/WEB-INF"> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws1107-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar destfile="${test.output.dir}/libs/jaxrpc-jbws1107-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1107/TestEndpoint.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1107/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/jbws1107/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1107/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/jbws1107/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> </jar> <!-- jaxrpc-jbws1121 --> - <war destfile="${build.tests.dir}/libs/jaxrpc-jbws1121.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws1121/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war destfile="${test.output.dir}/libs/jaxrpc-jbws1121.war" webxml="${test.output.dir}/resources/jaxrpc/jbws1121/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1121/HelloWorld.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1121/HelloWorldBean.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1121/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/jbws1121/WEB-INF"> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="jboss-wsse-server.xml"/> <include name="wsdl/*"/> </webinf> - <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1121"> + <webinf dir="${test.output.dir}/resources/jaxrpc/jbws1121"> <include name="wsse.keystore"/> <include name="wsse.truststore"/> </webinf> </war> - <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws1121-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar destfile="${test.output.dir}/libs/jaxrpc-jbws1121-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1121/HelloWorld.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1121/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/jbws1121/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="jboss-wsse-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1121/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/jbws1121/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/*"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1121"> + <metainf dir="${test.output.dir}/resources/jaxrpc/jbws1121"> <include name="wsse.keystore"/> <include name="wsse.truststore"/> </metainf> </jar> - <ear destfile="${build.tests.dir}/libs/jaxrpc-jbws1121.ear" - appxml="${build.tests.dir}/resources/jaxrpc/jbws1121/META-INF/application.xml"> - <fileset dir="${build.tests.dir}/libs"> + <ear destfile="${test.output.dir}/libs/jaxrpc-jbws1121.ear" + appxml="${test.output.dir}/resources/jaxrpc/jbws1121/META-INF/application.xml"> + <fileset dir="${test.output.dir}/libs"> <include name="jaxrpc-jbws1121-client.jar"/> <include name="jaxrpc-jbws1121.war"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1121/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/jbws1121/META-INF"> <include name="jboss-app.xml"/> </metainf> </ear> <!-- jaxrpc-jbws1124one --> - <copy todir="${build.tests.dir}/resources" overwrite="true"> + <copy todir="${test.output.dir}/resources" overwrite="true"> <fileset dir="${test.resources.dir}"> <include name="jaxrpc/jbws1124/META-INF/jboss-client.xml"/> <include name="jaxrpc/jbws1124/WEB-INF/test-resource.txt"/> @@ -675,12 +675,12 @@ <filter token="jbws1124.domain" value="jbws1124one"/> </filterset> </copy> - <war warfile="${build.tests.dir}/libs/jaxrpc-jbws1124one.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws1124/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-jbws1124one.war" webxml="${test.output.dir}/resources/jaxrpc/jbws1124/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1124/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1124/TestEndpointImpl.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1124/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/jbws1124/WEB-INF"> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="test-resource.txt"/> @@ -689,7 +689,7 @@ </webinf> </war> <!-- jaxrpc-jbws1124two --> - <copy todir="${build.tests.dir}/resources" overwrite="true"> + <copy todir="${test.output.dir}/resources" overwrite="true"> <fileset dir="${test.resources.dir}"> <include name="jaxrpc/jbws1124/META-INF/jboss-client.xml"/> <include name="jaxrpc/jbws1124/WEB-INF/test-resource.txt"/> @@ -699,12 +699,12 @@ <filter token="jbws1124.domain" value="jbws1124two"/> </filterset> </copy> - <war warfile="${build.tests.dir}/libs/jaxrpc-jbws1124two.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws1124/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-jbws1124two.war" webxml="${test.output.dir}/resources/jaxrpc/jbws1124/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1124/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1124/TestEndpointImpl.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1124/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/jbws1124/WEB-INF"> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="test-resource.txt"/> @@ -714,97 +714,97 @@ </war> <!-- jaxrpc-jbws1125 --> - <war warfile="${build.tests.dir}/libs/jaxrpc-jbws1125.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws1125/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-jbws1125.war" webxml="${test.output.dir}/resources/jaxrpc/jbws1125/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1125/TestEndpointImpl.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1125/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1125/*RequestStruct.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1125/*ResponseStruct.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1125/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/jbws1125/WEB-INF"> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws1125-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar destfile="${test.output.dir}/libs/jaxrpc-jbws1125-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1125/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1125/*RequestStruct.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1125/*ResponseStruct.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1125/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/jbws1125/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1125/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/jbws1125/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> </jar> <!-- jaxrpc-jbws1148 --> - <war warfile="${build.tests.dir}/libs/jaxrpc-jbws1148.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws1148/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-jbws1148.war" webxml="${test.output.dir}/resources/jaxrpc/jbws1148/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1148/TestEndpointImpl.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1148/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1148/TelephoneNumber.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1148/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/jbws1148/WEB-INF"> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-jbws1148-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-jbws1148-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1148/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1148/TelephoneNumber.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1148/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/jbws1148/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1148/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/jbws1148/WEB-INF"> <include name="jaxrpc-mapping.xml"/> </metainf> </jar> <!-- jbossws-jbws1179 --> - <war warfile="${build.tests.dir}/libs/jaxrpc-jbws1179.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws1179/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-jbws1179.war" webxml="${test.output.dir}/resources/jaxrpc/jbws1179/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1179/TestEndpointImpl.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1179/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/jbws1179/WEB-INF"> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws1179-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar destfile="${test.output.dir}/libs/jaxrpc-jbws1179-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1179/TestEndpoint.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1179/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/jbws1179/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1179/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/jbws1179/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> </jar> <!-- jbossws-jbws1186 --> - <war warfile="${build.tests.dir}/libs/jaxrpc-jbws1186.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws1186/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-jbws1186.war" webxml="${test.output.dir}/resources/jaxrpc/jbws1186/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1186/TestEndpointImpl.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1186/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1186/ServerHandler.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1186/UserType.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1186/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/jbws1186/WEB-INF"> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> @@ -812,8 +812,8 @@ </war> <!-- jaxrpc-jbws1190 --> - <war warfile="${build.tests.dir}/libs/jaxrpc-jbws1190.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws1190/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-jbws1190.war" webxml="${test.output.dir}/resources/jaxrpc/jbws1190/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpointImpl$1.class"/> @@ -821,42 +821,42 @@ <include name="org/jboss/test/ws/jaxrpc/jbws1190/ConfidentialEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1190/JBWS1190Exception.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1190/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/jbws1190/WEB-INF"> <include name="webservices.xml"/> <include name="test-mapping.xml"/> <include name="confidential-mapping.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-jbws1190-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-jbws1190-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1190/TestEndpoint.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1190/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/jbws1190/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1190/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/jbws1190/WEB-INF"> <include name="test-mapping.xml"/> </metainf> </jar> <!-- jaxrpcws-jbws1205 --> - <war warfile="${build.tests.dir}/libs/jaxrpc-jbws1205-simple.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-jbws1205-simple.war" webxml="${test.output.dir}/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpointImpl.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_RequestStruct.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_ResponseStruct.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF"> <include name="webservices.xml"/> <include name="simple-mapping.xml"/> <include name="wsdl/**"/> </webinf> </war> - <war warfile="${build.tests.dir}/libs/jaxrpc-jbws1205-test.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-jbws1205-test.war" webxml="${test.output.dir}/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1205/TestEndpointImpl$*.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1205/TestEndpoint.class"/> @@ -865,122 +865,122 @@ <include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_RequestStruct.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1205/SimpleEndpoint_echo_ResponseStruct.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF"> <include name="webservices.xml"/> <include name="test-mapping.xml"/> <include name="wsdl/**"/> <include name="jboss-web.xml"/> </webinf> - <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/jbws1205/SimpleEndpoint/WEB-INF"> <include name="simple-mapping.xml"/> </webinf> </war> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-jbws1205-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-jbws1205-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1205/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxrpc/jbws1205/TestException.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1205/Client/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/jbws1205/Client/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/jbws1205/TestEndpoint/WEB-INF"> <include name="test-mapping.xml"/> </metainf> </jar> <!-- jaxrpc-jbws1303 --> - <war warfile="${build.tests.dir}/libs/jaxrpc-jbws1303.war" webxml="${build.tests.dir}/resources/jaxrpc/jbws1303/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-jbws1303.war" webxml="${test.output.dir}/resources/jaxrpc/jbws1303/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1303/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws1303/*TestCase.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/jbws1303/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/jbws1303/WEB-INF"> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${build.tests.dir}/libs/jaxrpc-jbws1303-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar destfile="${test.output.dir}/libs/jaxrpc-jbws1303-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/jbws1303/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws1303/*TestCase.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1303/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/jbws1303/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/jbws1303/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/jbws1303/WEB-INF"> <include name="wsdl/**"/> <include name="jaxrpc-mapping.xml"/> </metainf> </jar> <!-- jaxrpc-marshall-doclit.war --> - <war warfile="${build.tests.dir}/libs/jaxrpc-marshall-doclit.war" webxml="${build.tests.dir}/resources/jaxrpc/marshall-doclit/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-marshall-doclit.war" webxml="${test.output.dir}/resources/jaxrpc/marshall-doclit/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypes.class"/> <include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypesBean.class"/> <include name="org/jboss/test/ws/jaxrpc/marshall/*RequestStruct.class"/> <include name="org/jboss/test/ws/jaxrpc/marshall/*ResponseStruct.class"/> <include name="org/jboss/test/ws/jaxrpc/marshall/types/**"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/marshall-doclit/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/marshall-doclit/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-marshall-doclit-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-marshall-doclit-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypes.class"/> <include name="org/jboss/test/ws/jaxrpc/marshall/types/**"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/marshall-doclit/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/marshall-doclit/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/marshall-doclit/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/marshall-doclit/WEB-INF"> <include name="jaxrpc-mapping.xml"/> </metainf> </jar> <!-- jaxrpc-marshall-rpclit.war --> - <war warfile="${build.tests.dir}/libs/jaxrpc-marshall-rpclit.war" webxml="${build.tests.dir}/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-marshall-rpclit.war" webxml="${test.output.dir}/resources/jaxrpc/marshall-rpclit/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypes.class"/> <include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypesBean.class"/> <include name="org/jboss/test/ws/jaxrpc/marshall/types/JavaBean.class"/> <include name="org/jboss/test/ws/jaxrpc/marshall/types/JavaBean2.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/marshall-rpclit/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/marshall-rpclit/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-marshall-rpclit-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-marshall-rpclit-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/marshall/StandardTypes.class"/> <include name="org/jboss/test/ws/jaxrpc/marshall/types/JavaBean.class"/> <include name="org/jboss/test/ws/jaxrpc/marshall/types/JavaBean2.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/marshall-rpclit/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/marshall-rpclit/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/marshall-rpclit/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/marshall-rpclit/WEB-INF"> <include name="jaxrpc-mapping.xml"/> </metainf> </jar> <!-- jaxrpc-outparam.war --> - <war warfile="${build.tests.dir}/libs/jaxrpc-outparam.war" webxml="${build.tests.dir}/resources/jaxrpc/outparam/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-outparam.war" webxml="${test.output.dir}/resources/jaxrpc/outparam/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/outparam/*Service.class"/> <include name="org/jboss/test/ws/jaxrpc/outparam/*ServiceBean.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/outparam/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/outparam/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="wsdl/**"/> @@ -988,211 +988,211 @@ </war> <!-- jaxrpc-overloaded --> - <war warfile="${build.tests.dir}/libs/jaxrpc-overloaded.war" webxml="${build.tests.dir}/resources/jaxrpc/overloaded/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-overloaded.war" webxml="${test.output.dir}/resources/jaxrpc/overloaded/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/overloaded/Overloaded.class"/> <include name="org/jboss/test/ws/jaxrpc/overloaded/OverloadedBean.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/overloaded/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/overloaded/WEB-INF"> <include name="jboss-web.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-overloaded-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-overloaded-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/overloaded/Overloaded.class"/> <include name="org/jboss/test/ws/jaxrpc/overloaded/OverloadedBean.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/overloaded/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/overloaded/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/overloaded/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/overloaded/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> </jar> <!-- jaxrpc-samples-docstyle-bare --> - <war warfile="${build.tests.dir}/libs/jaxrpc-samples-docstyle-bare.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-samples-docstyle-bare.war" webxml="${test.output.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialEndpointJSE.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialService.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrder.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrderResponse.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-docstyle-bare-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-samples-docstyle-bare-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialService.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrder.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/bare/TrivialOrderResponse.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/docstyle/bare/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/samples/docstyle/bare/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/samples/docstyle/bare/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> </jar> <!-- jaxrpc-samples-docstyle-wrapped --> - <war warfile="${build.tests.dir}/libs/jaxrpc-samples-docstyle-wrapped.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-samples-docstyle-wrapped.war" webxml="${test.output.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialEndpointJSE.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*RequestStruct.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*ResponseStruct.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-docstyle-wrapped-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-samples-docstyle-wrapped-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*RequestStruct.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/docstyle/wrapped/TrivialService*ResponseStruct.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/docstyle/wrapped/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/samples/docstyle/wrapped/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> </jar> <!-- jaxrpc-samples-dynamichandler --> - <war warfile="${build.tests.dir}/libs/jaxrpc-samples-dynamichandler.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-samples-dynamichandler.war" webxml="${test.output.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Service.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*ServiceBean.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Handler.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-dynamichandler-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-samples-dynamichandler-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Service.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/dynamichandler/*Handler.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/samples/dynamichandler/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/dynamichandler/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/samples/dynamichandler/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> </jar> <!-- jaxrpc-samples-exception --> - <war destfile="${build.tests.dir}/libs/jaxrpc-samples-exception.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/exception/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war destfile="${test.output.dir}/libs/jaxrpc-samples-exception.war" webxml="${test.output.dir}/resources/jaxrpc/samples/exception/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/exception/*Exception.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/exception/ServerHandler.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionServiceInterface.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionBeanImpl.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/exception/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/samples/exception/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${build.tests.dir}/libs/jaxrpc-samples-exception-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar destfile="${test.output.dir}/libs/jaxrpc-samples-exception-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/exception/*Exception.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/exception/ExceptionServiceInterface.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/exception/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/samples/exception/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/exception/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/samples/exception/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> </jar> <!-- jaxrpc-samples-handler --> - <war warfile="${build.tests.dir}/libs/jaxrpc-samples-handler.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/handler/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-samples-handler.war" webxml="${test.output.dir}/resources/jaxrpc/samples/handler/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/handler/*Service.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/handler/*ServiceBean.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/handler/ServerSideHandler.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/handler/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/samples/handler/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-handler-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-samples-handler-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/handler/*Service.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/handler/ClientSideHandler.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/handler/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/samples/handler/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/handler/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/samples/handler/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> </jar> <!-- jaxrpc-samples-holder --> - <war warfile="${build.tests.dir}/libs/jaxrpc-samples-holder.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/holder/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-samples-holder.war" webxml="${test.output.dir}/resources/jaxrpc/samples/holder/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/holder/*Service.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/holder/*ServiceBean.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/holder/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/samples/holder/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-holder-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-samples-holder-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/holder/*Service.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/holder/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/samples/holder/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/holder/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/samples/holder/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> </jar> <!-- jaxrpc-samples-jmstransport --> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-jmstransport.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-samples-jmstransport.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/jmstransport/Organization.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/jmstransport/OrganizationJMSEndpoint.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jmstransport/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/samples/jmstransport/META-INF"> <include name="ejb-jar.xml"/> <include name="jboss.xml"/> <include name="webservices.xml"/> @@ -1200,23 +1200,23 @@ <include name="wsdl/**"/> </metainf> </jar> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-jmstransport.sar"> - <fileset dir="${build.tests.dir}/libs"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-samples-jmstransport.sar"> + <fileset dir="${test.output.dir}/libs"> <include name="jaxrpc-samples-jmstransport.jar"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jmstransport/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/samples/jmstransport/META-INF"> <include name="jboss-service.xml"/> </metainf> </jar> <!-- jaxrpc-samples-jsr109ejb-rpc --> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-jsr109ejb-rpc.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-samples-jsr109ejb-rpc.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*EJBEndpoint.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF"> <include name="ejb-jar.xml"/> <include name="jboss.xml"/> <include name="jaxrpc-mapping.xml"/> @@ -1224,12 +1224,12 @@ <include name="wsdl/**"/> </metainf> </jar> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-jsr109ejb-rpc-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-samples-jsr109ejb-rpc-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="jaxrpc-mapping.xml"/> @@ -1238,14 +1238,14 @@ </jar> <!-- jaxrpc-samples-jsr109ejb-doc --> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-jsr109ejb-doc.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-samples-jsr109ejb-doc.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Struct.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*EJBEndpoint.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF"> <include name="ejb-jar.xml"/> <include name="jboss.xml"/> <include name="jaxrpc-mapping.xml"/> @@ -1253,13 +1253,13 @@ <include name="wsdl/**"/> </metainf> </jar> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-jsr109ejb-doc-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-samples-jsr109ejb-doc-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Type.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Struct.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*Service.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="jaxrpc-mapping.xml"/> @@ -1268,174 +1268,174 @@ </jar> <!-- jaxrpc-samples-jsr109pojo-rpc --> - <war warfile="${build.tests.dir}/libs/jaxrpc-samples-jsr109pojo-rpc.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-samples-jsr109pojo-rpc.war" webxml="${test.output.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*JSEEndpoint.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="jboss-web.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-jsr109pojo-rpc-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-samples-jsr109pojo-rpc-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> </jar> <!-- jaxrpc-samples-jsr109pojo-doc --> - <war warfile="${build.tests.dir}/libs/jaxrpc-samples-jsr109pojo-doc.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-samples-jsr109pojo-doc.war" webxml="${test.output.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Struct.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*JSEEndpoint.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-jsr109pojo-doc-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-samples-jsr109pojo-doc-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Type.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Struct.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/jsr109pojo/*Service.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> </jar> <!-- jaxrpc-samples-message --> - <war warfile="${build.tests.dir}/libs/jaxrpc-samples-message.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/message/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-samples-message.war" webxml="${test.output.dir}/resources/jaxrpc/samples/message/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/message/*Service.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/message/*ServiceBean.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/message/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/samples/message/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-message-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-samples-message-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/message/*Service.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/message/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/samples/message/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/message/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/samples/message/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> </jar> <!-- jaxrpc-samples-mtom --> - <war warfile="${build.tests.dir}/libs/jaxrpc-samples-mtom.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/mtom/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-samples-mtom.war" webxml="${test.output.dir}/resources/jaxrpc/samples/mtom/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/mtom/**"/> <exclude name="org/jboss/test/ws/jaxrpc/samples/mtom/MTOMTestCase.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/mtom/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/samples/mtom/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${build.tests.dir}/libs/jaxrpc-samples-mtom-client.jar"> - <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/mtom/META-INF"> + <jar destfile="${test.output.dir}/libs/jaxrpc-samples-mtom-client.jar"> + <metainf dir="${test.output.dir}/resources/jaxrpc/samples/mtom/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/mtom/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/samples/mtom/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> </jar> <!-- jaxrpc-samples-oneway --> - <war warfile="${build.tests.dir}/libs/jaxrpc-samples-oneway.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/oneway/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-samples-oneway.war" webxml="${test.output.dir}/resources/jaxrpc/samples/oneway/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/oneway/*Service.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/oneway/*ServiceBean.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/oneway/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/samples/oneway/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-oneway-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-samples-oneway-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/oneway/*Service.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/oneway/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/samples/oneway/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/oneway/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/samples/oneway/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> </jar> <!-- jaxrpc-samples-rpcstyle --> - <war warfile="${build.tests.dir}/libs/jaxrpc-samples-rpcstyle.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-samples-rpcstyle.war" webxml="${test.output.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialEndpointJSE.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialService.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-rpcstyle-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-samples-rpcstyle-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/rpcstyle/TrivialService.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/rpcstyle/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/samples/rpcstyle/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/samples/rpcstyle/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> </jar> <!-- jaxrpc-samples-secureejb --> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-secureejb.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-samples-secureejb.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationService.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationHome.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationRemote.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationImpl.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/secureejb/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/samples/secureejb/META-INF"> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="ejb-jar.xml"/> @@ -1443,13 +1443,13 @@ <include name="wsdl/**"/> </metainf> </jar> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-secureejb-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-samples-secureejb-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationService.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationHome.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/secureejb/OrganizationRemote.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/secureejb/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/samples/secureejb/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="jaxrpc-mapping.xml"/> @@ -1458,38 +1458,38 @@ </jar> <!-- jaxrpc-samples-swa --> - <war warfile="${build.tests.dir}/libs/jaxrpc-samples-swa.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/swa/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-samples-swa.war" webxml="${test.output.dir}/resources/jaxrpc/samples/swa/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/swa/AttachmentImpl.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/swa/Attachment.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/swa/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/samples/swa/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${build.tests.dir}/libs/jaxrpc-samples-swa-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar destfile="${test.output.dir}/libs/jaxrpc-samples-swa-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/swa/Attachment.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/swa/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/samples/swa/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/swa/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/samples/swa/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> </jar> <!-- jaxrpc-samples-wseventing.war --> - <war warfile="${build.tests.dir}/libs/jaxrpc-samples-wseventing.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/wseventing/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-samples-wseventing.war" webxml="${test.output.dir}/resources/jaxrpc/samples/wseventing/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/ws/samples/wseventing/*.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/wseventing/*.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wseventing/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/samples/wseventing/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="wsdl/sysmon.wsdl"/> @@ -1497,177 +1497,177 @@ <include name="wsdl/jbwse.xsd"/> </webinf> </war> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-wseventing-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-samples-wseventing-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/ws/samples/wseventing/*.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/wseventing/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/samples/wseventing/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/wseventing/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/samples/wseventing/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> </jar> <!-- jaxrpc-samples-wssecurity-sign --> - <war warfile="${build.tests.dir}/libs/jaxrpc-samples-wssecurity-sign.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-samples-wssecurity-sign.war" webxml="${test.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="wsdl/**"/> </webinf> - <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/simple-sign"> + <webinf dir="${test.output.dir}/resources/jaxrpc/samples/wssecurity/simple-sign"> <include name="jboss-wsse-server.xml"/> </webinf> - <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity"> + <webinf dir="${test.output.dir}/resources/jaxrpc/samples/wssecurity"> <include name="wsse.keystore"/> <include name="wsse.truststore"/> </webinf> </war> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-wssecurity-sign-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-samples-wssecurity-sign-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/simple-sign/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/samples/wssecurity/simple-sign/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="jboss-wsse-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> </jar> <!-- jaxrpc-samples-wssecurity-encrypt --> - <war warfile="${build.tests.dir}/libs/jaxrpc-samples-wssecurity-encrypt.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-samples-wssecurity-encrypt.war" webxml="${test.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF"> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </webinf> - <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/simple-encrypt"> + <webinf dir="${test.output.dir}/resources/jaxrpc/samples/wssecurity/simple-encrypt"> <include name="jboss-wsse-server.xml"/> </webinf> - <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity"> + <webinf dir="${test.output.dir}/resources/jaxrpc/samples/wssecurity"> <include name="wsse.keystore"/> <include name="wsse.truststore"/> </webinf> </war> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-wssecurity-encrypt-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-samples-wssecurity-encrypt-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/samples/wssecurity/simple-encrypt/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="jboss-wsse-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> </jar> <!-- jaxrpc-samples-store-pass-encrypt.war --> - <replace file="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml" token="${buildpath}" value="${build.tests.dir}"/> - <war warfile="${build.tests.dir}/libs/jaxrpc-samples-store-pass-encrypt.war" webxml="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <replace file="${test.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/jboss-wsse-server.xml" token="${buildpath}" value="${test.output.dir}"/> + <war warfile="${test.output.dir}/libs/jaxrpc-samples-store-pass-encrypt.war" webxml="${test.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/HelloJavaBean.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/PasswordUtil.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="wsdl/**"/> </webinf> - <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt"> + <webinf dir="${test.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt"> <include name="jboss-wsse-server.xml"/> </webinf> - <webinf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity"> + <webinf dir="${test.output.dir}/resources/jaxrpc/samples/wssecurity"> <include name="wsse.keystore"/> <include name="wsse.truststore"/> </webinf> </war> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-samples-store-pass-encrypt-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-samples-store-pass-encrypt-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/samples/wssecurity/UserType.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/samples/wssecurity/store-pass-encrypt/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="jboss-wsse-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/samples/wssecurity/WEB-INF"> <include name="wsdl/**"/> <include name="jaxrpc-mapping.xml"/> </metainf> </jar> <!-- jaxrpc-webserviceref --> - <war warfile="${build.tests.dir}/libs/jaxrpc-webserviceref.war" webxml="${build.tests.dir}/resources/jaxrpc/webserviceref/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-webserviceref.war" webxml="${test.output.dir}/resources/jaxrpc/webserviceref/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/webserviceref/TestEndpointImpl.class"/> <include name="org/jboss/test/ws/jaxrpc/webserviceref/TestEndpoint.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/webserviceref/META-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/webserviceref/META-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </webinf> - <webinf dir="${build.tests.dir}/resources/jaxrpc/webserviceref/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/webserviceref/WEB-INF"> <include name="webservices.xml"/> </webinf> </war> - <jar destfile="${build.tests.dir}/libs/jaxrpc-webserviceref-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar destfile="${test.output.dir}/libs/jaxrpc-webserviceref-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/webserviceref/ApplicationClient.class"/> <include name="org/jboss/test/ws/jaxrpc/webserviceref/TestEndpointService.class"/> <include name="org/jboss/test/ws/jaxrpc/webserviceref/TestEndpoint.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/webserviceref/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/webserviceref/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> </jar> - <war destfile="${build.tests.dir}/libs/jaxrpc-webserviceref-servlet-client.war" webxml="${build.tests.dir}/resources/jaxrpc/webserviceref/servlet-client/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war destfile="${test.output.dir}/libs/jaxrpc-webserviceref-servlet-client.war" webxml="${test.output.dir}/resources/jaxrpc/webserviceref/servlet-client/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/webserviceref/ServletClient.class"/> <include name="org/jboss/test/ws/jaxrpc/webserviceref/TestEndpointService.class"/> <include name="org/jboss/test/ws/jaxrpc/webserviceref/TestEndpoint.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/webserviceref/META-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/webserviceref/META-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${build.tests.dir}/libs/jaxrpc-webserviceref-ejb-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar destfile="${test.output.dir}/libs/jaxrpc-webserviceref-ejb-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/webserviceref/EJBClient.class"/> <include name="org/jboss/test/ws/jaxrpc/webserviceref/EJBRemote.class"/> <include name="org/jboss/test/ws/jaxrpc/webserviceref/EJBRemoteHome.class"/> <include name="org/jboss/test/ws/jaxrpc/webserviceref/TestEndpointService.class"/> <include name="org/jboss/test/ws/jaxrpc/webserviceref/TestEndpoint.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/webserviceref/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/webserviceref/META-INF"> <include name="ejb-jar.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> @@ -1675,34 +1675,34 @@ </jar> <!-- jaxrpc-wseventing --> - <war warfile="${build.tests.dir}/libs/jaxrpc-wseventing.war" webxml="${build.tests.dir}/resources/jaxrpc/wseventing/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-wseventing.war" webxml="${test.output.dir}/resources/jaxrpc/wseventing/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/ws/eventing/*.class"/> <include name="org/jboss/test/ws/jaxrpc/wseventing/*.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/wseventing/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/wseventing/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-wseventing-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-wseventing-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/ws/eventing/*.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/wseventing/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/wseventing/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/wseventing/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/wseventing/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> </jar> <!-- jaxrpc-wsse-account-signup.war --> - <war warfile="${build.tests.dir}/libs/jaxrpc-wsse-account-signup.war" webxml="${build.tests.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-wsse-account-signup.war" webxml="${test.output.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountInfo.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignup.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupImpl.class"/> @@ -1711,22 +1711,22 @@ <include name="org/jboss/test/ws/jaxrpc/wsse/signup/Address.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/signup/CreditCardInfo.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF"> <include name="jboss-web.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="jboss-wsse-server.xml"/> <include name="wsdl/**"/> </webinf> - <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse"> + <webinf dir="${test.output.dir}/resources/jaxrpc/wsse"> <include name="wsse.keystore"/> <include name="wsse.truststore"/> </webinf> </war> <!-- jaxrpc-wsse-account-signup.war --> - <war warfile="${build.tests.dir}/libs/jaxrpc-wsse-account-signup.war" webxml="${build.tests.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-wsse-account-signup.war" webxml="${test.output.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountInfo.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignup.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignupImpl.class"/> @@ -1735,307 +1735,307 @@ <include name="org/jboss/test/ws/jaxrpc/wsse/signup/Address.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/signup/CreditCardInfo.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF"> <include name="jboss-web.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="jboss-wsse-server.xml"/> <include name="wsdl/**"/> </webinf> - <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse"> + <webinf dir="${test.output.dir}/resources/jaxrpc/wsse"> <include name="wsse.keystore"/> <include name="wsse.truststore"/> </webinf> </war> <!-- jaxrpc-wsse-account-signup-client.jar --> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-wsse-account-signup-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-wsse-account-signup-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountInfo.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/signup/AccountSignup.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/signup/Address.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/signup/CreditCardInfo.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/account-signup/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/wsse/account-signup/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="jboss-wsse-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/wsse/account-signup/WEB-INF"> <include name="wsdl/**"/> <include name="jaxrpc-mapping.xml"/> </metainf> </jar> <!-- jaxrpc-wsse-rpc.war --> - <war warfile="${build.tests.dir}/libs/jaxrpc-wsse-rpc.war" webxml="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-wsse-rpc.war" webxml="${test.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/HelloJavaBean.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> <include name="jboss-web.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="jboss-wsse-server.xml"/> <include name="wsdl/**"/> </webinf> - <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse"> + <webinf dir="${test.output.dir}/resources/jaxrpc/wsse"> <include name="wsse.keystore"/> <include name="wsse.truststore"/> </webinf> </war> <!-- jaxrpc-wsse-rpc-client.jar --> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-wsse-rpc-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-wsse-rpc-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/wsse/rpc/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="jboss-wsse-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> <include name="wsdl/**"/> <include name="jaxrpc-mapping.xml"/> </metainf> </jar> <!-- jaxrpc-wsse-rpc-none-client --> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-wsse-rpc-none-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-wsse-rpc-none-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/wsse/rpc/META-INF"> <include name="application-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/META-INF-no-wsse"> + <metainf dir="${test.output.dir}/resources/jaxrpc/wsse/rpc/META-INF-no-wsse"> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> <include name="wsdl/**"/> <include name="jaxrpc-mapping.xml"/> </metainf> </jar> <!-- jaxrpc-wsse-simple-sign-encrypt.war --> - <war warfile="${build.tests.dir}/libs/jaxrpc-wsse-simple-sign-encrypt.war" webxml="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-wsse-simple-sign-encrypt.war" webxml="${test.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/HelloJavaBean.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="jboss-web.xml"/> <include name="webservices.xml"/> <include name="wsdl/**"/> </webinf> - <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse/simple-sign-encrypt"> + <webinf dir="${test.output.dir}/resources/jaxrpc/wsse/simple-sign-encrypt"> <include name="jboss-wsse-server.xml"/> </webinf> - <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse"> + <webinf dir="${test.output.dir}/resources/jaxrpc/wsse"> <include name="wsse.keystore"/> <include name="wsse.truststore"/> </webinf> </war> <!-- jaxrpc-wsse-simple-encrypt-client.jar --> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-wsse-simple-sign-encrypt-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-wsse-simple-sign-encrypt-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/wsse/rpc/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/simple-sign-encrypt"> + <metainf dir="${test.output.dir}/resources/jaxrpc/wsse/simple-sign-encrypt"> <include name="jboss-wsse-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> <include name="wsdl/**"/> <include name="jaxrpc-mapping.xml"/> </metainf> </jar> <!-- jaxrpc-wsse-sign-fault.war --> - <war warfile="${build.tests.dir}/libs/jaxrpc-wsse-sign-fault.war" webxml="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-wsse-sign-fault.war" webxml="${test.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/HelloJavaBean.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="jboss-web.xml"/> <include name="webservices.xml"/> <include name="wsdl/**"/> </webinf> - <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse/sign-fault"> + <webinf dir="${test.output.dir}/resources/jaxrpc/wsse/sign-fault"> <include name="jboss-wsse-server.xml"/> </webinf> - <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse"> + <webinf dir="${test.output.dir}/resources/jaxrpc/wsse"> <include name="wsse.keystore"/> <include name="wsse.truststore"/> </webinf> </war> <!-- jaxrpc-wsse-sign-fault-client.jar --> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-wsse-sign-fault-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-wsse-sign-fault-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/wsse/rpc/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/sign-fault"> + <metainf dir="${test.output.dir}/resources/jaxrpc/wsse/sign-fault"> <include name="jboss-wsse-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> <include name="wsdl/**"/> <include name="jaxrpc-mapping.xml"/> </metainf> </jar> <!-- jaxrpc-wsse-sign-encrypt-fault.war --> - <war warfile="${build.tests.dir}/libs/jaxrpc-wsse-sign-encrypt-fault.war" webxml="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-wsse-sign-encrypt-fault.war" webxml="${test.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/HelloJavaBean.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="jboss-web.xml"/> <include name="webservices.xml"/> <include name="wsdl/**"/> </webinf> - <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse/sign-encrypt-fault"> + <webinf dir="${test.output.dir}/resources/jaxrpc/wsse/sign-encrypt-fault"> <include name="jboss-wsse-server.xml"/> </webinf> - <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse"> + <webinf dir="${test.output.dir}/resources/jaxrpc/wsse"> <include name="wsse.keystore"/> <include name="wsse.truststore"/> </webinf> </war> <!-- jaxrpc-wsse-sign-encrypt-fault-client.jar --> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-wsse-sign-encrypt-fault-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-wsse-sign-encrypt-fault-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/wsse/rpc/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/sign-encrypt-fault"> + <metainf dir="${test.output.dir}/resources/jaxrpc/wsse/sign-encrypt-fault"> <include name="jboss-wsse-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> <include name="wsdl/**"/> <include name="jaxrpc-mapping.xml"/> </metainf> </jar> <!-- jaxrpc-wsse-store-pass-encrypt-class-cmd.war --> - <replace file="${build.tests.dir}/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml" token="${buildpath}" value="${build.tests.dir}"/> - <war warfile="${build.tests.dir}/libs/jaxrpc-wsse-store-pass-encrypt-class-cmd.war" webxml="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <replace file="${test.output.dir}/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd/jboss-wsse-server.xml" token="${buildpath}" value="${test.output.dir}"/> + <war warfile="${test.output.dir}/libs/jaxrpc-wsse-store-pass-encrypt-class-cmd.war" webxml="${test.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/HelloJavaBean.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/PasswordUtil.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="jboss-web.xml"/> <include name="webservices.xml"/> <include name="wsdl/**"/> </webinf> - <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd"> + <webinf dir="${test.output.dir}/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd"> <include name="jboss-wsse-server.xml"/> </webinf> - <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse"> + <webinf dir="${test.output.dir}/resources/jaxrpc/wsse"> <include name="wsse.keystore"/> <include name="wsse.truststore"/> </webinf> </war> <!-- jaxrpc-wsse-store-pass-encrypt-class-cmd-client.jar --> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-wsse-store-pass-encrypt-class-cmd-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-wsse-store-pass-encrypt-class-cmd-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/wsse/rpc/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd"> + <metainf dir="${test.output.dir}/resources/jaxrpc/wsse/store-pass-encrypt-class-cmd"> <include name="jboss-wsse-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> <include name="wsdl/**"/> <include name="jaxrpc-mapping.xml"/> </metainf> </jar> <!-- jaxrpc-wsse-web-client.war --> - <war warfile="${build.tests.dir}/libs/jaxrpc-wsse-web-client.war" webxml="${build.tests.dir}/resources/jaxrpc/wsse/webclient/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-wsse-web-client.war" webxml="${test.output.dir}/resources/jaxrpc/wsse/webclient/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/Hello.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/HelloJavaBean.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/HelloException.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/RpcTestClientServlet.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/UserType.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/wsse/rpc/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="webservices.xml"/> <include name="jboss-wsse-server.xml"/> <include name="wsdl/**"/> </webinf> - <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse/webclient/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/wsse/webclient/WEB-INF"> <include name="jboss-web.xml"/> <include name="jboss-wsse-client.xml"/> </webinf> - <webinf dir="${build.tests.dir}/resources/jaxrpc/wsse"> + <webinf dir="${test.output.dir}/resources/jaxrpc/wsse"> <include name="wsse.keystore"/> <include name="wsse.truststore"/> </webinf> </war> <!-- jaxrpc-wsse-username --> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-wsse-username.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-wsse-username.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/*Type.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/*Service.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/*Struct.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/*EJBEndpoint.class"/> </fileset> - <fileset dir="${build.tests.dir}/resources"> + <fileset dir="${test.output.dir}/resources"> <include name="*.properties"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/username/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/wsse/username/META-INF"> <include name="ejb-jar.xml"/> <include name="jboss.xml"/> <include name="jaxrpc-mapping.xml"/> @@ -2043,18 +2043,18 @@ <include name="webservices.xml"/> <include name="wsdl/**"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse"> + <metainf dir="${test.output.dir}/resources/jaxrpc/wsse"> <include name="wsse.keystore"/> <include name="wsse.truststore"/> </metainf> </jar> - <jar jarfile="${build.tests.dir}/libs/jaxrpc-wsse-username-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxrpc-wsse-username-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/wsse/username/*Type.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/username/*Struct.class"/> <include name="org/jboss/test/ws/jaxrpc/wsse/username/*Service.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/wsse/username/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/wsse/username/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="jaxrpc-mapping.xml"/> @@ -2064,122 +2064,122 @@ </jar> <!-- jaxrpc-xop-doclit without handlers --> - <war warfile="${build.tests.dir}/libs/jaxrpc-xop-doclit.war" webxml="${build.tests.dir}/resources/jaxrpc/xop/doclit/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-xop-doclit.war" webxml="${test.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/> <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/xop/doclit/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF"> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${build.tests.dir}/libs/jaxrpc-xop-doclit-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar destfile="${test.output.dir}/libs/jaxrpc-xop-doclit-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/> <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/xop/doclit/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/xop/doclit/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/xop/doclit/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF"> <include name="wsdl/**"/> <include name="jaxrpc-mapping.xml"/> </metainf> </jar> <!-- jaxrpc-xop-doclit with handlers --> - <war warfile="${build.tests.dir}/libs/jaxrpc-xop-doclit_handler.war" webxml="${build.tests.dir}/resources/jaxrpc/xop/doclit/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-xop-doclit_handler.war" webxml="${test.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/> <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/xop/doclit/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </webinf> - <webinf dir="${build.tests.dir}/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/xop/doclit/handlerconfig/WEB-INF"> <include name="webservices.xml"/> </webinf> </war> - <jar destfile="${build.tests.dir}/libs/jaxrpc-xop-doclit_handler-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar destfile="${test.output.dir}/libs/jaxrpc-xop-doclit_handler-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/xop/doclit/*.class"/> <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/xop/doclit/*TestCase.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/xop/doclit/handlerconfig/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/xop/doclit/handlerconfig/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/xop/doclit/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/xop/doclit/WEB-INF"> <include name="wsdl/**"/> <include name="jaxrpc-mapping.xml"/> </metainf> </jar> <!-- jaxrpc-xop-rpclit without handlers --> - <war warfile="${build.tests.dir}/libs/jaxrpc-xop-rpclit.war" webxml="${build.tests.dir}/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-xop-rpclit.war" webxml="${test.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/> <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/xop/rpclit/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF"> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${build.tests.dir}/libs/jaxrpc-xop-rpclit-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar destfile="${test.output.dir}/libs/jaxrpc-xop-rpclit-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/> <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/xop/rpclit/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/xop/rpclit/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/xop/rpclit/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF"> <include name="wsdl/**"/> <include name="jaxrpc-mapping.xml"/> </metainf> </jar> <!-- jaxrpc-xop-rpclit with handlers --> - <war warfile="${build.tests.dir}/libs/jaxrpc-xop-rpclit_handler.war" webxml="${build.tests.dir}/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxrpc-xop-rpclit_handler.war" webxml="${test.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/> <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxrpc/xop/rpclit/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF"> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/**"/> </webinf> - <webinf dir="${build.tests.dir}/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxrpc/xop/rpclit/handlerconfig/WEB-INF"> <include name="webservices.xml"/> </webinf> </war> - <jar destfile="${build.tests.dir}/libs/jaxrpc-xop-rpclit_handler-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar destfile="${test.output.dir}/libs/jaxrpc-xop-rpclit_handler-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxrpc/xop/rpclit/*.class"/> <include name="org/jboss/test/ws/jaxrpc/xop/shared/*.class"/> <exclude name="org/jboss/test/ws/jaxrpc/xop/rpclit/*TestCase.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/xop/rpclit/handlerconfig/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${build.tests.dir}/resources/jaxrpc/xop/rpclit/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxrpc/xop/rpclit/WEB-INF"> <include name="wsdl/**"/> <include name="jaxrpc-mapping.xml"/> </metainf> Modified: trunk/jbossws/src/test/ant/build-jars-jaxws.xml =================================================================== --- trunk/jbossws/src/test/ant/build-jars-jaxws.xml 2006-12-22 13:51:13 UTC (rev 1737) +++ trunk/jbossws/src/test/ant/build-jars-jaxws.xml 2006-12-22 13:51:18 UTC (rev 1738) @@ -19,105 +19,105 @@ <target name="build-jars" description="Build the deployments."> <!-- jaxws-asynchronous --> - <war warfile="${build.tests.dir}/libs/jaxws-asynchronous.war" webxml="${build.tests.dir}/resources/jaxws/asynchronous/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxws-asynchronous.war" webxml="${test.output.dir}/resources/jaxws/asynchronous/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/asynchronous/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/asynchronous/TestEndpointBean.class"/> </classes> </war> <!-- jaxws-binding --> - <war warfile="${build.tests.dir}/libs/jaxws-binding.war" webxml="${build.tests.dir}/resources/jaxws/binding/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxws-binding.war" webxml="${test.output.dir}/resources/jaxws/binding/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/binding/SOAPEndpointBean.class"/> <include name="org/jboss/test/ws/jaxws/binding/SOAPEndpoint.class"/> </classes> </war> <!-- jaxws-context --> - <war warfile="${build.tests.dir}/libs/jaxws-context.war" webxml="${build.tests.dir}/resources/jaxws/context/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxws-context.war" webxml="${test.output.dir}/resources/jaxws/context/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/context/EndpointBean.class"/> <include name="org/jboss/test/ws/jaxws/context/EndpointInterface.class"/> </classes> </war> <!-- jaxws-eardeployment --> - <war warfile="${build.tests.dir}/libs/jaxws-eardeployment.war" webxml="${build.tests.dir}/resources/jaxws/eardeployment/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxws-eardeployment.war" webxml="${test.output.dir}/resources/jaxws/eardeployment/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/eardeployment/JSEBean.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxws/eardeployment/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxws/eardeployment/WEB-INF"> <include name="wsdl/**"/> </webinf> </war> - <jar jarfile="${build.tests.dir}/libs/jaxws-eardeployment.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxws-eardeployment.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/eardeployment/EJB3Bean.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxws/eardeployment/WEB-INF"> + <metainf dir="${test.output.dir}/resources/jaxws/eardeployment/WEB-INF"> <include name="wsdl/**"/> </metainf> </jar> - <jar jarfile="${build.tests.dir}/libs/jaxws-eardeployment.ear"> - <fileset dir="${build.tests.dir}/libs"> + <jar jarfile="${test.output.dir}/libs/jaxws-eardeployment.ear"> + <fileset dir="${test.output.dir}/libs"> <include name="jaxws-eardeployment.jar"/> <include name="jaxws-eardeployment.war"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxws/eardeployment/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxws/eardeployment/META-INF"> <include name="jboss-app.xml"/> </metainf> </jar> <!-- jaxws-endpoint-servlet --> - <war warfile="${build.tests.dir}/libs/jaxws-endpoint-servlet.war" webxml="${build.tests.dir}/resources/jaxws/endpoint/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxws-endpoint-servlet.war" webxml="${test.output.dir}/resources/jaxws/endpoint/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/endpoint/EndpointServlet.class"/> <include name="org/jboss/test/ws/jaxws/endpoint/EndpointBean.class"/> <include name="org/jboss/test/ws/jaxws/endpoint/EndpointInterface.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxws/endpoint/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxws/endpoint/WEB-INF"> <include name="wsdl/**"/> </webinf> </war> <!-- jaxws-handlerscope --> - <war warfile="${build.tests.dir}/libs/jaxws-handlerscope.war" webxml="${build.tests.dir}/resources/jaxws/handlerscope/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxws-handlerscope.war" webxml="${test.output.dir}/resources/jaxws/handlerscope/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/handlerscope/SOAPEndpointBean.class"/> <include name="org/jboss/test/ws/jaxws/handlerscope/SOAPEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/handlerscope/ProtocolHandler.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxws/handlerscope/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxws/handlerscope/WEB-INF"> <include name="jaxws-server-handlers.xml"/> </webinf> </war> <!-- jaxws-jbws860 --> - <war warfile="${build.tests.dir}/libs/jaxws-jbws860.war" webxml="${build.tests.dir}/resources/jaxws/jbws860/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxws-jbws860.war" webxml="${test.output.dir}/resources/jaxws/jbws860/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws860/*.class"/> <exclude name="org/jboss/test/ws/jaxws/jbws860/*TestCase.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxws/jbws860/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxws/jbws860/WEB-INF"> <include name="jboss-web.xml"/> </webinf> </war> <!-- jaxws-jbws871 --> - <war warfile="${build.tests.dir}/libs/jaxws-jbws871-rpc.war" webxml="${build.tests.dir}/resources/jaxws/jbws871/WEB-INF-rpc/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxws-jbws871-rpc.war" webxml="${test.output.dir}/resources/jaxws/jbws871/WEB-INF-rpc/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpointImpl.class"/> </classes> </war> - <jar destfile="${build.tests.dir}/libs/jaxws-jbws871-rpc-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar destfile="${test.output.dir}/libs/jaxws-jbws871-rpc-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws871/IntegerArray.class"/> <include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/jbws871/RpcArrayEndpointService.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxws/jbws871/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxws/jbws871/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="jaxrpc-mapping.xml"/> @@ -126,16 +126,16 @@ </jar> <!-- jaxws-jbws944 --> - <jar jarfile="${build.tests.dir}/libs/jaxws-jbws944.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxws-jbws944.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws944/EJB3Bean01.class"/> <include name="org/jboss/test/ws/jaxws/jbws944/EJB3RemoteInterface.class"/> </fileset> </jar> <!-- jaxws-jbws981 --> - <jar destfile="${build.tests.dir}/libs/jaxws-jbws981.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar destfile="${test.output.dir}/libs/jaxws-jbws981.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws981/EJB3Bean.class"/> <include name="org/jboss/test/ws/jaxws/jbws981/EJB3RemoteInterface.class"/> <include name="org/jboss/test/ws/jaxws/jbws981/EndpointInterface.class"/> @@ -143,15 +143,15 @@ </jar> <!-- jaxws-jbws1178 --> - <war destfile="${build.tests.dir}/libs/jaxws-jbws1178.war" webxml="${build.tests.dir}/resources/jaxws/jbws1178/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war destfile="${test.output.dir}/libs/jaxws-jbws1178.war" webxml="${test.output.dir}/resources/jaxws/jbws1178/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1178/TestEndpoint.class"/> </classes> </war> <!-- jaxws-jbws1190 --> - <war destfile="${build.tests.dir}/libs/jaxws-jbws1190.war" webxml="${build.tests.dir}/resources/jaxws/jbws1190/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war destfile="${test.output.dir}/libs/jaxws-jbws1190.war" webxml="${test.output.dir}/resources/jaxws/jbws1190/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/jbws1190/TestEndpointImpl*.class"/> @@ -160,17 +160,17 @@ </war> <!-- jaxws-jsr181-complex --> - <war warfile="${build.tests.dir}/libs/jaxws-jsr181-complex.war" webxml="${build.tests.dir}/resources/jaxws/jsr181/complex/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxws-jsr181-complex.war" webxml="${test.output.dir}/resources/jaxws/jsr181/complex/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jsr181/complex/*.class"/> <include name="org/jboss/test/ws/jaxws/jsr181/complex/extra/*.class"/> </classes> </war> <!-- jaxws-jsr181-handlerchain --> - <copy todir="${build.tests.dir}/classes/org/jboss/test/ws/jaxws/jsr181/handlerchain" file="${build.tests.dir}/resources/jaxws/jsr181/handlerchain/jaxws-handlers.xml"/> - <war warfile="${build.tests.dir}/libs/jaxws-jsr181-handlerchain.war" webxml="${build.tests.dir}/resources/jaxws/jsr181/handlerchain/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <copy todir="${test.output.dir}/classes/org/jboss/test/ws/jaxws/jsr181/handlerchain" file="${test.output.dir}/resources/jaxws/jsr181/handlerchain/jaxws-handlers.xml"/> + <war warfile="${test.output.dir}/libs/jaxws-jsr181-handlerchain.war" webxml="${test.output.dir}/resources/jaxws/jsr181/handlerchain/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jsr181/handlerchain/EndpointImpl.class"/> <include name="org/jboss/test/ws/jaxws/jsr181/handlerchain/Endpoint.class"/> <include name="org/jboss/test/ws/jaxws/jsr181/handlerchain/*Handler.class"/> @@ -179,15 +179,15 @@ </war> <!-- jaxws-jsr181-oneway --> - <war warfile="${build.tests.dir}/libs/jaxws-jsr181-oneway.war" webxml="${build.tests.dir}/resources/jaxws/jsr181/oneway/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxws-jsr181-oneway.war" webxml="${test.output.dir}/resources/jaxws/jsr181/oneway/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jsr181/oneway/PingEndpointImpl.class"/> </classes> </war> <!-- jaxws-jsr181-soapbinding --> - <war warfile="${build.tests.dir}/libs/jaxws-jsr181-soapbinding.war" webxml="${build.tests.dir}/resources/jaxws/jsr181/soapbinding/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxws-jsr181-soapbinding.war" webxml="${test.output.dir}/resources/jaxws/jsr181/soapbinding/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jsr181/soapbinding/DocWrapped.class"/> <include name="org/jboss/test/ws/jaxws/jsr181/soapbinding/ExampleSEI.class"/> <include name="org/jboss/test/ws/jaxws/jsr181/soapbinding/DocBareServiceImpl.class"/> @@ -201,16 +201,16 @@ </war> <!-- jaxws-jsr181-webmethod --> - <war warfile="${build.tests.dir}/libs/jaxws-jsr181-webmethod.war" webxml="${build.tests.dir}/resources/jaxws/jsr181/webmethod/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxws-jsr181-webmethod.war" webxml="${test.output.dir}/resources/jaxws/jsr181/webmethod/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jsr181/webmethod/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/jsr181/webmethod/TestEndpointImpl.class"/> </classes> </war> <!-- jaxws-jsr181-webparam --> - <war warfile="${build.tests.dir}/libs/jaxws-jsr181-webparam.war" webxml="${build.tests.dir}/resources/jaxws/jsr181/webparam/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxws-jsr181-webparam.war" webxml="${test.output.dir}/resources/jaxws/jsr181/webparam/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jsr181/webparam/PingService.class"/> <include name="org/jboss/test/ws/jaxws/jsr181/webparam/PingDocument*.class"/> <include name="org/jboss/test/ws/jaxws/jsr181/webparam/SecurityHeader.class"/> @@ -218,8 +218,8 @@ </war> <!-- jaxws-jsr181-webresult --> - <war warfile="${build.tests.dir}/libs/jaxws-jsr181-webresult.war" webxml="${build.tests.dir}/resources/jaxws/jsr181/webresult/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxws-jsr181-webresult.war" webxml="${test.output.dir}/resources/jaxws/jsr181/webresult/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jsr181/webresult/CustomerService.class"/> <include name="org/jboss/test/ws/jaxws/jsr181/webresult/CustomerRecord.class"/> <include name="org/jboss/test/ws/jaxws/jsr181/webresult/USAddress.class"/> @@ -227,77 +227,77 @@ </war> <!-- jaxws-jsr181-webservice --> - <war warfile="${build.tests.dir}/libs/jaxws-jsr181-webservice01-jse.war" webxml="${build.tests.dir}/resources/jaxws/jsr181/webservice/WEB-INF01/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxws-jsr181-webservice01-jse.war" webxml="${test.output.dir}/resources/jaxws/jsr181/webservice/WEB-INF01/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jsr181/webservice/JSEBean01.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxws/jsr181/webservice/WEB-INF01"> + <webinf dir="${test.output.dir}/resources/jaxws/jsr181/webservice/WEB-INF01"> <include name="jboss-web.xml"/> </webinf> </war> - <war warfile="${build.tests.dir}/libs/jaxws-jsr181-webservice02-jse.war" webxml="${build.tests.dir}/resources/jaxws/jsr181/webservice/WEB-INF02/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxws-jsr181-webservice02-jse.war" webxml="${test.output.dir}/resources/jaxws/jsr181/webservice/WEB-INF02/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jsr181/webservice/JSEBean02.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxws/jsr181/webservice/WEB-INF02"> + <webinf dir="${test.output.dir}/resources/jaxws/jsr181/webservice/WEB-INF02"> <include name="jboss-web.xml"/> <include name="wsdl/**"/> </webinf> </war> - <war warfile="${build.tests.dir}/libs/jaxws-jsr181-webservice03-jse.war" webxml="${build.tests.dir}/resources/jaxws/jsr181/webservice/WEB-INF03/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxws-jsr181-webservice03-jse.war" webxml="${test.output.dir}/resources/jaxws/jsr181/webservice/WEB-INF03/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jsr181/webservice/JSEBean03.class"/> <include name="org/jboss/test/ws/jaxws/jsr181/webservice/EndpointInterface03.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxws/jsr181/webservice/WEB-INF03"> + <webinf dir="${test.output.dir}/resources/jaxws/jsr181/webservice/WEB-INF03"> <include name="jboss-web.xml"/> </webinf> </war> - <jar jarfile="${build.tests.dir}/libs/jaxws-jsr181-webservice01-ejb21.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxws-jsr181-webservice01-ejb21.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jsr181/webservice/EJB21Bean01.class"/> <include name="org/jboss/test/ws/jaxws/jsr181/webservice/EndpointInterface.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxws/jsr181/webservice/META-INF01"> + <metainf dir="${test.output.dir}/resources/jaxws/jsr181/webservice/META-INF01"> <include name="ejb-jar.xml"/> </metainf> </jar> - <jar jarfile="${build.tests.dir}/libs/jaxws-jsr181-webservice02-ejb21.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxws-jsr181-webservice02-ejb21.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jsr181/webservice/EJB21Bean02.class"/> <include name="org/jboss/test/ws/jaxws/jsr181/webservice/EndpointInterface.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxws/jsr181/webservice/META-INF02"> + <metainf dir="${test.output.dir}/resources/jaxws/jsr181/webservice/META-INF02"> <include name="ejb-jar.xml"/> <include name="wsdl/**"/> </metainf> </jar> - <jar jarfile="${build.tests.dir}/libs/jaxws-jsr181-webservice03-ejb21.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxws-jsr181-webservice03-ejb21.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jsr181/webservice/EJB21Bean03.class"/> <include name="org/jboss/test/ws/jaxws/jsr181/webservice/EndpointInterface03.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxws/jsr181/webservice/META-INF03"> + <metainf dir="${test.output.dir}/resources/jaxws/jsr181/webservice/META-INF03"> <include name="ejb-jar.xml"/> </metainf> </jar> - <jar jarfile="${build.tests.dir}/libs/jaxws-jsr181-webservice01-ejb3.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxws-jsr181-webservice01-ejb3.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jsr181/webservice/EJB3Bean01.class"/> <include name="org/jboss/test/ws/jaxws/jsr181/webservice/EJB3RemoteInterface.class"/> </fileset> </jar> - <jar jarfile="${build.tests.dir}/libs/jaxws-jsr181-webservice02-ejb3.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxws-jsr181-webservice02-ejb3.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jsr181/webservice/EJB3Bean02.class"/> <include name="org/jboss/test/ws/jaxws/jsr181/webservice/EJB3RemoteInterface.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxws/jsr181/webservice/META-INF02"> + <metainf dir="${test.output.dir}/resources/jaxws/jsr181/webservice/META-INF02"> <include name="wsdl/**"/> </metainf> </jar> - <jar jarfile="${build.tests.dir}/libs/jaxws-jsr181-webservice03-ejb3.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxws-jsr181-webservice03-ejb3.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jsr181/webservice/EJB3Bean03.class"/> <include name="org/jboss/test/ws/jaxws/jsr181/webservice/EJB3RemoteInterface.class"/> <include name="org/jboss/test/ws/jaxws/jsr181/webservice/EndpointInterface03.class"/> @@ -305,8 +305,8 @@ </jar> <!-- jaxws-logicalhandler --> - <war warfile="${build.tests.dir}/libs/jaxws-logicalhandler-source.war" webxml="${build.tests.dir}/resources/jaxws/logicalhandler/WEB-INF/web-source.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxws-logicalhandler-source.war" webxml="${test.output.dir}/resources/jaxws/logicalhandler/WEB-INF/web-source.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointSourceImpl.class"/> <include name="org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointSource.class"/> <include name="org/jboss/test/ws/jaxws/logicalhandler/LogicalSourceHandler.class"/> @@ -314,12 +314,12 @@ <include name="org/jboss/test/ws/jaxws/logicalhandler/Echo.class"/> <include name="org/jboss/test/ws/jaxws/logicalhandler/EchoResponse.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxws/logicalhandler/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxws/logicalhandler/WEB-INF"> <include name="jaxws-server-source-handlers.xml"/> </webinf> </war> - <war warfile="${build.tests.dir}/libs/jaxws-logicalhandler-jaxb.war" webxml="${build.tests.dir}/resources/jaxws/logicalhandler/WEB-INF/web-jaxb.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxws-logicalhandler-jaxb.war" webxml="${test.output.dir}/resources/jaxws/logicalhandler/WEB-INF/web-jaxb.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointJAXBImpl.class"/> <include name="org/jboss/test/ws/jaxws/logicalhandler/SOAPEndpointJAXB.class"/> <include name="org/jboss/test/ws/jaxws/logicalhandler/LogicalJAXBHandler.class"/> @@ -328,59 +328,59 @@ <include name="org/jboss/test/ws/jaxws/logicalhandler/EchoResponse.class"/> <include name="org/jboss/test/ws/jaxws/logicalhandler/ObjectFactory.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxws/logicalhandler/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxws/logicalhandler/WEB-INF"> <include name="jaxws-server-jaxb-handlers.xml"/> </webinf> </war> <!-- jaxws-provider-jaxb --> - <war warfile="${build.tests.dir}/libs/jaxws-provider-jaxb.war" webxml="${build.tests.dir}/resources/jaxws/provider/jaxb/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxws-provider-jaxb.war" webxml="${test.output.dir}/resources/jaxws/provider/jaxb/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/provider/ProviderBeanJAXB.class"/> <include name="org/jboss/test/ws/jaxws/provider/WebServiceEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/provider/UserType.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxws/provider/shared"> + <webinf dir="${test.output.dir}/resources/jaxws/provider/shared"> <include name="wsdl/Provider.wsdl"/> </webinf> </war> <!-- jaxws-provider-message --> - <war warfile="${build.tests.dir}/libs/jaxws-provider-message.war" webxml="${build.tests.dir}/resources/jaxws/provider/message/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxws-provider-message.war" webxml="${test.output.dir}/resources/jaxws/provider/message/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/provider/ProviderBeanMessage.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxws/provider/shared"> + <webinf dir="${test.output.dir}/resources/jaxws/provider/shared"> <include name="wsdl/Provider.wsdl"/> </webinf> </war> <!-- jaxws-provider-payload --> - <war warfile="${build.tests.dir}/libs/jaxws-provider-payload.war" webxml="${build.tests.dir}/resources/jaxws/provider/payload/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxws-provider-payload.war" webxml="${test.output.dir}/resources/jaxws/provider/payload/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/provider/ProviderBeanPayload.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxws/provider/shared"> + <webinf dir="${test.output.dir}/resources/jaxws/provider/shared"> <include name="wsdl/Provider.wsdl"/> </webinf> </war> <!-- jaxws-samples-jsr181ejb --> - <jar jarfile="${build.tests.dir}/libs/jaxws-samples-jsr181ejb.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxws-samples-jsr181ejb.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3Bean01.class"/> <include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EJB3RemoteInterface.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxws/samples/jsr181ejb/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxws/samples/jsr181ejb/META-INF"> <include name="jboss-wsse-server.xml"/> <include name="wsse.*"/> </metainf> </jar> - <jar jarfile="${build.tests.dir}/libs/jaxws-samples-jsr181ejb-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxws-samples-jsr181ejb-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/jsr181ejb/EndpointInterface.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxws/samples/jsr181ejb/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxws/samples/jsr181ejb/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="jaxrpc-mapping.xml"/> @@ -391,16 +391,16 @@ </jar> <!-- jaxws-samples-jsr181pojo --> - <war warfile="${build.tests.dir}/libs/jaxws-samples-jsr181pojo.war" webxml="${build.tests.dir}/resources/jaxws/samples/jsr181pojo/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxws-samples-jsr181pojo.war" webxml="${test.output.dir}/resources/jaxws/samples/jsr181pojo/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/JSEBean01.class"/> </classes> </war> - <jar jarfile="${build.tests.dir}/libs/jaxws-samples-jsr181pojo-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxws-samples-jsr181pojo-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/EndpointInterface.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxws/samples/jsr181pojo/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxws/samples/jsr181pojo/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="jaxrpc-mapping.xml"/> @@ -409,18 +409,18 @@ </jar> <!-- jaxws-samples-jsr181pojo-docwrapped --> - <war warfile="${build.tests.dir}/libs/jaxws-samples-jsr181pojo-docwrapped.war" webxml="${build.tests.dir}/resources/jaxws/samples/jsr181pojo/docwrapped/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxws-samples-jsr181pojo-docwrapped.war" webxml="${test.output.dir}/resources/jaxws/samples/jsr181pojo/docwrapped/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/JSEBean01.class"/> </classes> </war> - <jar jarfile="${build.tests.dir}/libs/jaxws-samples-jsr181pojo-docwrapped-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxws-samples-jsr181pojo-docwrapped-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/EndpointInterface.class"/> <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/Concat.class"/> <include name="org/jboss/test/ws/jaxws/samples/jsr181pojo/docwrapped/ConcatResponse.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="jaxrpc-mapping.xml"/> @@ -429,22 +429,22 @@ </jar> <!-- jaxws-samples-wsaddressing --> - <war warfile="${build.tests.dir}/libs/jaxws-samples-wsaddressing.war" webxml="${build.tests.dir}/resources/jaxws/samples/wsaddressing/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxws-samples-wsaddressing.war" webxml="${test.output.dir}/resources/jaxws/samples/wsaddressing/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpointImpl.class"/> <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/ServerHandler.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxws/samples/wsaddressing/WEB-INF"> + <webinf dir="${test.output.dir}/resources/jaxws/samples/wsaddressing/WEB-INF"> <include name="jaxws-handlers.xml"/> </webinf> </war> - <jar destfile="${build.tests.dir}/libs/jaxws-samples-wsaddressing-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar destfile="${test.output.dir}/libs/jaxws-samples-wsaddressing-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/StatefulEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/samples/wsaddressing/ClientHandler.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxws/samples/wsaddressing/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxws/samples/wsaddressing/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="jbossws-client-config.xml"/> @@ -454,21 +454,21 @@ </jar> <!-- jaxws-samples-retail --> - <jar jarfile="${build.tests.dir}/libs/jaxws-samples-retail.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxws-samples-retail.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/retail/**/*.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxws/samples/retail/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxws/samples/retail/META-INF"> <include name="wsdl/*"/> <include name="jaxws-handler.xml"/> </metainf> </jar> - <jar jarfile="${build.tests.dir}/libs/jaxws-samples-retail-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxws-samples-retail-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/retail/**/*.class"/> <exclude name="org/jboss/test/ws/jaxws/samples/retail/**/*Bean.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxws/samples/retail/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxws/samples/retail/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="wsdl/**"/> @@ -476,21 +476,21 @@ </jar> <!-- jaxws-xop-doclit --> - <jar jarfile="${build.tests.dir}/libs/jaxws-xop-doclit.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxws-xop-doclit.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/xop/doclit/**/*.class"/> </fileset> - <!--metainf dir="${build.tests.dir}/resources/jaxws/xop/doclit/META-INF"> + <!--metainf dir="${test.output.dir}/resources/jaxws/xop/doclit/META-INF"> <include name="wsdl/*"/> <include name="jaxws-handler.xml"/> </metainf--> </jar> - <jar jarfile="${build.tests.dir}/libs/jaxws-xop-doclit-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar jarfile="${test.output.dir}/libs/jaxws-xop-doclit-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/xop/doclit/**/*.class"/> <exclude name="org/jboss/test/ws/jaxws/xop/doclit/**/*Bean.class"/> </fileset> - <!--metainf dir="${build.tests.dir}/resources/jaxws/xop/doclit/META-INF"> + <!--metainf dir="${test.output.dir}/resources/jaxws/xop/doclit/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="wsdl/**"/> @@ -498,21 +498,21 @@ </jar> <!-- jaxws-webserviceref --> - <war warfile="${build.tests.dir}/libs/jaxws-webserviceref.war" webxml="${build.tests.dir}/resources/jaxws/webserviceref/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxws-webserviceref.war" webxml="${test.output.dir}/resources/jaxws/webserviceref/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.class"/> <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/> </classes> </war> - <jar destfile="${build.tests.dir}/libs/jaxws-webserviceref-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar destfile="${test.output.dir}/libs/jaxws-webserviceref-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/webserviceref/ApplicationClient.class"/> <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/> <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/webserviceref/EchoResponse.class"/> <include name="org/jboss/test/ws/jaxws/webserviceref/Echo.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxws/webserviceref/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxws/webserviceref/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="wsdl/**"/> @@ -521,21 +521,21 @@ <attribute name="main-class" value="org.jboss.test.ws.jaxws.webserviceref.ApplicationClient"/> </manifest> </jar> - <war destfile="${build.tests.dir}/libs/jaxws-webserviceref-servlet-client.war" webxml="${build.tests.dir}/resources/jaxws/webserviceref/servlet-client/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war destfile="${test.output.dir}/libs/jaxws-webserviceref-servlet-client.war" webxml="${test.output.dir}/resources/jaxws/webserviceref/servlet-client/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/webserviceref/ServletClient.class"/> <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/> <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/webserviceref/EchoResponse.class"/> <include name="org/jboss/test/ws/jaxws/webserviceref/Echo.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxws/webserviceref/META-INF"> + <webinf dir="${test.output.dir}/resources/jaxws/webserviceref/META-INF"> <include name="jboss-web.xml"/> <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${build.tests.dir}/libs/jaxws-webserviceref-ejb3-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar destfile="${test.output.dir}/libs/jaxws-webserviceref-ejb3-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/webserviceref/EJB3Client.class"/> <include name="org/jboss/test/ws/jaxws/webserviceref/EJB3Remote.class"/> <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/> @@ -543,15 +543,15 @@ <include name="org/jboss/test/ws/jaxws/webserviceref/EchoResponse.class"/> <include name="org/jboss/test/ws/jaxws/webserviceref/Echo.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxws/webserviceref/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxws/webserviceref/META-INF"> <include name="jboss.xml"/> <include name="wsdl/**"/> </metainf> </jar> <!-- jaxws-wrapped-accessor --> - <war warfile="${build.tests.dir}/libs/jaxws-wrapped-accessor.war" webxml="${build.tests.dir}/resources/jaxws/wrapped/accessor/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxws-wrapped-accessor.war" webxml="${test.output.dir}/resources/jaxws/wrapped/accessor/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/wrapped/accessor/Accessor.class"/> <include name="org/jboss/test/ws/jaxws/wrapped/accessor/AccessorImpl.class"/> <include name="org/jboss/test/ws/jaxws/wrapped/accessor/jaxws/*"/> @@ -559,8 +559,8 @@ </war> <!-- jaxws-anonymous --> - <war warfile="${build.tests.dir}/libs/jaxws-anonymous.war" webxml="${build.tests.dir}/resources/jaxws/anonymous/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxws-anonymous.war" webxml="${test.output.dir}/resources/jaxws/anonymous/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/anonymous/Anonymous.class"/> <include name="org/jboss/test/ws/jaxws/anonymous/AnonymousRequest.class"/> <include name="org/jboss/test/ws/jaxws/anonymous/AnonymousResponse.class"/> @@ -569,8 +569,8 @@ </war> <!-- jaxws-exception --> - <war warfile="${build.tests.dir}/libs/jaxws-exception.war" webxml="${build.tests.dir}/resources/jaxws/exception/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxws-exception.war" webxml="${test.output.dir}/resources/jaxws/exception/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/exception/ExceptionEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/exception/ExceptionEndpointImpl.class"/> <include name="org/jboss/test/ws/jaxws/exception/UserException.class"/> @@ -578,20 +578,20 @@ </war> <!-- jaxws-wsaddressing-action --> - <war warfile="${build.tests.dir}/libs/jaxws-wsaddressing-action-rpc.war" webxml="${build.tests.dir}/resources/jaxws/wsaddressing/action/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxws-wsaddressing-action-rpc.war" webxml="${test.output.dir}/resources/jaxws/wsaddressing/action/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/wsaddressing/action/ActionRpcEndpointImpl.class"/> <include name="org/jboss/test/ws/jaxws/wsaddressing/action/ActionEndpoint.class"/> </classes> - <webinf dir="${build.tests.dir}/resources/jaxws/wsaddressing/action/META-INF"> + <webinf dir="${test.output.dir}/resources/jaxws/wsaddressing/action/META-INF"> <include name="wsdl/**"/> </webinf> </war> - <jar destfile="${build.tests.dir}/libs/jaxws-wsaddressing-action-rpc-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar destfile="${test.output.dir}/libs/jaxws-wsaddressing-action-rpc-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/wsaddressing/action/ActionEndpoint.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxws/wsaddressing/action/META-INF"> + <metainf dir="${test.output.dir}/resources/jaxws/wsaddressing/action/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="jbossws-client-config.xml"/> @@ -601,50 +601,50 @@ </jar> <!-- jaxws-wsaddressing-replyto --> - <war warfile="${build.tests.dir}/libs/jaxws-wsaddressing-initial.war" webxml="${build.tests.dir}/resources/jaxws/wsaddressing/replyto/Initial-WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxws-wsaddressing-initial.war" webxml="${test.output.dir}/resources/jaxws/wsaddressing/replyto/Initial-WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpointImpl.class"/> <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_RequestStruct.class"/> <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_ResponseStruct.class"/> </classes> </war> - <jar destfile="${build.tests.dir}/libs/jaxws-wsaddressing-initial-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar destfile="${test.output.dir}/libs/jaxws-wsaddressing-initial-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_RequestStruct.class"/> <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/InitialEndpoint_*_ResponseStruct.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxws/wsaddressing/replyto/Initial-META-INF"> + <metainf dir="${test.output.dir}/resources/jaxws/wsaddressing/replyto/Initial-META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="jaxws-jbossws-client-config.xml"/> <include name="jaxrpc-mapping.xml"/> </metainf> </jar> - <war warfile="${build.tests.dir}/libs/jaxws-wsaddressing-replyto.war" webxml="${build.tests.dir}/resources/jaxws/wsaddressing/replyto/ReplyTo-WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxws-wsaddressing-replyto.war" webxml="${test.output.dir}/resources/jaxws/wsaddressing/replyto/ReplyTo-WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpointImpl.class"/> <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_RequestStruct.class"/> <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_ResponseStruct.class"/> </classes> </war> - <jar destfile="${build.tests.dir}/libs/jaxws-wsaddressing-replyto-client.jar"> - <fileset dir="${build.tests.dir}/classes"> + <jar destfile="${test.output.dir}/libs/jaxws-wsaddressing-replyto-client.jar"> + <fileset dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_RequestStruct.class"/> <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/ReplyToEndpoint_*_ResponseStruct.class"/> </fileset> - <metainf dir="${build.tests.dir}/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF"> + <metainf dir="${test.output.dir}/resources/jaxws/wsaddressing/replyto/ReplyTo-META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="jbossws-client-config.xml"/> <include name="jaxrpc-mapping.xml"/> </metainf> </jar> - <war warfile="${build.tests.dir}/libs/jaxws-wsaddressing-faultto.war" webxml="${build.tests.dir}/resources/jaxws/wsaddressing/replyto/FaultTo-WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxws-wsaddressing-faultto.war" webxml="${test.output.dir}/resources/jaxws/wsaddressing/replyto/FaultTo-WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpointImpl.class"/> <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultType.class"/> <include name="org/jboss/test/ws/jaxws/wsaddressing/replyto/FaultToEndpoint.class"/> @@ -652,12 +652,12 @@ </war> <!-- jaxws-jbws1357 --> - <war warfile="${build.tests.dir}/libs/jaxws-jbws1357.war" webxml="${build.tests.dir}/resources/jaxws/jbws1357/WEB-INF/web.xml"> - <classes dir="${build.tests.dir}/classes"> + <war warfile="${test.output.dir}/libs/jaxws-jbws1357.war" webxml="${test.output.dir}/resources/jaxws/jbws1357/WEB-INF/web.xml"> + <classes dir="${test.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1357/JBWS1357.class"/> <include name="org/jboss/test/ws/jaxws/jbws1357/JBWS1357Impl.class"/> </classes> - <fileset dir="${build.tests.dir}/resources/jaxws/jbws1357"> + <fileset dir="${test.output.dir}/resources/jaxws/jbws1357"> <include name="hello.jsp"/> </fileset> </war> Modified: trunk/jbossws/src/test/build.xml =================================================================== --- trunk/jbossws/src/test/build.xml 2006-12-22 13:51:13 UTC (rev 1737) +++ trunk/jbossws/src/test/build.xml 2006-12-22 13:51:18 UTC (rev 1738) @@ -11,29 +11,23 @@ <project name="JBossWS-Tests" default="main" basedir="../.."> <import file="${basedir}/../build/import/build-thirdparty.xml"/> + <import file="${basedir}/../build/import/build-setup.xml"/> - <!-- ================================================================== --> - <!-- Setup --> - <!-- ================================================================== --> + <property name="jbossws.output.dir" value="${jbossws.dir}/output"/> + <property name="jbossws.output.classes.dir" value="${jbossws.output.dir}/classes"/> + <property name="jbossws.output.classes14.dir" value="${jbossws.output.dir}/classes14"/> + <property name="jbossws.output.lib.dir" value="${jbossws.output.dir}/lib"/> - <property file="${basedir}/../build/ant.properties"/> - <property file="${basedir}/../build/version.properties"/> - - <property name="build.dir" value="${basedir}/../build/output"/> - <property name="build.lib.dir" value="${build.dir}/lib"/> - <property name="build.resources.dir" value="${build.dir}/resources"/> - <property name="build.tests.dir" value="${build.dir}/tests"/> <property name="test.dir" value="${basedir}/src/test"/> <property name="test.etc.dir" value="${test.dir}/etc"/> <property name="test.java.dir" value="${test.dir}/java"/> <property name="test.resources.dir" value="${test.dir}/resources"/> + <property name="test.output.dir" value="${jbossws.output.dir}/tests"/> - <property name="thirdparty.dir" value="${basedir}/../build/thirdparty"/> + <!-- ================================================================== --> + <!-- Setup --> + <!-- ================================================================== --> - <!-- JDK Detection --> - <available classname="java.lang.StackTraceElement" property="HAVE_JDK_1.4"/> - <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/> - <!-- Use -Ddebug=true for remote debugging --> <condition property="remote.debug.line" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5006"> <isset property="debug"/> @@ -98,8 +92,8 @@ <fail message="Not available: ${jboss.home}/client/jbossall-client.jar" unless="jbossws.available"/> - <mkdir dir="${build.tests.dir}/log"/> - <touch file="${build.tests.dir}/logtest.log"/> + <mkdir dir="${test.output.dir}/log"/> + <touch file="${test.output.dir}/logtest.log"/> <tstamp> <format property="build.id" pattern="yyyyMMddHHmm"/> @@ -122,7 +116,7 @@ <!-- The jbossws client classpath --> <path id="jbossws.client.classpath"> - <pathelement location="${build.lib.dir}/jbossws-client.jar"/> + <pathelement location="${jbossws.output.lib.dir}/jbossws-client.jar"/> <pathelement location="${jboss.client}/activation.jar"/> <pathelement location="${jboss.client}/commons-logging.jar"/> <pathelement location="${jboss.client}/javassist.jar"/> @@ -151,8 +145,9 @@ <pathelement location="${jboss.server.lib}/jboss.jar"/> <pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/> <pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-ejb3x.jar"/> - <pathelement location="${build.lib.dir}/jbossws-${jboss.integration.target}-integration.jar"/> - <pathelement location="${build.lib.dir}/jbossws-tomcat-integration.jar"/> + <pathelement location="${integration.jboss50.dir}/output/lib/jbossws-${jboss.integration.target}-integration.jar"/> + <pathelement location="${integration.jboss42.dir}/output/lib/jbossws-${jboss.integration.target}-integration.jar"/> + <pathelement location="${integration.tomcat.dir}/output/lib/jbossws-tomcat-integration.jar"/> </path> <!-- @@ -161,8 +156,8 @@ --> <path id="test.client.classpath"> <path refid="jbossws.client.classpath"/> - <pathelement location="${build.lib.dir}/jbossws-${jboss.integration.target}-integration.jar"/> - <pathelement location="${build.lib.dir}/jbossws-tomcat-integration.jar"/> + <pathelement location="${jbossws.output.lib.dir}/jbossws-${jboss.integration.target}-integration.jar"/> + <pathelement location="${jbossws.output.lib.dir}/jbossws-tomcat-integration.jar"/> <pathelement location="${jboss.client}/jboss-aspect-jdk50-client.jar"/> <pathelement location="${jboss.client}/jboss-aop-jdk50-client.jar"/> <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/> @@ -185,8 +180,8 @@ <target name="compile" depends="compile14, compile15" description="Compile sources"/> <target name="compile14" depends="init" unless="HAVE_JDK_1.5"> - <mkdir dir="${build.tests.dir}/classes"/> - <javac destdir="${build.tests.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> + <mkdir dir="${test.output.dir}/classes"/> + <javac destdir="${test.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> <src path="${test.java.dir}"/> <exclude name="org/jboss/test/ws/interop/**"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws718/**"/> @@ -197,8 +192,8 @@ </target> <target name="compile15" depends="init" if="HAVE_JDK_1.5"> - <mkdir dir="${build.tests.dir}/classes"/> - <javac destdir="${build.tests.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> + <mkdir dir="${test.output.dir}/classes"/> + <javac destdir="${test.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> <src path="${test.java.dir}"/> <exclude name="org/jboss/test/ws/interop/**"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws718/**"/> @@ -207,19 +202,19 @@ </target> <target name="compile-generated" depends="init" description="Compile generated sources"> - <mkdir dir="${build.tests.dir}/classes"/> - <javac destdir="${build.tests.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> - <src path="${build.tests.dir}/wstools/java"/> + <mkdir dir="${test.output.dir}/classes"/> + <javac destdir="${test.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> + <src path="${test.output.dir}/wstools/java"/> <exclude name="org/jboss/test/ws/interop/**"/> <classpath refid="javac.classpath"/> </javac> </target> <target name="copy-resources" depends="init" description="Copy the deployment resources."> - <copy todir="${build.tests.dir}/classes" file="${test.etc.dir}/jndi.properties"/> - <copy todir="${build.tests.dir}/classes" file="${test.etc.dir}/log4j.xml"/> + <copy todir="${test.output.dir}/classes" file="${test.etc.dir}/jndi.properties"/> + <copy todir="${test.output.dir}/classes" file="${test.etc.dir}/log4j.xml"/> <!-- Copy resources --> - <copy todir="${build.tests.dir}/resources"> + <copy todir="${test.output.dir}/resources"> <fileset dir="${test.resources.dir}"> <include name="**/*.wsdl"/> <include name="**/*.xml"/> @@ -227,11 +222,11 @@ </fileset> <filterset> <filter token="jbosstest.host.name" value="${node0}"/> - <filter token="wsdl-publish-location" value="${build.tests.dir}/wsdl-publish"/> + <filter token="wsdl-publish-location" value="${test.output.dir}/wsdl-publish"/> </filterset> </copy> <!-- Copy binary files --> - <copy todir="${build.tests.dir}/resources"> + <copy todir="${test.output.dir}/resources"> <fileset dir="${test.resources.dir}"> <exclude name="**/*.wsdl"/> <exclude name="**/*.xml"/> @@ -244,8 +239,8 @@ <!-- ================================================================== --> <target name="main" depends="compile,copy-resources,generate-sources,compile-generated,copy-generated" description="Build the deployments."> - <mkdir dir="${build.tests.dir}/reports"/> - <mkdir dir="${build.tests.dir}/libs"/> + <mkdir dir="${test.output.dir}/reports"/> + <mkdir dir="${test.output.dir}/libs"/> <ant antfile="${test.dir}/ant/build-jars-jaxrpc.xml" target="build-jars" inheritall="true"/> <ant antfile="${test.dir}/ant/build-jars-jaxws.xml" target="build-jars" inheritall="true"/> </target> @@ -256,47 +251,47 @@ <target name="generate-sources" depends="compile" description="Generate the deployment resources."> <taskdef name="wstools" classname="org.jboss.ws.tools.ant.wstools"> <classpath refid="jbossws.client.classpath"/> - <classpath location="${build.tests.dir}/classes"/> - <classpath location="${build.tests.dir}"/> + <classpath location="${test.output.dir}/classes"/> + <classpath location="${test.output.dir}"/> </taskdef> - <mkdir dir="${build.tests.dir}/wstools/java"/> - <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/jbws718/WEB-INF" config="${test.resources.dir}/jaxrpc/jbws718/wstools-config.xml"/> - <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/docstyle/wrapped/wstools-config.xml"/> - <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/docstyle/bare/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/docstyle/bare/wstools-config.xml"/> - <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/dynamichandler/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/dynamichandler/wstools-config.xml"/> - <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/exception/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/exception/wstools-config.xml"/> - <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/handler/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/handler/wstools-config.xml"/> - <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/holder/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/holder/wstools-config.xml"/> - <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/jmstransport/META-INF" config="${test.resources.dir}/jaxrpc/samples/jmstransport/wstools-config.xml"/> - <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF" config="${test.resources.dir}/jaxrpc/samples/jsr109ejb/doclit/wstools-config.xml"/> - <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF" config="${test.resources.dir}/jaxrpc/samples/jsr109ejb/rpclit/wstools-config.xml"/> - <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/jsr109pojo/doclit/wstools-config.xml"/> - <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/jsr109pojo/rpclit/wstools-config.xml"/> - <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/message/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/message/wstools-config.xml"/> - <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/oneway/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/oneway/wstools-config.xml"/> - <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/rpcstyle/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/rpcstyle/wstools-config.xml"/> - <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/secureejb/META-INF" config="${test.resources.dir}/jaxrpc/samples/secureejb/wstools-config.xml"/> - <wstools dest="${build.tests.dir}/wstools/resources/jaxrpc/samples/wssecurity/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/wssecurity/wstools-config.xml"/> - <wstools dest="${build.tests.dir}/wstools/resources/jaxws/samples/jsr181ejb/META-INF" config="${test.resources.dir}/jaxws/samples/jsr181ejb/wstools-config.xml"/> - <wstools dest="${build.tests.dir}/wstools/resources/jaxws/samples/jsr181pojo/META-INF" config="${test.resources.dir}/jaxws/samples/jsr181pojo/wstools-config.xml"/> - <wstools dest="${build.tests.dir}/wstools/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF" config="${test.resources.dir}/jaxws/samples/jsr181pojo/docwrapped/wstools-config.xml"/> - <wstools dest="${build.tests.dir}/wstools/resources/jaxws/samples/wsaddressing/META-INF" config="${test.resources.dir}/jaxws/samples/wsaddressing/wstools-config.xml"/> - <move todir="${build.tests.dir}/wstools/java"> - <fileset dir="${build.tests.dir}/wstools/resources/jaxrpc/jbws718/WEB-INF" includes="org/**"/> - <fileset dir="${build.tests.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/> + <mkdir dir="${test.output.dir}/wstools/java"/> + <wstools dest="${test.output.dir}/wstools/resources/jaxrpc/jbws718/WEB-INF" config="${test.resources.dir}/jaxrpc/jbws718/wstools-config.xml"/> + <wstools dest="${test.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/docstyle/wrapped/wstools-config.xml"/> + <wstools dest="${test.output.dir}/wstools/resources/jaxrpc/samples/docstyle/bare/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/docstyle/bare/wstools-config.xml"/> + <wstools dest="${test.output.dir}/wstools/resources/jaxrpc/samples/dynamichandler/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/dynamichandler/wstools-config.xml"/> + <wstools dest="${test.output.dir}/wstools/resources/jaxrpc/samples/exception/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/exception/wstools-config.xml"/> + <wstools dest="${test.output.dir}/wstools/resources/jaxrpc/samples/handler/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/handler/wstools-config.xml"/> + <wstools dest="${test.output.dir}/wstools/resources/jaxrpc/samples/holder/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/holder/wstools-config.xml"/> + <wstools dest="${test.output.dir}/wstools/resources/jaxrpc/samples/jmstransport/META-INF" config="${test.resources.dir}/jaxrpc/samples/jmstransport/wstools-config.xml"/> + <wstools dest="${test.output.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/doclit/META-INF" config="${test.resources.dir}/jaxrpc/samples/jsr109ejb/doclit/wstools-config.xml"/> + <wstools dest="${test.output.dir}/wstools/resources/jaxrpc/samples/jsr109ejb/rpclit/META-INF" config="${test.resources.dir}/jaxrpc/samples/jsr109ejb/rpclit/wstools-config.xml"/> + <wstools dest="${test.output.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/doclit/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/jsr109pojo/doclit/wstools-config.xml"/> + <wstools dest="${test.output.dir}/wstools/resources/jaxrpc/samples/jsr109pojo/rpclit/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/jsr109pojo/rpclit/wstools-config.xml"/> + <wstools dest="${test.output.dir}/wstools/resources/jaxrpc/samples/message/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/message/wstools-config.xml"/> + <wstools dest="${test.output.dir}/wstools/resources/jaxrpc/samples/oneway/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/oneway/wstools-config.xml"/> + <wstools dest="${test.output.dir}/wstools/resources/jaxrpc/samples/rpcstyle/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/rpcstyle/wstools-config.xml"/> + <wstools dest="${test.output.dir}/wstools/resources/jaxrpc/samples/secureejb/META-INF" config="${test.resources.dir}/jaxrpc/samples/secureejb/wstools-config.xml"/> + <wstools dest="${test.output.dir}/wstools/resources/jaxrpc/samples/wssecurity/WEB-INF" config="${test.resources.dir}/jaxrpc/samples/wssecurity/wstools-config.xml"/> + <wstools dest="${test.output.dir}/wstools/resources/jaxws/samples/jsr181ejb/META-INF" config="${test.resources.dir}/jaxws/samples/jsr181ejb/wstools-config.xml"/> + <wstools dest="${test.output.dir}/wstools/resources/jaxws/samples/jsr181pojo/META-INF" config="${test.resources.dir}/jaxws/samples/jsr181pojo/wstools-config.xml"/> + <wstools dest="${test.output.dir}/wstools/resources/jaxws/samples/jsr181pojo/docwrapped/META-INF" config="${test.resources.dir}/jaxws/samples/jsr181pojo/docwrapped/wstools-config.xml"/> + <wstools dest="${test.output.dir}/wstools/resources/jaxws/samples/wsaddressing/META-INF" config="${test.resources.dir}/jaxws/samples/wsaddressing/wstools-config.xml"/> + <move todir="${test.output.dir}/wstools/java"> + <fileset dir="${test.output.dir}/wstools/resources/jaxrpc/jbws718/WEB-INF" includes="org/**"/> + <fileset dir="${test.output.dir}/wstools/resources/jaxrpc/samples/docstyle/wrapped/WEB-INF" includes="org/**"/> </move> </target> <target name="copy-generated" depends="init" description="Copy the deployment resources."> <!-- Copy generated resources --> - <copy todir="${build.tests.dir}/resources"> - <fileset dir="${build.tests.dir}/wstools/resources"> + <copy todir="${test.output.dir}/resources"> + <fileset dir="${test.output.dir}/wstools/resources"> <include name="**/*.wsdl"/> <include name="**/*.xml"/> </fileset> </copy> <!-- Copy resources that cannot (yet) be generated --> - <copy todir="${build.tests.dir}/resources/jaxrpc/samples" overwrite="true"> + <copy todir="${test.output.dir}/resources/jaxrpc/samples" overwrite="true"> <fileset dir="${test.resources.dir}/jaxrpc/samples-override"/> <filterset> <filter token="jbosstest.host.name" value="${node0}"/> @@ -364,14 +359,14 @@ <!-- Common test target --> <target name="tests-main" depends="init"> - <junit printsummary="yes" showoutput="yes" dir="${build.tests.dir}"> + <junit printsummary="yes" showoutput="yes" dir="${test.output.dir}"> <jvmarg value="-Djava.security.manager"/> <sysproperty key="java.security.policy" value="${test.etc.dir}/tst.policy"/> <sysproperty key="jboss.home" value="${jboss.home}"/> <sysproperty key="tomcat.home" value="${tomcat.home}"/> <sysproperty key="jbosstest.host.name" value="${node0}"/> <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/> - <sysproperty key="build.testlog" value="${build.tests.dir}/log"/> + <sysproperty key="build.testlog" value="${test.output.dir}/log"/> <sysproperty key="java.endorsed.dirs" value="${jboss.home}/lib/endorsed"/> <sysproperty key="jbosstest.server.host" value="${node0}"/> <sysproperty key="jbossws.target.server" value="${jbossws.target.server}"/> @@ -386,12 +381,12 @@ <sysproperty key="client.scenario" value="${client.scenario}"/> <classpath> <path refid="test.client.classpath"/> - <pathelement location="${build.tests.dir}/classes"/> + <pathelement location="${test.output.dir}/classes"/> </classpath> <formatter type="plain" usefile="true"/> <formatter type="xml" usefile="true"/> - <batchtest todir="${build.tests.dir}/reports" fork="true"> - <fileset dir="${build.tests.dir}/classes" includes="${include.wildcard}" excludes="${exclude.wildcard}" excludesfile="${excludesfile}"/> + <batchtest todir="${test.output.dir}/reports" fork="true"> + <fileset dir="${test.output.dir}/classes" includes="${include.wildcard}" excludes="${exclude.wildcard}" excludesfile="${excludesfile}"/> </batchtest> </junit> </target> @@ -401,7 +396,7 @@ ant -Dtest=org.jboss.test.ws.jaxrpc.samples.jsr109pojo.RpcJSETestCase one-test --> <target name="one-test" depends="init" if="test" description="Run a single unit test"> - <junit printsummary="yes" showoutput="yes" dir="${build.tests.dir}"> + <junit printsummary="yes" showoutput="yes" dir="${test.output.dir}"> <jvmarg line="${remote.debug.line}"/> <jvmarg value="-Djava.security.manager"/> <sysproperty key="java.security.policy" value="${test.etc.dir}/tst.policy"/> @@ -409,7 +404,7 @@ <sysproperty key="tomcat.home" value="${tomcat.home}"/> <sysproperty key="jbosstest.host.name" value="${node0}"/> <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/> - <sysproperty key="build.testlog" value="${build.tests.dir}/log"/> + <sysproperty key="build.testlog" value="${test.output.dir}/log"/> <sysproperty key="java.endorsed.dirs" value="${jboss.home}/lib/endorsed"/> <sysproperty key="jbosstest.server.host" value="${node0}"/> <sysproperty key="jbossws.target.server" value="${jbossws.target.server}"/> @@ -435,11 +430,11 @@ <sysproperty key="org.jboss.ws.wsse.trustStoreType" value="jks"/> <classpath> <path refid="test.client.classpath"/> - <pathelement location="${build.tests.dir}/classes"/> + <pathelement location="${test.output.dir}/classes"/> </classpath> <formatter type="plain" usefile="true"/> <formatter type="xml" usefile="true"/> - <test todir="${build.tests.dir}/reports" name="${test}" fork="true"/> + <test todir="${test.output.dir}/reports" name="${test}" fork="true"/> </junit> </target> @@ -449,14 +444,14 @@ <!-- Build the tests report --> <target name="tests-report" depends="init" description="Build the tests report"> - <junitreport todir="${build.tests.dir}/reports"> - <fileset dir="${build.tests.dir}/reports"> + <junitreport todir="${test.output.dir}/reports"> + <fileset dir="${test.output.dir}/reports"> <include name="TEST-*.xml"/> </fileset> - <report format="frames" todir="${build.tests.dir}/reports/html"/> + <report format="frames" todir="${test.output.dir}/reports/html"/> </junitreport> - <zip destfile="${build.tests.dir}/test-report-${build.id}.zip"> - <fileset dir="${build.tests.dir}" includes="reports/**"/> + <zip destfile="${test.output.dir}/test-report-${build.id}.zip"> + <fileset dir="${test.output.dir}" includes="reports/**"/> </zip> </target> @@ -465,7 +460,7 @@ <!-- ================================================================== --> <target name="clean" description="Delete all generated test files."> - <delete dir="${build.tests.dir}"/> + <delete dir="${test.output.dir}"/> </target> </project>