Menu
▾
▴
[jboss-cvs] jbosstest build.xml
|
From: Thomas D. <tdi...@us...> - 2004-08-04 09:14:32
|
User: tdiesler Date: 04/08/04 02:14:25 Modified: . build.xml Log: Move jboss.net test stuff from webservice to jbossnet. Move webservice test stuff from ws4ee to webservice. Revision Changes Path 1.387 +184 -182 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.386 retrieving revision 1.387 diff -u -r1.386 -r1.387 --- build.xml 3 Aug 2004 08:04:06 -0000 1.386 +++ build.xml 4 Aug 2004 09:14:24 -0000 1.387 @@ -15,7 +15,7 @@ <!-- --> <!-- ====================================================================== --> -<!-- $Id: build.xml,v 1.386 2004/08/03 08:04:06 tdiesler Exp $ --> +<!-- $Id: build.xml,v 1.387 2004/08/04 09:14:24 tdiesler Exp $ --> <project default="main" name="JBoss/Testsuite"> @@ -927,20 +927,20 @@ <arg value="-s"/> <arg value="-d"/> <arg value="Session"/> - <arg value="-Nhttp://test.jboss.org/samples/AddressBook=org.jboss.test.webservice.wsr"/> - <arg value="${source.resources}/webservice/wsr/wsr/META-INF/AddressBook.wsdl"/> + <arg value="-Nhttp://test.jboss.org/samples/AddressBook=org.jboss.test.jbossnet.wsr"/> + <arg value="${source.resources}/jbossnet/wsr/wsr/META-INF/AddressBook.wsdl"/> <classpath refid="thirdparty.classpath"/> </java> <!-- Delete the service impl skeleton as we have an impl already --> - <delete file="${build.gen-src}/org/jboss/test/webservice/wsr/AddressBookSOAPBindingImpl.java"/> + <delete file="${build.gen-src}/org/jboss/test/jbossnet/wsr/AddressBookSOAPBindingImpl.java"/> <!-- call wsdl4j emitter for Bablefish stubs --> <java dir="${build.gen-src}" fork="yes" failOnError="true" className="org.apache.axis.wsdl.WSDL2Java"> <arg value="-d"/> <arg value="Session"/> - <arg value="-Nhttp://www.xmethods.net/sd/BabelFishService.wsdl=org.jboss.test.webservice.external.babelfish"/> - <arg value="${source.resources}/webservice/external/wsr/META-INF/babelfish.wsdl"/> + <arg value="-Nhttp://www.xmethods.net/sd/BabelFishService.wsdl=org.jboss.test.jbossnet.external.babelfish"/> + <arg value="${source.resources}/jbossnet/external/wsr/META-INF/babelfish.wsdl"/> <classpath refid="thirdparty.classpath"/> </java> @@ -948,106 +948,106 @@ <java dir="${build.gen-src}" fork="yes" failOnError="true" className="org.apache.axis.wsdl.WSDL2Java"> <arg value="-d"/> <arg value="Session"/> - <arg value="-Nurn:GoogleSearch=org.jboss.test.webservice.external.google"/> - <arg value="${source.resources}/webservice/external/wsr/META-INF/google.wsdl"/> + <arg value="-Nurn:GoogleSearch=org.jboss.test.jbossnet.external.google"/> + <arg value="${source.resources}/jbossnet/external/wsr/META-INF/google.wsdl"/> <classpath refid="thirdparty.classpath"/> </java> <!-- these taskdefs allow to call jboss.net specific xdoclet functionality --> - <taskdef name="webserviceejbdoclet" classname="xdoclet.modules.ejb.EjbDocletTask"> + <taskdef name="jbossnet-ejbdoclet" classname="xdoclet.modules.ejb.EjbDocletTask"> <classpath refid="xdoclet.task.classpath"/> <classpath refid="jboss.jbossnet.classpath"/> </taskdef> - <taskdef name="webservicejmxdoclet" classname="xdoclet.modules.jmx.JMXDocletTask"> + <taskdef name="jbossnet-jmxdoclet" classname="xdoclet.modules.jmx.JMXDocletTask"> <classpath refid="xdoclet.task.classpath"/> <classpath refid="jboss.jbossnet.classpath"/> </taskdef> <!-- generate ejbsimple meta-data and interfaces --> - <webserviceejbdoclet destdir="${build.gen-src}" + <jbossnet-ejbdoclet destdir="${build.gen-src}" ejbspec="2.0" excludedtags="@version,@author"> <fileset dir="${source.java}"> - <include name="org/jboss/test/webservice/ejbsimple/server/Hello*Bean.java"/> - <include name="org/jboss/test/webservice/ejbsimple/HelloData.java"/> + <include name="org/jboss/test/jbossnet/ejbsimple/server/Hello*Bean.java"/> + <include name="org/jboss/test/jbossnet/ejbsimple/HelloData.java"/> </fileset> <remoteinterface/> <localinterface/> <homeinterface/> <localhomeinterface/> <deploymentdescriptor xmlencoding="UTF-8" - destdir="${build.resources}/webservice/ejbsimple/ejb/META-INF"/> + destdir="${build.resources}/jbossnet/ejbsimple/ejb/META-INF"/> <jboss xmlencoding="UTF-8" version="3.0" - destdir="${build.resources}/webservice/ejbsimple/ejb/META-INF"/> + destdir="${build.resources}/jbossnet/ejbsimple/ejb/META-INF"/> <jbossnet webDeploymentName="EjbSimple" prefix="ejbsimple" - destdir="${build.resources}/webservice/ejbsimple/wsr/META-INF" + destdir="${build.resources}/jbossnet/ejbsimple/wsr/META-INF" targetNameSpace="http://test.jboss.org/ejbsimple"/> - </webserviceejbdoclet> + </jbossnet-ejbdoclet> <!-- generate jmx meta-data and interfaces --> - <webservicejmxdoclet destdir="${build.gen-src}" + <jbossnet-jmxdoclet destdir="${build.gen-src}" excludedtags="@version,@author"> <fileset dir="${source.java}"> - <include name="org/jboss/test/webservice/jmx/server/JMXTest.java"/> - <include name="org/jboss/test/webservice/jmx/server/JMXDynamicTest.java"/> + <include name="org/jboss/test/jbossnet/jmx/server/JMXTest.java"/> + <include name="org/jboss/test/jbossnet/jmx/server/JMXDynamicTest.java"/> </fileset> <mbeaninterface/> <jbossnet webDeploymentName="JMXTest" prefix="jmx" - destdir="${build.resources}/webservice/jmx/wsr/META-INF" + destdir="${build.resources}/jbossnet/jmx/wsr/META-INF" targetNameSpace="http://test.jboss.org/jmx"/> - </webservicejmxdoclet> + </jbossnet-jmxdoclet> <!-- generate state test meta-data --> - <webserviceejbdoclet destdir="${build.gen-src}" + <jbossnet-ejbdoclet destdir="${build.gen-src}" ejbspec="2.0" excludedtags="@version,@author"> <fileset dir="${source.java}"> - <include name="org/jboss/test/webservice/state/server/*Bean.java"/> + <include name="org/jboss/test/jbossnet/state/server/*Bean.java"/> </fileset> <remoteinterface/> <homeinterface/> <deploymentdescriptor xmlencoding="UTF-8" - destdir="${build.resources}/webservice/state/ejb/META-INF"/> + destdir="${build.resources}/jbossnet/state/ejb/META-INF"/> <jboss xmlencoding="UTF-8" version="3.0" - destdir="${build.resources}/webservice/state/ejb/META-INF"/> + destdir="${build.resources}/jbossnet/state/ejb/META-INF"/> <jbossnet webDeploymentName="State" prefix="state" - destdir="${build.resources}/webservice/state/wsr/META-INF" + destdir="${build.resources}/jbossnet/state/wsr/META-INF" targetNameSpace="http://test.jboss.org/state"/> - </webserviceejbdoclet> + </jbossnet-ejbdoclet> <!-- generate security test meta-data --> - <webserviceejbdoclet destdir="${build.gen-src}" + <jbossnet-ejbdoclet destdir="${build.gen-src}" ejbspec="2.0" excludedtags="@version,@author"> <fileset dir="${source.java}"> - <include name="org/jboss/test/webservice/security/server/*Bean.java"/> + <include name="org/jboss/test/jbossnet/security/server/*Bean.java"/> </fileset> <entitycmp cmpspec="2.x"/> <remoteinterface/> <homeinterface/> <deploymentdescriptor xmlencoding="UTF-8" - destdir="${build.resources}/webservice/security/ejb/META-INF"/> + destdir="${build.resources}/jbossnet/security/ejb/META-INF"/> <jboss xmlencoding="UTF-8" version="3.0" securitydomain="java:/jaas/other" - destdir="${build.resources}/webservice/security/ejb/META-INF"/> + destdir="${build.resources}/jbossnet/security/ejb/META-INF"/> <jbossnet webDeploymentName="Security" prefix="security" - destdir="${build.resources}/webservice/security/wsr/META-INF" + destdir="${build.resources}/jbossnet/security/wsr/META-INF" targetNameSpace="http://test.jboss.org/security"/> - </webserviceejbdoclet> + </jbossnet-ejbdoclet> <!-- generate external test meta-data --> - <webserviceejbdoclet destdir="${build.gen-src}" + <jbossnet-ejbdoclet destdir="${build.gen-src}" ejbspec="2.0" excludedtags="@version,@author"> <fileset dir="${source.java}"> - <include name="org/jboss/test/webservice/external/server/*Bean.java"/> + <include name="org/jboss/test/jbossnet/external/server/*Bean.java"/> </fileset> <entitycmp cmpspec="2.x"/> <remoteinterface/> @@ -1055,16 +1055,16 @@ <localinterface/> <localhomeinterface/> <deploymentdescriptor xmlencoding="UTF-8" - destdir="${build.resources}/webservice/external/ejb/META-INF"/> + destdir="${build.resources}/jbossnet/external/ejb/META-INF"/> <jboss xmlencoding="UTF-8" version="3.0" - destdir="${build.resources}/webservice/external/ejb/META-INF"/> + destdir="${build.resources}/jbossnet/external/ejb/META-INF"/> <jbossnet webDeploymentName="External" prefix="external" - mergedir="${source.resources}/webservice/external/wsr/META-INF" - destdir="${build.resources}/webservice/external/wsr/META-INF" + mergedir="${source.resources}/jbossnet/external/wsr/META-INF" + destdir="${build.resources}/jbossnet/external/wsr/META-INF" targetNameSpace="http://test.jboss.org/external"/> - </webserviceejbdoclet> + </jbossnet-ejbdoclet> <!-- aop test --> <mkdir dir="${build.resources}/aop/simpleejb/META-INF"/> @@ -1328,74 +1328,74 @@ </path> <!-- jboss.net/ejbsimple --> - <mkdir dir="${build.resources}/webservice/ejbsimple"/> + <mkdir dir="${build.resources}/jbossnet/ejbsimple"/> <java classname="org.apache.axis.wsdl.Java2WSDL" fork="yes"> <classpath refid="java2wsdl.classpath"/> <classpath path="${build.classes}"/> <arg value="-lhttp://dummy-host:8080/dummy-path"/> - <arg value="-o${build.resources}/webservice/ejbsimple/hello.wsdl"/> + <arg value="-o${build.resources}/jbossnet/ejbsimple/hello.wsdl"/> <arg value="-nhttp://ejbsimple.jbossnet.test.jboss.org"/> <arg value="-STestService"/> <arg value="-sTestPort"/> <arg value="-yRPC"/> <arg value="-uENCODED"/> - <arg value="org.jboss.test.webservice.ejbsimple.HelloRemote"/> + <arg value="org.jboss.test.jbossnet.ejbsimple.HelloRemote"/> </java> - <!-- ws4ee/marshalltest --> - <mkdir dir="${build.resources}/ws4ee/marshalltest-rpcenc/META-INF/wsdl"/> + <!-- webservice/marshalltest --> + <mkdir dir="${build.resources}/webservice/marshalltest-rpcenc/META-INF/wsdl"/> <java classname="org.apache.axis.wsdl.Java2WSDL" fork="yes"> <classpath refid="java2wsdl.classpath"/> <classpath path="${build.classes}"/> <arg value="-lhttp://dummy-host:8080/dummy-path"/> - <arg value="-o${build.resources}/ws4ee/marshalltest-rpcenc/META-INF/wsdl/rpc-encoded.wsdl"/> - <arg value="-nhttp://marshalltest.ws4ee.test.jboss.org"/> + <arg value="-o${build.resources}/webservice/marshalltest-rpcenc/META-INF/wsdl/rpc-encoded.wsdl"/> + <arg value="-nhttp://marshalltest.webservice.test.jboss.org"/> <arg value="-SMarshallTestService"/> <arg value="-sMarshallTestPort"/> <arg value="-yRPC"/> <arg value="-uENCODED"/> - <arg value="org.jboss.test.ws4ee.marshalltest.MarshallTestEndpoint"/> + <arg value="org.jboss.test.webservice.marshalltest.MarshallTestEndpoint"/> </java> - <mkdir dir="${build.resources}/ws4ee/marshalltest-rpclit/META-INF/wsdl"/> + <mkdir dir="${build.resources}/webservice/marshalltest-rpclit/META-INF/wsdl"/> <java classname="org.apache.axis.wsdl.Java2WSDL" fork="yes"> <classpath refid="java2wsdl.classpath"/> <classpath path="${build.classes}"/> <arg value="-lhttp://dummy-host:8080/dummy-path"/> - <arg value="-o${build.resources}/ws4ee/marshalltest-rpclit/META-INF/wsdl/rpc-literal.wsdl"/> - <arg value="-nhttp://marshalltest.ws4ee.test.jboss.org"/> + <arg value="-o${build.resources}/webservice/marshalltest-rpclit/META-INF/wsdl/rpc-literal.wsdl"/> + <arg value="-nhttp://marshalltest.webservice.test.jboss.org"/> <arg value="-SMarshallTestService"/> <arg value="-sMarshallTestPort"/> <arg value="-yRPC"/> <arg value="-uLITERAL"/> - <arg value="org.jboss.test.ws4ee.marshalltest.MarshallTestEndpoint"/> + <arg value="org.jboss.test.webservice.marshalltest.MarshallTestEndpoint"/> </java> - <mkdir dir="${build.resources}/ws4ee/marshalltest-doclit/META-INF/wsdl"/> + <mkdir dir="${build.resources}/webservice/marshalltest-doclit/META-INF/wsdl"/> <java classname="org.apache.axis.wsdl.Java2WSDL" fork="yes"> <classpath refid="java2wsdl.classpath"/> <classpath path="${build.classes}"/> <arg value="-lhttp://dummy-host:8080/dummy-path"/> - <arg value="-o${build.resources}/ws4ee/marshalltest-doclit/META-INF/wsdl/doc-literal.wsdl"/> - <arg value="-nhttp://marshalltest.ws4ee.test.jboss.org"/> + <arg value="-o${build.resources}/webservice/marshalltest-doclit/META-INF/wsdl/doc-literal.wsdl"/> + <arg value="-nhttp://marshalltest.webservice.test.jboss.org"/> <arg value="-SMarshallTestService"/> <arg value="-sMarshallTestPort"/> <arg value="-yDOCUMENT"/> <arg value="-uLITERAL"/> - <arg value="org.jboss.test.ws4ee.marshalltest.MarshallTestEndpoint"/> + <arg value="org.jboss.test.webservice.marshalltest.MarshallTestEndpoint"/> </java> - <!-- ws4ee/handlerflow --> - <mkdir dir="${build.resources}/ws4ee/handlerflow/META-INF/wsdl"/> + <!-- webservice/handlerflow --> + <mkdir dir="${build.resources}/webservice/handlerflow/META-INF/wsdl"/> <java classname="org.apache.axis.wsdl.Java2WSDL" fork="yes"> <classpath refid="java2wsdl.classpath"/> <classpath path="${build.classes}"/> <arg value="-lhttp://localhost:8080/ws4eehandlerflow/HelloService"/> - <arg value="-o${build.resources}/ws4ee/handlerflow/META-INF/wsdl/Hello.wsdl"/> - <arg value="-nhttp://test.jboss.org/ws4ee/handlerflow"/> + <arg value="-o${build.resources}/webservice/handlerflow/META-INF/wsdl/Hello.wsdl"/> + <arg value="-nhttp://test.jboss.org/webservice/handlerflow"/> <arg value="-SHelloService"/> <arg value="-sHelloPort"/> <arg value="-yRPC"/> <arg value="-uENCODED"/> - <arg value="org.jboss.test.ws4ee.handlerflow.HelloEndpoint"/> + <arg value="org.jboss.test.webservice.handlerflow.HelloEndpoint"/> </java> </target> @@ -1658,6 +1658,7 @@ <!-- ok, we have created the loadtime jars, let us now precompile the classes for standalone test --> +<!-- <aopc compilerclasspathref="aop.task.classpath"> <classpath refid="thirdparty.classpath"/> <classpath path="${build.classes}"/> @@ -1665,6 +1666,7 @@ <include name="org/jboss/test/aop/bean/**"/> <aoppath path="${source.resources}/aop/META-INF/jboss-aop.xml"/> </aopc> +--> </target> @@ -5113,26 +5115,26 @@ </ear> </target> - <!-- webservice tests --> + <!-- jbossnet tests --> <target name="_jars-jbossnet"> <mkdir dir="${build.lib}"/> <!-- The wsr.wsr --> - <mkdir dir="${build.resources}/webservice/wsr/wsr/META-INF"/> - <copy toFile="${build.resources}/webservice/wsr/wsr/META-INF/web-service.xml" - file="${build.gen-src}/org/jboss/test/webservice/wsr/deploy.wsdd"/> + <mkdir dir="${build.resources}/jbossnet/wsr/wsr/META-INF"/> + <copy toFile="${build.resources}/jbossnet/wsr/wsr/META-INF/web-service.xml" + file="${build.gen-src}/org/jboss/test/jbossnet/wsr/deploy.wsdd"/> <jar destfile="${build.lib}/wsr.wsr" manifest="${build.etc}/manifest.mf"> <fileset dir="${build.classes}"> - <include name="org/jboss/test/webservice/wsr/**/*.class"/> + <include name="org/jboss/test/jbossnet/wsr/**/*.class"/> <exclude name="**/*Test*"/> </fileset> - <fileset dir="${build.resources}/webservice/wsr/wsr"/> + <fileset dir="${build.resources}/jbossnet/wsr/wsr"/> </jar> <!-- The wsjmx.sar --> <jar destfile="${build.lib}/wsjmx.wsr" manifest="${build.etc}/manifest.mf"> - <fileset dir="${build.resources}/webservice/jmx/wsr"> + <fileset dir="${build.resources}/jbossnet/jmx/wsr"> <include name="**/*"/> </fileset> </jar> @@ -5141,17 +5143,17 @@ <fileset dir="${build.lib}"> <include name="wsjmx.wsr"/> </fileset> - <fileset dir="${source.resources}/webservice/jmx/sar/"> + <fileset dir="${source.resources}/jbossnet/jmx/sar/"> <include name="**/*"/> </fileset> <fileset dir="${build.classes}"> - <include name="org/jboss/test/webservice/jmx/server/*"/> + <include name="org/jboss/test/jbossnet/jmx/server/*"/> </fileset> </jar> <!-- The wsejbsimple.ear --> <jar destfile="${build.lib}/wsejbsimple.wsr" manifest="${build.etc}/manifest.mf"> - <fileset dir="${build.resources}/webservice/ejbsimple/wsr"> + <fileset dir="${build.resources}/jbossnet/ejbsimple/wsr"> <include name="**/*"/> </fileset> </jar> @@ -5159,10 +5161,10 @@ <jar destfile="${build.lib}/wsejbsimple.jar" manifest="${build.etc}/manifest.mf"> <fileset dir="${build.classes}"> <include name="org/jboss/test/util/**"/> - <include name="org/jboss/test/webservice/ejbsimple/**"/> - <exclude name="org/jboss/test/webservice/ejbsimple/*Test*"/> + <include name="org/jboss/test/jbossnet/ejbsimple/**"/> + <exclude name="org/jboss/test/jbossnet/ejbsimple/*Test*"/> </fileset> - <fileset dir="${build.resources}/webservice/ejbsimple/ejb/"> + <fileset dir="${build.resources}/jbossnet/ejbsimple/ejb/"> <include name="**/*.xml"/> </fileset> </jar> @@ -5172,7 +5174,7 @@ <include name="wsejbsimple.wsr"/> <include name="wsejbsimple.jar"/> </fileset> - <fileset dir="${source.resources}/webservice/ejbsimple/ear/"> + <fileset dir="${source.resources}/jbossnet/ejbsimple/ear/"> <include name="**"/> </fileset> </jar> @@ -5180,10 +5182,10 @@ <!-- The wsexternal wsr and ear --> <jar destfile="${build.lib}/wsexternal.wsr" manifest="${build.etc}/manifest.mf"> <fileset dir="${build.classes}"> - <include name="org/jboss/test/webservice/external/google/*.class"/> - <include name="org/jboss/test/webservice/external/babelfish/*.class"/> + <include name="org/jboss/test/jbossnet/external/google/*.class"/> + <include name="org/jboss/test/jbossnet/external/babelfish/*.class"/> </fileset> - <fileset dir="${build.resources}/webservice/external/wsr/"> + <fileset dir="${build.resources}/jbossnet/external/wsr/"> <include name="**/*"/> </fileset> </jar> @@ -5191,12 +5193,12 @@ <jar destfile="${build.lib}/wsexternal.jar" manifest="${build.etc}/manifest.mf"> <fileset dir="${build.classes}"> <include name="org/jboss/test/util/**"/> - <include name="org/jboss/test/webservice/external/**/*.class"/> - <exclude name="org/jboss/test/webservice/external/google/**/*.class"/> - <exclude name="org/jboss/test/webservice/external/babelfish/**/*.class"/> - <exclude name="org/jboss/test/webservice/external/*Test*"/> + <include name="org/jboss/test/jbossnet/external/**/*.class"/> + <exclude name="org/jboss/test/jbossnet/external/google/**/*.class"/> + <exclude name="org/jboss/test/jbossnet/external/babelfish/**/*.class"/> + <exclude name="org/jboss/test/jbossnet/external/*Test*"/> </fileset> - <fileset dir="${build.resources}/webservice/external/ejb/"> + <fileset dir="${build.resources}/jbossnet/external/ejb/"> <include name="**/*"/> </fileset> </jar> @@ -5206,14 +5208,14 @@ <include name="wsexternal.wsr"/> <include name="wsexternal.jar"/> </fileset> - <fileset dir="${source.resources}/webservice/external/ear/"> + <fileset dir="${source.resources}/jbossnet/external/ear/"> <include name="**/META-INF/application.xml"/> </fileset> </jar> <!-- build state.ear --> <jar jarFile="${build.lib}/wsstate.wsr" manifest="${build.etc}/manifest.mf"> - <fileset dir="${build.resources}/webservice/state/wsr"> + <fileset dir="${build.resources}/jbossnet/state/wsr"> <include name="**/*"/> </fileset> </jar> @@ -5221,10 +5223,10 @@ <jar jarfile="${build.lib}/wsstate.jar" manifest="${build.etc}/manifest.mf"> <fileset dir="${build.classes}"> <include name="**/test/util/**"/> - <include name="**/test/webservice/state/**"/> + <include name="**/test/jbossnet/state/**"/> <exclude name="**/*Test*.*"/> </fileset> - <fileset dir="${build.resources}/webservice/state/ejb/"> + <fileset dir="${build.resources}/jbossnet/state/ejb/"> <include name="**/*.xml"/> </fileset> </jar> @@ -5234,14 +5236,14 @@ <include name="wsstate.wsr"/> <include name="wsstate.jar"/> </fileset> - <fileset dir="${source.resources}/webservice/state/ear"> + <fileset dir="${source.resources}/jbossnet/state/ear"> <include name="**"/> </fileset> </jar> <!-- build security.ear --> <jar jarFile="${build.lib}/wssecurity.wsr" manifest="${build.etc}/manifest.mf"> - <fileset dir="${build.resources}/webservice/security/wsr"> + <fileset dir="${build.resources}/jbossnet/security/wsr"> <include name="**/*"/> </fileset> </jar> @@ -5249,14 +5251,14 @@ <jar jarfile="${build.lib}/wssecurity.jar" manifest="${build.etc}/manifest.mf"> <fileset dir="${build.classes}"> <include name="**/test/util/**"/> - <include name="**/test/webservice/security/**"/> + <include name="**/test/jbossnet/security/**"/> <include name="**/test/security/service/SecurityConfig*.*"/> <exclude name="**/*TestCase*.*"/> </fileset> - <fileset dir="${build.resources}/webservice/security/ejb/"> + <fileset dir="${build.resources}/jbossnet/security/ejb/"> <include name="**/*.xml"/> </fileset> - <fileset dir="${build.resources}/webservice/security/server/"> + <fileset dir="${build.resources}/jbossnet/security/server/"> <include name="**/*.xml"/> </fileset> </jar> @@ -5266,26 +5268,26 @@ <include name="wssecurity.wsr"/> <include name="wssecurity.jar"/> </fileset> - <fileset dir="${source.resources}/webservice/security/ear"> + <fileset dir="${source.resources}/jbossnet/security/ear"> <include name="**/*.xml"/> </fileset> </jar> </target> - <!-- ws4ee tests --> + <!-- webservice tests --> <target name="_jars-webservice"> <mkdir dir="${build.lib}"/> <!-- build ws4eesimple.jar --> <jar destfile="${build.lib}/ws4eesimple.jar" manifest="${build.etc}/manifest.mf"> <fileset dir="${build.classes}"> - <include name="org/jboss/test/ws4ee/ws4eesimple/Hello.class"/> - <include name="org/jboss/test/ws4ee/ws4eesimple/HelloBean.class"/> - <include name="org/jboss/test/ws4ee/ws4eesimple/HelloHome.class"/> - <include name="org/jboss/test/ws4ee/ws4eesimple/HelloWs.class"/> + <include name="org/jboss/test/webservice/ws4eesimple/Hello.class"/> + <include name="org/jboss/test/webservice/ws4eesimple/HelloBean.class"/> + <include name="org/jboss/test/webservice/ws4eesimple/HelloHome.class"/> + <include name="org/jboss/test/webservice/ws4eesimple/HelloWs.class"/> </fileset> - <fileset dir="${source.resources}/ws4ee/ws4eesimple"> + <fileset dir="${source.resources}/webservice/ws4eesimple"> <include name="META-INF/ejb-jar.xml"/> <include name="META-INF/webservices.xml"/> <include name="META-INF/HelloMapping.xml"/> @@ -5295,16 +5297,16 @@ <!-- build ws4eesimple.war --> <war warfile="${build.lib}/ws4eesimple.war" - webxml="${source.resources}/ws4ee/ws4eesimple/WEB-INF/web.xml"> + webxml="${source.resources}/webservice/ws4eesimple/WEB-INF/web.xml"> <classes dir="${build.classes}"> - <include name="org/jboss/test/ws4ee/ws4eesimple/HelloJavaBean.class"/> - <include name="org/jboss/test/ws4ee/ws4eesimple/HelloWs.class"/> + <include name="org/jboss/test/webservice/ws4eesimple/HelloJavaBean.class"/> + <include name="org/jboss/test/webservice/ws4eesimple/HelloWs.class"/> </classes> - <webinf dir="${source.resources}/ws4ee/ws4eesimple/META-INF"> + <webinf dir="${source.resources}/webservice/ws4eesimple/META-INF"> <include name="HelloMapping.xml"/> <include name="wsdl/Hello.wsdl"/> </webinf> - <webinf dir="${source.resources}/ws4ee/ws4eesimple/WEB-INF"> + <webinf dir="${source.resources}/webservice/ws4eesimple/WEB-INF"> <include name="webservices.xml"/> </webinf> </war> @@ -5312,12 +5314,12 @@ <!-- build ws4eesimple-client.ear --> <jar destfile="${build.lib}/ws4eesimple-client.jar" manifest="${build.etc}/manifest.mf"> <fileset dir="${build.classes}"> - <include name="org/jboss/test/ws4ee/ws4eesimple/HelloWs.class"/> - <include name="org/jboss/test/ws4ee/ws4eesimple/HelloWsClientApp.class"/> - <include name="org/jboss/test/ws4ee/ws4eesimple/HelloHome.class"/> - <include name="org/jboss/test/ws4ee/ws4eesimple/Hello.class"/> + <include name="org/jboss/test/webservice/ws4eesimple/HelloWs.class"/> + <include name="org/jboss/test/webservice/ws4eesimple/HelloWsClientApp.class"/> + <include name="org/jboss/test/webservice/ws4eesimple/HelloHome.class"/> + <include name="org/jboss/test/webservice/ws4eesimple/Hello.class"/> </fileset> - <metainf dir="${source.resources}/ws4ee/ws4eesimple-client/META-INF"> + <metainf dir="${source.resources}/webservice/ws4eesimple-client/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="HelloMapping.xml"/> @@ -5325,31 +5327,31 @@ </metainf> </jar> <war warfile="${build.lib}/ws4eesimple-client.war" - webxml="${source.resources}/ws4ee/ws4eesimple-client/WEB-INF/web.xml"> + webxml="${source.resources}/webservice/ws4eesimple-client/WEB-INF/web.xml"> <classes dir="${build.classes}"> - <include name="org/jboss/test/ws4ee/ws4eesimple/HelloWsClientServlet.class"/> - <include name="org/jboss/test/ws4ee/ws4eesimple/HelloWs.class"/> + <include name="org/jboss/test/webservice/ws4eesimple/HelloWsClientServlet.class"/> + <include name="org/jboss/test/webservice/ws4eesimple/HelloWs.class"/> </classes> - <webinf dir="${source.resources}/ws4ee/ws4eesimple-client/META-INF"> + <webinf dir="${source.resources}/webservice/ws4eesimple-client/META-INF"> <include name="HelloMapping.xml"/> <include name="wsdl/HelloClient.wsdl"/> </webinf> </war> <jar destfile="${build.lib}/ws4eesimple-client-ejb.jar" manifest="${build.etc}/manifest.mf"> <fileset dir="${build.classes}"> - <include name="org/jboss/test/ws4ee/ws4eesimple/HelloWs.class"/> - <include name="org/jboss/test/ws4ee/ws4eesimple/HelloClientBean.class"/> - <include name="org/jboss/test/ws4ee/ws4eesimple/HelloHome.class"/> - <include name="org/jboss/test/ws4ee/ws4eesimple/Hello.class"/> + <include name="org/jboss/test/webservice/ws4eesimple/HelloWs.class"/> + <include name="org/jboss/test/webservice/ws4eesimple/HelloClientBean.class"/> + <include name="org/jboss/test/webservice/ws4eesimple/HelloHome.class"/> + <include name="org/jboss/test/webservice/ws4eesimple/Hello.class"/> </fileset> - <metainf dir="${source.resources}/ws4ee/ws4eesimple-client/META-INF"> + <metainf dir="${source.resources}/webservice/ws4eesimple-client/META-INF"> <include name="ejb-jar.xml"/> <include name="HelloMapping.xml"/> <include name="wsdl/HelloClient.wsdl"/> </metainf> </jar> <ear destfile="${build.lib}/ws4eesimple-client.ear" manifest="${build.etc}/manifest.mf" - appxml="${source.resources}/ws4ee/ws4eesimple-client/META-INF/application.xml"> + appxml="${source.resources}/webservice/ws4eesimple-client/META-INF/application.xml"> <fileset dir="${build.lib}"> <include name="ws4eesimple-client.jar"/> <include name="ws4eesimple-client.war"/> @@ -5360,17 +5362,17 @@ <!-- build ws4eemarshall-rpcenc.ear --> <jar destfile="${build.lib}/ws4eemarshall-rpcenc.jar" manifest="${build.etc}/manifest.mf"> <fileset dir="${build.classes}"> - <include name="org/jboss/test/ws4ee/marshalltest/MarshallTestHome.class"/> - <include name="org/jboss/test/ws4ee/marshalltest/MarshallTestRemote.class"/> - <include name="org/jboss/test/ws4ee/marshalltest/MarshallTestEndpoint.class"/> - <include name="org/jboss/test/ws4ee/marshalltest/MarshallTestBean.class"/> - <include name="org/jboss/test/ws4ee/marshalltest/Bean.class"/> + <include name="org/jboss/test/webservice/marshalltest/MarshallTestHome.class"/> + <include name="org/jboss/test/webservice/marshalltest/MarshallTestRemote.class"/> + <include name="org/jboss/test/webservice/marshalltest/MarshallTestEndpoint.class"/> + <include name="org/jboss/test/webservice/marshalltest/MarshallTestBean.class"/> + <include name="org/jboss/test/webservice/marshalltest/Bean.class"/> </fileset> - <metainf dir="${build.resources}/ws4ee/marshalltest/META-INF"> + <metainf dir="${build.resources}/webservice/marshalltest/META-INF"> <include name="ejb-jar.xml"/> <include name="jboss.xml"/> </metainf> - <metainf dir="${build.resources}/ws4ee/marshalltest-rpcenc/META-INF"> + <metainf dir="${build.resources}/webservice/marshalltest-rpcenc/META-INF"> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="wsdl/rpc-encoded.wsdl"/> @@ -5378,10 +5380,10 @@ </jar> <jar destfile="${build.lib}/ws4eemarshall-rpcenc-client.jar" manifest="${build.etc}/manifest.mf"> <fileset dir="${build.classes}"> - <include name="org/jboss/test/ws4ee/marshalltest/MarshallTestEndpoint.class"/> - <include name="org/jboss/test/ws4ee/marshalltest/Bean.class"/> + <include name="org/jboss/test/webservice/marshalltest/MarshallTestEndpoint.class"/> + <include name="org/jboss/test/webservice/marshalltest/Bean.class"/> </fileset> - <metainf dir="${build.resources}/ws4ee/marshalltest-rpcenc/META-INF"> + <metainf dir="${build.resources}/webservice/marshalltest-rpcenc/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="jaxrpc-mapping.xml"/> @@ -5389,7 +5391,7 @@ </metainf> </jar> <ear destfile="${build.lib}/ws4eemarshall-rpcenc.ear" manifest="${build.etc}/manifest.mf" - appxml="${source.resources}/ws4ee/marshalltest-rpcenc/META-INF/application.xml"> + appxml="${source.resources}/webservice/marshalltest-rpcenc/META-INF/application.xml"> <fileset dir="${build.lib}"> <include name="ws4eemarshall-rpcenc.jar"/> <include name="ws4eemarshall-rpcenc-client.jar"/> @@ -5399,17 +5401,17 @@ <!-- build ws4eemarshall-rpclit.ear --> <jar destfile="${build.lib}/ws4eemarshall-rpclit.jar" manifest="${build.etc}/manifest.mf"> <fileset dir="${build.classes}"> - <include name="org/jboss/test/ws4ee/marshalltest/MarshallTestHome.class"/> - <include name="org/jboss/test/ws4ee/marshalltest/MarshallTestRemote.class"/> - <include name="org/jboss/test/ws4ee/marshalltest/MarshallTestEndpoint.class"/> - <include name="org/jboss/test/ws4ee/marshalltest/MarshallTestBean.class"/> - <include name="org/jboss/test/ws4ee/marshalltest/Bean.class"/> + <include name="org/jboss/test/webservice/marshalltest/MarshallTestHome.class"/> + <include name="org/jboss/test/webservice/marshalltest/MarshallTestRemote.class"/> + <include name="org/jboss/test/webservice/marshalltest/MarshallTestEndpoint.class"/> + <include name="org/jboss/test/webservice/marshalltest/MarshallTestBean.class"/> + <include name="org/jboss/test/webservice/marshalltest/Bean.class"/> </fileset> - <metainf dir="${build.resources}/ws4ee/marshalltest/META-INF"> + <metainf dir="${build.resources}/webservice/marshalltest/META-INF"> <include name="ejb-jar.xml"/> <include name="jboss.xml"/> </metainf> - <metainf dir="${build.resources}/ws4ee/marshalltest-rpclit/META-INF"> + <metainf dir="${build.resources}/webservice/marshalltest-rpclit/META-INF"> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="ws4ee-deployment.xml"/> @@ -5418,10 +5420,10 @@ </jar> <jar destfile="${build.lib}/ws4eemarshall-rpclit-client.jar" manifest="${build.etc}/manifest.mf"> <fileset dir="${build.classes}"> - <include name="org/jboss/test/ws4ee/marshalltest/MarshallTestEndpoint.class"/> - <include name="org/jboss/test/ws4ee/marshalltest/Bean.class"/> + <include name="org/jboss/test/webservice/marshalltest/MarshallTestEndpoint.class"/> + <include name="org/jboss/test/webservice/marshalltest/Bean.class"/> </fileset> - <metainf dir="${build.resources}/ws4ee/marshalltest-rpclit/META-INF"> + <metainf dir="${build.resources}/webservice/marshalltest-rpclit/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="jaxrpc-mapping.xml"/> @@ -5430,7 +5432,7 @@ </metainf> </jar> <ear destfile="${build.lib}/ws4eemarshall-rpclit.ear" manifest="${build.etc}/manifest.mf" - appxml="${source.resources}/ws4ee/marshalltest-rpclit/META-INF/application.xml"> + appxml="${source.resources}/webservice/marshalltest-rpclit/META-INF/application.xml"> <fileset dir="${build.lib}"> <include name="ws4eemarshall-rpclit.jar"/> <include name="ws4eemarshall-rpclit-client.jar"/> @@ -5440,17 +5442,17 @@ <!-- build ws4eemarshall-doclit.ear --> <jar destfile="${build.lib}/ws4eemarshall-doclit.jar" manifest="${build.etc}/manifest.mf"> <fileset dir="${build.classes}"> - <include name="org/jboss/test/ws4ee/marshalltest/MarshallTestHome.class"/> - <include name="org/jboss/test/ws4ee/marshalltest/MarshallTestRemote.class"/> - <include name="org/jboss/test/ws4ee/marshalltest/MarshallTestEndpoint.class"/> - <include name="org/jboss/test/ws4ee/marshalltest/MarshallTestBean.class"/> - <include name="org/jboss/test/ws4ee/marshalltest/Bean.class"/> + <include name="org/jboss/test/webservice/marshalltest/MarshallTestHome.class"/> + <include name="org/jboss/test/webservice/marshalltest/MarshallTestRemote.class"/> + <include name="org/jboss/test/webservice/marshalltest/MarshallTestEndpoint.class"/> + <include name="org/jboss/test/webservice/marshalltest/MarshallTestBean.class"/> + <include name="org/jboss/test/webservice/marshalltest/Bean.class"/> </fileset> - <metainf dir="${build.resources}/ws4ee/marshalltest/META-INF"> + <metainf dir="${build.resources}/webservice/marshalltest/META-INF"> <include name="ejb-jar.xml"/> <include name="jboss.xml"/> </metainf> - <metainf dir="${build.resources}/ws4ee/marshalltest-doclit/META-INF"> + <metainf dir="${build.resources}/webservice/marshalltest-doclit/META-INF"> <include name="webservices.xml"/> <include name="jaxrpc-mapping.xml"/> <include name="ws4ee-deployment.xml"/> @@ -5459,10 +5461,10 @@ </jar> <jar destfile="${build.lib}/ws4eemarshall-doclit-client.jar" manifest="${build.etc}/manifest.mf"> <fileset dir="${build.classes}"> - <include name="org/jboss/test/ws4ee/marshalltest/MarshallTestEndpoint.class"/> - <include name="org/jboss/test/ws4ee/marshalltest/Bean.class"/> + <include name="org/jboss/test/webservice/marshalltest/MarshallTestEndpoint.class"/> + <include name="org/jboss/test/webservice/marshalltest/Bean.class"/> </fileset> - <metainf dir="${build.resources}/ws4ee/marshalltest-doclit/META-INF"> + <metainf dir="${build.resources}/webservice/marshalltest-doclit/META-INF"> <include name="application-client.xml"/> <include name="jboss-client.xml"/> <include name="jaxrpc-mapping.xml"/> @@ -5471,7 +5473,7 @@ </metainf> </jar> <ear destfile="${build.lib}/ws4eemarshall-doclit.ear" manifest="${build.etc}/manifest.mf" - appxml="${source.resources}/ws4ee/marshalltest-doclit/META-INF/application.xml"> + appxml="${source.resources}/webservice/marshalltest-doclit/META-INF/application.xml"> <fileset dir="${build.lib}"> <include name="ws4eemarshall-doclit.jar"/> <include name="ws4eemarshall-doclit-client.jar"/> @@ -5481,19 +5483,19 @@ <!-- build ws4eehandlerflow-ejb.ear --> <jar destfile="${build.lib}/ws4eehandlerflow.jar" manifest="${build.etc}/manifest.mf"> <fileset dir="${build.classes}"> - <include name="org/jboss/test/ws4ee/handlerflow/HelloHome.class"/> - <include name="org/jboss/test/ws4ee/handlerflow/HelloRemote.class"/> - <include name="org/jboss/test/ws4ee/handlerflow/HelloEndpoint.class"/> - <include name="org/jboss/test/ws4ee/handlerflow/HelloBean.class"/> - <include name="org/jboss/test/ws4ee/handlerflow/HandlerBase.class"/> - <include name="org/jboss/test/ws4ee/handlerflow/HandlerTracker.class"/> - <include name="org/jboss/test/ws4ee/handlerflow/ClientHandler1.class"/> - <include name="org/jboss/test/ws4ee/handlerflow/ClientHandler2.class"/> + <include name="org/jboss/test/webservice/handlerflow/HelloHome.class"/> + <include name="org/jboss/test/webservice/handlerflow/HelloRemote.class"/> + <include name="org/jboss/test/webservice/handlerflow/HelloEndpoint.class"/> + <include name="org/jboss/test/webservice/handlerflow/HelloBean.class"/> + <include name="org/jboss/test/webservice/handlerflow/HandlerBase.class"/> + <include name="org/jboss/test/webservice/handlerflow/HandlerTracker.class"/> + <include name="org/jboss/test/webservice/handlerflow/ClientHandler1.class"/> + <include name="org/jboss/test/webservice/handlerflow/ClientHandler2.class"/> <!-- although the server handler are not needed, keep them for the test --> - <include name="org/jboss/test/ws4ee/handlerflow/ServerHandler1.class"/> - <include name="org/jboss/test/ws4ee/handlerflow/ServerHandler2.class"/> + <include name="org/jboss/test/webservice/handlerflow/ServerHandler1.class"/> + <include name="org/jboss/test/webservice/handlerflow/ServerHandler2.class"/> </fileset> - <metainf dir="${build.resources}/ws4ee/handlerflow/META-INF"> + <metainf dir="${build.resources}/webservice/handlerflow/META-INF"> <include name="ejb-jar.xml"/> <include name="jboss.xml"/> <include name="HelloMapping.xml"/> @@ -5503,24 +5505,24 @@ <!-- build ws4eehandlerflow.war --> <war warfile="${build.lib}/ws4eehandlerflow.war" - webxml="${build.resources}/ws4ee/handlerflow/WEB-INF/web.xml"> + webxml="${build.resources}/webservice/handlerflow/WEB-INF/web.xml"> <classes dir="${build.classes}"> - <include name="org/jboss/test/ws4ee/handlerflow/HelloEndpoint.class"/> - <include name="org/jboss/test/ws4ee/handlerflow/HelloJSE.class"/> - <include name="org/jboss/test/ws4ee/handlerflow/HelloFeedbackServlet.class"/> - <include name="org/jboss/test/ws4ee/handlerflow/HandlerBase.class"/> - <include name="org/jboss/test/ws4ee/handlerflow/HandlerTracker.class"/> - <include name="org/jboss/test/ws4ee/handlerflow/ServerHandler1.class"/> - <include name="org/jboss/test/ws4ee/handlerflow/ServerHandler2.class"/> + <include name="org/jboss/test/webservice/handlerflow/HelloEndpoint.class"/> + <include name="org/jboss/test/webservice/handlerflow/HelloJSE.class"/> + <include name="org/jboss/test/webservice/handlerflow/HelloFeedbackServlet.class"/> + <include name="org/jboss/test/webservice/handlerflow/HandlerBase.class"/> + <include name="org/jboss/test/webservice/handlerflow/HandlerTracker.class"/> + <include name="org/jboss/test/webservice/handlerflow/ServerHandler1.class"/> + <include name="org/jboss/test/webservice/handlerflow/ServerHandler2.class"/> <!-- although the client handler are not needed, keep them for the test --> - <include name="org/jboss/test/ws4ee/handlerflow/ClientHandler1.class"/> - <include name="org/jboss/test/ws4ee/handlerflow/ClientHandler2.class"/> + <include name="org/jboss/test/webservice/handlerflow/ClientHandler1.class"/> + <include name="org/jboss/test/webservice/handlerflow/ClientHandler2.class"/> </classes> - <webinf dir="${build.resources}/ws4ee/handlerflow/META-INF"> + <webinf dir="${build.resources}/webservice/handlerflow/META-INF"> <include name="HelloMapping.xml"/> <include name="wsdl/Hello.wsdl"/> </webinf> - <webinf dir="${build.resources}/ws4ee/handlerflow/WEB-INF"> + <webinf dir="${build.resources}/webservice/handlerflow/WEB-INF"> <include name="webservices.xml"/> <include name="jboss-web.xml"/> </webinf> @@ -5775,8 +5777,8 @@ <!-- Exclude JSR77, it is run in its own target with a security manager --> <exclude name="**/test/management/test/**UnitTestCase.class"/> - <!-- Exclude webservices, they run in their own target --> - <exclude name="**/test/webservice/**"/> + <!-- Exclude jboss.net, they run in their own target --> + <exclude name="**/test/jbossnet/**"/> <!-- Exclude iiop they run in their own target --> <exclude name="**/test/*iiop/test/*"/> @@ -6429,7 +6431,7 @@ </target> <!-- - | Standard webservice tests that should run successfully against a + | Standard jbossnet tests that should run successfully against a | JBoss server distribution build that contains jboss-net. --> @@ -6479,7 +6481,7 @@ fork="${junit.batchtest.fork}"> <fileset dir="${build.classes}"> - <include name="**/test/webservice/${jbosstest.pattern}TestCase.class"/> + <include name="**/test/jbossnet/${jbosstest.pattern}TestCase.class"/> </fileset> </batchtest> </junit> @@ -6487,7 +6489,7 @@ <!-- | J2EE webservice tests that should run successfully against a - | JBoss server distribution build that contains jboss-ws4ee.sar + | JBoss server distribution build that contains jboss-webservice.sar --> <target name="tests-webservice-unit" depends="maybejars"> @@ -6538,7 +6540,7 @@ fork="${junit.batchtest.fork}"> <fileset dir="${build.classes}"> - <include name="org/jboss/test/ws4ee/**/*TestCase.class"/> + <include name="org/jboss/test/webservice/**/*TestCase.class"/> </fileset> </batchtest> </junit> |
