|
From: Thomas D. <tdi...@us...> - 2004-10-25 07:43:26
|
User: tdiesler Date: 04/10/25 00:43:19 Modified: . build.xml Log: Retire JBoss.NET in head Revision Changes Path 1.416 +2 -468 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.415 retrieving revision 1.416 diff -u -r1.415 -r1.416 --- build.xml 22 Oct 2004 06:24:35 -0000 1.415 +++ build.xml 25 Oct 2004 07:43:18 -0000 1.416 @@ -15,7 +15,7 @@ <!-- --> <!-- ====================================================================== --> -<!-- $Id: build.xml,v 1.415 2004/10/22 06:24:35 ejort Exp $ --> +<!-- $Id: build.xml,v 1.416 2004/10/25 07:43:18 tdiesler Exp $ --> <project default="main" name="JBoss/Testsuite"> @@ -147,7 +147,6 @@ <path refid="jboss.internal-server.classpath"/> <path refid="jboss.j2ee.classpath"/> <path refid="jboss.jaxrpc.classpath"/> - <path refid="jboss.jbossnet.classpath"/> <path refid="jboss.jca.classpath"/> <path refid="jboss.jmx.classpath"/> <path refid="jboss.management.classpath"/> @@ -256,12 +255,8 @@ <fileset dir="${project.thirdparty}/xdoclet-xdoclet/lib"> <include name="**/*.jar"/> </fileset> -<!-- - <fileset dir="${project.root}/jboss.net/output/lib"> - <include name="xdoclet-*.jar"/> - </fileset> ---> </path> + <property name="xdoclet.task.classpath" refid="xdoclet.task.classpath"/> @@ -930,152 +925,6 @@ destdir="${build.resources}/entity/entity/META-INF"/> </ejbdoclet> - <!-- JBoss.NET services generation --> - - <!-- call wsdl4j emitter for AddressBook interfaces and stubs --> - <java dir="${build.gen-src}" fork="yes" failOnError="true" className="org.apache.axis.wsdl.WSDL2Java"> - <arg value="-s"/> - <arg value="-d"/> - <arg value="Session"/> - <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/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.jbossnet.external.babelfish"/> - <arg value="${source.resources}/jbossnet/external/wsr/META-INF/babelfish.wsdl"/> - <classpath refid="thirdparty.classpath"/> - </java> - - <!-- call wsdl4j emitter for Google stubs --> - <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.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="jbossnet-ejbdoclet" classname="xdoclet.modules.ejb.EjbDocletTask"> - <classpath refid="xdoclet.task.classpath"/> - <classpath refid="jboss.jbossnet.classpath"/> - </taskdef> - <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 --> - <jbossnet-ejbdoclet destdir="${build.gen-src}" - ejbspec="2.0" - excludedtags="@version,@author"> - <fileset dir="${source.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}/jbossnet/ejbsimple/ejb/META-INF"/> - <jboss xmlencoding="UTF-8" - version="3.0" - destdir="${build.resources}/jbossnet/ejbsimple/ejb/META-INF"/> - <jbossnet webDeploymentName="EjbSimple" - prefix="ejbsimple" - destdir="${build.resources}/jbossnet/ejbsimple/wsr/META-INF" - targetNameSpace="http://test.jboss.org/ejbsimple"/> - </jbossnet-ejbdoclet> - - <!-- generate jmx meta-data and interfaces --> - <jbossnet-jmxdoclet destdir="${build.gen-src}" - excludedtags="@version,@author"> - <fileset dir="${source.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}/jbossnet/jmx/wsr/META-INF" - targetNameSpace="http://test.jboss.org/jmx"/> - </jbossnet-jmxdoclet> - - <!-- generate state test meta-data --> - <jbossnet-ejbdoclet destdir="${build.gen-src}" - ejbspec="2.0" - excludedtags="@version,@author"> - <fileset dir="${source.java}"> - <include name="org/jboss/test/jbossnet/state/server/*Bean.java"/> - </fileset> - <remoteinterface/> - <homeinterface/> - <deploymentdescriptor xmlencoding="UTF-8" - destdir="${build.resources}/jbossnet/state/ejb/META-INF"/> - <jboss xmlencoding="UTF-8" - version="3.0" - destdir="${build.resources}/jbossnet/state/ejb/META-INF"/> - <jbossnet webDeploymentName="State" - prefix="state" - destdir="${build.resources}/jbossnet/state/wsr/META-INF" - targetNameSpace="http://test.jboss.org/state"/> - </jbossnet-ejbdoclet> - - <!-- generate security test meta-data --> - <jbossnet-ejbdoclet destdir="${build.gen-src}" - ejbspec="2.0" - excludedtags="@version,@author"> - <fileset dir="${source.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}/jbossnet/security/ejb/META-INF"/> - <jboss xmlencoding="UTF-8" - version="3.0" - securitydomain="java:/jaas/other" - destdir="${build.resources}/jbossnet/security/ejb/META-INF"/> - <jbossnet webDeploymentName="Security" - prefix="security" - destdir="${build.resources}/jbossnet/security/wsr/META-INF" - targetNameSpace="http://test.jboss.org/security"/> - </jbossnet-ejbdoclet> - - <!-- generate external test meta-data --> - <jbossnet-ejbdoclet destdir="${build.gen-src}" - ejbspec="2.0" - excludedtags="@version,@author"> - <fileset dir="${source.java}"> - <include name="org/jboss/test/jbossnet/external/server/*Bean.java"/> - </fileset> - <entitycmp cmpspec="2.x"/> - <remoteinterface/> - <homeinterface/> - <localinterface/> - <localhomeinterface/> - <deploymentdescriptor xmlencoding="UTF-8" - destdir="${build.resources}/jbossnet/external/ejb/META-INF"/> - <jboss xmlencoding="UTF-8" - version="3.0" - destdir="${build.resources}/jbossnet/external/ejb/META-INF"/> - <jbossnet webDeploymentName="External" - prefix="external" - mergedir="${source.resources}/jbossnet/external/wsr/META-INF" - destdir="${build.resources}/jbossnet/external/wsr/META-INF" - targetNameSpace="http://test.jboss.org/external"/> - </jbossnet-ejbdoclet> - <!-- aop test --> <mkdir dir="${build.resources}/aop/simpleejb/META-INF"/> <ejbdoclet destdir="${build.gen-src}" @@ -1297,13 +1146,6 @@ <include name="**/*"/> </fileset> </copy> - <!-- we copy the standard client-config to the resources folder - <copy todir="${build.resources}" filtering="no"> - <fileset dir="${jboss.jbossnet.etc}"> - <include name="**/client-config.xml"/> - </fileset> - </copy> ---> </target> <!-- Compile stylesheets files --> @@ -1326,93 +1168,6 @@ </copy> </target> - <!-- Compile wsdl files --> - <target name="compile-wsdl" depends="init"> - - <!-- Note, we use the latest axis tools --> - <path id="java2wsdl.classpath"> - <path refid="apache.axis.classpath"/> - <path refid="apache.commons.classpath"/> - <path refid="apache.log4j.classpath"/> - <path refid="ibm.wsdl4j.classpath"/> - <path refid="sun.jaf.classpath"/> - <path refid="sun.javamail.classpath"/> - <path refid="jboss.common.classpath"/> - <path refid="jboss.j2ee.classpath"/> - </path> - - <!-- jboss.net/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}/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.jbossnet.ejbsimple.HelloRemote"/> - </java> - - <!-- 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}/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.webservice.marshalltest.MarshallRpcServiceInterface"/> - </java> - <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}/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.webservice.marshalltest.MarshallRpcServiceInterface"/> - </java> - <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}/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.webservice.marshalltest.MarshallRpcServiceInterface"/> - </java> - - <!-- 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}/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.webservice.handlerflow.HelloEndpoint"/> - </java> - </target> - <!-- ================================================================== --> <!-- Archives --> <!-- ================================================================== --> @@ -1453,7 +1208,6 @@ _jars-isolation, _jars-jbossmq, _jars-jbossmx, - _jars-jbossnet, _jars-jca, _jars-jmsra, _jars-jmx, @@ -3446,166 +3200,6 @@ </jar> </target> - <!-- jbossnet tests --> - <target name="_jars-jbossnet"> - <mkdir dir="${build.lib}"/> - - <!-- The wsr.wsr --> - <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/jbossnet/wsr/**/*.class"/> - <exclude name="**/*Test*"/> - </fileset> - <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}/jbossnet/jmx/wsr"> - <include name="**/*"/> - </fileset> - </jar> - - <jar destfile="${build.lib}/wsjmx.sar" manifest="${build.etc}/manifest.mf"> - <fileset dir="${build.lib}"> - <include name="wsjmx.wsr"/> - </fileset> - <fileset dir="${source.resources}/jbossnet/jmx/sar/"> - <include name="**/*"/> - </fileset> - <fileset dir="${build.classes}"> - <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}/jbossnet/ejbsimple/wsr"> - <include name="**/*"/> - </fileset> - </jar> - - <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/jbossnet/ejbsimple/**"/> - <exclude name="org/jboss/test/jbossnet/ejbsimple/*Test*"/> - </fileset> - <fileset dir="${build.resources}/jbossnet/ejbsimple/ejb/"> - <include name="**/*.xml"/> - </fileset> - </jar> - - <jar destfile="${build.lib}/wsejbsimple.ear" manifest="${build.etc}/manifest.mf"> - <fileset dir="${build.lib}"> - <include name="wsejbsimple.wsr"/> - <include name="wsejbsimple.jar"/> - </fileset> - <fileset dir="${source.resources}/jbossnet/ejbsimple/ear/"> - <include name="**"/> - </fileset> - </jar> - - <!-- 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/jbossnet/external/google/*.class"/> - <include name="org/jboss/test/jbossnet/external/babelfish/*.class"/> - </fileset> - <fileset dir="${build.resources}/jbossnet/external/wsr/"> - <include name="**/*"/> - </fileset> - </jar> - - <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/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}/jbossnet/external/ejb/"> - <include name="**/*"/> - </fileset> - </jar> - - <jar destfile="${build.lib}/wsexternal.ear" manifest="${build.etc}/manifest.mf"> - <fileset dir="${build.lib}"> - <include name="wsexternal.wsr"/> - <include name="wsexternal.jar"/> - </fileset> - <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}/jbossnet/state/wsr"> - <include name="**/*"/> - </fileset> - </jar> - - <jar jarfile="${build.lib}/wsstate.jar" manifest="${build.etc}/manifest.mf"> - <fileset dir="${build.classes}"> - <include name="**/test/util/**"/> - <include name="**/test/jbossnet/state/**"/> - <exclude name="**/*Test*.*"/> - </fileset> - <fileset dir="${build.resources}/jbossnet/state/ejb/"> - <include name="**/*.xml"/> - </fileset> - </jar> - - <jar jarFile="${build.lib}/wsstate.ear" manifest="${build.etc}/manifest.mf"> - <fileset dir="${build.lib}"> - <include name="wsstate.wsr"/> - <include name="wsstate.jar"/> - </fileset> - <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}/jbossnet/security/wsr"> - <include name="**/*"/> - </fileset> - </jar> - - <jar jarfile="${build.lib}/wssecurity.jar" manifest="${build.etc}/manifest.mf"> - <fileset dir="${build.classes}"> - <include name="**/test/util/**"/> - <include name="**/test/jbossnet/security/**"/> - <include name="**/test/security/service/SecurityConfig*.*"/> - <exclude name="**/*TestCase*.*"/> - </fileset> - <fileset dir="${build.resources}/jbossnet/security/ejb/"> - <include name="**/*.xml"/> - </fileset> - <fileset dir="${build.resources}/jbossnet/security/server/"> - <include name="**/*.xml"/> - </fileset> - </jar> - - <jar jarFile="${build.lib}/wssecurity.ear" manifest="${build.etc}/manifest.mf"> - <fileset dir="${build.lib}"> - <include name="wssecurity.wsr"/> - <include name="wssecurity.jar"/> - </fileset> - <fileset dir="${source.resources}/jbossnet/security/ear"> - <include name="**/*.xml"/> - </fileset> - </jar> - - </target> - <!-- jca test --> <target name="_jars-jca"> <mkdir dir="${build.lib}"/> @@ -5986,9 +5580,6 @@ <!-- Exclude JSR77, it is run in its own target with a security manager --> <exclude name="**/test/management/test/**UnitTestCase.class"/> - <!-- 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/*"/> <exclude name="org/jboss/test/media/**" /> @@ -6646,63 +6237,6 @@ </target> <!-- - | Standard jbossnet tests that should run successfully against a - | JBoss server distribution build that contains jboss-net. - --> - - <target name="tests-jbossnet-unit" depends="maybejars"> - - <mkdir dir="${build.reports}"/> - <mkdir dir="${build.testlog}"/> - <!-- choose a testpattern via a property --> - <property name="jbosstest.pattern" value="**/*"/> - <junit dir="${module.output}" - printsummary="${junit.printsummary}" - haltonerror="${junit.haltonerror}" - haltonfailure="${junit.haltonfailure}" - fork="${junit.fork}" - timeout="${junit.timeout}" - jvm="${junit.jvm}"> - - <jvmarg line="${junit.jvm.options}"/> - <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/> - <sysproperty key="jbosstest.secure" value="true"/> - - <jvmarg value="-Djava.security.manager"/> - <sysproperty key="java.security.policy" value="${build.resources}/security/tst.policy"/> - <sysproperty key="java.security.auth.login.config" value="${build.resources}/security/auth.conf"/> - - <sysproperty key="build.testlog" value="${build.testlog}"/> - <sysproperty key="log4j.configuration" value="file:${build.resources}/log4j.xml"/> - - <!-- make sure to use xerces on the client side as well, otherwise the element echo tests might fail --> - <sysproperty key="javax.xml.parsers.DocumentBuilderFactory" value="org.apache.xerces.jaxp.DocumentBuilderFactoryImpl"/> - <sysproperty key="javax.xml.parsers.SAXParserFactory" value="org.apache.xerces.jaxp.SAXParserFactoryImpl"/> - - <classpath> - <pathelement location="${build.classes}"/> - <pathelement location="${build.resources}/security"/> - <pathelement location="${build.resources}"/> - <pathelement location="${jboss.jbossnet.lib}/jboss-net-client.jar"/> - <path refid="tests.classpath"/> - </classpath> - - <formatter type="xml" usefile="${junit.formatter.usefile}"/> - <formatter type="plain" usefile="${junit.formatter.usefile}"/> - - <batchtest todir="${build.reports}" - haltonerror="${junit.batchtest.haltonerror}" - haltonfailure="${junit.batchtest.haltonfailure}" - fork="${junit.batchtest.fork}"> - - <fileset dir="${build.classes}"> - <include name="**/test/jbossnet/${jbosstest.pattern}TestCase.class"/> - </fileset> - </batchtest> - </junit> - </target> - - <!-- | J2EE webservice tests that should run successfully against a | JBoss server distribution build that contains jboss-webservice.sar --> |