You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by mm...@apache.org on 2005/05/19 23:32:42 UTC
svn commit: r171001 - in /incubator/beehive/trunk: ./ samples/
samples/wsm-addressbook-fromWSDL/WEB-INF/src/
system-controls/test/src/webservice/
wsm/src/runtime/org/apache/beehive/wsm/wsdl/
Author: mmerz
Date: Thu May 19 14:32:40 2005
New Revision: 171001
URL: http://svn.apache.org/viewcvs?rev=171001&view=rev
Log:
Added wsm-addressbook-fromWSDL to the distribution
Fixed the wsdl1Ajava to generate .java rather than .jws
Fixed the build problem with servicecontrol drt.
Contributor: Daryoush Mehrtash
Removed:
incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/src/build-client-svn.xml
incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/src/build-client.xml
Modified:
incubator/beehive/trunk/distribution.xml
incubator/beehive/trunk/samples/build.xml
incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/src/build-svn.xml
incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/src/build.xml
incubator/beehive/trunk/system-controls/test/src/webservice/build.xml
incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/AbstractWsdl2AJava.java
Modified: incubator/beehive/trunk/distribution.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/distribution.xml?rev=171001&r1=171000&r2=171001&view=diff
==============================================================================
--- incubator/beehive/trunk/distribution.xml (original)
+++ incubator/beehive/trunk/distribution.xml Thu May 19 14:32:40 2005
@@ -90,6 +90,7 @@
<property name="derby.jar" location="${beehive.home}/external/derby/derby_46005.jar"/>
</ant>
<ant antfile="${samples.verify.dir}/samples/wsm-addressbook-enhanced/WEB-INF/src/build.xml" target="build" inheritAll="false"/>
+ <ant antfile="${samples.verify.dir}/samples/wsm-addressbook-fromWSDL/WEB-INF/src/build.xml" target="all" inheritAll="false"/>
<ant antfile="${samples.verify.dir}/samples/netui-samples/WEB-INF/src/build.xml" target="build" inheritAll="false"/>
<ant antfile="${samples.verify.dir}/samples/netui-jsf/WEB-INF/src/build.xml" target="build-myfaces" inheritAll="false">
@@ -349,6 +350,15 @@
<exclude name="WEB-INF/src/build*svn.xml"/>
</fileset>
</copy>
+
+
+ <!-- Build the sample: wsm-addressbook-enhanced -->
+ <copy todir="${dist.dir}/samples/wsm-addressbook-fromWSDL" failOnError="true">
+ <fileset dir="samples/wsm-addressbook-fromWSDL">
+ <exclude name="WEB-INF/src/build*svn.xml"/>
+ </fileset>
+ </copy>
+
<!-- build sample: wsm-samples -->
<copy todir="${dist.dir}/samples/wsm-samples" failOnError="true">
Modified: incubator/beehive/trunk/samples/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/build.xml?rev=171001&r1=171000&r2=171001&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/build.xml (original)
+++ incubator/beehive/trunk/samples/build.xml Thu May 19 14:32:40 2005
@@ -34,6 +34,8 @@
<ant antfile="wsm-blank/WEB-INF/src/build-svn.xml" target="clean" inheritAll="false"/>
<ant antfile="wsm-addressbook-enhanced/WEB-INF/src/build-svn.xml" target="clean" inheritAll="false"/>
+ <ant antfile="wsm-addressbook-fromWSDL/WEB-INF/src/build-svn.xml" target="clean" inheritAll="false"/>
+
<ant antfile="wsm-addressbook/WEB-INF/src/build-svn.xml" target="clean" inheritAll="false"/>
<ant antfile="wsm-employee/WEB-INF/src/build-svn.xml" target="clean" inheritAll="false"/>
@@ -58,6 +60,17 @@
<ant antfile="wsm-blank/WEB-INF/src/build-svn.xml" target="build" inheritAll="false"/>
<ant antfile="wsm-addressbook-enhanced/WEB-INF/src/build-svn.xml" target="build" inheritAll="false"/>
+
+ <!-- NOTE: The wsm-addressbook-fromWSDL build can't be wired into this build file. The distribution build runs
+ "clean build clean" target on this ant file. The problem is that for the "build" target would need axis-ant.jar
+ from the lib directory of the project, then when clean is called, it fails since the jar (in the WEB-INF/lib) is
+ in use by ant. It can be re-enabled if distribution.xml exectues the builds on different VM, or if the WSM is cleaned
+ up so that the ant targets are not included in the run-time distribution.
+
+ <ant antfile="wsm-addressbook-fromWSDL/WEB-INF/src/build-svn.xml" target="all" inheritAll="false"/>
+
+ -->
+
<ant antfile="wsm-addressbook/WEB-INF/src/build-svn.xml" target="build" inheritAll="false"/>
<ant antfile="wsm-samples/WEB-INF/src/build-svn.xml" target="build" inheritAll="false"/>
Modified: incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/src/build-svn.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/src/build-svn.xml?rev=171001&r1=171000&r2=171001&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/src/build-svn.xml (original)
+++ incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/src/build-svn.xml Thu May 19 14:32:40 2005
@@ -18,170 +18,182 @@
$Header:$
-->
-<project name="Address Book from WSDL Sample" default="build" basedir=".">
+<project name="Address Book from WSDL Sample" default="usage" basedir=".">
- <import file="../../../../beehive-imports.xml" />
+ <import file="../../../../beehive-imports.xml" />
+ <import file="../../../../ant/beehive-tools.xml" />
+ <property name="service.name" value="fromWSDL" />
+
+ <property name="webapp.dir" location="../.." />
+ <property name="web.inf.dir" location="${webapp.dir}/WEB-INF" />
+ <property name="attachments.dir" location="${web.inf.dir}/attachments" />
+ <property name="lib.dir" value="${web.inf.dir}/lib" />
+ <property name="src.dir" value="${web.inf.dir}/src" />
+ <property name="build.dir" location="${web.inf.dir}/build" />
+ <property name="gen.dir" location="${build.dir}/gen" />
+ <property name="aptgen.dir" location="${build.dir}/apt-gen" />
+ <property name="classes.dir" location="${build.dir}/classes" />
+ <property name="sourcegen.dir" value="${web.inf.dir}/src-ws" />
+ <property name="webservice.jar" value="${lib.dir}/${service.name}WS.jar" />
+ <property name="types.gen.dir" value="${build.dir}/types" />
+
+ <property name="webservice.war" value="${service.name}WS.war" />
+ <property name="schema.dir" value="../wsdl" />
+ <property name="wsdl.location" location="${schema.dir}/${service.name}.wsdl" />
+
+ <condition property="isJDK15">
+ <equals arg1="${ant.java.version}" arg2="1.5" />
+ </condition>
+
+ <path id="jars">
+ <fileset dir="${lib.dir}">
+ <include name="**/*.jar" />
+ </fileset>
+ </path>
+
+ <!-- ========================================= -->
+ <!-- all - source-gen and build -->
+ <!-- ========================================= -->
+ <target name="all" depends="source-gen, build" />
+
+ <!-- ========================================= -->
+ <!-- deploy - build deployable artifact -->
+ <!-- ========================================= -->
+
+ <target name="deploy">
+ <antcall target="deploy.war" />
+ </target>
+
+
+ <!-- ========================================= -->
+ <!-- deploy.war - build deployable artifact -->
+ <!-- ========================================= -->
+
+ <target name="deploy.war">
+ <jar jarfile="../../../${service.name}WS.war">
+ <fileset dir="${webapp.dir}">
+ <exclude name="${build.dir}/**" />
+ </fileset>
+ </jar>
+ </target>
+
+
+
+
+ <!-- ========================================= -->
+ <!-- clean - remove binary files -->
+ <!-- ========================================= -->
+
+ <target name="clean">
+
+ <delete dir="${attachments.dir}" />
+ <delete dir="${build.dir}" />
+ <delete file="velocity.log" />
+ <delete dir="gen.dir" />
+ <delete dir="${sourcegen.dir}" />
+ <delete dir="${types.gen.dir}" />
+ <delete dir="${lib.dir}" />
+ <clean-webapp webappDir="${webapp.dir}" />
+ </target>
+
+
+
+ <!-- ========================================= -->
+ <!-- build - create jar in ${lib.dir} -->
+ <!-- ========================================= -->
+ <target name="build" depends="dirs, deploy-wsm-controls">
+ <deploy-wsm webappDir="${webapp.dir}" />
+
+ <javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="jars" />
+ <build-webservices srcdir="${sourcegen.dir}" destdir="${classes.dir}" tempdir="${aptgen.dir}" classpathref="jars" />
+
+
+ <jar jarfile="${webservice.jar}">
+ <fileset dir="${classes.dir}" />
+ </jar>
+ </target>
+
+
+
+ <!-- ========================================= -->
+ <!-- source-gen - generate source from wsdl -->
+ <!-- ========================================= -->
+
+ <target name="source-gen" depends="generate-xmlbean-datatypes">
+
+ <taskdef name="wsdl2AJava" classname="org.apache.beehive.wsm.axis.ant.WSDL2AJavaTask">
+ <classpath>
+ <path refid="jars" />
+ </classpath>
+ </taskdef>
+
+
+ <wsdl2AJava outputdir="${sourcegen.dir}" wsdlfile="${wsdl.location}">
+ <classpath>
+ <path refid="jars" />
+ <path location="${classes.dir}" />
+ </classpath>
+ </wsdl2AJava>
+
+
+
+ </target>
+
+ <!-- ========================================= -->
+ <!-- generate-xmlbean-datatypes - -->
+ <!-- ========================================= -->
+
+ <target name="generate-xmlbean-datatypes" depends="dirs, deploy-wsm-controls">
+ <taskdef name="xmlbeanbuild" classname="org.apache.xmlbeans.impl.tool.XMLBean">
+ <classpath>
+ <path refid="jars" />
+ </classpath>
+ </taskdef>
+ <mkdir dir="${classes.dir}" />
+ <mkdir dir="${sourcegen.dir}" />
+ <xmlbeanbuild schema="${schema.dir}" srcgendir="${types.gen.dir}" classgendir="${classes.dir}" failonerror="true">
+ <classpath>
+ <path refid="jars" />
+ </classpath>
+ </xmlbeanbuild>
+ </target>
+
+
+ <!-- ========================================= -->
+ <!-- dirs - create dirs required for compile -->
+ <!-- ========================================= -->
+
+ <target name="dirs">
+ <mkdir dir="${sourcegen.dir}" />
+ <mkdir dir="${aptgen.dir}" />
+ <mkdir dir="${attachments.dir}" />
+ <mkdir dir="${classes.dir}" />
+ <mkdir dir="${gen.dir}" />
+ <mkdir dir="${lib.dir}" />
+ <mkdir dir="${types.gen.dir}" />
+ </target>
- <property name="service.name" value="fromWSDL" />
-
- <taskdef
- name="apt"
- classname="org.apache.beehive.controls.runtime.generator.AptTask"
- classpath="lib/beehive-controls.jar" onerror="report" />
-
- <property name="webapp.dir" location="../.." />
- <property name="web.inf.dir" location="${webapp.dir}/WEB-INF" />
- <property name="attachments.dir" location="${web.inf.dir}/attachments" />
- <property name="lib.dir" value="${web.inf.dir}/lib" />
- <property name="build.dir" location="${web.inf.dir}/build" />
- <property name="gen.dir" location="${build.dir}/gen" />
- <property name="aptgen.dir" location="${build.dir}/apt-gen" />
- <property name="classes.dir" location="${build.dir}/classes" />
- <property name="sourcegen.dir" value="${gen.dir}/src"/>
- <property name="webservice.jar" value="${lib.dir}/${service.name}WS.jar" />
-
- <property name="webservice.war" value="${service.name}WS.war" />
- <property name="schema.dir" value="wsdl" />
- <property name="wsdl.location" location="${schema.dir}/${service.name}.wsdl" />
-
- <condition property="isJDK15">
- <equals arg1="${ant.java.version}" arg2="1.5" />
- </condition>
-
- <path id="jars">
- <fileset dir="${lib.dir}" >
- <include name="**/*.jar" />
- </fileset>
- </path>
-
-
- <!-- ========================================= -->
- <!-- deploy - build deployable artifact -->
- <!-- ========================================= -->
-
- <target name="deploy">
- <antcall target="deploy.war" />
- </target>
-
-
- <!-- ========================================= -->
- <!-- deploy.war - build deployable artifact -->
- <!-- ========================================= -->
-
- <target name="deploy.war">
- <jar jarfile="../../../${service.name}WS.war">
- <fileset dir="${webapp.dir}">
- <exclude name="${build.dir}/**" />
- </fileset>
- </jar>
- </target>
-
-
- <!-- ========================================= -->
- <!-- build - build all binaries -->
- <!-- ========================================= -->
-
- <target name="build" depends="dirs">
- <deploy-wsm webappDir="${webapp.dir}" />
- <antcall target="source-gen" />
- <antcall target="generate-xmlbean-datatypes" />
- <!-- build-webapp webappDir="${webapp.dir}" / -->
- <jar jarfile="${webservice.jar}">
- <fileset dir="${classes.dir}" />
- </jar>
- </target>
-
-
- <!-- ========================================= -->
- <!-- clean - remove binary files -->
- <!-- ========================================= -->
-
- <target name="clean">
- <delete dir="${attachments.dir}" />
- <delete dir="${lib.dir}" />
- <delete dir="${build.dir}" />
- <delete file="velocity.log" />
- <clean-webapp webappDir="${webapp.dir}" />
- </target>
-
-
- <!-- ========================================= -->
- <!-- source-gen - generate source from wsdl -->
- <!-- ========================================= -->
-
- <target name="source-gen" depends="generate-xmlbean-datatypes" >
-
- <taskdef
- name="wsdl2AJava"
- classname="org.apache.beehive.wsm.axis.ant.WSDL2AJavaTask">
- <classpath>
- <path refid="jars"/>
- </classpath>
- </taskdef>
-
- <!-- apt
- srcdir="${sourcegen.dir}"
- destdir="${classes.dir}"
- gendir="${aptgen.dir}"
- compileByExtension="true"
- classpathref="jars"
- srcExtensions="*.java,*.jcx,*.jcs,*.jws" / -->
-
- <wsdl2AJava outputdir="${sourcegen.dir}" wsdlfile="${wsdl.location}">
- <classpath>
- <path refid="jars"/>
- <path location="${classes.dir}" />
- </classpath>
- </wsdl2AJava>
-
- <apt
- srcdir="${sourcegen.dir}"
- destdir="${classes.dir}"
- gendir="${aptgen.dir}"
- compileByExtension="true"
- srcExtensions="*.java,*.jcx,*.jcs,*.jws">
- <classpath>
- <path refid="jars"/>
- <path location="${classes.dir}" />
- </classpath>
- </apt>
- </target>
- <!-- ========================================= -->
- <!-- generate-xmlbean-datatypes - -->
- <!-- ========================================= -->
-
- <target name="generate-xmlbean-datatypes">
- <taskdef
- name="xmlbeanbuild"
- classname="org.apache.xmlbeans.impl.tool.XMLBean">
- <classpath>
- <path refid="jars" />
- </classpath>
- </taskdef>
- <mkdir dir="${classes.dir}" />
- <mkdir dir="${sourcegen.dir}" />
- <xmlbeanbuild
- schema="${schema.dir}"
- srcgendir="${sourcegen.dir}"
- classgendir="${classes.dir}"
- failonerror="true" >
- <classpath>
- <path refid="jars" />
- </classpath>
- </xmlbeanbuild>
- </target>
-
-
- <!-- ========================================= -->
- <!-- dirs - create dirs required for compile -->
- <!-- ========================================= -->
-
- <target name="dirs">
- <mkdir dir="${aptgen.dir}" />
- <mkdir dir="${attachments.dir}" />
- <mkdir dir="${classes.dir}" />
- <mkdir dir="${gen.dir}" />
- </target>
+ <target name="deploy-wsm-controls" depends="dirs" >
+ <deploy-wsm webappDir="${webapp.dir}" />
+ <deploy-controls destDir="${webapp.dir}/WEB-INF/lib" />
+ </target>
+
+
+ <target name="usage" description="Print the usage for this build.xml">
+ <echo message="" />
+ <echo message="" />
+ <echo message="Generate a web-service from WSDL" />
+ <echo message="" />
+ <echo message="" />
+ <echo message="----------------------------------------------------------------" />
+ <echo message="| Standard Targets |" />
+ <echo message="----------------------------------------------------------------" />
+ <echo message="clean - Delete all generated files" />
+ <echo message="build - Build control sources" />
+ <echo message="source-gen - Generate the JWS files. NOTE: this will" />
+ <echo message="overwrite any existing JWS files." />
+ <echo message="----------------------------------------------------------------" />
+ </target>
</project>
Modified: incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/src/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/src/build.xml?rev=171001&r1=171000&r2=171001&view=diff
==============================================================================
--- incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/src/build.xml (original)
+++ incubator/beehive/trunk/samples/wsm-addressbook-fromWSDL/WEB-INF/src/build.xml Thu May 19 14:32:40 2005
@@ -18,105 +18,174 @@
$Header:$
-->
-<project name="Address Book from WSDL Sample" default="build" basedir=".">
+<project name="Address Book from WSDL Sample" default="usage" basedir=".">
- <property file="build.properties"/>
+ <property file="build.properties"/>
- <import file="${beehive.home}/beehive-imports.xml" />
- <import file="${beehive.home}/ant/beehive-tools.xml" />
+ <import file="${beehive.home}/beehive-imports.xml" />
+ <import file="${beehive.home}/ant/beehive-tools.xml" />
- <property name="service.name" value="fromWSDL" />
+ <property name="service.name" value="fromWSDL" />
- <property name="webapp.dir" location="../.." />
- <property name="web.inf.dir" location="${webapp.dir}/WEB-INF" />
- <property name="attachments.dir" location="${web.inf.dir}/attachments" />
- <property name="classes.dir" location="${web.inf.dir}/classes" />
- <property name="gen.dir" location="${web.inf.dir}/gen" />
- <property name="lib.dir" location="${web.inf.dir}/lib" />
- <property name="src.dir" location="${web.inf.dir}/src" />
- <property name="webservice.jar" value="${lib.dir}/${service.name}.jar" />
- <property name="webservice.war" value="${service.name}.war" />
-
- <path id="lib.path">
- <fileset dir="${lib.dir}">
- <include name="**/*.jar" />
- </fileset>
- </path>
-
- <path id="build.classpath">
- <path refid="lib.path"/>
- <pathelement location="${classes.dir}"/>
- </path>
-
-
- <!-- ========================================= -->
- <!-- deploy - build deployable artifact -->
- <!-- ========================================= -->
-
- <target name="deploy">
- <antcall target="deploy.war" />
- </target>
-
-
- <!-- ========================================= -->
- <!-- deploy.war - build deployable artifact -->
- <!-- ========================================= -->
-
- <target name="deploy.war">
- <jar jarfile="../../../${webservice.war}">
- <fileset dir="../..">
- <exclude name="${build.dir}/**" />
- </fileset>
- </jar>
- </target>
-
-
- <!-- ========================================= -->
- <!-- build - build all binaries -->
- <!-- ========================================= -->
-
- <target name="build" depends="dirs">
- <antcall target="deploy.beehive.webservice.runtime" />
- <build-webservices srcdir="${src.dir}"
- destdir="${classes.dir}"
- tempdir="${gen.dir}"
- classpathref="build.classpath"/>
- <jar jarfile="${webservice.jar}">
- <fileset dir="${classes.dir}" />
- </jar>
- </target>
+ <property name="webapp.dir" location="../.." />
+ <property name="web.inf.dir" location="${webapp.dir}/WEB-INF" />
+ <property name="attachments.dir" location="${web.inf.dir}/attachments" />
+ <property name="classes.dir" location="${web.inf.dir}/classes" />
+ <property name="gen.dir" location="${web.inf.dir}/gen" />
+ <property name="temp.dir" location="${gen.dir}/tmp" />
+ <property name="sourcegen.dir" value="${web.inf.dir}/src-ws" />
+ <property name="types.gen.dir" value="${gen.dir}/types" />
+
+
+ <property name="lib.dir" location="${web.inf.dir}/lib" />
+ <property name="src.dir" location="${web.inf.dir}/src" />
+ <property name="schema.dir" value="${web.inf.dir}/wsdl" />
+ <property name="wsdl.location" location="${schema.dir}/${service.name}.wsdl" />
+ <property name="ws-src.dir" location="${web.inf.dir}/src-ws"/>
+ <property name="webservice.jar" value="${lib.dir}/${service.name}WS.jar" />
+ <property name="webservice.war" value="${service.name}WS.war" />
+
+ <path id="build.classpath">
+ <fileset dir="${lib.dir}">
+ <include name="**/*.jar" />
+ </fileset>
+ <pathelement location="${classes.dir}"/>
+ </path>
+
+ <!-- ========================================= -->
+ <!-- deploy.war - build deployable artifact -->
+ <!-- ========================================= -->
+ <target name="war">
+ <jar jarfile="../../../${webservice.war}">
+ <fileset dir="${webapp.dir}">
+ <exclude name="WEB-INF/src/**" />
+ <exclude name="WEB-INF/src-ws/**" />
+ <exclude name="WEB-INF/gen/**" />
+ </fileset>
+ </jar>
+ </target>
+
+ <!-- ========================================= -->
+ <!-- all - source-gen and build -->
+ <!-- ========================================= -->
+ <target name="all" depends="source-gen, build" />
+
+
+ <!-- ========================================= -->
+ <!-- build - build all binaries -->
+ <!-- ========================================= -->
+ <target name="build" depends="dirs">
+ <javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="build.classpath"/>
+
+ <build-webservices srcdir="${sourcegen.dir}"
+ destdir="${classes.dir}"
+ tempdir="${temp.dir}"
+ classpathref="build.classpath"/>
+ <jar jarfile="${webservice.jar}">
+ <fileset dir="${classes.dir}" />
+ </jar>
+ </target>
+
+
+ <!-- ========================================= -->
+ <!-- source-gen - generate source from wsdl -->
+ <!-- ========================================= -->
+
+ <target name="source-gen" depends="generate-xmlbean-datatypes">
+
+ <taskdef name="wsdl2AJava" classname="org.apache.beehive.wsm.axis.ant.WSDL2AJavaTask">
+ <classpath>
+ <path refid="build.classpath" />
+ </classpath>
+ </taskdef>
+
+
+ <wsdl2AJava outputdir="${sourcegen.dir}" wsdlfile="${wsdl.location}">
+ <classpath>
+ <path refid="build.classpath" />
+ <path location="${classes.dir}" />
+ </classpath>
+ </wsdl2AJava>
+
+
+
+ </target>
+
+ <!-- ========================================= -->
+ <!-- generate-xmlbean-datatypes - -->
+ <!-- ========================================= -->
+
+ <target name="generate-xmlbean-datatypes" depends="dirs, deploy-wsm-controls">
+ <taskdef name="xmlbeanbuild" classname="org.apache.xmlbeans.impl.tool.XMLBean">
+ <classpath>
+ <path refid="build.classpath" />
+ </classpath>
+ </taskdef>
+ <mkdir dir="${classes.dir}" />
+ <mkdir dir="${sourcegen.dir}" />
+ <xmlbeanbuild schema="${schema.dir}" srcgendir="${types.gen.dir}" classgendir="${classes.dir}" failonerror="true">
+ <classpath>
+ <path refid="build.classpath" />
+ </classpath>
+ </xmlbeanbuild>
+ </target>
+
+
+
+
+
+ <!-- ========================================= -->
+ <!-- clean - remove binary files -->
+ <!-- ========================================= -->
+ <target name="clean">
+ <delete dir="${attachments.dir}" />
+ <delete dir="${classes.dir}" />
+ <delete dir="${gen.dir}" />
+ <delete dir="${temp.dir}" />
+ <delete dir="${sourcegen.dir}" />
+ <delete dir="${lib.dir}" />
+ <delete dir="${web.inf.dir}/.tmpbeansrc"/>
+ <delete dir="${web.inf.dir}/build-server"/>
+ <delete file="velocity.log" />
+ <delete dir="${types.gen.dir}" />
+ </target>
+
+ <!-- ========================================= -->
+ <!-- dirs - create dirs required for compile -->
+ <!-- ========================================= -->
+ <target name="dirs">
+ <mkdir dir="${attachments.dir}" />
+ <mkdir dir="${classes.dir}" />
+ <mkdir dir="${gen.dir}" />
+ <mkdir dir="${sourcegen.dir}" />
+ <mkdir dir="${temp.dir}" />
+ <mkdir dir="${lib.dir}" />
+ <mkdir dir="${types.gen.dir}" />
+ </target>
+
+ <target name="deploy-wsm-controls" depends="dirs" >
+ <deploy-wsm webappDir="${webapp.dir}" />
+
+ <!-- control jars are included for webservices that would use controls -->
+ <deploy-controls destDir="${webapp.dir}/WEB-INF/lib" />
+ </target>
+
+
+
+ <target name="usage" description="Print the usage for this build.xml">
+ <echo message="" />
+ <echo message="" />
+ <echo message="Generate a web-service from WSDL" />
+ <echo message="" />
+ <echo message="" />
+ <echo message="----------------------------------------------------------------" />
+ <echo message="| Standard Targets |" />
+ <echo message="----------------------------------------------------------------" />
+ <echo message="clean - Delete all generated files" />
+ <echo message="build - Build control sources" />
+ <echo message="source-gen - Generate the JWS files. NOTE: this will" />
+ <echo message="overwrite any existing JWS files." />
+ <echo message="----------------------------------------------------------------" />
+ </target>
-
- <!-- ========================================= -->
- <!-- clean - remove binary files -->
- <!-- ========================================= -->
-
- <target name="clean">
- <delete dir="${attachments.dir}" />
- <delete dir="${build.dir}" />
- <delete dir="${gen.dir}" />
- <delete dir="${lib.dir}" />
- <delete file="velocity.log" />
- </target>
-
-
- <!-- ========================================= -->
- <!-- dirs - create dirs required for compile -->
- <!-- ========================================= -->
-
- <target name="dirs">
- <mkdir dir="${attachments.dir}" />
- <mkdir dir="${classes.dir}" />
- <mkdir dir="${gen.dir}" />
- <mkdir dir="${lib.dir}" />
- </target>
-
- <!-- copy all dependencies -->
- <target name="deploy.beehive.webservice.runtime" depends="dirs">
- <copy todir="${lib.dir}">
- <fileset file="${beehive.home}/lib/common/*.jar" />
- <fileset file="${beehive.home}/lib/controls/beehive-controls.jar" />
- <fileset file="${beehive.home}/lib/wsm/*.jar" />
- </copy>
- </target>
</project>
Modified: incubator/beehive/trunk/system-controls/test/src/webservice/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/system-controls/test/src/webservice/build.xml?rev=171001&r1=171000&r2=171001&view=diff
==============================================================================
--- incubator/beehive/trunk/system-controls/test/src/webservice/build.xml (original)
+++ incubator/beehive/trunk/system-controls/test/src/webservice/build.xml Thu May 19 14:32:40 2005
@@ -191,12 +191,24 @@
<antcall target="deploy-webapps"/>
<!-- run test cases -->
- <property name="drtfailed" value="true"/> <!-- assume tests have failed -->
- <antcall target="run.tests" >
- <reference refid="drtfailed" /> <!-- oass test failure flag to the run.test to get result -->
- </antcall>
-
- <!-- undeploy webapp -->
+ <echo message="** junit logfiles written to ${log.dir} **"/>
+ <junit failureproperty="drtfailed"
+ printsummary="on"
+ tempdir="${client.build}"
+ fork="yes">
+ <classpath>
+ <path refid="client.classpath"/>
+ <pathelement location="${client.classes}"/>
+ </classpath>
+ <formatter type="plain"/>
+ <batchtest filtertrace="off" todir="${log.dir}">
+ <fileset dir="${source.dir}">
+ <include name="**/*Test.java"/>
+ </fileset>
+ </batchtest>
+ </junit>
+
+ <!-- undeploy webapp -->
<antcall target="undeploy-webapps"/>
<!-- undeploy web service runtime -->
@@ -204,33 +216,13 @@
<!-- stop server -->
<stop-server />
-
+
</sequential>
</parallel>
- <fail if="drtfailed" message="One or more tests in the ServiceControl DRT failed."/>
+ <fail if="drtfailed" message="One or more tests in the ServiceControl DRT failed."/>
</target>
- <!-- ========================================= -->
- <!-- run.tests - run the tests -->
- <!-- ========================================= -->
- <target name="run.tests">
- <echo message="** junit logfiles written to ${log.dir} **"/>
- <junit failureproperty="drtfailed"
- printsummary="on"
- tempdir="${client.build}"
- fork="yes">
- <classpath>
- <path refid="client.classpath"/>
- <pathelement location="${client.classes}"/>
- </classpath>
- <formatter type="plain"/>
- <batchtest filtertrace="off" todir="${log.dir}">
- <fileset dir="${source.dir}">
- <include name="**/*Test.java"/>
- </fileset>
- </batchtest>
- </junit>
- </target>
+
<!-- ========================================= -->
<!--generate and compile the test control client interfaces from WSDLs -->
Modified: incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/AbstractWsdl2AJava.java
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/AbstractWsdl2AJava.java?rev=171001&r1=171000&r2=171001&view=diff
==============================================================================
--- incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/AbstractWsdl2AJava.java (original)
+++ incubator/beehive/trunk/wsm/src/runtime/org/apache/beehive/wsm/wsdl/AbstractWsdl2AJava.java Thu May 19 14:32:40 2005
@@ -123,7 +123,7 @@
packageDir.mkdirs();
String fullFilePath = baseSrcDir + "/" + packageDirName + "/"
- + className + ".jws";
+ + className + ".java";
File srcFile = new File(fullFilePath);
srcFile.createNewFile();