Author: rmannibucau
Date: Tue Jul 30 06:58:19 2013
New Revision: 1508323
URL: http://svn.apache.org/r1508323
Log:
moving clear/reset button on report page + adding links to convert in ms/ns/s +
mapping report.csv, report.xml, report.json
Added:
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/handler/ReportHandler.java
- copied, changed from r1508066,
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/handler/ReportHandler.java
Removed:
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/util/
Modified:
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/MonitoringController.java
commons/sandbox/monitoring/trunk/reporting/src/main/resources/templates/home.vm
commons/sandbox/monitoring/trunk/reporting/src/main/resources/templates/report.vm
commons/sandbox/monitoring/trunk/reporting/src/main/webapp/resources/css/monitoring.css
Modified:
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/MonitoringController.java
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/MonitoringController.java?rev=1508323&r1=1508322&r2=1508323&view=diff
==============================================================================
---
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/MonitoringController.java
(original)
+++
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/MonitoringController.java
Tue Jul 30 06:58:19 2013
@@ -16,6 +16,7 @@
*/
package org.apache.commons.monitoring.reporting.web;
+import org.apache.commons.monitoring.reporting.format.Format;
import org.apache.commons.monitoring.reporting.template.Templates;
import org.apache.commons.monitoring.reporting.web.handler.ClearHandler;
import org.apache.commons.monitoring.reporting.web.handler.FilteringHandler;
@@ -56,7 +57,10 @@ public class MonitoringController implem
defaultHandler = new HtmlHandler("home.vm");
handlers.put("/", defaultHandler);
handlers.put("/home", defaultHandler);
- handlers.put("/report", new ReportHandler());
+ handlers.put("/report", new ReportHandler(Format.Defaults.HTML));
+ handlers.put("/report.csv", new ReportHandler(Format.Defaults.CSV));
+ handlers.put("/report.json", new ReportHandler(Format.Defaults.JSON));
+ handlers.put("/report.xml", new ReportHandler(Format.Defaults.XML));
handlers.put("/clear", new ClearHandler());
handlers.put("/reset", new ResetHandler());
handlers.put("/resources/css/monitoring.css",
FilteringHandler.INSTANCE); // filtered to get the right base for pictures
Copied:
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/handler/ReportHandler.java
(from r1508066,
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/handler/ReportHandler.java)
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/handler/ReportHandler.java?p2=commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/handler/ReportHandler.java&p1=commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/handler/ReportHandler.java&r1=1508066&r2=1508323&rev=1508323&view=diff
==============================================================================
---
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/handler/ReportHandler.java
(original)
+++
commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/handler/ReportHandler.java
Tue Jul 30 06:58:19 2013
@@ -17,54 +17,19 @@
package org.apache.commons.monitoring.reporting.web.handler;
import org.apache.commons.monitoring.reporting.format.Format;
-import org.apache.commons.monitoring.reporting.web.util.HttpUtils;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
public class ReportHandler implements Handler {
- private static Map<String, Format> extensions = new HashMap<String,
Format>();
- private static Map<String, Format> formats = new HashMap<String, Format>();
+ private final Format format;
- static {
- formats.put("application/json", Format.Defaults.JSON);
- formats.put("text/javascript", Format.Defaults.JSON);
- formats.put("application/xml", Format.Defaults.XML);
- formats.put("text/xml", Format.Defaults.XML);
- formats.put("text/plain", Format.Defaults.CSV);
- formats.put("text/csv", Format.Defaults.CSV);
- formats.put("text/html", Format.Defaults.HTML);
-
- extensions.put("json", Format.Defaults.JSON);
- extensions.put("js", Format.Defaults.JSON);
- extensions.put("xml", Format.Defaults.XML);
- extensions.put("csv", Format.Defaults.CSV);
- extensions.put("html", Format.Defaults.HTML);
- extensions.put("htm", Format.Defaults.HTML);
- extensions.put("xhtml", Format.Defaults.HTML);
+ public ReportHandler(final Format frm) {
+ format = frm;
}
@Override
public Renderer handle(final HttpServletRequest request, final
HttpServletResponse response) {
- Format format = null;
-
- final String path = request.getRequestURI();
- final int dot = path.lastIndexOf('.');
- if (dot >= 0) {
- format = extensions.get(path.substring(dot +
1).toLowerCase(Locale.ENGLISH));
- } else {
- final String mime =
HttpUtils.parseAccept(request.getHeader("Accept"));
- if (mime != null) {
- format = formats.get(mime);
- }
- }
- if (format == null) {
- format = Format.Defaults.CSV;
- }
-
response.setContentType(format.type());
return format;
}
Modified:
commons/sandbox/monitoring/trunk/reporting/src/main/resources/templates/home.vm
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/reporting/src/main/resources/templates/home.vm?rev=1508323&r1=1508322&r2=1508323&view=diff
==============================================================================
---
commons/sandbox/monitoring/trunk/reporting/src/main/resources/templates/home.vm
(original)
+++
commons/sandbox/monitoring/trunk/reporting/src/main/resources/templates/home.vm
Tue Jul 30 06:58:19 2013
@@ -22,7 +22,7 @@
</div>
<div>
<ul>
- <li><a href="$mapping/report">Report</a></li>
+ <li><a href="$mapping/report">Report</a> (<a
href="$mapping/report.xml">xml</a>, <a href="$mapping/report.json">json</a>, <a
href="$mapping/report.csv">csv</a>)</li>
</ul>
</div>
</div>
\ No newline at end of file
Modified:
commons/sandbox/monitoring/trunk/reporting/src/main/resources/templates/report.vm
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/reporting/src/main/resources/templates/report.vm?rev=1508323&r1=1508322&r2=1508323&view=diff
==============================================================================
---
commons/sandbox/monitoring/trunk/reporting/src/main/resources/templates/report.vm
(original)
+++
commons/sandbox/monitoring/trunk/reporting/src/main/resources/templates/report.vm
Tue Jul 30 06:58:19 2013
@@ -16,23 +16,20 @@
*#
<h1>Report</h1>
+<ul class="breadcrumb">
+ <li><a href="$mapping/clear">Clear</a> <span class="divider">/</span></li>
+ <li><a href="$mapping/reset">Reset</a> </li>
+
+ <li class="pull-right"><a href="$mapping/report?unit=s">s</a></li>
+ <li class="pull-right"><a href="$mapping/report?unit=ms">ms</a> <span
class="divider">/</span></li>
+ <li class="pull-right"><a href="$mapping/report?unit=ns">ns</a> <span
class="divider">/</span></li>
+</ul>
+
<table id="report-table" class="table table-bordered table-striped
table-hover">
<thead>
<tr>
#foreach( $header in $headers )
- #if ( $header == "Monitor")
- <th>
- <div class="row-fluid">
- $header
- <div class="btn-group">
- <button type="button" class="btn
btn-default"><a href="$mapping/clear">Clear</a></button>
- <button type="button" class="btn
btn-default"><a href="$mapping/reset">Reset</a></button>
- </div>
- </div>
- </th>
- #else
- <th>$header</th>
- #end
+ <th>$header</th>
#end
</tr>
</thead>
Modified:
commons/sandbox/monitoring/trunk/reporting/src/main/webapp/resources/css/monitoring.css
URL:
http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/reporting/src/main/webapp/resources/css/monitoring.css?rev=1508323&r1=1508322&r2=1508323&view=diff
==============================================================================
---
commons/sandbox/monitoring/trunk/reporting/src/main/webapp/resources/css/monitoring.css
(original)
+++
commons/sandbox/monitoring/trunk/reporting/src/main/webapp/resources/css/monitoring.css
Tue Jul 30 06:58:19 2013
@@ -32,3 +32,6 @@ th#report-table {
background-repeat: no-repeat;
background-position: right;
}
+.timeUnit {
+ width: 5em;
+}
