geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ke...@apache.org
Subject svn commit: r499270 [1/2] - in /geronimo/server/trunk: applications/console/geronimo-console-framework/src/main/webapp/ applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/classloaderview/ applications/console/geron...
Date Wed, 24 Jan 2007 06:03:05 GMT
Author: kevan
Date: Tue Jan 23 22:03:04 2007
New Revision: 499270

URL: http://svn.apache.org/viewvc?view=rev&rev=499270
Log:
GERONIMO-2690 Fix OutOfMemoryErrors in ClassLoader view -- thanks for the patch Rakesh! Also, set svn properties for files and remove tab characters from source files.

Modified:
    geronimo/server/trunk/applications/console/geronimo-console-framework/src/main/webapp/TreeDocIcon.css   (contents, props changed)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/classloaderview/ClassLoaderViewPortlet.java   (contents, props changed)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/dependencyview/DependencyViewPortlet.java   (contents, props changed)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/jndiview/JNDIViewPortlet.java   (contents, props changed)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/util/StringTree.java   (contents, props changed)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/classloaderview/help.jsp   (contents, props changed)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/classloaderview/view.jsp   (contents, props changed)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/dependencyview/help.jsp   (contents, props changed)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/dependencyview/view.jsp   (contents, props changed)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/jndiview/help.jsp   (contents, props changed)
    geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/webapp/WEB-INF/view/jndiview/view.jsp   (contents, props changed)
    geronimo/server/trunk/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/util/ClassLoaderRegistry.java   (contents, props changed)

