Menu
▾
▴
[jboss-cvs] jbosstest build.xml
|
From: Thomas D. <tdi...@us...> - 2004-07-23 15:23:51
|
User: tdiesler
Date: 04/07/23 08:23:45
Modified: . build.xml
Log:
Move wsdl files in the wsdl subdir as now mandated by the spec
Revision Changes Path
1.376 +29 -35 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.375
retrieving revision 1.376
diff -u -r1.375 -r1.376
--- build.xml 22 Jul 2004 22:41:26 -0000 1.375
+++ build.xml 23 Jul 2004 15:23:44 -0000 1.376
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.375 2004/07/22 22:41:26 ejort Exp $ -->
+<!-- $Id: build.xml,v 1.376 2004/07/23 15:23:44 tdiesler Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -1317,12 +1317,12 @@
<target name="compile-wsdl" depends="init">
<!-- ws4ee/marshalltest -->
- <mkdir dir="${build.resources}/ws4ee/marshalltest/META-INF"/>
+ <mkdir dir="${build.resources}/ws4ee/marshalltest/META-INF/wsdl"/>
<java classname="org.apache.axis.wsdl.Java2WSDL" fork="yes">
<classpath refid="tests.classpath"/>
<classpath path="${build.classes}"/>
<arg value="-lhttp://dummy-host:8080/dummy-path"/>
- <arg value="-o${build.resources}/ws4ee/marshalltest/META-INF/rpc-encoded.wsdl"/>
+ <arg value="-o${build.resources}/ws4ee/marshalltest/META-INF/wsdl/rpc-encoded.wsdl"/>
<arg value="-nhttp://ws4ee.jboss.org/marshalltest"/>
<arg value="-SMarshallTestService"/>
<arg value="-sMarshallTestPort"/>
@@ -1334,7 +1334,7 @@
<classpath refid="tests.classpath"/>
<classpath path="${build.classes}"/>
<arg value="-lhttp://dummy-host:8080/dummy-path"/>
- <arg value="-o${build.resources}/ws4ee/marshalltest/META-INF/rpc-literal.wsdl"/>
+ <arg value="-o${build.resources}/ws4ee/marshalltest/META-INF/wsdl/rpc-literal.wsdl"/>
<arg value="-nhttp://ws4ee.jboss.org/marshalltest"/>
<arg value="-SMarshallTestService"/>
<arg value="-sMarshallTestPort"/>
@@ -1346,7 +1346,7 @@
<classpath refid="tests.classpath"/>
<classpath path="${build.classes}"/>
<arg value="-lhttp://dummy-host:8080/dummy-path"/>
- <arg value="-o${build.resources}/ws4ee/marshalltest/META-INF/doc-encoded.wsdl"/>
+ <arg value="-o${build.resources}/ws4ee/marshalltest/META-INF/wsdl/doc-encoded.wsdl"/>
<arg value="-nhttp://ws4ee.jboss.org/marshalltest"/>
<arg value="-SMarshallTestService"/>
<arg value="-sMarshallTestPort"/>
@@ -1358,7 +1358,7 @@
<classpath refid="tests.classpath"/>
<classpath path="${build.classes}"/>
<arg value="-lhttp://dummy-host:8080/dummy-path"/>
- <arg value="-o${build.resources}/ws4ee/marshalltest/META-INF/doc-literal.wsdl"/>
+ <arg value="-o${build.resources}/ws4ee/marshalltest/META-INF/wsdl/doc-literal.wsdl"/>
<arg value="-nhttp://ws4ee.jboss.org/marshalltest"/>
<arg value="-SMarshallTestService"/>
<arg value="-sMarshallTestPort"/>
@@ -1368,12 +1368,12 @@
</java>
<!-- ws4ee/handlerflow -->
- <mkdir dir="${build.resources}/ws4ee/handlerflow/META-INF"/>
+ <mkdir dir="${build.resources}/ws4ee/handlerflow/META-INF/wsdl"/>
<java classname="org.apache.axis.wsdl.Java2WSDL" fork="yes">
<classpath refid="tests.classpath"/>
<classpath path="${build.classes}"/>
<arg value="-lhttp://localhost:8080/ws4ee/services/HelloService"/>
- <arg value="-o${build.resources}/ws4ee/handlerflow/META-INF/Hello.wsdl"/>
+ <arg value="-o${build.resources}/ws4ee/handlerflow/META-INF/wsdl/Hello.wsdl"/>
<arg value="-nhttp://test.jboss.org/ws4ee/handlerflow"/>
<arg value="-SHelloService"/>
<arg value="-sHelloPort"/>
@@ -5311,8 +5311,8 @@
<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"/>
+ <include name="META-INF/wsdl/Hello.wsdl"/>
</fileset>
</jar>
@@ -5324,8 +5324,8 @@
<include name="org/jboss/test/ws4ee/ws4eesimple/HelloWs.class"/>
</classes>
<webinf dir="${source.resources}/ws4ee/ws4eesimple/META-INF">
- <include name="Hello.wsdl"/>
<include name="HelloMapping.xml"/>
+ <include name="wsdl/Hello.wsdl"/>
</webinf>
<webinf dir="${source.resources}/ws4ee/ws4eesimple/WEB-INF">
<include name="webservices.xml"/>
@@ -5343,8 +5343,8 @@
<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"/>
+ <include name="wsdl/HelloClient.wsdl"/>
</metainf>
</jar>
<war warfile="${build.lib}/ws4eesimple-client.war"
@@ -5354,8 +5354,8 @@
<include name="org/jboss/test/ws4ee/ws4eesimple/HelloWs.class"/>
</classes>
<webinf dir="${source.resources}/ws4ee/ws4eesimple-client/META-INF">
- <include name="HelloClient.wsdl"/>
<include name="HelloMapping.xml"/>
+ <include name="wsdl/HelloClient.wsdl"/>
</webinf>
</war>
<jar destfile="${build.lib}/ws4eesimple-client-ejb.jar" manifest="${build.etc}/manifest.mf">
@@ -5367,8 +5367,8 @@
</fileset>
<metainf dir="${source.resources}/ws4ee/ws4eesimple-client/META-INF">
<include name="ejb-jar.xml"/>
- <include name="HelloClient.wsdl"/>
<include name="HelloMapping.xml"/>
+ <include name="wsdl/HelloClient.wsdl"/>
</metainf>
</jar>
<ear destfile="${build.lib}/ws4eesimple-client.ear" manifest="${build.etc}/manifest.mf"
@@ -5390,7 +5390,7 @@
</fileset>
<metainf dir="${build.resources}/ws4ee/marshalltest/META-INF">
<include name="*.xml"/>
- <include name="*.wsdl"/>
+ <include name="wsdl/*.wsdl"/>
</metainf>
</jar>
@@ -5413,7 +5413,7 @@
<include name="ejb-jar.xml"/>
<include name="jboss.xml"/>
<include name="HelloMapping.xml"/>
- <include name="Hello.wsdl"/>
+ <include name="wsdl/Hello.wsdl"/>
</metainf>
</jar>
<ear destfile="${build.lib}/ws4eehandlerflow-ejb.ear" manifest="${build.etc}/manifest.mf"
@@ -5443,8 +5443,8 @@
<include name="org/jboss/test/ws4ee/handlerflow/ClientHandler2.class"/>
</classes>
<webinf dir="${build.resources}/ws4ee/handlerflow/META-INF">
- <include name="Hello.wsdl"/>
<include name="HelloMapping.xml"/>
+ <include name="wsdl/Hello.wsdl"/>
</webinf>
<webinf dir="${build.resources}/ws4ee/handlerflow/WEB-INF">
<include name="webservices.xml"/>
@@ -5463,7 +5463,6 @@
<!-- delete file="${build.lib}/ws4eehandlerflow.war"/ -->
<!-- build ws4eecomplex.jar -->
- <!--
<jar destfile="${build.lib}/ws4eecomplex.jar" manifest="${build.etc}/manifest.mf">
<fileset dir="${build.classes}">
<include name="org/jboss/test/ws4ee/ws4eecomplex/Complex1Bean.class"/>
@@ -5473,17 +5472,15 @@
<include name="org/jboss/test/ws4ee/ws4eecomplex/Complex1Home.class"/>
<include name="org/jboss/test/ws4ee/ws4eecomplex/Complex1Ws.class"/>
</fileset>
- <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>
+ <metainf dir="${source.resources}/ws4ee/ws4eecomplex/META-INF">
+ <include name="ejb-jar.xml"/>
+ <include name="Complex1Mapping.xml"/>
+ <include name="webservices.xml"/>
+ <include name="wsdl/Complex1.wsdl"/>
+ </metainf>
</jar>
- -->
<!-- build ws4eecomplex.war -->
- <!--
<war warfile="${build.lib}/ws4eecomplex.war"
webxml="${source.resources}/ws4ee/ws4eecomplex/WEB-INF/web.xml">
<classes dir="${build.classes}">
@@ -5493,27 +5490,24 @@
<include name="org/jboss/test/ws4ee/ws4eecomplex/ComplexSer2.class"/>
</classes>
<webinf dir="${source.resources}/ws4ee/ws4eecomplex/META-INF">
- <include name="Complex1.wsdl"/>
<include name="Complex1Mapping.xml"/>
+ <include name="wsdl/Complex1.wsdl"/>
</webinf>
</war>
- -->
<!-- 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/ws4ee/ws4eehandler/*.class"/>
</fileset>
- <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>
+ <metainf dir="${source.resources}/ws4ee/ws4eehandler/META-INF">
+ <include name="ejb-jar.xml"/>
+ <include name="webservices.xml"/>
+ <include name="HandlerMapping.xml"/>
+ <include name="wsdl/Handler.wsdl"/>
+ </metainf>
</jar>
- -->
</target>
<!-- xa test -->
|
