Author: ekoneil
Date: Mon Aug 9 11:23:02 2004
New Revision: 36123
Added:
incubator/beehive/trunk/test/ant/deployNetui.xml
Modified:
incubator/beehive/trunk/beehive.properties
incubator/beehive/trunk/controls/test/webapps/build.xml
incubator/beehive/trunk/netui/build.xml
incubator/beehive/trunk/netui/test/ant/buildWebapp.xml
incubator/beehive/trunk/test/ant/buildWebapp.xml
Log:
Work on the Ant targets used to deploy NetUI into a webapp.
This breaks the deployment of NetUI out of the test/ant/buildWebapp.xml and
into a deployNetuI.xml Ant file; this will enable the buildWebapp.xml file to
be used in the distribution.
Update build files that make use of this and change references for
"deploy.netui" in buildWebapp.xml to "deploy.netui" in ${deployNetui.ant} which
is defined in beehive.properties.
Also add "deploy.netui" and "undeploy.netui" targets in
$BEEHIVE_HOME/netui/build.xml which can be called externally from the NetUI
build.
BB: self
DRT: Controls pass
NetUI pass
Modified: incubator/beehive/trunk/beehive.properties
==============================================================================
--- incubator/beehive/trunk/beehive.properties (original)
+++ incubator/beehive/trunk/beehive.properties Mon Aug 9 11:23:02 2004
@@ -47,4 +47,5 @@
#
runTomcat.ant=${beehive.test.dir}/ant/runTomcat.xml
buildWebapp.ant=${beehive.test.dir}/ant/buildWebapp.xml
+deployNetui.ant=${beehive.test.dir}/ant/deployNetui.xml
Modified: incubator/beehive/trunk/controls/test/webapps/build.xml
==============================================================================
--- incubator/beehive/trunk/controls/test/webapps/build.xml (original)
+++ incubator/beehive/trunk/controls/test/webapps/build.xml Mon Aug 9
11:23:02 2004
@@ -56,7 +56,7 @@
<!--property name="webapp.dir"
location="C:/beehive/work_dir/controls/test/webapps/${webapp.name}"/-->
<property name="webapp.dir" location="./${webapp.name}"/>
- <ant antfile="${buildWebapp.ant}" target="deploy.netui"
inheritAll="false">
+ <ant antfile="${deployNetui.ant}" target="deploy.netui"
inheritAll="false">
<property name="webapp.dir" value="${webapp.dir}" />
</ant>
@@ -82,11 +82,10 @@
<echo message="| Controls controlsWeb clean starting |"/>
<echo message="----------------------------------------------"/>
- <ant antfile="${test.dir}/ant/buildWebapp.xml" target="undeploy.netui"
inheritAll="false">
+ <ant antfile="${deployNetui.ant}" target="undeploy.netui"
inheritAll="false">
<property name="webapp.dir"
location="${app.dir}/drt/${webapp.name}"/>
- <property name="include.testrecorder" value="true"/>
</ant>
- <ant antfile="${buildWebapp.ant}" target="clean.webapp"
inheritAll="false">
+ <ant antfile="${buildNetui.ant}" target="clean.webapp"
inheritAll="false">
<property name="webapp.dir"
location="${app.dir}/drt/${webapp.name}"/>
</ant>
Modified: incubator/beehive/trunk/netui/build.xml
==============================================================================
--- incubator/beehive/trunk/netui/build.xml (original)
+++ incubator/beehive/trunk/netui/build.xml Mon Aug 9 11:23:02 2004
@@ -47,4 +47,27 @@
<echo message="| NetUI DRT ending |"/>
<echo message="--------------------------------------------------"/>
</target>
+
+ <target name="deploy.netui"
+ description="Deploy the NetUI runtime to a fully-quaflified webapp
directory specified with the property 'webapp.dir'">
+ <available property="webapp.dir.available" file="${webapp.dir}"
type="dir"/>
+ <fail unless="webapp.dir.available" message="Can't find the webapp
directory ${webapp.dir}"/>
+
+ <echo>Deploy NetUI to webapp rooted at: ${webapp.dir}</echo>
+
+ <ant dir="${os.BEEHIVE_HOME}/netui/ant"
antfile="${os.BEEHIVE_HOME}/netui/ant/build.xml"
+ target="deploy.netui.runtime" inheritAll="false">
+ <property name="webapp.dir" value="${webapp.dir}"/>
+ </ant>
+ </target>
+
+ <target name="undeploy.netui"
+ description="Undeploy the NetUI runtime from a fully-quaflified
webapp directory specified with the property 'webapp.dir'">
+ <echo>Undeploy NetUI from webapp rooted at: ${webapp.dir}</echo>
+
+ <ant dir="${os.BEEHIVE_HOME}/netui/ant"
antfile="${os.BEEHIVE_HOME}/netui/ant/build.xml"
+ target="undeploy.netui.runtime" inheritAll="false">
+ <property name="webapp.dir" value="${webapp.dir}"/>
+ </ant>
+ </target>
</project>
Modified: incubator/beehive/trunk/netui/test/ant/buildWebapp.xml
==============================================================================
--- incubator/beehive/trunk/netui/test/ant/buildWebapp.xml (original)
+++ incubator/beehive/trunk/netui/test/ant/buildWebapp.xml Mon Aug 9
11:23:02 2004
@@ -15,13 +15,13 @@
<!-- ================================================================ -->
<!-- params (location webapp.dir, [value include.testrecorder, value
testRecorder.config.name]) -->
<target name="deploy.netui" description="Deploy the NetUI runtime into a
webapp rooted at ${webapp.dir}">
- <ant antfile="${buildWebapp.ant}" target="deploy.netui"
inheritAll="false"/>
+ <ant antfile="${deployNetui.ant}" target="deploy.netui"
inheritAll="false"/>
<antcall target="deploy.testrecorder"/>
</target>
<!-- params (location webapp.dir, [value include.testrecorder]) -->
<target name="undeploy.netui" description="Clean the NetUI runtime from a
webapp rooted at ${webapp.dir}">
- <ant antfile="${buildWebapp.ant}" target="undeploy.netui"
inheritAll="false"/>
+ <ant antfile="${deployNetui.ant}" target="undeploy.netui"
inheritAll="false"/>
<antcall target="undeploy.testrecorder"/>
</target>
Modified: incubator/beehive/trunk/test/ant/buildWebapp.xml
==============================================================================
--- incubator/beehive/trunk/test/ant/buildWebapp.xml (original)
+++ incubator/beehive/trunk/test/ant/buildWebapp.xml Mon Aug 9 11:23:02 2004
@@ -5,39 +5,10 @@
<property environment="os"/>
<property file="${os.BEEHIVE_HOME}/beehive.properties"/>
- <property name="netui.webappTemplate.dir"
location="${os.BEEHIVE_HOME}/netui/ant"/>
<property name="tmp.sourcegen.dir" value=".tmpbeansrc"/>
<!-- ================================================================ -->
<!-- -->
- <!-- Targets for deploying the NetUI runtime into a web application -->
- <!-- -->
- <!-- ================================================================ -->
- <!-- params (location webapp.dir, [value include.testrecorder, value
testRecorder.config.name]) -->
- <target name="deploy.netui" description="Deploy the NetUI runtime into a
webapp rooted at ${webapp.dir}">
- <available property="webapp.dir.available" file="${webapp.dir}"
type="dir"/>
- <fail unless="webapp.dir.available" message="Can't find the webapp
directory ${webapp.dir}"/>
-
- <echo>Deploy NetUI to webapp rooted at: ${webapp.dir}</echo>
-
- <ant dir="${netui.webappTemplate.dir}"
antfile="${netui.webappTemplate.dir}/build.xml"
- target="deploy.netui.runtime" inheritAll="false">
- <property name="webapp.dir" value="${webapp.dir}"/>
- </ant>
- </target>
-
- <!-- params (location webapp.dir, [value include.testrecorder]) -->
- <target name="undeploy.netui" description="Clean the NetUI runtime from a
webapp rooted at ${webapp.dir}">
- <echo>Deploy NetUI to webapp rooted at: ${webapp.dir}</echo>
-
- <ant dir="${netui.webappTemplate.dir}"
antfile="${netui.webappTemplate.dir}/build.xml"
- target="undeploy.netui.runtime" inheritAll="false">
- <property name="webapp.dir" value="${webapp.dir}"/>
- </ant>
- </target>
-
- <!-- ================================================================ -->
- <!-- -->
<!-- Target for building a test web application -->
<!-- -->
<!-- The build process includes several steps: -->
@@ -151,6 +122,12 @@
<delete dir="${webapp.dir}/WEB-INF/classes" includeEmptyDirs="true"/>
<delete dir="${webapp.dir}/WEB-INF/${tmp.sourcegen.dir}"
includeEmptyDirs="true"/>
+ </target>
+
+ <target name="usage" description="">
+ <java fork="no" classname="org.apache.tools.ant.Main">
+ <arg line="-projecthelp"/>
+ </java>
</target>
</project>
Added: incubator/beehive/trunk/test/ant/deployNetui.xml
==============================================================================
--- (empty file)
+++ incubator/beehive/trunk/test/ant/deployNetui.xml Mon Aug 9 11:23:02 2004
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+
+<project name="Beehive/DeployNetUI" default="usage" basedir=".">
+
+ <property environment="os"/>
+
+ <!-- ================================================================ -->
+ <!-- -->
+ <!-- Targets for deploying the NetUI runtime into a web application -->
+ <!-- -->
+ <!-- ================================================================ -->
+ <!-- params (location webapp.dir) -->
+ <target name="deploy.netui" description="Deploy the NetUI runtime into a
webapp rooted at ${webapp.dir}">
+ <ant target="deploy.netui" dir="${os.BEEHIVE_HOME}/netui/"
inheritAll="false">
+ <property name="webapp.dir" value="${webapp.dir}"/>
+ </ant>
+ </target>
+
+ <!-- params (location webapp.dir) -->
+ <target name="undeploy.netui" description="Clean the NetUI runtime from a
webapp rooted at ${webapp.dir}">
+ <ant target="undeploy.netui" dir="${os.BEEHIVE_HOME}/netui/"
inheritAll="false">
+ <property name="webapp.dir" value="${webapp.dir}"/>
+ </ant>
+ </target>
+
+ <target name="usage" description="">
+ <java fork="no" classname="org.apache.tools.ant.Main">
+ <arg line="-projecthelp"/>
+ </java>
+ </target>
+
+</project>
