svn commit: r219964 - in /incubator/beehive/trunk/netui/src/webapp-template/default/WEB-INF/src: build.properties build.xml

[ek...@apache.org]

Author: ekoneil
Date: Wed Jul 20 12:09:02 2005
New Revision: 219964

URL: http://svn.apache.org/viewcvs?rev=219964&view=rev
Log:
Slight fixes to the Ant build files for a NetUI webapp created from trunk/netui

Add a "war" sub target.

BB: self
DRT: NetUI pass


Modified:
    incubator/beehive/trunk/netui/src/webapp-template/default/WEB-INF/src/build.properties
    incubator/beehive/trunk/netui/src/webapp-template/default/WEB-INF/src/build.xml

Modified: incubator/beehive/trunk/netui/src/webapp-template/default/WEB-INF/src/build.properties
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/webapp-template/default/WEB-INF/src/build.properties?rev=219964&r1=219963&r2=219964&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/webapp-template/default/WEB-INF/src/build.properties (original)
+++ incubator/beehive/trunk/netui/src/webapp-template/default/WEB-INF/src/build.properties Wed Jul 20 12:09:02 2005
@@ -2,5 +2,5 @@
 #
 #
 
-beehive.dir=../../
+beehive.dir=../../..
 context.path=svnWeb

Modified: incubator/beehive/trunk/netui/src/webapp-template/default/WEB-INF/src/build.xml
URL: http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/webapp-template/default/WEB-INF/src/build.xml?rev=219964&r1=219963&r2=219964&view=diff
==============================================================================
--- incubator/beehive/trunk/netui/src/webapp-template/default/WEB-INF/src/build.xml (original)
+++ incubator/beehive/trunk/netui/src/webapp-template/default/WEB-INF/src/build.xml Wed Jul 20 12:09:02 2005
@@ -20,43 +20,51 @@
 
 <project name="Beehive petstoreWeb sample" default="build" basedir="../..">
 
-  <property file="${basedir}/WEB-INF/src/build.properties"/>
-  <import file="${beehive.dir}/beehive-imports.xml"/>
+    <property file="${basedir}/WEB-INF/src/build.properties"/>
+    <import file="${beehive.dir}/beehive-imports.xml"/>
   
-  <property name="webapp.dir" location="${basedir}"/>
+    <property name="webapp.dir" location="${basedir}"/>
+    <property name="archive.dir" location="${basedir}/.."/>
   
-  <!-- ========================================= -->
-  <!-- build - build the webapp                  -->
-  <!-- ========================================= -->
-
-  <target name="build" description="Build the webapp">
-    <deploy-netui webappDir="${webapp.dir}"/>
-    <build-webapp webappDir="${webapp.dir}"/>
-  </target>
-
+    <!-- ========================================= -->
+    <!-- build - build the webapp                  -->
+    <!-- ========================================= -->
+
+    <target name="build" description="Build the webapp">
+        <deploy-netui webappDir="${webapp.dir}"/>
+        <build-webapp webappDir="${webapp.dir}"/>
+    </target>
   
-  <!-- ========================================= -->
-  <!-- clean - clean the webapp                  -->
-  <!-- ========================================= -->
-
-  <target name="clean" description="Clean the webapp">
-    <clean-webapp webappDir="${webapp.dir}"/>
-  </target>
-
-  <!-- =========================================== -->
-  <!-- deploy targets - move the app to the server -->
-  <!-- =========================================== -->
+    <!-- ========================================= -->
+    <!-- clean - clean the webapp                  -->
+    <!-- ========================================= -->
+
+    <target name="clean" description="Clean the webapp">
+        <clean-webapp webappDir="${webapp.dir}"/>
+    </target>
+
+    <target name="war" description="Create .war file for webapp">
+        <war destfile="${archive.dir}/${context.path}.war" webxml="${webapp.dir}/WEB-INF/web.xml">
+            <fileset dir="${webapp.dir}">
+                <exclude name="WEB-INF/web.xml"/>
+            </fileset>
+        </war>
+    </target>
+
+    <!-- =========================================== -->
+    <!-- deploy targets - move the app to the server -->
+    <!-- =========================================== -->
   
-  <target name="deploy" description="Deploy the webapp to a running server">
-    <deploy-webapp webappDir="${webapp.dir}" contextPath="${context.path}"/>
-  </target>
-
-  <target name="undeploy" description="Undeploy the webapp from a running server">
-    <undeploy-webapp contextPath="${context.path}"/>
-  </target>
-
-  <target name="redeploy" description="Redeploy the webapp on a running server">
-    <redeploy-webapp contextPath="${context.path}"/>
-  </target>
+    <target name="deploy" description="Deploy the webapp to a running server">
+        <deploy-webapp webappDir="${webapp.dir}" contextPath="${context.path}"/>
+    </target>
+
+    <target name="undeploy" description="Undeploy the webapp from a running server">
+        <undeploy-webapp contextPath="${context.path}"/>
+    </target>
+
+    <target name="redeploy" description="Redeploy the webapp on a running server">
+        <redeploy-webapp contextPath="${context.path}"/>
+    </target>
   
 </project>