Menu
▾
▴
[jboss-cvs] jbosstest build.xml
|
From: Thomas D. <tdi...@us...> - 2004-07-28 11:53:06
|
User: tdiesler Date: 04/07/28 04:52:57 Modified: . build.xml Log: Restore the jboss.net test build. To run tests-jbossnet-unit install the jboss-net.sar and client jars first. Revision Changes Path 1.380 +77 -33 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.379 retrieving revision 1.380 diff -u -r1.379 -r1.380 --- build.xml 27 Jul 2004 14:01:11 -0000 1.379 +++ build.xml 28 Jul 2004 11:52:56 -0000 1.380 @@ -15,7 +15,7 @@ <!-- --> <!-- ====================================================================== --> -<!-- $Id: build.xml,v 1.379 2004/07/27 14:01:11 tdiesler Exp $ --> +<!-- $Id: build.xml,v 1.380 2004/07/28 11:52:56 tdiesler Exp $ --> <project default="main" name="JBoss/Testsuite"> @@ -112,11 +112,8 @@ <!-- needed for security login module tests --> <path refid="hsqldb.hsqldb.classpath"/> - <!-- needed for JBoss.NET tests --> - <!-- Note, enabeling this breaks the ws4ee tests - <path refid="apache.axis.classpath"/> + <!-- needed for jboss.net module tests --> <path refid="ibm.uddi4j.classpath"/> - --> </path> <!-- ======= --> @@ -144,7 +141,6 @@ <path refid="jboss.iiop.classpath"/> <path refid="jboss.internal-server.classpath"/> <path refid="jboss.j2ee.classpath"/> - <path refid="jboss.jbossnet.classpath"/> <path refid="jboss.jca.classpath"/> <path refid="jboss.management.classpath"/> <path refid="jboss.media.classpath"/> @@ -156,7 +152,6 @@ <path refid="jboss.system.classpath"/> <path refid="jboss.transaction.classpath"/> <path refid="jboss.varia.classpath"/> - <path refid="jboss.webservice.classpath"/> </path> <!-- ===== --> @@ -288,7 +283,7 @@ | documentation compiles. --> <target name="compile" - depends="compile-classes, compile-xmbean-dds, compile-etc, compile-stylesheets, compile-resources, compile-wsdl" + depends="compile-classes, compile-xmbean-dds, compile-etc, compile-stylesheets, compile-resources" description="Compile all source files."/> <!-- Compile EJB beans with XDoclet --> @@ -926,9 +921,9 @@ destdir="${build.resources}/entity/entity/META-INF"/> </ejbdoclet> - <!-- JBoss.NET services generation + <!-- JBoss.NET services generation --> - <!- - call wsdl4j emitter for AddressBook interfaces and stubs - -> + <!-- 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"/> @@ -936,36 +931,43 @@ <arg value="-Nhttp://test.jboss.org/samples/AddressBook=org.jboss.test.webservice.wsr"/> <arg value="${source.resources}/webservice/wsr/wsr/META-INF/AddressBook.wsdl"/> <classpath refid="thirdparty.classpath"/> + <classpath refid="apache.axis.classpath"/> </java> - <!- - Delete the service impl skeleton as we have an impl already - -> + <!-- Delete the service impl skeleton as we have an impl already --> <delete file="${build.gen-src}/org/jboss/test/webservice/wsr/AddressBookSOAPBindingImpl.java"/> - <!- - call wsdl4j emitter for Bablefish stubs- -> + <!-- 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"/> <classpath refid="thirdparty.classpath"/> + <classpath refid="apache.axis.classpath"/> </java> - <!- - call wsdl4j emitter for Google stubs - -> + <!-- 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.webservice.external.google"/> <arg value="${source.resources}/webservice/external/wsr/META-INF/google.wsdl"/> <classpath refid="thirdparty.classpath"/> + <classpath refid="apache.axis.classpath"/> </java> - <!- - these taskdefs allow to call jboss.net specific xdoclet functionality - <taskdef name="webserviceejbdoclet" classname="xdoclet.modules.ejb.EjbDocletTask" - classpathref="xdoclet.task.classpath"/> - <taskdef name="webservicejmxdoclet" classname="xdoclet.modules.jmx.JMXDocletTask" - classpathref="xdoclet.task.classpath"/> + <!-- these taskdefs allow to call jboss.net specific xdoclet functionality --> + <taskdef name="webserviceejbdoclet" classname="xdoclet.modules.ejb.EjbDocletTask"> + <classpath refid="xdoclet.task.classpath"/> + <classpath refid="jboss.jbossnet.classpath"/> + </taskdef> + <taskdef name="webservicejmxdoclet" classname="xdoclet.modules.jmx.JMXDocletTask"> + <classpath refid="xdoclet.task.classpath"/> + <classpath refid="jboss.jbossnet.classpath"/> + </taskdef> - <!- - generate ejbsimple meta-data and interfaces + <!-- generate ejbsimple meta-data and interfaces --> <webserviceejbdoclet destdir="${build.gen-src}" ejbspec="2.0" excludedtags="@version,@author"> @@ -988,7 +990,7 @@ targetNameSpace="http://test.jboss.org/ejbsimple"/> </webserviceejbdoclet> - <!- - generate jmx meta-data and interfaces + <!-- generate jmx meta-data and interfaces --> <webservicejmxdoclet destdir="${build.gen-src}" excludedtags="@version,@author"> <fileset dir="${source.java}"> @@ -1002,7 +1004,7 @@ targetNameSpace="http://test.jboss.org/jmx"/> </webservicejmxdoclet> - <!- - generate state test meta-data + <!-- generate state test meta-data --> <webserviceejbdoclet destdir="${build.gen-src}" ejbspec="2.0" excludedtags="@version,@author"> @@ -1022,7 +1024,7 @@ targetNameSpace="http://test.jboss.org/state"/> </webserviceejbdoclet> - <!- - generate security test meta-data - - + <!-- generate security test meta-data --> <webserviceejbdoclet destdir="${build.gen-src}" ejbspec="2.0" excludedtags="@version,@author"> @@ -1044,7 +1046,7 @@ targetNameSpace="http://test.jboss.org/security"/> </webserviceejbdoclet> - <!- - generate external test meta-data - - + <!-- generate external test meta-data --> <webserviceejbdoclet destdir="${build.gen-src}" ejbspec="2.0" excludedtags="@version,@author"> @@ -1067,7 +1069,6 @@ destdir="${build.resources}/webservice/external/wsr/META-INF" targetNameSpace="http://test.jboss.org/external"/> </webserviceejbdoclet> ---> <!-- aop test --> <mkdir dir="${build.resources}/aop/simpleejb/META-INF"/> @@ -1275,7 +1276,13 @@ <classpath refid="tests.classpath"/> <include name="${javac.includes}"/> <exclude name="${javac.excludes}"/> + + <!-- + The sources for these modules are compiled in their respective _jars-xxx target + because they depend on conflicting axis versions + --> <exclude name="org/jboss/test/webservice/**" /> + <exclude name="org/jboss/test/ws4ee/**" /> </javac> </target> @@ -1332,7 +1339,6 @@ <!-- ws4ee/marshalltest --> - <!-- Always uses xsd:base64Binary fo byte[], we need to manually override with xsd:hexBinary <mkdir dir="${build.resources}/ws4ee/marshalltest-rpcenc/META-INF/wsdl"/> <java classname="org.apache.axis.wsdl.Java2WSDL" fork="yes"> <classpath refid="java2wsdl.classpath"/> @@ -1372,7 +1378,6 @@ <arg value="-uLITERAL"/> <arg value="org.jboss.test.ws4ee.marshalltest.MarshallTestEndpoint"/> </java> - --> <!-- ws4ee/handlerflow --> <mkdir dir="${build.resources}/ws4ee/handlerflow/META-INF/wsdl"/> @@ -1447,7 +1452,7 @@ _jars-security, _jars-testbean, _jars-testbeancluster, - _jars-httpsessionreplication, + _jars-httpsessionreplication, _jars-threading, _jars-timer, _jars-tm, @@ -1456,7 +1461,8 @@ _jars-txtimer, _jars-util, _jars-web, - _jars-ws4ee, + _jars-jbossnet, + _jars-webservice, _jars-xa"> </target> @@ -1648,6 +1654,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}"/> @@ -1655,6 +1662,7 @@ <include name="org/jboss/test/aop/bean/**"/> <aoppath path="${source.resources}/aop/META-INF/jboss-aop.xml"/> </aopc> +--> </target> <!-- bank test --> @@ -5103,9 +5111,27 @@ </target> <!-- webservice tests --> - <target name="_jars-webservice"> + <target name="_jars-jbossnet"> <mkdir dir="${build.lib}"/> + <javac destdir="${build.classes}" + optimize="${javac.optimize}" + target="${javac.target}" + debug="${javac.debug}" + depend="${javac.depend}" + verbose="${javac.verbose}" + deprecation="${javac.deprecation}" + includeAntRuntime="${javac.include.ant.runtime}" + includeJavaRuntime="${javac.include.java.runtime}" + failonerror="${javac.fail.onerror}"> + <src path="${source.java}"/> + <src path="${build.gen-src}"/> + <classpath refid="tests.classpath"/> + <classpath refid="apache.axis.classpath"/> + <classpath refid="jboss.jbossnet.classpath"/> + <include name="org/jboss/test/webservice/**" /> + </javac> + <!-- The wsr.wsr --> <mkdir dir="${build.resources}/webservice/wsr/wsr/META-INF"/> <copy toFile="${build.resources}/webservice/wsr/wsr/META-INF/web-service.xml" @@ -5304,9 +5330,26 @@ </target> <!-- ws4ee tests --> - <target name="_jars-ws4ee"> + <target name="_jars-webservice"> <mkdir dir="${build.lib}"/> + <javac destdir="${build.classes}" + optimize="${javac.optimize}" + target="${javac.target}" + debug="${javac.debug}" + depend="${javac.depend}" + verbose="${javac.verbose}" + deprecation="${javac.deprecation}" + includeAntRuntime="${javac.include.ant.runtime}" + includeJavaRuntime="${javac.include.java.runtime}" + failonerror="${javac.fail.onerror}"> + <src path="${source.java}"/> + <src path="${build.gen-src}"/> + <classpath refid="tests.classpath"/> + <classpath refid="jboss.webservice.classpath"/> + <include name="org/jboss/test/ws4ee/**" /> + </javac> + <!-- build ws4eesimple.jar --> <jar destfile="${build.lib}/ws4eesimple.jar" manifest="${build.etc}/manifest.mf"> <fileset dir="${build.classes}"> @@ -5689,7 +5732,6 @@ tests-txtimer-unit, tests-util-unit, tests-webservice-unit, - tests-ws4ee-unit, tests-iiop-unit, tests-xml-unit"> </target> @@ -6464,7 +6506,7 @@ | JBoss server distribution build that contains jboss-net. --> - <target name="tests-webservice-unit" depends="maybejars"> + <target name="tests-jbossnet-unit" depends="maybejars"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> <!-- choose a testpattern via a property --> @@ -6493,7 +6535,9 @@ <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"/> + <path refid="apache.axis.classpath"/> </classpath> <formatter type="xml" usefile="${junit.formatter.usefile}"/> @@ -6516,7 +6560,7 @@ | JBoss server distribution build that contains jboss-ws4ee.sar --> - <target name="tests-ws4ee-unit" depends="maybejars"> + <target name="tests-webservice-unit" depends="maybejars"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> |
