Author: bryanche
Date: Fri Apr 1 14:39:17 2005
New Revision: 159742
URL: http://svn.apache.org/viewcvs?view=rev&rev=159742
Log:
Remove commons-logging.jar from testRecorder and switch netui to use the
one in external/commons instead.
Removed:
incubator/beehive/trunk/netui/external/testRecorder/commons-logging.jar
Modified:
incubator/beehive/trunk/beehive-imports.xml
incubator/beehive/trunk/netui/netui-imports.xml
incubator/beehive/trunk/netui/test/ant/testRecorderCore.xml
Modified: incubator/beehive/trunk/beehive-imports.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/beehive-imports.xml?view=diff&r1=159741&r2=159742
==============================================================================
--- incubator/beehive/trunk/beehive-imports.xml (original)
+++ incubator/beehive/trunk/beehive-imports.xml Fri Apr 1 14:39:17 2005
@@ -52,8 +52,14 @@
<fileset id="commons-discovery.fileset"
file="${beehive.home}/external/commons/commons-discovery-0.2.jar"/>
- <fileset id="commons-logging.fileset"
- file="${beehive.home}/external/commons/commons-logging-1.0.4.jar"/>
+ <!-- create a patternset for commons-logging so we can refer to the
filename of the jar -->
+ <patternset id="commons-logging.patternset">
+ <include name="commons-logging-1.0.4.jar" />
+ </patternset>
+
+ <fileset id="commons-logging.fileset"
dir="${beehive.home}/external/commons">
+ <patternset refid="commons-logging.patternset" />
+ </fileset>
<fileset id="log4j.fileset"
file="${beehive.home}/external/log4j/log4j-1.2.8.jar"/>
Modified: incubator/beehive/trunk/netui/netui-imports.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/netui-imports.xml?view=diff&r1=159741&r2=159742
==============================================================================
--- incubator/beehive/trunk/netui/netui-imports.xml (original)
+++ incubator/beehive/trunk/netui/netui-imports.xml Fri Apr 1 14:39:17 2005
@@ -36,10 +36,6 @@
<fileset file="${external.dir}/commons-el/commons-el.jar"/>
</path>
- <path id="commons-logging.dependency.path">
- <fileset file="${external.dir}/struts/commons-logging.jar"/>
- </path>
-
<path id="commons-collections.dependency.path">
<fileset file="${external.dir}/struts/commons-collections.jar"/>
</path>
@@ -65,7 +61,7 @@
<path id="testrecorder.build.dependency.path">
<pathelement
location="${external.dir}/testRecorder/commons-httpclient-2.0.jar"/>
- <pathelement
location="${external.dir}/testRecorder/commons-logging.jar"/>
+ <path refid="commons-logging.dependency.path"/>
</path>
<macrodef name="copy-testrecorder-deps">
@@ -73,7 +69,7 @@
<sequential>
<copy todir="@{todir}/lib">
<fileset
file="${external.dir}/testRecorder/commons-httpclient-2.0.jar"/>
- <fileset
file="${external.dir}/testRecorder/commons-logging.jar"/>
+ <fileset refid="commons-logging.fileset"/>
</copy>
<copy todir="@{todir}/ant">
<fileset file="${test.dir}/ant/testRecorderCore.xml"/>
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=159741&r2=159742
==============================================================================
--- incubator/beehive/trunk/netui/test/ant/testRecorderCore.xml (original)
+++ incubator/beehive/trunk/netui/test/ant/testRecorderCore.xml Fri Apr 1
14:39:17 2005
@@ -14,13 +14,13 @@
<include name="commons-httpclient-2.0.jar"/>
<include name="junit.jar"/>
<include name="testRecorder.jar"/>
- <include name="commons-logging.jar"/>
</patternset>
<path id="testrecorder.dependency.path">
<fileset dir="${testRecorder.dir}/lib">
<patternset id="testrecorder.jars"/>
</fileset>
+ <fileset refid="commons-logging.fileset"/>
</path>
<path id="test.recorder.classpath">
@@ -331,6 +331,7 @@
<fileset dir="${testRecorder.dir}/lib">
<patternset id="testrecorder.jars"/>
</fileset>
+ <fileset refid="commons-logging.fileset"/>
</copy>
<copy file="${_config.jar}" toDir="${webapp.dir}/WEB-INF/lib"/>
@@ -353,6 +354,7 @@
<delete quiet="true">
<fileset dir="${webapp.dir}/WEB-INF/lib">
<patternset refid="testrecorder.jars"/>
+ <patternset refid="commons-logging.patternset" />
</fileset>
</delete>
<delete quiet="true">
