Author: jsong
Date: Tue Feb 15 15:00:17 2005
New Revision: 153971
URL: http://svn.apache.org/viewcvs?view=rev&rev=153971
Log:
Contributed by Jamie Zyskowski: updated to reportWeb
Added:
incubator/beehive/trunk/controls/test/perf/external/xbean.jar (with props)
Modified:
incubator/beehive/trunk/controls/test/perf/external/perf-results.jar
incubator/beehive/trunk/controls/test/perf/webapps/build.xml
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/index.jsp
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/external/perf-results.jar
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/perf/external/perf-results.jar?view=diff&r1=153970&r2=153971
==============================================================================
Binary files - no diff available.
Added: incubator/beehive/trunk/controls/test/perf/external/xbean.jar
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/perf/external/xbean.jar?view=auto&rev=153971
==============================================================================
Binary file - no diff available.
Propchange: incubator/beehive/trunk/controls/test/perf/external/xbean.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
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=153970&r2=153971
==============================================================================
--- incubator/beehive/trunk/controls/test/perf/webapps/build.xml (original)
+++ incubator/beehive/trunk/controls/test/perf/webapps/build.xml Tue Feb 15
15:00:17 2005
@@ -62,7 +62,7 @@
<antcall target="${webapp.name}.stage"/>
<deploy-netui webappDir="${webapp.stage.dir}/${webapp.name}"/>
<build-webapp webappDir="${webapp.stage.dir}/${webapp.name}"/>
-
+ <antcall target="${webapp.name}.postprocess"/>
<echo message="----------------------------------------------"/>
<echo message="| ${webapp.name} build ending |"/>
<echo message="----------------------------------------------"/>
@@ -83,6 +83,8 @@
<copy file="${controls.perf.root}/build/lib/controlperf.jar"
todir="${webapp.stage.dir}/${webapp.name}/WEB-INF/lib"/>
</target>
+ <target name="controlsPerfWeb.postprocess"/>
+
<target name="reportWeb.stage" if="reportweb.properties.exists"
depends="check.reportweb.properties">
<copy todir="${webapp.stage.dir}/${webapp.name}">
@@ -114,6 +116,7 @@
<copy file="${controls.perf.root}/external/perf-results.jar"
todir="${webapp.stage.dir}/${webapp.name}/WEB-INF/lib"/>
<copy
file="${controls.perf.root}/ctlbuild/lib/customcontrols.jar"
todir="${webapp.stage.dir}/${webapp.name}/WEB-INF/lib"/>
+
<!-- these must be provided at build time for the machine's
localations -->
<copy file="${basedir}/reportweb.properties"
todir="${webapp.stage.dir}/${webapp.name}/jpf/" overwrite="true"/>
</target>
@@ -124,15 +127,19 @@
<available property="reportweb.properties.exists"
file="${basedir}/reportweb.properties" type="file"/>
</target>
-
+
+
+ <target name="reportWeb.postprocess">
+ <!-- HACK: apache-xbean.jar is out of date in beehive so use
local one -->
+ <delete
file="${webapp.stage.dir}/${webapp.name}/WEB-INF/lib/apache-xbean.jar"/>
+ <copy file="${controls.perf.root}/external/xbean.jar"
todir="${webapp.stage.dir}/${webapp.name}/WEB-INF/lib"/>
+ </target>
<target name="clean" description="Clean webapp">
<echo message="----------------------------------------------"/>
<echo message="| ${webapp.name} clean starting |"/>
<echo message="----------------------------------------------"/>
- <!--clean-webapp webappDir="${webapp.stage.dir}/${webapp.name}"/-->
-
<delete failonerror="false"
dir="${webapp.stage.dir}/${webapp.name}"/>
<echo message="----------------------------------------------"/>
Modified: incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/index.jsp
URL:
http://svn.apache.org/viewcvs/incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/index.jsp?view=diff&r1=153970&r2=153971
==============================================================================
--- incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/index.jsp
(original)
+++ incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/index.jsp Tue
Feb 15 15:00:17 2005
@@ -21,9 +21,10 @@
<br><br>
This web application is a work in progress,
however the core
functionality that allows the analysis of
result sets is
- functional. Click below to begin.
+ functional.
- <br><a href="jpf/Controller.jpf">View Available Results</a>
+ <br><a href="jpf/Controller.jpf">Analyze Results</a>
+ <br><a href="docs/index.html">Controls Performance Javadocs</a>
</netui:body>
</netui:html>
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=153970&r2=153971
==============================================================================
--- incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/index.jsp
(original)
+++ incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/index.jsp
Tue Feb 15 15:00:17 2005
@@ -6,6 +6,7 @@
<%@ page import="org.openuri.perf.*"%>
<%@ page import="java.util.Iterator"%>
<%@ page import="java.util.HashMap"%>
+<%@ page import="java.util.HashSet"%>
<%@ page import="java.util.Set"%>
<%@ page import="org.apache.beehive.netui.pageflow.PageFlowUtils"%>
@@ -13,6 +14,7 @@
HashMap<String,PerfResultControlBean> controls =
(HashMap<String,PerfResultControlBean>)PageFlowUtils.getPageInput("controls",
request);
PerfResultControlBean xmlbeanResults =
(PerfResultControlBean)controls.get("xmlbeans");
PerfResultControlBean controlResults =
(PerfResultControlBean)controls.get("controls");
+HashSet allFilenames = new HashSet();
%>
<netui:html>
@@ -42,6 +44,7 @@
<td id="XMLBEANS
HEADINGS">OS</td>
<td id="XMLBEANS
HEADINGS">JVM</td>
<td id="XMLBEANS
HEADINGS">Result Count</td>
+ <td id="XMLBEANS
HEADINGS">Note</td>
</tr>
<%
HashMap<String,ResultSetDocument.ResultSet>
xmlbeanResultSets = xmlbeanResults.getResultSets();
@@ -49,6 +52,7 @@
Object[] xmlbeansFilenames = keys.toArray();
for(int i=0; i<xmlbeansFilenames.length; i++){
String filename = (String)xmlbeansFilenames[i];
+ allFilenames.add(filename);
ResultSetDocument.ResultSet xmlbeanResultSet =
(ResultSetDocument.ResultSet)xmlbeanResultSets.get((Object)filename);
%>
<tr>
@@ -68,6 +72,14 @@
<td id="RESULT OS"><%
out.print(xmlbeanResultSet.getEnvironment().getOs()); %></td>
<td id="RESULT JVM"><%
out.print(xmlbeanResultSet.getEnvironment().getJvm()); %></td>
<td id="RESULT NUMRESULTS"><%
out.print(xmlbeanResultSet.getResultArray().length); %></td>
+ <% if(null !=
xmlbeanResultSet.getEnvironment().getNote())
+ {%>
+ <td id="RESULT NOTE"><%
out.print(xmlbeanResultSet.getEnvironment().getNote()); %></td>
+ <%}
+ else
+ {%>
+ <td id="RESULT
NOTE"><%out.print(" ");%></td>
+ <%}%>
</tr>
<%
}
@@ -87,6 +99,7 @@
<td id="CONTROLS
HEADINGS">OS</td>
<td id="CONTROLS
HEADINGS">JVM</td>
<td id="CONTROLS
HEADINGS">Result Count</td>
+ <td id="CONTROLS
HEADINGS">Note</td>
</tr>
<%
HashMap<String,ResultSetDocument.ResultSet>
controlResultSets = controlResults.getResultSets();
@@ -94,6 +107,7 @@
Object[] controlFilenames = keys.toArray();
for(int i=0; i<controlFilenames.length; i++){
String filename = (String) controlFilenames[i];
+ allFilenames.add(filename);
ResultSetDocument.ResultSet controlResultSet =
(ResultSetDocument.ResultSet)controlResultSets.get((Object)filename);
%>
<tr>
@@ -113,6 +127,14 @@
<td id="RESULT OS"><%
out.print(controlResultSet.getEnvironment().getOs()); %></td>
<td id="RESULT JVM"><%
out.print(controlResultSet.getEnvironment().getJvm()); %></td>
<td id="RESULT NUMRESULTS"><%
out.print(controlResultSet.getResultArray().length); %></td>
+ <% if(null !=
controlResultSet.getEnvironment().getNote())
+ {%>
+ <td id="RESULT NOTE"><%
out.print(controlResultSet.getEnvironment().getNote()); %></td>
+ <%}
+ else
+ {%>
+ <td id="RESULT
NOTE"><%out.print(" ");%></td>
+ <%}%>
</tr>
<%
}
@@ -123,7 +145,7 @@
<h4 class=margin>Custom Series Graph Form</h4>
<netui:form action="series">
Filename:
- <netui:select dataSource="actionForm.selections"
optionsDataSource="<%=xmlbeansFilenames%>"/><br>
+ <netui:select dataSource="actionForm.filename"
optionsDataSource="<%=allFilenames.toArray()%>"/><br>
Regex:
<netui:textBox dataSource="actionForm.regex"/><br>
Seriesname:
@@ -148,7 +170,7 @@
<h4 class=margin>Custom Snapshot Graph Form</h4>
<netui:form action="snapshot">
Filename:
- <netui:select dataSource="actionForm.selections"
optionsDataSource="<%=controlFilenames%>"/><br>
+ <netui:select dataSource="actionForm.filename"
optionsDataSource="<%=allFilenames.toArray()%>"/><br>
Regex:
<netui:textBox dataSource="actionForm.regex"/><br>
X axis:
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=153970&r2=153971
==============================================================================
---
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/xmlbeans.jsp
(original)
+++
incubator/beehive/trunk/controls/test/perf/webapps/reportWeb/jpf/xmlbeans.jsp
Tue Feb 15 15:00:17 2005
@@ -231,7 +231,7 @@
HashMap<String,String> POReadAll = new HashMap<String,String>();
POReadAll.put("POReadAllV2","POReadAllV2.*");
POReadAll.put("POReadAllV1","POReadAllV1.*");
- //POReadAll.put("POReadAllCastor","POReadAllCastor.*");
+ POReadAll.put("POReadAllCastor","POReadAllCastor.*");
POReadAll.put("POReadAllJaxb","POReadAllJaxb.*");
POReadAll.put("POReadAllJibx","POReadAllJibx.*");
%>
