geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmcma...@apache.org
Subject svn commit: r568246 - in /geronimo/plugins: console/trunk/console-base-portlets/src/main/java/org/apache/geronimo/console/servlet/ console/trunk/console-core/src/main/java/org/apache/geronimo/console/servlet/ console/trunk/console-portal-driver/src/mai...
Date Tue, 21 Aug 2007 19:55:41 GMT
Author: pmcmahan
Date: Tue Aug 21 12:55:33 2007
New Revision: 568246

URL: http://svn.apache.org/viewvc?rev=568246&view=rev
Log:
GERONIMO-3413 factor out the classloader, jmx, jndi, dependency, and ldap debug views as a plugin

Added:
    geronimo/plugins/console/trunk/console-core/src/main/java/org/apache/geronimo/console/servlet/
      - copied from r567286, geronimo/plugins/console/trunk/console-base-portlets/src/main/java/org/apache/geronimo/console/servlet/
    geronimo/plugins/debugviews/
    geronimo/plugins/debugviews/trunk/
    geronimo/plugins/debugviews/trunk/LICENSE.txt
      - copied unchanged from r566211, geronimo/plugins/console/trunk/LICENSE.txt
    geronimo/plugins/debugviews/trunk/NOTICE.txt
      - copied unchanged from r566211, geronimo/plugins/console/trunk/NOTICE.txt
    geronimo/plugins/debugviews/trunk/debugviews-jetty/
      - copied from r566211, geronimo/plugins/plancreator/trunk/plancreator-jetty/
    geronimo/plugins/debugviews/trunk/debugviews-portlets/
    geronimo/plugins/debugviews/trunk/debugviews-portlets/LICENSE.txt
      - copied unchanged from r566211, geronimo/plugins/plancreator/trunk/LICENSE.txt
    geronimo/plugins/debugviews/trunk/debugviews-portlets/NOTICE.txt
      - copied unchanged from r566211, geronimo/plugins/plancreator/trunk/NOTICE.txt
    geronimo/plugins/debugviews/trunk/debugviews-portlets/pom.xml
      - copied, changed from r566211, geronimo/plugins/plancreator/trunk/plancreator-portlets/pom.xml
    geronimo/plugins/debugviews/trunk/debugviews-portlets/src/
    geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/
    geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/java/
    geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/java/org/
    geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/java/org/apache/
    geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/java/org/apache/geronimo/
    geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/java/org/apache/geronimo/console/
    geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/java/org/apache/geronimo/console/classloaderview/
      - copied from r568129, geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/classloaderview/
    geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/java/org/apache/geronimo/console/dependencyview/
      - copied from r568129, geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/dependencyview/
    geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/java/org/apache/geronimo/console/jmxmanager/
      - copied from r568129, geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/jmxmanager/
    geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/java/org/apache/geronimo/console/jndiview/
      - copied from r568129, geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/jndiview/
    geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/java/org/apache/geronimo/console/ldapmanager/
      - copied from r568129, geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/ldapmanager/
    geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/webapp/
    geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/webapp/TreeDocIcon.css
      - copied unchanged from r568129, geronimo/server/trunk/applications/console/geronimo-console-framework/src/main/webapp/TreeDocIcon.css
    geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/webapp/WEB-INF/
    geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/webapp/WEB-INF/portlet.xml
      - copied, changed from r566211, geronimo/plugins/plancreator/trunk/plancreator-portlets/src/main/webapp/WEB-INF/portlet.xml
    geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/webapp/WEB-INF/view/
    geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/webapp/WEB-INF/view/classloaderview/
      - copied from r568129, geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/classloaderview/
    geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/webapp/WEB-INF/view/dependencyview/
      - copied from r568129, geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/dependencyview/
    geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/webapp/WEB-INF/view/jmxmanager/
      - copied from r568129, geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/jmxmanager/
    geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/webapp/WEB-INF/view/jndiview/
      - copied from r568129, geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/jndiview/
    geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/webapp/WEB-INF/view/ldapmanager/
      - copied from r568129, geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/ldapmanager/
    geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/webapp/WEB-INF/web.xml
      - copied, changed from r566211, geronimo/plugins/plancreator/trunk/plancreator-portlets/src/main/webapp/WEB-INF/web.xml
    geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/webapp/ico_filetree_16x16.gif
      - copied unchanged from r568129, geronimo/server/trunk/applications/console/geronimo-console-framework/src/main/webapp/images/ico_filetree_16x16.gif
    geronimo/plugins/debugviews/trunk/pom.xml
      - copied, changed from r566211, geronimo/plugins/plancreator/trunk/pom.xml
Removed:
    geronimo/plugins/console/trunk/console-base-portlets/src/main/java/org/apache/geronimo/console/servlet/
Modified:
    geronimo/plugins/console/trunk/console-portal-driver/src/main/webapp/WEB-INF/web.xml
    geronimo/plugins/debugviews/trunk/debugviews-jetty/pom.xml
    geronimo/plugins/debugviews/trunk/debugviews-jetty/src/main/resources/META-INF/geronimo-plugin.xml
    geronimo/plugins/debugviews/trunk/debugviews-jetty/src/plan/plan.xml
    geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/java/org/apache/geronimo/console/jmxmanager/JMXManagerHelper.java
    geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/java/org/apache/geronimo/console/ldapmanager/LDAPManagerHelper.java
    geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/webapp/WEB-INF/view/classloaderview/view.jsp
    geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/webapp/WEB-INF/view/dependencyview/view.jsp
    geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/webapp/WEB-INF/view/jmxmanager/viewJMXServer.jsp
    geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/webapp/WEB-INF/view/jndiview/view.jsp
    geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/webapp/WEB-INF/view/ldapmanager/viewLDAPServer.jsp

Modified: geronimo/plugins/console/trunk/console-portal-driver/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/console/trunk/console-portal-driver/src/main/webapp/WEB-INF/web.xml?rev=568246&r1=568245&r2=568246&view=diff
==============================================================================
--- geronimo/plugins/console/trunk/console-portal-driver/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/plugins/console/trunk/console-portal-driver/src/main/webapp/WEB-INF/web.xml Tue Aug 21 12:55:33 2007
@@ -67,9 +67,28 @@
     </init-param>
   </servlet>
 
