Menu
▾
▴
[jboss-cvs] jbosstest build.xml
|
From: Thomas D. <tdi...@us...> - 2004-08-02 14:24:04
|
User: tdiesler
Date: 04/08/02 07:23:58
Modified: . build.xml
Log:
JBoss.NET should use the axis-ws4ee implementation.
Apache Axis is only kept for java2wsdl.
Revision Changes Path
1.381 +20 -51 jbosstest/build.xml
Index: build.xml
===================================================================
RCS file: /cvsroot/jboss/jbosstest/build.xml,v
retrieving revision 1.380
retrieving revision 1.381
diff -u -r1.380 -r1.381
--- build.xml 28 Jul 2004 11:52:56 -0000 1.380
+++ build.xml 2 Aug 2004 14:23:57 -0000 1.381
@@ -15,7 +15,7 @@
<!-- -->
<!-- ====================================================================== -->
-<!-- $Id: build.xml,v 1.380 2004/07/28 11:52:56 tdiesler Exp $ -->
+<!-- $Id: build.xml,v 1.381 2004/08/02 14:23:57 tdiesler Exp $ -->
<project default="main" name="JBoss/Testsuite">
@@ -111,9 +111,6 @@
<path refid="apache.bcel.classpath"/>
<!-- needed for security login module tests -->
<path refid="hsqldb.hsqldb.classpath"/>
-
- <!-- needed for jboss.net module tests -->
- <path refid="ibm.uddi4j.classpath"/>
</path>
<!-- ======= -->
@@ -141,6 +138,7 @@
<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"/>
@@ -152,6 +150,7 @@
<path refid="jboss.system.classpath"/>
<path refid="jboss.transaction.classpath"/>
<path refid="jboss.varia.classpath"/>
+ <path refid="jboss.webservice.classpath"/>
</path>
<!-- ===== -->
@@ -931,7 +930,6 @@
<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 -->
@@ -944,7 +942,6 @@
<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 -->
@@ -954,7 +951,6 @@
<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 -->
@@ -1276,13 +1272,6 @@
<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>
@@ -1330,6 +1319,7 @@
<path id="java2wsdl.classpath">
<path refid="apache.axis.classpath"/>
<path refid="apache.commons.classpath"/>
+ <path refid="apache.log4j.classpath"/>
<path refid="ibm.wsdl4j.classpath"/>
<path refid="sun.jaf.classpath"/>
<path refid="sun.javamail.classpath"/>
@@ -1337,8 +1327,22 @@
<path refid="jboss.j2ee.classpath"/>
</path>
- <!-- ws4ee/marshalltest -->
+ <!-- jboss.net/ejbsimple -->
+ <mkdir dir="${build.resources}/webservice/ejbsimple"/>
+ <java classname="org.apache.axis.wsdl.Java2WSDL" fork="yes">
+ <classpath refid="java2wsdl.classpath"/>
+ <classpath path="${build.classes}"/>
+ <arg value="-lhttp://dummy-host:8080/dummy-path"/>
+ <arg value="-o${build.resources}/webservice/ejbsimple/hello.wsdl"/>
+ <arg value="-nhttp://ejbsimple.jbossnet.test.jboss.org"/>
+ <arg value="-STestService"/>
+ <arg value="-sTestPort"/>
+ <arg value="-yRPC"/>
+ <arg value="-uENCODED"/>
+ <arg value="org.jboss.test.webservice.ejbsimple.HelloRemote"/>
+ </java>
+ <!-- ws4ee/marshalltest -->
<mkdir dir="${build.resources}/ws4ee/marshalltest-rpcenc/META-INF/wsdl"/>
<java classname="org.apache.axis.wsdl.Java2WSDL" fork="yes">
<classpath refid="java2wsdl.classpath"/>
@@ -5114,24 +5118,6 @@
<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"
@@ -5333,23 +5319,6 @@
<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}">
@@ -6507,6 +6476,7 @@
-->
<target name="tests-jbossnet-unit" depends="maybejars">
+
<mkdir dir="${build.reports}"/>
<mkdir dir="${build.testlog}"/>
<!-- choose a testpattern via a property -->
@@ -6537,7 +6507,6 @@
<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}"/>
|
