[jbossws-commits] JBossWS SVN: r6295 - in framework/trunk/src/test: java/org/jboss/test/ws/jaxws and 1 other directory.

Author: thomas.diesler(a)jboss.com Date: 2008-04-09 05:45:46 -0400 (Wed, 09 Apr 2008) New Revision: 6295 Removed: framework/trunk/src/test/java/org/jboss/test/ws/jaxws/jbws1909/ Modified: framework/trunk/src/test/ant-import/build-jars-jaxws.xml Log: Move jbws1909 to native Modified: framework/trunk/src/test/ant-import/build-jars-jaxws.xml =================================================================== --- framework/trunk/src/test/ant-import/build-jars-jaxws.xml 2008-04-09 09:27:00 UTC (rev 6294) +++ framework/trunk/src/test/ant-import/build-jars-jaxws.xml 2008-04-09 09:45:46 UTC (rev 6295) @@ -17,9 +17,9 @@ <!-- ================================================================== --> <target name="build-jars-jaxws" description="Build the deployments."> - + <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"> <classes dir="${tests.output.dir}/classes"> @@ -44,7 +44,7 @@ <include name="org/jboss/test/ws/jaxws/smoke/tools/service/HelloWorld.class"/> </fileset> </jar> - + <!-- jaxws-classloading-types --> <jar destfile="${tests.output.dir}/libs/jaxws-classloading-types.jar"> <fileset dir="${tests.output.dir}/classes"> @@ -53,7 +53,7 @@ <include name="org/jboss/test/ws/jaxws/smoke/tools/service/EchoResponse.class"/> </fileset> </jar> - + <!-- jaxws-complex --> <war warfile="${tests.output.dir}/libs/jaxws-complex.war" webxml="${tests.output.dir}/resources/jaxws/complex/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> @@ -92,7 +92,7 @@ <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"> <classes dir="${tests.output.dir}/classes"> @@ -367,7 +367,7 @@ <include name="application.xml"/> </metainf> </jar> - + <!-- jaxws-jbws1815 --> <jar destfile="${tests.output.dir}/libs/jaxws-jbws1815.jar"> <fileset dir="${tests.output.dir}/classes"> @@ -377,60 +377,60 @@ <include name="wsdl/my-service.wsdl"/> </metainf> </jar> - - <!-- jaxws-jbws1822 --> - <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1822-shared.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1822/shared/TestBean.class"/> - <include name="org/jboss/test/ws/jaxws/jbws1822/shared/TestBeanIface.class"/> - </fileset> - </jar> - <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1822-one-ejb3-inside.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3Bean.class"/> - <include name="org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3RemoteIface.class"/> - </fileset> - </jar> - <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1822-two-ejb3-inside.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1822/shared/TestBean.class"/> - <include name="org/jboss/test/ws/jaxws/jbws1822/shared/TestBeanIface.class"/> - <include name="org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3Bean.class"/> - <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" - earfile="${tests.output.dir}/libs/jaxws-jbws1822-two-ejb-modules.ear"> - <metainf dir="${tests.output.dir}/resources/jaxws/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" - earfile="${tests.output.dir}/libs/jaxws-jbws1822-one-ejb-module.ear"> - <fileset file="${tests.output.dir}/libs/jaxws-jbws1822-two-ejb3-inside.jar" /> - </ear> + <!-- jaxws-jbws1822 --> + <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1822-shared.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1822/shared/TestBean.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1822/shared/TestBeanIface.class"/> + </fileset> + </jar> + <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1822-one-ejb3-inside.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3Bean.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3RemoteIface.class"/> + </fileset> + </jar> + <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1822-two-ejb3-inside.jar"> + <fileset dir="${tests.output.dir}/classes"> + <include name="org/jboss/test/ws/jaxws/jbws1822/shared/TestBean.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1822/shared/TestBeanIface.class"/> + <include name="org/jboss/test/ws/jaxws/jbws1822/webservice/EJB3Bean.class"/> + <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" + earfile="${tests.output.dir}/libs/jaxws-jbws1822-two-ejb-modules.ear"> + <metainf dir="${tests.output.dir}/resources/jaxws/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" + earfile="${tests.output.dir}/libs/jaxws-jbws1822-one-ejb-module.ear"> + <fileset file="${tests.output.dir}/libs/jaxws-jbws1822-two-ejb3-inside.jar"/> + </ear> + <!-- jaxws-jbws1840 --> <jar destfile="${tests.output.dir}/libs/jaxws-jbws1840.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1840/SecureEndpointImpl.class"/> </fileset> </jar> - - <!-- jaxws-jbws1841 --> - <jar destfile="${tests.output.dir}/libs/jaxws-jbws1841.jar"> - <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"> - <include name="wsdl/*"/> - <include name="ejb-jar.xml"/> - <include name="jboss.xml"/> - </metainf> - </jar> + <!-- jaxws-jbws1841 --> + <jar destfile="${tests.output.dir}/libs/jaxws-jbws1841.jar"> + <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"> + <include name="wsdl/*"/> + <include name="ejb-jar.xml"/> + <include name="jboss.xml"/> + </metainf> + </jar> + <!-- jaxws-jbws1843 --> <war warfile="${tests.output.dir}/libs/jaxws-jbws1843.war" webxml="${tests.output.dir}/resources/jaxws/jbws1843/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> @@ -441,15 +441,15 @@ <include name="wsdl/**"/> </webinf> </war> - - <!-- jaxws-jbws1845 --> + + <!-- jaxws-jbws1845 --> <jar destfile="${tests.output.dir}/libs/jaxws-jbws1845.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1845/*.class"/> - <exclude name="org/jboss/test/ws/jaxws/jbws1845/*TestCase.class"/> + <exclude name="org/jboss/test/ws/jaxws/jbws1845/*TestCase.class"/> </fileset> </jar> - + <!-- jaxws-jbws1854 --> <war destfile="${tests.output.dir}/libs/jaxws-jbws1854.war" webxml="${tests.output.dir}/resources/jaxws/jbws1854/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> @@ -467,7 +467,7 @@ <include name="jboss-service.xml"/> </metainf> </jar> - + <!-- jaxws-jbws1872 --> <jar jarfile="${tests.output.dir}/libs/jaxws-jbws1872.jar"> <fileset dir="${tests.output.dir}/classes"> @@ -476,24 +476,16 @@ <exclude name="org/jboss/test/ws/jaxws/jbws1872/Client*.class"/> </fileset> </jar> - - <!-- jaxws-jbws1904 --> + + <!-- jaxws-jbws1904 --> <jar destfile="${tests.output.dir}/libs/jaxws-jbws1904.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1904/*.class"/> - <exclude name="org/jboss/test/ws/jaxws/jbws1904/*TestCase.class"/> + <exclude name="org/jboss/test/ws/jaxws/jbws1904/*TestCase.class"/> </fileset> </jar> - - <!-- jaxws-jbws1909 --> - <jar destfile="${tests.output.dir}/libs/jaxws-jbws1909.jar"> - <fileset dir="${tests.output.dir}/classes"> - <include name="org/jboss/test/ws/jaxws/jbws1909/*.class"/> - <exclude name="org/jboss/test/ws/jaxws/jbws1909/*TestCase.class"/> - </fileset> - </jar> - - <!-- jaxws-jbws1969 --> + + <!-- jaxws-jbws1969 --> <jar destfile="${tests.output.dir}/libs/jaxws-jbws1969.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws1969/*.class"/> @@ -503,15 +495,15 @@ <include name="wsdl/**"/> </metainf> </jar> - - <!-- jaxws-jbws2000 --> + + <!-- jaxws-jbws2000 --> <jar destfile="${tests.output.dir}/libs/jaxws-jbws2000.jar"> <fileset dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/jbws2000/*.class"/> <exclude name="org/jboss/test/ws/jaxws/jbws2000/*TestCase.class"/> </fileset> </jar> - + <!-- jaxws-jbws2009 --> <war warfile="${tests.output.dir}/libs/jaxws-jbws2009.war" webxml="${tests.output.dir}/resources/jaxws/jbws2009/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> @@ -535,7 +527,7 @@ </webinf> </war> - <!-- jaxws-webfault --> + <!-- jaxws-webfault --> <war warfile="${tests.output.dir}/libs/jaxws-webfault.war" webxml="${tests.output.dir}/resources/jaxws/webfault/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/classes"> <include name="org/jboss/test/ws/jaxws/webfault/TestEndpoint.class"/> @@ -566,8 +558,7 @@ <attribute name="main-class" value="org.jboss.test.ws.jaxws.samples.webserviceref.TestEndpointClientOne"/> </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"> + <war destfile="${tests.output.dir}/libs/jaxws-webserviceref-servlet-client.war" webxml="${tests.output.dir}/resources/jaxws/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"/> @@ -681,7 +672,7 @@ </war> <!-- Please add alphabetically --> - + </target> </project>