January 2008 - jbosscache-commits

JBoss Cache SVN: r5274 - benchmarks/benchmark-fwk/trunk.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2008-01-30 20:39:17 -0500 (Wed, 30 Jan 2008) New Revision: 5274 Modified: benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh Log: Modified: benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh =================================================================== --- benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh 2008-01-31 01:37:14 UTC (rev 5273) +++ benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh 2008-01-31 01:39:17 UTC (rev 5274) @@ -16,15 +16,13 @@ ./cluster.sh start $product $config $size outputFileName=data_${product}_${config}_${size}.csv - while [ ! -e $outputFileName ] do - echo Waiting for report [ $outputFileName ] - sleep 10 + echo "Waiting for report [ $outputFileName ]" + sleep 5 done sleep 60 mv $outputFileName output/ - sleep 10 done done done

16 years, 11 months

1
0
0 / 0

JBoss Cache SVN: r5273 - benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2008-01-30 20:37:14 -0500 (Wed, 30 Jan 2008) New Revision: 5273 Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/ChartGenerator.java Log: Deal with header rows in csv output Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/ChartGenerator.java =================================================================== --- benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/ChartGenerator.java 2008-01-31 01:31:23 UTC (rev 5272) +++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/ChartGenerator.java 2008-01-31 01:37:14 UTC (rev 5273) @@ -147,7 +147,14 @@ strTokenizer.nextToken(); strTokenizer.nextToken(); String candidate = strTokenizer.nextToken(); - return Double.parseDouble(candidate); + try + { + return Double.parseDouble(candidate); + } + catch (NumberFormatException nfe) + { + return -1; + } } }

16 years, 11 months

1
0
0 / 0

JBoss Cache SVN: r5272 - benchmarks/benchmark-fwk/trunk.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2008-01-30 20:31:23 -0500 (Wed, 30 Jan 2008) New Revision: 5272 Modified: benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh benchmarks/benchmark-fwk/trunk/generateChart.sh Log: Modified: benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh =================================================================== --- benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh 2008-01-31 01:28:40 UTC (rev 5271) +++ benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh 2008-01-31 01:31:23 UTC (rev 5272) @@ -1,8 +1,8 @@ #!/bin/bash -scaling="2 4 6 8 10" -#scaling="2 4 6" -configs="pess-repl-async.xml pess-repl-sync.xml pess-repl-async-br.xml" +#scaling="2 4 6 8 10" +scaling="2 4" +configs="pess-repl-async.xml pess-repl-sync.xml" # pess-repl-async-br.xml" products="jbosscache-2.0.0 jbosscache-2.1.0" mkdir output @@ -15,15 +15,15 @@ do ./cluster.sh start $product $config $size - outputFileName=data_$product_$config_$size.csv + outputFileName=data_${product}_${config}_${size}.csv while [ ! -e $outputFileName ] do - echo Waiting for report... - sleep 60 + echo Waiting for report [ $outputFileName ] + sleep 10 done sleep 60 - mv outputFileName output/ + mv $outputFileName output/ sleep 10 done done Modified: benchmarks/benchmark-fwk/trunk/generateChart.sh =================================================================== --- benchmarks/benchmark-fwk/trunk/generateChart.sh 2008-01-31 01:28:40 UTC (rev 5271) +++ benchmarks/benchmark-fwk/trunk/generateChart.sh 2008-01-31 01:31:23 UTC (rev 5272) @@ -1,8 +1,8 @@ #!/bin/bash -CP=. +CP=.:classes/production/Framework -for i in lib/*.java +for i in lib/*.jar do CP=$CP:$i done

16 years, 11 months

1
0
0 / 0

JBoss Cache SVN: r5271 - benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2008-01-30 20:28:40 -0500 (Wed, 30 Jan 2008) New Revision: 5271 Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/ChartGenerator.java Log: User friendly error msgs Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/ChartGenerator.java =================================================================== --- benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/ChartGenerator.java 2008-01-31 01:24:21 UTC (rev 5270) +++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/ChartGenerator.java 2008-01-31 01:28:40 UTC (rev 5271) @@ -33,7 +33,7 @@ public class ChartGenerator { static String reportDirectory; - static boolean singleChart; + static boolean singleChart = true; DefaultCategoryDataset dataset; @@ -65,6 +65,12 @@ return; } + if (reportDirectory == null) + { + help(); + return; + } + if (!singleChart) throw new RuntimeException("Multiple charts not yet implemented"); new ChartGenerator().generateChart(); }

16 years, 11 months

1
0
0 / 0

JBoss Cache SVN: r5270 - benchmarks/benchmark-fwk/trunk.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2008-01-30 20:24:21 -0500 (Wed, 30 Jan 2008) New Revision: 5270 Modified: benchmarks/benchmark-fwk/trunk/build.xml Log: More flexible classpaths Modified: benchmarks/benchmark-fwk/trunk/build.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/build.xml 2008-01-31 01:22:26 UTC (rev 5269) +++ benchmarks/benchmark-fwk/trunk/build.xml 2008-01-31 01:24:21 UTC (rev 5270) @@ -55,7 +55,7 @@ </path> <path id="framework.module.classpath"> - <dirset dir="${module.framework.basedir}/lib" includes="**/*.jar"/> + <fileset dir="${module.framework.basedir}/lib" includes="**/*.jar"/> <pathelement location="${module.framework.basedir}/conf"/> </path>

16 years, 11 months

1
0
0 / 0

