Menu
▾
▴
[jboss-cvs] jbosstest build.xml
|
From: Thomas D. <tdi...@us...> - 2004-10-24 19:12:40
|
User: tdiesler
Date: 04/10/24 12:12:32
Modified: . Tag: Branch_4_0 build.xml
Log:
Merge webservice testsuite changes with head
Revision Changes Path
No revision
No revision
1.406.2.6 +90 -44 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.406.2.5
retrieving revision 1.406.2.6
diff -u -r1.406.2.5 -r1.406.2.6
--- build.xml 21 Oct 2004 13:09:57 -0000 1.406.2.5
+++ build.xml 24 Oct 2004 19:12:30 -0000 1.406.2.6
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.406.2.5 2004/10/21 13:09:57 ejort Exp $ -->
+<!-- $Id: build.xml,v 1.406.2.6 2004/10/24 19:12:30 tdiesler Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -1174,6 +1174,32 @@
destdir="${build.resources}/cache/META-INF"/>
</ejbdoclet>
+ <!-- webservice/exception test -->
+ <mkdir dir="${build.resources}/webservice/exception/META-INF"/>
+ <ejbdoclet destdir="${build.gen-src}"
+ ejbspec="2.0"
+ excludedtags="@version,@author">
+ <fileset dir="${source.java}">
+ <include name="org/jboss/test/webservice/exception/*BeanImpl.java"/>
+ </fileset>
+ <remoteinterface/>
+ <homeinterface/>
+ <jboss xmlencoding="UTF-8"
+ version="3.0"
+ destdir="${build.resources}/webservice/exception/META-INF"/>
+ </ejbdoclet>
+ <!-- webservice/marshalltest test -->
+ <mkdir dir="${build.resources}/webservice/marshalltest/META-INF"/>
+ <ejbdoclet destdir="${build.gen-src}"
+ ejbspec="2.0"
+ excludedtags="@version,@author">
+ <fileset dir="${source.java}">
+ <include name="org/jboss/test/webservice/marshalltest/*BeanImpl.java"/>
+ </fileset>
+ <remoteinterface/>
+ <homeinterface/>
+ </ejbdoclet>
+
</target>
<target name="compile-mbean-sources" depends="init" unless="noxdoclet">
@@ -5525,32 +5551,30 @@
<!-- 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/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"/>
+ <include name="org/jboss/test/webservice/marshalltest/MarshallRpcBeanHome.class"/>
+ <include name="org/jboss/test/webservice/marshalltest/MarshallRpcBean.class"/>
+ <include name="org/jboss/test/webservice/marshalltest/MarshallRpcServiceInterface.class"/>
+ <include name="org/jboss/test/webservice/marshalltest/MarshallRpcBeanImpl.class"/>
+ <include name="org/jboss/test/webservice/marshalltest/types/Bean.class"/>
</fileset>
- <metainf dir="${build.resources}/webservice/marshalltest/META-INF">
- <include name="ejb-jar.xml"/>
- <include name="jboss.xml"/>
- </metainf>
<metainf dir="${build.resources}/webservice/marshalltest-rpcenc/META-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/rpc-encoded.wsdl"/>
+ <include name="ejb-jar.xml"/>
+ <include name="jboss.xml"/>
+ <include name="wsdl/*.wsdl"/>
</metainf>
</jar>
<jar destfile="${build.lib}/ws4eemarshall-rpcenc-client.jar" manifest="${build.etc}/manifest.mf">
<fileset dir="${build.classes}">
- <include name="org/jboss/test/webservice/marshalltest/MarshallTestEndpoint.class"/>
- <include name="org/jboss/test/webservice/marshalltest/Bean.class"/>
+ <include name="org/jboss/test/webservice/marshalltest/MarshallRpcServiceInterface.class"/>
+ <include name="org/jboss/test/webservice/marshalltest/types/Bean.class"/>
</fileset>
<metainf dir="${build.resources}/webservice/marshalltest-rpcenc/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
- <include name="wsdl/rpc-encoded.wsdl"/>
+ <include name="wsdl/*.wsdl"/>
</metainf>
</jar>
<ear destfile="${build.lib}/ws4eemarshall-rpcenc.ear" manifest="${build.etc}/manifest.mf"
@@ -5564,34 +5588,30 @@
<!-- 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/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"/>
+ <include name="org/jboss/test/webservice/marshalltest/MarshallRpcBeanHome.class"/>
+ <include name="org/jboss/test/webservice/marshalltest/MarshallRpcBean.class"/>
+ <include name="org/jboss/test/webservice/marshalltest/MarshallRpcServiceInterface.class"/>
+ <include name="org/jboss/test/webservice/marshalltest/MarshallRpcBeanImpl.class"/>
+ <include name="org/jboss/test/webservice/marshalltest/types/Bean.class"/>
</fileset>
- <metainf dir="${build.resources}/webservice/marshalltest/META-INF">
- <include name="ejb-jar.xml"/>
- <include name="jboss.xml"/>
- </metainf>
<metainf dir="${build.resources}/webservice/marshalltest-rpclit/META-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
- <include name="ws4ee-deployment.xml"/>
- <include name="wsdl/rpc-literal.wsdl"/>
+ <include name="ejb-jar.xml"/>
+ <include name="jboss.xml"/>
+ <include name="wsdl/*.wsdl"/>
</metainf>
</jar>
<jar destfile="${build.lib}/ws4eemarshall-rpclit-client.jar" manifest="${build.etc}/manifest.mf">
<fileset dir="${build.classes}">
- <include name="org/jboss/test/webservice/marshalltest/MarshallTestEndpoint.class"/>
- <include name="org/jboss/test/webservice/marshalltest/Bean.class"/>
+ <include name="org/jboss/test/webservice/marshalltest/MarshallRpcServiceInterface.class"/>
+ <include name="org/jboss/test/webservice/marshalltest/types/Bean.class"/>
</fileset>
<metainf dir="${build.resources}/webservice/marshalltest-rpclit/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
- <include name="ws4ee-deployment.xml"/>
- <include name="wsdl/rpc-literal.wsdl"/>
+ <include name="wsdl/*.wsdl"/>
</metainf>
</jar>
<ear destfile="${build.lib}/ws4eemarshall-rpclit.ear" manifest="${build.etc}/manifest.mf"
@@ -5605,34 +5625,32 @@
<!-- 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/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"/>
+ <include name="org/jboss/test/webservice/marshalltest/MarshallDocBeanHome.class"/>
+ <include name="org/jboss/test/webservice/marshalltest/MarshallDocBean.class"/>
+ <include name="org/jboss/test/webservice/marshalltest/MarshallDocServiceInterface.class"/>
+ <include name="org/jboss/test/webservice/marshalltest/MarshallDocBeanImpl.class"/>
+ <include name="org/jboss/test/webservice/marshalltest/types/*"/>
</fileset>
- <metainf dir="${build.resources}/webservice/marshalltest/META-INF">
- <include name="ejb-jar.xml"/>
- <include name="jboss.xml"/>
- </metainf>
<metainf dir="${build.resources}/webservice/marshalltest-doclit/META-INF">
<include name="webservices.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="ws4ee-deployment.xml"/>
- <include name="wsdl/doc-literal.wsdl"/>
+ <include name="ejb-jar.xml"/>
+ <include name="jboss.xml"/>
+ <include name="wsdl/*.wsdl"/>
</metainf>
</jar>
<jar destfile="${build.lib}/ws4eemarshall-doclit-client.jar" manifest="${build.etc}/manifest.mf">
<fileset dir="${build.classes}">
- <include name="org/jboss/test/webservice/marshalltest/MarshallTestEndpoint.class"/>
- <include name="org/jboss/test/webservice/marshalltest/Bean.class"/>
+ <include name="org/jboss/test/webservice/marshalltest/MarshallDocServiceInterface.class"/>
+ <include name="org/jboss/test/webservice/marshalltest/types/*"/>
</fileset>
<metainf dir="${build.resources}/webservice/marshalltest-doclit/META-INF">
<include name="application-client.xml"/>
<include name="jboss-client.xml"/>
<include name="jaxrpc-mapping.xml"/>
<include name="ws4ee-deployment.xml"/>
- <include name="wsdl/doc-literal.wsdl"/>
+ <include name="wsdl/*.wsdl"/>
</metainf>
</jar>
<ear destfile="${build.lib}/ws4eemarshall-doclit.ear" manifest="${build.etc}/manifest.mf"
@@ -5643,7 +5661,7 @@
</fileset>
</ear>
- <!-- build ws4eehandlerflow-ejb.ear -->
+ <!-- build ws4eehandlerflow-ejb.jar -->
<jar destfile="${build.lib}/ws4eehandlerflow.jar" manifest="${build.etc}/manifest.mf">
<fileset dir="${build.classes}">
<include name="org/jboss/test/webservice/handlerflow/HelloHome.class"/>
@@ -5691,6 +5709,35 @@
</webinf>
</war>
+ <!-- build ws4eeexception.jar -->
+ <jar destfile="${build.lib}/ws4eeexception.jar" manifest="${build.etc}/manifest.mf">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/webservice/exception/*.class"/>
+ <exclude name="**/*TestCase.class"/>
+ </fileset>
+ <metainf dir="${build.resources}/webservice/exception/META-INF">
+ <include name="ejb-jar.xml"/>
+ <include name="jboss.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/*.wsdl"/>
+ </metainf>
+ </jar>
+
+ <!-- build ws4eeexception-client.jar -->
+ <jar destfile="${build.lib}/ws4eeexception-client.jar" manifest="${build.etc}/manifest.mf">
+ <fileset dir="${build.classes}">
+ <include name="org/jboss/test/webservice/exception/*Service.class"/>
+ <include name="org/jboss/test/webservice/exception/*ServiceInterface.class"/>
+ </fileset>
+ <metainf dir="${build.resources}/webservice/exception/META-INF">
+ <include name="application-client.xml"/>
+ <include name="jboss-client.xml"/>
+ <include name="jaxrpc-mapping.xml"/>
+ <include name="wsdl/*.wsdl"/>
+ </metainf>
+ </jar>
+
</target>
<!-- xa test -->
@@ -6667,7 +6714,6 @@
<property environment="env"/>
<property name="jboss.home" value="${env.JBOSS_HOME}"/>
- <echo message="java.endorsed.dirs=${jboss.home}/lib/endorsed"/>
<junit dir="${module.output}"
printsummary="${junit.printsummary}"
|
