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/07 03:48:41 UTC
svn commit: r331182 - in /beehive/trunk/samples:
wsm-addressbook-enhanced/build.xml wsm-addressbook/build.xml
wsm-blank/build.xml wsm-samples/build.properties wsm-samples/build.xml
Author: ias
Date: Sun Nov 6 18:48:37 2005
New Revision: 331182
URL: http://svn.apache.org/viewcvs?rev=331182&view=rev
Log:
Revise build scripts to copy web resourcees to build dir.
Modified:
beehive/trunk/samples/wsm-addressbook-enhanced/build.xml
beehive/trunk/samples/wsm-addressbook/build.xml
beehive/trunk/samples/wsm-blank/build.xml
beehive/trunk/samples/wsm-samples/build.properties
beehive/trunk/samples/wsm-samples/build.xml
Modified: beehive/trunk/samples/wsm-addressbook-enhanced/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/wsm-addressbook-enhanced/build.xml?rev=331182&r1=331181&r2=331182&view=diff
==============================================================================
--- beehive/trunk/samples/wsm-addressbook-enhanced/build.xml (original)
+++ beehive/trunk/samples/wsm-addressbook-enhanced/build.xml Sun Nov 6 18:48:37 2005
@@ -27,18 +27,19 @@
<property name="service.name" value="EnhancedAddressBook"/>
- <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="web.dir" location="web"/>
+ <property name="build.dir" location="build"/>
+ <property name="web.inf.dir" location="${build.dir}/WEB-INF"/>
+ <property name="classes.dir" location="${web.inf.dir}/classes"/>
<property name="gen.dir" location="${web.inf.dir}/gen"/>
+
<property name="webservice.war.name" value="${service.name}WS.war"/>
<path id="build.classpath">
<pathelement location="${classes.dir}"/>
- <fileset dir="${build.dir}/WEB-INF/lib" includes="*.jar"/>
+ <fileset dir="${web.inf.dir}/lib" includes="*.jar"/>
</path>
<!-- ========================================= -->
@@ -57,16 +58,20 @@
<!-- ========================================= -->
<target name="build">
<mkdir dir="${build.dir}"/>
- <mkdir dir="${build.dir}/WEB-INF/classes"/>
+ <mkdir dir="${classes.dir}"/>
<deploy-wsm webappDir="${build.dir}"/>
- <javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="build.classpath"/>
+ <javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="build.classpath"/>
- <build-webservices srcdir="${ws-src.dir}"
+ <build-webservices srcdir="${ws-src.dir}"
destdir="${classes.dir}"
tempdir="${gen.dir}"
classpathref="build.classpath"/>
+
+ <copy todir="${build.dir}">
+ <fileset dir="${web.dir}"/>
+ </copy>
</target>
<!-- ========================================= -->
Modified: beehive/trunk/samples/wsm-addressbook/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/wsm-addressbook/build.xml?rev=331182&r1=331181&r2=331182&view=diff
==============================================================================
--- beehive/trunk/samples/wsm-addressbook/build.xml (original)
+++ beehive/trunk/samples/wsm-addressbook/build.xml Sun Nov 6 18:48:37 2005
@@ -27,18 +27,19 @@
<property name="service.name" value="AddressBook" />
- <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="web.dir" location="web"/>
+ <property name="build.dir" location="build"/>
+ <property name="web.inf.dir" location="${build.dir}/WEB-INF"/>
+ <property name="classes.dir" location="${web.inf.dir}/classes"/>
<property name="gen.dir" location="${web.inf.dir}/gen"/>
+
<property name="webservice.war.name" value="${service.name}WS.war"/>
<path id="build.classpath">
<pathelement location="${classes.dir}"/>
- <fileset dir="${build.dir}/WEB-INF/lib" includes="*.jar"/>
+ <fileset dir="${web.inf.dir}/lib" includes="*.jar"/>
</path>
<!-- ========================================= -->
@@ -57,16 +58,20 @@
<!-- ========================================= -->
<target name="build">
<mkdir dir="${build.dir}"/>
- <mkdir dir="${build.dir}/WEB-INF/classes"/>
+ <mkdir dir="${classes.dir}"/>
<deploy-wsm webappDir="${build.dir}"/>
- <javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="build.classpath"/>
+ <javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="build.classpath"/>
- <build-webservices srcdir="${ws-src.dir}"
+ <build-webservices srcdir="${ws-src.dir}"
destdir="${classes.dir}"
tempdir="${gen.dir}"
classpathref="build.classpath"/>
+
+ <copy todir="${build.dir}">
+ <fileset dir="${web.dir}"/>
+ </copy>
</target>
<!-- ========================================= -->
Modified: beehive/trunk/samples/wsm-blank/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/wsm-blank/build.xml?rev=331182&r1=331181&r2=331182&view=diff
==============================================================================
--- beehive/trunk/samples/wsm-blank/build.xml (original)
+++ beehive/trunk/samples/wsm-blank/build.xml Sun Nov 6 18:48:37 2005
@@ -27,13 +27,14 @@
<property name="service.name" value="blank"/>
- <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="web.dir" location="web"/>
+ <property name="build.dir" location="build"/>
+ <property name="web.inf.dir" location="${build.dir}/WEB-INF"/>
+ <property name="classes.dir" location="${web.inf.dir}/classes"/>
<property name="gen.dir" location="${web.inf.dir}/gen"/>
+
<property name="webservice.war.name" value="${service.name}WS.war"/>
<path id="build.classpath">
@@ -57,7 +58,7 @@
<!-- ========================================= -->
<target name="build">
<mkdir dir="${build.dir}"/>
- <mkdir dir="${build.dir}/WEB-INF/classes"/>
+ <mkdir dir="${classes.dir}"/>
<deploy-wsm webappDir="${build.dir}"/>
@@ -67,6 +68,10 @@
destdir="${classes.dir}"
tempdir="${gen.dir}"
classpathref="build.classpath"/>
+
+ <copy todir="${build.dir}">
+ <fileset dir="${web.dir}"/>
+ </copy>
</target>
<!-- ========================================= -->
Modified: beehive/trunk/samples/wsm-samples/build.properties
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/wsm-samples/build.properties?rev=331182&r1=331181&r2=331182&view=diff
==============================================================================
--- beehive/trunk/samples/wsm-samples/build.properties (original)
+++ beehive/trunk/samples/wsm-samples/build.properties Sun Nov 6 18:48:37 2005
@@ -3,4 +3,4 @@
#
beehive.home=../../
-service.name=wsm-blank
+service.name=wsm-samples
Modified: beehive/trunk/samples/wsm-samples/build.xml
URL: http://svn.apache.org/viewcvs/beehive/trunk/samples/wsm-samples/build.xml?rev=331182&r1=331181&r2=331182&view=diff
==============================================================================
--- beehive/trunk/samples/wsm-samples/build.xml (original)
+++ beehive/trunk/samples/wsm-samples/build.xml Sun Nov 6 18:48:37 2005
@@ -26,28 +26,22 @@
<property name="service.name" value="samples"/>
- <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="web.dir" location="web"/>
+ <property name="build.dir" location="build"/>
+ <property name="web.inf.dir" location="${build.dir}/WEB-INF"/>
+ <property name="classes.dir" location="${web.inf.dir}/classes"/>
<property name="gen.dir" location="${web.inf.dir}/gen"/>
- <property name="webservice.war.name" value="${service.name}WS.war"/>
+
+ <property name="webservice.war.name" value="${service.name}WS.war"/>
<path id="build.classpath">
<pathelement location="${classes.dir}"/>
- <fileset dir="${build.dir}/WEB-INF/lib" includes="*.jar"/>
+ <fileset dir="${web.inf.dir}/lib" includes="*.jar"/>
</path>
<!-- ========================================= -->
- <!-- deploy - build deployable artifact -->
- <!-- ========================================= -->
- <target name="deploy" depends="war">
- <antcall target="deploy.war"/>
- </target>
-
- <!-- ========================================= -->
<!-- war - build deployable artifact -->
<!-- ========================================= -->
<target name="war">
@@ -63,16 +57,20 @@
<!-- ========================================= -->
<target name="build">
<mkdir dir="${build.dir}"/>
- <mkdir dir="${build.dir}/WEB-INF/classes"/>
+ <mkdir dir="${classes.dir}"/>
<deploy-wsm webappDir="${build.dir}"/>
- <javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="build.classpath"/>
+ <javac srcdir="${src.dir}" destdir="${classes.dir}" classpathref="build.classpath"/>
- <build-webservices srcdir="${ws-src.dir}"
+ <build-webservices srcdir="${ws-src.dir}"
destdir="${classes.dir}"
tempdir="${gen.dir}"
classpathref="build.classpath"/>
+
+ <copy todir="${build.dir}">
+ <fileset dir="${web.dir}"/>
+ </copy>
</target>
<!-- ========================================= -->