JBoss Cache SVN: r5269 - benchmarks/benchmark-fwk/trunk.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2008-01-30 20:22:26 -0500 (Wed, 30 Jan 2008) New Revision: 5269 Modified: benchmarks/benchmark-fwk/trunk/build.xml Log: More flexible classpaths Modified: benchmarks/benchmark-fwk/trunk/build.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/build.xml 2008-01-31 01:18:57 UTC (rev 5268) +++ benchmarks/benchmark-fwk/trunk/build.xml 2008-01-31 01:22:26 UTC (rev 5269) @@ -1,501 +1,534 @@ <?xml version="1.0" encoding="ISO-8859-1"?> <project name="cachebenchfwk" default="help"> - - - <property file="build.properties"/> -  -  +  - -  - - <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> - -  - - -  - - <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="${module.framework.basedir}/classes/production/Framework"/> - <property name="framework.testoutput.dir" value="${module.framework.basedir}/classes/test/Framework"/> - - <path id="framework.module.bootclasspath"> -  - </path> - - <path id="framework.module.classpath"> - <pathelement location="${module.framework.basedir}/lib/commons-logging.jar"/> - <pathelement location="${module.framework.basedir}/lib/log4j.jar"/> - <pathelement location="${module.framework.basedir}/lib/commons-digester.jar"/> - <pathelement location="${module.framework.basedir}/lib/commons-beanutils.jar"/> - <pathelement location="${module.framework.basedir}/lib/commons-math-1.0.jar"/> - <pathelement location="${module.framework.basedir}/lib/smartfrog-3.12.014.jar"/> - <pathelement location="${module.framework.basedir}/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. -See /docs/ for more details. - -Some useful targets: +  - help - this documentation - all - builds the entire project, including plugins for all - cache products in /cache-products/. Output classes - in /classes/. - runNode - runs the CacheBenchFwk. Depending on the number of nodes in the cluster(configured in cachebenchmark.xml), - it will wait for all configured nodes to be launched before starting the tests + <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> -Make sure you have looked at: +  - 1) 'build.properties' and have set JVM params (such as heap size, - etc.) as necessary. - 2) '/conf/cachebench.xml' to configure the tests you want run, the - nodes in the cluster if the case and the output file for reports. - 3) '/conf/log4j.xml' for logging settings (make sure these aren't - very verbose as it can skew tests). - 4) Provided one of the plugins as a system property. This is - necessary since at the moment plugin libs may overlap and - cause problems, so are not loaded every time. Specify which - plugin you plan to use in your test by using +  + + <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="${module.framework.basedir}/classes/production/Framework"/> + <property name="framework.testoutput.dir" value="${module.framework.basedir}/classes/test/Framework"/> + + <path id="framework.module.bootclasspath"> +  + </path> + + <path id="framework.module.classpath"> + <dirset dir="${module.framework.basedir}/lib" includes="**/*.jar"/> + <pathelement location="${module.framework.basedir}/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. + See /docs/ for more details. + + Some useful targets: + + help - this documentation + all - builds the entire project, including plugins for all + cache products in /cache-products/. Output classes + in /classes/. + runNode - runs the CacheBenchFwk. Depending on the number of nodes in the cluster(configured in + cachebenchmark.xml), + it will wait for all configured nodes to be launched before starting the tests + + Make sure you have looked at: + + 1) 'build.properties' and have set JVM params (such as heap size, + etc.) as necessary. + 2) '/conf/cachebench.xml' to configure the tests you want run, the + nodes in the cluster if the case and the output file for reports. + 3) '/conf/log4j.xml' for logging settings (make sure these aren't + very verbose as it can skew tests). + 4) Provided one of the plugins as a system property. This is + necessary since at the moment plugin libs may overlap and + cause problems, so are not loaded every time. Specify which + plugin you plan to use in your test by using + -Dorg.cachebench.plugins.jbosscache1=true -Dbind.address=${MYTESTIP_1} -Dorg.cachebench.plugins.jbosscache2=true -Dbind.address=${MYTESTIP_1} -Dorg.cachebench.pluins.ehcache=true -Dbind.address=${MYTESTIP_1} -Dorg.cachebench.plugins.coherence=true -Dtangosol.coherence.localhost=${MYTESTIP_1} - // WORK IN PROGRESS - -Dorg.cachebench.plugins.terracotta=true - when running ant. Note that only one can be set at any time. - 5) Make sure you set up an correct NODE_INDEX environment property - indicating the index of the node before starting it. E.g. if - we have 3 nodes each process should have an environment - variable named NODE_INDEX, having values in the range 0-2, - each node having an distict value. - see cachebench.xml\cachebench\cluster for more details + // WORK IN PROGRESS + -Dorg.cachebench.plugins.terracotta=true + when running ant. Note that only one can be set at any time. + 5) Make sure you set up an correct NODE_INDEX environment property + indicating the index of the node before starting it. E.g. if + we have 3 nodes each process should have an environment + variable named NODE_INDEX, having values in the range 0-2, + each node having an distict value. + see cachebench.xml\cachebench\cluster for more details - NB: NEEDS Ant >= 1.7.0 - </echo> - </target> + NB: NEEDS Ant >= 1.7.0 + </echo> + </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"> - <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"/> - <classpath refid="framework.module.classpath"/> - <src refid="framework.module.sourcepath"/> - <patternset refid="excluded.from.compilation.framework"/> - </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"/> - + <target name="compile.module.framework" depends="compile.module.framework.production,compile.module.framework.tests" + description="Compile module Framework"/> -  - - <dirname property="module.ehcache124-plugin.basedir" file="${ant.file}"/> - - - - <property name="compiler.args.ehcache124-plugin" value="${compiler.args}"/> - - <property name="ehcache124-plugin.output.dir" value="${module.ehcache124-plugin.basedir}/classes/production/ehcache-1.2.4"/> - <property name="ehcache124-plugin.testoutput.dir" value="${module.ehcache124-plugin.basedir}/classes/test/ehcache-1.2.4"/> - - <path id="ehcache124-plugin.module.bootclasspath"> -  - </path> - - <path id="ehcache124-plugin.module.classpath"> - <fileset dir="${module.ehcache124-plugin.basedir}/cache-products/ehcache-1.2.4/lib" includes="*.jar" /> - <pathelement location="${module.ehcache124-plugin.basedir}/cache-products/ehcache-1.2.4/conf"/> - <pathelement location="${framework.output.dir}"/> - <pathelement location="${framework.testoutput.dir}"/> - <pathelement location="${ehcache124-plugin.output.dir}" /> - </path> - - - <patternset id="excluded.from.module.ehcache124-plugin"> - <patternset refid="ignored.files"/> - </patternset> - - <patternset id="excluded.from.compilation.ehcache124-plugin"> - <patternset refid="excluded.from.module.ehcache124-plugin"/> - </patternset> - - <path id="ehcache124-plugin.module.sourcepath"> - <dirset dir="${module.ehcache124-plugin.basedir}/cache-products/ehcache-1.2.4"> - <include name="src"/> - </dirset> - </path> - - - <target name="compile.module.ehcache124-plugin" depends="compile.module.ehcache124-plugin.production,compile.module.ehcache124-plugin.tests" description="Compile module ehcache-1.2.4"/> - - <target name="compile.module.ehcache124-plugin.production" depends="compile.module.framework" description="Compile module ehcache-1.2.4; production classes"> - <mkdir dir="${ehcache124-plugin.output.dir}"/> - <javac destdir="${ehcache124-plugin.output.dir}" debug="${compiler.debug}" nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true"> - <compilerarg line="${compiler.args.ehcache124-plugin}"/> - <bootclasspath refid="ehcache124-plugin.module.bootclasspath"/> - <classpath refid="ehcache124-plugin.module.classpath"/> - <src refid="ehcache124-plugin.module.sourcepath"/> - <patternset refid="excluded.from.compilation.ehcache124-plugin"/> - </javac> - - <copy todir="${ehcache124-plugin.output.dir}"> - <fileset dir="${module.ehcache124-plugin.basedir}/cache-products/ehcache-1.2.4/src"> - <patternset refid="compiler.resources"/> - <type type="file"/> - </fileset> - </copy> - </target> - - <target name="compile.module.ehcache124-plugin.tests" depends="compile.module.ehcache124-plugin.production" description="compile module ehcache-1.2.4; test classes" unless="skip.tests"/> - + <target name="compile.module.framework.production" description="Compile module Framework; production classes"> + <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"/> + <classpath refid="framework.module.classpath"/> + <src refid="framework.module.sourcepath"/> + <patternset refid="excluded.from.compilation.framework"/> + </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"/> + + +  + + <dirname property="module.ehcache124-plugin.basedir" file="${ant.file}"/> + + + <property name="compiler.args.ehcache124-plugin" value="${compiler.args}"/> + + <property name="ehcache124-plugin.output.dir" + value="${module.ehcache124-plugin.basedir}/classes/production/ehcache-1.2.4"/> + <property name="ehcache124-plugin.testoutput.dir" + value="${module.ehcache124-plugin.basedir}/classes/test/ehcache-1.2.4"/> + + <path id="ehcache124-plugin.module.bootclasspath"> +  + </path> + + <path id="ehcache124-plugin.module.classpath"> + <fileset dir="${module.ehcache124-plugin.basedir}/cache-products/ehcache-1.2.4/lib" includes="*.jar"/> + <pathelement location="${module.ehcache124-plugin.basedir}/cache-products/ehcache-1.2.4/conf"/> + <pathelement location="${framework.output.dir}"/> + <pathelement location="${framework.testoutput.dir}"/> + <pathelement location="${ehcache124-plugin.output.dir}"/> + </path> + + + <patternset id="excluded.from.module.ehcache124-plugin"> + <patternset refid="ignored.files"/> + </patternset> + + <patternset id="excluded.from.compilation.ehcache124-plugin"> + <patternset refid="excluded.from.module.ehcache124-plugin"/> + </patternset> + + <path id="ehcache124-plugin.module.sourcepath"> + <dirset dir="${module.ehcache124-plugin.basedir}/cache-products/ehcache-1.2.4"> + <include name="src"/> + </dirset> + </path> + + + <target name="compile.module.ehcache124-plugin" + depends="compile.module.ehcache124-plugin.production,compile.module.ehcache124-plugin.tests" + description="Compile module ehcache-1.2.4"/> + + <target name="compile.module.ehcache124-plugin.production" depends="compile.module.framework" + description="Compile module ehcache-1.2.4; production classes"> + <mkdir dir="${ehcache124-plugin.output.dir}"/> + <javac destdir="${ehcache124-plugin.output.dir}" debug="${compiler.debug}" + nowarn="${compiler.generate.no.warnings}" memorymaximumsize="${compiler.max.memory}" fork="true"> + <compilerarg line="${compiler.args.ehcache124-plugin}"/> + <bootclasspath refid="ehcache124-plugin.module.bootclasspath"/> + <classpath refid="ehcache124-plugin.module.classpath"/> + <src refid="ehcache124-plugin.module.sourcepath"/> + <patternset refid="excluded.from.compilation.ehcache124-plugin"/> + </javac> + + <copy todir="${ehcache124-plugin.output.dir}"> + <fileset dir="${module.ehcache124-plugin.basedir}/cache-products/ehcache-1.2.4/src"> + <patternset refid="compiler.resources"/> + <type type="file"/> + </fileset> + </copy> + </target> + + <target name="compile.module.ehcache124-plugin.tests" depends="compile.module.ehcache124-plugin.production" + description="compile module ehcache-1.2.4; test classes" unless="skip.tests"/> + +  - <dirname property="module.coherence322-plugin.basedir" file="${ant.file}"/> + <dirname property="module.coherence322-plugin.basedir" file="${ant.file}"/> + <property name="compiler.args.coherence322-plugin" value="${compiler.args}"/> - <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"/> - <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"> +  + </path> - <path id="coherence322-plugin.module.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> - <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.module.coherence322-plugin"> - <patternset refid="ignored.files"/> - </patternset> + <patternset id="excluded.from.compilation.coherence322-plugin"> + <patternset refid="excluded.from.module.coherence322-plugin"/> + </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.ehcache124-plugin.basedir}/cache-products/coherence-3.2.2"> + <include name="src"/> + </dirset> + </path> - <path id="coherence322-plugin.module.sourcepath"> - <dirset dir="${module.ehcache124-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" 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" + 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"/> + </javac> - <target name="compile.module.coherence322-plugin.production" 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"/> - </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> - <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="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> - <target name="clean.module.coherence322-plugin" description="cleanup module"> - <delete dir="${coherence322-plugin.output.dir}"/> - <delete dir="${coherence322-plugin.testoutput.dir}"/> - </target> +  -  + <dirname property="module.terracotta-plugin.basedir" file="${ant.file}"/> - <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"/> - <property name="compiler.args.terracotta-plugin" value="${compiler.args}"/> + <path id="terracotta-plugin.module.bootclasspath"> +  + </path> - <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.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> - <path id="terracotta-plugin.module.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> - <patternset id="excluded.from.module.terracotta-plugin"> - <patternset refid="ignored.files"/> - </patternset> + <path id="terracotta-plugin.module.sourcepath"> + <dirset dir="${module.terracotta-plugin.basedir}/cache-products/terracotta-2.5.0"> + <include name="src"/> + </dirset> + </path> - <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" + 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"/> + </javac> - <target name="compile.module.terracotta-plugin" depends="compile.module.terracotta-plugin.production,compile.module.terracotta-plugin.tests" description="Compile module terracotta-2.5.0"/> + <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.production" 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"/> - </javac> + <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"/> - <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="clean.module.terracotta-plugin" description="cleanup module"> + <delete dir="${terracotta-plugin.output.dir}"/> + <delete dir="${terracotta-plugin.testoutput.dir}"/> + </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> +  + <dirname property="module.jbosscache140-plugin.basedir" file="${ant.file}"/> -  - - <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"> -  - </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" 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"/> - </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"/> - -  - - <dirname property="module.jbosscache200-plugin.basedir" file="${ant.file}"/> - <dirname property="module.jbosscache210-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="jbosscache200-plugin.testoutput.dir" value="${module.jbosscache200-plugin.basedir}/classes/test/jbosscache-2.0.0"/> - - <path id="jbosscache200-plugin.module.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> + <property name="compiler.args.jbosscache140-plugin" value="${compiler.args}"/> - <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> - - - <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"/> + <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"/> - <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"/> - </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> + <path id="jbosscache140-plugin.module.bootclasspath"> +  + </path> - <target name="compile.module.jbosscache210-plugin.production" 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"/> - </javac> - </target> + <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> - <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="init" description="Build initialization"> -  - </target> - - <target name="clean" description="cleanup all"> - <delete dir="${module.framework.basedir}/classes"/> - </target> - - <target name="all" depends="init, clean, compile.module.framework, compile.module.jbosscache140-plugin, compile.module.jbosscache200-plugin, compile.module.jbosscache210-plugin.production, compile.module.terracotta-plugin" description="build all"/> + <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" + 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"/> + </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"/> + +  + + <dirname property="module.jbosscache200-plugin.basedir" file="${ant.file}"/> + <dirname property="module.jbosscache210-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="jbosscache200-plugin.testoutput.dir" + value="${module.jbosscache200-plugin.basedir}/classes/test/jbosscache-2.0.0"/> + + <path id="jbosscache200-plugin.module.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> + + + <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"/> + </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" + 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"/> + </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="init" description="Build initialization"> +  + </target> + + <target name="clean" description="cleanup all"> + <delete dir="${module.framework.basedir}/classes"/> + </target> + + <target name="all" + depends="init, clean, compile.module.framework, compile.module.jbosscache140-plugin, compile.module.jbosscache200-plugin, compile.module.jbosscache210-plugin.production, compile.module.terracotta-plugin" + description="build all"/> + <target name="checkClusterAddresses" depends="compile.module.framework.production" description="Check whether the cluster config is a valid one"> <java classname="org.cachebench.ClusterConfigurationCheck" clonevm="true" fork="true"> @@ -508,7 +541,8 @@ </target> <target name="deploy.sf" depends="compile.module.framework" description="builds the smartfrog jar and deploys it"> - <rmic classname="org.cachebench.smartfrog.CacheBenchmarkPrim" base="${framework.output.dir}" verify="true" debug="true"> + <rmic classname="org.cachebench.smartfrog.CacheBenchmarkPrim" base="${framework.output.dir}" verify="true" + debug="true"> <classpath refid="framework.module.classpath"/> </rmic> <delete dir="${basedir}/smartfrog/sfClasses"/>

16 years, 11 months

1
0
0 / 0

JBoss Cache SVN: r5268 - in benchmarks/benchmark-fwk/trunk: conf and 2 other directories.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2008-01-30 20:18:57 -0500 (Wed, 30 Jan 2008) New Revision: 5268 Added: benchmarks/benchmark-fwk/trunk/generateChart.sh benchmarks/benchmark-fwk/trunk/lib/jcommon.jar benchmarks/benchmark-fwk/trunk/lib/jfreechart.jar benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/ChartGenerator.java Modified: benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh benchmarks/benchmark-fwk/trunk/conf/cachebench.xml benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/AbstractReportGenerator.java Log: Added chart generation Modified: benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh =================================================================== --- benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh 2008-01-31 00:25:05 UTC (rev 5267) +++ benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh 2008-01-31 01:18:57 UTC (rev 5268) @@ -15,7 +15,7 @@ do ./cluster.sh start $product $config $size - outputFileName=data-$product-$config-$size.csv + outputFileName=data_$product_$config_$size.csv while [ ! -e $outputFileName ] do @@ -28,19 +28,3 @@ done done done - -echo Combining reports - -cd output -if [ -e ../combined.csv ] -then - rm ../combined.csv -fi - -for i in *.csv -do - echo $i >> ../combined.csv - cat $i >> ../combined.csv - echo >> ../combined.csv -done - Modified: benchmarks/benchmark-fwk/trunk/conf/cachebench.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/conf/cachebench.xml 2008-01-31 00:25:05 UTC (rev 5267) +++ benchmarks/benchmark-fwk/trunk/conf/cachebench.xml 2008-01-31 01:18:57 UTC (rev 5268) @@ -8,7 +8,8 @@ emptyCacheBetweenTests - again, use if you're running out of mem. numThreads - the number of executor threads to use to perform the required number of operations. --> -<cachebench sampleSize="10000" gcBetweenTestsEnabled="true" sleepBetweenTests="1000" emptyCacheBetweenTests="true" numThreads="10"> +<cachebench sampleSize="10000" gcBetweenTestsEnabled="true" sleepBetweenTests="1000" emptyCacheBetweenTests="true" + numThreads="10">  - <testcase name="WebSessionReplicationTest" stopOnFailure="true"> + <testcase name="WebSessionReplicationTest" stopOnFailure="true">  -  + -->  -  - - <test name="SessionSimulator" testClass="org.cachebench.tests.SessionSimulatorTest" weight="2.0" > - <param name="numberOfRequest" value="100000"/> - <param name="numberOfAttributes" value="100"/> - <param name="writePercentage" value="20"/> - <param name="sizeOfAnAttribute" value="1000"/> - </test> +  -  + <test name="SessionSimulator" testClass="org.cachebench.tests.SessionSimulatorTest" weight="2.0"> + <param name="numberOfRequest" value="100000"/> + <param name="numberOfAttributes" value="100"/> + <param name="writePercentage" value="20"/> + <param name="sizeOfAnAttribute" value="1000"/> + </test> -  +  + +  </testcase> -   + '-generic-' then the name would be generated as follows: 'data_<cache-product>_<configuration>_<cluster-size>.csv' --> <report outputFile="-generic-" generator="org.cachebench.reportgenerators.ClusterReportGenerator"/> </cachebench> Added: benchmarks/benchmark-fwk/trunk/generateChart.sh =================================================================== --- benchmarks/benchmark-fwk/trunk/generateChart.sh (rev 0) +++ benchmarks/benchmark-fwk/trunk/generateChart.sh 2008-01-31 01:18:57 UTC (rev 5268) @@ -0,0 +1,10 @@ +#!/bin/bash + +CP=. + +for i in lib/*.java +do + CP=$CP:$i +done + +java -cp $CP org.cachebench.reportgenerators.ChartGenerator ${*} Added: benchmarks/benchmark-fwk/trunk/lib/jcommon.jar =================================================================== (Binary files differ) Property changes on: benchmarks/benchmark-fwk/trunk/lib/jcommon.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: benchmarks/benchmark-fwk/trunk/lib/jfreechart.jar =================================================================== (Binary files differ) Property changes on: benchmarks/benchmark-fwk/trunk/lib/jfreechart.jar ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/AbstractReportGenerator.java =================================================================== --- benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/AbstractReportGenerator.java 2008-01-31 00:25:05 UTC (rev 5267) +++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/AbstractReportGenerator.java 2008-01-31 01:18:57 UTC (rev 5268) @@ -32,9 +32,9 @@ private String getFileName(String fileName) { - if (fileName.indexOf("-generic-") >=0 ) + if (fileName.indexOf("-generic-") >= 0) { - return "data-" + params.get("cacheProductName") + "-" + params.get("config") + "-" + params.get("clusterSize") + ".csv"; + return "data_" + params.get("cacheProductName") + "_" + params.get("config") + "_" + params.get("clusterSize") + ".csv"; } log.info("Filename for report generation is: " + fileName); return fileName; Added: benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/ChartGenerator.java =================================================================== --- benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/ChartGenerator.java (rev 0) +++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/ChartGenerator.java 2008-01-31 01:18:57 UTC (rev 5268) @@ -0,0 +1,147 @@ +package org.cachebench.reportgenerators; + +import org.apache.commons.math.stat.descriptive.DescriptiveStatistics; +import org.jfree.chart.ChartFactory; +import org.jfree.chart.ChartUtilities; +import org.jfree.chart.JFreeChart; +import org.jfree.chart.plot.PlotOrientation; +import org.jfree.data.category.DefaultCategoryDataset; + +import java.io.BufferedReader; +import java.io.File; +import java.io.FileReader; +import java.io.FilenameFilter; +import java.io.IOException; +import java.util.Collections; +import java.util.Date; +import java.util.StringTokenizer; + +/** + * Manual chart generator. Grabs CSVs generated by {@link org.cachebench.reportgenerators.ClusterReportGenerator} and spits out + * line graphs. + * <p/> + * This generator draws line graphs, using cluster size on the X axis (e.g., 2, 4, 6 nodes) and throughput (requests per second) + * on the Y axis. It then plots points for the different cache products and configurations tested. + * <p/> + * For the time being, this is expected to be run manually on the command line, passing in relevant parameters. Calling this with + * no params will generate some help. + * <p/> + * TODO: Make this a proper report generator plugin once we have proper report consolidation that spans multiple runs for different cluster sizes and cache products. + * + * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>) + */ +public class ChartGenerator +{ + static String reportDirectory; + static boolean singleChart; + DefaultCategoryDataset dataset; + + + private static void help() + { + System.out.println("Usage:"); + System.out.println(" ChartGenerator [-reportDir <directory containing CSV files>] [-singleChart <true | false> if true, generates a single chart for all config files.]"); + } + + public static void main(String[] args) throws IOException + { + System.out.println("Welcome to the ChartGenerator."); + // the params we expect: + for (int i = 0; i < args.length; i++) + { + if (args[i].equals("-reportDir")) + { + reportDirectory = args[++i]; + continue; + } + + if (args[i].equals("-singleChart")) + { + singleChart = Boolean.valueOf(args[++i]); + continue; + } + + help(); + return; + } + + new ChartGenerator().generateChart(); + } + + private void generateChart() throws IOException + { + readData(); + JFreeChart chart = ChartFactory.createLineChart("CacheBenchFwk Report", "Cluster size", "Throughput (reqs/sec)", + dataset, PlotOrientation.HORIZONTAL, true, false, false); + + chart.setSubtitles(Collections.singletonList("" + new Date())); + ChartUtilities.saveChartAsPNG(new File("chart.png"), chart, 600, 800); + } + + private void readData() throws IOException + { + File file = new File(reportDirectory); + if (!file.exists() || !file.isDirectory()) + throw new IllegalArgumentException("Report directory " + reportDirectory + " does not exist or is not a directory!"); + + File[] files = file.listFiles(new FilenameFilter() + { + public boolean accept(File dir, String name) + { + return name.toUpperCase().endsWith(".CSV"); + } + }); + + dataset = new DefaultCategoryDataset(); + for (File f : files) + { + readData(f); + } + } + + private void readData(File f) throws IOException + { + // chop up the file name to get productAndConfiguration and clusterSize. + Integer clusterSize = 0; + DescriptiveStatistics stats = DescriptiveStatistics.newInstance(); + // file name is in the format data_<cache-product>_<cache-cfg.xml>_<cluster-size>.csv + + StringTokenizer strtok = new StringTokenizer(f.getName(), "_"); + strtok.nextToken(); // this is the "data-" bit + String productNameAndConfiguration = strtok.nextToken() + "(" + strtok.nextToken(); + // chop off the trailing ".xml" + if (productNameAndConfiguration.toUpperCase().endsWith(".XML")) + productNameAndConfiguration = productNameAndConfiguration.substring(0, productNameAndConfiguration.length() - 4); + productNameAndConfiguration += ")"; + + // cluster size + String cS = strtok.nextToken(); + if (cS.toUpperCase().endsWith(".CSV")) cS = cS.substring(0, cS.length() - 4); + clusterSize = Integer.parseInt(cS); + + // now read the data. + String line = null; + BufferedReader br = new BufferedReader(new FileReader(f)); + while ((line = br.readLine()) != null) + { + double throughput = getThroughput(line); + if (throughput != -1) stats.addValue(throughput); + } + + dataset.addValue(stats.getMean(), productNameAndConfiguration, clusterSize); + } + + private double getThroughput(String line) + { + // To be a valid line, the line should be comma delimited + StringTokenizer strTokenizer = new StringTokenizer(line, ","); + if (strTokenizer.countTokens() < 2) return -1; + + // we want the 3rd element which is throughput + strTokenizer.nextToken(); + strTokenizer.nextToken(); + String candidate = strTokenizer.nextToken(); + return Double.parseDouble(candidate); + } + +}

16 years, 11 months

1
0
0 / 0

JBoss Cache SVN: r5267 - in benchmarks/benchmark-fwk/trunk: conf and 2 other directories.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2008-01-30 19:25:05 -0500 (Wed, 30 Jan 2008) New Revision: 5267 Modified: benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh benchmarks/benchmark-fwk/trunk/conf/cachebench.xml benchmarks/benchmark-fwk/trunk/runNode.sh benchmarks/benchmark-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/AbstractReportGenerator.java benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/ClusterReportGenerator.java benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/CsvBaseReportGenerator.java Log: Added proper naming of output files Modified: benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh =================================================================== --- benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh 2008-01-30 18:36:19 UTC (rev 5266) +++ benchmarks/benchmark-fwk/trunk/allJBossCacheTests.sh 2008-01-31 00:25:05 UTC (rev 5267) @@ -14,13 +14,16 @@ for size in $scaling do ./cluster.sh start $product $config $size - while [ ! -e performance-$size.csv ] + + outputFileName=data-$product-$config-$size.csv + + while [ ! -e $outputFileName ] do echo Waiting for report... sleep 60 done sleep 60 - mv performance-$size.csv output/$product-$config-$size.csv + mv outputFileName output/ sleep 10 done done Modified: benchmarks/benchmark-fwk/trunk/conf/cachebench.xml =================================================================== --- benchmarks/benchmark-fwk/trunk/conf/cachebench.xml 2008-01-30 18:36:19 UTC (rev 5266) +++ benchmarks/benchmark-fwk/trunk/conf/cachebench.xml 2008-01-31 00:25:05 UTC (rev 5267) @@ -91,7 +91,7 @@ own report generators such as XML generators, graphic generators, etc -->  + '-generic-' then the name would be generated as follows: 'data-<cache-product>-<configuration>-<cluster-size>.csv' --> <report outputFile="-generic-" generator="org.cachebench.reportgenerators.ClusterReportGenerator"/> </cachebench> Modified: benchmarks/benchmark-fwk/trunk/runNode.sh =================================================================== --- benchmarks/benchmark-fwk/trunk/runNode.sh 2008-01-30 18:36:19 UTC (rev 5266) +++ benchmarks/benchmark-fwk/trunk/runNode.sh 2008-01-31 00:25:05 UTC (rev 5267) @@ -61,7 +61,7 @@ . ./bindAddress.sh -JVM_OPTIONS="${JVM_OPTIONS} -Dbind.address=${BIND_ADDRESS} -DcacheBenchFwk.cacheConfigFile=${TEST_CFG} -DcurrentIndex=${CURRENT_INDEX} -DclusterSize=${CLUSTER_SIZE} -DcurrentIndex=${CURRENT_INDEX} -Djava.net.preferIPv4Stack=${preferIPv4Stack}" +JVM_OPTIONS="${JVM_OPTIONS} -DcacheBenchFwk.cachePrioductName=${CACHE_PRODUCT} -Dbind.address=${BIND_ADDRESS} -DcacheBenchFwk.cacheConfigFile=${TEST_CFG} -DcurrentIndex=${CURRENT_INDEX} -DclusterSize=${CLUSTER_SIZE} -DcurrentIndex=${CURRENT_INDEX} -Djava.net.preferIPv4Stack=${preferIPv4Stack}" TO_EXECUTE="java $JVM_OPTIONS -cp $CLASSPATH org.cachebench.CacheBenchmarkRunner" if [ "$DEBUG" = "debug" ] Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java =================================================================== --- benchmarks/benchmark-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java 2008-01-30 18:36:19 UTC (rev 5266) +++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/CacheBenchmarkRunner.java 2008-01-31 00:25:05 UTC (rev 5267) @@ -17,6 +17,7 @@ import java.util.Date; import java.util.List; import java.util.Map; +import java.util.HashMap; /** @@ -30,6 +31,13 @@ private Log logger = LogFactory.getLog(CacheBenchmarkRunner.class); private Log errorLogger = LogFactory.getLog("CacheException"); + // information about how we are called: + + String cacheProductName; + String configuraton; + int clusterSize; + Map<String, String> systemParams = new HashMap<String, String>(); + public static void main(String[] args) { String conf = null; @@ -47,6 +55,20 @@ } } + /** + * Initialise some params that may be passed in via JVM params + */ + private void initJVMParams() + { + String configuraton = System.getProperty("cacheBenchFwk.cacheConfigFile"); + String cacheProductName = System.getProperty("cacheBenchFwk.cachePrioductName"); + String clusterSize = System.getProperty("clusterSize"); + + if (configuraton != null) systemParams.put("config", configuraton); + if (cacheProductName != null) systemParams.put("cacheProductName", cacheProductName); + if (clusterSize != null) systemParams.put("clusterSize", clusterSize); + } + private CacheBenchmarkRunner() { this("cachebench.xml"); @@ -54,6 +76,7 @@ private CacheBenchmarkRunner(String s) { + initJVMParams(); // first, try and find the configuration on the filesystem. URL confFile = ConfigBuilder.findConfigFile(s); if (confFile == null) @@ -105,8 +128,7 @@ { Map<String,String> params = test.getParams(); // now add the config file, if any is passed in: - String configSystemProperty = System.getProperty("cacheBenchFwk.cacheConfigFile"); - if (configSystemProperty != null) params.put("config", configSystemProperty); + params.putAll(systemParams); logger.info("Initialising cache with params " + params); cache.init(params); barrier("BEFORE_WARMUP"); @@ -250,7 +272,9 @@ generator = getReportGenerator(report); if (generator != null) { - generator.setConfigParams(report.getParams()); + Map<String, String> params = report.getParams(); + params.putAll(systemParams); + generator.setConfigParams(params); generator.setResults(results); generator.setClusterConfig(conf.getClusterConfig()); generator.setOutputFile(report.getOutputFile()); Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/AbstractReportGenerator.java =================================================================== --- benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/AbstractReportGenerator.java 2008-01-30 18:36:19 UTC (rev 5266) +++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/AbstractReportGenerator.java 2008-01-31 00:25:05 UTC (rev 5267) @@ -7,6 +7,7 @@ import java.io.File; import java.util.ArrayList; import java.util.List; +import java.util.Map; /** * Base implementation of {@link org.cachebench.reportgenerators.ReportGenerator} @@ -17,7 +18,13 @@ protected List<TestResult> results; protected Log log; protected ClusterConfig clusterConfig; + protected Map<String, String> params; + public void setConfigParams(Map<String, String> params) + { + this.params = params; + } + public void setOutputFile(String fileName) { this.output = new File(getFileName(fileName)); @@ -27,7 +34,7 @@ { if (fileName.indexOf("-generic-") >=0 ) { - return "performance-" + clusterConfig.getClusterSize() + ".csv"; + return "data-" + params.get("cacheProductName") + "-" + params.get("config") + "-" + params.get("clusterSize") + ".csv"; } log.info("Filename for report generation is: " + fileName); return fileName; Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/ClusterReportGenerator.java =================================================================== --- benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/ClusterReportGenerator.java 2008-01-30 18:36:19 UTC (rev 5266) +++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/ClusterReportGenerator.java 2008-01-31 00:25:05 UTC (rev 5267) @@ -22,8 +22,10 @@ private static Log log = LogFactory.getLog(ClusterReportGenerator.class); private String reportGeneratorClassName; + @Override public void setConfigParams(Map<String, String> configParams) { + super.setConfigParams(configParams); log.trace("Received config params: " + configParams); reportGeneratorClassName = configParams.get("generatorClassName"); } Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/CsvBaseReportGenerator.java =================================================================== --- benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/CsvBaseReportGenerator.java 2008-01-30 18:36:19 UTC (rev 5266) +++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/CsvBaseReportGenerator.java 2008-01-31 00:25:05 UTC (rev 5267) @@ -19,14 +19,8 @@ { protected static Log log = LogFactory.getLog(CsvBaseReportGenerator.class); - protected Map<String,String> configParams; private ArrayList footNotes; - public void setConfigParams(Map<String, String> configParams) - { - this.configParams = configParams; - } - public void generate() throws Exception { try

16 years, 11 months

1
0
0 / 0

JBoss Cache SVN: r5266 - benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators.

by jbosscache-commits＠lists.jboss.org

Author: mircea.markus Date: 2008-01-30 13:36:19 -0500 (Wed, 30 Jan 2008) New Revision: 5266 Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/ClusterReportGenerator.java Log: guarded the received list of results Modified: benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/ClusterReportGenerator.java =================================================================== --- benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/ClusterReportGenerator.java 2008-01-30 18:24:23 UTC (rev 5265) +++ benchmarks/benchmark-fwk/trunk/src/org/cachebench/reportgenerators/ClusterReportGenerator.java 2008-01-30 18:36:19 UTC (rev 5266) @@ -66,7 +66,13 @@ List<List<TestResult>> results = new ArrayList<List<TestResult>>(); for (SocketAddress socketAddress : receivedMessages.keySet()) { - List<TestResult> testResults = (List<TestResult>) receivedMessages.get(socketAddress); + Object obj = receivedMessages.get(socketAddress); + if (!(obj instanceof List)) + { + log.error("Expected a List of results, but received '" + obj + "'"); + throw new IllegalStateException("Expected a List of results, but received '" + obj + "'"); + } + List<TestResult> testResults = (List<TestResult>) obj; log.trace("From " + socketAddress + " received " + testResults); results.add(testResults); }

16 years, 11 months

1
0
0 / 0

JBoss Cache SVN: r5265 - in core/trunk/src/main/java/org/jboss/cache: interceptors and 2 other directories.

by jbosscache-commits＠lists.jboss.org

Author: mircea.markus Date: 2008-01-30 13:24:23 -0500 (Wed, 30 Jan 2008) New Revision: 5265 Modified: core/trunk/src/main/java/org/jboss/cache/CacheImpl.java core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInterceptor.java core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java core/trunk/src/main/java/org/jboss/cache/marshall/MethodDeclarations.java Log: removal event is not triggered anymore when a phantom node is created Modified: core/trunk/src/main/java/org/jboss/cache/CacheImpl.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/CacheImpl.java 2008-01-30 17:38:21 UTC (rev 5264) +++ core/trunk/src/main/java/org/jboss/cache/CacheImpl.java 2008-01-30 18:24:23 UTC (rev 5265) @@ -633,13 +633,13 @@ _remove(null, // no tx tmp, false, // no undo ops - false, // no nodeEvent + true, // no nodeEvent true);// is an eviction } } // Remove the root node of the subtree - _remove(null, subtree, false, false, true); + _remove(null, subtree, false, true, true); } @@ -1210,13 +1210,13 @@ * @param tx * @param fqn * @param create_undo_ops - * @param sendNodeEvent + * @param skipSendingNodeEvents * @param eviction * @param version * @return true if the node was removed, false if not found * @throws CacheException */ - public boolean _remove(GlobalTransaction tx, Fqn fqn, boolean create_undo_ops, boolean sendNodeEvent, boolean eviction, DataVersion version) + public boolean _remove(GlobalTransaction tx, Fqn fqn, boolean create_undo_ops, boolean skipSendingNodeEvents, boolean eviction, DataVersion version) throws CacheException { @@ -1259,7 +1259,7 @@ return false; } - if (!isRollback) + if (!isRollback && !skipSendingNodeEvents) { if (eviction) { @@ -1304,7 +1304,7 @@ transactionTable.addUndoOperation(tx, undo_op); } - if (!isRollback) + if (!isRollback && !skipSendingNodeEvents) { if (eviction) { @@ -1559,7 +1559,7 @@ } else { - _remove(null, fqn, false, false, true, version); + _remove(null, fqn, false, true, true, version); return true; } } @@ -1669,7 +1669,7 @@ if (gtx != null && undoOps) { // 1. put undo-op in TX' undo-operations list (needed to rollback TX) - transactionTable.addUndoOperation(gtx, MethodCallFactory.create(MethodDeclarations.removeNodeMethodLocal_id, gtx, fqn, false)); + transactionTable.addUndoOperation(gtx, MethodCallFactory.create(MethodDeclarations.removeNodeMethodLocal_id, gtx, fqn, false, false)); } if (!isRollback) notifier.notifyNodeCreated(fqn, false, ctx); Modified: core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java 2008-01-30 17:38:21 UTC (rev 5264) +++ core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java 2008-01-30 18:24:23 UTC (rev 5265) @@ -274,7 +274,7 @@ if (gtx != null) { MethodCall undo_op = MethodCallFactory.create(MethodDeclarations.removeNodeMethodLocal_id, - gtx, child_fqn, false); + gtx, child_fqn, false, false); cacheImpl.addUndoOperation(gtx, undo_op); // add the node name to the list maintained for the current tx // (needed for abort/rollback of transaction) Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInterceptor.java 2008-01-30 17:38:21 UTC (rev 5264) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInterceptor.java 2008-01-30 18:24:23 UTC (rev 5265) @@ -246,8 +246,15 @@ } } acquireLocksOnChildren(peekNode(ctx, fqn, false, false, false), NodeLock.LockType.WRITE, ctx); + if (!createdNodes.isEmpty()) + { + if (trace) log.trace("There were new nodes created, skiping notification on delete"); + Object[] args = ctx.getMethodCall().getArgs(); + if (trace) log.trace("Changing 'skipNotification' for method '_remove' from " + args[args.length - 1] + " to true"); + args[args.length - 1] = Boolean.TRUE; + } + Object retVal = nextInterceptor(ctx); - // and make sure we remove all nodes we've created for the sake of later removal. if (ctx.getGlobalTransaction() == null) { Modified: core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java 2008-01-30 17:38:21 UTC (rev 5264) +++ core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java 2008-01-30 18:24:23 UTC (rev 5265) @@ -422,7 +422,7 @@ } else { - MethodCall m = MethodCallFactory.create(MethodDeclarations.removeNodeMethodLocal_id, tx, fqn, true); + MethodCall m = MethodCallFactory.create(MethodDeclarations.removeNodeMethodLocal_id, tx, fqn, true, false); Object retval = invoke(m); return retval != null && (Boolean) retval; } Modified: core/trunk/src/main/java/org/jboss/cache/marshall/MethodDeclarations.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/marshall/MethodDeclarations.java 2008-01-30 17:38:21 UTC (rev 5264) +++ core/trunk/src/main/java/org/jboss/cache/marshall/MethodDeclarations.java 2008-01-30 18:24:23 UTC (rev 5265) @@ -245,7 +245,7 @@ putDataEraseMethodLocal = CacheImpl.class.getDeclaredMethod("_put", GlobalTransaction.class, Fqn.class, Map.class, boolean.class, boolean.class); putKeyValMethodLocal = CacheImpl.class.getDeclaredMethod("_put", GlobalTransaction.class, Fqn.class, Object.class, Object.class, boolean.class); putForExternalReadMethodLocal = CacheImpl.class.getDeclaredMethod("_putForExternalRead", GlobalTransaction.class, Fqn.class, Object.class, Object.class); - removeNodeMethodLocal = CacheImpl.class.getDeclaredMethod("_remove", GlobalTransaction.class, Fqn.class, boolean.class); + removeNodeMethodLocal = CacheImpl.class.getDeclaredMethod("_remove", GlobalTransaction.class, Fqn.class, boolean.class, boolean.class); removeKeyMethodLocal = CacheImpl.class.getDeclaredMethod("_remove", GlobalTransaction.class, Fqn.class, Object.class, boolean.class); removeDataMethodLocal = CacheImpl.class.getDeclaredMethod("_removeData", GlobalTransaction.class, Fqn.class, boolean.class); evictNodeMethodLocal = CacheImpl.class.getDeclaredMethod("_evict", Fqn.class);

16 years, 11 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbosscache-commits January 2008