geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r803728 - in /geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main: java/org/apache/geronimo/console/jmxmanager/ java/org/apache/geronimo/console/ldapmanager/ webapp/WEB-INF/view/jmxmanager/ webapp/WEB-INF/view/ldapmanager/
Date Wed, 12 Aug 2009 22:29:54 GMT
Author: djencks
Date: Wed Aug 12 22:29:53 2009
New Revision: 803728

URL: http://svn.apache.org/viewvc?rev=803728&view=rev
Log:
GERONIMO-4753 upgrade to DWR 3.0M1, thanks to Rex Wang for the patch

Modified:
    geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/java/org/apache/geronimo/console/jmxmanager/JMXManagerHelper.java
    geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/java/org/apache/geronimo/console/ldapmanager/LDAPManagerHelper.java
    geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/jmxmanager/viewJMXServer.jsp
    geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/ldapmanager/viewLDAPServer.jsp

Modified: geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/java/org/apache/geronimo/console/jmxmanager/JMXManagerHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/java/org/apache/geronimo/console/jmxmanager/JMXManagerHelper.java?rev=803728&r1=803727&r2=803728&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/java/org/apache/geronimo/console/jmxmanager/JMXManagerHelper.java
(original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/java/org/apache/geronimo/console/jmxmanager/JMXManagerHelper.java
Wed Aug 12 22:29:53 2009
@@ -56,7 +56,7 @@
 /**
  * The JMX manager helper
  */
-@RemoteProxy(name="JMXHelper")
+@RemoteProxy
 public class JMXManagerHelper {
     /** Used to return all MBeans */
     private static final String ALL_MBEANS = "AllMBeans";

Modified: geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/java/org/apache/geronimo/console/ldapmanager/LDAPManagerHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/java/org/apache/geronimo/console/ldapmanager/LDAPManagerHelper.java?rev=803728&r1=803727&r2=803728&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/java/org/apache/geronimo/console/ldapmanager/LDAPManagerHelper.java
(original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/java/org/apache/geronimo/console/ldapmanager/LDAPManagerHelper.java
Wed Aug 12 22:29:53 2009
@@ -46,7 +46,7 @@
 /**
  * The LDAP manager helper
  */
-@RemoteProxy(name="LDAPHelper")
+@RemoteProxy
 public class LDAPManagerHelper {
     private final static String LDAP_VERSION_KEY = "java.naming.ldap.version";
 

Modified: geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/jmxmanager/viewJMXServer.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/jmxmanager/viewJMXServer.jsp?rev=803728&r1=803727&r2=803728&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/jmxmanager/viewJMXServer.jsp
(original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/jmxmanager/viewJMXServer.jsp
Wed Aug 12 22:29:53 2009
@@ -201,18 +201,18 @@
                             if (id.indexOf('<PATTERN>') != -1) {
                                 // Remove pattern marker
                                 var pattern = id.substring(id.indexOf('<PATTERN>')
+ '<PATTERN>'.length);  
-                                JMXHelper.listByPattern(pattern, <portlet:namespace/>updateJMXTree);
+                                JMXManagerHelper.listByPattern(pattern, <portlet:namespace/>updateJMXTree);
                             } else if (selectedNode.widgetId.indexOf('<J2EETYPE>')
!= -1) {
                                 // Remove j2ee type marker
                                 var j2eeType = id.substring(id.indexOf('<J2EETYPE>')
+ '<J2EETYPE>'.length);  
-                                JMXHelper.listByJ2EEType(j2eeType, <portlet:namespace/>updateJMXTree);
+                                JMXManagerHelper.listByJ2EEType(j2eeType, <portlet:namespace/>updateJMXTree);
                             } else if (selectedNode.widgetId.indexOf('<SVCMODULE>')
!= -1) {
                                 // Remove service module marker
                                 var svcModule = id.substring(id.indexOf('<SVCMODULE>')
+ '<SVCMODULE>'.length);  
-                                JMXHelper.listBySubstring(svcModule, <portlet:namespace/>updateJMXTree);
+                                JMXManagerHelper.listBySubstring(svcModule, <portlet:namespace/>updateJMXTree);
                             } else if (selectedNode.widgetId == 'statisticsProviderMBeans')
{
                                 // Get statistics provider MBeans
-                                JMXHelper.getStatsProvidersMBeans(<portlet:namespace/>updateJMXTree);
+                                JMXManagerHelper.getStatsProvidersMBeans(<portlet:namespace/>updateJMXTree);
                             } else {
                                 // Marker not recognized
                             }
@@ -241,10 +241,10 @@
                 } else {
                     // Remove marker to get abstract name
                     window.aName = window.aName.substring(window.aName.indexOf('::') + 2);
-                    JMXHelper.getMBeanInfo(window.aName, <portlet:namespace/>updateBasicInfoTable);
-                    JMXHelper.getAttributes(window.aName, <portlet:namespace/>updateAttributesTable);
-                    JMXHelper.getOperations(window.aName, <portlet:namespace/>updateOperationsTable);
-                    JMXHelper.getMBeanStats(window.aName, <portlet:namespace/>updateStatsTable);
+                    JMXManagerHelper.getMBeanInfo(window.aName, <portlet:namespace/>updateBasicInfoTable);
+                    JMXManagerHelper.getAttributes(window.aName, <portlet:namespace/>updateAttributesTable);
+                    JMXManagerHelper.getOperations(window.aName, <portlet:namespace/>updateOperationsTable);
+                    JMXManagerHelper.getMBeanStats(window.aName, <portlet:namespace/>updateStatsTable);
                 }
             }
         );
@@ -388,7 +388,7 @@
  */
 function searchBtnClicked() {
     var jmxQuery = dojo.widget.byId('jmxQuery').getValue();
-    JMXHelper.listByPattern(jmxQuery, <portlet:namespace/>updateSearchMBeansTreeNode);
+    JMXManagerHelper.listByPattern(jmxQuery, <portlet:namespace/>updateSearchMBeansTreeNode);
 }
 
     /**
@@ -397,7 +397,7 @@
     function refreshStatsBtnClicked() {
         var abstractName = window.aName;
 
-        JMXHelper.getMBeanStats(abstractName, <portlet:namespace/>updateStatsTable);
+        JMXManagerHelper.getMBeanStats(abstractName, <portlet:namespace/>updateStatsTable);
     }
 </script>
 
@@ -406,7 +406,7 @@
 <!----------------------->
 
 <% String dwrForwarderServlet = "/console/dwr2"; %>
-<script type='text/javascript' src='<%= dwrForwarderServlet %>/interface/JMXHelper.js'></script>
+<script type='text/javascript' src='<%= dwrForwarderServlet %>/interface/JMXManagerHelper.js'></script>
 <script type='text/javascript' src='<%= dwrForwarderServlet %>/engine.js'></script>
 <script type='text/javascript' src='<%= dwrForwarderServlet %>/util.js'></script>
 
@@ -414,12 +414,12 @@
 /**
  * Sync calls 
  */
-DWREngine.setAsync(false);
+dwr.engine.setAsync(false);
 
 /**
  * Generic error handler 
  */
-DWREngine.setErrorHandler(
+dwr.engine.setErrorHandler(
     function (errorString) {
         alert('Error: ' + errorString);
     }
@@ -720,7 +720,7 @@
         }
         _attribValue = newValue;
         // Set attribute
-        JMXHelper.setAttribute(
+        JMXManagerHelper.setAttribute(
             abstractName, attribName, newValue, attribType, /* Arguments */
             function(result) { /* setAttribFN Callback */
                 if (result[1] == '<SUCCESS>') {
@@ -741,7 +741,7 @@
     if (paramSize == 0) {
         // Operation without parameters
         // Invoke operator with no args        
-        JMXHelper.invokeOperNoArgs(
+        JMXManagerHelper.invokeOperNoArgs(
             abstractName, opName, /* Arguments */
             function(result) { /* invokeOperNoArgs Callback */
                 alert(result[0] + ' returned: ' + result[1]);
@@ -758,7 +758,7 @@
             paramTypes[i] = dwr.util.getValue(opParamTypeID);
         }
         // Invoke operator with args
-        JMXHelper.invokeOperWithArgs(
+        JMXManagerHelper.invokeOperWithArgs(
             abstractName, opName, paramValues, paramTypes,
             function(result) { /* invokeOperWithArgs Callback */
                 alert(result[0] + ' returned: ' + result[1]);

Modified: geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/ldapmanager/viewLDAPServer.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/ldapmanager/viewLDAPServer.jsp?rev=803728&r1=803727&r2=803728&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/ldapmanager/viewLDAPServer.jsp
(original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/webapp/WEB-INF/view/ldapmanager/viewLDAPServer.jsp
Wed Aug 12 22:29:53 2009
@@ -74,11 +74,11 @@
 dojo.addOnLoad(
     function() {
         /* Init LDAP tree */
-        LDAPHelper.getBaseDN(<portlet:namespace/>initLDAPTree);
+        LDAPManagerHelper.getBaseDN(<portlet:namespace/>initLDAPTree);
 
         /* Init LDAP connection info tab */
         if (_baseDN != null) {
-            LDAPHelper.getEnvironment(<portlet:namespace/>initConnectInfoTab);
+            LDAPManagerHelper.getEnvironment(<portlet:namespace/>initConnectInfoTab);
         }
 
         /* Tree click event handler */
@@ -93,7 +93,7 @@
                     if ((selectedNode.state == 'UNCHECKED') && (selectedNode.isExpanded
== false)) {
                         // Add children
                         _selectedNode = selectedNode;
-                        LDAPHelper.list(_selectedNode.widgetId, <portlet:namespace/>updateLDAPTree);
+                        LDAPManagerHelper.list(_selectedNode.widgetId, <portlet:namespace/>updateLDAPTree);
                     }
                 }
             },
@@ -106,7 +106,7 @@
             tree.eventNames.titleClick,
             function(message) {
                 var dn = message.source.widgetId;
-                LDAPHelper.getAttributes(dn, <portlet:namespace/>updateAttributesTable);
+                LDAPManagerHelper.getAttributes(dn, <portlet:namespace/>updateAttributesTable);
             }
         );
 
@@ -132,7 +132,7 @@
                     }
                     // Add children
                     _selectedNode = selectedNode;
-                    LDAPHelper.list(_selectedNode.widgetId, <portlet:namespace/>updateLDAPTree);
+                    LDAPManagerHelper.list(_selectedNode.widgetId, <portlet:namespace/>updateLDAPTree);
                 }
             }
         );
@@ -247,7 +247,7 @@
     // alert(connectInfoStr);
     
     // Connect to new LDAP server
-    LDAPHelper.connect(
+    LDAPManagerHelper.connect(
         initialContextFactory,
         host,
         port,
@@ -279,13 +279,13 @@
     } else {
         scope = 'subtree';
     }
-    LDAPHelper.search(searchDN, filter, scope, <portlet:namespace/>updateSearchResultTable);
+    LDAPManagerHelper.search(searchDN, filter, scope, <portlet:namespace/>updateSearchResultTable);
 }
 
 /* Clear result button clicked event handler */
 function clearResultBtnClicked() {
-    DWRUtil.removeAllRows('searchResultTableBody');
-    DWRUtil.setValue('searchResultCount', '');
+	dwr.util.removeAllRows('searchResultTableBody');
+	dwr.util.setValue('searchResultCount', '');
 }
 </script>
 
@@ -308,16 +308,16 @@
 
 <!-- DWR Stuff -->
 <% String dwrForwarderServlet = "/console/dwr2"; %>
-<script type='text/javascript' src='<%= dwrForwarderServlet %>/interface/LDAPHelper.js'></script>
+<script type='text/javascript' src='<%= dwrForwarderServlet %>/interface/LDAPManagerHelper.js'></script>
 <script type='text/javascript' src='<%= dwrForwarderServlet %>/engine.js'></script>
 <script type='text/javascript' src='<%= dwrForwarderServlet %>/util.js'></script>
 
 <script>
 /* Sync calls */
-DWREngine.setAsync(false);
+dwr.engine.setAsync(false);
 
 /* Generic error handler */
-DWREngine.setErrorHandler(
+dwr.engine.setErrorHandler(
     function (errorString) {
         alert('Error: ' + errorString + '\n** Make sure LDAP server is running and/or connection
properties are correct.');
         selectTab('connectInfoTab');
@@ -343,8 +343,8 @@
 
 /* Update attributes table */
 function <portlet:namespace/>updateAttributesTable(attributes) {
-    DWRUtil.removeAllRows('attributesTableBody');
-    DWRUtil.addRows(
+	dwr.util.removeAllRows('attributesTableBody');
+	dwr.util.addRows(
         'attributesTableBody', 
         attributes,
         [
@@ -361,8 +361,8 @@
 
 /* Update search result table */
 function <portlet:namespace/>updateSearchResultTable(searchResult) {
-    DWRUtil.removeAllRows('searchResultTableBody');
-    DWRUtil.addRows(
+	dwr.util.removeAllRows('searchResultTableBody');
+	dwr.util.addRows(
         'searchResultTableBody',
         searchResult,
         [
@@ -372,7 +372,7 @@
         ],
         tableOption
     );
-    DWRUtil.setValue('searchResultCount', searchResult.length + ' entries returned...');
+	dwr.util.setValue('searchResultCount', searchResult.length + ' entries returned...');
 }
 
 /* Update LDAP tree */
@@ -405,7 +405,7 @@
     var controller = dojo.widget.byId('treeController');
     controller.expand(rootNode);
     _selectedNode = rootNode;
-    LDAPHelper.list(_selectedNode.widgetId, <portlet:namespace/>updateLDAPTree);
+    LDAPManagerHelper.list(_selectedNode.widgetId, <portlet:namespace/>updateLDAPTree);
 
     // Select node
     var treeSelector = dojo.widget.byId("treeSelector");
@@ -419,7 +419,7 @@
     
     // Update attributes table
     var dn = rootNode.widgetId;
-    LDAPHelper.getAttributes(dn, <portlet:namespace/>updateAttributesTable);
+    LDAPManagerHelper.getAttributes(dn, <portlet:namespace/>updateAttributesTable);
     
     // Update Search tab's 'Search DN' field
     document.LDAPSearchForm.searchDN.value = baseDN;
@@ -457,7 +457,7 @@
 
 /* Prints 'LOADING' message while waiting for DWR method calls */
 function init() {
-    DWRUtil.useLoadingMessage();
+	dwr.util.useLoadingMessage();
 }
 
 function callOnLoad(load) {



Mime
View raw message