Author: ekoneil
Date: Fri Jul 16 19:11:37 2004
New Revision: 22987
Removed:
incubator/beehive/netui/local-build.xml
Modified:
incubator/beehive/netui/ant/webappTemplate.xml
incubator/beehive/netui/test/webapps/drt/build.xml
Log:
Build fixes.
- fixup the waitfor.url for the NetUI DRT web application. In a clean sync
from SVN, the build was waiting for the server to start at the wrong URL, which
caused the checkin tests to fail.
- add controls, xbean, jsr173, and log4j JARs to the NetUI webapp template in
netui/build/dist/webapp. These are needed to create a new NetUI-enabled webapp.
BB: self
DRT: Controls / NetUI pass
Modified: incubator/beehive/netui/ant/webappTemplate.xml
==============================================================================
--- incubator/beehive/netui/ant/webappTemplate.xml (original)
+++ incubator/beehive/netui/ant/webappTemplate.xml Fri Jul 16 19:11:37 2004
@@ -56,6 +56,16 @@
<!-- copy the JSTL support JARs -->
<copy todir="${webinf.lib}" file="${jstl.jar}"/>
<copy todir="${webinf.lib}" file="${standard.jar}"/>
+
+ <!-- copy the XMLBeans JARs -->
+ <copy todir="${webinf.lib}" file="${xbean.jar}"/>
+ <copy todir="${webinf.lib}" file="${jsr173.jar}"/>
+
+ <!-- copy log4j -->
+ <copy todir="${webinf.lib}" file="${log4j.jar}"/>
+
+ <!-- copy control support -->
+ <copy todir="${webinf.lib}" file="${controls.jar}"/>
<!-- copy the validation files -->
<copy todir="${webinf.dir}" file="${struts.dir}/validator-rules.xml"/>
@@ -209,7 +219,7 @@
<!--
@todo: it's as yet undecided how these should get into Tomcat
classpath; for now,
- they are copied directly into WEB-INF/lib
+ they are copied directly into WEB-INF/lib of the webapp template.
-->
<copy todir="${webapp.dir}/WEB-INF/lib" file="${log4j.jar}"/>
<copy todir="${webapp.dir}/WEB-INF/lib" file="${controls.jar}"/>
Modified: incubator/beehive/netui/test/webapps/drt/build.xml
==============================================================================
--- incubator/beehive/netui/test/webapps/drt/build.xml (original)
+++ incubator/beehive/netui/test/webapps/drt/build.xml Fri Jul 16 19:11:37 2004
@@ -107,14 +107,14 @@
<ant antfile="${test.dir}/ant/testRecorder.xml"
target="suite.callback" inheritAll="false">
<property name="testRecorder.config.name"
value="${testRecorder.config.name}"/>
<property name="suite.name" value="bvt"/>
- <property name="waitfor.url" value="${webapp.waitfor.url}"/>
+ <property name="waitfor.url" value="http://localhost:8080/"/>
</ant>
</target>
<target name="drt" description="Run the drt suite with full server start /
stop support.">
<ant dir="${test.dir}" antfile="${test.dir}/ant/testRecorder.xml"
inheritAll="false" target="server.test">
<property name="app.build.file"
location="${app.dir}/drt/build.xml"/>
- <property name="waitfor.url" value="${webapp.waitfor.url}"/>
+ <property name="waitfor.url" value="http://localhost:8080/"/>
<property name="testRecorder.config.name"
value="${testRecorder.config.name}"/>
<property name="suite.name" value="drt"/>
<property name="drt.mode" value="true"/>
@@ -124,7 +124,7 @@
<target name="bvt" description="Run the bvt suite with full server start /
stop support.">
<ant antfile="${test.dir}/ant/testRecorder.xml" inheritAll="false"
target="server.test">
<property name="app.build.file"
location="${app.dir}/drt/build.xml"/>
- <property name="waitfor.url" value="${webapp.waitfor.url}"/>
+ <property name="waitfor.url" value="http://localhost:8080/"/>
<property name="testRecorder.config.name"
value="${testRecorder.config.name}"/>
<property name="suite.name" value="bvt"/>
<property name="drt.mode" value="true"/>
