You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beehive.apache.org by ia...@apache.org on 2005/11/04 09:52:23 UTC
svn commit: r330762 - in /beehive/trunk/samples/wsm-addressbook-enhanced:
build-client.xml build.properties build.xml
Author: ias
Date: Fri Nov 4 00:52:20 2005
New Revision: 330762
URL: http://svn.apache.org/viewcvs?rev=330762&view=rev
Log:
Reorganization of wsm-addressbook-enhanced is done.
BB: self
Test: samples/wsm-addressbook-enhanced/build pass
Modified:
beehive/trunk/samples/wsm-addressbook-enhanced/build-client.xml
beehive/trunk/samples/wsm-addressbook-enhanced/build.properties
beehive/trunk/samples/wsm-addressbook-enhanced/build.xml
Modified: beehive/trunk/samples/wsm-addressbook-enhanced/build-client.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/wsm-addressbook-enhanced/build-client.xml?rev=330762&r1=330761&r2=330762&view=diff
==============================================================================
--- beehive/trunk/samples/wsm-addressbook-enhanced/build-client.xml (original)
+++ beehive/trunk/samples/wsm-addressbook-enhanced/build-client.xml Fri Nov 4 00:52:20 2005
@@ -17,71 +17,59 @@
$Header:$
-->
-<project name="Beehive/Samples/WSM/Blank" default="test" basedir=".">
+<project name="Beehive/Samples/WSM/AddressBookEnhanced" default="test" basedir=".">
<property file="build.properties"/>
<import file="${beehive.home}/beehive-imports.xml"/>
- <property name="wsdl.url" value="http://localhost:8080/EnhancedAddressBookWS/web/Service.jws?wsdl" /> <property name="webapp.dir" location="../.."/>
- <property name="lib.dir" location="${webapp.dir}/WEB-INF/"/>
- <property name="log.dir" location="${webapp.dir}/WEB-INF/logs"/>
- <property name="build.dir" location="${webapp.dir}/WEB-INF/build-client"/>
- <property name="gen.dir" location="${build.dir}/gen"/>
- <property name="classes.dir" location="${build.dir}/classes"/>
+ <property name="wsdl.url" value="http://localhost:8080/EnhancedAddressBookWS/web/Service.jws?wsdl" />
+ <property name="build.dir" location="build"/>
+ <property name="test.build.dir" location="build-test"/>
+ <property name="test.classes.dir" location="${test.build.dir}/classes"/>
+ <property name="test.log.dir" location="${test.build.dir}/logs"/>
+ <property name="test.sourcegen.dir" location="${test.build.dir}/sourcegen"/>
<path id="jars">
- <fileset dir="${lib.dir}" includes="**/*.jar"/>
+ <fileset dir="${build.dir}/WEB-INF/lib" includes="**/*.jar"/>
</path>
-
- <target name="test" depends="dirs,compile">
- <junit printsummary="yes" haltonfailure="yes" showoutput="yes">
- <classpath>
- <pathelement location= "${classes.dir}"/>
- <path refid="jars"/>
- </classpath>
- <formatter type="plain"/>
- <batchtest fork="yes" todir="${log.dir}">
- <fileset dir="${classes.dir}" includes="**/*Test*.class"/>
- </batchtest>
- </junit>
- </target>
-
+
<target name="compile" depends="generate.client">
- <javac srcdir="${gen.dir}"
- destdir="${classes.dir}"
+ <mkdir dir="${test.classes.dir}"/>
+
+ <javac srcdir="${test.sourcegen.dir}"
+ destdir="${test.classes.dir}"
classpathref="jars"
failonerror="true"
source="1.4"/>
</target>
- <target name="generate.client" depends="dirs">
- <antcall target="deploy.beehive.webservice.runtime"/>
+ <target name="generate.client">
<taskdef name="wsdl2java"
classname="org.apache.axis.tools.ant.wsdl.Wsdl2javaAntTask"
loaderref="axis"
classpathref="jars"/>
<wsdl2java url="${wsdl.url}"
- output="${gen.dir}"
+ output="${test.sourcegen.dir}"
testcase="yes"/>
</target>
- <target name="clean">
- <delete dir="${build.dir}"/>
- <delete dir="${log.dir}"/>
- <delete dir="${lib.dir}"/>
+ <target name="test" depends="compile">
+ <junit printsummary="yes" haltonfailure="yes" showoutput="yes">
+ <classpath>
+ <pathelement location="${test.classes.dir}"/>
+ <pathelement location="${build.dir}/WEB-INF/classes"/>
+ <path refid="jars"/>
+ </classpath>
+ <formatter type="plain"/>
+ <batchtest fork="yes" todir="${test.log.dir}">
+ <fileset dir="${test.classes.dir}" includes="**/*Test*.class"/>
+ </batchtest>
+ </junit>
</target>
- <target name="dirs">
- <mkdir dir="${build.dir}"/>
- <mkdir dir="${gen.dir}"/>
- <mkdir dir="${classes.dir}"/>
- <mkdir dir="${log.dir}"/>
- </target>
-
- <target name="deploy.beehive.webservice.runtime" depends="dirs">
- <deploy-controls destdir="${webapp.dir}"/>
- <deploy-wsm webappdir="${webapp.dir}"/>
+ <target name="clean">
+ <delete dir="${test.build.dir}"/>
</target>
</project>
Modified: beehive/trunk/samples/wsm-addressbook-enhanced/build.properties
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/wsm-addressbook-enhanced/build.properties?rev=330762&r1=330761&r2=330762&view=diff
==============================================================================
--- beehive/trunk/samples/wsm-addressbook-enhanced/build.properties (original)
+++ beehive/trunk/samples/wsm-addressbook-enhanced/build.properties Fri Nov 4 00:52:20 2005
@@ -1,4 +1,6 @@
#
-# Edit this if you have moved the sample out of BEEHIVE_HOME/samples.
+# Edit this if you have moved the sample out of <beehive-home>/samples.
#
-beehive.home=../../../..
+beehive.home=../../
+
+service.name=wsm-addressbook-enhanced
Modified: beehive/trunk/samples/wsm-addressbook-enhanced/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/wsm-addressbook-enhanced/build.xml?rev=330762&r1=330761&r2=330762&view=diff
==============================================================================
--- beehive/trunk/samples/wsm-addressbook-enhanced/build.xml (original)
+++ beehive/trunk/samples/wsm-addressbook-enhanced/build.xml Fri Nov 4 00:52:20 2005
@@ -18,7 +18,7 @@
$Header:$
-->
-<project name="Enhanced Address Book Sample" default="build" basedir=".">
+<project name="Beehive/Samples/WSM/AddressBookEnhanced" default="build" basedir=".">
<property file="build.properties"/>
@@ -27,74 +27,53 @@
<property name="service.name" value="EnhancedAddressBook"/>
- <property name="webapp.dir" location="../.."/>
+ <property name="build.dir" location="build"/>
+ <property name="src.dir" location="src"/>
+ <property name="ws-src.dir" location="src-ws"/>
+ <property name="classes.dir" location="${build.dir}/WEB-INF/classes"/>
+
<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="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"/>
+ <property name="webservice.war.name" value="${service.name}WS.war"/>
<path id="build.classpath">
- <fileset dir="${lib.dir}">
- <include name="**/*.jar"/>
- </fileset>
<pathelement location="${classes.dir}"/>
+ <fileset dir="${build.dir}/WEB-INF/lib" includes="*.jar"/>
</path>
<!-- ========================================= -->
- <!-- deploy.war - build deployable artifact -->
+ <!-- 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/**"/>
+ <jar jarfile="${service.name}.war">
+ <fileset dir="${build.dir}">
<exclude name="WEB-INF/gen/**"/>
</fileset>
</jar>
</target>
-
+
<!-- ========================================= -->
<!-- build - build all binaries -->
<!-- ========================================= -->
- <target name="build" depends="dirs">
- <deploy-wsm webappDir="${webapp.dir}"/>
-
- <javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="build.classpath"/>
-
- <build-webservices srcdir="${ws-src.dir}"
- destdir="${classes.dir}"
- tempdir="${gen.dir}"
- classpathref="build.classpath"/>
-
- <jar jarfile="${webservice.jar}">
- <fileset dir="${classes.dir}"/>
- </jar>
+ <target name="build">
+ <mkdir dir="${build.dir}"/>
+ <mkdir dir="${build.dir}/WEB-INF/classes"/>
+
+ <deploy-wsm webappDir="${build.dir}"/>
+
+ <javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="build.classpath"/>
+
+ <build-webservices srcdir="${ws-src.dir}"
+ destdir="${classes.dir}"
+ tempdir="${gen.dir}"
+ classpathref="build.classpath"/>
</target>
-
+
<!-- ========================================= -->
<!-- clean - remove binary files -->
<!-- ========================================= -->
<target name="clean">
- <delete dir="${attachments.dir}"/>
- <delete dir="${classes.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}"/>
+ <delete dir="${build.dir}"/>
</target>
</project>