Modified: geronimo/server/trunk/applications/console/geronimo-console-framework/src/main/webapp/TreeDocIcon.css
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-framework/src/main/webapp/TreeDocIcon.css?view=diff&rev=499270&r1=499269&r2=499270
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-framework/src/main/webapp/TreeDocIcon.css (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-framework/src/main/webapp/TreeDocIcon.css Tue Jan 23 22:03:04 2007
@@ -1,25 +1,25 @@
-/*======================================================================
-*   Licensed to the Apache Software Foundation (ASF) under one or more
-*   contributor license agreements.  See the NOTICE file distributed with
-*   this work for additional information regarding copyright ownership.
-*   The ASF licenses this file to You under the Apache License, Version 2.0
-*   (the "License"); you may not use this file except in compliance with
-*   the License.  You may obtain a copy of the License at
-*
-*      http://www.apache.org/licenses/LICENSE-2.0
-*
-*   Unless required by applicable law or agreed to in writing, software
-*   distributed under the License is distributed on an "AS IS" BASIS,
-*   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-*   See the License for the specific language governing permissions and
-*   limitations under the License.
-======================================================================*/
-@import url("../dojo/src/widget/templates/TreeDocIcon.css");
-
-.TreeExpandOpen .TreeIconFolder {
-    background-image: url('./images/ico_filetree_16x16.gif');
-}
-
-.TreeExpandClosed .TreeIconFolder {
-    background-image: url('./images/ico_filetree_16x16.gif');
-}
+/*======================================================================
+*   Licensed to the Apache Software Foundation (ASF) under one or more
+*   contributor license agreements.  See the NOTICE file distributed with
+*   this work for additional information regarding copyright ownership.
+*   The ASF licenses this file to You under the Apache License, Version 2.0
+*   (the "License"); you may not use this file except in compliance with
+*   the License.  You may obtain a copy of the License at
+*
+*      http://www.apache.org/licenses/LICENSE-2.0
+*
+*   Unless required by applicable law or agreed to in writing, software
+*   distributed under the License is distributed on an "AS IS" BASIS,
+*   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+*   See the License for the specific language governing permissions and
+*   limitations under the License.
+======================================================================*/
+@import url("../dojo/src/widget/templates/TreeDocIcon.css");
+
+.TreeExpandOpen .TreeIconFolder {
+    background-image: url('./images/ico_filetree_16x16.gif');
+}
+
+.TreeExpandClosed .TreeIconFolder {
+    background-image: url('./images/ico_filetree_16x16.gif');
+}

Propchange: geronimo/server/trunk/applications/console/geronimo-console-framework/src/main/webapp/TreeDocIcon.css
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/applications/console/geronimo-console-framework/src/main/webapp/TreeDocIcon.css
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/applications/console/geronimo-console-framework/src/main/webapp/TreeDocIcon.css
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/classloaderview/ClassLoaderViewPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/classloaderview/ClassLoaderViewPortlet.java?view=diff&rev=499270&r1=499269&r2=499270
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/classloaderview/ClassLoaderViewPortlet.java (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/classloaderview/ClassLoaderViewPortlet.java Tue Jan 23 22:03:04 2007
@@ -1,202 +1,204 @@
-/**
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.geronimo.console.classloaderview;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-
-import org.apache.geronimo.console.BasePortlet;
-import org.apache.geronimo.console.util.StringTree;
-import java.util.List;
-
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequestDispatcher;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.WindowState;
-
-import org.apache.geronimo.kernel.util.ClassLoaderRegistry;
-
-public class ClassLoaderViewPortlet extends BasePortlet {
-
-    private static final String NORMALVIEW_JSP = "/WEB-INF/view/classloaderview/view.jsp";
-
-    private static final String MAXIMIZEDVIEW_JSP = "/WEB-INF/view/classloaderview/view.jsp";
-
-    private static final String HELPVIEW_JSP = "/WEB-INF/view/classloaderview/help.jsp";
-
-    private PortletRequestDispatcher normalView;
-
-    private PortletRequestDispatcher maximizedView;
-
-    private PortletRequestDispatcher helpView;
-
-    public void processAction(ActionRequest actionRequest,
-            ActionResponse actionResponse) throws PortletException, IOException {
-    }
-
-    protected void doView(RenderRequest renderRequest,
-            RenderResponse renderResponse) throws IOException, PortletException {
-        if (WindowState.MINIMIZED.equals(renderRequest.getWindowState())) {
-            return;
-        }
-        renderRequest.getPortletSession().setAttribute("classloaderTree", this);
-
-        if (WindowState.NORMAL.equals(renderRequest.getWindowState())) {
-            normalView.include(renderRequest, renderResponse);
-        } else {
-            maximizedView.include(renderRequest, renderResponse);
-        }
-    }
-
-    protected void doHelp(RenderRequest renderRequest,
-            RenderResponse renderResponse) throws PortletException, IOException {
-        helpView.include(renderRequest, renderResponse);
-    }
-
-    public void init(PortletConfig portletConfig) throws PortletException {
-        super.init(portletConfig);
-        normalView = portletConfig.getPortletContext().getRequestDispatcher(
-                NORMALVIEW_JSP);
-        maximizedView = portletConfig.getPortletContext().getRequestDispatcher(
-                MAXIMIZEDVIEW_JSP);
-        helpView = portletConfig.getPortletContext().getRequestDispatcher(
-                HELPVIEW_JSP);
-
-    }
-
-    public void destroy() {
-        normalView = null;
-        maximizedView = null;
-        helpView = null;
-        super.destroy();
-    }
-
-    public String getJSONTrees() {
-        List list = getTrees();
-        if (list == null)
-            return "[]";
-
-        StringBuffer stb = new StringBuffer();
-        stb.append("[");
-        for (int i = 0; i < list.size(); i++) {
-            StringTree node = (StringTree) list.get(i);
-            if (i != 0)
-                stb.append(",");
-            stb.append(node.toJSONObject("" + i));
-        }
-        stb.append("]");
-        list = null;
-        return stb.toString();
-    }
-
-    public ArrayList getTrees() {
-        ArrayList parentNodes = new ArrayList();
-        List list = ClassLoaderRegistry.getList();
-        Iterator iter = list.iterator();
-        while (iter.hasNext()) {
-            updateTree((ClassLoader) iter.next(), parentNodes);
-        }
-        return parentNodes;
-    }
-
-    public StringTree updateTree(ClassLoader classloader, ArrayList parentNodes) {
-
-        Iterator iter = parentNodes.iterator();
-        StringTree node = null;
-        while (iter.hasNext()) {
-            StringTree currNode = (StringTree) iter.next();
-            node = currNode.findNode(classloader.toString());
-            if (node != null)
-                return node;
-        }
-
-        if (node == null) {
-            node = new StringTree(classloader.toString());
-            node = addClasses(node, classloader);
-
-            if (classloader instanceof org.apache.geronimo.kernel.config.MultiParentClassLoader) {
-                org.apache.geronimo.kernel.config.MultiParentClassLoader mpclassloader = (org.apache.geronimo.kernel.config.MultiParentClassLoader) classloader;
-                ClassLoader[] parents = mpclassloader.getParents();
-                if (parents == null)
-                    parentNodes.add(node);
-                else if (parents.length == 0)
-                    parentNodes.add(node);
-                else {
-                    for (int i = 0; i < parents.length; i++) {
-                        StringTree parentNode = updateTree(parents[i],
-                                parentNodes);
-                        parentNode.addChild(node);
-                    }
-                }
-            } else if (classloader.getParent() != null) {
-                StringTree parentNode = updateTree(classloader.getParent(),
-                        parentNodes);
-                parentNode.addChild(node);
-            } else
-                parentNodes.add(node);
-        }
-        return node;
-    }
-
-    private StringTree addClasses(StringTree node, ClassLoader loader) {
-        try {
-            java.lang.reflect.Field CLASSES_VECTOR_FIELD = ClassLoader.class
-                    .getDeclaredField("classes");
-
-            if (CLASSES_VECTOR_FIELD.getType() != java.util.Vector.class) {
-                return node;
-            }
-            CLASSES_VECTOR_FIELD.setAccessible(true);
-
-            final java.util.Vector classes = (java.util.Vector) CLASSES_VECTOR_FIELD
-                    .get(loader);
-            if (classes == null)
-                return node;
-
-            final Class[] result;
-
-            synchronized (classes) {
-                result = new Class[classes.size()];
-                classes.toArray(result);
-            }
-
-            CLASSES_VECTOR_FIELD.setAccessible(false);
-
-            StringTree classNames = new StringTree("Classes");
-            StringTree interfaceNames = new StringTree("Interfaces");
-            node.addChild(classNames);
-            node.addChild(interfaceNames);
-
-            for (int i = 0; i < result.length; i++) {
-                if (result[i].isInterface())
-                    interfaceNames.addChild(result[i].toString());
-                else
-                    classNames.addChild(result[i].toString());
-            }
-
-            return node;
-        } catch (Exception e) {
-            return node;
-        }
-    }
-
-}
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.console.classloaderview;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Hashtable;
+import java.util.List;
+
+import org.apache.geronimo.console.BasePortlet;
+import org.apache.geronimo.console.util.StringTree;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletConfig;
+import javax.portlet.PortletException;
+import javax.portlet.PortletRequestDispatcher;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.WindowState;
+
+import org.apache.geronimo.kernel.util.ClassLoaderRegistry;
+
+public class ClassLoaderViewPortlet extends BasePortlet {
+
+    private static final String NORMALVIEW_JSP = "/WEB-INF/view/classloaderview/view.jsp";
+
+    private static final String MAXIMIZEDVIEW_JSP = "/WEB-INF/view/classloaderview/view.jsp";
+
+    private static final String HELPVIEW_JSP = "/WEB-INF/view/classloaderview/help.jsp";
+
+    private PortletRequestDispatcher normalView;
+
+    private PortletRequestDispatcher maximizedView;
+
+    private PortletRequestDispatcher helpView;
+
+    public void processAction(ActionRequest actionRequest,
+            ActionResponse actionResponse) throws PortletException, IOException {
+    }
+
+    protected void doView(RenderRequest renderRequest,
+            RenderResponse renderResponse) throws IOException, PortletException {
+        if (WindowState.MINIMIZED.equals(renderRequest.getWindowState())) {
+            return;
+        }
+        renderRequest.getPortletSession().setAttribute("classloaderTree", this);
+
+        if (WindowState.NORMAL.equals(renderRequest.getWindowState())) {
+            normalView.include(renderRequest, renderResponse);
+        } else {
+            maximizedView.include(renderRequest, renderResponse);
+        }
+    }
+
+    protected void doHelp(RenderRequest renderRequest,
+            RenderResponse renderResponse) throws PortletException, IOException {
+        helpView.include(renderRequest, renderResponse);
+    }
+
+    public void init(PortletConfig portletConfig) throws PortletException {
+        super.init(portletConfig);
+        normalView = portletConfig.getPortletContext().getRequestDispatcher(
+                NORMALVIEW_JSP);
+        maximizedView = portletConfig.getPortletContext().getRequestDispatcher(
+                MAXIMIZEDVIEW_JSP);
+        helpView = portletConfig.getPortletContext().getRequestDispatcher(
+                HELPVIEW_JSP);
+
+    }
+
+    public void destroy() {
+        normalView = null;
+        maximizedView = null;
+        helpView = null;
+        super.destroy();
+    }
+
+    public String getJSONTrees() {
+        List list = getTrees();
+        if (list == null)
+            return "[]";
+
+        StringBuffer stb = new StringBuffer();
+        stb.append("[");
+        Hashtable htLinks = new Hashtable();
+        for (int i = 0; i < list.size(); i++) {
+            StringTree node = (StringTree) list.get(i);
+            if (i != 0)
+                stb.append(",");
+            stb.append(node.toJSONObject("" + i, htLinks));
+        }
+        stb.append("]");
+        list = null;
+        return stb.toString();
+    }
+
+    public ArrayList getTrees() {
+        ArrayList parentNodes = new ArrayList();
+        List list = ClassLoaderRegistry.getList();
+        Iterator iter = list.iterator();
+        while (iter.hasNext()) {
+            updateTree((ClassLoader) iter.next(), parentNodes);
+        }
+        return parentNodes;
+    }
+
+    public StringTree updateTree(ClassLoader classloader, ArrayList parentNodes) {
+
+        Iterator iter = parentNodes.iterator();
+        StringTree node = null;
+        while (iter.hasNext()) {
+            StringTree currNode = (StringTree) iter.next();
+            node = currNode.findNode(classloader.toString());
+            if (node != null)
+                return node;
+        }
+
+        if (node == null) {
+            node = new StringTree(classloader.toString());
+            node = addClasses(node, classloader);
+
+            if (classloader instanceof org.apache.geronimo.kernel.config.MultiParentClassLoader) {
+                org.apache.geronimo.kernel.config.MultiParentClassLoader mpclassloader = (org.apache.geronimo.kernel.config.MultiParentClassLoader) classloader;
+                ClassLoader[] parents = mpclassloader.getParents();
+                if (parents == null)
+                    parentNodes.add(node);
+                else if (parents.length == 0)
+                    parentNodes.add(node);
+                else {
+                    for (int i = 0; i < parents.length; i++) {
+                        StringTree parentNode = updateTree(parents[i],
+                                parentNodes);
+                        parentNode.addChild(node);
+                    }
+                }
+            } else if (classloader.getParent() != null) {
+                StringTree parentNode = updateTree(classloader.getParent(),
+                        parentNodes);
+                parentNode.addChild(node);
+            } else
+                parentNodes.add(node);
+        }
+        return node;
+    }
+
+    private StringTree addClasses(StringTree node, ClassLoader loader) {
+        try {
+            java.lang.reflect.Field CLASSES_VECTOR_FIELD = ClassLoader.class
+                    .getDeclaredField("classes");
+
+            if (CLASSES_VECTOR_FIELD.getType() != java.util.Vector.class) {
+                return node;
+            }
+            CLASSES_VECTOR_FIELD.setAccessible(true);
+
+            final java.util.Vector classes = (java.util.Vector) CLASSES_VECTOR_FIELD
+                    .get(loader);
+            if (classes == null)
+                return node;
+
+            final Class[] result;
+
+            synchronized (classes) {
+                result = new Class[classes.size()];
+                classes.toArray(result);
+            }
+
+            CLASSES_VECTOR_FIELD.setAccessible(false);
+
+            StringTree classNames = new StringTree("Classes");
+            StringTree interfaceNames = new StringTree("Interfaces");
+            node.addChild(classNames);
+            node.addChild(interfaceNames);
+
+            for (int i = 0; i < result.length; i++) {
+                if (result[i].isInterface())
+                    interfaceNames.addChild(result[i].toString());
+                else
+                    classNames.addChild(result[i].toString());
+            }
+
+            return node;
+        } catch (Exception e) {
+            return node;
+        }
+    }
+
+}

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/classloaderview/ClassLoaderViewPortlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/classloaderview/ClassLoaderViewPortlet.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/classloaderview/ClassLoaderViewPortlet.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/dependencyview/DependencyViewPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/dependencyview/DependencyViewPortlet.java?view=diff&rev=499270&r1=499269&r2=499270
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/dependencyview/DependencyViewPortlet.java (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/dependencyview/DependencyViewPortlet.java Tue Jan 23 22:03:04 2007
@@ -1,326 +1,326 @@
-/**
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.geronimo.console.dependencyview;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Set;
-import java.util.SortedSet;
-
-import org.apache.geronimo.console.BasePortlet;
-import org.apache.geronimo.console.util.PortletManager;
-import org.apache.geronimo.console.util.StringTree;
-import org.apache.geronimo.gbean.AbstractName;
-import org.apache.geronimo.kernel.repository.Artifact;
-
-import java.util.List;
-
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequestDispatcher;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.WindowState;
-
-import org.apache.geronimo.kernel.DependencyManager;
-import org.apache.geronimo.kernel.config.ConfigurationInfo;
-import org.apache.geronimo.kernel.config.ConfigurationManager;
-import org.apache.geronimo.kernel.config.ConfigurationModuleType;
-import org.apache.geronimo.kernel.config.ConfigurationUtil;
-import org.apache.geronimo.kernel.config.Configuration;
-import org.apache.geronimo.kernel.repository.ListableRepository;
-import org.apache.geronimo.kernel.util.ClassLoaderRegistry;
-import org.apache.geronimo.kernel.repository.ListableRepository;
-
-public class DependencyViewPortlet extends BasePortlet {
-
-    private static final String NORMALVIEW_JSP = "/WEB-INF/view/dependencyview/view.jsp";
-
-    private static final String MAXIMIZEDVIEW_JSP = "/WEB-INF/view/dependencyview/view.jsp";
-
-    private static final String HELPVIEW_JSP = "/WEB-INF/view/dependencyview/help.jsp";
-
-    private PortletRequestDispatcher normalView;
-
-    private PortletRequestDispatcher maximizedView;
-
-    private PortletRequestDispatcher helpView;
-
-    public void processAction(ActionRequest actionRequest,
-            ActionResponse actionResponse) throws PortletException, IOException {
-    }
-
-    protected void doView(RenderRequest renderRequest,
-            RenderResponse renderResponse) throws IOException, PortletException {
-        if (WindowState.MINIMIZED.equals(renderRequest.getWindowState())) {
-            return;
-        }
-
-        renderRequest.getPortletSession().setAttribute("dependencyTree",
-                getJSONTrees(renderRequest));
-
-        if (WindowState.NORMAL.equals(renderRequest.getWindowState())) {
-            normalView.include(renderRequest, renderResponse);
-        } else {
-            maximizedView.include(renderRequest, renderResponse);
-        }
-    }
-
-    protected void doHelp(RenderRequest renderRequest,
-            RenderResponse renderResponse) throws PortletException, IOException {
-        helpView.include(renderRequest, renderResponse);
-    }
-
-    public void init(PortletConfig portletConfig) throws PortletException {
-        super.init(portletConfig);
-        normalView = portletConfig.getPortletContext().getRequestDispatcher(
-                NORMALVIEW_JSP);
-        maximizedView = portletConfig.getPortletContext().getRequestDispatcher(
-                MAXIMIZEDVIEW_JSP);
-        helpView = portletConfig.getPortletContext().getRequestDispatcher(
-                HELPVIEW_JSP);
-
-    }
-
-    public void destroy() {
-        normalView = null;
-        maximizedView = null;
-        helpView = null;
-        super.destroy();
-    }
-
-    private static ArrayList parentNodes = new ArrayList();
-
-    public static String getJSONTrees(RenderRequest renderRequest) {
-        List list = getTrees(renderRequest);
-        if (list == null)
-            return "[]";
-
-        StringBuffer stb = new StringBuffer();
-        stb.append("[");
-        for (int i = 0; i < list.size(); i++) {
-            StringTree node = (StringTree) list.get(i);
-            if (i != 0)
-                stb.append(",");
-            stb.append(node.toJSONObject("" + i));
-        }
-        stb.append("]");
-        return stb.toString();
-    }
-
-    public static void addDependencies(StringTree curr, Configuration conf) {
-        if (curr == null || conf == null)
-            return;
-        StringTree dep = new StringTree("dependencies");
-        curr.addChild(dep);
-        for (Iterator iterator = conf.getDependencies().iterator(); iterator
-                .hasNext();) {
-            dep.addChild(iterator.next().toString());
-        }
-        for (Iterator iterator = conf.getServiceParents().iterator(); iterator
-                .hasNext();) {
-            Configuration config = (Configuration) iterator.next();
-            dep.addChild(config.getId().toString());
-        }
-    }
-
-    public static ArrayList getTrees(RenderRequest request) {
-
-        ArrayList arryList = new ArrayList();
-        StringTree treeEAR = new StringTree("Enterprise Applications");
-        arryList.add(treeEAR);
-
-        StringTree treeEJB = new StringTree("EJBModule");
-        arryList.add(treeEJB);
-
-        StringTree treeWeb = new StringTree("WebModule");
-        arryList.add(treeWeb);
-
-        StringTree treeRAR = new StringTree("ResourceAdapterModule");
-        arryList.add(treeRAR);
-
-        StringTree treeCLI = new StringTree("AppClientModule");
-        arryList.add(treeCLI);
-
-        StringTree treeSys = new StringTree("System Module");
-        arryList.add(treeSys);
-
-        org.apache.geronimo.kernel.Kernel kernel = org.apache.geronimo.kernel.KernelRegistry
-                .getSingleKernel();
-
-        ConfigurationManager configManager = ConfigurationUtil
-                .getConfigurationManager(kernel);
-
-        List infos = configManager.listConfigurations();
-        for (Iterator infoIterator = infos.iterator(); infoIterator.hasNext();) {
-            ConfigurationInfo info = (ConfigurationInfo) infoIterator.next();
-            Configuration conf = configManager.getConfiguration(info
-                    .getConfigID());
-            if (conf != null) {
-                StringTree curr = new StringTree(info.getConfigID().toString());
-                ;
-                switch (info.getType().getValue()) {
-                case 0:// EAR
-                {
-                    treeEAR.addChild(curr);
-                    break;
-                }
-                case 1:// EJB
-                {
-                    treeEJB.addChild(curr);
-                    break;
-                }
-                case 2:// CAR
-                {
-                    treeCLI.addChild(curr);
-                    break;
-                }
-
-                case 3:// RAR
-                {
-                    treeRAR.addChild(curr);
-                    break;
-                }
-                case 4:// WAR
-                {
-                    treeWeb.addChild(curr);
-                    break;
-                }
-                case 5:// SERVICE
-                {
-                    treeSys.addChild(curr);
-                    break;
-                }
-                }
-
-                addDependencies(curr, conf);
-
-                if (info.getType().getValue() == ConfigurationModuleType.EAR
-                        .getValue()) {
-                    StringTree nodeEJB = new StringTree("EJBModule");
-                    curr.addChild(nodeEJB);
-
-                    StringTree nodeWeb = new StringTree("WebModule");
-                    curr.addChild(nodeWeb);
-
-                    StringTree nodeRAR = new StringTree("ResourceAdapterModule");
-                    curr.addChild(nodeRAR);
-
-                    StringTree nodeCLI = new StringTree("AppClientModule");
-                    curr.addChild(nodeCLI);
-
-                    Map query = new HashMap();
-                    query.put("j2eeType", "EJBModule");
-                    query.put("J2EEApplication", info.getConfigID().toString());
-                    Set setEnt = kernel
-                            .listGBeans(new org.apache.geronimo.gbean.AbstractNameQuery(
-                                    null, query));
-                    Iterator iterator = setEnt.iterator();
-                    while (iterator.hasNext()) {
-                        AbstractName gb = (AbstractName) iterator.next();
-                        StringTree subCurr = new StringTree(info.getConfigID()
-                                .getGroupId()
-                                + "/"
-                                + info.getConfigID().getArtifactId()
-                                + "_"
-                                + gb.getNameProperty("name")
-                                + "/"
-                                + info.getConfigID().getVersion()
-                                + "/"
-                                + info.getConfigID().getType());
-                        nodeEJB.addChild(subCurr);
-                        addDependencies(subCurr, configManager
-                                .getConfiguration(gb.getArtifact()));
-                    }
-
-                    Map query1 = new HashMap();
-                    query1.put("j2eeType", "ResourceAdapterModule");
-                    query1
-                            .put("J2EEApplication", info.getConfigID()
-                                    .toString());
-                    Set setEnt1 = kernel
-                            .listGBeans(new org.apache.geronimo.gbean.AbstractNameQuery(
-                                    null, query1));
-
-                    Iterator iterator1 = setEnt1.iterator();
-                    while (iterator1.hasNext()) {
-                        AbstractName gb = (AbstractName) iterator1.next();
-                        StringTree subCurr = new StringTree(info.getConfigID()
-                                .getGroupId()
-                                + "/"
-                                + info.getConfigID().getArtifactId()
-                                + "_"
-                                + gb.getNameProperty("name")
-                                + "/"
-                                + info.getConfigID().getVersion()
-                                + "/"
-                                + info.getConfigID().getType());
-                        nodeRAR.addChild(subCurr);
-                        addDependencies(subCurr, configManager
-                                .getConfiguration(gb.getArtifact()));
-                    }
-
-                    for (int i = 0; i < conf.getChildren().size(); i++) {
-                        Configuration config = ((Configuration) conf
-                                .getChildren().get(i));
-                        StringTree subCurr = new StringTree(config
-                                .getAbstractName().toString());
-                        nodeWeb.addChild(subCurr);
-                        addDependencies(subCurr, config);
-                    }
-
-                    for (Iterator iter = conf.getOwnedConfigurations()
-                            .iterator(); iter.hasNext();) {
-                        Artifact name = (Artifact) iter.next();
-                        StringTree subCurr = new StringTree(name.toString());
-                        nodeCLI.addChild(subCurr);
-                        addDependencies(subCurr, configManager
-                                .getConfiguration(name));
-                    }
-
-                }
-
-            }
-
-        }
-
-        StringTree treeRepo = new StringTree("Repository");
-        arryList.add(treeRepo);
-
-        ListableRepository[] repos = PortletManager.getCurrentServer(request)
-                .getRepositories();
-        for (int i = 0; i < repos.length; i++) {
-            ListableRepository repo = repos[i];
-            final SortedSet artifacts = repo.list();
-            for (Iterator iterator = artifacts.iterator(); iterator.hasNext();) {
-                String fileName = iterator.next().toString();
-                treeRepo.addChild(fileName);
-            }
-
-        }
-
-        return arryList;
-
-    }
-
-}
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.console.dependencyview;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedSet;
+
+import org.apache.geronimo.console.BasePortlet;
+import org.apache.geronimo.console.util.PortletManager;
+import org.apache.geronimo.console.util.StringTree;
+import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.kernel.repository.Artifact;
+
+import java.util.List;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletConfig;
+import javax.portlet.PortletException;
+import javax.portlet.PortletRequestDispatcher;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.WindowState;
+
+import org.apache.geronimo.kernel.DependencyManager;
+import org.apache.geronimo.kernel.config.ConfigurationInfo;
+import org.apache.geronimo.kernel.config.ConfigurationManager;
+import org.apache.geronimo.kernel.config.ConfigurationModuleType;
+import org.apache.geronimo.kernel.config.ConfigurationUtil;
+import org.apache.geronimo.kernel.config.Configuration;
+import org.apache.geronimo.kernel.repository.ListableRepository;
+import org.apache.geronimo.kernel.util.ClassLoaderRegistry;
+import org.apache.geronimo.kernel.repository.ListableRepository;
+
+public class DependencyViewPortlet extends BasePortlet {
+
+    private static final String NORMALVIEW_JSP = "/WEB-INF/view/dependencyview/view.jsp";
+
+    private static final String MAXIMIZEDVIEW_JSP = "/WEB-INF/view/dependencyview/view.jsp";
+
+    private static final String HELPVIEW_JSP = "/WEB-INF/view/dependencyview/help.jsp";
+
+    private PortletRequestDispatcher normalView;
+
+    private PortletRequestDispatcher maximizedView;
+
+    private PortletRequestDispatcher helpView;
+
+    public void processAction(ActionRequest actionRequest,
+            ActionResponse actionResponse) throws PortletException, IOException {
+    }
+
+    protected void doView(RenderRequest renderRequest,
+            RenderResponse renderResponse) throws IOException, PortletException {
+        if (WindowState.MINIMIZED.equals(renderRequest.getWindowState())) {
+            return;
+        }
+
+        renderRequest.getPortletSession().setAttribute("dependencyTree",
+                getJSONTrees(renderRequest));
+
+        if (WindowState.NORMAL.equals(renderRequest.getWindowState())) {
+            normalView.include(renderRequest, renderResponse);
+        } else {
+            maximizedView.include(renderRequest, renderResponse);
+        }
+    }
+
+    protected void doHelp(RenderRequest renderRequest,
+            RenderResponse renderResponse) throws PortletException, IOException {
+        helpView.include(renderRequest, renderResponse);
+    }
+
+    public void init(PortletConfig portletConfig) throws PortletException {
+        super.init(portletConfig);
+        normalView = portletConfig.getPortletContext().getRequestDispatcher(
+                NORMALVIEW_JSP);
+        maximizedView = portletConfig.getPortletContext().getRequestDispatcher(
+                MAXIMIZEDVIEW_JSP);
+        helpView = portletConfig.getPortletContext().getRequestDispatcher(
+                HELPVIEW_JSP);
+
+    }
+
+    public void destroy() {
+        normalView = null;
+        maximizedView = null;
+        helpView = null;
+        super.destroy();
+    }
+
+    private static ArrayList parentNodes = new ArrayList();
+
+    public static String getJSONTrees(RenderRequest renderRequest) {
+        List list = getTrees(renderRequest);
+        if (list == null)
+            return "[]";
+
+        StringBuffer stb = new StringBuffer();
+        stb.append("[");
+        for (int i = 0; i < list.size(); i++) {
+            StringTree node = (StringTree) list.get(i);
+            if (i != 0)
+                stb.append(",");
+            stb.append(node.toJSONObject("" + i));
+        }
+        stb.append("]");
+        return stb.toString();
+    }
+
+    public static void addDependencies(StringTree curr, Configuration conf) {
+        if (curr == null || conf == null)
+            return;
+        StringTree dep = new StringTree("dependencies");
+        curr.addChild(dep);
+        for (Iterator iterator = conf.getDependencies().iterator(); iterator
+                .hasNext();) {
+            dep.addChild(iterator.next().toString());
+        }
+        for (Iterator iterator = conf.getServiceParents().iterator(); iterator
+                .hasNext();) {
+            Configuration config = (Configuration) iterator.next();
+            dep.addChild(config.getId().toString());
+        }
+    }
+
+    public static ArrayList getTrees(RenderRequest request) {
+
+        ArrayList arryList = new ArrayList();
+        StringTree treeEAR = new StringTree("Enterprise Applications");
+        arryList.add(treeEAR);
+
+        StringTree treeEJB = new StringTree("EJBModule");
+        arryList.add(treeEJB);
+
+        StringTree treeWeb = new StringTree("WebModule");
+        arryList.add(treeWeb);
+
+        StringTree treeRAR = new StringTree("ResourceAdapterModule");
+        arryList.add(treeRAR);
+
+        StringTree treeCLI = new StringTree("AppClientModule");
+        arryList.add(treeCLI);
+
+        StringTree treeSys = new StringTree("System Module");
+        arryList.add(treeSys);
+
+        org.apache.geronimo.kernel.Kernel kernel = org.apache.geronimo.kernel.KernelRegistry
+                .getSingleKernel();
+
+        ConfigurationManager configManager = ConfigurationUtil
+                .getConfigurationManager(kernel);
+
+        List infos = configManager.listConfigurations();
+        for (Iterator infoIterator = infos.iterator(); infoIterator.hasNext();) {
+            ConfigurationInfo info = (ConfigurationInfo) infoIterator.next();
+            Configuration conf = configManager.getConfiguration(info
+                    .getConfigID());
+            if (conf != null) {
+                StringTree curr = new StringTree(info.getConfigID().toString());
+                ;
+                switch (info.getType().getValue()) {
+                case 0:// EAR
+                {
+                    treeEAR.addChild(curr);
+                    break;
+                }
+                case 1:// EJB
+                {
+                    treeEJB.addChild(curr);
+                    break;
+                }
+                case 2:// CAR
+                {
+                    treeCLI.addChild(curr);
+                    break;
+                }
+
+                case 3:// RAR
+                {
+                    treeRAR.addChild(curr);
+                    break;
+                }
+                case 4:// WAR
+                {
+                    treeWeb.addChild(curr);
+                    break;
+                }
+                case 5:// SERVICE
+                {
+                    treeSys.addChild(curr);
+                    break;
+                }
+                }
+
+                addDependencies(curr, conf);
+
+                if (info.getType().getValue() == ConfigurationModuleType.EAR
+                        .getValue()) {
+                    StringTree nodeEJB = new StringTree("EJBModule");
+                    curr.addChild(nodeEJB);
+
+                    StringTree nodeWeb = new StringTree("WebModule");
+                    curr.addChild(nodeWeb);
+
+                    StringTree nodeRAR = new StringTree("ResourceAdapterModule");
+                    curr.addChild(nodeRAR);
+
+                    StringTree nodeCLI = new StringTree("AppClientModule");
+                    curr.addChild(nodeCLI);
+
+                    Map query = new HashMap();
+                    query.put("j2eeType", "EJBModule");
+                    query.put("J2EEApplication", info.getConfigID().toString());
+                    Set setEnt = kernel
+                            .listGBeans(new org.apache.geronimo.gbean.AbstractNameQuery(
+                                    null, query));
+                    Iterator iterator = setEnt.iterator();
+                    while (iterator.hasNext()) {
+                        AbstractName gb = (AbstractName) iterator.next();
+                        StringTree subCurr = new StringTree(info.getConfigID()
+                                .getGroupId()
+                                + "/"
+                                + info.getConfigID().getArtifactId()
+                                + "_"
+                                + gb.getNameProperty("name")
+                                + "/"
+                                + info.getConfigID().getVersion()
+                                + "/"
+                                + info.getConfigID().getType());
+                        nodeEJB.addChild(subCurr);
+                        addDependencies(subCurr, configManager
+                                .getConfiguration(gb.getArtifact()));
+                    }
+
+                    Map query1 = new HashMap();
+                    query1.put("j2eeType", "ResourceAdapterModule");
+                    query1
+                            .put("J2EEApplication", info.getConfigID()
+                                    .toString());
+                    Set setEnt1 = kernel
+                            .listGBeans(new org.apache.geronimo.gbean.AbstractNameQuery(
+                                    null, query1));
+
+                    Iterator iterator1 = setEnt1.iterator();
+                    while (iterator1.hasNext()) {
+                        AbstractName gb = (AbstractName) iterator1.next();
+                        StringTree subCurr = new StringTree(info.getConfigID()
+                                .getGroupId()
+                                + "/"
+                                + info.getConfigID().getArtifactId()
+                                + "_"
+                                + gb.getNameProperty("name")
+                                + "/"
+                                + info.getConfigID().getVersion()
+                                + "/"
+                                + info.getConfigID().getType());
+                        nodeRAR.addChild(subCurr);
+                        addDependencies(subCurr, configManager
+                                .getConfiguration(gb.getArtifact()));
+                    }
+
+                    for (int i = 0; i < conf.getChildren().size(); i++) {
+                        Configuration config = ((Configuration) conf
+                                .getChildren().get(i));
+                        StringTree subCurr = new StringTree(config
+                                .getAbstractName().toString());
+                        nodeWeb.addChild(subCurr);
+                        addDependencies(subCurr, config);
+                    }
+
+                    for (Iterator iter = conf.getOwnedConfigurations()
+                            .iterator(); iter.hasNext();) {
+                        Artifact name = (Artifact) iter.next();
+                        StringTree subCurr = new StringTree(name.toString());
+                        nodeCLI.addChild(subCurr);
+                        addDependencies(subCurr, configManager
+                                .getConfiguration(name));
+                    }
+
+                }
+
+            }
+
+        }
+
+        StringTree treeRepo = new StringTree("Repository");
+        arryList.add(treeRepo);
+
+        ListableRepository[] repos = PortletManager.getCurrentServer(request)
+                .getRepositories();
+        for (int i = 0; i < repos.length; i++) {
+            ListableRepository repo = repos[i];
+            final SortedSet artifacts = repo.list();
+            for (Iterator iterator = artifacts.iterator(); iterator.hasNext();) {
+                String fileName = iterator.next().toString();
+                treeRepo.addChild(fileName);
+            }
+
+        }
+
+        return arryList;
+
+    }
+
+}

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/dependencyview/DependencyViewPortlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/dependencyview/DependencyViewPortlet.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/dependencyview/DependencyViewPortlet.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/jndiview/JNDIViewPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/jndiview/JNDIViewPortlet.java?view=diff&rev=499270&r1=499269&r2=499270
==============================================================================
--- geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/jndiview/JNDIViewPortlet.java (original)
+++ geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/jndiview/JNDIViewPortlet.java Tue Jan 23 22:03:04 2007
@@ -1,431 +1,428 @@
-/**
- *  Licensed to the Apache Software Foundation (ASF) under one or more
- *  contributor license agreements.  See the NOTICE file distributed with
- *  this work for additional information regarding copyright ownership.
- *  The ASF licenses this file to You under the Apache License, Version 2.0
- *  (the "License"); you may not use this file except in compliance with
- *  the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- */
-package org.apache.geronimo.console.jndiview;
-
-// import org.apache.geronimo.kernel.config.*;
-import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.gbean.AbstractName;
-import javax.naming.Context;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.Hashtable;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Set;
-import java.util.Collections;
-
-import org.apache.geronimo.console.BasePortlet;
-import org.apache.geronimo.console.util.StringTree;
-
-import javax.portlet.ActionRequest;
-import javax.portlet.ActionResponse;
-import javax.portlet.PortletConfig;
-import javax.portlet.PortletException;
-import javax.portlet.PortletRequestDispatcher;
-import javax.portlet.RenderRequest;
-import javax.portlet.RenderResponse;
-import javax.portlet.WindowState;
-
-public class JNDIViewPortlet extends BasePortlet {
-
-    private static final String NORMALVIEW_JSP = "/WEB-INF/view/jndiview/view.jsp";
-
-    private static final String MAXIMIZEDVIEW_JSP = "/WEB-INF/view/jndiview/view.jsp";
-
-    private static final String HELPVIEW_JSP = "/WEB-INF/view/jndiview/help.jsp";
-
-    private PortletRequestDispatcher normalView;
-
-    private PortletRequestDispatcher maximizedView;
-
-    private PortletRequestDispatcher helpView;
-
-    public void processAction(ActionRequest actionRequest,
-            ActionResponse actionResponse) throws PortletException, IOException {
-    }
-
-    protected void doView(RenderRequest renderRequest,
-            RenderResponse renderResponse) throws IOException, PortletException {
-        if (WindowState.MINIMIZED.equals(renderRequest.getWindowState())) {
-            return;
-        }
-
-        try {
-            renderRequest.getPortletSession().setAttribute("jndiTree",
-                    getJSONTrees());
-        } catch (Exception ex) {
-            throw new PortletException(ex);
-        }
-        if (WindowState.NORMAL.equals(renderRequest.getWindowState())) {
-            normalView.include(renderRequest, renderResponse);
-        } else {
-            maximizedView.include(renderRequest, renderResponse);
-        }
-    }
-
-    protected void doHelp(RenderRequest renderRequest,
-            RenderResponse renderResponse) throws PortletException, IOException {
-        helpView.include(renderRequest, renderResponse);
-    }
-
-    public void init(PortletConfig portletConfig) throws PortletException {
-        super.init(portletConfig);
-        normalView = portletConfig.getPortletContext().getRequestDispatcher(
-                NORMALVIEW_JSP);
-        maximizedView = portletConfig.getPortletContext().getRequestDispatcher(
-                MAXIMIZEDVIEW_JSP);
-        helpView = portletConfig.getPortletContext().getRequestDispatcher(
-                HELPVIEW_JSP);
-
-    }
-
-    public void destroy() {
-        normalView = null;
-        maximizedView = null;
-        helpView = null;
-        super.destroy();
-    }
-
-    public String getJSONTrees() throws Exception {
-        List list = getContextTree();
-        if (list == null)
-            return "[]";
-
-        StringBuffer stb = new StringBuffer();
-        stb.append("[");
-        for (int i = 0; i < list.size(); i++) {
-            StringTree node = (StringTree) list.get(i);
-            if (i != 0)
-                stb.append(",");
-            stb.append(node.toJSONObject("" + i));
-        }
-        stb.append("]");
-        return stb.toString();
-    }
-
-    private void buildEJBModule(Kernel kernel, List arryList, Hashtable entApp)
-            throws Exception {
-        Map query = new HashMap();
-        query.put("j2eeType", "EJBModule");
-        Set setEnt = kernel
-                .listGBeans(new org.apache.geronimo.gbean.AbstractNameQuery(
-                        null, query));
-        Iterator iterator = setEnt.iterator();
-
-        while (iterator.hasNext()) {
-            AbstractName gb = (AbstractName) iterator.next();
-            StringTree ejbModule = new StringTree(gb.getNameProperty("name"));
-
-            if (gb.getNameProperty("J2EEApplication") == null
-                    || gb.getNameProperty("J2EEApplication").equals("null")) {
-                StringTree treeEnt = (StringTree) entApp.get("EJBModule");
-                treeEnt.addChild(ejbModule);
-            } else {
-                StringTree treeEnt = (StringTree) entApp.get(gb
-                        .getNameProperty("J2EEApplication"));
-                treeEnt = treeEnt.findNode("EJBModule");
-                treeEnt.addChild(ejbModule);
-            }
-            Map queryEnt = new HashMap();
-            StringTree entityBean = new StringTree("EntityBeans");
-            ejbModule.addChild(entityBean);
-            queryEnt.put("j2eeType", "EntityBean");
-            queryEnt.put("EJBModule", gb.getNameProperty("name"));
-            queryEnt.put("J2EEApplication", gb
-                    .getNameProperty("J2EEApplication"));
-            Set setEntBean = kernel
-                    .listGBeans(new org.apache.geronimo.gbean.AbstractNameQuery(
-                            null, queryEnt));
-
-            Iterator iterEntBean = setEntBean.iterator();
-
-            while (iterEntBean.hasNext()) {
-                AbstractName gbEntBean = (AbstractName) iterEntBean.next();
-                StringTree beanNode = new StringTree(gbEntBean
-                        .getNameProperty("name"));
-                entityBean.addChild(beanNode);
-                Context jndi = (Context) kernel.getAttribute(gbEntBean,
-                        "componentContext");
-                buildContext(beanNode, jndi, "java:comp");
-            }
-
-            queryEnt = new HashMap();
-            StringTree sessionBean = new StringTree("SessionBeans");
-            ejbModule.addChild(sessionBean);
-            queryEnt.put("j2eeType", "StatelessSessionBean");
-            queryEnt.put("EJBModule", gb.getNameProperty("name"));
-            queryEnt.put("J2EEApplication", gb
-                    .getNameProperty("J2EEApplication"));
-            Set setSessionBean = kernel
-                    .listGBeans(new org.apache.geronimo.gbean.AbstractNameQuery(
-                            null, queryEnt));
-
-            Iterator iterSessionBean = setSessionBean.iterator();
-
-            while (iterSessionBean.hasNext()) {
-                AbstractName gbSessionBean = (AbstractName) iterSessionBean
-                        .next();
-                StringTree beanNode = new StringTree(gbSessionBean
-                        .getNameProperty("name"));
-                sessionBean.addChild(beanNode);
-                Context jndi = (Context) kernel.getAttribute(gbSessionBean,
-                        "componentContext");
-                buildContext(beanNode, jndi, "java:comp");
-            }
-
-            queryEnt = new HashMap();
-            queryEnt.put("j2eeType", "StatefullSessionBean");
-            queryEnt.put("EJBModule", gb.getNameProperty("name"));
-            queryEnt.put("J2EEApplication", gb
-                    .getNameProperty("J2EEApplication"));
-            setSessionBean = kernel
-                    .listGBeans(new org.apache.geronimo.gbean.AbstractNameQuery(
-                            null, queryEnt));
-
-            iterSessionBean = setSessionBean.iterator();
-
-            while (iterSessionBean.hasNext()) {
-                AbstractName gbSessionBean = (AbstractName) iterSessionBean
-                        .next();
-                StringTree beanNode = new StringTree(gbSessionBean
-                        .getNameProperty("name"));
-                sessionBean.addChild(beanNode);
-                Context jndi = (Context) kernel.getAttribute(gbSessionBean,
-                        "componentContext");
-                buildContext(beanNode, jndi, "java:comp");
-            }
-        }
-    }
-
-    private void buildWebModule(Kernel kernel, List arryList, Hashtable entApp)
-            throws Exception {
-        Map query = new HashMap();
-        query.put("j2eeType", "WebModule");
-        Set setEnt = kernel
-                .listGBeans(new org.apache.geronimo.gbean.AbstractNameQuery(
-                        null, query));
-        Iterator iterator = setEnt.iterator();
-
-        while (iterator.hasNext()) {
-
-            AbstractName gb = (AbstractName) iterator.next();
-            StringTree webModule = new StringTree(gb.getNameProperty("name"));
-
-            if (gb.getNameProperty("J2EEApplication") == null
-                    || gb.getNameProperty("J2EEApplication").equals("null")) {
-                StringTree treeEnt = (StringTree) entApp.get("WebModule");
-                treeEnt.addChild(webModule);
-            } else {
-                StringTree treeEnt = (StringTree) entApp.get(gb
-                        .getNameProperty("J2EEApplication"));
-                treeEnt = treeEnt.findNode("WebModule");
-                treeEnt.addChild(webModule);
-            }
-
-            Map map = (Map) kernel.getAttribute(gb, "componentContext");
-            String[] servlets = (String[]) kernel.getAttribute(gb, "servlets");
-
-            StringTree servletsNode = null;
-            StringTree jspNode = null;
-
-            for (int i = 0; i < servlets.length; i++) {
-                String servlet = servlets[i];
-                servlet = servlet.substring(servlet.indexOf("name=") + 5);
-                if (servlet.indexOf(",") != -1)
-                    servlet = servlet.substring(0, servlet.indexOf(","));
-                if (!servlet.equals("jsp") && servlet.startsWith("jsp.")) {
-                    if (servletsNode == null) {
-                        servletsNode = new StringTree("Servlets");
-                        webModule.addChild(servletsNode);
-                    }
-                    if (jspNode == null) {
-                        jspNode = new StringTree("JSP");
-                        servletsNode.addChild(jspNode);
-                    }
-                    jspNode.addChild(servlet.substring(4));
-                } else if (!servlet.equals("jsp")) {
-                    if (servletsNode == null) {
-                        servletsNode = new StringTree("Servlets");
-                        webModule.addChild(servletsNode);
-                    }
-                    servletsNode.addChild(servlet);
-                }
-            }
-            Iterator contexts = map.keySet().iterator();
-            while (contexts.hasNext())
-                webModule.addChild("java:comp/" + contexts.next());
-        }
-    }
-
-    private void buildResourceModule(Kernel kernel, List arryList,
-            Hashtable entApp) throws Exception {
-        Map query = new HashMap();
-        query.put("j2eeType", "ResourceAdapterModule");
-        Set setEnt = kernel
-                .listGBeans(new org.apache.geronimo.gbean.AbstractNameQuery(
-                        null, query));
-        Iterator iterator = setEnt.iterator();
-
-        while (iterator.hasNext()) {
-            AbstractName gb = (AbstractName) iterator.next();
-            String resourceModule = gb.getNameProperty("name");
-            if (gb.getNameProperty("J2EEApplication") == null
-                    || gb.getNameProperty("J2EEApplication").equals("null")) {
-                StringTree treeEnt = (StringTree) entApp
-                        .get("ResourceAdapterModule");
-                treeEnt.addChild(resourceModule);
-            } else {
-                StringTree treeEnt = (StringTree) entApp.get(gb
-                        .getNameProperty("J2EEApplication"));
-                treeEnt = treeEnt.findNode("ResourceAdapterModule");
-                treeEnt.addChild(resourceModule);
-            }
-        }
-    }
-
-    private void buildAppClientModule(Kernel kernel, List arryList,
-            Hashtable entApp) throws Exception {
-        Map query = new HashMap();
-        query.put("j2eeType", "AppClientModule");
-        Set setEnt = kernel
-                .listGBeans(new org.apache.geronimo.gbean.AbstractNameQuery(
-                        null, query));
-        Iterator iterator = setEnt.iterator();
-
-        while (iterator.hasNext()) {
-            AbstractName gb = (AbstractName) iterator.next();
-            String appClienteModule = gb.getNameProperty("name");
-            if (gb.getNameProperty("J2EEApplication") == null
-                    || gb.getNameProperty("J2EEApplication").equals("null")) {
-                StringTree treeEnt = (StringTree) entApp.get("AppClientModule");
-                treeEnt.addChild(appClienteModule);
-            } else {
-                StringTree treeEnt = (StringTree) entApp.get(gb
-                        .getNameProperty("J2EEApplication"));
-                treeEnt = treeEnt.findNode("AppClientModule");
-                treeEnt.addChild(appClienteModule);
-            }
-        }
-    }
-
-    public void buildContext(StringTree node, Context ctx, String nodeCurr) {
-        try {
-            javax.naming.NamingEnumeration enumName = ctx.list("");
-            while (enumName.hasMoreElements()) {
-                javax.naming.NameClassPair pair = (javax.naming.NameClassPair) enumName
-                        .next();
-                Object obj = ctx.lookup(pair.getName());
-                if (obj instanceof Context) {
-                    buildContext(node, (Context) obj, nodeCurr + "/"
-                            + pair.getName());
-                } else {
-                    node.addChild(new String(nodeCurr + "/" + pair.getName()));
-                }
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-    }
-
-    private void buildGlobal(StringTree tree, Context context, String parent)
-            throws Exception {
-        if (parent == null)
-            parent = "";
-        if (!parent.equals(""))
-            parent = parent + "/";
-        javax.naming.NamingEnumeration enum1 = context.list("");
-        while (enum1.hasMoreElements()) {
-            javax.naming.NameClassPair pair = (javax.naming.NameClassPair) enum1
-                    .next();
-            Object obj = context.lookup(pair.getName());
-            if (obj instanceof Context) {
-                buildGlobal(tree, (Context) obj, parent + pair.getName());
-            } else {
-                tree.addChild(parent + pair.getName());
-            }
-        }
-    }
-
-    public List getContextTree() throws Exception {
-        List arryList = new ArrayList();
-        Hashtable entApp = new Hashtable();
-
-        StringTree treeGlobal = new StringTree("Global Context");
-        arryList.add(treeGlobal);
-        buildGlobal(treeGlobal,
-                org.apache.xbean.naming.global.GlobalContextManager
-                        .getGlobalContext(), "");
-
-        StringTree tree = new StringTree("Enterprise Applications");
-        arryList.add(tree);
-
-        StringTree treeMod = new StringTree("EJBModule");
-        entApp.put("EJBModule", treeMod);
-        arryList.add(treeMod);
-
-        treeMod = new StringTree("WebModule");
-        entApp.put("WebModule", treeMod);
-        arryList.add(treeMod);
-
-        treeMod = new StringTree("ResourceAdapterModule");
-        entApp.put("ResourceAdapterModule", treeMod);
-        arryList.add(treeMod);
-
-        treeMod = new StringTree("AppClientModule");
-        entApp.put("AppClientModule", treeMod);
-        arryList.add(treeMod);
-
-        org.apache.geronimo.kernel.Kernel kernel = org.apache.geronimo.kernel.KernelRegistry
-                .getSingleKernel();
-
-        Set setEnt = kernel
-                .listGBeans(new org.apache.geronimo.gbean.AbstractNameQuery(
-                        null,
-                        Collections.EMPTY_MAP,
-                        org.apache.geronimo.j2ee.management.impl.J2EEApplicationImpl.class
-                                .getName()));
-        Iterator iterator = setEnt.iterator();
-        while (iterator.hasNext()) {
-            org.apache.geronimo.gbean.AbstractName gb = (org.apache.geronimo.gbean.AbstractName) iterator
-                    .next();
-            StringTree curr = new StringTree(gb.getNameProperty("name"));
-            tree.addChild(curr);
-            entApp.put(gb.getNameProperty("name"), curr);
-
-            StringTree temp = new StringTree("EJBModule");
-            curr.addChild(temp);
-
-            temp = new StringTree("WebModule");
-            curr.addChild(temp);
-
-            temp = new StringTree("ResourceAdapterModule");
-            curr.addChild(temp);
-
-            temp = new StringTree("AppClientModule");
-            curr.addChild(temp);
-        }
-
-        buildEJBModule(kernel, arryList, entApp);
-        buildWebModule(kernel, arryList, entApp);
-        buildResourceModule(kernel, arryList, entApp);
-        buildAppClientModule(kernel, arryList, entApp);
-        return arryList;
-    }
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.console.jndiview;
+
+import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.gbean.AbstractName;
+import javax.naming.Context;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.Hashtable;
+import java.util.Map;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Set;
+import java.util.Collections;
+
+import org.apache.geronimo.console.BasePortlet;
+import org.apache.geronimo.console.util.StringTree;
+
+import javax.portlet.ActionRequest;
+import javax.portlet.ActionResponse;
+import javax.portlet.PortletConfig;
+import javax.portlet.PortletException;
+import javax.portlet.PortletRequestDispatcher;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.WindowState;
+
+public class JNDIViewPortlet extends BasePortlet {
+
+    private static final String NORMALVIEW_JSP = "/WEB-INF/view/jndiview/view.jsp";
+
+    private static final String MAXIMIZEDVIEW_JSP = "/WEB-INF/view/jndiview/view.jsp";
+
+    private static final String HELPVIEW_JSP = "/WEB-INF/view/jndiview/help.jsp";
+
+    private PortletRequestDispatcher normalView;
+
+    private PortletRequestDispatcher maximizedView;
+
+    private PortletRequestDispatcher helpView;
+
+    public void processAction(ActionRequest actionRequest,
+            ActionResponse actionResponse) throws PortletException, IOException {
+    }
+
+    protected void doView(RenderRequest renderRequest,
+            RenderResponse renderResponse) throws IOException, PortletException {
+        if (WindowState.MINIMIZED.equals(renderRequest.getWindowState())) {
+            return;
+        }
+
+        try {
+            renderRequest.getPortletSession().setAttribute("jndiTree",
+                    getJSONTrees());
+        } catch (Exception ex) {
+            throw new PortletException(ex);
+        }
+        if (WindowState.NORMAL.equals(renderRequest.getWindowState())) {
+            normalView.include(renderRequest, renderResponse);
+        } else {
+            maximizedView.include(renderRequest, renderResponse);
+        }
+    }
+
+    protected void doHelp(RenderRequest renderRequest,
+            RenderResponse renderResponse) throws PortletException, IOException {
+        helpView.include(renderRequest, renderResponse);
+    }
+
+    public void init(PortletConfig portletConfig) throws PortletException {
+        super.init(portletConfig);
+        normalView = portletConfig.getPortletContext().getRequestDispatcher(
+                NORMALVIEW_JSP);
+        maximizedView = portletConfig.getPortletContext().getRequestDispatcher(
+                MAXIMIZEDVIEW_JSP);
+        helpView = portletConfig.getPortletContext().getRequestDispatcher(
+                HELPVIEW_JSP);
+
+    }
+
+    public void destroy() {
+        normalView = null;
+        maximizedView = null;
+        helpView = null;
+        super.destroy();
+    }
+
+    public String getJSONTrees() throws Exception {
+        List list = getContextTree();
+        if (list == null)
+            return "[]";
+
+        StringBuffer stb = new StringBuffer();
+        stb.append("[");
+        for (int i = 0; i < list.size(); i++) {
+            StringTree node = (StringTree) list.get(i);
+            if (i != 0)
+                stb.append(",");
+            stb.append(node.toJSONObject("" + i));
+        }
+        stb.append("]");
+        return stb.toString();
+    }
+
+    private void buildEJBModule(Kernel kernel, List arryList, Hashtable entApp)
+            throws Exception {
+        Map query = new HashMap();
+        query.put("j2eeType", "EJBModule");
+        Set setEnt = kernel.listGBeans(new org.apache.geronimo.gbean.AbstractNameQuery(null, query));
+        Iterator iterator = setEnt.iterator();
+
+        while (iterator.hasNext()) {
+            AbstractName gb = (AbstractName) iterator.next();
+            StringTree ejbModule = new StringTree(gb.getNameProperty("name"));
+
+            if (gb.getNameProperty("J2EEApplication") == null
+                    || gb.getNameProperty("J2EEApplication").equals("null")) {
+                StringTree treeEnt = (StringTree) entApp.get("EJBModule");
+                treeEnt.addChild(ejbModule);
+            } else {
+                StringTree treeEnt = (StringTree) entApp.get(gb
+                        .getNameProperty("J2EEApplication"));
+                treeEnt = treeEnt.findNode("EJBModule");
+                treeEnt.addChild(ejbModule);
+            }
+            Map queryEnt = new HashMap();
+            StringTree entityBean = new StringTree("EntityBeans");
+            ejbModule.addChild(entityBean);
+            queryEnt.put("j2eeType", "EntityBean");
+            queryEnt.put("EJBModule", gb.getNameProperty("name"));
+            queryEnt.put("J2EEApplication", gb
+                    .getNameProperty("J2EEApplication"));
+            Set setEntBean = kernel
+                    .listGBeans(new org.apache.geronimo.gbean.AbstractNameQuery(
+                            null, queryEnt));
+
+            Iterator iterEntBean = setEntBean.iterator();
+
+            while (iterEntBean.hasNext()) {
+                AbstractName gbEntBean = (AbstractName) iterEntBean.next();
+                StringTree beanNode = new StringTree(gbEntBean
+                        .getNameProperty("name"));
+                entityBean.addChild(beanNode);
+                Context jndi = (Context) kernel.getAttribute(gbEntBean,
+                        "componentContext");
+                buildContext(beanNode, jndi, "java:comp");
+            }
+
+            queryEnt = new HashMap();
+            StringTree sessionBean = new StringTree("SessionBeans");
+            ejbModule.addChild(sessionBean);
+            queryEnt.put("j2eeType", "StatelessSessionBean");
+            queryEnt.put("EJBModule", gb.getNameProperty("name"));
+            queryEnt.put("J2EEApplication", gb
+                    .getNameProperty("J2EEApplication"));
+            Set setSessionBean = kernel
+                    .listGBeans(new org.apache.geronimo.gbean.AbstractNameQuery(
+                            null, queryEnt));
+
+            Iterator iterSessionBean = setSessionBean.iterator();
+
+            while (iterSessionBean.hasNext()) {
+                AbstractName gbSessionBean = (AbstractName) iterSessionBean
+                        .next();
+                StringTree beanNode = new StringTree(gbSessionBean
+                        .getNameProperty("name"));
+                sessionBean.addChild(beanNode);
+                Context jndi = (Context) kernel.getAttribute(gbSessionBean,
+                        "componentContext");
+                buildContext(beanNode, jndi, "java:comp");
+            }
+
+            queryEnt = new HashMap();
+            queryEnt.put("j2eeType", "StatefullSessionBean");
+            queryEnt.put("EJBModule", gb.getNameProperty("name"));
+            queryEnt.put("J2EEApplication", gb
+                    .getNameProperty("J2EEApplication"));
+            setSessionBean = kernel
+                    .listGBeans(new org.apache.geronimo.gbean.AbstractNameQuery(
+                            null, queryEnt));
+
+            iterSessionBean = setSessionBean.iterator();
+
+            while (iterSessionBean.hasNext()) {
+                AbstractName gbSessionBean = (AbstractName) iterSessionBean
+                        .next();
+                StringTree beanNode = new StringTree(gbSessionBean
+                        .getNameProperty("name"));
+                sessionBean.addChild(beanNode);
+                Context jndi = (Context) kernel.getAttribute(gbSessionBean,
+                        "componentContext");
+                buildContext(beanNode, jndi, "java:comp");
+            }
+        }
+    }
+
+    private void buildWebModule(Kernel kernel, List arryList, Hashtable entApp)
+            throws Exception {
+        Map query = new HashMap();
+        query.put("j2eeType", "WebModule");
+        Set setEnt = kernel
+                .listGBeans(new org.apache.geronimo.gbean.AbstractNameQuery(
+                        null, query));
+        Iterator iterator = setEnt.iterator();
+
+        while (iterator.hasNext()) {
+
+            AbstractName gb = (AbstractName) iterator.next();
+            StringTree webModule = new StringTree(gb.getNameProperty("name"));
+
+            if (gb.getNameProperty("J2EEApplication") == null
+                    || gb.getNameProperty("J2EEApplication").equals("null")) {
+                StringTree treeEnt = (StringTree) entApp.get("WebModule");
+                treeEnt.addChild(webModule);
+            } else {
+                StringTree treeEnt = (StringTree) entApp.get(gb
+                        .getNameProperty("J2EEApplication"));
+                treeEnt = treeEnt.findNode("WebModule");
+                treeEnt.addChild(webModule);
+            }
+
+            Map map = (Map) kernel.getAttribute(gb, "componentContext");
+            String[] servlets = (String[]) kernel.getAttribute(gb, "servlets");
+
+            StringTree servletsNode = null;
+            StringTree jspNode = null;
+
+            for (int i = 0; i < servlets.length; i++) {
+                String servlet = servlets[i];
+                servlet = servlet.substring(servlet.indexOf("name=") + 5);
+                if (servlet.indexOf(",") != -1)
+                    servlet = servlet.substring(0, servlet.indexOf(","));
+                if (!servlet.equals("jsp") && servlet.startsWith("jsp.")) {
+                    if (servletsNode == null) {
+                        servletsNode = new StringTree("Servlets");
+                        webModule.addChild(servletsNode);
+                    }
+                    if (jspNode == null) {
+                        jspNode = new StringTree("JSP");
+                        servletsNode.addChild(jspNode);
+                    }
+                    jspNode.addChild(servlet.substring(4));
+                } else if (!servlet.equals("jsp")) {
+                    if (servletsNode == null) {
+                        servletsNode = new StringTree("Servlets");
+                        webModule.addChild(servletsNode);
+                    }
+                    servletsNode.addChild(servlet);
+                }
+            }
+            Iterator contexts = map.keySet().iterator();
+            while (contexts.hasNext())
+                webModule.addChild("java:comp/" + contexts.next());
+        }
+    }
+
+    private void buildResourceModule(Kernel kernel, List arryList,
+            Hashtable entApp) throws Exception {
+        Map query = new HashMap();
+        query.put("j2eeType", "ResourceAdapterModule");
+        Set setEnt = kernel
+                .listGBeans(new org.apache.geronimo.gbean.AbstractNameQuery(
+                        null, query));
+        Iterator iterator = setEnt.iterator();
+
+        while (iterator.hasNext()) {
+            AbstractName gb = (AbstractName) iterator.next();
+            String resourceModule = gb.getNameProperty("name");
+            if (gb.getNameProperty("J2EEApplication") == null
+                    || gb.getNameProperty("J2EEApplication").equals("null")) {
+                StringTree treeEnt = (StringTree) entApp
+                        .get("ResourceAdapterModule");
+                treeEnt.addChild(resourceModule);
+            } else {
+                StringTree treeEnt = (StringTree) entApp.get(gb
+                        .getNameProperty("J2EEApplication"));
+                treeEnt = treeEnt.findNode("ResourceAdapterModule");
+                treeEnt.addChild(resourceModule);
+            }
+        }
+    }
+
+    private void buildAppClientModule(Kernel kernel, List arryList,
+            Hashtable entApp) throws Exception {
+        Map query = new HashMap();
+        query.put("j2eeType", "AppClientModule");
+        Set setEnt = kernel
+                .listGBeans(new org.apache.geronimo.gbean.AbstractNameQuery(
+                        null, query));
+        Iterator iterator = setEnt.iterator();
+
+        while (iterator.hasNext()) {
+            AbstractName gb = (AbstractName) iterator.next();
+            String appClienteModule = gb.getNameProperty("name");
+            if (gb.getNameProperty("J2EEApplication") == null
+                    || gb.getNameProperty("J2EEApplication").equals("null")) {
+                StringTree treeEnt = (StringTree) entApp.get("AppClientModule");
+                treeEnt.addChild(appClienteModule);
+            } else {
+                StringTree treeEnt = (StringTree) entApp.get(gb
+                        .getNameProperty("J2EEApplication"));
+                treeEnt = treeEnt.findNode("AppClientModule");
+                treeEnt.addChild(appClienteModule);
+            }
+        }
+    }
+
+    public void buildContext(StringTree node, Context ctx, String nodeCurr) {
+        try {
+            javax.naming.NamingEnumeration enumName = ctx.list("");
+            while (enumName.hasMoreElements()) {
+                javax.naming.NameClassPair pair = (javax.naming.NameClassPair) enumName
+                        .next();
+                Object obj = ctx.lookup(pair.getName());
+                if (obj instanceof Context) {
+                    buildContext(node, (Context) obj, nodeCurr + "/"
+                            + pair.getName());
+                } else {
+                    node.addChild(new String(nodeCurr + "/" + pair.getName()));
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    private void buildGlobal(StringTree tree, Context context, String parent)
+            throws Exception {
+        if (parent == null)
+            parent = "";
+        if (!parent.equals(""))
+            parent = parent + "/";
+        javax.naming.NamingEnumeration enum1 = context.list("");
+        while (enum1.hasMoreElements()) {
+            javax.naming.NameClassPair pair = (javax.naming.NameClassPair) enum1
+                    .next();
+            Object obj = context.lookup(pair.getName());
+            if (obj instanceof Context) {
+                buildGlobal(tree, (Context) obj, parent + pair.getName());
+            } else {
+                tree.addChild(parent + pair.getName());
+            }
+        }
+    }
+
+    public List getContextTree() throws Exception {
+        List arryList = new ArrayList();
+        Hashtable entApp = new Hashtable();
+
+        StringTree treeGlobal = new StringTree("Global Context");
+        arryList.add(treeGlobal);
+        buildGlobal(treeGlobal,
+                org.apache.xbean.naming.global.GlobalContextManager
+                        .getGlobalContext(), "");
+
+        StringTree tree = new StringTree("Enterprise Applications");
+        arryList.add(tree);
+
+        StringTree treeMod = new StringTree("EJBModule");
+        entApp.put("EJBModule", treeMod);
+        arryList.add(treeMod);
+
+        treeMod = new StringTree("WebModule");
+        entApp.put("WebModule", treeMod);
+        arryList.add(treeMod);
+
+        treeMod = new StringTree("ResourceAdapterModule");
+        entApp.put("ResourceAdapterModule", treeMod);
+        arryList.add(treeMod);
+
+        treeMod = new StringTree("AppClientModule");
+        entApp.put("AppClientModule", treeMod);
+        arryList.add(treeMod);
+
+        org.apache.geronimo.kernel.Kernel kernel = org.apache.geronimo.kernel.KernelRegistry
+                .getSingleKernel();
+
+        Set setEnt = kernel
+                .listGBeans(new org.apache.geronimo.gbean.AbstractNameQuery(
+                        null,
+                        Collections.EMPTY_MAP,
+                        org.apache.geronimo.j2ee.management.impl.J2EEApplicationImpl.class
+                                .getName()));
+        Iterator iterator = setEnt.iterator();
+        while (iterator.hasNext()) {
+            org.apache.geronimo.gbean.AbstractName gb = (org.apache.geronimo.gbean.AbstractName) iterator
+                    .next();
+            StringTree curr = new StringTree(gb.getNameProperty("name"));
+            tree.addChild(curr);
+            entApp.put(gb.getNameProperty("name"), curr);
+
+            StringTree temp = new StringTree("EJBModule");
+            curr.addChild(temp);
+
+            temp = new StringTree("WebModule");
+            curr.addChild(temp);
+
+            temp = new StringTree("ResourceAdapterModule");
+            curr.addChild(temp);
+
+            temp = new StringTree("AppClientModule");
+            curr.addChild(temp);
+        }
+
+        buildEJBModule(kernel, arryList, entApp);
+        buildWebModule(kernel, arryList, entApp);
+        buildResourceModule(kernel, arryList, entApp);
+        buildAppClientModule(kernel, arryList, entApp);
+        return arryList;
+    }
 }

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/jndiview/JNDIViewPortlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/jndiview/JNDIViewPortlet.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/jndiview/JNDIViewPortlet.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain



Mime
View raw message