Return-Path: 
 <scm-return-29559-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 71737 invoked from network); 25 Jun 2008 15:12:58 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 25 Jun 2008 15:12:58 -0000
Received: (qmail 91107 invoked by uid 500); 25 Jun 2008 15:12:52 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 91064 invoked by uid 500); 25 Jun 2008 15:12:52 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 91044 invoked by uid 99); 25 Jun 2008 15:12:52 -0000
Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Jun 2008 08:12:52 -0700
X-ASF-Spam-Status: No, hits=-2000.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 25 Jun 2008 15:12:11 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id A8330238896B; Wed, 25 Jun 2008 08:12:00 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r671577 - in
 /geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main:
 java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java
 webapp/WEB-INF/view/configmanager/normal.jsp
Date: Wed, 25 Jun 2008 15:12:00 -0000
To: scm@geronimo.apache.org
From: gawor@apache.org
X-Mailer: svnmailer-1.0.8
Message-Id: <20080625151200.A8330238896B@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: gawor
Date: Wed Jun 25 08:12:00 2008
New Revision: 671577

URL: http://svn.apache.org/viewvc?rev=671577&view=rev
Log:
added a checkbox to show/hide parent and child components of modules in the console (GERONIMO-4152)

Modified:
    geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java
    geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java?rev=671577&r1=671576&r2=671577&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java Wed Jun 25 08:12:00 2008
@@ -69,6 +69,8 @@
 
     private static final String CONFIG_INIT_PARAM = "config-type";
 
+    private static final String SHOW_DEPENDENCIES_COOKIE = "org.apache.geronimo.configmanager.showDependencies";
+    
     private Kernel kernel;
 
     private PortletRequestDispatcher normalView;
@@ -201,7 +203,10 @@
         if (WindowState.MINIMIZED.equals(renderRequest.getWindowState())) {
             return;
         }
-
+              
+        String cookies = renderRequest.getProperty("cookie");
+        boolean showDependencies = (cookies != null && cookies.indexOf(SHOW_DEPENDENCIES_COOKIE + "=true") > 0);
+        
         List<ModuleDetails> moduleDetails = new ArrayList<ModuleDetails>();
         ConfigurationManager configManager = ConfigurationUtil.getConfigurationManager(kernel);
         List<ConfigurationInfo> infos = configManager.listConfigurations();
@@ -221,7 +226,9 @@
                             details.getContextPaths().add(webModule.getContextPath());
                         }
 
-                        addDependencies(details, configObjName);
+                        if (showDependencies) {
+                            addDependencies(details, configObjName);
+                        }
                         if (loaded) {
                             unloadModule(configManager, configObjName);
                         }
@@ -244,7 +251,9 @@
                                 if (webModule != null) {
                                     childDetails.getContextPaths().add(webModule.getContextPath());
                                 }
-                                addDependencies(childDetails, configObjName);
+                                if (showDependencies) {
+                                    addDependencies(childDetails, configObjName);
+                                }
                                 moduleDetails.add(childDetails);
                             }
                         }
@@ -278,7 +287,9 @@
                         }
                     }
 
-                    addDependencies(details, configObjName);
+                    if (showDependencies) {
+                        addDependencies(details, configObjName);
+                    }
                     if (loaded) {
                         unloadModule(configManager, configObjName);
                     }
@@ -292,6 +303,7 @@
         Collections.sort(moduleDetails);
         renderRequest.setAttribute("configurations", moduleDetails);
         renderRequest.setAttribute("showWebInfo", Boolean.valueOf(showWebInfo()));
