svn commit: r158646 - incubator/beehive/trunk/user/netui-blank/build.xml

[steveh]

Author: steveh
Date: Tue Mar 22 11:41:33 2005
New Revision: 158646

URL: http://svn.apache.org/viewcvs?view=rev&rev=158646
Log:
Integrating changes in beta branch (fix for BEEHIVE-447).

Modified:
    incubator/beehive/trunk/user/netui-blank/build.xml

Modified: incubator/beehive/trunk/user/netui-blank/build.xml
URL: 
http://svn.apache.org/viewcvs/incubator/beehive/trunk/user/netui-blank/build.xml?view=diff&r1=158645&r2=158646
==============================================================================
--- incubator/beehive/trunk/user/netui-blank/build.xml (original)
+++ incubator/beehive/trunk/user/netui-blank/build.xml Tue Mar 22 11:41:33 2005
@@ -18,7 +18,7 @@
  -->
 
 <!--
-  An Ant build file for compiling the petstoreWeb Beehive sample web 
application.
+  An Ant build file for compiling a Beehive page flow application.
 -->
 <project name="Beehive/Samples/netui-blank" default="usage" basedir="../..">
 
@@ -29,6 +29,7 @@
     <import file="${beehive.home}/ant/beehive-tools.xml"/>
 
     <property name="webapp.dir" location="${basedir}"/>
+    <property name="contextPath" value="netui-blank"/>
 
     <property name="tmp.sourcegen.dir" value=".tmpbeansrc"/>
     <property name="tmp.jpfgen.dir" value=".pageflow-struts-generated"/>
@@ -43,12 +44,12 @@
         </fileset>
     </path>    
 
-    <target name="deploy-beehive" description="Copy the Beehive webapp rutime 
into the petstoreWeb webapp">
+    <target name="deploy-beehive" description="Copy the Beehive webapp rutime 
into the webapp's WEB-INF/lib directory">
         <deploy-netui webappDir="${webapp.dir}"/>
         <deploy-wsm webappDir="${webapp.dir}"/>
     </target>
 
-    <target name="build" depends="deploy-beehive" description="Build the 
petstoreWeb webapp">
+    <target name="build" depends="deploy-beehive" description="Build the 
webapp">
         <available property="webapp.dir.available" file="${webapp.dir}" 
type="dir"/>
         <fail unless="webapp.dir.available" message="Can't find the webapp 
directory ${webapp.dir}"/>
 
@@ -84,7 +85,7 @@
         </copy>
     </target>
 
-    <target name="clean" description="Clean the petstoreWeb">
+    <target name="clean" description="Clean the webapp">
         <delete dir="${webapp.dir}/WEB-INF/classes" includeEmptyDirs="true"/>
         <delete dir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}" 
includeEmptyDirs="true"/>
         <delete dir="${webapp.dir}/WEB-INF/${tmp.jpfgen.dir}" 
includeEmptyDirs="true"/>
@@ -94,9 +95,8 @@
         <property name="archive.dir" value="${webapp.dir}/.."/>
 
         <!-- this does *not* exclude source from the archive -->
-        <war destfile="${archive.dir}/${context.path}.war" 
webxml="${webapp.dir}/WEB-INF/web.xml">
+        <war destfile="${archive.dir}/${contextPath}.war" 
webxml="${webapp.dir}/WEB-INF/web.xml">
             <fileset dir="${webapp.dir}">
-                <exclude name="WEB-INF/web.xml"/>
                 <exclude name="WEB-INF/src/**"/>
             </fileset>
         </war>
@@ -104,8 +104,6 @@
 
     <target name="usage" description="Print usage information for this build 
file">
         <echo>
-Welcome to the Beehive petstoreWeb sample webapp!  
-
 To run the webapp, two steps need to occur:
 - copy the Beehive runtime to the webapp
 - build the webapp