[jbossws-commits] JBossWS SVN: r6230 - framework/trunk/src/test/ant-import.

Author: thomas.diesler(a)jboss.com Date: 2008-04-04 07:04:45 -0400 (Fri, 04 Apr 2008) New Revision: 6230 Modified: framework/trunk/src/test/ant-import/build-jars-jaxws.xml Log: [JBWS-2096] Migrate common jax-ws tests to framework (WIP) Modified: framework/trunk/src/test/ant-import/build-jars-jaxws.xml =================================================================== --- framework/trunk/src/test/ant-import/build-jars-jaxws.xml 2008-04-04 10:54:48 UTC (rev 6229) +++ framework/trunk/src/test/ant-import/build-jars-jaxws.xml 2008-04-04 11:04:45 UTC (rev 6230) @@ -21,7 +21,7 @@ <mkdir dir="${tests.output.dir}/libs"/> <!-- jaxws-anonymous --> - <war warfile="${tests.output.dir}/libs/jaxws-anonymous.war" webxml="${tests.output.dir}/resources/jaxws/anonymous/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-anonymous.war" webxml="${tests.output.dir}/resources/anonymous/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/anonymous/Anonymous.class"/> <include name="org/jboss/test/ws/jaxws/anonymous/AnonymousRequest.class"/> @@ -31,7 +31,7 @@ </war> <!-- jaxws-binding --> - <war warfile="${tests.output.dir}/libs/jaxws-binding.war" webxml="${tests.output.dir}/resources/jaxws/binding/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-binding.war" webxml="${tests.output.dir}/resources/binding/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/binding/SOAPEndpointBean.class"/> <include name="org/jboss/test/ws/jaxws/binding/SOAPEndpoint.class"/> @@ -55,7 +55,7 @@ </jar> <!-- jaxws-complex --> - <war warfile="${tests.output.dir}/libs/jaxws-complex.war" webxml="${tests.output.dir}/resources/jaxws/complex/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-complex.war" webxml="${tests.output.dir}/resources/complex/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/complex/*.class"/> <include name="org/jboss/test/ws/jaxws/complex/extra/*.class"/> @@ -65,19 +65,19 @@ </war> <!-- jaxws-endpoint-servlet --> - <war warfile="${tests.output.dir}/libs/jaxws-endpoint-servlet.war" webxml="${tests.output.dir}/resources/jaxws/endpoint/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-endpoint-servlet.war" webxml="${tests.output.dir}/resources/endpoint/WEB-INF/web.xml"> <classes dir="${tests.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="${tests.output.dir}/resources/jaxws/endpoint/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/endpoint/WEB-INF"> <include name="wsdl/**"/> </webinf> </war> <!-- jaxws-handlerscope --> - <war warfile="${tests.output.dir}/libs/jaxws-handlerscope.war" webxml="${tests.output.dir}/resources/jaxws/handlerscope/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-handlerscope.war" webxml="${tests.output.dir}/resources/handlerscope/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/handlerscope/SOAPEndpointBean.class"/> <include name="org/jboss/test/ws/jaxws/handlerscope/SOAPEndpoint.class"/> @@ -87,19 +87,19 @@ </war> <!-- jaxws-holder --> - <war warfile="${tests.output.dir}/libs/jaxws-holder.war" webxml="${tests.output.dir}/resources/jaxws/holder/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-holder.war" webxml="${tests.output.dir}/resources/holder/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/holder/HolderServiceImpl.class"/> </classes> </war> <!-- jaxws-jbws860 --> - <war warfile="${tests.output.dir}/libs/jaxws-jbws860.war" webxml="${tests.output.dir}/resources/jaxws/jbws860/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-jbws860.war" webxml="${tests.output.dir}/resources/jbws860/WEB-INF/web.xml"> <classes dir="${tests.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="${tests.output.dir}/resources/jaxws/jbws860/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jbws860/WEB-INF"> <include name="jboss-web.xml"/> </webinf> </war> @@ -124,7 +124,7 @@ </jar> <!-- jaxws-jbws1190 --> - <war destfile="${tests.output.dir}/libs/jaxws-jbws1190.war" webxml="${tests.output.dir}/resources/jaxws/jbws1190/WEB-INF/web.xml"> + <war destfile="${tests.output.dir}/libs/jaxws-jbws1190.war" webxml="${tests.output.dir}/resources/jbws1190/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1190/ConfidentialEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/jbws1190/TestEndpoint.class"/> @@ -141,12 +141,12 @@ </jar> <!-- jaxws-jbws1357 --> - <war warfile="${tests.output.dir}/libs/jaxws-jbws1357.war" webxml="${tests.output.dir}/resources/jaxws/jbws1357/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-jbws1357.war" webxml="${tests.output.dir}/resources/jbws1357/WEB-INF/web.xml"> <classes dir="${tests.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="${tests.output.dir}/resources/jaxws/jbws1357"> + <fileset dir="${tests.output.dir}/resources/jbws1357"> <include name="hello.jsp"/> </fileset> </war> @@ -175,7 +175,7 @@ </jar> <!-- jaxws-jbws1529 --> - <war warfile="${tests.output.dir}/libs/jaxws-jbws1529.war" webxml="${tests.output.dir}/resources/jaxws/jbws1529/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-jbws1529.war" webxml="${tests.output.dir}/resources/jbws1529/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1529/UserException.class"/> <include name="org/jboss/test/ws/jaxws/jbws1529/JBWS1529.class"/> @@ -194,7 +194,7 @@ <fileset dir="${tests.output.dir}/libs"> <include name="jaxws-jbws1556.jar"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1556/META-INF"> + <metainf dir="${tests.output.dir}/resources/jbws1556/META-INF"> <include name="application.xml"/> <include name="jboss-app.xml"/> </metainf> @@ -208,12 +208,12 @@ </jar> <!-- jaxws-jbws1581 --> - <war warfile="${tests.output.dir}/libs/jaxws-jbws1581.war" webxml="${tests.output.dir}/resources/jaxws/jbws1581/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-jbws1581.war" webxml="${tests.output.dir}/resources/jbws1581/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointBean.class"/> <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/jbws1581/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jbws1581/WEB-INF"> <include name="jboss-web.xml"/> </webinf> </war> @@ -221,7 +221,7 @@ <fileset dir="${tests.output.dir}/libs"> <include name="jaxws-jbws1581.war"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1581/META-INF"> + <metainf dir="${tests.output.dir}/resources/jbws1581/META-INF"> <include name="application.xml"/> <include name="jboss-app.xml"/> </metainf> @@ -232,20 +232,20 @@ <include name="org/jboss/test/ws/jaxws/jbws1581/EJB3Remote.class"/> <include name="org/jboss/test/ws/jaxws/jbws1581/EndpointInterface.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1581/META-INF"> + <metainf dir="${tests.output.dir}/resources/jbws1581/META-INF"> <include name="wsdl/**"/> </metainf> </jar> <!-- jaxws-jbws1611 --> - <war destfile="${tests.output.dir}/libs/jaxws-jbws1611.war" webxml="${tests.output.dir}/resources/jaxws/jbws1611/WEB-INF/web.xml"> + <war destfile="${tests.output.dir}/libs/jaxws-jbws1611.war" webxml="${tests.output.dir}/resources/jbws1611/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1611/PingEndpointImpl.class"/> </classes> </war> <!-- jaxws-jbws1666 --> - <war destfile="${tests.output.dir}/libs/jaxws-jbws1666.war" webxml="${tests.output.dir}/resources/jaxws/jbws1666/WEB-INF/web.xml"> + <war destfile="${tests.output.dir}/libs/jaxws-jbws1666.war" webxml="${tests.output.dir}/resources/jbws1666/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1666/TestEndpointImpl.class"/> </classes> @@ -259,15 +259,15 @@ </jar> <!-- jaxws-jbws1702 --> - <war destfile="${tests.output.dir}/libs/jaxws-jbws1702.war" webxml="${tests.output.dir}/resources/jaxws/jbws1702/WEB-INF/web.xml"> + <war destfile="${tests.output.dir}/libs/jaxws-jbws1702.war" webxml="${tests.output.dir}/resources/jbws1702/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1702/**/*.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/jbws1702/WEB-INF"/> + <webinf dir="${tests.output.dir}/resources/jbws1702/WEB-INF"/> </war> <!-- jaxws-jbws1733 --> - <war warfile="${tests.output.dir}/libs/jaxws-jbws1733.war" webxml="${tests.output.dir}/resources/jaxws/jbws1733/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-jbws1733.war" webxml="${tests.output.dir}/resources/jbws1733/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1733/JBWS1733.class"/> <include name="org/jboss/test/ws/jaxws/jbws1733/JBWS1733Impl.class"/> @@ -282,12 +282,12 @@ </jar> <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.jar"/> <unjar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.jar" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.jar"/> - <war warfile="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" webxml="${tests.output.dir}/resources/jaxws/jbws1762/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" webxml="${tests.output.dir}/resources/jbws1762/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1762/services/POJOBean.class"/> <include name="org/jboss/test/ws/jaxws/jbws1762/services/POJOIface.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/jbws1762/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jbws1762/WEB-INF"> <include name="jboss-web.xml"/> </webinf> </war> @@ -297,31 +297,31 @@ <fileset dir="${tests.output.dir}/libs"> <include name="jaxws-jbws1762-packaged.war"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1762/META-INF"> + <metainf dir="${tests.output.dir}/resources/jbws1762/META-INF"> <include name="jboss-service.xml"/> </metainf> </jar> <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar"/> <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar/META-INF"/> - <copy file="${tests.output.dir}/resources/jaxws/jbws1762/META-INF/jboss-service.xml" todir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar/META-INF"/> + <copy file="${tests.output.dir}/resources/jbws1762/META-INF/jboss-service.xml" todir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar/META-INF"/> <unwar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.sar/jaxws-jbws1762-exploded.war"/> <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1762-packaged.ear"> <fileset dir="${tests.output.dir}/libs"> <include name="jaxws-jbws1762-packaged.jar"/> <include name="jaxws-jbws1762-packaged.war"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1762/META-INF/packaged"> + <metainf dir="${tests.output.dir}/resources/jbws1762/META-INF/packaged"> <include name="application.xml"/> </metainf> </jar> <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear"/> <mkdir dir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/META-INF"/> - <copy file="${tests.output.dir}/resources/jaxws/jbws1762/META-INF/exploded/application.xml" todir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/META-INF"/> + <copy file="${tests.output.dir}/resources/jbws1762/META-INF/exploded/application.xml" todir="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/META-INF"/> <unwar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.war" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/jaxws-jbws1762-exploded.war"/> <unjar src="${tests.output.dir}/libs/jaxws-jbws1762-packaged.jar" dest="${tests.output.dir}/libs/jaxws-jbws1762-exploded.ear/jaxws-jbws1762-exploded.jar"/> <!-- jaxws-jbws1797 --> - <war destfile="${tests.output.dir}/libs/jaxws-jbws1797.war" webxml="${tests.output.dir}/resources/jaxws/jbws1797/WEB-INF/web.xml"> + <war destfile="${tests.output.dir}/libs/jaxws-jbws1797.war" webxml="${tests.output.dir}/resources/jbws1797/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1797/*.class"/> <exclude name="org/jboss/test/ws/jaxws/jbws1797/*TestCase.class"/> @@ -329,12 +329,12 @@ </war> <!-- jaxws-jbws1798 --> - <war warfile="${tests.output.dir}/libs/jaxws-jbws1798.war" webxml="${tests.output.dir}/resources/jaxws/jbws1798/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-jbws1798.war" webxml="${tests.output.dir}/resources/jbws1798/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1798/**/*.class"/> <exclude name="org/jboss/test/ws/jaxws/jbws1798/*TestCase.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/jbws1798/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jbws1798/WEB-INF"> <include name="wsdl/**"/> </webinf> </war> @@ -348,11 +348,11 @@ </jar> <!-- jaxws-jbws1807 --> - <war warfile="${tests.output.dir}/libs/jaxws-jbws1807.war" webxml="${tests.output.dir}/resources/jaxws/jbws1807/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-jbws1807.war" webxml="${tests.output.dir}/resources/jbws1807/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1807/ProviderImpl.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/jbws1807/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jbws1807/WEB-INF"> <include name="wsdl/**"/> </webinf> </war> @@ -363,7 +363,7 @@ <include name="org/jboss/test/ws/jaxws/jbws1809/*.class"/> <exclude name="org/jboss/test/ws/jaxws/jbws1809/*TestCase.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1809/META-INF"/> + <metainf dir="${tests.output.dir}/resources/jbws1809/META-INF"/> </jar> <!-- jaxws-jbws1813 --> @@ -371,7 +371,7 @@ <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1813/EndpointImpl.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1813/META-INF"> + <metainf dir="${tests.output.dir}/resources/jbws1813/META-INF"> <include name="jboss.xml"/> </metainf> </jar> @@ -379,7 +379,7 @@ <fileset dir="${tests.output.dir}/libs"> <include name="jaxws-jbws1813.jar"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1813/META-INF"> + <metainf dir="${tests.output.dir}/resources/jbws1813/META-INF"> <include name="application.xml"/> </metainf> </jar> @@ -389,7 +389,7 @@ <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1815/ProviderImpl.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1815/META-INF"> + <metainf dir="${tests.output.dir}/resources/jbws1815/META-INF"> <include name="wsdl/my-service.wsdl"/> </metainf> </jar> @@ -415,15 +415,15 @@ <include name="org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3RemoteIface.class"/> </fileset> </jar> - <ear appxml="${tests.output.dir}/resources/jaxws/jbws1822/two-ejb-modules/META-INF/application.xml" + <ear appxml="${tests.output.dir}/resources/jbws1822/two-ejb-modules/META-INF/application.xml" earfile="${tests.output.dir}/libs/jaxws-jbws1822-two-ejb-modules.ear"> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1822/two-ejb-modules/META-INF"> + <metainf dir="${tests.output.dir}/resources/jbws1822/two-ejb-modules/META-INF"> <include name="jboss-app.xml"/><!-- this fixes the problem --> </metainf> <fileset file="${tests.output.dir}/libs/jaxws-jbws1822-shared.jar" /> <fileset file="${tests.output.dir}/libs/jaxws-jbws1822-one-ejb3-inside.jar" /> </ear> - <ear appxml="${tests.output.dir}/resources/jaxws/jbws1822/one-ejb-module/META-INF/application.xml" + <ear appxml="${tests.output.dir}/resources/jbws1822/one-ejb-module/META-INF/application.xml" earfile="${tests.output.dir}/libs/jaxws-jbws1822-one-ejb-module.ear"> <fileset file="${tests.output.dir}/libs/jaxws-jbws1822-two-ejb3-inside.jar" /> </ear> @@ -440,7 +440,7 @@ <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1841/*.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1841/META-INF"> + <metainf dir="${tests.output.dir}/resources/jbws1841/META-INF"> <include name="wsdl/*"/> <include name="ejb-jar.xml"/> <include name="jboss.xml"/> @@ -448,12 +448,12 @@ </jar> <!-- jaxws-jbws1843 --> - <war warfile="${tests.output.dir}/libs/jaxws-jbws1843.war" webxml="${tests.output.dir}/resources/jaxws/jbws1843/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-jbws1843.war" webxml="${tests.output.dir}/resources/jbws1843/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1843/**/*.class"/> <exclude name="org/jboss/test/ws/jaxws/jbws1843/*TestCase.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/jbws1843/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jbws1843/WEB-INF"> <include name="wsdl/**"/> </webinf> </war> @@ -467,11 +467,11 @@ </jar> <!-- jaxws-jbws1854 --> - <war destfile="${tests.output.dir}/libs/jaxws-jbws1854.war" webxml="${tests.output.dir}/resources/jaxws/jbws1854/WEB-INF/web.xml"> + <war destfile="${tests.output.dir}/libs/jaxws-jbws1854.war" webxml="${tests.output.dir}/resources/jbws1854/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1854/TestEndpointImpl.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/jbws1854/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jbws1854/WEB-INF"> <include name="jboss-web.xml"/> </webinf> </war> @@ -479,7 +479,7 @@ <fileset dir="${tests.output.dir}/libs"> <include name="jaxws-jbws1854.war"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1854/META-INF"> + <metainf dir="${tests.output.dir}/resources/jbws1854/META-INF"> <include name="jboss-service.xml"/> </metainf> </jar> @@ -515,7 +515,7 @@ <include name="org/jboss/test/ws/jaxws/jbws1969/*.class"/> <exclude name="org/jboss/test/ws/jaxws/jbws1969/*TestCase.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/jbws1969/META-INF"> + <metainf dir="${tests.output.dir}/resources/jbws1969/META-INF"> <include name="wsdl/**"/> </metainf> </jar> @@ -529,30 +529,30 @@ </jar> <!-- jaxws-jbws2009 --> - <war warfile="${tests.output.dir}/libs/jaxws-jbws2009.war" webxml="${tests.output.dir}/resources/jaxws/jbws2009/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-jbws2009.war" webxml="${tests.output.dir}/resources/jbws2009/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws2009/**/*.class"/> <exclude name="org/jboss/test/ws/jaxws/jbws2009/*TestCase.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/jbws2009/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/jbws2009/WEB-INF"> <include name="wsdl/**"/> <include name="schema/**"/> </webinf> </war> <!-- jaxws namespace --> - <war warfile="${tests.output.dir}/libs/jaxws-namespace.war" webxml="${tests.output.dir}/resources/jaxws/namespace/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-namespace.war" webxml="${tests.output.dir}/resources/namespace/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/namespace/EndpointBean.class"/> <include name="org/jboss/test/ws/jaxws/namespace/EndpointInterface.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/namespace/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/namespace/WEB-INF"> <include name="jboss-web.xml"/> </webinf> </war> <!-- jaxws-samples-asynchronous --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-asynchronous.war" webxml="${tests.output.dir}/resources/jaxws/samples/asynchronous/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-asynchronous.war" webxml="${tests.output.dir}/resources/samples/asynchronous/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/samples/asynchronous/TestEndpointBean.class"/> @@ -560,11 +560,11 @@ </war> <!-- jaxws-samples-context --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-context.war" webxml="${tests.output.dir}/resources/jaxws/samples/context/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-context.war" webxml="${tests.output.dir}/resources/samples/context/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/context/EndpointJSE.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/context/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/samples/context/WEB-INF"> <include name="jboss-web.xml"/> </webinf> </war> @@ -572,17 +572,17 @@ <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/context/EndpointEJB.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/context/META-INF"> + <metainf dir="${tests.output.dir}/resources/samples/context/META-INF"> <include name="jboss.xml"/> </metainf> </jar> <!-- jaxws-samples-eardeployment --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-eardeployment.war" webxml="${tests.output.dir}/resources/jaxws/samples/eardeployment/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-eardeployment.war" webxml="${tests.output.dir}/resources/samples/eardeployment/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/eardeployment/JSEBean.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/eardeployment/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/samples/eardeployment/WEB-INF"> <include name="jboss-web.xml"/> <include name="wsdl/**"/> </webinf> @@ -591,7 +591,7 @@ <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/eardeployment/EJB3Bean.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/eardeployment/WEB-INF"> + <metainf dir="${tests.output.dir}/resources/samples/eardeployment/WEB-INF"> <include name="wsdl/**"/> </metainf> </jar> @@ -600,7 +600,7 @@ <include name="jaxws-samples-eardeployment.jar"/> <include name="jaxws-samples-eardeployment.war"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/eardeployment/META-INF"> + <metainf dir="${tests.output.dir}/resources/samples/eardeployment/META-INF"> <include name="jboss-app.xml"/> </metainf> </jar> @@ -609,13 +609,13 @@ <include name="jaxws-samples-eardeployment.jar"/> <include name="jaxws-samples-eardeployment.war"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/eardeployment/META-INF"> + <metainf dir="${tests.output.dir}/resources/samples/eardeployment/META-INF"> <include name="application.xml"/> </metainf> </jar> <!-- jaxws-samples-exception --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-exception.war" webxml="${tests.output.dir}/resources/jaxws/samples/exception/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-exception.war" webxml="${tests.output.dir}/resources/samples/exception/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/exception/server/jaxws/**"/> <include name="org/jboss/test/ws/jaxws/samples/exception/server/ExceptionEndpoint.class"/> @@ -627,7 +627,7 @@ </war> <!-- jaxws-samples-handlerchain --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-handlerchain.war" webxml="${tests.output.dir}/resources/jaxws/samples/handlerchain/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-handlerchain.war" webxml="${tests.output.dir}/resources/samples/handlerchain/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/handlerchain/EndpointImpl.class"/> <include name="org/jboss/test/ws/jaxws/samples/handlerchain/Endpoint.class"/> @@ -637,30 +637,30 @@ </war> <!-- jaxws-samples-httpbinding --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-httpbinding-jaxb.war" webxml="${tests.output.dir}/resources/jaxws/samples/httpbinding/jaxb/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-httpbinding-jaxb.war" webxml="${tests.output.dir}/resources/samples/httpbinding/jaxb/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanJAXB.class"/> <include name="org/jboss/test/ws/jaxws/samples/httpbinding/WebServiceEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/samples/httpbinding/UserType.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/httpbinding/shared"> + <webinf dir="${tests.output.dir}/resources/samples/httpbinding/shared"> <include name="wsdl/HttpBinding.wsdl"/> </webinf> </war> - <war warfile="${tests.output.dir}/libs/jaxws-samples-httpbinding-payload.war" webxml="${tests.output.dir}/resources/jaxws/samples/httpbinding/payload/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-httpbinding-payload.war" webxml="${tests.output.dir}/resources/samples/httpbinding/payload/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/httpbinding/ProviderBeanPayload.class"/> <include name="org/jboss/test/ws/jaxws/samples/httpbinding/LogicalSourceHandler.class"/> <include name="org/jboss/test/ws/jaxws/samples/httpbinding/httpbinding-handlers.xml"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/httpbinding/shared"> + <webinf dir="${tests.output.dir}/resources/samples/httpbinding/shared"> <include name="wsdl/HttpBinding.wsdl"/> </webinf> </war> <!-- jaxws-samples-logicalhandler --> <war warfile="${tests.output.dir}/libs/jaxws-samples-logicalhandler-source.war" - webxml="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF/web-source.xml"> + webxml="${tests.output.dir}/resources/samples/logicalhandler/WEB-INF/web-source.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceDocImpl.class"/> <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointSourceRpcImpl.class"/> @@ -673,7 +673,7 @@ </classes> </war> <war warfile="${tests.output.dir}/libs/jaxws-samples-logicalhandler-jaxb.war" - webxml="${tests.output.dir}/resources/jaxws/samples/logicalhandler/WEB-INF/web-jaxb.xml"> + webxml="${tests.output.dir}/resources/samples/logicalhandler/WEB-INF/web-jaxb.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXBImpl.class"/> <include name="org/jboss/test/ws/jaxws/samples/logicalhandler/SOAPEndpointJAXB.class"/> @@ -688,38 +688,38 @@ </war> <!-- jaxws-samples-oneway --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-oneway.war" webxml="${tests.output.dir}/resources/jaxws/samples/oneway/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-oneway.war" webxml="${tests.output.dir}/resources/samples/oneway/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/oneway/PingEndpointImpl.class"/> </classes> </war> <!-- jaxws-samples-provider --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-jaxb.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/jaxb/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-jaxb.war" webxml="${tests.output.dir}/resources/samples/provider/jaxb/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanJAXB.class"/> <include name="org/jboss/test/ws/jaxws/samples/provider/WebServiceEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/samples/provider/UserType.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/jaxb/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/samples/provider/jaxb/WEB-INF"> <include name="wsdl/Provider.wsdl"/> </webinf> </war> - <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-message.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/message/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-message.war" webxml="${tests.output.dir}/resources/samples/provider/message/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanMessage.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/message/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/samples/provider/message/WEB-INF"> <include name="wsdl/Provider.wsdl"/> </webinf> </war> - <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-payload.war" webxml="${tests.output.dir}/resources/jaxws/samples/provider/payload/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-provider-payload.war" webxml="${tests.output.dir}/resources/samples/provider/payload/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/provider/ProviderBeanPayload.class"/> <include name="org/jboss/test/ws/jaxws/samples/provider/LogicalSourceHandler.class"/> <include name="org/jboss/test/ws/jaxws/samples/provider/provider-handlers.xml"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/provider/payload/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/samples/provider/payload/WEB-INF"> <include name="wsdl/Provider.wsdl"/> </webinf> </war> @@ -730,13 +730,13 @@ <include name="org/jboss/test/ws/jaxws/samples/advanced/retail/**/*.class"/> <include name="org/jboss/test/ws/jaxws/samples/advanced/retail/jaxws-handler.xml"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/advanced/retail/META-INF"> + <metainf dir="${tests.output.dir}/resources/samples/advanced/retail/META-INF"> <include name="wsdl/*"/> </metainf> </jar> <!-- jaxws-samples-serviceref --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-serviceref.war" webxml="${tests.output.dir}/resources/jaxws/samples/serviceref/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-serviceref.war" webxml="${tests.output.dir}/resources/samples/serviceref/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointImpl.class"/> <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpoint.class"/> @@ -749,22 +749,22 @@ <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointService.class"/> <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpoint.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/serviceref/META-INF"> + <metainf dir="${tests.output.dir}/resources/samples/serviceref/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="wsdl/**"/> </metainf> </jar> - <war destfile="${tests.output.dir}/libs/jaxws-samples-serviceref-servlet-client.war" webxml="${tests.output.dir}/resources/jaxws/samples/serviceref/servlet-client/WEB-INF/web.xml"> + <war destfile="${tests.output.dir}/libs/jaxws-samples-serviceref-servlet-client.war" webxml="${tests.output.dir}/resources/samples/serviceref/servlet-client/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/serviceref/ServletClient.class"/> <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointService.class"/> <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpoint.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/serviceref/META-INF"> + <webinf dir="${tests.output.dir}/resources/samples/serviceref/META-INF"> <include name="wsdl/**"/> </webinf> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/serviceref/servlet-client/WEB-INF"> + <webinf dir="${tests.output.dir}/resources/samples/serviceref/servlet-client/WEB-INF"> <include name="jboss-web.xml"/> </webinf> </war> @@ -775,7 +775,7 @@ <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpointService.class"/> <include name="org/jboss/test/ws/jaxws/samples/serviceref/TestEndpoint.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/serviceref/META-INF"> + <metainf dir="${tests.output.dir}/resources/samples/serviceref/META-INF"> <include name="ejb-jar.xml"/> <include name="jboss.xml"/> <include name="wsdl/**"/> @@ -783,7 +783,7 @@ </jar> <!-- jaxws-samples-soapbinding --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-soapbinding.war" webxml="${tests.output.dir}/resources/jaxws/samples/soapbinding/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-soapbinding.war" webxml="${tests.output.dir}/resources/samples/soapbinding/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/soapbinding/jaxws/**"/> <include name="org/jboss/test/ws/jaxws/samples/soapbinding/DocBare.class"/> @@ -812,7 +812,7 @@ </jar> <!-- jaxws-samples-webmethod --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-webmethod.war" webxml="${tests.output.dir}/resources/jaxws/samples/webmethod/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-webmethod.war" webxml="${tests.output.dir}/resources/samples/webmethod/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/webmethod/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/samples/webmethod/TestEndpointImpl.class"/> @@ -820,7 +820,7 @@ </war> <!-- jaxws-samples-webparam --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-webparam.war" webxml="${tests.output.dir}/resources/jaxws/samples/webparam/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-webparam.war" webxml="${tests.output.dir}/resources/samples/webparam/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/webparam/PingServiceImpl.class"/> <include name="org/jboss/test/ws/jaxws/samples/webparam/PingDocument.class"/> @@ -829,7 +829,7 @@ </war> <!-- jaxws-samples-webresult --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-webresult.war" webxml="${tests.output.dir}/resources/jaxws/samples/webresult/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-webresult.war" webxml="${tests.output.dir}/resources/samples/webresult/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/webresult/CustomerServiceImpl.class"/> <include name="org/jboss/test/ws/jaxws/samples/webresult/CustomerRecord.class"/> @@ -838,20 +838,20 @@ </war> <!-- jaxws-samples-webservice --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice01-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF01/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice01-jse.war" webxml="${tests.output.dir}/resources/samples/webservice/WEB-INF01/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean01.class"/> </classes> </war> - <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice02-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF02/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice02-jse.war" webxml="${tests.output.dir}/resources/samples/webservice/WEB-INF02/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean02.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF02"> + <webinf dir="${tests.output.dir}/resources/samples/webservice/WEB-INF02"> <include name="wsdl/**"/> </webinf> </war> - <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice03-jse.war" webxml="${tests.output.dir}/resources/jaxws/samples/webservice/WEB-INF03/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-webservice03-jse.war" webxml="${tests.output.dir}/resources/samples/webservice/WEB-INF03/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/webservice/JSEBean03.class"/> <include name="org/jboss/test/ws/jaxws/samples/webservice/EndpointInterface03.class"/> @@ -868,7 +868,7 @@ <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3Bean02.class"/> <include name="org/jboss/test/ws/jaxws/samples/webservice/EJB3RemoteInterface.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/webservice/META-INF02"> + <metainf dir="${tests.output.dir}/resources/samples/webservice/META-INF02"> <include name="wsdl/**"/> </metainf> </jar> @@ -881,7 +881,7 @@ </jar> <!-- jaxws-webfault --> - <war warfile="${tests.output.dir}/libs/jaxws-webfault.war" webxml="${tests.output.dir}/resources/jaxws/webfault/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-webfault.war" webxml="${tests.output.dir}/resources/webfault/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/webfault/TestEndpoint.class"/> <include name="org/jboss/test/ws/jaxws/webfault/TestEndpointImpl.class"/> @@ -891,7 +891,7 @@ </war> <!-- jaxws-webserviceref --> - <war warfile="${tests.output.dir}/libs/jaxws-samples-webserviceref.war" webxml="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-samples-webserviceref.war" webxml="${tests.output.dir}/resources/samples/webserviceref/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointImpl.class"/> </classes> @@ -903,7 +903,7 @@ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/> <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpoint.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> + <metainf dir="${tests.output.dir}/resources/samples/webserviceref/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="wsdl/**"/> @@ -914,7 +914,7 @@ </jar> <war destfile="${tests.output.dir}/libs/jaxws-samples-webserviceref-servlet-client.war" - webxml="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF-client/web.xml"> + webxml="${tests.output.dir}/resources/samples/webserviceref/WEB-INF-client/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/webserviceref/ServletClient.class"/> <include name="org/jboss/test/ws/jaxws/samples/webserviceref/TestEndpointService.class"/> @@ -922,10 +922,10 @@ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EchoResponse.class"/> <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Echo.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> + <webinf dir="${tests.output.dir}/resources/samples/webserviceref/META-INF"> <include name="wsdl/**"/> </webinf> - <webinf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/WEB-INF-client"> + <webinf dir="${tests.output.dir}/resources/samples/webserviceref/WEB-INF-client"> <include name="jboss-web.xml"/> </webinf> </war> @@ -939,14 +939,14 @@ <include name="org/jboss/test/ws/jaxws/samples/webserviceref/EchoResponse.class"/> <include name="org/jboss/test/ws/jaxws/samples/webserviceref/Echo.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/samples/webserviceref/META-INF"> + <metainf dir="${tests.output.dir}/resources/samples/webserviceref/META-INF"> <include name="jboss.xml"/> <include name="wsdl/**"/> </metainf> </jar> <!-- jaxws-samples-xop-doclit --> - <war jarfile="${tests.output.dir}/libs/jaxws-samples-xop-doclit.war" webxml="${tests.output.dir}/resources/jaxws/samples/xop/doclit/WEB-INF/web.xml"> + <war jarfile="${tests.output.dir}/libs/jaxws-samples-xop-doclit.war" webxml="${tests.output.dir}/resources/samples/xop/doclit/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/samples/xop/doclit/*.class"/> <include name="org/jboss/test/ws/jaxws/samples/xop/doclit/jaxws/**"/> @@ -956,7 +956,7 @@ </war> <!-- jaxws-webserviceref --> - <war warfile="${tests.output.dir}/libs/jaxws-webserviceref.war" webxml="${tests.output.dir}/resources/jaxws/webserviceref/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-webserviceref.war" webxml="${tests.output.dir}/resources/webserviceref/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointImpl.class"/> </classes> @@ -967,7 +967,7 @@ <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/> <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF"> + <metainf dir="${tests.output.dir}/resources/webserviceref/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="wsdl/**"/> @@ -977,7 +977,7 @@ </manifest> </jar> <war destfile="${tests.output.dir}/libs/jaxws-webserviceref-servlet-client.war" - webxml="${tests.output.dir}/resources/jaxws/webserviceref/WEB-INF-client/web.xml"> + webxml="${tests.output.dir}/resources/webserviceref/WEB-INF-client/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/webserviceref/ServletClient.class"/> <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/> @@ -985,10 +985,10 @@ <include name="org/jboss/test/ws/jaxws/webserviceref/EchoResponse.class"/> <include name="org/jboss/test/ws/jaxws/webserviceref/Echo.class"/> </classes> - <webinf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF"> + <webinf dir="${tests.output.dir}/resources/webserviceref/META-INF"> <include name="wsdl/**"/> </webinf> - <webinf dir="${tests.output.dir}/resources/jaxws/webserviceref/WEB-INF-client"> + <webinf dir="${tests.output.dir}/resources/webserviceref/WEB-INF-client"> <include name="jboss-web.xml"/> </webinf> </war> @@ -1001,7 +1001,7 @@ <include name="org/jboss/test/ws/jaxws/webserviceref/EchoResponse.class"/> <include name="org/jboss/test/ws/jaxws/webserviceref/Echo.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF"> + <metainf dir="${tests.output.dir}/resources/webserviceref/META-INF"> <include name="jboss.xml"/> <include name="wsdl/**"/> </metainf> @@ -1017,7 +1017,7 @@ <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.class"/> <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF-secure"> + <metainf dir="${tests.output.dir}/resources/webserviceref/META-INF-secure"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> @@ -1031,12 +1031,12 @@ <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/> <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF-override"> + <metainf dir="${tests.output.dir}/resources/webserviceref/META-INF-override"> <include name="jbossws-client-config.xml"/> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> - <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF"> + <metainf dir="${tests.output.dir}/resources/webserviceref/META-INF"> <include name="wsdl/**"/> </metainf> <manifest> @@ -1056,7 +1056,7 @@ <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpointService.class"/> <include name="org/jboss/test/ws/jaxws/webserviceref/SecureEndpoint.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF-secure"> + <metainf dir="${tests.output.dir}/resources/webserviceref/META-INF-secure"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> </metainf> @@ -1070,7 +1070,7 @@ <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpointService.class"/> <include name="org/jboss/test/ws/jaxws/webserviceref/TestEndpoint.class"/> </fileset> - <metainf dir="${tests.output.dir}/resources/jaxws/webserviceref/META-INF-override"> + <metainf dir="${tests.output.dir}/resources/webserviceref/META-INF-override"> <include name="jbossws-client-config.xml"/> <include name="application-client.xml"/> <include name="jboss-client.xml"/> @@ -1082,7 +1082,7 @@ </jar> <!-- jaxws-wrapped-accessor --> - <war warfile="${tests.output.dir}/libs/jaxws-wrapped-accessor.war" webxml="${tests.output.dir}/resources/jaxws/wrapped/accessor/WEB-INF/web.xml"> + <war warfile="${tests.output.dir}/libs/jaxws-wrapped-accessor.war" webxml="${tests.output.dir}/resources/wrapped/accessor/WEB-INF/web.xml"> <classes dir="${tests.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"/>