Menu
▾
▴
[jboss-cvs] jbosstest build.xml
|
From: Thomas D. <tdi...@us...> - 2004-05-06 16:24:27
|
User: tdiesler
Date: 04/05/06 09:24:20
Modified: . build.xml
Log:
add ws4ee tests
Revision Changes Path
1.363 +190 -170 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.362
retrieving revision 1.363
diff -u -r1.362 -r1.363
--- build.xml 27 Apr 2004 12:50:44 -0000 1.362
+++ build.xml 6 May 2004 16:24:20 -0000 1.363
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.362 2004/04/27 12:50:44 ejort Exp $ -->
+<!-- $Id: build.xml,v 1.363 2004/05/06 16:24:20 tdiesler Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -134,25 +134,26 @@
<!-- The combined dependant module classpath -->
<path id="dependentmodule.classpath">
- <path refid="jboss.j2ee.classpath"/>
+ <path refid="jboss.aop.classpath"/>
+ <path refid="jboss.aspects.classpath"/>
+ <path refid="jboss.cache.classpath"/>
+ <path refid="jboss.cluster.classpath"/>
<path refid="jboss.common.classpath"/>
- <path refid="jboss.system.classpath"/>
- <path refid="jboss.naming.classpath"/>
- <path refid="jboss.server.classpath"/>
<path refid="jboss.internal-server.classpath"/>
- <path refid="jboss.messaging.classpath"/>
- <path refid="jboss.security.classpath"/>
+ <path refid="jboss.j2ee.classpath"/>
+ <path refid="jboss.jbossnet.classpath"/>
<path refid="jboss.jca.classpath"/>
- <path refid="jboss.cluster.classpath"/>
<path refid="jboss.management.classpath"/>
+ <path refid="jboss.media.classpath"/>
+ <path refid="jboss.messaging.classpath"/>
+ <path refid="jboss.naming.classpath"/>
+ <path refid="jboss.remoting.classpath"/>
+ <path refid="jboss.security.classpath"/>
+ <path refid="jboss.server.classpath"/>
+ <path refid="jboss.system.classpath"/>
<path refid="jboss.transaction.classpath"/>
<path refid="jboss.varia.classpath"/>
- <path refid="jboss.jbossnet.classpath"/>
- <path refid="jboss.aop.classpath"/>
- <path refid="jboss.aspects.classpath"/>
- <path refid="jboss.remoting.classpath"/>
- <path refid="jboss.cache.classpath"/>
- <path refid="jboss.media.classpath"/>
+ <!--path refid="jboss.webservice.classpath"/-->
</path>
<!-- ===== -->
@@ -1319,61 +1320,62 @@
<target name="jars" description="Builds all jar files."
depends="compile,
-_jars-aop,
-_jars-bank,
-_jars-bank-new,
-_jars-bankiiop,
-_jars-bench,
-_jars-bmp,
-_jars-cache,
-_jars-classloader,
-_jars-client,
-_jars-cmp2,
-_jars-cts,
-_jars-dbtest,
-_jars-deadlock,
-_jars-ejbconf,
-_jars-entity,
-_jars-entityexc,
-_jars-excepiiop,
-_jars-exception,
-_jars-foedeployer,
-_jars-hello,
-_jars-helloiiop,
-_jars-hellojrmpiiop,
-_jars-idgen,
-_jars-iiop,
-_jars-invokers,
-_jars-jbossmq,
-_jars-jbossmx,
-_jars-jca,
-_jars-jmsra,
-_jars-jmx,
-_jars-jrmp,
-_jars-jsr77,
-_jars-load,
-_jars-lock,
-_jars-marathon,
-_jars-mdb,
-_jars-media,
-_jars-naming,
-_jars-perf,
-_jars-pooled,
-_jars-proxycompiler,
-_jars-readahead,
-_jars-retry,
-_jars-security,
-_jars-testbean,
-_jars-testbeancluster,
-_jars-threading,
-_jars-timer,
-_jars-tm,
-_jars-txiiop,
-_jars-txtimer,
-_jars-util,
-_jars-web,
-_jars-webservice,
-_jars-xa">
+ _jars-aop,
+ _jars-bank,
+ _jars-bank-new,
+ _jars-bankiiop,
+ _jars-bench,
+ _jars-bmp,
+ _jars-cache,
+ _jars-classloader,
+ _jars-client,
+ _jars-cmp2,
+ _jars-cts,
+ _jars-dbtest,
+ _jars-deadlock,
+ _jars-ejbconf,
+ _jars-entity,
+ _jars-entityexc,
+ _jars-excepiiop,
+ _jars-exception,
+ _jars-foedeployer,
+ _jars-hello,
+ _jars-helloiiop,
+ _jars-hellojrmpiiop,
+ _jars-idgen,
+ _jars-iiop,
+ _jars-invokers,
+ _jars-jbossmq,
+ _jars-jbossmx,
+ _jars-jca,
+ _jars-jmsra,
+ _jars-jmx,
+ _jars-jrmp,
+ _jars-jsr77,
+ _jars-load,
+ _jars-lock,
+ _jars-marathon,
+ _jars-mdb,
+ _jars-media,
+ _jars-naming,
+ _jars-perf,
+ _jars-pooled,
+ _jars-proxycompiler,
+ _jars-readahead,
+ _jars-retry,
+ _jars-security,
+ _jars-testbean,
+ _jars-testbeancluster,
+ _jars-threading,
+ _jars-timer,
+ _jars-tm,
+ _jars-txiiop,
+ _jars-txtimer,
+ _jars-util,
+ _jars-web,
+ _jars-webservice,
+ _jars-ws4ee,
+ _jars-xa">
</target>
<!--
@@ -5049,93 +5051,83 @@
<include name="**/*.xml"/>
</fileset>
</jar>
+ </target>
- <!-- build ws4eesimple-ejb.ear -->
+ <!-- ws4ee tests -->
+ <target name="_jars-ws4ee">
+ <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/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"/>
+ <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"/>
</fileset>
- <fileset dir="${source.resources}/webservice/ws4eesimple">
+ <fileset dir="${source.resources}/ws4ee/ws4eesimple">
<include name="META-INF/ejb-jar.xml"/>
<include name="META-INF/webservices.xml"/>
<include name="META-INF/Hello.wsdl"/>
<include name="META-INF/HelloMapping.xml"/>
</fileset>
</jar>
- <ear destfile="${build.lib}/ws4eesimple-ejb.ear" manifest="${build.etc}/manifest.mf"
- appxml="${source.resources}/webservice/ws4eesimple/META-INF/application-ejb.xml">
- <fileset dir="${build.lib}">
- <include name="ws4eesimple.jar"/>
- </fileset>
- </ear>
- <!-- build ws4eesimple-web.ear -->
+ <!-- build ws4eesimple.war -->
<war warfile="${build.lib}/ws4eesimple.war"
- webxml="${source.resources}/webservice/ws4eesimple/WEB-INF/web.xml">
+ webxml="${source.resources}/ws4ee/ws4eesimple/WEB-INF/web.xml">
<classes dir="${build.classes}">
- <include name="org/jboss/test/webservice/ws4eesimple/HelloJavaBean.class"/>
- <include name="org/jboss/test/webservice/ws4eesimple/HelloWs.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eesimple/HelloJavaBean.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eesimple/HelloWs.class"/>
</classes>
- <webinf dir="${source.resources}/webservice/ws4eesimple/META-INF">
+ <webinf dir="${source.resources}/ws4ee/ws4eesimple/META-INF">
<include name="Hello.wsdl"/>
<include name="HelloMapping.xml"/>
</webinf>
- <webinf dir="${source.resources}/webservice/ws4eesimple/WEB-INF">
+ <webinf dir="${source.resources}/ws4ee/ws4eesimple/WEB-INF">
<include name="webservices.xml"/>
</webinf>
</war>
- <ear destfile="${build.lib}/ws4eesimple-web.ear" manifest="${build.etc}/manifest.mf"
- appxml="${source.resources}/webservice/ws4eesimple/META-INF/application-web.xml">
- <fileset dir="${build.lib}">
- <include name="ws4eesimple.war"/>
- </fileset>
- </ear>
<!-- 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/webservice/ws4eesimple/HelloWs.class"/>
- <include name="org/jboss/test/webservice/ws4eesimple/HelloWsClientApp.class"/>
- </fileset>
- <fileset dir="${source.resources}/webservice/ws4eesimple-client">
- <include name="META-INF/application-client.xml"/>
- <include name="META-INF/webservicesclient.xml"/>
- <include name="META-INF/HelloClient.wsdl"/>
- <include name="META-INF/HelloMapping.xml"/>
+ <include name="org/jboss/test/ws4ee/ws4eesimple/HelloWs.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eesimple/HelloWsClientApp.class"/>
</fileset>
+ <metainf dir="${source.resources}/ws4ee/ws4eesimple-client/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="HelloClient.wsdl"/>
+ <include name="HelloMapping.xml"/>
+ </metainf>
</jar>
<war warfile="${build.lib}/ws4eesimple-client.war"
- webxml="${source.resources}/webservice/ws4eesimple-client/WEB-INF/web.xml">
+ webxml="${source.resources}/ws4ee/ws4eesimple-client/WEB-INF/web.xml">
<classes dir="${build.classes}">
- <include name="org/jboss/test/webservice/ws4eesimple/HelloWsClientServlet.class"/>
- <include name="org/jboss/test/webservice/ws4eesimple/HelloWs.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eesimple/HelloWsClientServlet.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eesimple/HelloWs.class"/>
</classes>
- <webinf dir="${source.resources}/webservice/ws4eesimple-client/META-INF">
+ <webinf dir="${source.resources}/ws4ee/ws4eesimple-client/META-INF">
<include name="HelloClient.wsdl"/>
<include name="HelloMapping.xml"/>
</webinf>
- <webinf dir="${source.resources}/webservice/ws4eesimple-client/WEB-INF">
- </webinf>
</war>
<jar destfile="${build.lib}/ws4eesimple-client-ejb.jar" manifest="${build.etc}/manifest.mf">
<fileset dir="${build.classes}">
- <include name="org/jboss/test/webservice/ws4eesimple/HelloWs.class"/>
- <include name="org/jboss/test/webservice/ws4eesimple/Hello.class"/>
- <include name="org/jboss/test/webservice/ws4eesimple/HelloClientBean.class"/>
- <include name="org/jboss/test/webservice/ws4eesimple/HelloHome.class"/>
- </fileset>
- <fileset dir="${source.resources}/webservice/ws4eesimple-client">
- <include name="META-INF/ejb-jar.xml"/>
- <include name="META-INF/webservicesclient.xml"/>
- <include name="META-INF/HelloClient.wsdl"/>
- <include name="META-INF/HelloMapping.xml"/>
+ <include name="org/jboss/test/ws4ee/ws4eesimple/HelloWs.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eesimple/Hello.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eesimple/HelloClientBean.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eesimple/HelloHome.class"/>
</fileset>
+ <metainf dir="${source.resources}/ws4ee/ws4eesimple-client/META-INF">
+ <include name="ejb-jar.xml"/>
+ <include name="HelloClient.wsdl"/>
+ <include name="HelloMapping.xml"/>
+ </metainf>
</jar>
<ear destfile="${build.lib}/ws4eesimple-client.ear" manifest="${build.etc}/manifest.mf"
- appxml="${source.resources}/webservice/ws4eesimple-client/META-INF/application.xml">
+ appxml="${source.resources}/ws4ee/ws4eesimple-client/META-INF/application.xml">
<fileset dir="${build.lib}">
<include name="ws4eesimple-client.jar"/>
<include name="ws4eesimple-client.war"/>
@@ -5143,85 +5135,58 @@
</fileset>
</ear>
- <!-- build ws4eesimple-secure.war -->
- <war warfile="${build.lib}/ws4eesimple-secure.war"
- webxml="${source.resources}/webservice/ws4eesimple/WEB-INF/web-secure.xml">
- <classes dir="${build.classes}">
- <include name="org/jboss/test/webservice/ws4eesimple/HelloJavaBean.class"/>
- <include name="org/jboss/test/webservice/ws4eesimple/HelloWs.class"/>
- </classes>
- <webinf dir="${source.resources}/webservice/ws4eesimple/WEB-INF/">
- <include name="webservices.xml"/>
- </webinf>
- <webinf dir="${source.resources}/webservice/ws4eesimple/META-INF">
- <include name="Hello.wsdl"/>
- <include name="HelloMapping.xml"/>
- </webinf>
- </war>
-
- <!-- build ws4eecomplex-ejb.ear -->
+ <!-- build ws4eecomplex.jar -->
+ <!--
<jar destfile="${build.lib}/ws4eecomplex.jar" manifest="${build.etc}/manifest.mf">
<fileset dir="${build.classes}">
- <include name="org/jboss/test/webservice/ws4eecomplex/Complex1Bean.class"/>
- <include name="org/jboss/test/webservice/ws4eecomplex/Complex1.class"/>
- <include name="org/jboss/test/webservice/ws4eecomplex/ComplexSer1.class"/>
- <include name="org/jboss/test/webservice/ws4eecomplex/ComplexSer2.class"/>
- <include name="org/jboss/test/webservice/ws4eecomplex/Complex1Home.class"/>
- <include name="org/jboss/test/webservice/ws4eecomplex/Complex1Ws.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eecomplex/Complex1Bean.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eecomplex/Complex1.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eecomplex/ComplexSer1.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eecomplex/ComplexSer2.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eecomplex/Complex1Home.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eecomplex/Complex1Ws.class"/>
</fileset>
- <fileset dir="${source.resources}/webservice/ws4eecomplex">
+ <fileset dir="${source.resources}/ws4ee/ws4eecomplex">
<include name="META-INF/ejb-jar.xml"/>
<include name="META-INF/Complex1.wsdl"/>
<include name="META-INF/Complex1Mapping.xml"/>
<include name="META-INF/webservices.xml"/>
</fileset>
</jar>
+ -->
- <ear destfile="${build.lib}/ws4eecomplex-ejb.ear" manifest="${build.etc}/manifest.mf"
- appxml="${source.resources}/webservice/ws4eecomplex/META-INF/server-ejb-application.xml">
- <fileset dir="${build.lib}">
- <include name="ws4eecomplex.jar"/>
- </fileset>
- </ear>
-
- <!-- build ws4eecomplex-web.ear -->
+ <!-- build ws4eecomplex.war -->
+ <!--
<war warfile="${build.lib}/ws4eecomplex.war"
- webxml="${source.resources}/webservice/ws4eecomplex/WEB-INF/web.xml">
+ webxml="${source.resources}/ws4ee/ws4eecomplex/WEB-INF/web.xml">
<classes dir="${build.classes}">
- <include name="org/jboss/test/webservice/ws4eecomplex/Complex1Ws.class"/>
- <include name="org/jboss/test/webservice/ws4eecomplex/Complex1WsClientServlet.class"/>
- <include name="org/jboss/test/webservice/ws4eecomplex/ComplexSer1.class"/>
- <include name="org/jboss/test/webservice/ws4eecomplex/ComplexSer2.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eecomplex/Complex1Ws.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eecomplex/Complex1WsClientServlet.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eecomplex/ComplexSer1.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eecomplex/ComplexSer2.class"/>
</classes>
- <webinf dir="${source.resources}/webservice/ws4eecomplex/META-INF">
+ <webinf dir="${source.resources}/ws4ee/ws4eecomplex/META-INF">
<include name="Complex1.wsdl"/>
<include name="Complex1Mapping.xml"/>
</webinf>
- <webinf dir="${source.resources}/webservice/ws4eecomplex/WEB-INF">
- </webinf>
</war>
+ -->
- <ear destfile="${build.lib}/ws4eecomplex-web.ear" manifest="${build.etc}/manifest.mf"
- appxml="${source.resources}/webservice/ws4eecomplex/META-INF/server-web-application.xml">
- <fileset dir="${build.lib}">
- <include name="ws4eecomplex.war"/>
- </fileset>
- </ear>
-
- <!-- build ws4eehandler.ear -->
+ <!-- build ws4eehandler.jar -->
+ <!--
<jar destfile="${build.lib}/ws4eehandler.jar" manifest="${build.etc}/manifest.mf">
<fileset dir="${build.classes}">
<include name="org/jboss/test/util/**"/>
- <include name="org/jboss/test/webservice/ws4eehandler/*.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eehandler/*.class"/>
</fileset>
- <fileset dir="${source.resources}/webservice/ws4eehandler">
+ <fileset dir="${source.resources}/ws4ee/ws4eehandler">
<include name="META-INF/ejb-jar.xml"/>
<include name="META-INF/webservices.xml"/>
<include name="META-INF/Handler.wsdl"/>
<include name="META-INF/HandlerMapping.xml"/>
</fileset>
</jar>
-
+ -->
</target>
<!-- xa test -->
@@ -5355,6 +5320,7 @@
tests-txtimer-unit,
tests-util-unit,
tests-webservice-unit,
+ tests-ws4ee-unit,
tests-xml-unit">
</target>
@@ -6040,7 +6006,7 @@
| JBoss server distribution build that contains jboss-net.
-->
- <target name="tests-webservice-unit" depends="init">
+ <target name="tests-webservice-unit" depends="maybejars">
<mkdir dir="${build.reports}"/>
<mkdir dir="${build.testlog}"/>
<!-- choose a testpattern via a property -->
@@ -6088,6 +6054,60 @@
</target>
<!--
+ | J2EE webservice tests that should run successfully against a
+ | JBoss server distribution build that contains jboss-ws4ee.sar
+ -->
+
+ <target name="tests-ws4ee-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"/>
+
+ <classpath>
+ <pathelement location="${build.classes}"/>
+ <pathelement location="${build.resources}/security"/>
+ <pathelement location="${build.resources}"/>
+ <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="org/jboss/test/ws4ee/ws4eesimple/SimpleEJBTestCase.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eesimple/SimpleJSETestCase.class"/>
+ <include name="org/jboss/test/ws4ee/ws4eesimple/SimpleClientTestCase.class"/>
+ </fileset>
+ </batchtest>
+ </junit>
+ </target>
+
+ <!--
| Standard marathon tests that should run successfully against a default
| JBoss server distribution build.
-->
|
