Author: jsong
Date: Mon Aug 9 22:51:40 2004
New Revision: 36161
Added:
incubator/beehive/trunk/controls/test/webapps/common.properties
Modified:
incubator/beehive/trunk/controls/test/webapps/build.xml
Log:
Remove reference to NETUI specific properties from
controls/test/webapps/build.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
22:51:40 2004
@@ -15,10 +15,11 @@
<property environment="os"/>
<property file="${os.BEEHIVE_HOME}/beehive.properties"/>
- <property file="${os.BEEHIVE_HOME}/netui/test/ant/test.properties"/>
- <property file="${os.BEEHIVE_HOME}/netui/ant/bootstrap.properties"/>
- <property file="${os.BEEHIVE_HOME}/netui/ant/common.properties"/>
-
+ <!--property file="${os.BEEHIVE_HOME}/netui/test/ant/test.properties"/-->
+ <!--property file="${os.BEEHIVE_HOME}/netui/ant/bootstrap.properties"/-->
+ <!--property file="${os.BEEHIVE_HOME}/netui/ant/common.properties"/-->
+ <property file="common.properties"/>
+
<property name="webapp.name" value="controlsWeb"/>
<property name="webapp.waitfor.url"
value="http://localhost:8080/${webapp.name}"/>
@@ -77,17 +78,25 @@
<echo message="----------------------------------------------"/>
</target>
+ <!-- Fix me: currently, netui\ant\webappTemplate.xml
undeploy.netui.runtime delete all the jars -->
+ <!-- Fix me: milton.jar is deleted by mistake. undeploy.netui.runtime
should be fixed and -->
+ <!-- Fix me: not delete milton.jar -->
<target name="clean" description="Clean webapp">
<echo message="----------------------------------------------"/>
<echo message="| Controls controlsWeb clean starting |"/>
<echo message="----------------------------------------------"/>
- <ant antfile="${deployNetui.ant}" target="undeploy.netui"
inheritAll="false">
- <property name="webapp.dir"
location="${app.dir}/drt/${webapp.name}"/>
+ <ant antfile="${buildWebapp.ant}" target="undeploy.netui"
inheritAll="false">
+ <property name="webapp.dir" location="./${webapp.name}"/>
</ant>
<ant antfile="${buildNetui.ant}" target="clean.webapp"
inheritAll="false">
- <property name="webapp.dir"
location="${app.dir}/drt/${webapp.name}"/>
+ <property name="webapp.dir" location="./${webapp.name}"/>
</ant>
+
+ <echo message="****************************************************"/>
+ <echo message="* milton.jar is deleted by undeploy.netui.runtime, *"/>
+ <echo message="* please put it back to controlsWeb/WEB-INF/lib/ *"/>
+ <echo message="****************************************************"/>
<echo message="----------------------------------------------"/>
<echo message="| Controls controlsWeb clean ending |"/>
Added: incubator/beehive/trunk/controls/test/webapps/common.properties
==============================================================================
--- (empty file)
+++ incubator/beehive/trunk/controls/test/webapps/common.properties Mon Aug
9 22:51:40 2004
@@ -0,0 +1,24 @@
+#
+# common.properties -- an Ant properties file that
+# contains properties that are read-only in
+# a user's development environment.
+#
+webui.home=${beehive.dir}/netui
+build.dir=${webui.home}/build
+build.external.dir=${build.dir}/external
+struts.dir=${build.external.dir}/struts
+
+#
+# Tomcat properties. These are used by the XDoclet build
+# and will go away when the Tomcat security integration is
+# implemented on Tomcat 5.x
+#
+
+# External JARs
+
+#
+# External TLDs
+#
+struts11.logic.tld=${struts.dir}/struts-logic.tld
+struts11.html.tld=${struts.dir}/struts-html.tld
+struts11.bean.tld=${struts.dir}/struts-bean.tld
