Author: jsong
Date: Fri Feb 11 16:33:28 2005
New Revision: 153475
URL: http://svn.apache.org/viewcvs?view=rev&rev=153475
Log:
Contributed by Jamie Zyskowski: more updates to reportWeb, add a doc target to
build
Modified:
incubator/beehive/trunk/controls/test/perf/build.xml
incubator/beehive/trunk/controls/test/perf/webapps/build.xml
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/Controller.jpf
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/index.jsp
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/xmlbeans.jsp
Modified: incubator/beehive/trunk/controls/test/perf/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/perf/build.xml?view=diff&r1=153474&r2=153475
==============================================================================
--- incubator/beehive/trunk/controls/test/perf/build.xml (original)
+++ incubator/beehive/trunk/controls/test/perf/build.xml Fri Feb 11 16:33:28
2005
@@ -5,6 +5,7 @@
<echo>
Usage:
bootstrap - for report web only (downloads cewolf jars)
+doc - build javadocs
[re]build - builds everything
[re]build.tests - build tests and utils
[re]build.controls - build controls only
@@ -32,9 +33,9 @@
<property name="control.perf.ctlbuild"
value="${control.perf.root}/ctlbuild"/>
<property name="control.perf.src" value="${control.perf.root}/src"/>
<property name="control.perf.build" value="${control.perf.root}/build"/>
+ <property name="control.perf.docbuild"
value="${control.perf.root}/build/docs"/>
<property name="control.perf.cases" value="${control.perf.root}/cases"/>
<property name="control.perf.temp" value="${control.perf.root}/temp"/>
- <property name="control.perf.lib" value="${control.perf.root}/lib"/>
<property name="control.perf.logs" value="${control.perf.root}/logs"/>
<!-- graphing utils used in reportWeb -->
@@ -86,6 +87,18 @@
<pathelement path="${control.perf.build}"/>
</path>
+ <path id="doc.classpath">
+ <path refid="controls.dependency.path"/>
+ <path refid="xbean.dependency.path"/>
+ <path refid="ant-all.dependency.path"/>
+ <pathelement path="${control.perf.external}/perf-results.jar"/>
+ <pathelement path="${tch.jar}"/>
+ <pathelement path="${milton.jar}"/>
+ <pathelement path="${httpunit.jar}"/>
+ <pathelement path="${control.perf.build}"/>
+ <pathelement path="${control.perf.ctlbuild}"/>
+ </path>
+
<!-- task definitions -->
<taskdef name="apt"
classname="org.apache.beehive.controls.runtime.generator.AptTask"
@@ -97,6 +110,22 @@
classpathref="tch.run.classpath"/>
<!-- build targets -->
+ <path id="doc.srcpaths">
+ <pathelement path="${control.perf.src}"/>
+ <pathelement path="${control.perf.ctlsrc}"/>
+ </path>
+
+ <target name="doc.build">
+ <mkdir dir="${control.perf.docbuild}"/>
+ <javadoc
+ sourcepathref="doc.srcpaths"
+ destdir="${control.perf.docbuild}"
+ source="1.5"
+ packagenames="org.apache.beehive.controls.perf.*"
+ classpathref="doc.classpath"
+ />
+ </target>
+
<target name="bootstrap">
<mkdir dir="${control.perf.external}"/>
<get
src="http://umn.dl.sourceforge.net/sourceforge/cewolf/${cewolf.version}.zip";
@@ -157,7 +186,7 @@
</target>
<target name="build"
depends="build.controls,build.tests,controlperf.jar"/>
- <target name="rebuild" depends="rebuild.controls,rebuild.tests"/>
+ <target name="rebuild"
depends="rebuild.controls,rebuild.tests,doc.build"/>
<target name="rebuild.controls"
depends="clean.controls,build.controls"/>
<target name="rebuild.tests"
depends="clean.tests,build.tests,controlperf.jar"/>
Modified: incubator/beehive/trunk/controls/test/perf/webapps/build.xml
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/perf/webapps/build.xml?view=diff&r1=153474&r2=153475
==============================================================================
--- incubator/beehive/trunk/controls/test/perf/webapps/build.xml (original)
+++ incubator/beehive/trunk/controls/test/perf/webapps/build.xml Fri Feb 11
16:33:28 2005
@@ -85,13 +85,14 @@
<target name="reportWeb.stage" if="reportweb.properties.exists"
depends="check.reportweb.properties">
- <echo message="XMLBEANS REPORTS:
xmlbeans.report.dir=${xmlbeans.report.dir}"/>
- <echo message="BEEHIVE REPORTS:
beehive.report.dir=${beehive.report.dir}"/>
-
<copy todir="${webapp.stage.dir}/${webapp.name}">
<fileset dir="${webapp.dir}"/>
</copy>
+ <copy todir="${webapp.stage.dir}/${webapp.name}/docs">
+ <fileset dir="${controls.perf.root}/build/docs"/>
+ </copy>
+
<!-- inject stuff -->
<ant antfile="${controls.test.root}/webapps/build.xml"
target="-inject.milton" inheritAll="false">
<property name="webapp.dir"
location="${webapp.stage.dir}/${webapp.name}"/>
@@ -123,8 +124,6 @@
<available property="reportweb.properties.exists"
file="${basedir}/reportweb.properties" type="file"/>
</target>
-
-
<target name="clean" description="Clean webapp">
Modified:
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/Controller.jpf
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/Controller.jpf?view=diff&r1=153474&r2=153475
==============================================================================
---
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/Controller.jpf
(original)
+++
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/Controller.jpf
Fri Feb 11 16:33:28 2005
@@ -43,6 +43,7 @@
@Jpf.Controller(
forwards = {
@Jpf.Forward(name="index",path="index.jsp"),
+
@Jpf.Forward(name="tableview",path="tableview.jsp"),
@Jpf.Forward(name="snapshot",path="snapshot.jsp"),
@Jpf.Forward(name="series",path="series.jsp"),
@Jpf.Forward(name="xmlbeans",path="xmlbeans.jsp"),
@@ -92,6 +93,14 @@
}
@Jpf.Action()
+ protected Forward tableview(ReportForm form)
+ {
+ Forward f = new Forward("error");
+ getRequest().setAttribute("msg", "NYI");
+ return f;
+ }
+
+ @Jpf.Action()
protected Forward snapshot(SnapshotForm form)
{
// defaults
@@ -275,8 +284,17 @@
private String ensureControlInited(String p_filename, String
p_controlKey) throws ClassNotFoundException,XmlException,IOException
{
String filenameResult = null;
- // if no filename given, use the newest
- if( (null == p_filename || p_filename.equalsIgnoreCase(""))
+ // check for form or a request param for the fileaname, latest
if none provided
+ if( (null == p_filename) && null !=
getRequest().getParameter("filename") && _isInited)
+ {
+ filenameResult = getRequest().getParameter("filename");
+ }
+ else if( (null == p_filename) && null !=
getRequest().getParameter("filename") && !_isInited)
+ {
+
initializeControl(_props.getProperty(p_controlKey+"dir"),p_controlKey);
+ filenameResult = getRequest().getParameter("filename");
+ }
+ else if( (null == p_filename ||
p_filename.equalsIgnoreCase(""))
&& _isInited)
{
filenameResult =
((PerfResultControlBean)_controls.get(p_controlKey)).getLatestFilename();
Modified:
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/index.jsp
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/index.jsp?view=diff&r1=153474&r2=153475
==============================================================================
--- incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/index.jsp
(original)
+++ incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/index.jsp
Fri Feb 11 16:33:28 2005
@@ -31,9 +31,13 @@
<br><br><h4 class=margin>XMLBeans Result Sets</h4>
+ <netui:form action="xmlbeans">
+ <netui:button value="Latest XMLBeans Results"
type="submit"/>
+ </netui:form>
<table border="1" id="XMLBEANS SUMMARY TABLE">
<tr>
- <td id="XMLBEANS
HEADINGS">Filename</td>
+ <td id="XMLBEANS
HEADINGS">Table Report</td>
+ <td id="XMLBEANS
HEADINGS">Graphical Report</td>
<td id="XMLBEANS
HEADINGS">Date</td>
<td id="XMLBEANS
HEADINGS">OS</td>
<td id="XMLBEANS
HEADINGS">JVM</td>
@@ -42,16 +46,22 @@
<%
HashMap<String,ResultSetDocument.ResultSet>
xmlbeanResultSets = xmlbeanResults.getResultSets();
Set keys = xmlbeanResultSets.keySet();
- Iterator it = keys.iterator();
- while(it.hasNext()){
- String filename = (String) it.next();
+ Object[] xmlbeansFilenames = keys.toArray();
+ for(int i=0; i<xmlbeansFilenames.length; i++){
+ String filename = (String)xmlbeansFilenames[i];
ResultSetDocument.ResultSet xmlbeanResultSet =
(ResultSetDocument.ResultSet)xmlbeanResultSets.get((Object)filename);
%>
<tr>
- <td id="RESULT FILENAME">
+ <td id="RESULT TABLE">
+ <netui:anchor
action="tableview">
+
<netui:parameter name="filename" value="<%=(String)xmlbeansFilenames[i]%>"/>
+ <netui:label
value="View"/>
+ </netui:anchor>
+ </td>
+ <td id="RESULT GRAPH">
<netui:anchor
action="xmlbeans">
-
<netui:parameter name="actionForm.filename" value=" <% out.print(filename); %>
"/>
- <%
out.print(filename); %>
+
<netui:parameter name="filename" value="<%=(String)xmlbeansFilenames[i]%>"/>
+ <netui:label
value="View"/>
</netui:anchor>
</td>
<td id="RESULT DATE"><%
out.print(xmlbeanResultSet.getEnvironment().getDate()); %></td>
@@ -64,19 +74,15 @@
%>
</table>
- <h4 class=margin>XMLBeans Analysis</h4>
- <netui:form action="xmlbeans">
- Filename (if none provided, latest by date):
- <netui:textBox dataSource="actionForm.filename"/>
- <netui:button value="Submit" type="submit"/>
- </netui:form>
-
-
<h4 class=margin>Controls Result Sets</h4>
+ <netui:form action="controls">
+ <netui:button value="Latest Controls Results"
type="submit"/>
+ </netui:form>
<table border="1" id="CONTROLS SUMMARY TABLE">
<tr>
- <td id="CONTROLS
HEADINGS">Filename</td>
+ <td id="CONTROLS
HEADINGS">Table Report</td>
+ <td id="CONTROLS
HEADINGS">Graphical Report</td>
<td id="CONTROLS
HEADINGS">Date</td>
<td id="CONTROLS
HEADINGS">OS</td>
<td id="CONTROLS
HEADINGS">JVM</td>
@@ -85,13 +91,24 @@
<%
HashMap<String,ResultSetDocument.ResultSet>
controlResultSets = controlResults.getResultSets();
keys = controlResultSets.keySet();
- it = keys.iterator();
- while(it.hasNext()){
- String filename = (String) it.next();
+ Object[] controlFilenames = keys.toArray();
+ for(int i=0; i<controlFilenames.length; i++){
+ String filename = (String) controlFilenames[i];
ResultSetDocument.ResultSet controlResultSet =
(ResultSetDocument.ResultSet)controlResultSets.get((Object)filename);
%>
<tr>
- <td id="RESULT FILENAME"><%
out.print(filename); %></td>
+ <td id="RESULT TABLE">
+ <netui:anchor
action="tableview">
+
<netui:parameter name="filename" value="<%=(String)controlFilenames[i]%>"/>
+ <netui:label
value="View"/>
+ </netui:anchor>
+ </td>
+ <td id="RESULT GRAPH">
+ <netui:anchor
action="controls">
+
<netui:parameter name="filename" value="<%=(String)controlFilenames[i]%>"/>
+ <netui:label
value="View"/>
+ </netui:anchor>
+ </td>
<td id="RESULT DATE"><%
out.print(controlResultSet.getEnvironment().getDate()); %></td>
<td id="RESULT OS"><%
out.print(controlResultSet.getEnvironment().getOs()); %></td>
<td id="RESULT JVM"><%
out.print(controlResultSet.getEnvironment().getJvm()); %></td>
@@ -102,59 +119,53 @@
%>
</table>
- <h4 class=margin>Controls Analysis</h4>
- <netui:form action="controls">
- Filename (if none provided, latest by date):
- <netui:textBox dataSource="actionForm.filename"/>
- <netui:button value="Submit" type="submit"/>
- </netui:form>
<h4 class=margin>Custom Series Graph Form</h4>
<netui:form action="series">
Filename:
- <netui:textBox dataSource="actionForm.filename"/>
+ <netui:select dataSource="actionForm.selections"
optionsDataSource="<%=xmlbeansFilenames%>"/><br>
Regex:
- <netui:textBox dataSource="actionForm.regex"/>
+ <netui:textBox dataSource="actionForm.regex"/><br>
Seriesname:
- <netui:textBox dataSource="actionForm.seriesname"/>
+ <netui:textBox dataSource="actionForm.seriesname"/><br>
X axis:
- <netui:textBox dataSource="actionForm.xaxis"/>
+ <netui:textBox dataSource="actionForm.xaxis"/><br>
X label:
- <netui:textBox dataSource="actionForm.xlabel"/>
+ <netui:textBox dataSource="actionForm.xlabel"/><br>
Y axis:
- <netui:textBox dataSource="actionForm.yaxis"/>
+ <netui:textBox dataSource="actionForm.yaxis"/><br>
Y label:
- <netui:textBox dataSource="actionForm.ylabel"/>
+ <netui:textBox dataSource="actionForm.ylabel"/><br>
Type:
- <netui:textBox dataSource="actionForm.type"/>
+ <netui:textBox dataSource="actionForm.type"/><br>
Width:
- <netui:textBox dataSource="actionForm.width"/>
+ <netui:textBox dataSource="actionForm.width"/><br>
Height:
- <netui:textBox dataSource="actionForm.height"/>
- <netui:button value="Submit" type="submit"/>
+ <netui:textBox dataSource="actionForm.height"/><br>
+ <netui:button value="Submit" type="submit"/> <br>
</netui:form>
<h4 class=margin>Custom Snapshot Graph Form</h4>
<netui:form action="snapshot">
Filename:
- <netui:textBox dataSource="actionForm.filename"/>
+ <netui:select dataSource="actionForm.selections"
optionsDataSource="<%=controlFilenames%>"/><br>
Regex:
- <netui:textBox dataSource="actionForm.regex"/>
+ <netui:textBox dataSource="actionForm.regex"/><br>
X axis:
- <netui:textBox dataSource="actionForm.xaxis"/>
+ <netui:textBox dataSource="actionForm.xaxis"/><br>
X label:
- <netui:textBox dataSource="actionForm.xlabel"/>
+ <netui:textBox dataSource="actionForm.xlabel"/><br>
Y axis:
- <netui:textBox dataSource="actionForm.yaxis"/>
+ <netui:textBox dataSource="actionForm.yaxis"/><br>
Y label:
- <netui:textBox dataSource="actionForm.ylabel"/>
+ <netui:textBox dataSource="actionForm.ylabel"/><br>
Type:
- <netui:textBox dataSource="actionForm.type"/>
+ <netui:textBox dataSource="actionForm.type"/><br>
Width:
- <netui:textBox dataSource="actionForm.width"/>
+ <netui:textBox dataSource="actionForm.width"/><br>
Height:
- <netui:textBox dataSource="actionForm.height"/>
- <netui:button value="Submit" type="submit"/>
+ <netui:textBox dataSource="actionForm.height"/><br>
+ <netui:button value="Submit" type="submit"/> <br>
</netui:form>
</netui:body>
Modified:
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/xmlbeans.jsp
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/xmlbeans.jsp?view=diff&r1=153474&r2=153475
==============================================================================
---
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/xmlbeans.jsp
(original)
+++
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/xmlbeans.jsp
Fri Feb 11 16:33:28 2005
@@ -239,7 +239,7 @@
<cewolf:chart
id="POReadAll"
title="Purchase Order Read All"
- type="scatter"
+ type="xy"
xaxislabel="filesize(bytes)"
yaxislabel="time(ms)">
<cewolf:data>
@@ -256,6 +256,35 @@
<P>
+ <%
+ HashMap<String,String> POReadOne = new HashMap<String,String>();
+ POReadOne.put("POReadOneV2","POReadOneV2.*");
+ POReadOne.put("POReadOneV1","POReadOneV1.*");
+ POReadOne.put("POReadOneCastor","POReadOneCastor.*");
+ POReadOne.put("POReadOneJaxb","POReadOneJaxb.*");
+ POReadOne.put("POReadOneJibx","POReadOneJibx.*");
+ %>
+ <jsp:useBean id="POReadOne_data" class="graphing.SeriesProducer"/>
+ <cewolf:chart
+ id="POReadOne"
+ title="Purchase Order Read One"
+ type="xy"
+ xaxislabel="filesize(bytes)"
+ yaxislabel="time(ms)">
+ <cewolf:data>
+ <cewolf:producer id="POReadOne_data">
+ <cewolf:param name="filename"
value='${requestScope.filename}' />
+ <cewolf:param name="xaxis"
value="<%=g_sFilesize%>"/>
+ <cewolf:param name="yaxis"
value="<%=g_sTime%>"/>
+ <cewolf:param name="regexmap"
value="<%=POReadOne%>"/>
+ </cewolf:producer>
+ </cewolf:data>
+ </cewolf:chart>
+ <p>
+ <cewolf:img chartid="POReadOne" renderer="/cewolf" width="800"
height="800"/>
+ <P>
+
+
<!-- Memory Plots -->
<%
@@ -295,7 +324,7 @@
<cewolf:chart
id="MaxMemUntypedBisLoadDeepElements"
title="Maximum File Size vs. Memory (flavor=deep-elements)"
- type="scatter"
+ type="xy"
xaxislabel="memory"
yaxislabel="size">
<cewolf:data>
@@ -309,6 +338,87 @@
</cewolf:chart>
<p>
<cewolf:img chartid="MaxMemUntypedBisLoadDeepElements"
renderer="/cewolf" width="800" height="800"/>
+ <P>
+
+
+ <%
+ HashMap<String,String> MaxMemUntypedBisLoadWideAttributes = new
HashMap<String,String>();
+
MaxMemUntypedBisLoadWideAttributes.put("MaxMemUntypedBisLoadV2_wide-attributes","MaxMemUntypedBisLoadV2.*wide-attributes.*");
+
MaxMemUntypedBisLoadWideAttributes.put("MaxMemUntypedBisLoadV1_wide-attributes","MaxMemUntypedBisLoadV1.*wide-attributes.*");
+
//MaxMemUntypedBisLoadWideAttributes.put("MaxMemUntypedBisLoadCastor_wide-attributes","MaxMemUntypedBisLoadCastor.*wide-attributes.*");
+ %>
+ <jsp:useBean id="MaxMemUntypedBisLoadWideAttributes_data"
class="graphing.SeriesProducer"/>
+ <cewolf:chart
+ id="MaxMemUntypedBisLoadWideAttributes"
+ title="Maximum File Size vs. Memory (flavor=wide-attributes)"
+ type="xy"
+ xaxislabel="memory"
+ yaxislabel="size">
+ <cewolf:data>
+ <cewolf:producer
id="MaxMemUntypedBisLoadWideAttributes_data">
+ <cewolf:param name="filename"
value='${requestScope.filename}' />
+ <cewolf:param name="xaxis"
value="<%=g_sMemory%>"/>
+ <cewolf:param name="yaxis"
value="<%=g_sSize%>"/>
+ <cewolf:param name="regexmap"
value="<%=MaxMemUntypedBisLoadWideAttributes%>"/>
+ </cewolf:producer>
+ </cewolf:data>
+ </cewolf:chart>
+ <p>
+ <cewolf:img chartid="MaxMemUntypedBisLoadWideAttributes"
renderer="/cewolf" width="800" height="800"/>
+ <P>
+
+
+ <%
+ HashMap<String,String> MaxMemUntypedBisLoadWideElements = new
HashMap<String,String>();
+
MaxMemUntypedBisLoadWideElements.put("MaxMemUntypedBisLoadV2_wide-elements","MaxMemUntypedBisLoadV2.*wide-elements.*");
+
MaxMemUntypedBisLoadWideElements.put("MaxMemUntypedBisLoadV1_wide-elements","MaxMemUntypedBisLoadV1.*wide-elements.*");
+
//MaxMemUntypedBisLoadWideElements.put("MaxMemUntypedBisLoadCastor_wide-elements","MaxMemUntypedBisLoadCastor.*wide-elements.*");
+ %>
+ <jsp:useBean id="MaxMemUntypedBisLoadWideElements_data"
class="graphing.SeriesProducer"/>
+ <cewolf:chart
+ id="MaxMemUntypedBisLoadWideElements"
+ title="Maximum File Size vs. Memory (flavor=wide-elements)"
+ type="xy"
+ xaxislabel="memory"
+ yaxislabel="size">
+ <cewolf:data>
+ <cewolf:producer
id="MaxMemUntypedBisLoadWideElements_data">
+ <cewolf:param name="filename"
value='${requestScope.filename}' />
+ <cewolf:param name="xaxis"
value="<%=g_sMemory%>"/>
+ <cewolf:param name="yaxis"
value="<%=g_sSize%>"/>
+ <cewolf:param name="regexmap"
value="<%=MaxMemUntypedBisLoadWideElements%>"/>
+ </cewolf:producer>
+ </cewolf:data>
+ </cewolf:chart>
+ <p>
+ <cewolf:img chartid="MaxMemUntypedBisLoadWideElements"
renderer="/cewolf" width="800" height="800"/>
+ <P>
+
+
+ <%
+ HashMap<String,String> MaxMemUntypedBisLoadWideText = new
HashMap<String,String>();
+
MaxMemUntypedBisLoadWideText.put("MaxMemUntypedBisLoadV2_wide-text","MaxMemUntypedBisLoadV2.*wide-text.*");
+
MaxMemUntypedBisLoadWideText.put("MaxMemUntypedBisLoadV1_wide-text","MaxMemUntypedBisLoadV1.*wide-text.*");
+
//MaxMemUntypedBisLoadWideText.put("MaxMemUntypedBisLoadCastor_wide-text","MaxMemUntypedBisLoadCastor.*wide-text.*");
+ %>
+ <jsp:useBean id="MaxMemUntypedBisLoadWideText_data"
class="graphing.SeriesProducer"/>
+ <cewolf:chart
+ id="MaxMemUntypedBisLoadWideText"
+ title="Maximum File Size vs. Memory (flavor=wide-text)"
+ type="xy"
+ xaxislabel="memory"
+ yaxislabel="size">
+ <cewolf:data>
+ <cewolf:producer id="MaxMemUntypedBisLoadWideText_data">
+ <cewolf:param name="filename"
value='${requestScope.filename}' />
+ <cewolf:param name="xaxis"
value="<%=g_sMemory%>"/>
+ <cewolf:param name="yaxis"
value="<%=g_sSize%>"/>
+ <cewolf:param name="regexmap"
value="<%=MaxMemUntypedBisLoadWideText%>"/>
+ </cewolf:producer>
+ </cewolf:data>
+ </cewolf:chart>
+ <p>
+ <cewolf:img chartid="MaxMemUntypedBisLoadWideText"
renderer="/cewolf" width="800" height="800"/>
<P>
