svn commit: rev 55024 - in incubator/beehive/trunk: netui netui/src/webapp-template/default test/ant

[ek...@apache.org]

Author: ekoneil
Date: Mon Oct 18 10:39:33 2004
New Revision: 55024

Added:
   incubator/beehive/trunk/netui/src/webapp-template/default/build-dev.xml   (contents, props changed)
Modified:
   incubator/beehive/trunk/netui/build.xml
   incubator/beehive/trunk/netui/src/webapp-template/default/build.xml
   incubator/beehive/trunk/test/ant/runTomcat.xml
   incubator/beehive/trunk/test/ant/runTomcatCore.xml
Log:
Adding target to create a Beehive-enabled webapp from the dev build.

Add build file (build-dev.xml) that will build such a webapp in the context of a Beehive dev environment.

BB: self
DRT: Beehive pass



Modified: incubator/beehive/trunk/netui/build.xml
==============================================================================
--- incubator/beehive/trunk/netui/build.xml	(original)
+++ incubator/beehive/trunk/netui/build.xml	Mon Oct 18 10:39:33 2004
@@ -90,4 +90,23 @@
             <property name="webapp.dir" value="${webapp.dir}"/>
         </ant>
     </target>
+
+    <target name="create.beehive.webapp">
+        <fail unless="webapp.dir" message="The ${webapp.dir} property is unset"/>
+        <fail unless="context.path" message="The ${context.path} property is unset"/>
+
+        <copy todir="${webapp.dir}" overwrite="true">
+            <fileset dir="${os.BEEHIVE_HOME}/netui/build/dist/webapp"/>
+        </copy>
+
+        <mkdir dir="${webapp.dir}/WEB-INF/src"/>
+
+        <copy tofile="${webapp.dir}/WEB-INF/src/build.xml" overwrite="true">
+            <fileset file="${os.BEEHIVE_HOME}/netui/src/webapp-template/default/build-dev.xml"/>
+            <filterset>
+                <filter token="WEBAPP_CONTEXT_PATH" value="${context.path}"/>
+            </filterset>
+        </copy>
+    </target>
+
 </project>

Added: incubator/beehive/trunk/netui/src/webapp-template/default/build-dev.xml
==============================================================================
--- (empty file)
+++ incubator/beehive/trunk/netui/src/webapp-template/default/build-dev.xml	Mon Oct 18 10:39:33 2004
@@ -0,0 +1,22 @@
+<?xml version="1.0"?>
+
+<!-- 
+    Beehive webapp build file.
+-->
+<project name="Webapp Build" default="usage" basedir="../..">
+
+    <property environment="os"/>
+
+    <property name="context.path" value="@WEBAPP_CONTEXT_PATH@"/>
+    <property name="webapp.dir" location="${basedir}"/>
+
+    <import file="${os.BEEHIVE_HOME}/test/ant/buildWebapp.xml"/>
+    <import file="${os.BEEHIVE_HOME}/test/ant/runTomcat.xml"/>
+
+    <target name="usage" description="Print the usage for this build.xml">
+        <java fork="no" classname="org.apache.tools.ant.Main">
+            <arg line="-projecthelp"/>
+        </java>
+    </target>
+
+</project>

Modified: incubator/beehive/trunk/netui/src/webapp-template/default/build.xml
==============================================================================
--- incubator/beehive/trunk/netui/src/webapp-template/default/build.xml	(original)
+++ incubator/beehive/trunk/netui/src/webapp-template/default/build.xml	Mon Oct 18 10:39:33 2004
@@ -48,14 +48,8 @@
     <!-- 
         These are both needed because the runTomcatCore and buildWebappCore files 
         each use different property names to refer to the webapp root 
-
-        WARNING: do not take an external dependency on these == they need to 
-                 become a single property, so one will be going away!!!
       -->
     <property name="webapp.dir" location="${basedir}"/>
-
-    <!-- todo: delete me -->
-    <property name="webapp.root" location="${basedir}"/>
 
     <!-- 
         The context path to use when deploying this webapp to Tomcat via Tomcat's 

Modified: incubator/beehive/trunk/test/ant/runTomcat.xml
==============================================================================
--- incubator/beehive/trunk/test/ant/runTomcat.xml	(original)
+++ incubator/beehive/trunk/test/ant/runTomcat.xml	Mon Oct 18 10:39:33 2004
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<project name="Beehive/NetUI/RunTomcatWebapps" default="usage" basedir=".">
+<project name="Beehive/RunTomcat" default="usage" basedir=".">
 
     <property environment="os"/>
     <property file="${os.BEEHIVE_HOME}/beehive.properties"/>

Modified: incubator/beehive/trunk/test/ant/runTomcatCore.xml
==============================================================================
--- incubator/beehive/trunk/test/ant/runTomcatCore.xml	(original)
+++ incubator/beehive/trunk/test/ant/runTomcatCore.xml	Mon Oct 18 10:39:33 2004
@@ -7,7 +7,7 @@
     - catalina.password
     - tomcat.home
 -->
-<project name="Beehive/NetUI/RunTomcatWebapps" default="usage" basedir=".">
+<project name="Beehive/RunTomcatTasks" default="usage" basedir=".">
 
     <target name="deploy" description="Deploy a webapp to a running Tomcat server">
         <fail unless="context.path" message="Can't deploy webapp; the value ${context.path} was unspecified"/>