|
From: Scott M S. <st...@us...> - 2003-09-29 23:47:22
|
User: starksm Date: 03/09/29 16:47:18 Modified: . Tag: Branch_3_2 build.xml Log: Move the jboss.net test to the testsuite module Revision Changes Path No revision No revision 1.165.2.107 +291 -3 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.165.2.106 retrieving revision 1.165.2.107 diff -u -r1.165.2.106 -r1.165.2.107 --- build.xml 29 Sep 2003 07:47:44 -0000 1.165.2.106 +++ build.xml 29 Sep 2003 23:47:17 -0000 1.165.2.107 @@ -15,7 +15,7 @@ <!-- --> <!-- ====================================================================== --> -<!-- $Id: build.xml,v 1.165.2.106 2003/09/29 07:47:44 pilhuhn Exp $ --> +<!-- $Id: build.xml,v 1.165.2.107 2003/09/29 23:47:17 starksm Exp $ --> <project default="main" name="JBoss/Testsuite"> @@ -92,6 +92,7 @@ <path refid="apache.crimson.classpath"/> <path refid="apache.commons.classpath"/> <path refid="apache.log4j.classpath"/> + <path refid="apache.axis.classpath"/> <path refid="oswego.concurrent.classpath"/> <path refid="jacorb.jacorb.classpath"/> <path refid="junit.junit.classpath"/> @@ -136,6 +137,7 @@ <path refid="jboss.management.classpath"/> <path refid="jboss.transaction.classpath"/> <path refid="jboss.varia.classpath"/> + <path refid="jboss.jbossnet.classpath" /> </path> <!-- ===== --> @@ -231,6 +233,9 @@ <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"/> @@ -847,6 +852,94 @@ destdir="${build.resources}/entity/entity/META-INF"/> </ejbdoclet> +<!-- JBoss.NET services generation --> + <!-- call wsdl4j emitter --> + <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://net.jboss.org/samples/AddressBook=org.jboss.test.webservice.addr" /> + <arg value="${source.resources}/webservice/addr/wsr/META-INF/AddressBook.wsdl" /> + <classpath refid="apache.axis.generate.classpath"/> + </java> + + <!-- call wsdl4j emitter --> + <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="apache.axis.generate.classpath"/> + </java> + + <!-- call wsdl4j emitter --> + <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="apache.axis.generate.classpath"/> + </java> + + <!-- remove the empty service impl? --> + <delete file="${build.gen-src}/samples/addr/AddressBookSOAPBindingImpl.java"/> + + <taskdef name="webserviceejbdoclet" classname="xdoclet.modules.ejb.EjbDocletTask" + classpathref="xdoclet.task.classpath"/> + <taskdef name="webservicejmxdoclet" classname="xdoclet.modules.jmx.JMXDocletTask" + classpathref="xdoclet.task.classpath"/> + + <webserviceejbdoclet destdir="${build.gen-src}" + ejbspec="2.0" + excludedtags="@version,@author"> + <fileset dir="${source.java}"> + <include name="org/jboss/test/webservice/hello/server/Hello*Bean.java"/> + <include name="org/jboss/test/webservice/hello/HelloData.java"/> + </fileset> + <entitycmp cmpspec="2.x"/> + <remoteinterface/> + <homeinterface/> + <deploymentdescriptor xmlencoding ="UTF-8" + destdir="${build.resources}/webservice/hello/ejb/META-INF"/> + <jboss xmlencoding="UTF-8" + version="3.0" + destdir="${build.resources}/webservice/hello/ejb/META-INF"/> + <jbossnet webDeploymentName="Hello" + prefix="hello" + destdir="${build.resources}/webservice/hello/wsr/META-INF" + targetNameSpace="http://net.jboss.org/hello" /> + </webserviceejbdoclet> + + <webservicejmxdoclet destdir="${build.gen-src}" + excludedtags="@version,@author"> + <fileset dir="${source.java}"> + <include name="org/jboss/test/webservice/jmx/JMXTest.java"/> + </fileset> + <mbeaninterface/> + <jbossnet webDeploymentName="JMXTest" + prefix="jmx" + destdir="${build.resources}/webservice/jmx/wsr/META-INF" + targetNameSpace="http://net.jboss.org/jmx" /> + </webservicejmxdoclet> + + <webserviceejbdoclet destdir="${build.gen-src}" + ejbspec="2.0" + excludedtags="@version,@author"> + <fileset dir="${source.java}"> + <include name="org/jboss/test/webservice/arrays/ArraysData.java"/> + <include name="org/jboss/test/webservice/arrays/server/ArraysBean.java"/> + </fileset> + <entitycmp cmpspec="2.x"/> + <remoteinterface/> + <homeinterface/> + <deploymentdescriptor xmlencoding ="UTF-8" + destdir="${build.resources}/webservice/arrays/ejb/META-INF"/> + <jboss xmlencoding="UTF-8" + version="3.0" + destdir="${build.resources}/webservice/arrays/ejb/META-INF"/> + <jbossnet webDeploymentName="Arrays" + prefix="arrays" + destdir="${build.resources}/webservice/arrays/wsr/META-INF" + targetNameSpace="http://net.jboss.org/arrays" /> + </webserviceejbdoclet> + </target> <target name="compile-mbean-sources" depends="init" unless="noxdoclet"> @@ -1022,7 +1115,9 @@ _jars-entity, _jars-classloader, _jars-tm, - _jars-util"> + _jars-util, + _jars-webservice + "> </target> <!-- @@ -2955,6 +3050,16 @@ </fileset> </war> + <!-- war to test DIGEST auth --> + <war warfile="${build.lib}/digest-auth.war" + webxml="${build.resources}/web/WEB-INF/digest-auth-web.xml"> + <webinf dir="${build.resources}/web/html/other/WEB-INF"> + <include name="jboss-web.xml"/> + </webinf> + <fileset dir="${build.resources}/web/html/root"> + <include name="**/*.html"/> + </fileset> + </war> <!-- build jbosstest-web.ear --> <ear earfile="${build.lib}/jbosstest-web.ear" @@ -3975,7 +4080,7 @@ <mkdir dir="${build.lib}"/> <!-- build tmtest.sar --> - <jar jarfile="${build.lib}/tmtest.sar"> + <jar destfile="${build.lib}/tmtest.sar"> <metainf dir="${build.resources}/tm"> <include name="jboss-service.xml" /> </metainf> @@ -3985,6 +4090,189 @@ </fileset> </jar> </target> + + <!-- Web services tests --> + <target name="_jars-webservice"> + <mkdir dir="${build.lib}"/> + + <!-- The addr.wsr --> + <mkdir dir="${build.resources}/addr/wsr/META-INF"/> + + <copy toFile="${build.resources}/addr/wsr/META-INF/web-service.xml" + file="${build.gen-src}/org/jboss/test/webservice/addr/deploy.wsdd"/> + + <jar destfile="${build.lib}/addr.wsr"> + <fileset dir="${build.classes}"> + <include name="org/jboss/test/webservice/addr/*.class"/> + <exclude name="**/addr/AddressBookSOAPBindingImpl.class"/> + <exclude name="**/addr/AddressBookSOAPBindingSkeleton.class"/> + </fileset> + <fileset dir="${build.resources}/webservice/addr/wsr" /> + </jar> + + <jar destfile="${build.lib}/addrtest.jar"> + <fileset dir="${build.classes}"> + <include name="org/jboss/test/webservice/addr/*.class"/> + </fileset> + <fileset dir="${build.classes}"> + <include name="org/jboss/test/webservice/addr/*.class"/> + </fileset> + </jar> + + <!-- The jmx.wsr --> + <jar destfile="${build.lib}/jmx.wsr"> + <fileset dir="${build.resources}/webservice/jmx/wsr"> + <include name="**/*"/> + </fileset> + </jar> + + <jar destfile="${build.lib}/jmx-test.sar"> + <fileset dir="${build.lib}"> + <include name="jmx.wsr"/> + </fileset> + <fileset dir="${build.resources}/webservice/jmx/sar/"> + <include name="**/*"/> + </fileset> + <fileset dir="${build.classes}"> + <include name="org/jboss/test/webservice/jmx/**"/> + </fileset> + </jar> + + <!-- The wshello.ear and wsr --> + <jar destfile="${build.lib}/wshello.wsr"> + <fileset dir="${build.resources}/webservice/hello/wsr"> + <include name="**/*"/> + </fileset> + </jar> + + <jar destfile="${build.lib}/wshellotest.jar"> + <fileset dir="${build.classes}"> + <include name="org/jboss/test/webservice/hello/**"/> + <exclude name="org/jboss/test/webservice/hello/server/**"/> + </fileset> + </jar> + + <!-- build hello.jar --> + <jar destfile="${build.lib}/wshello.jar"> + <fileset dir="${build.classes}"> + <include name="org/jboss/test/util/**"/> + <include name="org/jboss/test/webservice/hello/**"/> + <exclude name="org/jboss/test/webservice/hello/*UnitTestCase.*"/> + </fileset> + <fileset dir="${build.resources}/webservice/hello/ejb/"> + <include name="**/*.xml"/> + </fileset> + </jar> + + <ear destfile="${build.lib}/wshello.ear" + appxml="${build.resources}/webservice/hello/ear/META-INF/application.xml"> + <fileset dir="${build.lib}"> + <include name="wshello.wsr"/> + <include name="wshello.jar"/> + </fileset> + </ear> + + <!-- The arrays.ear and arrays.wsr --> + <jar jarFile="${build.lib}/arrays.wsr"> + <fileset dir="${build.resources}/webservice/arrays/wsr"> + <include name="**/*"/> + </fileset> + </jar> + + <jar jarFile="${build.lib}/arraystest.jar"> + <fileset dir="${build.classes}"> + <include name="org/jboss/test/webservice/arrays/**"/> + <exclude name="org/jboss/test/webservice/arrays/server/**"/> + </fileset> + </jar> + + <!-- build arrays.jar --> + <jar jarfile="${build.lib}/arrays.jar"> + <fileset dir="${build.classes}"> + <include name="org/jboss/test/util/**"/> + <include name="org/jboss/test/webservice/arrays/**"/> + <exclude name="org/jboss/test/webservice/arrays/*UnitTestCase.*"/> + </fileset> + <fileset dir="${build.resources}/webservice/arrays/ejb/"> + <include name="**/*.xml"/> + </fileset> + </jar> + + <ear destfile="${build.lib}/arrays.ear" + appxml="${build.resources}/webservice/arrays/ear/META-INF/application.xml"> + <fileset dir="${build.lib}"> + <include name="arrays.wsr"/> + <include name="arrays.jar"/> + </fileset> + </ear> + + <!-- The store wsr and ear --> + <jar destfile="${build.lib}/store.wsr"> + <fileset dir="${build.classes}"> + <include name="org/jboss/test/webservice/store/server/**"/> + </fileset> + <fileset dir="${build.resources}/webservice/store/wsr"> + <include name="**/*"/> + </fileset> + </jar> + + <jar destfile="${build.lib}/storetest.jar"> + <fileset dir="${build.classes}"> + <include name="org/jboss/test/webservice/store/*"/> + </fileset> + </jar> + + <!-- build store.jar --> + <jar destfile="${build.lib}/store.jar"> + <fileset dir="${build.classes}"> + <include name="org/jboss/test/webservice/store/**"/> + <exclude name="org/jboss/test/webservice/*Test*"/> + </fileset> + <fileset dir="${build.resources}/webservice/store/jar/"> + <include name="**/*.xml"/> + </fileset> + </jar> + + <ear destfile="${build.lib}/store.ear" + appxml="${build.resources}/webservice/store/ear/META-INF/application.xml"> + <fileset dir="${build.lib}"> + <include name="store.wsr"/> + <include name="store.jar"/> + </fileset> + </ear> + + <!-- The wsexternal wsr and ear --> + <jar destfile="${build.lib}/wsexternal.wsr"> + <fileset dir="${build.classes}"> + <include name="org/jboss/test/webservice/external/google/*.class"/> + <include name="org/jboss/test/webservice/external/babelfish/*.class"/> + </fileset> + <fileset dir="${build.resources}/webservice/external/wsr/"> + <include name="**/*"/> + </fileset> + </jar> + + <jar destfile="${build.lib}/wsexternal.jar"> + <fileset dir="${build.classes}"> + <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*"/> + </fileset> + <fileset dir="${build.resources}/webservice/external/jar/"> + <include name="**/*"/> + </fileset> + </jar> + + <ear destfile="${build.lib}/wsexternal.ear" + appxml="${build.resources}/webservice/external/ear/META-INF/application.xml"> + <fileset dir="${build.lib}"> + <include name="wsexternal.wsr"/> + <include name="wsexternal.jar"/> + </fileset> + </ear> + + </target> <!-- ================================================================== --> <!-- Install & Release --> |