+  <servlet>
+    <display-name>DWR Forward Servlet 2</display-name>
+    <servlet-name>dwr-forward2</servlet-name>
+    <servlet-class>org.apache.geronimo.console.servlet.ContextForwardServlet</servlet-class>
+    <init-param>
+       <param-name>servlet-path</param-name>
+       <param-value>/dwr2</param-value>
+    </init-param>
+    <init-param>
+       <param-name>context-path</param-name>
+       <param-value>/DebugViews</param-value>
+    </init-param>
+  </servlet>
+
   <servlet-mapping>
     <servlet-name>dwr-forward</servlet-name>
     <url-pattern>/dwr/*</url-pattern>
+  </servlet-mapping>
+
+  <servlet-mapping>
+    <servlet-name>dwr-forward2</servlet-name>
+    <url-pattern>/dwr2/*</url-pattern>
   </servlet-mapping>
 
   <servlet-mapping>

Modified: geronimo/plugins/debugviews/trunk/debugviews-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/debugviews/trunk/debugviews-jetty/pom.xml?rev=568246&r1=566211&r2=568246&view=diff
==============================================================================
--- geronimo/plugins/debugviews/trunk/debugviews-jetty/pom.xml (original)
+++ geronimo/plugins/debugviews/trunk/debugviews-jetty/pom.xml Tue Aug 21 12:55:33 2007
@@ -24,21 +24,21 @@
 
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>plancreator</artifactId>
+        <artifactId>debugviews</artifactId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <groupId>org.apache.geronimo.plugins</groupId>
-    <artifactId>plancreator-jetty</artifactId>
-    <name>Geronimo Plan Creator :: Configuration for Jetty</name>
+    <artifactId>debugviews-jetty</artifactId>
+    <name>Geronimo Debug Views :: Configuration for Jetty</name>
     <packaging>car</packaging>
 
     <dependencies>
         
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>plancreator-portlets</artifactId>
+            <artifactId>debugviews-portlets</artifactId>
             <version>${version}</version>
             <type>war</type>
         </dependency>
@@ -51,29 +51,40 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-management</artifactId>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
+            <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>connector-deployer</artifactId>
+            <artifactId>dojo-jetty6</artifactId>
             <type>car</type>
         </dependency>
 
         <dependency>
+            <groupId>org.apache.xbean</groupId>
+            <artifactId>xbean-naming</artifactId>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-deploy-jsr88</artifactId>
+            <artifactId>geronimo-kernel</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-test-ddbean</artifactId>
+            <artifactId>geronimo-management</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>console-core</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_2.5_spec</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee</artifactId>
         </dependency>
 
     </dependencies>
@@ -99,7 +110,7 @@
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.plugins</groupId>
-                        <artifactId>plancreator-portlets</artifactId>
+                        <artifactId>debugviews-portlets</artifactId>
                         <type>war</type>
                     </module>
                 </configuration>

Modified: geronimo/plugins/debugviews/trunk/debugviews-jetty/src/main/resources/META-INF/geronimo-plugin.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/debugviews/trunk/debugviews-jetty/src/main/resources/META-INF/geronimo-plugin.xml?rev=568246&r1=566211&r2=568246&view=diff
==============================================================================
--- geronimo/plugins/debugviews/trunk/debugviews-jetty/src/main/resources/META-INF/geronimo-plugin.xml (original)
+++ geronimo/plugins/debugviews/trunk/debugviews-jetty/src/main/resources/META-INF/geronimo-plugin.xml Tue Aug 21 12:55:33 2007
@@ -19,11 +19,11 @@
 <!-- $Rev$ $Date$ -->
 
 <geronimo-plugin xmlns="http://geronimo.apache.org/xml/ns/plugins-1.1">
-    <name>Plan Creator -- Jetty</name>
-    <module-id>org.apache.geronimo.plugins/plancreator-jetty/1.0-SNAPSHOT/car</module-id>
+    <name>Debug Views -- Jetty</name>
+    <module-id>org.apache.geronimo.plugins/debugviews-jetty/1.0-SNAPSHOT/car</module-id>
     <category>Application</category>
     <description>
-       Geronimo Plan Creator for Jetty
+       Geronimo Debug Views for Jetty
     </description>
 
     <url>http://geronimo.apache.org/</url>
@@ -47,6 +47,14 @@
         <description>
             The pluto container configuration must be present in order for this
             plugin to register the web application context for its management portlets.
+        </description>
+    </prerequisite>
+    <prerequisite>
+        <id>org.apache.geronimo.configs/dojo-jetty6//car</id>
+        <resource-type>Web Resources</resource-type>
+        <description>
+            The dojo configuration must be present in order for this
+            plugin to have access to resources from the dojo library.
         </description>
     </prerequisite>
     <dependency>org.apache.geronimo.configs/j2ee-server/2.1-SNAPSHOT/car</dependency>

Modified: geronimo/plugins/debugviews/trunk/debugviews-jetty/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/debugviews/trunk/debugviews-jetty/src/plan/plan.xml?rev=568246&r1=566211&r2=568246&view=diff
==============================================================================
--- geronimo/plugins/debugviews/trunk/debugviews-jetty/src/plan/plan.xml (original)
+++ geronimo/plugins/debugviews/trunk/debugviews-jetty/src/plan/plan.xml Tue Aug 21 12:55:33 2007
@@ -19,7 +19,7 @@
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2">
     
     <!-- This is where the files are accessed from. (aka - portletContext) -->
-    <context-root>/PlanCreator</context-root>
+    <context-root>/DebugViews</context-root>
 
     <security-realm-name>geronimo-admin</security-realm-name>
     <security xmlns="http://geronimo.apache.org/xml/ns/security-1.2">
@@ -30,10 +30,34 @@
         </role-mappings>
     </security>
     
-    <!-- Start off a ACEGBean, this is the lifecycle for the portlet -->
-    <gbean name="PlanCreator" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-        <attribute name="pageTitle">Applications/Plan Creator</attribute>
-        <attribute name="portletContext">/PlanCreator</attribute>
-        <attribute name="portletList">[PlanCreator]</attribute>
+    <gbean name="JMXViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+        <attribute name="pageTitle">Debug Views/JMX Viewer</attribute>
+        <attribute name="portletContext">/DebugViews</attribute>
+        <attribute name="portletList">[JMXViewer]</attribute>
     </gbean>
+
+    <gbean name="LDAPViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+        <attribute name="pageTitle">Debug Views/LDAP Viewer</attribute>
+        <attribute name="portletContext">/DebugViews</attribute>
+        <attribute name="portletList">[LDAPViewer]</attribute>
+    </gbean>
+
+    <gbean name="ClassLoaderViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+        <attribute name="pageTitle">Debug Views/ClassLoader Viewer</attribute>
+        <attribute name="portletContext">/DebugViews</attribute>
+        <attribute name="portletList">[ClassLoaderViewer]</attribute>
+    </gbean>
+
+    <gbean name="JNDIViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+        <attribute name="pageTitle">Debug Views/JNDI Viewer</attribute>
+        <attribute name="portletContext">/DebugViews</attribute>
+        <attribute name="portletList">[JNDIViewer]</attribute>
+    </gbean>
+
+    <gbean name="DependencyViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+        <attribute name="pageTitle">Debug Views/Dependency Viewer</attribute>
+        <attribute name="portletContext">/DebugViews</attribute>
+        <attribute name="portletList">[DependencyViewer]</attribute>
+    </gbean>
+
 </web-app>

Copied: geronimo/plugins/debugviews/trunk/debugviews-portlets/pom.xml (from r566211, geronimo/plugins/plancreator/trunk/plancreator-portlets/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/plugins/debugviews/trunk/debugviews-portlets/pom.xml?p2=geronimo/plugins/debugviews/trunk/debugviews-portlets/pom.xml&p1=geronimo/plugins/plancreator/trunk/plancreator-portlets/pom.xml&r1=566211&r2=568246&rev=568246&view=diff
==============================================================================
--- geronimo/plugins/plancreator/trunk/plancreator-portlets/pom.xml (original)
+++ geronimo/plugins/debugviews/trunk/debugviews-portlets/pom.xml Tue Aug 21 12:55:33 2007
@@ -24,67 +24,60 @@
 
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
-        <artifactId>plancreator</artifactId>
+        <artifactId>debugviews</artifactId>
         <version>1.0-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>plancreator-portlets</artifactId>
-    <name>Geronimo Plan Creator :: Admin Console Portlets</name>
+    <artifactId>debugviews-portlets</artifactId>
+    <name>Geronimo Debug Views :: Admin Console Portlets</name>
     <packaging>war</packaging>
 
     <dependencies>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-management</artifactId>
+            <groupId>org.apache.xbean</groupId>
+            <artifactId>xbean-naming</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-j2ee-builder</artifactId>
-            <scope>provided</scope>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>console-core</artifactId>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-naming-builder</artifactId>
+            <artifactId>geronimo-kernel</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-security-builder</artifactId>
+            <artifactId>geronimo-management</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-connector-builder</artifactId>
-            <scope>provided</scope>
+            <groupId>org.directwebremoting</groupId>
+            <artifactId>dwr</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-web-2.5-builder</artifactId>
+            <groupId>javax.portlet</groupId>
+            <artifactId>portlet-api</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-deploy-jsr88</artifactId>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_2.5_spec</artifactId>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>console-core</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>javax.portlet</groupId>
-            <artifactId>portlet-api</artifactId>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-j2ee</artifactId>
             <scope>provided</scope>
         </dependency>
         

Modified: geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/java/org/apache/geronimo/console/jmxmanager/JMXManagerHelper.java
URL: http://svn.apache.org/viewvc/geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/java/org/apache/geronimo/console/jmxmanager/JMXManagerHelper.java?rev=568246&r1=568129&r2=568246&view=diff
==============================================================================
--- geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/java/org/apache/geronimo/console/jmxmanager/JMXManagerHelper.java (original)
+++ geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/java/org/apache/geronimo/console/jmxmanager/JMXManagerHelper.java Tue Aug 21 12:55:33 2007
@@ -49,10 +49,13 @@
 import org.apache.geronimo.kernel.GBeanNotFoundException;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.KernelRegistry;
+import org.directwebremoting.annotations.RemoteMethod;
+import org.directwebremoting.annotations.RemoteProxy;
 
 /**
  * The JMX manager helper
  */
