You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ke...@apache.org on 2006/01/20 04:49:10 UTC

svn commit: r370723 - in /geronimo/branches/1.0/applications/jmxdebug/src: java/org/apache/geronimo/jmxdebug/web/velocity/ServletLogger.java webapp/mbeaninfo.vm

Author: kevan
Date: Thu Jan 19 19:49:06 2006
New Revision: 370723

URL: http://svn.apache.org/viewcvs?rev=370723&view=rev
Log:
Merge fix from HEAD to 1.0 to prevent creation of velocity.log

Modified:
    geronimo/branches/1.0/applications/jmxdebug/src/java/org/apache/geronimo/jmxdebug/web/velocity/ServletLogger.java
    geronimo/branches/1.0/applications/jmxdebug/src/webapp/mbeaninfo.vm

Modified: geronimo/branches/1.0/applications/jmxdebug/src/java/org/apache/geronimo/jmxdebug/web/velocity/ServletLogger.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/jmxdebug/src/java/org/apache/geronimo/jmxdebug/web/velocity/ServletLogger.java?rev=370723&r1=370722&r2=370723&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/jmxdebug/src/java/org/apache/geronimo/jmxdebug/web/velocity/ServletLogger.java (original)
+++ geronimo/branches/1.0/applications/jmxdebug/src/java/org/apache/geronimo/jmxdebug/web/velocity/ServletLogger.java Thu Jan 19 19:49:06 2006
@@ -28,7 +28,7 @@
  *
  * @version $Rev$ $Date$
  */
-public class ServletLogger {
+public class ServletLogger implements LogSystem {
     private ServletContext servletContext = null;
 
     private static final String PREFIX = " Velocity ";

Modified: geronimo/branches/1.0/applications/jmxdebug/src/webapp/mbeaninfo.vm
URL: http://svn.apache.org/viewcvs/geronimo/branches/1.0/applications/jmxdebug/src/webapp/mbeaninfo.vm?rev=370723&r1=370722&r2=370723&view=diff
==============================================================================
--- geronimo/branches/1.0/applications/jmxdebug/src/webapp/mbeaninfo.vm (original)
+++ geronimo/branches/1.0/applications/jmxdebug/src/webapp/mbeaninfo.vm Thu Jan 19 19:49:06 2006
@@ -25,7 +25,7 @@
 </tr>
 </table>
 
-<h3>Attributes</h3>
+<h3>MBean Attributes</h3>
 
 <table>
 
@@ -47,7 +47,6 @@
 #end
 </table>
 
-<!--
 <h3>MBean Operations</h3>
 
 
@@ -55,15 +54,16 @@
 
 <tr>
   <th>Name</th>
-  <th>Return Type</th>
+  <th>MethodName</th>
+  <th>Parameters</th>
 </tr>
 
 #foreach($i in $beanInfo.getOperationInfo())
 <tr>
   <td>$i.getName()</td>
-  <td>$i.getReturnType()</td>
+  <td>$i.getMethodName()</td>
+  <td>$i.getParameterList()</td>
 </tr>
 #end
 </table>
--->