Author: ekoneil
Date: Tue Oct 26 07:56:13 2004
New Revision: 55611
Removed:
incubator/beehive/trunk/samples/petstoreWeb/WEB-INF/src/petstore-build.xml
Modified:
incubator/beehive/trunk/beehive.properties
incubator/beehive/trunk/controls/test/webapps/build.xml
incubator/beehive/trunk/netui/test/ant/build.xml
incubator/beehive/trunk/netui/test/ant/buildWebapp.xml
incubator/beehive/trunk/netui/test/webapps/drt/build.xml
incubator/beehive/trunk/netui/test/webapps/jsf/build.xml
incubator/beehive/trunk/netui/test/webapps/testRecorder-test/build.xml
incubator/beehive/trunk/netui/test/webapps/webappBuild-test/build.xml
incubator/beehive/trunk/test/ant/webappRuntimeCore.xml
Log:
Cleanup in the Beehive webapp build process.
Eliminate two top-level properties:
- runTomcat.ant
- deployNetui.ant
These are now imported in buildWebapp.xml and can be overridden to point to
different deployment / startup strategies for different containers.
BB: self
DRT: Beehive pass
Modified: incubator/beehive/trunk/beehive.properties
==============================================================================
--- incubator/beehive/trunk/beehive.properties (original)
+++ incubator/beehive/trunk/beehive.properties Tue Oct 26 07:56:13 2004
@@ -52,10 +52,6 @@
buildWebapp.ant=${beehive.test.dir}/ant/buildWebapp.xml
-# todo: need to whack both of these
-runTomcat.ant=${beehive.test.dir}/ant/buildWebapp.xml
-deployNetui.ant=${beehive.test.dir}/ant/buildWebapp.xml
-
#
# Properties related to building a Beehive distribution.
#
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 Tue Oct 26
07:56:13 2004
@@ -117,7 +117,7 @@
<target name="-inject.netui" if="do.inject.netui">
<echo message="Injecting Netui in ${webapp.name}"/>
- <ant antfile="${deployNetui.ant}" target="deploy.netui"
inheritAll="false">
+ <ant antfile="${buildWebapp.ant}"
target="deploy.beehive.webapp.runtime" inheritAll="false">
<property name="webapp.dir" value="${webapp.dir}" />
</ant>
@@ -202,7 +202,7 @@
<echo message="| Controls controlsWeb clean starting |"/>
<echo message="----------------------------------------------"/>
- <ant antfile="${deployNetui.ant}" target="undeploy.netui"
inheritAll="false">
+ <ant antfile="${buildWebapp.ant}"
target="undeploy.beehive.webapp.runtime" inheritAll="false">
<property name="webapp.dir" location="${webapp.dir}"/>
</ant>
@@ -225,20 +225,20 @@
<!-- -->
<!-- ================================================================ -->
<target name="deploy" description="Deploy webapp" depends="-init">
- <ant antfile="${runTomcat.ant}" target="deploy" inheritAll="false">
+ <ant antfile="${buildWebapp.ant}" target="deploy" inheritAll="false">
<property name="context.path" value="${webapp.name}"/> <!-- whats
this for? -->
<property name="webapp.dir" value="${webapp.dir}"/>
</ant>
</target>
<target name="undeploy" description="Undeploy webapp">
- <ant antfile="${runTomcat.ant}" target="undeploy" inheritAll="false">
+ <ant antfile="${buildWebapp.ant}" target="undeploy" inheritAll="false">
<property name="context.path" value="${webapp.name}"/>
</ant>
</target>
<target name="redeploy" description="Redeploy webapp">
- <ant antfile="${runTomcat.ant}" target="redeploy" inheritAll="false">
+ <ant antfile="${buildWebapp.ant}" target="redeploy" inheritAll="false">
<property name="context.path" value="${webapp.name}"/>
</ant>
</target>
@@ -249,30 +249,30 @@
<!-- -->
<!-- ================================================================ -->
<target name="start" description="Start server">
- <ant antfile="${runTomcat.ant}" target="start" inheritAll="false"/>
+ <ant antfile="${buildWebapp.ant}" target="start" inheritAll="false"/>
</target>
<target name="start.with.shmem" description="Start server">
- <ant antfile="${runTomcat.ant}" target="start.with.shmem"
inheritAll="false"/>
+ <ant antfile="${buildWebapp.ant}" target="start.with.shmem"
inheritAll="false"/>
</target>
<target name="start.with.asserts" description="Start server with asserts
enabled for org.apache.beehive.netui">
- <ant antfile="${runTomcat.ant}" target="start" inheritAll="false">
+ <ant antfile="${buildWebapp.ant}" target="start" inheritAll="false">
<property name="java.options"
value="-ea:org.apache.beehive.netui..."/>
</ant>
</target>
<target name="start.with.shmem.asserts" description="Start server with
asserts enabled for org.apache.beehive.netui">
- <ant antfile="${runTomcat.ant}" target="start.with.shmem"
inheritAll="false">
+ <ant antfile="${buildWebapp.ant}" target="start.with.shmem"
inheritAll="false">
<property name="java.options"
value="-ea:org.apache.beehive.netui..."/>
</ant>
</target>
<target name="stop" description="Stop server">
- <ant antfile="${runTomcat.ant}" target="stop" inheritAll="false"/>
+ <ant antfile="${buildWebapp.ant}" target="stop" inheritAll="false"/>
</target>
- <!-- todo: this needs to compost down into runTomcat.xml; until we're sure
it works, it stays here -->
+ <!-- todo: this needs to compost down into buildWebapp.xml; until we're
sure it works, it stays here -->
<target name="ensure.deployed" description="Deploy webapp for the test
recorder">
<echo>Ensuring that the webapp ${webapp.name} is deployed on a running
server at the url ${webapp.waitfor.url}</echo>
Modified: incubator/beehive/trunk/netui/test/ant/build.xml
==============================================================================
--- incubator/beehive/trunk/netui/test/ant/build.xml (original)
+++ incubator/beehive/trunk/netui/test/ant/build.xml Tue Oct 26 07:56:13 2004
@@ -12,11 +12,11 @@
<!-- Tomcat Start/Stop Targets -->
<!-- ============================================= -->
<target name="start" description="Start Tomcat.">
- <ant antfile="${runTomcat.ant}" target="start" inheritAll="false"/>
+ <ant antfile="${buildWebapp.ant}" target="start" inheritAll="false"/>
</target>
<target name="stop" description="Stop Tomcat.">
- <ant antfile="${runTomcat.ant}" target="stop" inheritAll="false"/>
+ <ant antfile="${buildWebapp.ant}" target="stop" inheritAll="false"/>
</target>
<!-- ============================================= -->
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 Tue Oct 26
07:56:13 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="${deployNetui.ant}" target="deploy.netui"
inheritAll="false"/>
+ <ant antfile="${buildWebapp.ant}"
target="deploy.beehive.webapp.runtime" 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="${deployNetui.ant}" target="undeploy.netui"
inheritAll="false"/>
+ <ant antfile="${buildWebapp.ant}"
target="undeploy.beehive.webapp.runtime" inheritAll="false"/>
<antcall target="undeploy.testrecorder"/>
</target>
Modified: incubator/beehive/trunk/netui/test/webapps/drt/build.xml
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/build.xml (original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/build.xml Tue Oct 26
07:56:13 2004
@@ -161,20 +161,20 @@
<!-- -->
<!-- ================================================================ -->
<target name="deploy" description="Deploy webapp">
- <ant antfile="${runTomcat.ant}" target="deploy" inheritAll="false">
+ <ant antfile="${buildWebapp.ant}" target="deploy" inheritAll="false">
<property name="context.path" value="${webapp.name}"/>
<property name="webapp.dir" value="${app.dir}/drt/${webapp.name}"/>
</ant>
</target>
<target name="undeploy" description="Undeploy webapp">
- <ant antfile="${runTomcat.ant}" target="undeploy" inheritAll="false">
+ <ant antfile="${buildWebapp.ant}" target="undeploy" inheritAll="false">
<property name="context.path" value="${webapp.name}"/>
</ant>
</target>
<target name="redeploy" description="Redeploy webapp">
- <ant antfile="${runTomcat.ant}" target="redeploy" inheritAll="false">
+ <ant antfile="${buildWebapp.ant}" target="redeploy" inheritAll="false">
<property name="context.path" value="${webapp.name}"/>
</ant>
</target>
@@ -185,34 +185,34 @@
<!-- -->
<!-- ================================================================ -->
<target name="start.without.asserts" description="Start server without
asserts enabled for org.apache.beehive.netui">
- <ant antfile="${runTomcat.ant}" target="start" inheritAll="false"/>
+ <ant antfile="${buildWebapp.ant}" target="start" inheritAll="false"/>
</target>
<target name="start.with.shmem" description="Start server">
- <ant antfile="${runTomcat.ant}" target="start.with.shmem"
inheritAll="false"/>
+ <ant antfile="${buildWebapp.ant}" target="start.with.shmem"
inheritAll="false"/>
</target>
<target name="start" description="Start server with asserts enabled for
org.apache.beehive.netui">
- <ant antfile="${runTomcat.ant}" target="start" inheritAll="false">
+ <ant antfile="${buildWebapp.ant}" target="start" inheritAll="false">
<property name="java.options"
value="-ea:org.apache.beehive.netui..."/>
</ant>
</target>
<target name="start.with.shmem.asserts" description="Start server with
asserts enabled for org.apache.beehive.netui">
- <ant antfile="${runTomcat.ant}" target="start.with.shmem"
inheritAll="false">
+ <ant antfile="${buildWebapp.ant}" target="start.with.shmem"
inheritAll="false">
<property name="java.options"
value="-ea:org.apache.beehive.netui..."/>
</ant>
</target>
<target name="start.with.shmem.asserts.i18n"
description="Start server with asserts enabled for
org.apache.beehive.netui, with debugging enabled, and in a non-US locale for
i18n / l10n testing.">
- <ant antfile="${runTomcat.ant}" target="start.with.shmem"
inheritAll="false">
+ <ant antfile="${buildWebapp.ant}" target="start.with.shmem"
inheritAll="false">
<property name="java.options"
value="-ea:org.apache.beehive.netui... -Duser.language=NL -Duser.country=BE"/>
</ant>
</target>
<target name="stop" description="Stop server">
- <ant antfile="${runTomcat.ant}" target="stop" inheritAll="false"/>
+ <ant antfile="${buildWebapp.ant}" target="stop" inheritAll="false"/>
</target>
<target name="package.drts" description="Package the NetUI DRT
application.">
@@ -231,7 +231,7 @@
</java>
</target>
- <!-- todo: this needs to compost down into runTomcat.xml; until we're sure
it works, it stays here -->
+ <!-- todo: this needs to compost down into buildWebapp.xml; until we're
sure it works, it stays here -->
<target name="ensure.deployed" description="Deploy webapp for the test
recorder">
<echo>Ensuring that the webapp ${webapp.name} is deployed on a running
server at the url ${webapp.waitfor.url}</echo>
Modified: incubator/beehive/trunk/netui/test/webapps/jsf/build.xml
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/jsf/build.xml (original)
+++ incubator/beehive/trunk/netui/test/webapps/jsf/build.xml Tue Oct 26
07:56:13 2004
@@ -106,20 +106,20 @@
<!-- -->
<!-- ================================================================ -->
<target name="deploy" description="Deploy webapp">
- <ant antfile="${runTomcat.ant}" target="deploy" inheritAll="false">
+ <ant antfile="${buildWebapp.ant}" target="deploy" inheritAll="false">
<property name="context.path" value="${webapp.name}"/>
<property name="webapp.dir" value="${app.dir}/jsf/${webapp.name}"/>
</ant>
</target>
<target name="undeploy" description="Undeploy webapp">
- <ant antfile="${runTomcat.ant}" target="undeploy" inheritAll="false">
+ <ant antfile="${buildWebapp.ant}" target="undeploy" inheritAll="false">
<property name="context.path" value="${webapp.name}"/>
</ant>
</target>
<target name="redeploy" description="Redeploy webapp">
- <ant antfile="${runTomcat.ant}" target="redeploy" inheritAll="false">
+ <ant antfile="${buildWebapp.ant}" target="redeploy" inheritAll="false">
<property name="context.path" value="${webapp.name}"/>
</ant>
</target>
@@ -130,11 +130,11 @@
<!-- -->
<!-- ================================================================ -->
<target name="start" description="Start server">
- <ant antfile="${runTomcat.ant}" target="start" inheritAll="false"/>
+ <ant antfile="${buildWebapp.ant}" target="start" inheritAll="false"/>
</target>
<target name="stop" description="Stop server">
- <ant antfile="${runTomcat.ant}" target="stop" inheritAll="false"/>
+ <ant antfile="${buildWebapp.ant}" target="stop" inheritAll="false"/>
</target>
<target name="usage">
Modified: incubator/beehive/trunk/netui/test/webapps/testRecorder-test/build.xml
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/testRecorder-test/build.xml
(original)
+++ incubator/beehive/trunk/netui/test/webapps/testRecorder-test/build.xml
Tue Oct 26 07:56:13 2004
@@ -87,20 +87,20 @@
<!-- -->
<!-- ================================================================ -->
<target name="deploy" description="Deploy webapp">
- <ant antfile="${runTomcat.ant}" target="deploy" inheritAll="false">
+ <ant antfile="${buildWebapp.ant}" target="deploy" inheritAll="false">
<property name="context.path" value="${webapp.name}"/>
<property name="webapp.dir"
value="${app.dir}/${webapp.name}/${webapp.name}"/>
</ant>
</target>
<target name="undeploy" description="Undeploy webapp">
- <ant antfile="${runTomcat.ant}" target="undeploy" inheritAll="false">
+ <ant antfile="${buildWebapp.ant}" target="undeploy" inheritAll="false">
<property name="context.path" value="${webapp.name}"/>
</ant>
</target>
<target name="redeploy" description="Redeploy webapp">
- <ant antfile="${runTomcat.ant}" target="redeploy" inheritAll="false">
+ <ant antfile="${buildWebapp.ant}" target="redeploy" inheritAll="false">
<property name="context.path" value="${webapp.name}"/>
</ant>
</target>
@@ -115,11 +115,11 @@
<!-- -->
<!-- ================================================================ -->
<target name="start" description="Start server">
- <ant antfile="${runTomcat.ant}" target="start" inheritAll="false"/>
+ <ant antfile="${buildWebapp.ant}" target="start" inheritAll="false"/>
</target>
<target name="stop" description="Stop server">
- <ant antfile="${runTomcat.ant}" target="stop" inheritAll="false"/>
+ <ant antfile="${buildWebapp.ant}" target="stop" inheritAll="false"/>
</target>
<target name="usage">
Modified: incubator/beehive/trunk/netui/test/webapps/webappBuild-test/build.xml
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/webappBuild-test/build.xml
(original)
+++ incubator/beehive/trunk/netui/test/webapps/webappBuild-test/build.xml
Tue Oct 26 07:56:13 2004
@@ -49,20 +49,20 @@
<!-- -->
<!-- ================================================================ -->
<target name="deploy" description="Deploy webapp">
- <ant antfile="${runTomcat.ant}" target="deploy" inheritAll="false">
+ <ant antfile="${buildWebapp.ant}" target="deploy" inheritAll="false">
<property name="context.path" value="${webapp.name}"/>
<property name="webapp.dir"
value="${app.dir}/${webapp.name}/${webapp.name}"/>
</ant>
</target>
<target name="undeploy" description="Undeploy webapp">
- <ant antfile="${runTomcat.ant}" target="undeploy" inheritAll="false">
+ <ant antfile="${buildWebapp.ant}" target="undeploy" inheritAll="false">
<property name="context.path" value="${webapp.name}"/>
</ant>
</target>
<target name="redeploy" description="Redeploy webapp">
- <ant antfile="${runTomcat.ant}" target="redeploy" inheritAll="false">
+ <ant antfile="${buildWebapp.ant}" target="redeploy" inheritAll="false">
<property name="context.path" value="${webapp.name}"/>
</ant>
</target>
@@ -77,11 +77,11 @@
<!-- -->
<!-- ================================================================ -->
<target name="start" description="Start server">
- <ant antfile="${runTomcat.ant}" target="start" inheritAll="false"/>
+ <ant antfile="${buildWebapp.ant}" target="start" inheritAll="false"/>
</target>
<target name="stop" description="Stop server">
- <ant antfile="${runTomcat.ant}" target="stop" inheritAll="false"/>
+ <ant antfile="${buildWebapp.ant}" target="stop" inheritAll="false"/>
</target>
<target name="usage">
Modified: incubator/beehive/trunk/test/ant/webappRuntimeCore.xml
==============================================================================
--- incubator/beehive/trunk/test/ant/webappRuntimeCore.xml (original)
+++ incubator/beehive/trunk/test/ant/webappRuntimeCore.xml Tue Oct 26
07:56:13 2004
@@ -10,14 +10,14 @@
<!-- -->
<!-- ================================================================ -->
<!-- params (location webapp.dir) -->
- <target name="deploy.netui" description="Deploy the NetUI runtime into a
webapp rooted at ${webapp.dir}">
+ <target name="deploy.beehive.webapp.runtime" description="Deploy the
Beehive webapp 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}">
+ <target name="undeploy.beehive.webapp.runtime" description="Clean the
Beehive webapp 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>