+@RemoteProxy(name="JMXHelper")
 public class JMXManagerHelper {
     /** Used to return all MBeans */
     private static final String ALL_MBEANS = "AllMBeans";
@@ -86,6 +89,7 @@
     /**
      * List MBeans containing a substring in its object name
      */
+    @RemoteMethod
     public Collection listBySubstring(String substring) {
         Collection result = new ArrayList();
         if ((substring == null) || (substring.trim().length() == 0)) {
@@ -106,6 +110,7 @@
     /**
      * List MBeans using a pattern (ObjectName)
      */
+    @RemoteMethod
     public Collection listByPattern(String pattern) {
         Collection result = new ArrayList();
         if ((pattern == null) || (pattern.trim().length() == 0)) {
@@ -136,6 +141,7 @@
     /**
      * List MBeans using J2EE type
      */
+    @RemoteMethod
     public Collection listByJ2EEType(String type) {
         Collection result = new ArrayList();
         Map m = null;
@@ -222,6 +228,7 @@
     /**
      * Return MBean attributes
      */
+    @RemoteMethod
     public Collection getAttributes(String abstractName) {
         Map attributes = new TreeMap();
         try {
@@ -283,6 +290,7 @@
     /**
      * Return MBean operations
      */
+    @RemoteMethod
     public Collection getOperations(String abstractName) {
         Map operations = new TreeMap();
         try {
@@ -316,6 +324,7 @@
     /**
      * Return MBean basic info
      */
+    @RemoteMethod
     public Collection getMBeanInfo(String abstractName) {
         Collection info = new ArrayList();
         try {
@@ -342,6 +351,7 @@
     /**
      * Return all MBeans that provide stats
      */
+    @RemoteMethod
     public Collection getStatsProvidersMBeans() {
         Collection result = new ArrayList();
 
@@ -367,6 +377,7 @@
     /**
      * Return MBean stats
      */
+    @RemoteMethod
     public Collection getMBeanStats(String abstractName) {
         Map mbeanStats = new TreeMap();
         try {
@@ -465,6 +476,7 @@
     /**
      * Invoke MBean operation with arguments
      */
+    @RemoteMethod
     public String[] invokeOperWithArgs(String abstractName, String methodName,
             String[] args, String[] types) {
         String[] result = new String[2]; // return method name & result
@@ -489,6 +501,7 @@
     /**
      * Invoke MBean operation without arguments
      */
+    @RemoteMethod
     public String[] invokeOperNoArgs(String abstractName, String methodName) {
         String[] result = new String[2]; // return method name & result
         result[0] = methodName + "()";

Modified: geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/java/org/apache/geronimo/console/ldapmanager/LDAPManagerHelper.java
URL: http://svn.apache.org/viewvc/geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/java/org/apache/geronimo/console/ldapmanager/LDAPManagerHelper.java?rev=568246&r1=568129&r2=568246&view=diff
==============================================================================
--- geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/java/org/apache/geronimo/console/ldapmanager/LDAPManagerHelper.java (original)
+++ geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/java/org/apache/geronimo/console/ldapmanager/LDAPManagerHelper.java Tue Aug 21 12:55:33 2007
@@ -37,12 +37,16 @@
 import javax.naming.directory.SearchResult;
 import javax.servlet.http.HttpSession;
 
+import org.directwebremoting.annotations.RemoteMethod;
+import org.directwebremoting.annotations.RemoteProxy;
+
 import uk.ltd.getahead.dwr.WebContext;
 import uk.ltd.getahead.dwr.WebContextFactory;
 
 /**
  * The LDAP manager helper
  */
+@RemoteProxy(name="LDAPHelper")
 public class LDAPManagerHelper {
     private final static String LDAP_VERSION_KEY = "java.naming.ldap.version";
 
@@ -137,6 +141,7 @@
     /**
      * Create a directory context using config data
      */
+    @RemoteMethod
     public synchronized String connect(String initialContextFactory,
             String host, String port, String baseDN, String ldapVersion,
             String securityProtocol, String securityAuthentication,
@@ -188,6 +193,7 @@
     /**
      * Return directory context environment
      */
+    @RemoteMethod
     public Map getEnvironment() {
         Map env = new HashMap();
         env.put("host", host);
@@ -211,6 +217,7 @@
     /**
      * Returns the names bound in the named context
      */
+    @RemoteMethod
     public Collection list(String name) throws Exception {
         ArrayList result = new ArrayList();
 
@@ -284,6 +291,7 @@
     /**
      * Return the attributes of an LDAP entry
      */
+    @RemoteMethod
     public Collection getAttributes(String name) throws Exception {
         ArrayList result = new ArrayList();
         
@@ -314,6 +322,7 @@
     /**
      * Execute an LDAP search
      */
+    @RemoteMethod
     public Collection search(String searchDN, String filter, String searchScope)
             throws Exception {
         ArrayList result = new ArrayList();
@@ -374,6 +383,7 @@
     /**
      * Return base DN of this directory context
      */
+    @RemoteMethod
     public String getBaseDN() {
         return baseDN;
     }

Copied: geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/webapp/WEB-INF/portlet.xml (from r566211, geronimo/plugins/plancreator/trunk/plancreator-portlets/src/main/webapp/WEB-INF/portlet.xml)
URL: http://svn.apache.org/viewvc/geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/webapp/WEB-INF/portlet.xml?p2=geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/webapp/WEB-INF/portlet.xml&p1=geronimo/plugins/plancreator/trunk/plancreator-portlets/src/main/webapp/WEB-INF/portlet.xml&r1=566211&r2=568246&rev=568246&view=diff
==============================================================================
--- geronimo/plugins/plancreator/trunk/plancreator-portlets/src/main/webapp/WEB-INF/portlet.xml (original)
+++ geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/webapp/WEB-INF/portlet.xml Tue Aug 21 12:55:33 2007
@@ -22,26 +22,88 @@
 
 <portlet-app version="1.0">
 
-     <portlet>
-        <description>Portlet for creating Geronimo Deployment Plan</description>
-        <portlet-name>PlanCreator</portlet-name>
-        <display-name>Create Deployment Plan Portlet</display-name>
-
-        <portlet-class>org.apache.geronimo.console.configcreator.CreatePlanPortlet</portlet-class>
+    <portlet>
+        <description>ClassLoader Viewer Portlet</description>
+        <portlet-name>ClassLoaderViewer</portlet-name>
+        <display-name>ClassLoader Viewer</display-name>
+        <portlet-class>org.apache.geronimo.console.classloaderview.ClassLoaderViewPortlet</portlet-class>
+        <expiration-cache>-1</expiration-cache>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+        </supports>
+        <supported-locale>en</supported-locale>
+        <portlet-info>
+            <title>ClassLoader Viewer</title>
+            <short-title>classloaderviewer</short-title>
+        </portlet-info>
+    </portlet>
 
+    <portlet>
+        <description>Dependency Viewer Portlet</description>
+        <portlet-name>DependencyViewer</portlet-name>
+        <display-name>Dependency Viewer</display-name>
+        <portlet-class>org.apache.geronimo.console.dependencyview.DependencyViewPortlet</portlet-class>
         <expiration-cache>-1</expiration-cache>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+        </supports>
+        <supported-locale>en</supported-locale>
+        <portlet-info>
+            <title>Dependency Viewer</title>
+            <short-title>dependencyviewer</short-title>
+        </portlet-info>
+    </portlet>
 
+    <portlet>
+        <description>JMX Viewer Portlet</description>
+        <portlet-name>JMXViewer</portlet-name>
+        <display-name>JMX Viewer</display-name>
+        <portlet-class>org.apache.geronimo.console.jmxmanager.JMXManagerPortlet</portlet-class>
+        <expiration-cache>-1</expiration-cache>
         <supports>
             <mime-type>text/html</mime-type>
             <portlet-mode>VIEW</portlet-mode>
         </supports>
+        <supported-locale>en</supported-locale>
+        <portlet-info>
+            <title>JMX Viewer</title>
+            <short-title>jmxviewer</short-title>
+        </portlet-info>
+    </portlet>
 
+    <portlet>
+        <description>JNDI Viewer Portlet</description>
+        <portlet-name>JNDIViewer</portlet-name>
+        <display-name>JNDI Viewer</display-name>
+        <portlet-class>org.apache.geronimo.console.jndiview.JNDIViewPortlet</portlet-class>
+        <expiration-cache>-1</expiration-cache>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+        </supports>
         <supported-locale>en</supported-locale>
+        <portlet-info>
+            <title>JNDI Viewer</title>
+            <short-title>jndiviewer</short-title>
+        </portlet-info>
+    </portlet>
 
+    <portlet>
+        <description>LDAP Viewer Portlet</description>
+        <portlet-name>LDAPViewer</portlet-name>
+        <display-name>LDAP Viewer</display-name>
+        <portlet-class>org.apache.geronimo.console.ldapmanager.LDAPManagerPortlet</portlet-class>
+        <expiration-cache>-1</expiration-cache>
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+        </supports>
+        <supported-locale>en</supported-locale>
         <portlet-info>
-            <title>Create Geronimo Deployment Plan</title>
-            <short-title>Create Deployment Plan</short-title>
-            <keywords>Create Deployment Plan</keywords>
+            <title>LDAP Viewer</title>
+            <short-title>ldapviewer</short-title>
         </portlet-info>
     </portlet>
 

Modified: geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/webapp/WEB-INF/view/classloaderview/view.jsp
URL: http://svn.apache.org/viewvc/geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/webapp/WEB-INF/view/classloaderview/view.jsp?rev=568246&r1=568129&r2=568246&view=diff
==============================================================================
--- geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/webapp/WEB-INF/view/classloaderview/view.jsp (original)
+++ geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/webapp/WEB-INF/view/classloaderview/view.jsp Tue Aug 21 12:55:33 2007
@@ -16,8 +16,7 @@
 --%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<%@ page import="org.apache.geronimo.console.util.PortletManager,
-                 javax.portlet.RenderRequest,org.apache.geronimo.console.classloaderview.ClassLoaderViewPortlet"%>
+<%@ page import="javax.portlet.RenderRequest,org.apache.geronimo.console.classloaderview.ClassLoaderViewPortlet"%>
 <portlet:defineObjects />
 
 <%
@@ -35,6 +34,31 @@
     String childs = cp.getJSONTrees(inverse);
 %>
 
+    <script type="text/javascript" src="/dojo/dojo.js"></script>
+
+    <script type="text/javascript">
+        dojo.require("dojo.lang.*");
+        dojo.require("dojo.widget.*");
+        // Pane includes
+        dojo.require("dojo.widget.ContentPane");
+        dojo.require("dojo.widget.LayoutContainer"); // Before: LayoutPane
+        dojo.require("dojo.widget.SplitContainer"); // Before: SplitPane
+        // Tree includes
+        dojo.require("dojo.widget.Tree");
+        dojo.require("dojo.widget.TreeBasicController");
+        dojo.require("dojo.widget.TreeContextMenu");
+        dojo.require("dojo.widget.TreeSelector");
+        // Tab includes
+        dojo.require("dojo.widget.TabContainer");
+        // Etc includes
+        dojo.require("dojo.widget.SortableTable");
+        dojo.require("dojo.widget.ComboBox");
+        dojo.require("dojo.widget.Tooltip");
+        dojo.require("dojo.widget.validate");
+        // Includes Dojo source for debugging
+        // dojo.hostenv.writeIncludes();
+    </script>
+
 <script>
     dojo.require("dojo.widget.*");
     dojo.require("dojo.widget.TreeV3");
@@ -291,10 +315,6 @@
     }
 </script>
 
-<%
-    String consoleFrameworkContext = PortletManager.getConsoleFrameworkServletPath(request);
-    String iconCSS = consoleFrameworkContext + "/../TreeDocIcon.css";
-%>
 <form name="clform" onSubmit="return getAction()">
 <input type="hidden" name="snNode" value=""/>
 <input type="hidden" name="inverse" value="${inverse}"/>
@@ -317,7 +337,7 @@
 <div dojoType="TreeToggleOnSelect" selector="selector"
  controller="controller"></div>
 <div dojoType="TreeDocIconExtension" widgetId="iconcontroller"
- templateCssPath="<%= iconCSS %>"></div>
+ templateCssPath="<%= renderResponse.encodeURL(renderRequest.getContextPath() + "/TreeDocIcon.css") %>"></div>
 <div dojoType="TreeV3" listeners="controller;selector;iconcontroller"
  widgetId='tree' allowedMulti='false'></div>
 

Modified: geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/webapp/WEB-INF/view/dependencyview/view.jsp
URL: http://svn.apache.org/viewvc/geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/webapp/WEB-INF/view/dependencyview/view.jsp?rev=568246&r1=568129&r2=568246&view=diff
==============================================================================
--- geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/webapp/WEB-INF/view/dependencyview/view.jsp (original)
+++ geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/webapp/WEB-INF/view/dependencyview/view.jsp Tue Aug 21 12:55:33 2007
@@ -16,8 +16,7 @@
 --%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<%@ page import="org.apache.geronimo.console.util.PortletManager,
-                 javax.portlet.RenderRequest"%>
+<%@ page import="javax.portlet.RenderRequest"%>
 <portlet:defineObjects/>
 
 <%
@@ -25,6 +24,31 @@
     renderRequest.getPortletSession().removeAttribute("dependencyTree");
 %>
 
+    <script type="text/javascript" src="/dojo/dojo.js"></script>
+
+    <script type="text/javascript">
+        dojo.require("dojo.lang.*");
+        dojo.require("dojo.widget.*");
+        // Pane includes
+        dojo.require("dojo.widget.ContentPane");
+        dojo.require("dojo.widget.LayoutContainer"); // Before: LayoutPane
+        dojo.require("dojo.widget.SplitContainer"); // Before: SplitPane
+        // Tree includes
+        dojo.require("dojo.widget.Tree");
+        dojo.require("dojo.widget.TreeBasicController");
+        dojo.require("dojo.widget.TreeContextMenu");
+        dojo.require("dojo.widget.TreeSelector");
+        // Tab includes
+        dojo.require("dojo.widget.TabContainer");
+        // Etc includes
+        dojo.require("dojo.widget.SortableTable");
+        dojo.require("dojo.widget.ComboBox");
+        dojo.require("dojo.widget.Tooltip");
+        dojo.require("dojo.widget.validate");
+        // Includes Dojo source for debugging
+        // dojo.hostenv.writeIncludes();
+    </script>
+
 <script>
     dojo.require("dojo.widget.*");
     dojo.require("dojo.widget.TreeV3");
@@ -192,10 +216,6 @@
         document.body.style.cursor = '';
     }
 </script>
-<% 
-    String consoleFrameworkContext = PortletManager.getConsoleFrameworkServletPath(request);
-    String iconCSS = consoleFrameworkContext + "/../TreeDocIcon.css";
-%>
 <TABLE cellpadding="1" cellspacing="1" border="1">
 <tr><td>
 <b>Search Text:</b> <input type="text" id="searchText" onChange="javascript:textChange()"/>
@@ -210,6 +230,6 @@
 <div dojoType="TreeSelectorV3" widgetId="selector" eventNames="select:nodeSelected"></div>    
 <div dojoType="TreeEmphasizeOnSelect" selector="selector"></div>
 <div dojoType="TreeToggleOnSelect" selector="selector" controller="controller"></div>
-<div dojoType="TreeDocIconExtension"  widgetId="iconcontroller" templateCssPath="<%= iconCSS %>"></div>
+<div dojoType="TreeDocIconExtension"  widgetId="iconcontroller" templateCssPath="<%= renderResponse.encodeURL(renderRequest.getContextPath() + "TreeDocIcon.css") %>"></div>
 <div dojoType="TreeV3" listeners="controller;selector;iconcontroller" widgetId='tree' allowedMulti='false'></div>
 

Modified: geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/webapp/WEB-INF/view/jmxmanager/viewJMXServer.jsp
URL: http://svn.apache.org/viewvc/geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/webapp/WEB-INF/view/jmxmanager/viewJMXServer.jsp?rev=568246&r1=568129&r2=568246&view=diff
==============================================================================
--- geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/webapp/WEB-INF/view/jmxmanager/viewJMXServer.jsp (original)
+++ geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/webapp/WEB-INF/view/jmxmanager/viewJMXServer.jsp Tue Aug 21 12:55:33 2007
@@ -18,18 +18,41 @@
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 <%@ taglib prefix="portlet" uri="http://java.sun.com/portlet" %>
-<%@ page import="org.apache.geronimo.console.util.PortletManager,
-                 org.apache.geronimo.console.jmxmanager.JMXManagerHelper" %>
+<%@ page import="org.apache.geronimo.console.jmxmanager.JMXManagerHelper" %>
 <portlet:defineObjects/>
 
+    <script type="text/javascript" src="/dojo/dojo.js"></script>
+
+    <script type="text/javascript">
+        dojo.require("dojo.lang.*");
+        dojo.require("dojo.widget.*");
+        // Pane includes
+        dojo.require("dojo.widget.ContentPane");
+        dojo.require("dojo.widget.LayoutContainer"); // Before: LayoutPane
+        dojo.require("dojo.widget.SplitContainer"); // Before: SplitPane
+        // Tree includes
+        dojo.require("dojo.widget.Tree");
+        dojo.require("dojo.widget.TreeBasicController");
+        dojo.require("dojo.widget.TreeContextMenu");
+        dojo.require("dojo.widget.TreeSelector");
+        // Tab includes
+        dojo.require("dojo.widget.TabContainer");
+        // Etc includes
+        dojo.require("dojo.widget.SortableTable");
+        dojo.require("dojo.widget.ComboBox");
+        dojo.require("dojo.widget.Tooltip");
+        dojo.require("dojo.widget.validate");
+        // Includes Dojo source for debugging
+        // dojo.hostenv.writeIncludes();
+    </script>
+
 <!------------------------>
 <!--     DOJO Stuff     -->
 <!------------------------>
 
 <%
     // JMX icon
-    String consoleFrameworkContext = PortletManager.getConsoleFrameworkServletPath(request);
-    String jmxIconURI = consoleFrameworkContext + "/../images/ico_filetree_16x16.gif";
+    String jmxIconURI = renderResponse.encodeURL(renderRequest.getContextPath() + "/ico_filetree_16x16.gif");
 %>
 
 <style type="text/css">
@@ -176,15 +199,15 @@
                             if (id.indexOf('<PATTERN>') != -1) {
                                 // Remove pattern marker
                                 var pattern = id.substring(id.indexOf('<PATTERN>') + '<PATTERN>'.length);  
-                                JMXHelper.listByPattern(<portlet:namespace/>updateJMXTree, pattern);
+                                JMXHelper.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(<portlet:namespace/>updateJMXTree, j2eeType);
+                                JMXHelper.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(<portlet:namespace/>updateJMXTree, svcModule);
+                                JMXHelper.listBySubstring(svcModule, <portlet:namespace/>updateJMXTree);
                             } else if (selectedNode.widgetId == 'statisticsProviderMBeans') {
                                 // Get statistics provider MBeans
                                 JMXHelper.getStatsProvidersMBeans(<portlet:namespace/>updateJMXTree);
@@ -216,10 +239,10 @@
                 } else {
                     // Remove marker to get abstract name
                     abstractName = abstractName.substring(abstractName.indexOf('::') + 2);
-                    JMXHelper.getMBeanInfo(<portlet:namespace/>updateBasicInfoTable, abstractName);
-                    JMXHelper.getAttributes(<portlet:namespace/>updateAttributesTable, abstractName);
-                    JMXHelper.getOperations(<portlet:namespace/>updateOperationsTable, abstractName);
-                    JMXHelper.getMBeanStats(<portlet:namespace/>updateStatsTable, abstractName);
+                    JMXHelper.getMBeanInfo(abstractName, <portlet:namespace/>updateBasicInfoTable);
+                    JMXHelper.getAttributes(abstractName, <portlet:namespace/>updateAttributesTable);
+                    JMXHelper.getOperations(abstractName, <portlet:namespace/>updateOperationsTable);
+                    JMXHelper.getMBeanStats(abstractName, <portlet:namespace/>updateStatsTable);
                 }
             }
         );
@@ -363,7 +386,7 @@
  */
 function searchBtnClicked() {
     var jmxQuery = dojo.widget.byId('jmxQuery').getValue();
-    JMXHelper.listByPattern(<portlet:namespace/>updateSearchMBeansTreeNode, jmxQuery);
+    JMXHelper.listByPattern(jmxQuery, <portlet:namespace/>updateSearchMBeansTreeNode);
 }
 
     /**
@@ -372,7 +395,7 @@
     function refreshStatsBtnClicked() {
         var abstractName = $('abstractName').value;
 
-        JMXHelper.getMBeanStats(<portlet:namespace/>updateStatsTable, abstractName);
+        JMXHelper.getMBeanStats(abstractName, <portlet:namespace/>updateStatsTable);
     }
 </script>
 
@@ -380,7 +403,7 @@
 <!--     DWR Stuff     -->
 <!----------------------->
 
-<% String dwrForwarderServlet = PortletManager.getConsoleFrameworkServletPath(request) + "/../dwr"; %>
+<% String dwrForwarderServlet = "/console/dwr2"; %>
 <script type='text/javascript' src='<%= dwrForwarderServlet %>/interface/JMXHelper.js'></script>
 <script type='text/javascript' src='<%= dwrForwarderServlet %>/engine.js'></script>
 <script type='text/javascript' src='<%= dwrForwarderServlet %>/util.js'></script>
@@ -696,6 +719,7 @@
         _attribValue = newValue;
         // Set attribute
         JMXHelper.setAttribute(
+            abstractName, attribName, newValue, attribType, /* Arguments */
             function(result) { /* setAttribFN Callback */
                 if (result[1] == '<SUCCESS>') {
                     alert("Attribute '" + result[0] + "' successfully set."); 
@@ -703,8 +727,7 @@
                 } else {
                     alert("Failed to set attribute '" + result[0] + "': " + result[1]);
                 }
-            },
-            abstractName, attribName, newValue, attribType /* Arguments */
+            }
         );
     }
 }
@@ -717,10 +740,10 @@
         // Operation without parameters
         // Invoke operator with no args        
         JMXHelper.invokeOperNoArgs(
+            abstractName, opName, /* Arguments */
             function(result) { /* invokeOperNoArgs Callback */
                 alert(result[0] + ' returned: ' + result[1]);
-            },
-            abstractName, opName /* Arguments */
+            }
         );
     } else {
         // Operation with parameters
@@ -734,10 +757,10 @@
         }
         // Invoke operator with args
         JMXHelper.invokeOperWithArgs(
+            abstractName, opName, paramValues, paramTypes,
             function(result) { /* invokeOperWithArgs Callback */
                 alert(result[0] + ' returned: ' + result[1]);
-            },
-            abstractName, opName, paramValues, paramTypes
+            }
         );
     }
 }

Modified: geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/webapp/WEB-INF/view/jndiview/view.jsp
URL: http://svn.apache.org/viewvc/geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/webapp/WEB-INF/view/jndiview/view.jsp?rev=568246&r1=568129&r2=568246&view=diff
==============================================================================
--- geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/webapp/WEB-INF/view/jndiview/view.jsp (original)
+++ geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/webapp/WEB-INF/view/jndiview/view.jsp Tue Aug 21 12:55:33 2007
@@ -16,8 +16,7 @@
 --%>
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
-<%@ page import="org.apache.geronimo.console.util.PortletManager,
-                 javax.portlet.RenderRequest"%>
+<%@ page import="javax.portlet.RenderRequest"%>
 <portlet:defineObjects/>
 
 <%
@@ -25,6 +24,31 @@
     renderRequest.getPortletSession().removeAttribute("jndiTree");
 %>
 
+    <script type="text/javascript" src="/dojo/dojo.js"></script>
+
+    <script type="text/javascript">
+        dojo.require("dojo.lang.*");
+        dojo.require("dojo.widget.*");
+        // Pane includes
+        dojo.require("dojo.widget.ContentPane");
+        dojo.require("dojo.widget.LayoutContainer"); // Before: LayoutPane
+        dojo.require("dojo.widget.SplitContainer"); // Before: SplitPane
+        // Tree includes
+        dojo.require("dojo.widget.Tree");
+        dojo.require("dojo.widget.TreeBasicController");
+        dojo.require("dojo.widget.TreeContextMenu");
+        dojo.require("dojo.widget.TreeSelector");
+        // Tab includes
+        dojo.require("dojo.widget.TabContainer");
+        // Etc includes
+        dojo.require("dojo.widget.SortableTable");
+        dojo.require("dojo.widget.ComboBox");
+        dojo.require("dojo.widget.Tooltip");
+        dojo.require("dojo.widget.validate");
+        // Includes Dojo source for debugging
+        // dojo.hostenv.writeIncludes();
+    </script>
+
 <script>
     dojo.require("dojo.widget.*");
     dojo.require("dojo.widget.TreeV3");
@@ -166,10 +190,6 @@
         document.body.style.cursor = '';
     }
 </script>
-<% 
-    String consoleFrameworkContext = PortletManager.getConsoleFrameworkServletPath(request);
-    String iconCSS = consoleFrameworkContext + "/../TreeDocIcon.css";
-%>
 <TABLE cellpadding="1" cellspacing="1" border="1">
 <tr><td>
 <b>Search Text:</b> <input type="text" id="searchText" onChange="javascript:textChange()"/>
@@ -185,6 +205,6 @@
 <div dojoType="TreeSelectorV3" widgetId="selector"></div>       
 <div dojoType="TreeEmphasizeOnSelect" selector="selector"></div>
 <div dojoType="TreeToggleOnSelect" selector="selector" controller="controller"></div>
-<div dojoType="TreeDocIconExtension"  widgetId="iconcontroller" templateCssPath="<%= iconCSS %>"></div>
+<div dojoType="TreeDocIconExtension"  widgetId="iconcontroller" templateCssPath="<%= renderResponse.encodeURL(renderRequest.getContextPath() + "/TreeDocIcon.css") %>"></div>
 <div dojoType="TreeV3" listeners="controller;selector;iconcontroller" widgetId='tree' allowedMulti='false'></div>
 

Modified: geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/webapp/WEB-INF/view/ldapmanager/viewLDAPServer.jsp
URL: http://svn.apache.org/viewvc/geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/webapp/WEB-INF/view/ldapmanager/viewLDAPServer.jsp?rev=568246&r1=568129&r2=568246&view=diff
==============================================================================
--- geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/webapp/WEB-INF/view/ldapmanager/viewLDAPServer.jsp (original)
+++ geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/webapp/WEB-INF/view/ldapmanager/viewLDAPServer.jsp Tue Aug 21 12:55:33 2007
@@ -17,13 +17,35 @@
 
 <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet" %>
-<%@ page import="org.apache.geronimo.console.util.PortletManager" %>
 <portlet:defineObjects/>
+    <script type="text/javascript" src="/dojo/dojo.js"></script>
+
+    <script type="text/javascript">
+        dojo.require("dojo.lang.*");
+        dojo.require("dojo.widget.*");
+        // Pane includes
+        dojo.require("dojo.widget.ContentPane");
+        dojo.require("dojo.widget.LayoutContainer"); // Before: LayoutPane
+        dojo.require("dojo.widget.SplitContainer"); // Before: SplitPane
+        // Tree includes
+        dojo.require("dojo.widget.Tree");
+        dojo.require("dojo.widget.TreeBasicController");
+        dojo.require("dojo.widget.TreeContextMenu");
+        dojo.require("dojo.widget.TreeSelector");
+        // Tab includes
+        dojo.require("dojo.widget.TabContainer");
+        // Etc includes
+        dojo.require("dojo.widget.SortableTable");
+        dojo.require("dojo.widget.ComboBox");
+        dojo.require("dojo.widget.Tooltip");
+        dojo.require("dojo.widget.validate");
+        // Includes Dojo source for debugging
+        // dojo.hostenv.writeIncludes();
+    </script>
 
 <%
     // LDAP icon
-    String consoleFrameworkContext = PortletManager.getConsoleFrameworkServletPath(request);
-    String ldapIconURI = consoleFrameworkContext + "/../images/ico_filetree_16x16.gif";
+    String ldapIconURI = renderResponse.encodeURL(renderRequest.getContextPath() + "/ico_filetree_16x16.gif");
 %>
 
 <!-- DOJO Stuff -->
@@ -69,7 +91,7 @@
                     if ((selectedNode.state == 'UNCHECKED') && (selectedNode.isExpanded == false)) {
                         // Add children
                         _selectedNode = selectedNode;
-                        LDAPHelper.list(<portlet:namespace/>updateLDAPTree, _selectedNode.widgetId);
+                        LDAPHelper.list(_selectedNode.widgetId, <portlet:namespace/>updateLDAPTree);
                     }
                 }
             },
@@ -82,7 +104,7 @@
             tree.eventNames.titleClick,
             function(message) {
                 var dn = message.source.widgetId;
-                LDAPHelper.getAttributes(<portlet:namespace/>updateAttributesTable, dn);
+                LDAPHelper.getAttributes(dn, <portlet:namespace/>updateAttributesTable);
             }
         );
 
@@ -108,7 +130,7 @@
                     }
                     // Add children
                     _selectedNode = selectedNode;
-                    LDAPHelper.list(<portlet:namespace/>updateLDAPTree, _selectedNode.widgetId);
+                    LDAPHelper.list(_selectedNode.widgetId, <portlet:namespace/>updateLDAPTree);
                 }
             }
         );
@@ -224,15 +246,6 @@
     
     // Connect to new LDAP server
     LDAPHelper.connect(
-        function(result) {
-            // TODO: Check result
-            if (result == '<SUCCESS>') {
-                window.location = '<portlet:actionURL />';
-            } else {
-                // Display error
-                alert(result + '\n** Make sure LDAP server is running and/or connection properties are correct.');
-            }
-        },
         initialContextFactory,
         host,
         port,
@@ -241,7 +254,16 @@
         securityProtocol,
         securityAuthentication,
         securityPrincipal,
-        securityCredentials
+        securityCredentials,
+        function(result) {
+            // TODO: Check result
+            if (result == '<SUCCESS>') {
+                window.location = '<portlet:actionURL />';
+            } else {
+                // Display error
+                alert(result + '\n** Make sure LDAP server is running and/or connection properties are correct.');
+            }
+        }
     );
 }
 
@@ -255,7 +277,7 @@
     } else {
         scope = 'subtree';
     }
