Author: ekoneil
Date: Tue Nov 2 09:30:17 2004
New Revision: 56389
Modified:
incubator/beehive/branches/v1/alpha/netui/ant/netui.properties
incubator/beehive/branches/v1/alpha/netui/test/ant/testRecorder.xml
incubator/beehive/branches/v1/alpha/netui/test/src/testRecorder/build.xml
Log:
SVN merge of change 56341 into v1/alpha
BB: self
DRT: Beehive pass
Modified: incubator/beehive/branches/v1/alpha/netui/ant/netui.properties
==============================================================================
--- incubator/beehive/branches/v1/alpha/netui/ant/netui.properties
(original)
+++ incubator/beehive/branches/v1/alpha/netui/ant/netui.properties Tue Nov
2 09:30:17 2004
@@ -90,12 +90,9 @@
#
# XDoclet JARs
#
-xdoclet.jar.name=xdoclet-1.2b4.jar
-xdoclet.web.module.jar.name=xdoclet-web-module-1.2b4.jar
-xjavadoc.jar.name=xjavadoc-1.0.jar
-xdoclet.jar=${xdoclet.dir}/${xdoclet.jar.name}
-xdoclet.web.module.jar=${xdoclet.dir}/${xdoclet.web.module.jar.name}
-xjavadoc.jar=${xdoclet.dir}/${xjavadoc.jar.name}
+xdoclet.jar=${xdoclet.dir}/xdoclet-1.2b4.jar
+xdoclet.web.module.jar=${xdoclet.dir}/xdoclet-web-module-1.2b4.jar
+xjavadoc.jar=${xdoclet.dir}/xjavadoc-1.0.jar
#
# Tomcat properties. These JARs are still used to compile
@@ -178,23 +175,6 @@
webappTemplate.webinf=${webapp.dist.dir}/WEB-INF
webappTemplate.webinf.lib=${webappTemplate.webinf}/lib
-# Deployed JARs
-deployed.tags.html.jar=${webappTemplate.webinf.lib}/${tags-html.jar.name}
-deployed.tags.template.jar=${webappTemplate.webinf.lib}/${tags-template.jar.name}
-deployed.tags.databinding.jar=${webappTemplate.webinf.lib}/${tags-databinding.jar.name}
-deployed.util.jar=${webappTemplate.webinf.lib}/${util.jar.name}
-deployed.compiler.jar=${webappTemplate.webinf.lib}/${compiler.jar.name}
-deployed.pageflow.jar=${webappTemplate.webinf.lib}/${pageflow.jar.name}
-deployed.scoping.jar=${webappTemplate.webinf.lib}/${scoping.jar.name}
-deployed.struts.jar=${webappTemplate.webinf.lib}/struts.jar
-deployed.commons-beanutils.jar=${webappTemplate.webinf.lib}/commons-beanutils.jar
-deployed.commons-collections.jar=${webappTemplate.webinf.lib}/commons-collections.jar
-deployed.commons-logging.jar=${webappTemplate.webinf.lib}/commons-logging.jar
-deployed.commons-digester.jar=${webappTemplate.webinf.lib}/commons-digester.jar
-deployed.commons-fileupload.jar=${webappTemplate.webinf.lib}/commons-fileupload.jar
-deployed.commons-validator.jar=${webappTemplate.webinf.lib}/commons-validator.jar
-deployed.jakarta-oro.jar=${webappTemplate.webinf.lib}/jakarta-oro.jar
-deployed.commons-el.jar=${webappTemplate.webinf.lib}/commons-el.jar
deployed.netuiconfig.xml=${webappTemplate.webinf}/netui-config.xml
#
---------------------------------------------------------------------------------
Modified: incubator/beehive/branches/v1/alpha/netui/test/ant/testRecorder.xml
==============================================================================
--- incubator/beehive/branches/v1/alpha/netui/test/ant/testRecorder.xml
(original)
+++ incubator/beehive/branches/v1/alpha/netui/test/ant/testRecorder.xml Tue Nov
2 09:30:17 2004
@@ -20,7 +20,7 @@
<property name="_test.config.dir" location="${test.dir}/conf"/>
<property name="_httpClient.jar" location="${httpClient.jar}"/>
<property name="_testRecorder.jar" location="${test-recorder.jar}"/>
- <property name="_commons-logging.jar"
location="${deployed.commons-logging.jar}"/>
+ <property name="_commons-logging.jar" location="${commons-logging.jar}"/>
<property name="_testRecorder.jar.name" value="${test-recorder.jar.name}"/>
<property name="_httpClient.jar.name" value="${httpClient.jar.name}"/>
Modified:
incubator/beehive/branches/v1/alpha/netui/test/src/testRecorder/build.xml
==============================================================================
--- incubator/beehive/branches/v1/alpha/netui/test/src/testRecorder/build.xml
(original)
+++ incubator/beehive/branches/v1/alpha/netui/test/src/testRecorder/build.xml
Tue Nov 2 09:30:17 2004
@@ -10,7 +10,7 @@
<property name="module.name" value="testRecorder"/>
<property name="module.dir" location="${test.src.dir}/${module.name}"/>
<property name="module.classpath"
-
location="${httpClient.jar};${deployed.commons-logging.jar};${log4j.jar};${servlet24.jar};${jsp20.jar};${xbean.jar};${junit.jar};${jsr173.jar}"/>
+
location="${httpClient.jar};${commons-logging.jar};${log4j.jar};${servlet24.jar};${jsp20.jar};${xbean.jar};${junit.jar};${jsr173.jar}"/>
<property name="module.classes.dir"
location="${test.classes.dir}/${module.name}"/>
<property name="module.jar.name" value="${test-recorder.jar.name}"/>
<property name="module.jar" location="${test.lib.dir}/${module.jar.name}"/>
