Author: bryanche
Date: Tue Apr 5 13:20:28 2005
New Revision: 160214
URL: http://svn.apache.org/viewcvs?view=rev&rev=160214
Log:
Fix some references to commons-logging.
Modified:
incubator/beehive/trunk/controls/test/dist-test/common/controls-test-imports.xml
incubator/beehive/trunk/netui/test/ant/testRecorderCore.xml
incubator/beehive/trunk/netui/test/dist-test/ant/netui-test.properties
incubator/beehive/trunk/test/dist-test/ant/test-imports.xml
Modified:
incubator/beehive/trunk/controls/test/dist-test/common/controls-test-imports.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/dist-test/common/controls-test-imports.xml?view=diff&r1=160213&r2=160214
==============================================================================
---
incubator/beehive/trunk/controls/test/dist-test/common/controls-test-imports.xml
(original)
+++
incubator/beehive/trunk/controls/test/dist-test/common/controls-test-imports.xml
Tue Apr 5 13:20:28 2005
@@ -53,9 +53,9 @@
<include name="axis-ant.jar"/>
<include name="axis.jar"/>
</fileset>
- <fileset id="webservice.common.jars" dir="${dist.home}/lib/commmon">
+ <fileset id="webservice.common.jars" dir="${dist.home}/lib/common">
<include name="commons-discovery-0.2.jar"/>
- <include name="commons-logging.jar"/>
+ <include name="commons-logging-1.0.4.jar"/>
</fileset>
</path>
Modified: incubator/beehive/trunk/netui/test/ant/testRecorderCore.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/ant/testRecorderCore.xml?view=diff&r1=160213&r2=160214
==============================================================================
--- incubator/beehive/trunk/netui/test/ant/testRecorderCore.xml (original)
+++ incubator/beehive/trunk/netui/test/ant/testRecorderCore.xml Tue Apr 5
13:20:28 2005
@@ -5,6 +5,9 @@
-->
<project name="Beehive/NetUI/TestRecorderCoreTasks" default="" basedir=".">
+ <!-- need to import this when running tests on the distribution -->
+ <import file="${dist.home}/beehive-imports.xml" optional="true" />
+
<property name="_report.root.dir"
location="${_testRecorder.base.dir}/junit"/>
<property name="_testRecorder.config.dir"
location="${_testRecorder.base.dir}/config"/>
<property name="_testRecorder.scratch.dir"
location="${_testRecorder.base.dir}/scratch"/>
Modified: incubator/beehive/trunk/netui/test/dist-test/ant/netui-test.properties
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/dist-test/ant/netui-test.properties?view=diff&r1=160213&r2=160214
==============================================================================
--- incubator/beehive/trunk/netui/test/dist-test/ant/netui-test.properties
(original)
+++ incubator/beehive/trunk/netui/test/dist-test/ant/netui-test.properties Tue
Apr 5 13:20:28 2005
@@ -41,7 +41,7 @@
test-recorder.jar.name=testRecorder.jar
test-recorder.jar=${testRecorder.dir}/lib/${test-recorder.jar.name}
-commons-logging.jar=${webapp.dir}/WEB-INF/lib/commons-logging.jar
+commons-logging.jar=${webapp.dir}/WEB-INF/lib/commons-logging-1.0.4.jar
httpClient.jar.name=commons-httpclient-2.0.jar
httpClient.jar=${testRecorder.dir}/lib/${httpClient.jar.name}
Modified: incubator/beehive/trunk/test/dist-test/ant/test-imports.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/test/dist-test/ant/test-imports.xml?view=diff&r1=160213&r2=160214
==============================================================================
--- incubator/beehive/trunk/test/dist-test/ant/test-imports.xml (original)
+++ incubator/beehive/trunk/test/dist-test/ant/test-imports.xml Tue Apr 5
13:20:28 2005
@@ -36,6 +36,17 @@
<property name="jsp20.jar" value="${tomcat.dir}/common/lib/jsp-api.jar"/>
+ <!-- define commons-logging location -->
+ <patternset id="commons-logging.patternset">
+ <include name="commons-logging-1.0.4.jar" />
+ </patternset>
+ <fileset id="commons-logging.fileset" dir="${dist.home}/lib/common">
+ <patternset refid="commons-logging.patternset" />
+ </fileset>
+ <path id="commons-logging.dependency.path">
+ <fileset refid="commons-logging.fileset"/>
+ </path>
+
<!--
======================================================================== -->
<!-- Common Beehive Distribution Test Ant macros
-->
<!--
======================================================================== -->