-    LDAPHelper.search(<portlet:namespace/>updateSearchResultTable, searchDN, filter, scope);
+    LDAPHelper.search(searchDN, filter, scope, <portlet:namespace/>updateSearchResultTable);
 }
 
 /* Clear result button clicked event handler */
@@ -283,7 +305,7 @@
 </style>
 
 <!-- DWR Stuff -->
-<% String dwrForwarderServlet = PortletManager.getConsoleFrameworkServletPath(request) + "/../dwr"; %>
+<% String dwrForwarderServlet = "/console/dwr2"; %>
 <script type='text/javascript' src='<%= dwrForwarderServlet %>/interface/LDAPHelper.js'></script>
 <script type='text/javascript' src='<%= dwrForwarderServlet %>/engine.js'></script>
 <script type='text/javascript' src='<%= dwrForwarderServlet %>/util.js'></script>
@@ -381,7 +403,7 @@
     var controller = dojo.widget.byId('treeController');
     controller.expand(rootNode);
     _selectedNode = rootNode;
-    LDAPHelper.list(<portlet:namespace/>updateLDAPTree, _selectedNode.widgetId);
+    LDAPHelper.list(_selectedNode.widgetId, <portlet:namespace/>updateLDAPTree);
 
     // Select node
     var treeSelector = dojo.widget.byId("treeSelector");
