You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by am...@apache.org on 2005/12/13 22:35:54 UTC
svn commit: r356626 - in
/geronimo/branches/1.0/applications/console-standard/src:
java/org/apache/geronimo/console/webmanager/ webapp/WEB-INF/view/webmanager/
Author: ammulder
Date: Tue Dec 13 13:35:48 2005
New Revision: 356626
URL: http://svn.apache.org/viewcvs?rev=356626&view=rev
Log:
Nicer message for Tomcat when statistics gathering isn't available
Patch from GERONIMO-1350 -- thanks Joe!
Modified:
geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/JettyStatisticsHelper.java
geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/WebManagerPortlet.java
geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/webmanager/normal.jsp
Modified: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/JettyStatisticsHelper.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/JettyStatisticsHelper.java?rev=356626&r1=356625&r2=356626&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/JettyStatisticsHelper.java (original)
+++ geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/JettyStatisticsHelper.java Tue Dec 13 13:35:48 2005
@@ -27,6 +27,11 @@
renderRequest.setAttribute("requestsDurationAve", new Long(jetty.getRequestsDurationAve()));
renderRequest.setAttribute("requestsDurationMax", new Long(jetty.getRequestsDurationMax()));
}
+ else
+ {
+ renderRequest.setAttribute("statsSupported", Boolean.TRUE);
+ renderRequest.setAttribute("statsMessage", "Statistics are not currently being collected.");
+ }
}
}
Modified: geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/WebManagerPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/WebManagerPortlet.java?rev=356626&r1=356625&r2=356626&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/WebManagerPortlet.java (original)
+++ geronimo/branches/1.0/applications/console-standard/src/java/org/apache/geronimo/console/webmanager/WebManagerPortlet.java Tue Dec 13 13:35:48 2005
@@ -110,7 +110,8 @@
if(server.equals(WEB_SERVER_JETTY)) {
helper = new JettyStatisticsHelper();
} else if(server.equals(WEB_SERVER_TOMCAT)) {
- //todo - Handle Tomcat logs
+ renderRequest.setAttribute("statsSupported", Boolean.FALSE);
+ renderRequest.setAttribute("statsMessage", "Statistics are not currently implemented for this web container.");
}
else {
// todo - Log error, unknown server
Modified: geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/webmanager/normal.jsp
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/webmanager/normal.jsp?rev=356626&r1=356625&r2=356626&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/webmanager/normal.jsp (original)
+++ geronimo/branches/1.0/applications/console-standard/src/webapp/WEB-INF/view/webmanager/normal.jsp Tue Dec 13 13:35:48 2005
@@ -19,6 +19,8 @@
</table>
</c:if>
<c:if test="${!statsOn}">
-Statistics are not currently being collected. <br/>
-<a href="<portlet:actionURL><portlet:param name="stats" value="true"/></portlet:actionURL>">enable</a>
+ ${statsMessage}<br/>
+ <c:if test="${statsSupported}">
+ <a href="<portlet:actionURL><portlet:param name="stats" value="true"/></portlet:actionURL>">enable</a>
+ </c:if>
</c:if>