Author: bryanche
Date: Mon Apr 18 07:41:17 2005
New Revision: 161763
URL: http://svn.apache.org/viewcvs?view=rev&rev=161763
Log:
Remove xbean-1.0.2.jar copies from beehive and use the newer
apache-xbean.jar instead.
drt: pass
run.test.dist: pass
Removed:
incubator/beehive/trunk/controls/test/infra/tch/xbean-1.0.2.jar
incubator/beehive/trunk/controls/test/tools/tch/3rdparty/xbean-1.0.2.jar
Modified:
incubator/beehive/trunk/controls/test/build.xml
incubator/beehive/trunk/controls/test/common/path.properties
incubator/beehive/trunk/controls/test/dist-test/build.xml
incubator/beehive/trunk/controls/test/dist-test/common/controls-test-imports.xml
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/tools/tch/build.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=161762&r2=161763
==============================================================================
--- incubator/beehive/trunk/controls/test/build.xml (original)
+++ incubator/beehive/trunk/controls/test/build.xml Mon Apr 18 07:41:17 2005
@@ -83,7 +83,10 @@
<!-- todo: there should be a common milton.dependency.path -->
<pathelement location="${tchx.jar}"/>
<pathelement location="${tchx.schema.jar}"/>
- <pathelement location="${tchx.xbean.jar}"/>
+ <!-- <pathelement location="${tchx.xbean.jar}"/> -->
+ <fileset refid="xbean.fileset"/>
+ <fileset refid="jsr173.fileset"/>
+
<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=161762&r2=161763
==============================================================================
--- incubator/beehive/trunk/controls/test/common/path.properties (original)
+++ incubator/beehive/trunk/controls/test/common/path.properties Mon Apr 18
07:41:17 2005
@@ -36,7 +36,6 @@
tch.home=${controls.test.infra.dir}/tch
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
@@ -53,7 +52,6 @@
mantis.home=${controls.test.infra.dir}/mantis
mantis.jar=${mantis.home}/mantis.jar
tchschema.jar=${mantis.home}/tchschema.jar
-mantis.xbean.jar=${mantis.home}/xbean-1.0.2.jar
mantis.config=${mantis.home}/mantis.properties
mantis.runtime.basedir=${controls.test.root}
Modified: incubator/beehive/trunk/controls/test/dist-test/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/dist-test/build.xml?view=diff&r1=161762&r2=161763
==============================================================================
--- incubator/beehive/trunk/controls/test/dist-test/build.xml (original)
+++ incubator/beehive/trunk/controls/test/dist-test/build.xml Mon Apr 18
07:41:17 2005
@@ -92,6 +92,15 @@
<include name="*.jar" />
</fileset>
</copy>
+ <!-- xmlbean jars -->
+ <copy
todir="${test.dist.base.dir}/beehive-test-dist/controls/external">
+ <fileset dir="../../../external/xmlbeans">
+ <include name="*.jar" />
+ </fileset>
+ <fileset dir="../../../installed/jsr173">
+ <include name="jsr173_1.0_api.jar" />
+ </fileset>
+ </copy>
<!-- Copy internal tools from controls/test/infra to
beehive-test-dist/controls/test/infra-->
<copy
todir="${test.dist.base.dir}/beehive-test-dist/controls/test/infra">
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=161762&r2=161763
==============================================================================
---
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
Mon Apr 18 07:41:17 2005
@@ -32,6 +32,11 @@
<pathelement location="${test.home}/controls/external/junit.jar"/>
</path>
+ <path id="xbean.dependency.path">
+ <pathelement
location="${test.home}/controls/external/apache-xbean.jar"/>
+ <pathelement
location="${test.home}/controls/external/jsr173_1.0_api.jar"/>
+ </path>
+
<path id="servlet.dependency.path">
<pathelement location="${servlet24.jar}"/>
<pathelement location="${jsp20.jar}"/>
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=161762&r2=161763
==============================================================================
--- incubator/beehive/trunk/controls/test/dist-test/common/path.properties
(original)
+++ incubator/beehive/trunk/controls/test/dist-test/common/path.properties Mon
Apr 18 07:41:17 2005
@@ -20,8 +20,6 @@
tch.home=${controls.test.home}/test/infra/tch
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
jakarta.jar=${test.home}/controls/external/jakarta-regexp-1.2.jar
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=161762&r2=161763
==============================================================================
--- 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
Mon Apr 18 07:41:17 2005
@@ -37,14 +37,14 @@
<pathelement location="${tchx.jar}"/>
<pathelement location="${tchx.schema.jar}"/>
- <pathelement location="${tchx.xbean.jar}"/>
- <pathelement location="${milton.jar}"/>
+ <pathelement location="${milton.jar}"/>
<pathelement location="${jakarta.jar}"/>
<pathelement location="${httpunit.jar}"/>
<pathelement location="${httpunit-xerces.jar}"/>
<pathelement location="${nekohtml.jar}"/>
+ <path refid="xbean.dependency.path"/>
<path refid="ant-all.dependency.path"/>
<path refid="controls.dependency.path"/>
<path refid="velocity.dependency.path"/>
Modified: incubator/beehive/trunk/controls/test/tools/tch/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/tools/tch/build.xml?view=diff&r1=161762&r2=161763
==============================================================================
--- incubator/beehive/trunk/controls/test/tools/tch/build.xml (original)
+++ incubator/beehive/trunk/controls/test/tools/tch/build.xml Mon Apr 18
07:41:17 2005
@@ -18,7 +18,7 @@
<property name="schema.jar.file" location="deploy/schema.jar"/>
<path id="classpath">
- <pathelement path="3rdparty/xbean-1.0.2.jar"/>
+ <path refid="xbean.dependency.path" />
</path>