@@ -395,7 +417,7 @@
     
     // Update attributes table
     var dn = rootNode.widgetId;
-    LDAPHelper.getAttributes(<portlet:namespace/>updateAttributesTable, dn);
+    LDAPHelper.getAttributes(dn, <portlet:namespace/>updateAttributesTable);
     
     // Update Search tab's 'Search DN' field
     document.LDAPSearchForm.searchDN.value = baseDN;

Copied: geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/webapp/WEB-INF/web.xml (from r566211, geronimo/plugins/plancreator/trunk/plancreator-portlets/src/main/webapp/WEB-INF/web.xml)
URL: http://svn.apache.org/viewvc/geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/webapp/WEB-INF/web.xml?p2=geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/webapp/WEB-INF/web.xml&p1=geronimo/plugins/plancreator/trunk/plancreator-portlets/src/main/webapp/WEB-INF/web.xml&r1=566211&r2=568246&rev=568246&view=diff
==============================================================================
--- geronimo/plugins/plancreator/trunk/plancreator-portlets/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/plugins/debugviews/trunk/debugviews-portlets/src/main/webapp/WEB-INF/web.xml Tue Aug 21 12:55:33 2007
@@ -21,24 +21,106 @@
     <display-name>Geronimo Plan Creator Portlet</display-name>
 
     <servlet>
