Author: jsong
Date: Tue Feb 15 18:37:13 2005
New Revision: 153983
URL: http://svn.apache.org/viewcvs?view=rev&rev=153983
Log:
Contributed by Jamie Zyskowski: remove xbean.jar - no need to have it in svn
Removed:
incubator/beehive/trunk/controls/test/perf/external/xbean.jar
Modified:
incubator/beehive/trunk/controls/test/perf/build.xml
incubator/beehive/trunk/controls/test/perf/webapps/build.xml
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=153982&r2=153983
==============================================================================
--- incubator/beehive/trunk/controls/test/perf/build.xml (original)
+++ incubator/beehive/trunk/controls/test/perf/build.xml Tue Feb 15 18:37:13
2005
@@ -42,6 +42,8 @@
<property name="control.perf.external"
value="${control.perf.root}/external"/>
<property name="cewolf.version" value="cewolf_0_10_1"/>
<property name="cewolf.lib"
value="${control.perf.external}/${cewolf.version}/lib"/>
+ <property name="xmlbeans.version" value="xmlbeans-2.0.0-beta1"/>
+ <property name="xmlbeans.lib"
value="${control.perf.external}/${xmlbeans.version}/lib"/>
<!-- test run configuration (for web-based scenarios) -->
<property name="test.hostname" value="localhost"/>
@@ -127,16 +129,24 @@
</target>
<target name="bootstrap">
+ <!-- get cewolf -->
<mkdir dir="${control.perf.external}"/>
<get
src="http://umn.dl.sourceforge.net/sourceforge/cewolf/${cewolf.version}.zip";
dest="${control.perf.external}/${cewolf.version}.zip"
verbose="true"/>
<mkdir dir="${control.perf.external}/${cewolf.version}"/>
<unzip src="${control.perf.external}/${cewolf.version}.zip"
dest="${control.perf.external}/${cewolf.version}"/>
+
+ <!-- get xmlbeans v2 -->
+ <get
src="http://xmlbeans.apache.org/dist/${xmlbeans.version}.zip";
+
dest="${control.perf.external}/${xmlbeans.version}.zip"
+ verbose="true"/>
+ <unzip src="${control.perf.external}/${xmlbeans.version}.zip"
dest="${control.perf.external}/"/>
</target>
<target name="clean.bootstrap">
<delete dir="${control.perf.external}/${cewolf.version}"/>
+ <delete dir="${control.perf.external}/${xmlbeans.version}"/>
</target>
<target name="build.controls">
Modified: incubator/beehive/trunk/controls/test/perf/webapps/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/perf/webapps/build.xml?view=diff&r1=153982&r2=153983
==============================================================================
--- incubator/beehive/trunk/controls/test/perf/webapps/build.xml (original)
+++ incubator/beehive/trunk/controls/test/perf/webapps/build.xml Tue Feb 15
18:37:13 2005
@@ -26,6 +26,7 @@
<property name="test.port" value="8080"/>
<property name="webapp.waitfor.url"
value="http://${test.hostname}:${test.port}/${webapp.name}"/>
<property name="cewolf.root"
value="${controls.perf.root}/external/cewolf_0_10_1"/>
+ <property name="xmlbeans.root"
value="${controls.perf.root}/external/xmlbeans-2.0.0-beta1"/>
<target name="usage">
<echo message="" />
@@ -130,9 +131,10 @@
<target name="reportWeb.postprocess">
- <!-- HACK: apache-xbean.jar is out of date in beehive so use
local one -->
+ <!-- HACK: until i figure out why the perf-results.jar compiled
by svn-built v2 has a version error against 2.0.0-beta1 -->
+ <!-- may have to just compile perf-results.xsd as part of the
reportWeb build using the beehive xbean jar -->
<delete
file="${webapp.stage.dir}/${webapp.name}/WEB-INF/lib/apache-xbean.jar"/>
- <copy file="${controls.perf.root}/external/xbean.jar"
todir="${webapp.stage.dir}/${webapp.name}/WEB-INF/lib"/>
+ <copy file="${xmlbeans.root}/lib/xbean.jar"
todir="${webapp.stage.dir}/${webapp.name}/WEB-INF/lib"/>
</target>
<target name="clean" description="Clean webapp">
