[jboss-cvs] JBossAS SVN: r107838 - in projects/jboss-jca/branches/performance/apps: src/main/java/org/jboss/jca/performance/apps and 1 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Aug 27 04:21:23 EDT 2010
Author: jeff.zhang
Date: 2010-08-27 04:21:23 -0400 (Fri, 27 Aug 2010)
New Revision: 107838
Added:
projects/jboss-jca/branches/performance/apps/src/main/resources/html.css
Modified:
projects/jboss-jca/branches/performance/apps/build.xml
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/HtmlBenchmarkReport.java
Log:
[JBJCA-394] add css to html report
Modified: projects/jboss-jca/branches/performance/apps/build.xml
===================================================================
--- projects/jboss-jca/branches/performance/apps/build.xml 2010-08-27 06:22:45 UTC (rev 107837)
+++ projects/jboss-jca/branches/performance/apps/build.xml 2010-08-27 08:21:23 UTC (rev 107838)
@@ -70,11 +70,9 @@
Target: benchmark-report
================================= -->
<target name="benchmark-report">
-<!--
- <copy todir="${build.dir}">
- <fileset dir="src/main/resources/" includes="*"/>
+ <copy todir="${root.dir}/reports/${kit.version}/benchmark/${report.num}">
+ <fileset dir="src/main/resources" includes="*.css"/>
</copy>
--->
<path id="benchmark.report.classpath">
<fileset dir="${target.dir}" includes="ironjacamar-performance-apps.jar"/>
</path>
@@ -105,7 +103,10 @@
Target: benchmark-report-summary
================================= -->
<target name="benchmark-report-summary">
- <path id="benchmark.report.classpath">
+ <copy todir="${root.dir}/reports/benchmark/${report.num}">
+ <fileset dir="src/main/resources" includes="*.css"/>
+ </copy>
+ <path id="benchmark.report.classpath">
<fileset dir="${target.dir}" includes="ironjacamar-performance-apps.jar"/>
</path>
<java classname="org.jboss.jca.performance.apps.CompareHtmlBenchmarkReport" dir="${build.dir}">
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-08-27 06:22:45 UTC (rev 107837)
+++ projects/jboss-jca/branches/performance/apps/src/main/java/org/jboss/jca/performance/apps/CompareHtmlBenchmarkReport.java 2010-08-27 08:21:23 UTC (rev 107838)
@@ -44,6 +44,8 @@
int[][] workManagerBlockArray = new int[units.length * 2][servers.length];
int[][] connectionArray = new int[units.length * 2][servers.length];
+ String runNumber;
+
/**
* main
*
@@ -61,6 +63,7 @@
{
CompareHtmlBenchmarkReport report = new CompareHtmlBenchmarkReport();
+ report.runNumber = args[1];
for (String server : servers)
{
@@ -183,8 +186,12 @@
{
fw.write("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">");
writeEol(fw);
- fw.write("<html><head><title>benchmark report</title></head><body>");
+ fw.write("<html><head><title>benchmark report</title>");
writeEol(fw);
+ fw.write("<link rel=\"stylesheet\" type=\"text/css\" id=\"css\" href=\"html.css\">");
+ writeEol(fw);
+ fw.write("</head><body>");
+ writeEol(fw);
}
/**
@@ -196,7 +203,7 @@
@Override
void generateSubject(FileWriter fw) throws IOException
{
- fw.write("<p><b1>Servers</b1></p>");
+ fw.write("<p><h1>Servers</h1></p>");
writeEol(fw);
}
/**
@@ -229,9 +236,9 @@
*/
private void writeArrayData(FileWriter fw, int[][] data, String text) throws IOException
{
- fw.write("<p><b2>");
+ fw.write("<p><h2>");
fw.write(text);
- fw.write("</b2></p>");
+ fw.write("</h2></p>");
writeEol(fw);
fw.write("<table border=\"1\">");
writeEol(fw);
@@ -253,7 +260,8 @@
fw.write("<theader><td>Units</td><td>Transaction</td>");
for (int i = 0; i < servers.length; i++)
{
- fw.write("<td>" + servers[i] + "</td>");
+ fw.write("<td><a href=\"../../" + servers[i] + "/benchmark/" + this.runNumber + "/report.html\">" +
+ servers[i] + "</a></td>");
}
fw.write("</theader>");
writeEol(fw);
Modified: projects/jboss-jca/branches/performance/apps/src/main/java/org/jboss/jca/performance/apps/HtmlBenchmarkReport.java
===================================================================
--- projects/jboss-jca/branches/performance/apps/src/main/java/org/jboss/jca/performance/apps/HtmlBenchmarkReport.java 2010-08-27 06:22:45 UTC (rev 107837)
+++ projects/jboss-jca/branches/performance/apps/src/main/java/org/jboss/jca/performance/apps/HtmlBenchmarkReport.java 2010-08-27 08:21:23 UTC (rev 107838)
@@ -96,8 +96,12 @@
{
fw.write("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\">");
writeEol(fw);
- fw.write("<html><head><title>benchmark report</title></head><body>");
+ fw.write("<html><head><title>benchmark report</title>");
writeEol(fw);
+ fw.write("<link rel=\"stylesheet\" type=\"text/css\" id=\"css\" href=\"html.css\">");
+ writeEol(fw);
+ fw.write("</head><body>");
+ writeEol(fw);
}
/**
@@ -109,7 +113,7 @@
@Override
void generateSubject(FileWriter fw) throws IOException
{
- fw.write("<p><b1>");
+ fw.write("<p><h1>");
String split[] = serverVersion.split("-");
if (split[0].equals("jbas"))
fw.write("JBoss Application Server ");
@@ -120,7 +124,7 @@
fw.write("SNAPSHOT");
else
fw.write(split[1]);
- fw.write("</b1></p>");
+ fw.write("</h1></p>");
writeEol(fw);
}
/**
@@ -149,9 +153,9 @@
{
if (data.size() > 0)
{
- fw.write("<p><b2>");
+ fw.write("<p><h2>");
fw.write(text);
- fw.write("</b2></p>");
+ fw.write("</h2></p>");
writeEol(fw);
fw.write("<table border=\"1\">");
writeEol(fw);
Added: projects/jboss-jca/branches/performance/apps/src/main/resources/html.css
===================================================================
--- projects/jboss-jca/branches/performance/apps/src/main/resources/html.css (rev 0)
+++ projects/jboss-jca/branches/performance/apps/src/main/resources/html.css 2010-08-27 08:21:23 UTC (rev 107838)
@@ -0,0 +1,122 @@
+ * {
+ font-family: "Verdana", "Arial", "Helvetica";
+ font-size: 14px;
+ }
+
+ A {
+ color: #0000CC;
+ }
+
+ A:active {
+ color: #0000CC;
+ }
+
+ A:visited {
+ color: #0000CC;
+ }
+
+ P, OL, UL, LI, DL, DT, DD, BLOCKQUOTE {
+ color: #000000;
+ }
+
+ TD, TH, SPAN {
+ color: #000000;
+ }
+
+ BLOCKQUOTE {
+ margin-right: 0px;
+ }
+
+
+ H1, H2, H3, H4, H5, H6 {
+ color: #003399;
+ font-weight: 500;
+ margin-top: 10px;
+ padding-top: 5px;
+ }
+
+ H1 { font-size: 150%; }
+ H2 { font-size: 140%; }
+ H3 { font-size: 110%; font-weight: bold; }
+ H4 { font-size: 110%; font-weight: bold;}
+ H5 { font-size: 100%; font-style: italic; }
+ H6 { font-size: 100%; font-style: italic; }
+
+ TABLE {
+ border-collapse: collapse;
+ border-spacing: 0;
+ /*border: 1px dashed #CCCCCC;*/
+ empty-cells: hide;
+ width: 100%
+ }
+
+ TD {
+ padding: 4pt;
+ }
+
+
+ TT {
+ font-size: 90%;
+ font-style: monospace;
+ color: #111111;
+ }
+
+ PRE {
+ font-size: 100%;
+ padding: 5px;
+ border-style: solid;
+ border-width: 1px;
+ border-color: #CCCCCC;
+ background-color: #F4F4F4;
+ }
+
+ HR {
+ width: 100%;
+ height: 1px;
+ background-color: #CCCCCC;
+ border-width: 0px;
+ padding: 0px;
+ color: #CCCCCC;
+ }
+
+ .variablelist {
+ padding-top: 10;
+ padding-bottom: 10;
+ margin: 0;
+ }
+
+ .itemizedlist {
+ padding-top: 0;
+ padding-bottom: 0;
+ margin: 0;
+ list-style-type: disc;
+
+ }
+
+ .orderedlist{
+ padding-top: 0;
+ padding-bottom: 0;
+ margin: 0;
+ }
+
+ .term {
+ font-weight: bold;
+ }
+
+ .note
+ {
+ padding-bottom: 5px;
+ padding-left: 5px;
+ padding-right: 5px;
+ background-color: #FFFFCC;
+ }
+
+ .warning
+ {
+ padding-bottom: 5px;
+ padding-left: 5px;
+ padding-right: 5px;
+ background-color: #FBDADA;
+ }
+
+
More information about the jboss-cvs-commits
mailing list