+        renderRequest.setAttribute("showDependencies", Boolean.valueOf(showDependencies));
         if (moduleDetails.size() == 0) {
             renderRequest.setAttribute("messageInstalled", "No modules found of this type<br /><br />");
         } else {

Modified: geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp?rev=671577&r1=671576&r2=671577&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp (original)
+++ geronimo/server/branches/2.1/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp Wed Jun 25 08:12:00 2008
@@ -22,6 +22,7 @@
 
 <script>
 var EXPERT_COOKIE = "org.apache.geronimo.configmanager.expertmode";
+var SHOW_DEPENDENCIES_COOKIE = "org.apache.geronimo.configmanager.showDependencies";
 
 // Check to see if a component is "safe" to stop within a running server.
 // Service components with names that begin with "org.apache.geronimo.configs/", for example,
@@ -190,28 +191,48 @@
 function init() {
     if (getCookie(EXPERT_COOKIE) == 'true') {
         document.checkExpert.expertMode.checked = true;
-    }
-    else {
+    } else {
         document.checkExpert.expertMode.checked = false;
     }
     toggleExpertMode();
+    
+    if (getCookie(SHOW_DEPENDENCIES_COOKIE) == 'true') {
+        document.showDependenciesForm.showDependenciesMode.checked = true;
+    } else {
+        document.showDependenciesForm.showDependenciesMode.checked = false;
+    }
 }
+
+function toggleShowDependenciesMode() {
+    if (document.showDependenciesForm.showDependenciesMode.checked) {
+        document.cookie=SHOW_DEPENDENCIES_COOKIE+"=true";
+    } else {
+        document.cookie=SHOW_DEPENDENCIES_COOKIE+"=false";
+    }
+    window.location.reload();
+}
+
 </script>
 
 
-<br />
 <form name="checkExpert">
-<input type="checkbox" name="expertMode" onClick="toggleExpertMode();" />&nbsp;Expert User (enable all actions on Geronimo Provided Components)   
+<input type="checkbox" name="expertMode" onClick="toggleExpertMode();" />&nbsp;Expert User (enable all actions on Geronimo Provided Components)  
 </form>
-<br />
+
+<form name="showDependenciesForm">
+<input type="checkbox" name="showDependenciesMode" onClick="toggleShowDependenciesMode();" />&nbsp;Show parent and child components
+</form>
+
 <table width="100%">
     <tr class="DarkBackground">
         <th align="left">&nbsp;<fmt:message key="configmanager.normal.componentName" /></th>
         <c:if test="${showWebInfo}"><th>URL</th></c:if>
         <th>&nbsp;<fmt:message key="consolebase.common.state"/></th>
         <th align="center" colspan="3"> <fmt:message key="consolebase.common.commands"/></th>
-        <th align="left"><fmt:message key="configmanager.normal.parentComponents" /></th>
-        <th align="left"><fmt:message key="configmanager.normal.childComponents" /></th>
+        <c:if test="${showDependencies}">
+           <th align="left"><fmt:message key="configmanager.normal.parentComponents" /></th>
+           <th align="left"><fmt:message key="configmanager.normal.childComponents" /></th>
+        </c:if>
     </tr>
   <c:set var="backgroundClass" value='MediumBackground'/>
   <c:forEach var="moduleDetails" items="${configurations}">
@@ -291,19 +312,21 @@
             </c:if>
         </td>
 
-        <!-- Parents -->
-        <td class="${backgroundClass}">
-            <c:forEach var="parent" items="${moduleDetails.parents}">
-                ${parent} <br>
-            </c:forEach>
-        </td>
-
-        <!-- Children -->
-        <td class="${backgroundClass}">
-        <c:forEach var="child" items="${moduleDetails.children}">
-            ${child} <br>
-        </c:forEach>
-        </td>
+        <c:if test="${showDependencies}">
+           <!-- Parents -->
+           <td class="${backgroundClass}">
+               <c:forEach var="parent" items="${moduleDetails.parents}">
+                  ${parent} <br>
+               </c:forEach>
+           </td>
+
+           <!-- Children -->
+           <td class="${backgroundClass}">
+               <c:forEach var="child" items="${moduleDetails.children}">
+                  ${child} <br>
+               </c:forEach>
+           </td>
+        </c:if>
     </tr>
   </c:forEach>
 </table>