arminw 2005/08/27 06:52:00
Modified: . build.xml
Log:
merge 1.x trunk with 1.0.x branch
Revision Changes Path
1.173 +9 -52 db-ojb/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/db-ojb/build.xml,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -r1.172 -r1.173
--- build.xml 27 Aug 2005 12:52:33 -0000 1.172
+++ build.xml 27 Aug 2005 13:52:00 -0000 1.173
@@ -1247,24 +1247,6 @@
</target>
<!-- ==================================================================
-->
- <!-- Performance tests 2 / stress test
-->
- <!-- ==================================================================
-->
- <target name="performance2" depends="prepare-testdb"
- description="Performance benchmark and stress test for PB- and
ODMG-api">
- <java fork="yes" classname="org.apache.ojb.broker.PerformanceTest2"
- dir="${build.test}/ojb" taskname="ojb" failonerror="true" >
- <classpath refid="runtime-classpath"/>
- <arg value="10"/> <!-- performed threads, default was 10 -->
- <arg value="2000"/> <!-- iterations per thread, default
was 2000 -->
- <arg value="false"/> <!-- if 'false' we use autoincrement key
generation, default false -->
- <arg value="7"/> <!-- 1 = PB-test, 2 = ODMG-test, 3 = Both, 4 =
OTM-test, 7 = All three tests, default was 7 -->
- <arg value="3"/> <!-- Number of test loops, default was 3 -->
- <jvmarg value="-Xms128m"/>
- <jvmarg value="-Xmx256m"/>
- </java>
- </target>
-
- <!-- ==================================================================
-->
<!-- failover tests -->
<!-- ==================================================================
-->
<target name="failover"
@@ -1290,23 +1272,17 @@
<java fork="yes" classname="org.apache.ojb.performance.PerfMain"
dir="${build.test}/ojb" taskname="ojb" failonerror="true" >
<classpath refid="runtime-classpath"/>
-
<!-- comma separated list of the PerfTest implementations -->
<arg value=
- "org.apache.ojb.broker.OJBPerfTest$JdbcPerfTest,
- org.apache.ojb.broker.OJBPerfTest$PBPerfTest,
- org.apache.ojb.broker.OJBPerfTest$ODMGPerfTest,
- org.apache.ojb.broker.OJBPerfTest$OTMPerfTest"
+ "org.apache.ojb.compare.OJBPerfTest$JdbcPerfTest,
+ org.apache.ojb.compare.OJBPerfTest$PBPerfTest,
+ org.apache.ojb.compare.OJBPerfTest$ODMGPerfTest,
+ org.apache.ojb.compare.OJBPerfTest$OTMPerfTest"
/>
- <!-- test loops, default was 3 -->
- <arg value="3"/>
- <!-- performed threads, default was 10 -->
- <arg value="10"/>
- <!-- number of managed objects per thread, default was 2000 -->
- <arg value="2000"/>
- <!-- if 'false' we use performance mode, 'true' we do run in
stress mode -->
- <arg value="false"/>
-
+ <arg value="6"/> <!-- test loops, default was 6 -->
+ <arg value="12"/> <!-- performed threads, default was 12 -->
+ <arg value="500"/> <!-- number of managed objects per
thread, default was 500 -->
+ <arg value="false"/> <!-- if 'false' we use performance mode,
'true' we do run in stress mode -->
<jvmarg value="-Xms128m"/>
<jvmarg value="-Xmx256m"/>
</java>
@@ -1342,25 +1318,6 @@
</target>
<!-- ==================================================================
-->
- <!-- Performance tests 3 / stress test multiple db
-->
- <!-- ==================================================================
-->
- <target name="performance3" depends="prepare-testdb"
- description="Stress test for PB- and ODMG-api using multiple
- databases">
- <java fork="yes" classname="org.apache.ojb.broker.PerformanceTest3"
- dir="${build.test}/ojb" taskname="ojb" failonerror="true" >
- <classpath refid="runtime-classpath"/>
- <arg value="5"/> <!-- performed threads, default was 5 -->
- <arg value="100"/> <!-- iterations per thread, default
was 100 -->
- <arg value="false"/> <!-- if 'false' we use autoincrement key
generation, default false -->
- <arg value="3"/> <!-- 1 = PB-test, 2 = ODMG-test, 3 = Both,
default was 3 -->
- <arg value="2"/> <!-- Number of test loops, default was 3 -->
- <jvmarg value="-Xms128m"/>
- <jvmarg value="-Xmx256m"/>
- </java>
- </target>
-
- <!-- ==================================================================
-->
<!-- Browse Demo Database
-->
<!-- ==================================================================
-->
<target name="browse-db" depends="init"
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