-        <servlet-name>PlanCreator</servlet-name>
+      <servlet-name>dwr-invoker</servlet-name>
+      <servlet-class>org.directwebremoting.servlet.DwrServlet</servlet-class>
+      <init-param>
+        <param-name>classes</param-name>
+        <param-value>
+            org.apache.geronimo.console.jmxmanager.JMXManagerHelper,
+            org.apache.geronimo.console.ldapmanager.LDAPManagerHelper
+        </param-value>
+      </init-param>
+      <init-param>
+          <param-name>activeReverseAjaxEnabled</param-name>
+          <param-value>true</param-value>
+      </init-param>
+    </servlet>
+
+    <servlet>
+        <servlet-name>ClassLoaderViewer</servlet-name>
+        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+        <init-param>
+            <param-name>portlet-name</param-name>
+            <param-value>ClassLoaderViewer</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>DependencyViewer</servlet-name>
+        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+        <init-param>
+            <param-name>portlet-name</param-name>
+            <param-value>DependencyViewer</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>JMXViewer</servlet-name>
+        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+        <init-param>
+            <param-name>portlet-name</param-name>
+            <param-value>JMXViewer</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet>
+        <servlet-name>JNDIViewer</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
             <param-name>portlet-name</param-name>
-            <param-value>PlanCreator</param-value>
+            <param-value>JNDIViewer</param-value>
         </init-param>
         <load-on-startup>1</load-on-startup>
     </servlet>
 
