You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2009/08/19 15:46:45 UTC
svn commit: r805805 - in
/geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main:
java/org/apache/geronimo/console/jsr77/Jsr77Lookup.java
webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp
Author: xuhaihong
Date: Wed Aug 19 13:46:45 2009
New Revision: 805805
URL: http://svn.apache.org/viewvc?rev=805805&view=rev
Log:
GERONIMO-4802 Error occurs when click Information link on the console
Modified:
geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/jsr77/Jsr77Lookup.java
geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp
Modified: geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/jsr77/Jsr77Lookup.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/jsr77/Jsr77Lookup.java?rev=805805&r1=805804&r2=805805&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/jsr77/Jsr77Lookup.java (original)
+++ geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/jsr77/Jsr77Lookup.java Wed Aug 19 13:46:45 2009
@@ -16,16 +16,17 @@
*/
package org.apache.geronimo.console.jsr77;
-import javax.servlet.http.HttpSession;
-import javax.management.j2ee.statistics.JVMStats;
import javax.management.j2ee.statistics.BoundedRangeStatistic;
-import uk.ltd.getahead.dwr.WebContextFactory;
-import org.apache.geronimo.console.util.PortletManager;
+import javax.management.j2ee.statistics.JVMStats;
+import javax.servlet.http.HttpSession;
+
import org.apache.geronimo.console.util.ManagementHelper;
-import org.apache.geronimo.management.geronimo.J2EEDomain;
+import org.apache.geronimo.console.util.PortletManager;
import org.apache.geronimo.management.StatisticsProvider;
+import org.apache.geronimo.management.geronimo.J2EEDomain;
import org.apache.geronimo.management.geronimo.J2EEServer;
import org.apache.geronimo.management.geronimo.JVM;
+import org.directwebremoting.WebContextFactory;
import org.directwebremoting.annotations.RemoteProxy;
/**
@@ -33,7 +34,7 @@
*
* @version $Rev$ $Date$
*/
-@RemoteProxy(name="Jsr77Stats")
+@RemoteProxy
public class Jsr77Lookup {
public DynamicServerInfo getJavaVMStatistics() {
HttpSession session = WebContextFactory.get().getSession(true);
Modified: geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp?rev=805805&r1=805804&r2=805805&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp (original)
+++ geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/infomanager/svrInfoNormal.jsp Wed Aug 19 13:46:45 2009
@@ -20,7 +20,7 @@
<fmt:setBundle basename="consolebase"/>
<portlet:defineObjects/>
-<script type='text/javascript' src='/console/dwr/interface/Jsr77Stats.js'></script>
+<script type='text/javascript' src='/console/dwr/interface/Jsr77Lookup.js'></script>
<script type='text/javascript' src='/console/dwr/engine.js'></script>
<script type='text/javascript' src='/console/dwr/util.js'></script>
@@ -124,7 +124,7 @@
metadata = {};
metadata.callback=<portlet:namespace/>updateValues;
metadata.errorHandler=<portlet:namespace/>onError;
- Jsr77Stats.getJavaVMStatistics(metadata);
+ Jsr77Lookup.getJavaVMStatistics(metadata);
}
function <portlet:namespace/>updateValues(serverStats) {
DWRUtil.setValue("<portlet:namespace/>CurrentMemory", serverStats.memoryCurrent);