Author: jsong
Date: Tue Apr 5 15:37:23 2005
New Revision: 160236
URL: http://svn.apache.org/viewcvs?view=rev&rev=160236
Log:
Fix for BEEHIVE-216. TCH will now run with inheritall="true" so that it will
properly inherit filter properties.
Contributed by Joe Pemberton.
Modified:
incubator/beehive/trunk/controls/test/build.xml
incubator/beehive/trunk/controls/test/common/path.properties
incubator/beehive/trunk/controls/test/dist-test/common/path.properties
incubator/beehive/trunk/controls/test/dist-test/common/run-test-build.xml
incubator/beehive/trunk/controls/test/perf/build.xml
incubator/beehive/trunk/controls/test/tools/mantis/build.xml
incubator/beehive/trunk/controls/test/tools/mantis/mantis.xml
Modified: incubator/beehive/trunk/controls/test/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/build.xml?view=diff&r1=160235&r2=160236
==============================================================================
--- incubator/beehive/trunk/controls/test/build.xml (original)
+++ incubator/beehive/trunk/controls/test/build.xml Tue Apr 5 15:37:23 2005
@@ -32,7 +32,7 @@
<path refid="junit.dependency.path"/>
<path refid="servlet.dependency.path"/>
<pathelement path="${milton.jar}"/>
- <pathelement path="${tch.schema.jar}"/>
+ <pathelement path="${tchx.schema.jar}"/>
<pathelement path="${mantis.jar}"/>
<fileset refid="xbean.fileset"/>
<fileset refid="jsr173.fileset"/>
@@ -81,9 +81,9 @@
<path id="tch.run.classpath">
<!-- todo: there should be a common milton.dependency.path -->
- <pathelement location="${tch.jar}"/>
- <pathelement location="${tch.schema.jar}"/>
- <pathelement location="${tch.xbean.jar}"/>
+ <pathelement location="${tchx.jar}"/>
+ <pathelement location="${tchx.schema.jar}"/>
+ <pathelement location="${tchx.xbean.jar}"/>
<pathelement location="${milton.jar}"/>
<!-- todo: these JARs live in trunk/external and should be moved into
controls/test/external
Modified: incubator/beehive/trunk/controls/test/common/path.properties
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/common/path.properties?view=diff&r1=160235&r2=160236
==============================================================================
--- incubator/beehive/trunk/controls/test/common/path.properties (original)
+++ incubator/beehive/trunk/controls/test/common/path.properties Tue Apr 5
15:37:23 2005
@@ -34,9 +34,9 @@
#locations of built tools
tch.home=${controls.test.infra.dir}/tch
-tch.jar=${tch.home}/tchx.jar
-tch.schema.jar=${tch.home}/schema.jar
-tch.xbean.jar=${tch.home}/xbean-1.0.2.jar
+tchx.jar=${tch.home}/tchx.jar
+tchx.schema.jar=${tch.home}/schema.jar
+tchx.xbean.jar=${tch.home}/xbean-1.0.2.jar
milton.jar=${controls.test.infra.dir}/milton/milton.jar
milton.templates=${controls.test.root}/webapps/common/milton
Modified: incubator/beehive/trunk/controls/test/dist-test/common/path.properties
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/dist-test/common/path.properties?view=diff&r1=160235&r2=160236
==============================================================================
--- incubator/beehive/trunk/controls/test/dist-test/common/path.properties
(original)
+++ incubator/beehive/trunk/controls/test/dist-test/common/path.properties Tue
Apr 5 15:37:23 2005
@@ -13,9 +13,9 @@
#tch is a test util
tch.home=${controls.test.home}/test/infra/tch
-tch.jar=${tch.home}/tchx.jar
-tch.schema.jar=${tch.home}/schema.jar
-tch.xbean.jar=${tch.home}/xbean-1.0.2.jar
+tchx.jar=${tch.home}/tchx.jar
+tchx.schema.jar=${tch.home}/schema.jar
+tchx.xbean.jar=${tch.home}/xbean-1.0.2.jar
milton.jar=${test.home}/controls/test/infra/milton/milton.jar
@@ -28,4 +28,4 @@
mantis.milton.srcgen.dir=${test.home}
mantis.milton.bingen.dir=${test.home}
mantis.milton.log.dir=${test.home}/mantis.milton.logs
-mantis.milton.control.test.units=${mantis.milton.srcgen.dir}/testsrcgen
\ No newline at end of file
+mantis.milton.control.test.units=${mantis.milton.srcgen.dir}/testsrcgen
Modified:
incubator/beehive/trunk/controls/test/dist-test/common/run-test-build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/dist-test/common/run-test-build.xml?view=diff&r1=160235&r2=160236
==============================================================================
--- incubator/beehive/trunk/controls/test/dist-test/common/run-test-build.xml
(original)
+++ incubator/beehive/trunk/controls/test/dist-test/common/run-test-build.xml
Tue Apr 5 15:37:23 2005
@@ -35,9 +35,9 @@
<!-- Inherited from beehive/controls/test/build.xml -->
<path id="tch.run.classpath">
- <pathelement location="${tch.jar}"/>
- <pathelement location="${tch.schema.jar}"/>
- <pathelement location="${tch.xbean.jar}"/>
+ <pathelement location="${tchx.jar}"/>
+ <pathelement location="${tchx.schema.jar}"/>
+ <pathelement location="${tchx.xbean.jar}"/>
<pathelement location="${milton.jar}"/>
<pathelement location="${jakarta.jar}"/>
Modified: incubator/beehive/trunk/controls/test/perf/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/perf/build.xml?view=diff&r1=160235&r2=160236
==============================================================================
--- incubator/beehive/trunk/controls/test/perf/build.xml (original)
+++ incubator/beehive/trunk/controls/test/perf/build.xml Tue Apr 5 15:37:23
2005
@@ -52,7 +52,7 @@
<!-- classpaths -->
<path id="build.classpath">
<path refid="controls.dependency.path"/>
- <pathelement path="${tch.jar}"/>
+ <pathelement path="${tchx.jar}"/>
<!-- todo: there should be a common milton.dependency.path -->
<pathelement path="${milton.jar}"/>
<pathelement path="${httpunit.jar}"/>
@@ -78,8 +78,8 @@
<path refid="velocity.dependency.path"/>
<path refid="ant-all.dependency.path"/>
- <pathelement path="${tch.jar}"/>
- <pathelement path="${tch.schema.jar}"/>
+ <pathelement path="${tchx.jar}"/>
+ <pathelement path="${tchx.schema.jar}"/>
<!-- todo: these JARs live in trunk/external and should be
moved into controls/test/external
they are used only under that sub-directory. there
should also be a common path defined
@@ -94,7 +94,7 @@
<path refid="xbean.dependency.path"/>
<path refid="ant-all.dependency.path"/>
<pathelement path="${control.perf.external}/perf-results.jar"/>
- <pathelement path="${tch.jar}"/>
+ <pathelement path="${tchx.jar}"/>
<pathelement path="${milton.jar}"/>
<pathelement path="${httpunit.jar}"/>
<pathelement path="${control.perf.build}"/>
Modified: incubator/beehive/trunk/controls/test/tools/mantis/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/tools/mantis/build.xml?view=diff&r1=160235&r2=160236
==============================================================================
--- incubator/beehive/trunk/controls/test/tools/mantis/build.xml (original)
+++ incubator/beehive/trunk/controls/test/tools/mantis/build.xml Tue Apr 5
15:37:23 2005
@@ -34,7 +34,7 @@
<!-- CLASSPATHS -->
<!--************-->
<path id="classpath">
- <pathelement path="${tch.schema.jar}"/>
+ <pathelement path="${tchx.schema.jar}"/>
<path refid="xbean.dependency.path"/>
<path refid="ant-jar.dependency.path"/>
<path refid="junit.dependency.path"/>
Modified: incubator/beehive/trunk/controls/test/tools/mantis/mantis.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/tools/mantis/mantis.xml?view=diff&r1=160235&r2=160236
==============================================================================
--- incubator/beehive/trunk/controls/test/tools/mantis/mantis.xml (original)
+++ incubator/beehive/trunk/controls/test/tools/mantis/mantis.xml Tue Apr 5
15:37:23 2005
@@ -26,7 +26,7 @@
<!--************-->
<path id="mantis.run.classpath">
<pathelement path="${mantis.local.deploy.jar}"/>
- <pathelement path="${tch.schema.jar}"/>
+ <pathelement path="${tchx.schema.jar}"/>
<path refid="xbean.dependency.path"/>
<path refid="ant-jar.dependency.path"/>
<path refid="junit.dependency.path"/>
@@ -37,8 +37,8 @@
<path refid="junit.dependency.path"/>
<path refid="xbean.dependency.path"/>
<path refid="ant-all.dependency.path"/>
- <pathelement path="${tch.jar}"/>
- <pathelement path="${tch.schema.jar}"/>
+ <pathelement path="${tchx.jar}"/>
+ <pathelement path="${tchx.schema.jar}"/>
<pathelement path="${jakarta.jar}"/>
<pathelement path="${xerces.jar}"/>
</path>
