Author: ekoneil
Date: Wed Jan 26 12:25:42 2005
New Revision: 126536
URL: http://svn.apache.org/viewcvs?view=rev&rev=126536
Log:
Move the netui/test/src/testRecorder directory to netui/src/testRecorder.
This is a tool, and with the new build stuff, we've been running into problems
where the tool isn't built before it's used.
Building this with the server source should fix that problem.
BB: self
DRT: NetUI pass
Added:
incubator/beehive/trunk/netui/external/testRecorder/
- copied from r126515, incubator/beehive/trunk/netui/test/external/
incubator/beehive/trunk/netui/src/testRecorder/
- copied from r126515,
incubator/beehive/trunk/netui/test/src/testRecorder/
Removed:
incubator/beehive/trunk/netui/test/external/
incubator/beehive/trunk/netui/test/src/testRecorder/
Modified:
incubator/beehive/trunk/netui/ant/build.xml
incubator/beehive/trunk/netui/ant/netui.properties
incubator/beehive/trunk/netui/netui-imports.xml
incubator/beehive/trunk/netui/src/testRecorder/build.xml
incubator/beehive/trunk/netui/test/ant/build.xml
incubator/beehive/trunk/netui/test/ant/buildWebapp.xml
incubator/beehive/trunk/netui/test/ant/test-imports.xml
incubator/beehive/trunk/netui/test/src/testRecorderQA/build.xml
Modified: incubator/beehive/trunk/netui/ant/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/ant/build.xml?view=diff&rev=126536&p1=incubator/beehive/trunk/netui/ant/build.xml&r1=126535&p2=incubator/beehive/trunk/netui/ant/build.xml&r2=126536
==============================================================================
--- incubator/beehive/trunk/netui/ant/build.xml (original)
+++ incubator/beehive/trunk/netui/ant/build.xml Wed Jan 26 12:25:42 2005
@@ -76,6 +76,7 @@
<file name="tags-html"/>
<file name="tags-databinding"/>
<file name="tags-template"/>
+ <file name="testRecorder"/>
</filelist>
</subant>
</target>
Modified: incubator/beehive/trunk/netui/ant/netui.properties
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/ant/netui.properties?view=diff&rev=126536&p1=incubator/beehive/trunk/netui/ant/netui.properties&r1=126535&p2=incubator/beehive/trunk/netui/ant/netui.properties&r2=126536
==============================================================================
--- incubator/beehive/trunk/netui/ant/netui.properties (original)
+++ incubator/beehive/trunk/netui/ant/netui.properties Wed Jan 26 12:25:42 2005
@@ -20,6 +20,8 @@
default.tomcat-users.xml=${conf.dir}/tomcat-users.xml
+testRecorder.dir=${netui.home}/build/tools/testRecorder
+
#
---------------------------------------------------------------------------------
#
# External JAR and resource paths
Modified: incubator/beehive/trunk/netui/netui-imports.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/netui-imports.xml?view=diff&rev=126536&p1=incubator/beehive/trunk/netui/netui-imports.xml&r1=126535&p2=incubator/beehive/trunk/netui/netui-imports.xml&r2=126536
==============================================================================
--- incubator/beehive/trunk/netui/netui-imports.xml (original)
+++ incubator/beehive/trunk/netui/netui-imports.xml Wed Jan 26 12:25:42 2005
@@ -10,6 +10,8 @@
<import file="../beehive-imports.xml"/>
<property file="${beehive.home}/netui/ant/netui.properties"/>
+ <property name="testRecorder.dir" location="${test.lib.dir}/testRecorder"/>
+
<!-- filesets used by <path> structures and for copying -->
<fileset id="commons-el.fileset"
file="${beehive.home}/netui/external/commons-el/commons-el.jar"/>
@@ -56,6 +58,24 @@
<include name="*.jar"/>
</fileset>
</path>
+
+ <path id="testrecorder.dependency.path">
+ <pathelement
location="${external.dir}/testRecorder/commons-httpclient-2.0.jar"/>
+ <pathelement
location="${external.dir}/testRecorder/commons-logging.jar"/>
+ </path>
+
+ <macrodef name="copy-testrecorder-deps">
+ <attribute name="todir"/>
+ <sequential>
+ <copy todir="@{todir}/lib">
+ <fileset
file="${external.dir}/testRecorder/commons-httpclient-2.0.jar"/>
+ <fileset
file="${external.dir}/testRecorder/commons-logging.jar"/>
+ </copy>
+ <copy todir="@{todir}/ant">
+ <fileset file="${test.dir}/ant/testRecorderCore.xml"/>
+ </copy>
+ </sequential>
+ </macrodef>
<patternset id="struts11.jars">
<include name="commons-beanutils.jar"/>
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&rev=126536&p1=incubator/beehive/trunk/netui/test/src/testRecorder/build.xml&r1=126515&p2=incubator/beehive/trunk/netui/src/testRecorder/build.xml&r2=126536
==============================================================================
--- incubator/beehive/trunk/netui/test/src/testRecorder/build.xml
(original)
+++ incubator/beehive/trunk/netui/src/testRecorder/build.xml Wed Jan 26
12:25:42 2005
@@ -2,21 +2,20 @@
<project name="Beehive/NetUI/TestRecorder" default="build" basedir=".">
- <import file="../../ant/test-imports.xml"/>
+ <import file="../../netui-imports.xml"/>
<property name="module.name" value="testRecorder"/>
- <property name="module.dir" location="${test.src.dir}/${module.name}"/>
- <property name="module.classes.dir"
location="${test.classes.dir}/${module.name}"/>
+ <property name="module.dir" location="${src.dir}/${module.name}"/>
+ <property name="module.classes.dir"
location="${classes.dir}/${module.name}"/>
<property name="module.jar.name" value="testRecorder.jar"/>
- <property name="module.jar"
location="${test.lib.dir}/testRecorder/lib/${module.jar.name}"/>
+ <property name="module.jar"
location="${testRecorder.dir}/lib/${module.jar.name}"/>
<path id="module.classpath">
<path refid="log4j.dependency.path"/>
<path refid="servlet.dependency.path"/>
<path refid="junit.dependency.path"/>
<path refid="xbean.dependency.path"/>
- <path refid="commons-logging.dependency.path"/>
- <path refid="httpclient.dependency.path"/>
+ <path refid="testrecorder.dependency.path"/>
</path>
<target name="build">
@@ -44,12 +43,12 @@
</javac>
<!-- make testRecorder output directory -->
- <mkdir dir="${test.lib.dir}/testRecorder"/>
- <copy todir="${test.lib.dir}/testRecorder/jsp">
+ <mkdir dir="${testRecorder.dir}"/>
+ <copy todir="${testRecorder.dir}/jsp">
<fileset dir="${module.dir}/jsp"/>
</copy>
- <copy-junit todir="${test.lib.dir}/testRecorder/lib"/>
- <copy-testrecorder-deps todir="${test.lib.dir}/testRecorder"/>
+ <copy-junit todir="${testRecorder.dir}/lib"/>
+ <copy-testrecorder-deps todir="${testRecorder.dir}"/>
<jar jarfile="${module.jar}" basedir="${module.classes.dir}"/>
</target>
Modified: incubator/beehive/trunk/netui/test/ant/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/ant/build.xml?view=diff&rev=126536&p1=incubator/beehive/trunk/netui/test/ant/build.xml&r1=126535&p2=incubator/beehive/trunk/netui/test/ant/build.xml&r2=126536
==============================================================================
--- incubator/beehive/trunk/netui/test/ant/build.xml (original)
+++ incubator/beehive/trunk/netui/test/ant/build.xml Wed Jan 26 12:25:42 2005
@@ -30,7 +30,6 @@
<subant target="${target.name}">
<filelist dir="${test.src.dir}">
<file name="junitTests"/>
- <file name="testRecorder"/>
<file name="testRecorderQA"/>
</filelist>
</subant>
Modified: incubator/beehive/trunk/netui/test/ant/buildWebapp.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/ant/buildWebapp.xml?view=diff&rev=126536&p1=incubator/beehive/trunk/netui/test/ant/buildWebapp.xml&r1=126535&p2=incubator/beehive/trunk/netui/test/ant/buildWebapp.xml&r2=126536
==============================================================================
--- incubator/beehive/trunk/netui/test/ant/buildWebapp.xml (original)
+++ incubator/beehive/trunk/netui/test/ant/buildWebapp.xml Wed Jan 26
12:25:42 2005
@@ -31,7 +31,6 @@
<target name="deploy.testrecorder" if="include.testrecorder"
description="Deploy the test recorder to a webapp">
<available property="testrecorder.available"
file="${test-recorder.jar}"/>
- <antcall target="build.testrecorder"/>
<echo>Deploying the test recorder to webapp at root:
${webapp.dir}</echo>
@@ -53,22 +52,9 @@
<target name="undeploy.testrecorder" if="include.testrecorder"
description="Undeploy the test recorder from a webapp">
<echo>Clean the test recorder to webapp at root: ${webapp.dir}</echo>
- <!-- hard code the test recorder clean. this isn't great, but it's a
fair workaround -->
- <delete quiet="true">
- <fileset dir="${webapp.dir}/WEB-INF/lib">
- <patternset refid="testrecorder.jars"/>
- </fileset>
- </delete>
- <delete quiet="true">
- <fileset dir="${webapp.dir}/testRecorder">
- <include name="*.jsp"/>
- <include name="*.inc"/>
- </fileset>
- </delete>
- </target>
-
- <target name="build.testrecorder" unless="testrecorder.available">
- <ant dir="${test.dir}/src/testRecorder" antfile="build.xml"
target="build" inheritAll="false"/>
+ <ant antfile="${test.dir}/ant/testRecorder.xml"
target="undeploy.testrecorder" inheritAll="false">
+ <property name="webapp.dir" location="${webapp.dir}"/>
+ </ant>
</target>
</project>
Modified: incubator/beehive/trunk/netui/test/ant/test-imports.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/ant/test-imports.xml?view=diff&rev=126536&p1=incubator/beehive/trunk/netui/test/ant/test-imports.xml&r1=126535&p2=incubator/beehive/trunk/netui/test/ant/test-imports.xml&r2=126536
==============================================================================
--- incubator/beehive/trunk/netui/test/ant/test-imports.xml (original)
+++ incubator/beehive/trunk/netui/test/ant/test-imports.xml Wed Jan 26
12:25:42 2005
@@ -12,31 +12,8 @@
<property name="log4jconfig.verbose.junit"
location="${test.dir}/conf/junitLogCfgVerbose.xml"/>
<property name="log4jconfig.junit"
location="${test.dir}/conf/junitLogCfg.xml"/>
- <property name="testRecorder.dir" location="${test.lib.dir}/testRecorder"/>
-
- <path id="httpclient.dependency.path">
- <pathelement
location="${test.external.dir}/commons-httpclient-2.0.jar"/>
- </path>
-
<path id="junit-tests.dependency.path">
<pathelement location="${test.lib.dir}/beehive-netui-junitTests.jar"/>
</path>
-
- <path id="commons-logging.dependency.path">
- <pathelement location="${test.external.dir}/commons-logging.jar"/>
- </path>
-
- <macrodef name="copy-testrecorder-deps">
- <attribute name="todir"/>
- <sequential>
- <copy todir="@{todir}/lib">
- <fileset
file="${test.external.dir}/commons-httpclient-2.0.jar"/>
- <fileset file="${test.external.dir}/commons-logging.jar"/>
- </copy>
- <copy todir="@{todir}/ant">
- <fileset file="${test.dir}/ant/testRecorderCore.xml"/>
- </copy>
- </sequential>
- </macrodef>
</project>
Modified: incubator/beehive/trunk/netui/test/src/testRecorderQA/build.xml
Url:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/netui/test/src/testRecorderQA/build.xml?view=diff&rev=126536&p1=incubator/beehive/trunk/netui/test/src/testRecorderQA/build.xml&r1=126535&p2=incubator/beehive/trunk/netui/test/src/testRecorderQA/build.xml&r2=126536
==============================================================================
--- incubator/beehive/trunk/netui/test/src/testRecorderQA/build.xml
(original)
+++ incubator/beehive/trunk/netui/test/src/testRecorderQA/build.xml Wed Jan
26 12:25:42 2005
@@ -10,23 +10,13 @@
<property name="module.jar.name" value="testRecorder-qa.jar"/>
<property name="module.jar" location="${test.lib.dir}/${module.jar.name}"/>
- <patternset id="testrecorder.jars">
- <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>
+ <path id="testrecorder-test.dependency.path">
+ <fileset dir="${testRecorder.dir}/lib"/>
</path>
<path id="module.classpath">
- <path refid="junit.dependency.path"/>
<path refid="xbean.dependency.path"/>
- <path refid="testrecorder.dependency.path"/>
+ <path refid="testrecorder-test.dependency.path"/>
</path>
<target name="build">
