[jbosscache-commits] JBoss Cache SVN: r6291 - in benchmarks/benchmark-fwk/trunk: cache-products and 7 other directories.
jbosscache-commits at lists.jboss.org
jbosscache-commits at lists.jboss.org
Wed Jul 16 08:04:48 EDT 2008
Author: mircea.markus
Date: 2008-07-16 08:04:48 -0400 (Wed, 16 Jul 2008)
New Revision: 6291
Added:
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-async-br.xml
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-async.xml
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-sync-br.xml
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-sync.xml
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-local.xml
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-async-br.xml
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-async.xml
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-sync-br.xml
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-sync.xml
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/config.sh
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib/
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib/commons-codec.jar
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib/jboss-common-core.jar
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib/jboss-logging-spi.jar
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib/jcip-annotations.jar
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib/jgroups.jar
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/src/
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/src/org/
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/src/org/cachebench/
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/src/org/cachebench/cachewrappers/
benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/src/org/cachebench/cachewrappers/JBossCache300Wrapper.java
Modified:
benchmarks/benchmark-fwk/trunk/build.xml
Log:
added support for jbc3x and simplified the build file
Modified: benchmarks/benchmark-fwk/trunk/build.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/build.xml 2008-07-16 09:28:37 UTC (rev 6290)
+++ benchmarks/benchmark-fwk/trunk/build.xml 2008-07-16 12:04:48 UTC (rev 6291)
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<project name="cachebenchfwk" default="help">
+<project name="cachebenchfwk" default="help" basedir=".">
<property file="build.properties"/>
@@ -12,68 +12,17 @@
<property name="compiler.debug" value="on"/>
<property name="compiler.generate.no.warnings" value="off"/>
- <property name="compiler.args" value=""/>
- <property name="compiler.max.memory" value="128m"/>
- <patternset id="ignored.files">
- <exclude name="**/CVS/**"/>
- <exclude name="**/SCCS/**"/>
- <exclude name="**/RCS/**"/>
- <exclude name="**/rcs/**"/>
- <exclude name="**/.DS_Store/**"/>
- <exclude name="**/.svn/**"/>
- <exclude name="**/.sbas/**"/>
- <exclude name="**/.IJI.*/**"/>
- </patternset>
- <patternset id="compiler.resources">
- <include name="**/?*.properties"/>
- <include name="**/?*.xml"/>
- <include name="**/?*.gif"/>
- <include name="**/?*.png"/>
- <include name="**/?*.jpeg"/>
- <include name="**/?*.jpg"/>
- <include name="**/?*.html"/>
- <include name="**/?*.dtd"/>
- <include name="**/?*.tld"/>
- </patternset>
- <!-- Modules -->
-
-
- <!-- Module Framework -->
-
- <dirname property="module.framework.basedir" file="${ant.file}"/>
-
<property environment="env"/>
- <property name="compiler.args.framework" value="${compiler.args}"/>
+ <property name="framework.output.dir" value="./classes/production/Framework"/>
- <property name="framework.output.dir" value="${module.framework.basedir}/classes/production/Framework"/>
- <property name="framework.testoutput.dir" value="${module.framework.basedir}/classes/test/Framework"/>
-
- <path id="framework.module.bootclasspath">
- <!-- Paths to be included in compilation bootclasspath -->
- </path>
-
<path id="framework.module.classpath">
- <fileset dir="${module.framework.basedir}/lib" includes="**/*.jar"/>
- <pathelement location="${module.framework.basedir}/conf"/>
+ <fileset dir="./lib" includes="**/*.jar"/>
+ <pathelement location="./conf"/>
</path>
- <patternset id="excluded.from.module.framework">
- <patternset refid="ignored.files"/>
- </patternset>
-
- <patternset id="excluded.from.compilation.framework">
- <patternset refid="excluded.from.module.framework"/>
- </patternset>
-
- <path id="framework.module.sourcepath">
- <dirset dir="${module.framework.basedir}">
- <include name="src"/>
- </dirset>
- </path>
-
<target name="help" description="Dumps usage information">
<echo>
This script has the purpose of building the CacheBenchFwk.
@@ -121,509 +70,158 @@
</target>
- <target name="compile.module.framework" depends="compile.module.framework.production,compile.module.framework.tests"
- description="Compile module Framework"/>
-
- <target name="compile.module.framework.production" description="Compile module Framework; production classes">
+ <target name="compile.module.framework" description="Compile module Framework">
<mkdir dir="${framework.output.dir}"/>
<javac destdir="${framework.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}"
- memorymaximumsize="${compiler.max.memory}" fork="true">
- <compilerarg line="${compiler.args.framework}"/>
- <bootclasspath refid="framework.module.bootclasspath"/>
+ fork="true">
<classpath refid="framework.module.classpath"/>
- <src refid="framework.module.sourcepath"/>
- <patternset refid="excluded.from.compilation.framework"/>
+ <src path="./src"/>
</javac>
-
- <copy todir="${framework.output.dir}">
- <fileset dir="${module.framework.basedir}/src">
- <patternset refid="compiler.resources"/>
- <type type="file"/>
- </fileset>
- </copy>
</target>
- <target name="compile.module.framework.tests" depends="compile.module.framework.production"
- description="compile module Framework; test classes" unless="skip.tests"/>
-
-
- <!-- Module ehcache-1.4.1 -->
-
- <dirname property="module.ehcache141-plugin.basedir" file="${ant.file}"/>
-
-
- <property name="compiler.args.ehcache141-plugin" value="${compiler.args}"/>
-
- <property name="ehcache141-plugin.output.dir"
- value="${module.ehcache141-plugin.basedir}/classes/production/ehcache-1.4.1"/>
- <property name="ehcache141-plugin.testoutput.dir"
- value="${module.ehcache141-plugin.basedir}/classes/test/ehcache-1.4.1"/>
-
- <path id="ehcache141-plugin.module.bootclasspath">
- <!-- Paths to be included in compilation bootclasspath -->
- </path>
-
- <path id="ehcache141-plugin.module.classpath">
- <fileset dir="${module.ehcache141-plugin.basedir}/cache-products/ehcache-1.4.1/lib" includes="*.jar"/>
- <pathelement location="${module.ehcache141-plugin.basedir}/cache-products/ehcache-1.4.1/conf"/>
- <pathelement location="${framework.output.dir}"/>
- <pathelement location="${framework.testoutput.dir}"/>
- <pathelement location="${ehcache141-plugin.output.dir}"/>
- </path>
-
-
- <patternset id="excluded.from.module.ehcache141-plugin">
- <patternset refid="ignored.files"/>
- </patternset>
-
- <patternset id="excluded.from.compilation.ehcache141-plugin">
- <patternset refid="excluded.from.module.ehcache141-plugin"/>
- </patternset>
-
- <path id="ehcache141-plugin.module.sourcepath">
- <dirset dir="${module.ehcache141-plugin.basedir}/cache-products/ehcache-1.4.1">
- <include name="src"/>
- </dirset>
- </path>
-
-
- <target name="compile.module.ehcache141-plugin"
- depends="compile.module.ehcache141-plugin.production,compile.module.ehcache141-plugin.tests"
- description="Compile module ehcache-1.4.1"/>
-
- <target name="compile.module.ehcache141-plugin.production" depends="compile.module.framework"
+ <target name="compile.module.ehcache141" depends="compile.module.framework"
description="Compile module ehcache-1.4.1; production classes">
- <mkdir dir="${ehcache141-plugin.output.dir}"/>
- <javac destdir="${ehcache141-plugin.output.dir}" debug="${compiler.debug}"
- nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true">
- <compilerarg line="${compiler.args.ehcache141-plugin}"/>
- <bootclasspath refid="ehcache141-plugin.module.bootclasspath"/>
- <classpath refid="ehcache141-plugin.module.classpath"/>
- <src refid="ehcache141-plugin.module.sourcepath"/>
- <patternset refid="excluded.from.compilation.ehcache141-plugin"/>
+ <mkdir dir="./classes/production/ehcache-1.4.1"/>
+ <javac destdir="./classes/production/ehcache-1.4.1" debug="${compiler.debug}"
+ nowarn="${compiler.generate.no.warnings}" fork="true">
+ <classpath>
+ <fileset dir="./cache-products/ehcache-1.4.1/lib" includes="*.jar"/>
+ <pathelement location="./cache-products/ehcache-1.4.1/conf"/>
+ <pathelement location="${framework.output.dir}"/>
+ <pathelement location="./classes/production/ehcache-1.4.1"/>
+ </classpath>
+ <src path="./cache-products/ehcache-1.4.1/src"/>
</javac>
-
- <copy todir="${ehcache141-plugin.output.dir}">
- <fileset dir="${module.ehcache141-plugin.basedir}/cache-products/ehcache-1.4.1/src">
- <patternset refid="compiler.resources"/>
- <type type="file"/>
- </fileset>
- </copy>
</target>
- <target name="compile.module.ehcache141-plugin.tests" depends="compile.module.ehcache141-plugin.production"
- description="compile module ehcache-1.4.1; test classes" unless="skip.tests"/>
-
-
- <!-- Module coherence-3.2.2 -->
-
- <dirname property="module.coherence322-plugin.basedir" file="${ant.file}"/>
-
-
- <property name="compiler.args.coherence322-plugin" value="${compiler.args}"/>
-
- <property name="coherence322-plugin.output.dir"
- value="${module.coherence322-plugin.basedir}/classes/production/coherence-3.2.2"/>
- <property name="coherence322-plugin.testoutput.dir"
- value="${module.coherence322-plugin.basedir}/classes/test/coherence-3.2.2"/>
-
- <path id="coherence322-plugin.module.bootclasspath">
- <!-- Paths to be included in compilation bootclasspath -->
- </path>
-
- <path id="coherence322-plugin.module.classpath">
- <fileset dir="${module.coherence322-plugin.basedir}/cache-products/coherence-3.2.2/lib" includes="*.jar"/>
- <pathelement location="${module.coherence322-plugin.basedir}/cache-products/coherence-3.2.2/conf"/>
- <pathelement location="${framework.output.dir}"/>
- <pathelement location="${framework.testoutput.dir}"/>
- <pathelement location="${coherence322-plugin.output.dir}"/>
- </path>
-
-
- <patternset id="excluded.from.module.coherence322-plugin">
- <patternset refid="ignored.files"/>
- </patternset>
-
- <patternset id="excluded.from.compilation.coherence322-plugin">
- <patternset refid="excluded.from.module.coherence322-plugin"/>
- </patternset>
-
- <path id="coherence322-plugin.module.sourcepath">
- <dirset dir="${module.ehcache141-plugin.basedir}/cache-products/coherence-3.2.2">
- <include name="src"/>
- </dirset>
- </path>
-
-
- <target name="compile.module.coherence322-plugin"
- depends="compile.module.coherence322-plugin.production, compile.module.coherence322-plugin.tests"
- description="Compile module coherence322"/>
-
- <target name="compile.module.coherence322-plugin.production" depends="compile.module.framework"
+ <target name="compile.module.coherence322" depends="compile.module.framework"
description="Compile module coherence322; production classes">
- <mkdir dir="${coherence322-plugin.output.dir}"/>
- <javac destdir="${coherence322-plugin.output.dir}" debug="${compiler.debug}"
- nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true">
- <compilerarg line="${compiler.args.coherence322-plugin}"/>
- <bootclasspath refid="coherence322-plugin.module.bootclasspath"/>
- <classpath refid="coherence322-plugin.module.classpath"/>
- <src refid="coherence322-plugin.module.sourcepath"/>
- <patternset refid="excluded.from.compilation.coherence322-plugin"/>
+ <mkdir dir="./classes/production/coherence-3.2.2"/>
+ <javac destdir="./classes/production/coherence-3.2.2" debug="${compiler.debug}"
+ nowarn="${compiler.generate.no.warnings}" fork="true">
+ <classpath>
+ <fileset dir="./cache-products/coherence-3.2.2/lib" includes="*.jar"/>
+ <pathelement location="./cache-products/coherence-3.2.2/conf"/>
+ <pathelement location="${framework.output.dir}"/>
+ <pathelement location="./classes/production/coherence-3.2.2"/>
+ </classpath>
+ <src path="./cache-products/coherence-3.2.2"/>
</javac>
-
- <copy todir="${coherence322-plugin.output.dir}">
- <fileset dir="${module.coherence322-plugin.basedir}/cache-products/coherence-3.2.2/src">
- <patternset refid="compiler.resources"/>
- <type type="file"/>
- </fileset>
- </copy>
</target>
- <target name="compile.module.coherence322-plugin.tests" depends="compile.module.coherence322-plugin.production"
- description="compile module coherence322; test classes" unless="skip.tests"/>
-
- <target name="clean.module.coherence322-plugin" description="cleanup module">
- <delete dir="${coherence322-plugin.output.dir}"/>
- <delete dir="${coherence322-plugin.testoutput.dir}"/>
- </target>
-
- <!-- Module terracotta-2.5.0 -->
-
- <dirname property="module.terracotta-plugin.basedir" file="${ant.file}"/>
-
-
- <property name="compiler.args.terracotta-plugin" value="${compiler.args}"/>
-
- <property name="terracotta-plugin.output.dir"
- value="${module.terracotta-plugin.basedir}/classes/production/terracotta-2.5.0"/>
- <property name="terracotta-plugin.testoutput.dir"
- value="${module.terracotta-plugin.basedir}/classes/test/terracotta-2.5.0"/>
-
- <path id="terracotta-plugin.module.bootclasspath">
- <!-- Paths to be included in compilation bootclasspath -->
- </path>
-
- <path id="terracotta-plugin.module.classpath">
- <pathelement location="${module.terracotta-plugin.basedir}/cache-products/terracotta-2.5.0/conf"/>
- <pathelement location="${framework.output.dir}"/>
- <pathelement location="${framework.testoutput.dir}"/>
- <pathelement location="${terracotta-plugin.output.dir}"/>
- </path>
-
-
- <patternset id="excluded.from.module.terracotta-plugin">
- <patternset refid="ignored.files"/>
- </patternset>
-
- <patternset id="excluded.from.compilation.terracotta-plugin">
- <patternset refid="excluded.from.module.terracotta-plugin"/>
- </patternset>
-
- <path id="terracotta-plugin.module.sourcepath">
- <dirset dir="${module.terracotta-plugin.basedir}/cache-products/terracotta-2.5.0">
- <include name="src"/>
- </dirset>
- </path>
-
-
- <target name="compile.module.terracotta-plugin"
- depends="compile.module.terracotta-plugin.production,compile.module.terracotta-plugin.tests"
- description="Compile module terracotta-2.5.0"/>
-
- <target name="compile.module.terracotta-plugin.production" depends="compile.module.framework"
+ <target name="compile.module.terracotta250" depends="compile.module.framework"
description="Compile module terracotta-2.5.0; production classes">
- <mkdir dir="${terracotta-plugin.output.dir}"/>
- <javac destdir="${terracotta-plugin.output.dir}" debug="${compiler.debug}"
- nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true">
- <compilerarg line="${compiler.args.terracotta-plugin}"/>
- <bootclasspath refid="terracotta-plugin.module.bootclasspath"/>
- <classpath refid="terracotta-plugin.module.classpath"/>
- <src refid="terracotta-plugin.module.sourcepath"/>
- <patternset refid="excluded.from.compilation.terracotta-plugin"/>
+ <mkdir dir="./classes/production/terracotta-2.5.0"/>
+ <javac destdir="./classes/production/terracotta-2.5.0" debug="${compiler.debug}"
+ nowarn="${compiler.generate.no.warnings}" fork="true">
+ <classpath>
+ <pathelement location="./cache-products/terracotta-2.5.0/conf"/>
+ <pathelement location="${framework.output.dir}"/>
+ <pathelement location="./classes/production/terracotta-2.5.0"/>
+ </classpath>
+ <src path="./cache-products/terracotta-2.5.0/src"/>
</javac>
-
- <copy todir="${terracotta-plugin.output.dir}">
- <fileset dir="${module.terracotta-plugin.basedir}/cache-products/terracotta-2.5.0/src">
- <patternset refid="compiler.resources"/>
- <type type="file"/>
- </fileset>
- </copy>
</target>
- <target name="compile.module.terracotta-plugin.tests" depends="compile.module.terracotta-plugin.production"
- description="compile module terracotta-2.5.0; test classes" unless="skip.tests"/>
-
- <target name="clean.module.terracotta-plugin" description="cleanup module">
- <delete dir="${terracotta-plugin.output.dir}"/>
- <delete dir="${terracotta-plugin.testoutput.dir}"/>
- </target>
-
-
- <!-- Module whirlycache-1.0.1 -->
-
- <dirname property="module.whirlycache101-plugin.basedir" file="${ant.file}"/>
-
-
- <property name="compiler.args.whirlycache101-plugin" value="${compiler.args}"/>
-
- <property name="whirlycache101-plugin.output.dir"
- value="${module.whirlycache101-plugin.basedir}/classes/production/whirlycache-1.0.1"/>
- <property name="whirlycache101-plugin.testoutput.dir"
- value="${module.whirlycache101-plugin.basedir}/classes/test/whirlycache-1.0.1"/>
-
- <path id="whirlycache101-plugin.module.bootclasspath">
- <!-- Paths to be included in compilation bootclasspath -->
- </path>
-
- <path id="whirlycache101-plugin.module.classpath">
- <fileset dir="${module.whirlycache101-plugin.basedir}/cache-products/whirlycache-1.0.1/lib" includes="**/*.jar"/>
- <pathelement location="${framework.output.dir}"/>
- <pathelement location="${framework.testoutput.dir}"/>
- <pathelement location="${whirlycache101-plugin.output.dir}"/>
- <pathelement location="${module.whirlycache101-plugin.basedir}/cache-products/whirlycache-1.0.1/conf"/>
- </path>
-
-
- <patternset id="excluded.from.module.whirlycache101-plugin">
- <patternset refid="ignored.files"/>
- </patternset>
-
- <patternset id="excluded.from.compilation.whirlycache101-plugin">
- <patternset refid="excluded.from.module.whirlycache101-plugin"/>
- </patternset>
-
- <path id="whirlycache101-plugin.module.sourcepath">
- <dirset dir="${module.whirlycache101-plugin.basedir}/cache-products/whirlycache-1.0.1">
- <include name="src"/>
- </dirset>
- </path>
-
-
- <target name="compile.module.whirlycache101-plugin"
- depends="compile.module.whirlycache101-plugin.production,compile.module.whirlycache101-plugin.tests"
- description="Compile module whirlycache-1.0.1"/>
-
- <target name="compile.module.whirlycache101-plugin.production" depends="compile.module.framework"
- description="Compile module whirlycache-1.0.1; production classes">
- <mkdir dir="${whirlycache101-plugin.output.dir}"/>
- <javac destdir="${whirlycache101-plugin.output.dir}" debug="${compiler.debug}"
- nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true">
- <compilerarg line="${compiler.args.whirlycache101-plugin}"/>
- <bootclasspath refid="whirlycache101-plugin.module.bootclasspath"/>
- <classpath refid="whirlycache101-plugin.module.classpath"/>
- <src refid="whirlycache101-plugin.module.sourcepath"/>
- <patternset refid="excluded.from.compilation.whirlycache101-plugin"/>
- </javac>
-
- <copy todir="${whirlycache101-plugin.output.dir}">
- <fileset dir="${module.whirlycache101-plugin.basedir}/cache-products/whirlycache-1.0.1/src">
- <patternset refid="compiler.resources"/>
- <type type="file"/>
- </fileset>
- </copy>
- </target>
-
- <target name="compile.module.whirlycache101-plugin.tests" depends="compile.module.whirlycache101-plugin.production"
- description="compile module whirlycache-1.0.1; test classes" unless="skip.tests"/>
-
- <!-- Module jbosscache-1.4.1 -->
-
- <dirname property="module.jbosscache140-plugin.basedir" file="${ant.file}"/>
-
-
- <property name="compiler.args.jbosscache140-plugin" value="${compiler.args}"/>
-
- <property name="jbosscache140-plugin.output.dir"
- value="${module.jbosscache140-plugin.basedir}/classes/production/jbosscache-1.4.1"/>
- <property name="jbosscache140-plugin.testoutput.dir"
- value="${module.jbosscache140-plugin.basedir}/classes/test/jbosscache-1.4.1"/>
-
- <path id="jbosscache140-plugin.module.bootclasspath">
- <!-- Paths to be included in compilation bootclasspath -->
- </path>
-
- <path id="jbosscache140-plugin.module.classpath">
- <fileset dir="${module.jbosscache140-plugin.basedir}/cache-products/jbosscache-1.4.1/lib" includes="**/*.jar"/>
- <pathelement location="${framework.output.dir}"/>
- <pathelement location="${framework.testoutput.dir}"/>
- <pathelement location="${jbosscache140-plugin.output.dir}"/>
- <pathelement location="${module.jbosscache140-plugin.basedir}/cache-products/jbosscache-1.4.1/conf"/>
- </path>
-
-
- <patternset id="excluded.from.module.jbosscache140-plugin">
- <patternset refid="ignored.files"/>
- </patternset>
-
- <patternset id="excluded.from.compilation.jbosscache140-plugin">
- <patternset refid="excluded.from.module.jbosscache140-plugin"/>
- </patternset>
-
- <path id="jbosscache140-plugin.module.sourcepath">
- <dirset dir="${module.jbosscache140-plugin.basedir}/cache-products/jbosscache-1.4.1">
- <include name="src"/>
- </dirset>
- </path>
-
-
- <target name="compile.module.jbosscache140-plugin"
- depends="compile.module.jbosscache140-plugin.production,compile.module.jbosscache140-plugin.tests"
- description="Compile module jbosscache-1.4.1"/>
-
- <target name="compile.module.jbosscache140-plugin.production" depends="compile.module.framework"
+ <target name="compile.module.jbosscache140" depends="compile.module.framework"
description="Compile module jbosscache-1.4.1; production classes">
- <mkdir dir="${jbosscache140-plugin.output.dir}"/>
- <javac destdir="${jbosscache140-plugin.output.dir}" debug="${compiler.debug}"
- nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true">
- <compilerarg line="${compiler.args.jbosscache140-plugin}"/>
- <bootclasspath refid="jbosscache140-plugin.module.bootclasspath"/>
- <classpath refid="jbosscache140-plugin.module.classpath"/>
- <src refid="jbosscache140-plugin.module.sourcepath"/>
- <patternset refid="excluded.from.compilation.jbosscache140-plugin"/>
+ <mkdir dir="./classes/production/jbosscache-1.4.1"/>
+ <javac destdir="./classes/production/jbosscache-1.4.1" debug="${compiler.debug}"
+ nowarn="${compiler.generate.no.warnings}" fork="true">
+ <classpath>
+ <fileset dir="./cache-products/jbosscache-1.4.1/lib" includes="**/*.jar"/>
+ <pathelement location="${framework.output.dir}"/>
+ </classpath>
+ <src>
+ <dirset dir="./cache-products/jbosscache-1.4.1">
+ <include name="src"/>
+ </dirset>
+ </src>
</javac>
-
- <copy todir="${jbosscache140-plugin.output.dir}">
- <fileset dir="${module.jbosscache140-plugin.basedir}/cache-products/jbosscache-1.4.1/src">
- <patternset refid="compiler.resources"/>
- <type type="file"/>
- </fileset>
- </copy>
</target>
- <target name="compile.module.jbosscache140-plugin.tests" depends="compile.module.jbosscache140-plugin.production"
- description="compile module jbosscache-1.4.1; test classes" unless="skip.tests"/>
-
- <!-- Module jbosscache-2.0.0 -->
-
- <dirname property="module.jbosscache200-plugin.basedir" file="${ant.file}"/>
- <dirname property="module.jbosscache210-plugin.basedir" file="${ant.file}"/>
- <dirname property="module.jbosscache220-plugin.basedir" file="${ant.file}"/>
-
-
- <property name="compiler.args.jbosscache200-plugin" value="${compiler.args}"/>
-
- <property name="jbosscache200-plugin.output.dir"
- value="${module.jbosscache200-plugin.basedir}/classes/production/jbosscache-2.0.0"/>
- <property name="jbosscache210-plugin.output.dir"
- value="${module.jbosscache210-plugin.basedir}/classes/production/jbosscache-2.1.0"/>
- <property name="jbosscache220-plugin.output.dir"
- value="${module.jbosscache220-plugin.basedir}/classes/production/jbosscache-2.2.0"/>
- <property name="jbosscache200-plugin.testoutput.dir"
- value="${module.jbosscache200-plugin.basedir}/classes/test/jbosscache-2.0.0"/>
-
- <path id="jbosscache200-plugin.module.bootclasspath">
- <!-- Paths to be included in compilation bootclasspath -->
- </path>
-
- <path id="jbosscache200-plugin.module.classpath">
- <fileset dir="${module.jbosscache200-plugin.basedir}/cache-products/jbosscache-2.0.0/lib" includes="*.jar"/>
- <pathelement location="${module.jbosscache200-plugin.basedir}/cache-products/jbosscache-2.0.0/conf"/>
- <pathelement location="${module.framework.basedir}/lib/commons-logging.jar"/>
- <pathelement location="${framework.output.dir}"/>
- <pathelement location="${framework.testoutput.dir}"/>
- <pathelement location="${jbosscache200-plugin.output.dir}"/>
- </path>
-
- <path id="jbosscache210-plugin.module.classpath">
- <fileset dir="${module.jbosscache210-plugin.basedir}/cache-products/jbosscache-2.1.0/lib" includes="*.jar"/>
- <pathelement location="${module.framework.basedir}/lib/commons-logging.jar"/>
- <pathelement location="${framework.output.dir}"/>
- <pathelement location="${framework.testoutput.dir}"/>
- <pathelement location="${jbosscache210-plugin.output.dir}"/>
- </path>
-
- <path id="jbosscache220-plugin.module.classpath">
- <fileset dir="${module.jbosscache220-plugin.basedir}/cache-products/jbosscache-2.2.0/lib" includes="*.jar"/>
- <pathelement location="${module.framework.basedir}/lib/commons-logging.jar"/>
- <pathelement location="${framework.output.dir}"/>
- <pathelement location="${framework.testoutput.dir}"/>
- <pathelement location="${jbosscache220-plugin.output.dir}"/>
- </path>
-
-
- <patternset id="excluded.from.module.jbosscache200-plugin">
- <patternset refid="ignored.files"/>
- </patternset>
-
- <patternset id="excluded.from.compilation.jbosscache200-plugin">
- <patternset refid="excluded.from.module.jbosscache200-plugin"/>
- </patternset>
-
- <path id="jbosscache200-plugin.module.sourcepath">
- <dirset dir="${module.jbosscache200-plugin.basedir}/cache-products/jbosscache-2.0.0">
- <include name="src"/>
- </dirset>
- </path>
-
-
- <target name="compile.module.jbosscache200-plugin"
- depends="compile.module.jbosscache200-plugin.production,compile.module.jbosscache200-plugin.tests"
- description="Compile module jbosscache-2.0.0"/>
-
- <target name="compile.module.jbosscache200-plugin.production" depends="compile.module.framework"
- description="Compile module jbosscache-2.0.0; production classes">
- <mkdir dir="${jbosscache200-plugin.output.dir}"/>
- <javac destdir="${jbosscache200-plugin.output.dir}" debug="${compiler.debug}"
- nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true">
- <compilerarg line="${compiler.args}"/>
- <bootclasspath refid="jbosscache200-plugin.module.bootclasspath"/>
- <classpath refid="jbosscache200-plugin.module.classpath"/>
- <src refid="jbosscache200-plugin.module.sourcepath"/>
- <patternset refid="excluded.from.compilation.jbosscache200-plugin"/>
+ <target name="compile.module.jbosscache200" depends="compile.module.framework"
+ description="Compile module jbosscache-2.0.0">
+ <mkdir dir="./classes/production/jbosscache-2.0.0"/>
+ <javac destdir="./classes/production/jbosscache-2.0.0" debug="${compiler.debug}"
+ nowarn="${compiler.generate.no.warnings}" fork="true">
+ <classpath>
+ <fileset dir="./cache-products/jbosscache-2.0.0/lib" includes="*.jar"/>
+ <pathelement location="./lib/commons-logging.jar"/>
+ <pathelement location="${framework.output.dir}"/>
+ </classpath>
+ <src path="./cache-products/jbosscache-2.0.0/src"/>
</javac>
-
- <copy todir="${jbosscache200-plugin.output.dir}">
- <fileset dir="${module.jbosscache200-plugin.basedir}/cache-products/jbosscache-2.0.0/src">
- <patternset refid="compiler.resources"/>
- <type type="file"/>
- </fileset>
- </copy>
</target>
- <target name="compile.module.jbosscache210-plugin.production" depends="compile.module.framework"
+ <target name="compile.module.jbosscache210" depends="compile.module.framework"
description="Compile module jbosscache-2.1.0cr2; production classes">
- <mkdir dir="${jbosscache210-plugin.output.dir}"/>
- <javac destdir="${jbosscache210-plugin.output.dir}" debug="${compiler.debug}"
- nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true">
- <compilerarg line="${compiler.args}"/>
- <classpath refid="jbosscache210-plugin.module.classpath"/>
- <src path="${module.jbosscache210-plugin.basedir}/cache-products/jbosscache-2.1.0"/>
+ <mkdir dir="./classes/production/jbosscache-2.1.0"/>
+ <javac destdir="./classes/production/jbosscache-2.1.0" debug="${compiler.debug}"
+ nowarn="${compiler.generate.no.warnings}" fork="true">
+ <classpath>
+ <fileset dir="./cache-products/jbosscache-2.1.0/lib" includes="*.jar"/>
+ <pathelement location="./lib/commons-logging.jar"/>
+ <pathelement location="${framework.output.dir}"/>
+ </classpath>
+ <src path="./cache-products/jbosscache-2.1.0/src"/>
</javac>
</target>
- <target name="compile.module.jbosscache220-plugin.production" depends="compile.module.framework"
+ <target name="compile.module.jbosscache220" depends="compile.module.framework"
description="Compile module jbosscache-2.2.0; production classes">
- <mkdir dir="${jbosscache220-plugin.output.dir}"/>
- <javac destdir="${jbosscache220-plugin.output.dir}" debug="${compiler.debug}"
- nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true">
- <compilerarg line="${compiler.args}"/>
- <classpath refid="jbosscache220-plugin.module.classpath"/>
- <src path="${module.jbosscache220-plugin.basedir}/cache-products/jbosscache-2.2.0"/>
+ <mkdir dir="./classes/production/jbosscache-2.2.0"/>
+ <javac destdir="./classes/production/jbosscache-2.2.0" debug="${compiler.debug}"
+ nowarn="${compiler.generate.no.warnings}" fork="true">
+ <classpath>
+ <fileset dir="./cache-products/jbosscache-2.2.0/lib" includes="*.jar"/>
+ <pathelement location="./lib/commons-logging.jar"/>
+ <pathelement location="${framework.output.dir}"/>
+ </classpath>
+ <src path="./cache-products/jbosscache-2.2.0/src"/>
</javac>
</target>
- <target name="compile.module.jbosscache200-plugin.tests" depends="compile.module.jbosscache200-plugin.production"
- description="compile module jbosscache-2.0.0; test classes" unless="skip.tests"/>
+ <target name="compile.module.whirlycache101" depends="compile.module.framework"
+ description="Compile module whirlycache-1.0.1; production classes">
+ <mkdir dir="./classes/production/whirlycache-1.0.1"/>
+ <javac destdir="./classes/production/whirlycache-1.0.1" debug="${compiler.debug}"
+ nowarn="${compiler.generate.no.warnings}" fork="true">
+ <classpath>
+ <fileset dir="./cache-products/whirlycache-1.0.1/lib" includes="**/*.jar"/>
+ <pathelement location="${framework.output.dir}"/>
+ </classpath>
+ <src path="./cache-products/whirlycache-1.0.1/src"/>
+ </javac>
+ </target>
-
- <target name="init" description="Build initialization">
- <!-- Perform any build initialization in this target -->
+ <target name="compile.module.jbosscache300" depends="compile.module.framework"
+ description="Compile module jbosscache-3.0.0">
+ <mkdir dir="./classes/production/jbosscache-3.0.0"/>
+ <javac destdir="./classes/production/jbosscache-3.0.0" debug="${compiler.debug}"
+ nowarn="${compiler.generate.no.warnings}" fork="true">
+ <classpath>
+ <fileset dir="./cache-products/jbosscache-3.0.0/lib" includes="*.jar"/>
+ <pathelement location="./lib/commons-logging.jar"/>
+ <pathelement location="${framework.output.dir}"/>
+ </classpath>
+ <src path="./cache-products/jbosscache-3.0.0/src"/>
+ </javac>
</target>
<target name="clean" description="cleanup all">
- <delete dir="${module.framework.basedir}/classes"/>
+ <delete dir="./classes"/>
</target>
<target name="all"
- depends="init, clean, compile.module.framework, compile.module.whirlycache101-plugin.production, compile.module.ehcache141-plugin.production, compile.module.jbosscache140-plugin, compile.module.jbosscache200-plugin, compile.module.jbosscache210-plugin.production, compile.module.jbosscache220-plugin.production, compile.module.terracotta-plugin"
+ depends="clean, compile.module.framework, compile.module.jbosscache140, compile.module.jbosscache200, compile.module.jbosscache210, compile.module.jbosscache220, compile.module.terracotta250, compile.module.ehcache141, compile.module.whirlycache101, compile.module.jbosscache300"
description="build all"/>
- <target name="checkClusterAddresses" depends="compile.module.framework.production"
+ <target name="checkClusterAddresses" depends="compile.module.framework"
description="Check whether the cluster config is a valid one">
<java classname="org.cachebench.ClusterConfigurationCheck" clonevm="true" fork="true">
<classpath>
<pathelement location="${framework.output.dir}"/>
- <pathelement location="${framework.testoutput.dir}"/>
</classpath>
<classpath refid="framework.module.classpath"/>
</java>
Added: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-async-br.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-async-br.xml (rev 0)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-async-br.xml 2008-07-16 12:04:48 UTC (rev 6291)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbosscache>
+ <locking lockAcquisitionTimeout="10000" nodeLockingScheme="Optimistic"/>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <stateRetrieval timeout="20000"/>
+ <transport clusterName="JBossCache-Cluster">
+ <jgroupsConfig>
+ <TCP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false"
+ enable_unicast_bundling="false" loopback="false" max_bundle_size="64000" max_bundle_timeout="30"
+ oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4"
+ oob_thread_pool.min_threads="2" oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="10"
+ oob_thread_pool.rejection_policy="Run" recv_buf_size="20000000" thread_naming_pattern="pl"
+ thread_pool.enabled="true" thread_pool.keep_alive_time="30000" thread_pool.max_threads="4"
+ thread_pool.min_threads="1" thread_pool.queue_enabled="true" thread_pool.queue_max_size="50000"
+ thread_pool.rejection_policy="discard" use_concurrent_stack="true" use_incoming_packet_handler="true"
+ use_send_queues="false"/>
+ <MPING mcast_addr="232.1.2.3" num_initial_members="3" timeout="2000"/>
+ <MERGE2 max_interval="30000" min_interval="10000"/>
+ <FD_SOCK/>
+ <FD max_tries="5" shun="true" timeout="10000"/>
+ <VERIFY_SUSPECT timeout="1500"/>
+ <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800"
+ use_mcast_xmit="false"/>
+ <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/>
+ <pbcast.GMS join_retry_timeout="2000" join_timeout="5000" print_local_addr="true" shun="false"
+ view_ack_collection_timeout="5000" view_bundling="true"/>
+ <FC max_credits="5000000" min_threshold="0.20"/>
+ <FRAG2 frag_size="60000"/>
+ <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
+ <pbcast.FLUSH timeout="0"/>
+ </jgroupsConfig>
+ </transport>
+ <replication>
+ <async/>
+ <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000">
+ <dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/>
+ <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator">
+ <properties>
+ numBuddies = 1
+ ignoreColocatedBuddies = true
+ </properties>
+ </locator>
+ </buddy>
+ </replication>
+</jbosscache>
Added: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-async.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-async.xml (rev 0)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-async.xml 2008-07-16 12:04:48 UTC (rev 6291)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbosscache>
+ <locking lockAcquisitionTimeout="10000" nodeLockingScheme="Optimistic"/>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <stateRetrieval timeout="20000"/>
+ <transport clusterName="JBossCache-Cluster">
+ <jgroupsConfig>
+ <UDP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false" ip_ttl="2"
+ loopback="false" max_bundle_size="64000" max_bundle_timeout="30" mcast_addr="228.10.10.10"
+ mcast_port="45588" mcast_recv_buf_size="25000000" mcast_send_buf_size="640000"
+ oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4"
+ oob_thread_pool.min_threads="1" oob_thread_pool.queue_enabled="true" oob_thread_pool.queue_max_size="10"
+ oob_thread_pool.rejection_policy="Run" thread_naming_pattern="pl" thread_pool.enabled="true"
+ thread_pool.keep_alive_time="30000" thread_pool.max_threads="25" thread_pool.min_threads="1"
+ thread_pool.queue_enabled="true" thread_pool.queue_max_size="10" thread_pool.rejection_policy="Run"
+ tos="8" ucast_recv_buf_size="20000000" ucast_send_buf_size="640000" use_concurrent_stack="true"
+ use_incoming_packet_handler="true"/>
+ <PING num_initial_members="3" timeout="2000"/>
+ <MERGE2 max_interval="30000" min_interval="10000"/>
+ <FD_SOCK/>
+ <FD max_tries="5" shun="true" timeout="10000"/>
+ <VERIFY_SUSPECT timeout="1500"/>
+ <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800"
+ use_mcast_xmit="false"/>
+ <UNICAST timeout="300,600,1200,2400,3600"/>
+ <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/>
+ <pbcast.GMS join_timeout="5000" print_local_addr="true" shun="false" view_ack_collection_timeout="5000"
+ view_bundling="true"/>
+ <FRAG2 frag_size="60000"/>
+ <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
+ <pbcast.FLUSH timeout="0"/>
+ </jgroupsConfig>
+ </transport>
+ <replication>
+ <async/>
+ </replication>
+</jbosscache>
Added: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-sync-br.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-sync-br.xml (rev 0)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-sync-br.xml 2008-07-16 12:04:48 UTC (rev 6291)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbosscache>
+ <locking lockAcquisitionTimeout="10000" nodeLockingScheme="Optimistic"/>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <stateRetrieval timeout="20000"/>
+ <transport clusterName="JBossCache-Cluster">
+ <jgroupsConfig>
+ <TCP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false"
+ enable_unicast_bundling="false" loopback="false" max_bundle_size="64000" max_bundle_timeout="30"
+ oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4"
+ oob_thread_pool.min_threads="2" oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="10"
+ oob_thread_pool.rejection_policy="Run" recv_buf_size="20000000" thread_naming_pattern="pl"
+ thread_pool.enabled="true" thread_pool.keep_alive_time="30000" thread_pool.max_threads="4"
+ thread_pool.min_threads="1" thread_pool.queue_enabled="true" thread_pool.queue_max_size="50000"
+ thread_pool.rejection_policy="discard" use_concurrent_stack="true" use_incoming_packet_handler="true"
+ use_send_queues="false"/>
+ <MPING mcast_addr="232.1.2.3" num_initial_members="3" timeout="2000"/>
+ <MERGE2 max_interval="30000" min_interval="10000"/>
+ <FD_SOCK/>
+ <FD max_tries="5" shun="true" timeout="10000"/>
+ <VERIFY_SUSPECT timeout="1500"/>
+ <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800"
+ use_mcast_xmit="false"/>
+ <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/>
+ <pbcast.GMS join_retry_timeout="2000" join_timeout="5000" print_local_addr="true" shun="false"
+ view_ack_collection_timeout="5000" view_bundling="true"/>
+ <FC max_credits="5000000" min_threshold="0.20"/>
+ <FRAG2 frag_size="60000"/>
+ <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
+ <pbcast.FLUSH timeout="0"/>
+ </jgroupsConfig>
+ </transport>
+ <replication>
+ <sync replTimeout="15000"/>
+ <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000">
+ <dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/>
+ <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator">
+ <properties>
+ numBuddies = 1
+ ignoreColocatedBuddies = true
+ </properties>
+ </locator>
+ </buddy>
+ </replication>
+</jbosscache>
Added: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-sync.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-sync.xml (rev 0)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/opt-repl-sync.xml 2008-07-16 12:04:48 UTC (rev 6291)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbosscache>
+ <locking lockAcquisitionTimeout="10000" nodeLockingScheme="Optimistic"/>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <stateRetrieval timeout="20000"/>
+ <transport clusterName="JBossCache-Cluster">
+ <jgroupsConfig>
+ <UDP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false" ip_ttl="2"
+ loopback="false" max_bundle_size="64000" max_bundle_timeout="30" mcast_addr="228.10.10.10"
+ mcast_port="45588" mcast_recv_buf_size="25000000" mcast_send_buf_size="640000"
+ oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4"
+ oob_thread_pool.min_threads="1" oob_thread_pool.queue_enabled="true" oob_thread_pool.queue_max_size="10"
+ oob_thread_pool.rejection_policy="Run" thread_naming_pattern="pl" thread_pool.enabled="true"
+ thread_pool.keep_alive_time="30000" thread_pool.max_threads="25" thread_pool.min_threads="1"
+ thread_pool.queue_enabled="true" thread_pool.queue_max_size="10" thread_pool.rejection_policy="Run"
+ tos="8" ucast_recv_buf_size="20000000" ucast_send_buf_size="640000" use_concurrent_stack="true"
+ use_incoming_packet_handler="true"/>
+ <PING num_initial_members="3" timeout="2000"/>
+ <MERGE2 max_interval="30000" min_interval="10000"/>
+ <FD_SOCK/>
+ <FD max_tries="5" shun="true" timeout="10000"/>
+ <VERIFY_SUSPECT timeout="1500"/>
+ <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800"
+ use_mcast_xmit="false"/>
+ <UNICAST timeout="300,600,1200,2400,3600"/>
+ <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/>
+ <pbcast.GMS join_timeout="5000" print_local_addr="true" shun="false" view_ack_collection_timeout="5000"
+ view_bundling="true"/>
+ <FRAG2 frag_size="60000"/>
+ <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
+ <pbcast.FLUSH timeout="0"/>
+ </jgroupsConfig>
+ </transport>
+ <replication>
+ <sync replTimeout="15000"/>
+ </replication>
+</jbosscache>
Added: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-local.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-local.xml (rev 0)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-local.xml 2008-07-16 12:04:48 UTC (rev 6291)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbosscache>
+ <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <stateRetrieval timeout="20000"/>
+ <transport clusterName="JBossCache-Cluster"/>
+</jbosscache>
Added: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-async-br.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-async-br.xml (rev 0)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-async-br.xml 2008-07-16 12:04:48 UTC (rev 6291)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbosscache>
+ <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <stateRetrieval timeout="20000"/>
+ <transport clusterName="JBossCache-Cluster">
+ <jgroupsConfig>
+ <TCP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false"
+ enable_unicast_bundling="false" loopback="false" max_bundle_size="64000" max_bundle_timeout="30"
+ oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4"
+ oob_thread_pool.min_threads="2" oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="10"
+ oob_thread_pool.rejection_policy="Run" recv_buf_size="20000000" thread_naming_pattern="pl"
+ thread_pool.enabled="true" thread_pool.keep_alive_time="30000" thread_pool.max_threads="4"
+ thread_pool.min_threads="1" thread_pool.queue_enabled="true" thread_pool.queue_max_size="50000"
+ thread_pool.rejection_policy="discard" use_concurrent_stack="true" use_incoming_packet_handler="true"
+ use_send_queues="false"/>
+ <MPING mcast_addr="232.1.2.3" num_initial_members="3" timeout="2000"/>
+ <MERGE2 max_interval="30000" min_interval="10000"/>
+ <FD_SOCK/>
+ <FD max_tries="5" shun="true" timeout="10000"/>
+ <VERIFY_SUSPECT timeout="1500"/>
+ <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800"
+ use_mcast_xmit="false"/>
+ <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/>
+ <pbcast.GMS join_retry_timeout="2000" join_timeout="5000" print_local_addr="true" shun="false"
+ view_ack_collection_timeout="5000" view_bundling="true"/>
+ <FC max_credits="5000000" min_threshold="0.20"/>
+ <FRAG2 frag_size="60000"/>
+ <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
+ <pbcast.FLUSH timeout="0"/>
+ </jgroupsConfig>
+ </transport>
+ <replication>
+ <async/>
+ <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000">
+ <dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/>
+ <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator">
+ <properties>
+ numBuddies = 1
+ ignoreColocatedBuddies = true
+ </properties>
+ </locator>
+ </buddy>
+ </replication>
+</jbosscache>
Added: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-async.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-async.xml (rev 0)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-async.xml 2008-07-16 12:04:48 UTC (rev 6291)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbosscache>
+ <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <stateRetrieval timeout="20000"/>
+ <transport clusterName="JBossCache-Cluster">
+ <jgroupsConfig>
+ <UDP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false" ip_ttl="2"
+ loopback="false" max_bundle_size="64000" max_bundle_timeout="30" mcast_addr="228.10.10.10"
+ mcast_port="45588" mcast_recv_buf_size="25000000" mcast_send_buf_size="640000"
+ oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4"
+ oob_thread_pool.min_threads="1" oob_thread_pool.queue_enabled="true" oob_thread_pool.queue_max_size="10"
+ oob_thread_pool.rejection_policy="Run" thread_naming_pattern="pl" thread_pool.enabled="true"
+ thread_pool.keep_alive_time="30000" thread_pool.max_threads="25" thread_pool.min_threads="1"
+ thread_pool.queue_enabled="true" thread_pool.queue_max_size="10" thread_pool.rejection_policy="Run"
+ tos="8" ucast_recv_buf_size="20000000" ucast_send_buf_size="640000" use_concurrent_stack="true"
+ use_incoming_packet_handler="true"/>
+ <PING num_initial_members="3" timeout="2000"/>
+ <MERGE2 max_interval="30000" min_interval="10000"/>
+ <FD_SOCK/>
+ <FD max_tries="5" shun="true" timeout="10000"/>
+ <VERIFY_SUSPECT timeout="1500"/>
+ <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800"
+ use_mcast_xmit="false"/>
+ <UNICAST timeout="300,600,1200,2400,3600"/>
+ <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/>
+ <pbcast.GMS join_timeout="5000" print_local_addr="true" shun="false" view_ack_collection_timeout="5000"
+ view_bundling="true"/>
+ <FRAG2 frag_size="60000"/>
+ <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
+ <pbcast.FLUSH timeout="0"/>
+ </jgroupsConfig>
+ </transport>
+ <replication>
+ <async/>
+ </replication>
+</jbosscache>
Added: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-sync-br.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-sync-br.xml (rev 0)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-sync-br.xml 2008-07-16 12:04:48 UTC (rev 6291)
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbosscache>
+ <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <stateRetrieval timeout="20000"/>
+ <transport clusterName="JBossCache-Cluster">
+ <jgroupsConfig>
+ <TCP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false"
+ enable_unicast_bundling="false" loopback="false" max_bundle_size="64000" max_bundle_timeout="30"
+ oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4"
+ oob_thread_pool.min_threads="2" oob_thread_pool.queue_enabled="false" oob_thread_pool.queue_max_size="10"
+ oob_thread_pool.rejection_policy="Run" recv_buf_size="20000000" thread_naming_pattern="pl"
+ thread_pool.enabled="true" thread_pool.keep_alive_time="30000" thread_pool.max_threads="4"
+ thread_pool.min_threads="1" thread_pool.queue_enabled="true" thread_pool.queue_max_size="50000"
+ thread_pool.rejection_policy="discard" use_concurrent_stack="true" use_incoming_packet_handler="true"
+ use_send_queues="false"/>
+ <MPING mcast_addr="232.1.2.3" num_initial_members="3" timeout="2000"/>
+ <MERGE2 max_interval="30000" min_interval="10000"/>
+ <FD_SOCK/>
+ <FD max_tries="5" shun="true" timeout="10000"/>
+ <VERIFY_SUSPECT timeout="1500"/>
+ <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800"
+ use_mcast_xmit="false"/>
+ <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/>
+ <pbcast.GMS join_retry_timeout="2000" join_timeout="5000" print_local_addr="true" shun="false"
+ view_ack_collection_timeout="5000" view_bundling="true"/>
+ <FC max_credits="5000000" min_threshold="0.20"/>
+ <FRAG2 frag_size="60000"/>
+ <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
+ <pbcast.FLUSH timeout="0"/>
+ </jgroupsConfig>
+ </transport>
+ <replication>
+ <sync replTimeout="15000"/>
+ <buddy enabled="true" poolName="myBuddyPoolReplicationGroup" communicationTimeout="2000">
+ <dataGravitation auto="false" removeOnFind="true" searchBackupTrees="true"/>
+ <locator class="org.jboss.cache.buddyreplication.NextMemberBuddyLocator">
+ <properties>
+ numBuddies = 1
+ ignoreColocatedBuddies = true
+ </properties>
+ </locator>
+ </buddy>
+ </replication>
+</jbosscache>
Added: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-sync.xml
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-sync.xml (rev 0)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/conf/pess-repl-sync.xml 2008-07-16 12:04:48 UTC (rev 6291)
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jbosscache>
+ <locking isolationLevel="REPEATABLE_READ" lockAcquisitionTimeout="10000"/>
+ <transaction transactionManagerLookupClass="org.jboss.cache.transaction.GenericTransactionManagerLookup"/>
+ <stateRetrieval timeout="20000"/>
+ <transport clusterName="JBossCache-Cluster">
+ <jgroupsConfig>
+ <UDP discard_incompatible_packets="true" enable_bundling="false" enable_diagnostics="false" ip_ttl="2"
+ loopback="false" max_bundle_size="64000" max_bundle_timeout="30" mcast_addr="228.10.10.10"
+ mcast_port="45588" mcast_recv_buf_size="25000000" mcast_send_buf_size="640000"
+ oob_thread_pool.enabled="true" oob_thread_pool.keep_alive_time="10000" oob_thread_pool.max_threads="4"
+ oob_thread_pool.min_threads="1" oob_thread_pool.queue_enabled="true" oob_thread_pool.queue_max_size="10"
+ oob_thread_pool.rejection_policy="Run" thread_naming_pattern="pl" thread_pool.enabled="true"
+ thread_pool.keep_alive_time="30000" thread_pool.max_threads="25" thread_pool.min_threads="1"
+ thread_pool.queue_enabled="true" thread_pool.queue_max_size="10" thread_pool.rejection_policy="Run"
+ tos="8" ucast_recv_buf_size="20000000" ucast_send_buf_size="640000" use_concurrent_stack="true"
+ use_incoming_packet_handler="true"/>
+ <PING num_initial_members="3" timeout="2000"/>
+ <MERGE2 max_interval="30000" min_interval="10000"/>
+ <FD_SOCK/>
+ <FD max_tries="5" shun="true" timeout="10000"/>
+ <VERIFY_SUSPECT timeout="1500"/>
+ <pbcast.NAKACK discard_delivered_msgs="true" gc_lag="0" retransmit_timeout="300,600,1200,2400,4800"
+ use_mcast_xmit="false"/>
+ <UNICAST timeout="300,600,1200,2400,3600"/>
+ <pbcast.STABLE desired_avg_gossip="50000" max_bytes="400000" stability_delay="1000"/>
+ <pbcast.GMS join_timeout="5000" print_local_addr="true" shun="false" view_ack_collection_timeout="5000"
+ view_bundling="true"/>
+ <FRAG2 frag_size="60000"/>
+ <pbcast.STREAMING_STATE_TRANSFER use_reading_thread="true"/>
+ <pbcast.FLUSH timeout="0"/>
+ </jgroupsConfig>
+ </transport>
+ <replication>
+ <sync replTimeout="15000"/>
+ </replication>
+</jbosscache>
Added: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/config.sh
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/config.sh (rev 0)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/config.sh 2008-07-16 12:04:48 UTC (rev 6291)
@@ -0,0 +1,18 @@
+#!/bin/bash
+
+#see "$CACHE_ROOT/cache-products/cache.sh" for details
+
+THIS_DIR="./cache-products/jbosscache-3.0.0"
+
+#setting up classpath
+for JAR in $THIS_DIR/lib/*
+do
+ CLASSPATH=$CLASSPATH:$JAR
+done
+
+CLASSPATH="$CLASSPATH:./classes/production/jbosscache-3.0.0"
+CLASSPATH="$CLASSPATH:$THIS_DIR/conf"
+#--classpath was set
+
+#additional JVM options
+JVM_OPTIONS="$JVM_OPTIONS -Xmx1024m -Djava.net.preferIPv4Stack=true" JVM_OPTIONS="$JVM_OPTIONS -DcacheBenchFwk.cacheWrapperClassName=org.cachebench.cachewrappers.JBossCache220Wrapper"
\ No newline at end of file
Added: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib/commons-codec.jar
===================================================================
(Binary files differ)
Property changes on: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib/commons-codec.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib/jboss-common-core.jar
===================================================================
(Binary files differ)
Property changes on: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib/jboss-common-core.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib/jboss-logging-spi.jar
===================================================================
(Binary files differ)
Property changes on: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib/jboss-logging-spi.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib/jcip-annotations.jar
===================================================================
(Binary files differ)
Property changes on: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib/jcip-annotations.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib/jgroups.jar
===================================================================
(Binary files differ)
Property changes on: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/lib/jgroups.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Copied: benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/src/org/cachebench/cachewrappers/JBossCache300Wrapper.java (from rev 5777, benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-2.1.0/src/org/cachebench/cachewrappers/JBossCache210Wrapper.java)
===================================================================
--- benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/src/org/cachebench/cachewrappers/JBossCache300Wrapper.java (rev 0)
+++ benchmarks/benchmark-fwk/trunk/cache-products/jbosscache-3.0.0/src/org/cachebench/cachewrappers/JBossCache300Wrapper.java 2008-07-16 12:04:48 UTC (rev 6291)
@@ -0,0 +1,78 @@
+package org.cachebench.cachewrappers;
+
+import org.jboss.cache.Cache;
+import org.jboss.cache.DefaultCacheFactory;
+import org.jboss.cache.Fqn;
+import org.jboss.cache.CacheSPI;
+import org.jboss.cache.config.Option;
+import org.jboss.cache.marshall.NodeData;
+import org.jboss.cache.buddyreplication.GravitateResult;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.cachebench.CacheWrapper;
+
+import java.util.Map;
+
+/**
+ * @author Mircea.Markus at jboss.com
+ */
+public class JBossCache300Wrapper implements CacheWrapper
+{
+ private Cache cache;
+ private Log log = LogFactory.getLog(JBossCache300Wrapper.class);
+
+ public void init(Map parameters) throws Exception
+ {
+ log.info("Creating cache with the following configuration: " + parameters);
+ cache = new DefaultCacheFactory().createCache((String)parameters.get("config"));
+ log.info("Running cache with following config: " + cache.getConfiguration());
+ log.info("Running follwing JBossCacheVersion: " + org.jboss.cache.Version.version);
+ log.info("Running follwing JBossCacheCodeName: " + org.jboss.cache.Version.codename);
+ }
+
+ public void setUp() throws Exception
+ {
+ }
+
+ public void tearDown() throws Exception
+ {
+ cache.stop();
+ }
+
+ public void put(Object key, Object value) throws Exception
+ {
+ // make sure the threads don't conflict!
+ Fqn f = Fqn.fromElements("test", key);
+ cache.put(f, key, value);
+ }
+
+ public Object get(Object key) throws Exception
+ {
+ Fqn f = Fqn.fromElements("test", key);
+ return cache.get(f, key);
+ }
+
+ public void empty() throws Exception
+ {
+ //not removing root because there it fails with buddy replication: http://jira.jboss.com/jira/browse/JBCACHE-1241
+ cache.removeNode(Fqn.fromElements("test"));
+ }
+
+ public int getNumMembers()
+ {
+ return cache.getMembers().size();
+ }
+
+ public String getInfo()
+ {
+ return "Num direct children: " + cache.getRoot().getChildren().size();
+ }
+
+ public Object getReplicatedData(String key) throws Exception
+ {
+ Option option = cache.getInvocationContext().getOptionOverrides();
+ option.setForceDataGravitation(true);
+ Fqn<String> fqn = Fqn.fromElements("test", key);
+ return cache.get(fqn, key);
+ }
+}
More information about the jbosscache-commits
mailing list