+    <servlet>
+        <servlet-name>LDAPViewer</servlet-name>
+        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+        <init-param>
+            <param-name>portlet-name</param-name>
+            <param-value>LDAPViewer</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>dwr-invoker</servlet-name>
+        <url-pattern>/dwr2/*</url-pattern>
+    </servlet-mapping>
+
     <servlet-mapping>
-        <servlet-name>PlanCreator</servlet-name>
-        <url-pattern>/PlutoInvoker/PlanCreator</url-pattern>
+        <servlet-name>ClassLoaderViewer</servlet-name>
+        <url-pattern>/PlutoInvoker/ClassLoaderViewer</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>DependencyViewer</servlet-name>
+        <url-pattern>/PlutoInvoker/DependencyViewer</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>JMXViewer</servlet-name>
+        <url-pattern>/PlutoInvoker/JMXViewer</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>JNDIViewer</servlet-name>
+        <url-pattern>/PlutoInvoker/JNDIViewer</url-pattern>
+    </servlet-mapping>
+
+    <servlet-mapping>
+        <servlet-name>LDAPViewer</servlet-name>
+        <url-pattern>/PlutoInvoker/LDAPViewer</url-pattern>
     </servlet-mapping>
 
     <security-constraint>
         <web-resource-collection>
-            <web-resource-name>plancreator</web-resource-name>
-            <url-pattern>/</url-pattern>
+            <web-resource-name>debugviews</web-resource-name>
+            <url-pattern>/PlutoInvoker/*</url-pattern>
+            <url-pattern>/dwr2/*</url-pattern>
             <http-method>GET</http-method>
             <http-method>POST</http-method>
             <http-method>PUT</http-method>
@@ -54,5 +136,23 @@
     <security-role>
         <role-name>admin</role-name>
     </security-role>
+
+    <!--
+    For security reasons requests to the dwr servlet go through
+    the "/console" web-app context. The purpose of dwr-filter is
+    to map the attributes such as pathInfo, requestURI, etc. of
+    the original request into the request that is delivered to
+    the dwr-invoker servlet.  The dwr-invoker servlet uses those
+    attributes to create URLs that it sends back to the client.
+     -->
+    <filter>
+        <filter-name>dwr-filter</filter-name>
+        <filter-class>org.apache.geronimo.console.servlet.ForwardDispatchFilter</filter-class>
+    </filter>
+    <filter-mapping>
+        <filter-name>dwr-filter</filter-name>
+        <servlet-name>dwr-invoker</servlet-name>
+        <dispatcher>FORWARD</dispatcher>
+    </filter-mapping>
 
 </web-app>

Copied: geronimo/plugins/debugviews/trunk/pom.xml (from r566211, geronimo/plugins/plancreator/trunk/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/plugins/debugviews/trunk/pom.xml?p2=geronimo/plugins/debugviews/trunk/pom.xml&p1=geronimo/plugins/plancreator/trunk/pom.xml&r1=566211&r2=568246&rev=568246&view=diff
==============================================================================
--- geronimo/plugins/plancreator/trunk/pom.xml (original)
+++ geronimo/plugins/debugviews/trunk/pom.xml Tue Aug 21 12:55:33 2007
@@ -29,20 +29,20 @@
     </parent>
 
     <groupId>org.apache.geronimo.plugins</groupId>
-    <artifactId>plancreator</artifactId>
-    <name>Geronimo Plan Creator</name>
+    <artifactId>debugviews</artifactId>
+    <name>Geronimo Debug Views</name>
     <packaging>pom</packaging>
 
     <version>1.0-SNAPSHOT</version>
 
     <description>
-        Geronimo plan creator
+        Geronimo Debug Views 
     </description>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/plugins/plancreator/trunk</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/plugins/plancreator/trunk</developerConnection>
-        <url>http://svn.apache.org/viewvc/geronimo/plugins/plancreator/trunk</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/plugins/debugviews/trunk</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/plugins/debugviews/trunk</developerConnection>
+        <url>http://svn.apache.org/viewvc/geronimo/plugins/debugviews/trunk</url>
     </scm>
 
     <properties>
@@ -77,83 +77,53 @@
             </dependency>
 
             <dependency>
-                <groupId>commons-logging</groupId>
-                <artifactId>commons-logging-api</artifactId>
-                <version>1.0.4</version>
-            </dependency>
-
-             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
                 <artifactId>geronimo-kernel</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
 
-             <dependency>
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>j2ee-security</artifactId>
-                <version>${geronimoVersion}</version>
-                <type>car</type>
-            </dependency>
-
-             <dependency>
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>connector-deployer</artifactId>
-                <version>${geronimoVersion}</version>
-                <type>car</type>
-            </dependency>
-
-             <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-deployment</artifactId>
-                <version>${geronimoVersion}</version>
-            </dependency>
-
-             <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-test-ddbean</artifactId>
-                <version>${geronimoVersion}</version>
-            </dependency>
-
-             <dependency>
+            <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-connector-builder</artifactId>
+                <artifactId>geronimo-management</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
 
-             <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-naming-builder</artifactId>
-                <version>${geronimoVersion}</version>
+            <dependency>
+                <groupId>org.directwebremoting</groupId>
+                <artifactId>dwr</artifactId>
+                <version>2.0.1</version>
             </dependency>
 
             <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-security-builder</artifactId>
-                <version>${geronimoVersion}</version>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-servlet_2.5_spec</artifactId>
+                <version>1.1-SNAPSHOT</version>
             </dependency>
 
             <dependency>
                 <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-management</artifactId>
+                <artifactId>geronimo-j2ee</artifactId>
                 <version>${geronimoVersion}</version>
             </dependency>
 
             <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-j2ee-builder</artifactId>
-                <version>${geronimoVersion}</version>
+                <groupId>org.apache.xbean</groupId>
+                <artifactId>xbean-naming</artifactId>
+                <version>3.0.1</version>
             </dependency>
 
             <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-web-2.5-builder</artifactId>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>geronimo-gbean-deployer</artifactId>
                 <version>${geronimoVersion}</version>
+                <type>car</type>
             </dependency>
 
             <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-deploy-jsr88</artifactId>
+                <groupId>org.apache.geronimo.configs</groupId>
+                <artifactId>dojo-jetty6</artifactId>
                 <version>${geronimoVersion}</version>
+                <type>car</type>
             </dependency>
 
             <dependency>
@@ -351,9 +321,11 @@
             </activation>
 
             <modules>
-                <module>plancreator-portlets</module>
-                <module>plancreator-tomcat</module>
-                <module>plancreator-jetty</module>
+                <module>debugviews-portlets</module>
+<!--
+                <module>debugviews-tomcat</module>
+-->
+                <module>debugviews-jetty</module>
             </modules>
         </profile>
     </profiles>



Mime
View raw message