Author: ekoneil
Date: Sun Oct 17 14:34:43 2004
New Revision: 54975
Modified:
incubator/beehive/trunk/controls/test/webapps/build.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/runTomcatCore.xml
Log:
Make the change to switch runTomcatCore.xml from "webapp.root" to "webapp.dir".
This is now symmetric with the buildWebappCore.xml Ant file.
Also changed the Controls / NetUI builds, which were using the affected Tomcat
"deploy" target.
BB: self
DRT: Beehive pass
BVT: NetUI pass
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 Sun Oct 17
14:34:43 2004
@@ -227,7 +227,7 @@
<target name="deploy" description="Deploy webapp" depends="-init">
<ant antfile="${runTomcat.ant}" target="deploy" inheritAll="false">
<property name="context.path" value="${webapp.name}"/> <!-- whats
this for? -->
- <property name="webapp.root" value="${webapp.dir}"/>
+ <property name="webapp.dir" value="${webapp.dir}"/>
</ant>
</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 Sun Oct 17
14:34:43 2004
@@ -163,7 +163,7 @@
<target name="deploy" description="Deploy webapp">
<ant antfile="${runTomcat.ant}" target="deploy" inheritAll="false">
<property name="context.path" value="${webapp.name}"/>
- <property name="webapp.root"
value="${app.dir}/drt/${webapp.name}"/>
+ <property name="webapp.dir" value="${app.dir}/drt/${webapp.name}"/>
</ant>
</target>
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 Sun Oct 17
14:34:43 2004
@@ -108,7 +108,7 @@
<target name="deploy" description="Deploy webapp">
<ant antfile="${runTomcat.ant}" target="deploy" inheritAll="false">
<property name="context.path" value="${webapp.name}"/>
- <property name="webapp.root"
value="${app.dir}/jsf/${webapp.name}"/>
+ <property name="webapp.dir" value="${app.dir}/jsf/${webapp.name}"/>
</ant>
</target>
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
Sun Oct 17 14:34:43 2004
@@ -89,7 +89,7 @@
<target name="deploy" description="Deploy webapp">
<ant antfile="${runTomcat.ant}" target="deploy" inheritAll="false">
<property name="context.path" value="${webapp.name}"/>
- <property name="webapp.root"
value="${app.dir}/${webapp.name}/${webapp.name}"/>
+ <property name="webapp.dir"
value="${app.dir}/${webapp.name}/${webapp.name}"/>
</ant>
</target>
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
Sun Oct 17 14:34:43 2004
@@ -51,7 +51,7 @@
<target name="deploy" description="Deploy webapp">
<ant antfile="${runTomcat.ant}" target="deploy" inheritAll="false">
<property name="context.path" value="${webapp.name}"/>
- <property name="webapp.root"
value="${app.dir}/${webapp.name}/${webapp.name}"/>
+ <property name="webapp.dir"
value="${app.dir}/${webapp.name}/${webapp.name}"/>
</ant>
</target>
Modified: incubator/beehive/trunk/test/ant/runTomcatCore.xml
==============================================================================
--- incubator/beehive/trunk/test/ant/runTomcatCore.xml (original)
+++ incubator/beehive/trunk/test/ant/runTomcatCore.xml Sun Oct 17 14:34:43 2004
@@ -11,12 +11,12 @@
<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"/>
- <fail unless="webapp.root" message="Can't deploy webapp; the value
${webapp.root} was unspecified"/>
+ <fail unless="webapp.dir" message="Can't deploy webapp; the value
${webapp.dir} was unspecified"/>
- <available property="webapp.available" file="${webapp.root}"
type="dir"/>
- <fail unless="webapp.available" message="The webapp at ${webapp.root}
does not exist."/>
+ <available property="webapp.available" file="${webapp.dir}"
type="dir"/>
+ <fail unless="webapp.available" message="The webapp at ${webapp.dir}
does not exist."/>
- <property name="_url" value="file://${webapp.root}"/>
+ <property name="_url" value="file://${webapp.dir}"/>
<echo>deploy webapp from ${_url} with context path
${context.path}</echo>
<taskdef name="tomcatdeploy"
classname="org.apache.catalina.ant.DeployTask" classpath="${catalina-ant.jar}"/>
