[jboss-cvs] JBossAS SVN: r109291 - in projects/jboss-jca/branches/performance: servers and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Thu Nov 11 23:25:06 EST 2010
Author: jeff.zhang
Date: 2010-11-11 23:25:05 -0500 (Thu, 11 Nov 2010)
New Revision: 109291
Modified:
projects/jboss-jca/branches/performance/apps/src/main/java/org/jboss/jca/performance/apps/ChartGraphics.java
projects/jboss-jca/branches/performance/apps/src/main/java/org/jboss/jca/performance/apps/CompareHtmlBenchmarkReport.java
projects/jboss-jca/branches/performance/servers/build.xml
Log:
[JBJCA-423] add all jbjca beta version data
Modified: projects/jboss-jca/branches/performance/apps/src/main/java/org/jboss/jca/performance/apps/ChartGraphics.java
===================================================================
--- projects/jboss-jca/branches/performance/apps/src/main/java/org/jboss/jca/performance/apps/ChartGraphics.java 2010-11-12 04:08:50 UTC (rev 109290)
+++ projects/jboss-jca/branches/performance/apps/src/main/java/org/jboss/jca/performance/apps/ChartGraphics.java 2010-11-12 04:25:05 UTC (rev 109291)
@@ -38,6 +38,7 @@
new Color(0, 128, 0),
new Color(0, 191, 255),
new Color(0, 139, 139),
+ Color.blue,
new Color(224, 255, 255)};
private BufferedImage image;
@@ -60,11 +61,11 @@
public void graphicsGeneration(int[][] data, String imageFile)
{
final int X = 20;
- int imageWidth = 1050;
+ int imageWidth = 1250;
int imageHeight = 600;
int columnWidth = 10;
int columnHeight = 550;
- int groupDistance = 160;
+ int groupDistance = 190;
int barDistance = 5;
final int H = 50;
final int Y = 70;
@@ -106,7 +107,7 @@
if (i < CompareHtmlBenchmarkReport.servers.length)
graphics.drawString(CompareHtmlBenchmarkReport.servers[i], X + 105, H + i * (columnWidth + barDistance) + 10);
else
- graphics.drawString(CompareHtmlBenchmarkReport.servers[i - 4] + " with abq mcp",
+ graphics.drawString(CompareHtmlBenchmarkReport.servers[i - 1] + " with abq mcp",
X + 105, H + i * (columnWidth + barDistance) + 10);
}
Modified: projects/jboss-jca/branches/performance/apps/src/main/java/org/jboss/jca/performance/apps/CompareHtmlBenchmarkReport.java
===================================================================
--- projects/jboss-jca/branches/performance/apps/src/main/java/org/jboss/jca/performance/apps/CompareHtmlBenchmarkReport.java 2010-11-12 04:08:50 UTC (rev 109290)
+++ projects/jboss-jca/branches/performance/apps/src/main/java/org/jboss/jca/performance/apps/CompareHtmlBenchmarkReport.java 2010-11-12 04:25:05 UTC (rev 109291)
@@ -36,13 +36,14 @@
*/
public class CompareHtmlBenchmarkReport extends BenchmarkReport
{
- final static String[] servers = {"jbas-4.2.3.GA", "jbas-5.1.0.GA", "jbjca-1.0.0.Beta3", "jbjca-daily"};
+ final static String[] servers = {"jbas-4.2.3.GA", "jbas-5.1.0.GA",
+ "jbjca-1.0.0.Beta1", "jbjca-1.0.0.Beta2", "jbjca-1.0.0.Beta3", "jbjca-daily"};
final static String[] units = {"1", "10", "100", "1000", "10000", "100000"};
final static String[] transactions = {"NoTransaction", "XATransaction"};
int[][] workManagerArray = new int[units.length * 2][servers.length];
int[][] workManagerBlockArray = new int[units.length * 2][servers.length];
- int[][] connectionArray = new int[units.length * 2][servers.length + 2]; // +2 for Abq MCP of jbjca
+ int[][] connectionArray = new int[units.length * 2][servers.length + 1]; // +1 for Abq MCP of jbjca-daily
String runNumber;
@@ -173,7 +174,7 @@
server = i;
}
if (part[1].equals("JBJCA_ABQ"))
- dataArray[unit * 2 + tran][server + 2] = Integer.parseInt(part[4]); //abq mcp
+ dataArray[unit * 2 + tran][server + 1] = Integer.parseInt(part[4]); //abq mcp
else
dataArray[unit * 2 + tran][server] = Integer.parseInt(part[4]);
}
@@ -294,11 +295,9 @@
}
if (isConn)
{
- for (int i = 0; i < servers.length - 2; i++)
- {
- fw.write("<td><a href=\"../../" + servers[servers.length - 2 + i] + "/benchmark/" + this.runNumber + "/report.html\">" +
- servers[servers.length - 2 + i] + "</a> with ABQ</td>");
- }
+ fw.write("<td><a href=\"../../" + servers[servers.length - 1] + "/benchmark/" + this.runNumber + "/report.html\">" +
+ servers[servers.length - 1] + "</a> with ABQ</td>");
+
}
fw.write("</theader>");
writeEol(fw);
@@ -317,7 +316,7 @@
{
int serverCol;
if (isConn)
- serverCol = servers.length + 2;
+ serverCol = servers.length + 1;
else
serverCol = servers.length;
Modified: projects/jboss-jca/branches/performance/servers/build.xml
===================================================================
--- projects/jboss-jca/branches/performance/servers/build.xml 2010-11-12 04:08:50 UTC (rev 109290)
+++ projects/jboss-jca/branches/performance/servers/build.xml 2010-11-12 04:25:05 UTC (rev 109291)
@@ -31,7 +31,13 @@
<property name="jbossas.6.file" value="6.0.0.20100911-M5" />
<property name="jbossas.5.version" value="5.1.0.GA" />
<property name="jbossas.4.version" value="4.2.3.GA" />
+
+ <property name="ironjacamar.beta1" value="1.0.0.Beta1" />
+ <property name="ironjacamar.beta2" value="1.0.0.Beta2" />
+ <property name="ironjacamar.beta3" value="1.0.0.Beta3" />
+<!--
<property name="ironjacamar.version" value="1.0.0.Beta3" />
+-->
<property name="ironjacamar.daily" value="daily" />
<property name="ironjacamar.sjc" value="${root.dir}/../../../trunk/target/sjc" />
@@ -72,8 +78,12 @@
<get src="http://sourceforge.net/projects/jboss/files/JBoss/JBoss-${jbossas.4.version}/jboss-${jbossas.4.version}.zip/download"
dest="${root.dir}/downloads/jboss-${jbossas.4.version}.zip" skipexisting="true"/>
- <get src="http://sourceforge.net/projects/jboss/files/IronJacamar/${ironjacamar.version}/ironjacamar-${ironjacamar.version}.zip/download"
- dest="${root.dir}/downloads/ironjacamar-${ironjacamar.version}.zip" skipexisting="true"/>
+ <get src="http://sourceforge.net/projects/jboss/files/IronJacamar/${ironjacamar.beta1}/ironjacamar-${ironjacamar.beta1}.zip/download"
+ dest="${root.dir}/downloads/ironjacamar-${ironjacamar.beta1}.zip" skipexisting="true"/>
+ <get src="http://sourceforge.net/projects/jboss/files/IronJacamar/${ironjacamar.beta2}/ironjacamar-${ironjacamar.beta2}.zip/download"
+ dest="${root.dir}/downloads/ironjacamar-${ironjacamar.beta2}.zip" skipexisting="true"/>
+ <get src="http://sourceforge.net/projects/jboss/files/IronJacamar/${ironjacamar.beta3}/ironjacamar-${ironjacamar.beta3}.zip/download"
+ dest="${root.dir}/downloads/ironjacamar-${ironjacamar.beta3}.zip" skipexisting="true"/>
</target>
<!-- =================================
@@ -84,7 +94,10 @@
<available file="${root.dir}/servers/jbas-${jbossas.5.version}/jboss-${jbossas.5.version}/bin" type="dir" property="exist.as5" value="true"/>
<available file="${root.dir}/servers/jbas-${jbossas.4.version}/jboss-${jbossas.4.version}/bin" type="dir" property="exist.as4" value="true"/>
- <available file="${root.dir}/servers/jbjca-${ironjacamar.version}/ironjacamar-${ironjacamar.version}/bin" type="dir" property="exist.jca.1" value="true"/>
+ <available file="${root.dir}/servers/jbjca-${ironjacamar.beta1}/ironjacamar-${ironjacamar.beta1}/bin" type="dir" property="exist.jca.1" value="true"/>
+ <available file="${root.dir}/servers/jbjca-${ironjacamar.beta2}/ironjacamar-${ironjacamar.beta2}/bin" type="dir" property="exist.jca.2" value="true"/>
+ <available file="${root.dir}/servers/jbjca-${ironjacamar.beta3}/ironjacamar-${ironjacamar.beta3}/bin" type="dir" property="exist.jca.3" value="true"/>
+
<available file="${root.dir}/servers/jbjca-daily/ironjacamar-daily/bin" type="dir" property="exist.jca.d" value="true"/>
<available file="${ironjacamar.sjc}/bin" type="dir" property="exist.jca.sjc" value="true"/>
</target>
@@ -101,10 +114,18 @@
<unzip src="${root.dir}/downloads/jboss-${jbossas.4.version}.zip" dest="${root.dir}/servers/jbas-${jbossas.4.version}"/>
</target>
- <target name="unzip-jbjca" depends="exist-servers" unless="exist.jca.1">
- <unzip src="${root.dir}/downloads/ironjacamar-${ironjacamar.version}.zip" dest="${root.dir}/servers/jbjca-${ironjacamar.version}"/>
+ <target name="unzip-jbjca-b1" depends="exist-servers" unless="exist.jca.1">
+ <unzip src="${root.dir}/downloads/ironjacamar-${ironjacamar.beta1}.zip" dest="${root.dir}/servers/jbjca-${ironjacamar.beta1}"/>
</target>
+ <target name="unzip-jbjca-b2" depends="exist-servers" unless="exist.jca.2">
+ <unzip src="${root.dir}/downloads/ironjacamar-${ironjacamar.beta2}.zip" dest="${root.dir}/servers/jbjca-${ironjacamar.beta2}"/>
+ </target>
+
+ <target name="unzip-jbjca-b3" depends="exist-servers" unless="exist.jca.3">
+ <unzip src="${root.dir}/downloads/ironjacamar-${ironjacamar.beta3}.zip" dest="${root.dir}/servers/jbjca-${ironjacamar.beta3}"/>
+ </target>
+
<target name="copy-jbjca-daily" depends="exist-servers" unless="exist.jca.d" if="exist.jca.sjc">
<copy todir="${root.dir}/servers/jbjca-daily/ironjacamar-daily">
<fileset dir="${root.dir}/../../../trunk/target/sjc"/>
@@ -118,7 +139,10 @@
<antcall target="unzip-as5"/>
<antcall target="unzip-as4"/>
- <antcall target="unzip-jbjca"/>
+ <antcall target="unzip-jbjca-b1"/>
+ <antcall target="unzip-jbjca-b2"/>
+ <antcall target="unzip-jbjca-b3"/>
+
<antcall target="copy-jbjca-daily"/>
</target>
@@ -300,9 +324,17 @@
<antcall target="profiler-daily"/>
<antcall target="profiler-jbjca">
- <param name="jbjca.kit" value="${ironjacamar.version}"/>
+ <param name="jbjca.kit" value="${ironjacamar.beta1}"/>
</antcall>
+ <antcall target="profiler-jbjca">
+ <param name="jbjca.kit" value="${ironjacamar.beta2}"/>
+ </antcall>
+
+ <antcall target="profiler-jbjca">
+ <param name="jbjca.kit" value="${ironjacamar.beta3}"/>
+ </antcall>
+
<antcall target="profiler-jbas">
<param name="jbas.kit" value="${jbossas.4.version}"/>
</antcall>
@@ -812,10 +844,17 @@
<antcall target="benchmark-daily"/>
<antcall target="doBenchmark-jbjca">
- <param name="jbjca.kit" value="${ironjacamar.version}"/>
- <param name="run.jbjca.d" value="true"/>
+ <param name="jbjca.kit" value="${ironjacamar.beta1}"/>
</antcall>
+ <antcall target="doBenchmark-jbjca">
+ <param name="jbjca.kit" value="${ironjacamar.beta2}"/>
+ </antcall>
+
+ <antcall target="doBenchmark-jbjca">
+ <param name="jbjca.kit" value="${ironjacamar.beta3}"/>
+ </antcall>
+
<antcall target="doBenchmark-jbas">
<param name="jbas.kit" value="${jbossas.4.version}"/>
</antcall>
More information about the jboss-cvs-commits
mailing list