Author: ekoneil
Date: Tue Feb 22 08:00:27 2005
New Revision: 154864
URL: http://svn.apache.org/viewcvs?view=rev&rev=154864
Log:
Build cleanup. Remove the ${test.lib.dir} dropping in netui/ant.
BB: self
DRT: NetUI pass
Modified:
incubator/beehive/trunk/netui/netui-imports.xml
incubator/beehive/trunk/netui/src/testRecorder/build.xml
incubator/beehive/trunk/netui/test/ant/testRecorder.xml
incubator/beehive/trunk/netui/test/webapps/drt/build.xml
Modified: incubator/beehive/trunk/netui/netui-imports.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/netui-imports.xml?view=diff&r1=154863&r2=154864
==============================================================================
--- incubator/beehive/trunk/netui/netui-imports.xml (original)
+++ incubator/beehive/trunk/netui/netui-imports.xml Tue Feb 22 08:00:27 2005
@@ -10,7 +10,7 @@
<import file="../beehive-imports.xml"/>
<property file="${beehive.home}/netui/ant/netui.properties"/>
- <property name="testRecorder.dir" location="${test.lib.dir}/testRecorder"/>
+ <property name="testRecorder.dir" location="${build.dir}/tools"/>
<!-- filesets used by <path> structures and for copying -->
<fileset id="commons-el.fileset"
file="${beehive.home}/netui/external/commons-el/commons-el.jar"/>
@@ -59,7 +59,7 @@
</fileset>
</path>
- <path id="testrecorder.dependency.path">
+ <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>
Modified: incubator/beehive/trunk/netui/src/testRecorder/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/src/testRecorder/build.xml?view=diff&r1=154863&r2=154864
==============================================================================
--- incubator/beehive/trunk/netui/src/testRecorder/build.xml (original)
+++ incubator/beehive/trunk/netui/src/testRecorder/build.xml Tue Feb 22
08:00:27 2005
@@ -15,14 +15,13 @@
<path refid="servlet.dependency.path"/>
<path refid="junit.dependency.path"/>
<path refid="xbean.dependency.path"/>
- <path refid="testrecorder.dependency.path"/>
+ <path refid="testrecorder.build.dependency.path"/>
</path>
<target name="build">
<echo>compile module: ${module.name}</echo>
<echo>debug: ${compile.debug}</echo>
- <mkdir dir="${test.lib.dir}"/>
<mkdir dir="${module.classes.dir}"/>
<ant antfile="${netui.ant.dir}/xmlBean.xml" target="ant.build.xmlbean">
Modified: incubator/beehive/trunk/netui/test/ant/testRecorder.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/ant/testRecorder.xml?view=diff&r1=154863&r2=154864
==============================================================================
--- incubator/beehive/trunk/netui/test/ant/testRecorder.xml (original)
+++ incubator/beehive/trunk/netui/test/ant/testRecorder.xml Tue Feb 22 08:00:27
2005
@@ -10,7 +10,6 @@
<property name="_log4j.config.verbose"
location="${log4jconfig.verbose.junit}"/>
<property name="_log4j.config" location="${log4jconfig.junit}"/>
<property name="_server.maxWait" value="300"/>
- <property name="testRecorder.dir" location="${test.lib.dir}/testRecorder"/>
<import file="${testRecorder.dir}/ant/testRecorderCore.xml"/>
Modified: incubator/beehive/trunk/netui/test/webapps/drt/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/webapps/drt/build.xml?view=diff&r1=154863&r2=154864
==============================================================================
--- incubator/beehive/trunk/netui/test/webapps/drt/build.xml (original)
+++ incubator/beehive/trunk/netui/test/webapps/drt/build.xml Tue Feb 22
08:00:27 2005
@@ -256,10 +256,4 @@
<http url="${webapp.waitfor.url}"/>
</waitfor>
</target>
-
- <target name="usage">
- <java fork="no" classname="org.apache.tools.ant.Main">
- <arg line="-projecthelp"/>
- </java>
- </target>
</project>
