You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ge...@apache.org on 2010/01/07 12:11:24 UTC
svn commit: r896846 - in /geronimo/server/branches/2.2/plugins:
activemq/activemq-console-jetty/src/main/plan/
activemq/activemq-console-tomcat/src/main/plan/
console/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/
console/console-filter/sr...
Author: genspring
Date: Thu Jan 7 11:05:18 2010
New Revision: 896846
URL: http://svn.apache.org/viewvc?rev=896846&view=rev
Log:
GERONIMO-4994 To support multiple level navigation tree in geronimo web console.
Added:
geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlets-only.jsp (with props)
geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlets-with-tree.jsp (with props)
geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/images/folderClosed_new.gif (with props)
geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/images/folderOpened_new.gif (with props)
Removed:
geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/head.jsp
Modified:
geronimo/server/branches/2.2/plugins/activemq/activemq-console-jetty/src/main/plan/plan.xml
geronimo/server/branches/2.2/plugins/activemq/activemq-console-tomcat/src/main/plan/plan.xml
geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp
geronimo/server/branches/2.2/plugins/console/console-filter/src/main/java/org/apache/geronimo/console/filter/XSRFHandler.java
geronimo/server/branches/2.2/plugins/console/console-filter/src/main/java/org/apache/geronimo/console/filter/XSSHandler.java
geronimo/server/branches/2.2/plugins/console/console-jetty/src/main/plan/plan.xml
geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/default-theme.jsp
geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/navigation.jsp
geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/index.jsp
geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/logout.jsp
geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/main.css
geronimo/server/branches/2.2/plugins/console/console-tomcat/src/main/plan/plan.xml
geronimo/server/branches/2.2/plugins/console/plugin-console-jetty/src/main/plan/plan.xml
geronimo/server/branches/2.2/plugins/console/plugin-console-tomcat/src/main/plan/plan.xml
geronimo/server/branches/2.2/plugins/debugviews/debugviews-console-jetty/src/main/plan/plan.xml
geronimo/server/branches/2.2/plugins/debugviews/debugviews-console-tomcat/src/main/plan/plan.xml
geronimo/server/branches/2.2/plugins/monitoring/mconsole-jetty/src/main/plan/plan.xml
geronimo/server/branches/2.2/plugins/monitoring/mconsole-tomcat/src/main/plan/plan.xml
geronimo/server/branches/2.2/plugins/openejb/openejb-console-jetty/src/main/plan/plan.xml
geronimo/server/branches/2.2/plugins/openejb/openejb-console-tomcat/src/main/plan/plan.xml
geronimo/server/branches/2.2/plugins/plancreator/plancreator-console-jetty/src/main/plan/plan.xml
geronimo/server/branches/2.2/plugins/plancreator/plancreator-console-tomcat/src/main/plan/plan.xml
geronimo/server/branches/2.2/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml
geronimo/server/branches/2.2/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml
Modified: geronimo/server/branches/2.2/plugins/activemq/activemq-console-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/activemq/activemq-console-jetty/src/main/plan/plan.xml?rev=896846&r1=896845&r2=896846&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/activemq/activemq-console-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.2/plugins/activemq/activemq-console-jetty/src/main/plan/plan.xml Thu Jan 7 11:05:18 2010
@@ -38,7 +38,7 @@
</gbean>
<gbean name="JMSServerManager" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Server/JMS Server</attribute>
+ <attribute name="pageTitle">1-10/Server/JMS Server</attribute>
<attribute name="portletContext">/activemq</attribute>
<attribute name="portletList">[JMSServerManager,JMSConnectorManager]</attribute>
<attribute name="icon">/images/ico_jmsserv_16x16.gif</attribute>
@@ -48,7 +48,7 @@
</gbean>
<gbean name="JMSWizard" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Services/JMS Resources</attribute>
+ <attribute name="pageTitle">2-2/Services/JMS Resources</attribute>
<attribute name="portletContext">/activemq</attribute>
<attribute name="portletList">[JMSWizard]</attribute>
<attribute name="icon">/images/ico_jms_16x16.gif</attribute>
Modified: geronimo/server/branches/2.2/plugins/activemq/activemq-console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/activemq/activemq-console-tomcat/src/main/plan/plan.xml?rev=896846&r1=896845&r2=896846&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/activemq/activemq-console-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.2/plugins/activemq/activemq-console-tomcat/src/main/plan/plan.xml Thu Jan 7 11:05:18 2010
@@ -39,7 +39,7 @@
</gbean>
<gbean name="JMSServerManager" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Server/JMS Server</attribute>
+ <attribute name="pageTitle">1-10/Server/JMS Server</attribute>
<attribute name="portletContext">/activemq</attribute>
<attribute name="portletList">[JMSServerManager,JMSConnectorManager]</attribute>
<attribute name="icon">/images/ico_jmsserv_16x16.gif</attribute>
@@ -49,7 +49,7 @@
</gbean>
<gbean name="JMSWizard" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Services/JMS Resources</attribute>
+ <attribute name="pageTitle">2-2/Services/JMS Resources</attribute>
<attribute name="portletContext">/activemq</attribute>
<attribute name="portletList">[JMSWizard]</attribute>
<attribute name="icon">/images/ico_jms_16x16.gif</attribute>
Modified: geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp?rev=896846&r1=896845&r2=896846&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp (original)
+++ geronimo/server/branches/2.2/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp Thu Jan 7 11:05:18 2010
@@ -67,9 +67,9 @@
<tr>
<td bgcolor="#FFFFFF" nowrap>
<br />
- <img src='/console/images/ico_list_16x16.gif' alt=""/><a href="/console/portal/Applications/Deploy New"><fmt:message key="welcome.welcomeNormal.deployNew"/></a><br />
- <img src='/console/images/ico_servcomp_16x16.gif' alt=""/><a href="/console/portal/Server/Web Server"><fmt:message key="welcome.welcomeNormal.webServerPorts"/></a><br />
- <img src='/console/images/ico_look_16x16.gif' alt=""/><a href="/console/portal/Server/Information"><fmt:message key="welcome.welcomeNormal.serverInfo"/></a><br />
+ <img src='/console/images/ico_list_16x16.gif' alt=""/><a href="/console/portal/3-8/Applications/Deploy New"><fmt:message key="welcome.welcomeNormal.deployNew"/></a><br />
+ <img src='/console/images/ico_servcomp_16x16.gif' alt=""/><a href="/console/portal/1-5/Server/Web Server"><fmt:message key="welcome.welcomeNormal.webServerPorts"/></a><br />
+ <img src='/console/images/ico_look_16x16.gif' alt=""/><a href="/console/portal/1-1/Server/Information"><fmt:message key="welcome.welcomeNormal.serverInfo"/></a><br />
<br />
</td>
</tr>
Modified: geronimo/server/branches/2.2/plugins/console/console-filter/src/main/java/org/apache/geronimo/console/filter/XSRFHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/console/console-filter/src/main/java/org/apache/geronimo/console/filter/XSRFHandler.java?rev=896846&r1=896845&r2=896846&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/console/console-filter/src/main/java/org/apache/geronimo/console/filter/XSRFHandler.java (original)
+++ geronimo/server/branches/2.2/plugins/console/console-filter/src/main/java/org/apache/geronimo/console/filter/XSRFHandler.java Thu Jan 7 11:05:18 2010
@@ -47,7 +47,8 @@
private static final Logger log = LoggerFactory.getLogger(XSRFHandler.class);
private static final String XSRF_UNIQUEID = "formId";
private static final String XSRF_JS_FILENAME = "/XSRF.js";
- private final static String XSRF_JS_UNIQUEID = "<%XSRF_UNIQUEID%>";
+ private static final String XSRF_JS_UNIQUEID = "<%XSRF_UNIQUEID%>";
+ private static final String NOXSS_SHOW_TREE = "noxssShowTree";
private Map<String, String> sessionMap = Collections.synchronizedMap(new HashMap<String, String>());
private String xsrfJS;
@@ -85,6 +86,14 @@
}
if ((hreq.getQueryString() != null) || (hreq.getParameterNames().hasMoreElements())) {
+
+ if (hreq.getParameterMap().keySet().size() == 1 && hreq.getParameter(NOXSS_SHOW_TREE) != null
+ && hreq.getParameter(NOXSS_SHOW_TREE).equals("true")) {
+
+ return false;
+
+ }
+
String sesId = (String)hses.getAttribute(XSRF_UNIQUEID);
String reqId = (String)hreq.getParameter(XSRF_UNIQUEID);
log.debug("XSRF checking requestURI=" + hreq.getRequestURI());
Modified: geronimo/server/branches/2.2/plugins/console/console-filter/src/main/java/org/apache/geronimo/console/filter/XSSHandler.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/console/console-filter/src/main/java/org/apache/geronimo/console/filter/XSSHandler.java?rev=896846&r1=896845&r2=896846&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/console/console-filter/src/main/java/org/apache/geronimo/console/filter/XSSHandler.java (original)
+++ geronimo/server/branches/2.2/plugins/console/console-filter/src/main/java/org/apache/geronimo/console/filter/XSSHandler.java Thu Jan 7 11:05:18 2010
@@ -70,7 +70,8 @@
String name = e.nextElement();
String name2 = name.trim().toLowerCase();
if (name2.startsWith("noxss")) {
- log.debug("Skipping specially marked paramter=" + name);
+ log.debug("Skipping specially marked parameter=" + name);
+ continue;
}
else if ((name2.startsWith("minxss")) || (name2.indexOf("password") != -1) || (name2.indexOf("xml") != -1) || (name2.indexOf("sql") != -1)) {
// perform a "minimal" but more CPU intensive set of checks on
Modified: geronimo/server/branches/2.2/plugins/console/console-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/console/console-jetty/src/main/plan/plan.xml?rev=896846&r1=896845&r2=896846&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/console/console-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.2/plugins/console/console-jetty/src/main/plan/plan.xml Thu Jan 7 11:05:18 2010
@@ -69,8 +69,8 @@
<name>ConsoleResourceRegistry</name>
</reference>
</gbean>
- <gbean name="Welcome" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Welcome</attribute>
+ <gbean name="Welcome" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+ <attribute name="pageTitle">0/Welcome</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[Welcome]</attribute>
<reference name="PortalContainerServices">
@@ -78,7 +78,7 @@
</reference>
</gbean>
<gbean name="ServerInfo" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Server/Information</attribute>
+ <attribute name="pageTitle">1-1/Server/Information</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[ServerInfo]</attribute>
<attribute name="icon">/images/ico_servinfo_16x16.gif</attribute>
@@ -87,7 +87,7 @@
</reference>
</gbean>
<gbean name="JavaSysInfo" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Server/Java System Info</attribute>
+ <attribute name="pageTitle">1-2/Server/Java System Info</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[JavaSysInfo]</attribute>
<attribute name="icon">/images/ico_info_16x16.gif</attribute>
@@ -96,7 +96,7 @@
</reference>
</gbean>
<gbean name="Logs" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Server/Server Logs</attribute>
+ <attribute name="pageTitle">1-3/Server/Server Logs</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[LogManager, LogViewer, WebAccessLogViewer]</attribute>
<attribute name="icon">/images/ico_look_16x16.gif</attribute>
@@ -105,7 +105,7 @@
</reference>
</gbean>
<gbean name="Shutdown" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Server/Shutdown</attribute>
+ <attribute name="pageTitle">1-4/Server/Shutdown</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[ServerManager]</attribute>
<attribute name="icon">/images/ico_x_16x16.gif</attribute>
@@ -114,7 +114,7 @@
</reference>
</gbean>
<gbean name="WebServer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Server/Web Server</attribute>
+ <attribute name="pageTitle">1-5-1/Server/Http/Web Server</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[WebServerManager, ConnectorManager]</attribute>
<attribute name="icon">/images/ico_webserv_16x16.gif</attribute>
@@ -123,7 +123,7 @@
</reference>
</gbean>
<gbean name="ThreadPool" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Server/Thread Pools</attribute>
+ <attribute name="pageTitle">1-5-2/Server/Http/Thread Pools</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[ThreadPool]</attribute>
<attribute name="icon">/images/ico_threads_16x16.gif</attribute>
@@ -132,7 +132,7 @@
</reference>
</gbean>
<gbean name="ApacheJK" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Server/Apache HTTP</attribute>
+ <attribute name="pageTitle">1-5-3/Server/Http/Apache HTTP</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[ApacheJK]</attribute>
<attribute name="icon">/images/ico_web_16x16.gif</attribute>
@@ -141,7 +141,7 @@
</reference>
</gbean>
<gbean name="Aliases" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Server/JAR Aliases</attribute>
+ <attribute name="pageTitle">1-7/Server/JAR Aliases</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[Artifact]</attribute>
<attribute name="icon">/images/ico_connect_16x16.gif</attribute>
@@ -150,7 +150,7 @@
</reference>
</gbean>
<gbean name="RepositoryViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Services/Repository</attribute>
+ <attribute name="pageTitle">2-1/Services/Repository</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[RepositoryViewer]</attribute>
<attribute name="icon">/images/ico_repo_16x16.gif</attribute>
@@ -159,7 +159,7 @@
</reference>
</gbean>
<gbean name="WARModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Applications/Web App WARs</attribute>
+ <attribute name="pageTitle">3-1/Applications/Web App WARs</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[WARModules]</attribute>
<attribute name="icon">/images/ico_webapp_16x16.gif</attribute>
@@ -168,7 +168,7 @@
</reference>
</gbean>
<gbean name="SystemModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Applications/System Modules</attribute>
+ <attribute name="pageTitle">3-2/Applications/System Modules</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[SystemModules]</attribute>
<attribute name="icon">/images/ico_car_16x16.gif</attribute>
@@ -176,17 +176,17 @@
<name>PlutoPortalServices</name>
</reference>
</gbean>
- <gbean name="EARModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Applications/Application EARs</attribute>
- <attribute name="portletContext">/console-base</attribute>
- <attribute name="portletList">[EARModules]</attribute>
- <attribute name="icon">/images/ico_ear_16x16.gif</attribute>
- <reference name="PortalContainerServices">
- <name>PlutoPortalServices</name>
- </reference>
- </gbean>
+ <gbean name="EARModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+ <attribute name="pageTitle">3-3/Applications/Application EARs</attribute>
+ <attribute name="portletContext">/console-base</attribute>
+ <attribute name="portletList">[EARModules]</attribute>
+ <attribute name="icon">/images/ico_ear_16x16.gif</attribute>
+ <reference name="PortalContainerServices">
+ <name>PlutoPortalServices</name>
+ </reference>
+ </gbean>
<gbean name="EJBModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Applications/EJB JARs</attribute>
+ <attribute name="pageTitle">3-4/Applications/EJB JARs</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[EJBModules]</attribute>
<attribute name="icon">/images/ico_beanjar_16x16.gif</attribute>
@@ -195,7 +195,7 @@
</reference>
</gbean>
<gbean name="RARModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Applications/J2EE Connectors</attribute>
+ <attribute name="pageTitle">3-5/Applications/J2EE Connectors</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[RARModules]</attribute>
<attribute name="icon">/images/ico_connect_16x16.gif</attribute>
@@ -204,7 +204,7 @@
</reference>
</gbean>
<gbean name="ClientModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Applications/App Clients</attribute>
+ <attribute name="pageTitle">3-6/Applications/App Clients</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[ClientModules]</attribute>
<attribute name="icon">/images/ico_jar_16x16.gif</attribute>
@@ -213,7 +213,7 @@
</reference>
</gbean>
<gbean name="UsersGroups" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Security/Users and Groups</attribute>
+ <attribute name="pageTitle">4-1/Security/Users and Groups</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[SEUsers, SEGroups]</attribute>
<attribute name="icon">/images/ico_usergroup_16x16.gif</attribute>
@@ -222,7 +222,7 @@
</reference>
</gbean>
<gbean name="Keystores" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Security/Keystores</attribute>
+ <attribute name="pageTitle">4-2/Security/Keystores</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[Keystores]</attribute>
<attribute name="icon">/images/ico_keystore_16x16.gif</attribute>
@@ -231,7 +231,7 @@
</reference>
</gbean>
<gbean name="CertificationAuthority" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Security/Certificate Authority</attribute>
+ <attribute name="pageTitle">4-3/Security/Certificate Authority</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[CertificationAuthority]</attribute>
<attribute name="icon">/images/ico_cert_16x16.gif</attribute>
Modified: geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/default-theme.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/default-theme.jsp?rev=896846&r1=896845&r2=896846&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/default-theme.jsp (original)
+++ geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/default-theme.jsp Thu Jan 7 11:05:18 2010
@@ -16,85 +16,34 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-<%@ taglib uri="http://portals.apache.org/pluto" prefix="pluto" %>
+
<%@ page language="java" %>
<%@ page contentType="text/html; charset=UTF-8" %>
<%@ page session="true" buffer="none" %>
-<html>
-<%@ include file="./head.jsp" %>
-<body id="admin-console" marginwidth="0" marginheight="0" leftmargin="0" topmargin="0" rightmargin="0">
-
-<!-- start accessibility prolog -->
-<div class="skip"><a href="#left-nav" accesskey="1">Skip to navigation</a></div>
-<div class="skip"><a href="#content" accesskey="2">Skip to main content</a></div>
-<div id="access-info">
- <p class="access" >The access keys for this page are:</p>
- <ul class="access">
- <li>ALT plus 1 skips to navigation.</li>
- <li>ALT plus 2 skips to main content.</li>
- </ul>
-</div>
-<!-- end accessibility prolog -->
-
-<table width="100%" cellpadding="0" cellspacing="0" border="0" id="rootfragment">
+<fmt:setLocale value="<%=request.getLocale()%>"/>
+<fmt:setBundle basename="portaldriver"/>
- <!-- Header -->
- <%@ include file="./banner.jsp" %>
-
- <tr>
- <td>
- <table width="100%" border="0" cellpadding="0" cellspacing="0">
- <!-- Spacer -->
- <tr>
- <td class="Gutter"> </td>
- <td> </td>
- <td class="Gutter"> </td>
- <td> </td>
- <td class="Gutter"> </td>
- </tr>
-
- <!-- Start of Body -->
- <tr>
- <!-- Navigation Column -->
- <td class="Gutter"> </td> <!-- Spacer -->
- <td width="200px" valign="top">
- <div class="Menu" id="left-nav">
- <table width="100%" border="0" cellpadding="0" cellspacing="0">
- <tr>
- <td>
- <!-- Include Navigation.jsp here -->
- <jsp:include page="navigation.jsp"/>
- </td>
- </tr>
- </table>
- </div>
- </td>
-
- <!-- Portlet Section -->
- <td class="Gutter"> </td> <!-- Spacer -->
- <td valign="top">
- <!-- Content block: portlets are divided into two columns/groups -->
- <!--<div id="body-block" style="height:100%">-->
- <div id="content">
- <pluto:isMaximized var="isMax"/>
- <c:forEach var="portlet" varStatus="status" items="${currentPage.portletIds}">
- <c:set var="portlet" value="${portlet}" scope="request"/>
- <jsp:include page="portlet-skin.jsp"/>
- </c:forEach>
- </div>
- <!--</div>-->
- </td>
-
- <td class="Gutter"> </td> <!-- Spacer -->
- <td class="Gutter"> </td> <!-- Spacer -->
- </tr>
- <!-- End of Body -->
- </table>
- </td>
- </tr>
-</table>
-</body>
-</html>
+<head>
+ <title><fmt:message key="console.head.title"/></title>
+ <link rel="stylesheet" href="/dojo/dijit/themes/tundra/tundra.css" type="text/css"/>
+ <link rel="stylesheet" href="<%=request.getContextPath()%>/main.css" type="text/css"/>
+ <link rel="stylesheet" href="<%=request.getContextPath()%>/pluto.css" type="text/css"/>
+ <link rel="stylesheet" href="<%=request.getContextPath()%>/CommonMsg.css" type="text/css"/>
+ <link rel="SHORTCUT ICON" href="<%=request.getContextPath()%>/favicon.ico" type="image/x-icon"/>
+ <script language="Javascript" src="<%=request.getContextPath()%>/js/forms.js" type="text/javascript"></script>
+ <script language="Javascript" src="<%=request.getContextPath()%>/CommonMsg.js" type="text/javascript"></script>
+</head>
+<html>
+<c:choose>
+ <c:when test="${param.noxssShowTree!=null}">
+ <jsp:include page="portlets-with-tree.jsp" />
+ </c:when>
+ <c:otherwise>
+ <jsp:include page="portlets-only.jsp" />
+ </c:otherwise>
+</c:choose>
+</html>
\ No newline at end of file
Modified: geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/navigation.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/navigation.jsp?rev=896846&r1=896845&r2=896846&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/navigation.jsp (original)
+++ geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/navigation.jsp Thu Jan 7 11:05:18 2010
@@ -16,167 +16,157 @@
See the License for the specific language governing permissions and
limitations under the License.
--%>
-<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
-<%@ taglib uri="http://portals.apache.org/pluto" prefix="pluto" %>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c"%>
+<%@ taglib uri="http://portals.apache.org/pluto" prefix="pluto"%>
<%@ taglib uri="http://java.sun.com/jstl/fmt_rt" prefix="fmt"%>
-<fmt:setLocale value="<%=request.getLocale()%>"/>
+<fmt:setLocale value="<%=request.getLocale()%>" />
<fmt:setBundle basename="org.apache.geronimo.console.i18n.ConsoleResource"/>
+<%response.setContentType("text/html; charset=UTF-8");%>
-<%@ page import="java.util.ArrayList,java.util.HashMap,org.apache.geronimo.pluto.impl.PageConfig" %>
-
+<%@ page import="java.util.List,java.util.ArrayList,java.util.HashMap,
+ org.apache.geronimo.pluto.impl.PageConfig,
+ org.apache.geronimo.console.navigation.NavigationJsonGenerator"%>
<%
- //Get everything into the map and ready.
- String delim = "/";
- int delim_len = delim.length();
-
- HashMap<String, ArrayList<PageConfig>> categories = new HashMap<String, ArrayList<PageConfig>>();
- ArrayList<String> catNames = new ArrayList<String>();
- HashMap<String, String> shortNames = new HashMap<String, String>();
- PageConfig welcomePageConfig = null;
- String welcomePageName = "Welcome";
-%>
- <c:forEach var="page" items="${driverConfig.pages}">
+ List<PageConfig> pageConfigList=new ArrayList<PageConfig>();
+%>
+
+<c:forEach var="page" items="${driverConfig.pages}">
<%
- PageConfig pageConfig = (PageConfig)(pageContext.getAttribute("page"));
- String str = pageConfig.getName();
- String cat;
- String pageName;
-
- if(!str.equals(welcomePageName)){
- int index = str.indexOf(delim);
- if(index != -1){
- cat = str.substring(0, index);
- pageName = str.substring(index+delim_len);
- }else{
- cat = "Other";
- pageName = str;
- }
-
- if(categories.get(cat)==null){
- categories.put(cat, new ArrayList<PageConfig>());
- catNames.add(cat);
- }
- categories.get(cat).add(pageConfig);
- shortNames.put(str,pageName);
- }else{
- welcomePageConfig = pageConfig;
- }
+ pageConfigList.add((PageConfig) (pageContext.getAttribute("page")));
%>
- </c:forEach>
+</c:forEach>
+<%
+ NavigationJsonGenerator generator = new NavigationJsonGenerator();
+ String treeJson = generator.generateTreeJSON(pageConfigList, request.getContextPath(), "/images/ico_doc_16x16.gif");
+ String listJson = generator.generateQuickLauncherJSON(pageConfigList, request.getContextPath(), "/images/ico_doc_16x16.gif");
+%>
+<table class="tundra" width="200px" border="0" cellpadding="0" cellspacing="0">
+ <tr>
+ <td CLASS="ReallyDarkBackground"><strong> <fmt:message key="Console Navigation" /></strong></td>
+ </tr>
+ <tr>
+ <td> </td>
+ </tr>
+ <tr>
+ <td> <input id="quickLauncher"></td>
+ </tr>
+ <tr>
+ <td> <div id="navigationTree"></div>
+ </td>
+ </tr>
+</table>
+<div id="links" style="visibility: hidden; width: 0px; height: 0px;">
+<%=generator.generateLinks(pageConfigList, request.getContextPath(), "/images/ico_doc_16x16.gif")%>
+</div>
+
+<script type="text/javascript" src="/dojo/dojo/dojo.js" djConfig="parseOnLoad: true"></script>
+
+<script type="text/javascript">
+
+ dojo.require("dojo.data.ItemFileReadStore");
+ dojo.require("dijit.form.FilteringSelect");
+ dojo.require("dijit.Tree");
+
+ dijit._TreeNode.prototype.setLabelNode = function (label) {
+ this.labelNode.innerHTML = label;
+ };
+
+ var treeData = <%=treeJson%>;
+ var listData = <%=listJson%>;
+
+function load() {
+
+ var listStore= new dojo.data.ItemFileReadStore
+ ({
+ data: {
+ identifier: 'name',
+ label: 'label',
+ items: listData
+ }
+ });
+
+
+ var treeStore = new dojo.data.ItemFileReadStore
+ ({
+ data: {
+ identifier: 'id',
+ label: 'label',
+ items: treeData
+ }
+ });
+
+
+ var treeModel = new dijit.tree.ForestStoreModel({
+ store: treeStore
+ });
+
+ var navigationTree = new dijit.Tree
+ (
+ { model: treeModel,
+ showRoot: false,
+ openOnClick: true,
+ onClick: function(treeNodeItem,treeNode) {
+
+ var anchorNode=treeNode.labelNode.childNodes[2];
-<table width="200px" border="0" cellpadding="0" cellspacing="0">
- <tr><td CLASS="ReallyDarkBackground"><strong> <fmt:message key="Console Navigation"/></strong></td></tr>
- <tr><td><div class="Selection">
- <table width="100%" border="0" cellpadding="0" cellspacing="0">
- <tr>
- <td class="CollapsedLeft"><img src="<%=request.getContextPath()%>/images/spacer.gif" width="1" height="1" alt=""/></td>
- <td class="Indent"><img src="<%=request.getContextPath()%>/images/spacer.gif" width="1" height="1" alt=""/></td>
- <td class="TopMiddle"><img src="<%=request.getContextPath()%>/images/spacer.gif" width="1" height="1" alt=""/></td>
- <td class="CollapsedRight"><img src="<%=request.getContextPath()%>/images/spacer.gif" width="1" height="1" alt=""/></td>
- </tr>
- </table>
- </div></td></tr>
-
- <%
- String pageName;
- if(welcomePageConfig!=null){
- pageContext.setAttribute("page",welcomePageConfig);
- pageName = welcomePageName;
- %>
- <!-- Add the Welcome Link -->
- <c:choose>
- <c:when test="${page == currentPage}">
- <tr><td><div class="SelectedSubselection Selection"></c:when>
- <c:otherwise>
- <tr><td><div class="Selection"></c:otherwise>
- </c:choose>
- <table width="100%" border="0" cellpadding="1" cellspacing="0">
- <tr>
- <td class="CollapsedLeft"> </td>
- <td class="Indent"> </td>
- <td class="TopMiddle">
- <img border="0" src="<%=request.getContextPath()%>/images/ico_geronimo_16x16.gif" alt=""/> <a href='<c:out value="${pageContext.request.contextPath}"/>/portal/<c:out value="${page.name}"/>'><fmt:message key="<%=pageName%>"/></a>
- </td>
- <td class="CollapsedRight"> </td>
- </tr>
- </table>
- </div></td></tr>
- <%}
- %>
-<%
- //generate the output tree
- int catNames_len = catNames.size();
- for(int i=0;i<catNames_len;i++){
- String catName = catNames.get(i);
- pageContext.setAttribute("catName",catName);
- if(request.isUserInRole("admin")||
- (request.isUserInRole("monitor") &&catName.equals("Server"))){
- %>
- <tr><td><div class="Selection">
- <table width="100%" border="0" cellpadding="1" cellspacing="0">
- <tr>
- <td class="CollapsedLeft"> </td>
- <td class="Indent"> </td>
- <td class="TopMiddle">
- <img border="0" src="<%=request.getContextPath()%>/images/ico_folder_16x16.gif" alt=""/> <fmt:message key="<%=catName%>"/>
- </td>
- <td class="CollapsedRight"> </td>
- </tr>
- </table>
- </div></td></tr>
- <%
- }
- ArrayList<PageConfig> list = categories.get(catName);
- int list_len = list.size();
- for(int k=0;k<list_len;k++){
- //System.out.println("\t"+list.get(k));
- PageConfig pageConfig = list.get(k);
- pageContext.setAttribute("page",pageConfig);
- pageName = shortNames.get(pageConfig.getName());
- if(request.isUserInRole("admin")||
- (request.isUserInRole("monitor") &&(pageName.equals("Information")
- ||pageName.equals("Java System Info")
- ||pageName.equals("Thread Pools")
- ||pageName.equals("Monitoring")))){
- String icon = pageConfig.getIcon();
- if (icon == null || icon.trim().length() == 0) {
- icon = "/images/ico_doc_16x16.gif";
- }
- %>
- <c:choose>
- <c:when test="${page == currentPage}">
- <tr><td><div class="SelectedSubselection Subselection"></c:when>
- <c:otherwise>
- <tr><td><div class="Subselection"></c:otherwise>
- </c:choose>
- <table width="100%" border="0" cellpadding="1" cellspacing="0">
- <tr>
- <td class="Left"> </td>
- <td class="Indent"> </td>
- <td class="Middle">
-
- <img border="0" src="<%=request.getContextPath()%><%=icon%>" alt=""/> <a href='<c:out value="${pageContext.request.contextPath}"/>/portal/<c:out value="${page.name}"/>'><fmt:message key="<%=pageName%>"/></a>
- </td>
- <td class="Right"> </td>
- </tr>
- </table>
- </div></td></tr>
- <%
+ if(anchorNode)
+ {
+ displayPortlets(anchorNode);
+ }
}
- }
- }
-%>
- <tr><td><div class="Selection"><table width="100%" border="0" cellpadding="0" cellspacing="0">
- <tr>
- <td class="CollapsedLeft"><img src="<%=request.getContextPath()%>/images/spacer.gif" width="1" height="1" alt=""/></td>
- <td class="Indent"><img src="<%=request.getContextPath()%>/images/spacer.gif" width="1" height="1" alt=""/></td>
- <td class="TopMiddle"><img src="<%=request.getContextPath()%>/images/spacer.gif" width="1" height="1" alt=""/></td>
- <td class="CollapsedRight"><img src="<%=request.getContextPath()%>/images/spacer.gif" width="1" height="1" alt=""/></td>
- </tr>
- </table></div></td></tr>
-</table>
+ },
+ dojo.byId("navigationTree")
+ );
+
+
+ var filterSelect = new dijit.form.FilteringSelect
+ (
+ {
+ id: "quickLauncher",
+ value: "Server Log",
+ store: listStore,
+ searchAttr: "name",
+ name: "quickLauncher",
+ promptMessage: "type and press enter to quick launch",
+ labelAttr: "label",
+ labelType: "html",
+ onKeyPress: function(event){
+ if(event.charCode!=dojo.keys.ENTER) return;
+ quickLaunchPortlets(this.value);
+ },
+ onChange: function(event){
+ quickLaunchPortlets(this.value);
+ }
+ },
+ dojo.byId("quickLauncher")
+ );
+ }
+
+ function quickLaunchPortlets(portalPageName){
+
+ var anchors = dojo.byId("links").getElementsByTagName("a");
+
+ for (var i = 0; i < anchors.length; i++) {
+ anchorName = anchors[i].innerHTML;
+ if ( anchorName == portalPageName) {
+ displayPortlets(anchors[i]);
+ return;
+ }
+ }
+
+ }
+
+ function displayPortlets(anchor){
+ document.getElementById('content').style.display = 'none';
+ document.getElementById("portletsFrame").src = anchor.href+"?formId="+formID;
+ }
+
+
+ dojo.addOnLoad(load);
+
+</script>
Added: geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlets-only.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlets-only.jsp?rev=896846&view=auto
==============================================================================
--- geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlets-only.jsp (added)
+++ geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlets-only.jsp Thu Jan 7 11:05:18 2010
@@ -0,0 +1,32 @@
+<%--
+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.
+--%>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+<%@ taglib uri="http://portals.apache.org/pluto" prefix="pluto" %>
+<body id="portlets" marginwidth="0" marginheight="0" leftmargin="0" topmargin="0" rightmargin="0">
+<!-- Content block: portlets are divided into two columns/groups -->
+<!--<div id="body-block" style="height:100%">-->
+<div id="content"><pluto:isMaximized var="isMax" />
+
+<c:forEach var="portlet" varStatus="status" items="${currentPage.portletIds}">
+ <c:set var="portlet" value="${portlet}" scope="request" />
+ <jsp:include page="portlet-skin.jsp" />
+</c:forEach>
+</div>
+</body>
+
Propchange: geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlets-only.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlets-with-tree.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlets-with-tree.jsp?rev=896846&view=auto
==============================================================================
--- geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlets-with-tree.jsp (added)
+++ geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlets-with-tree.jsp Thu Jan 7 11:05:18 2010
@@ -0,0 +1,113 @@
+<%--
+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.
+--%>
+<%@ taglib uri="http://java.sun.com/jstl/core" prefix="c" %>
+<%@ taglib uri="http://portals.apache.org/pluto" prefix="pluto" %>
+
+<body id="admin-console" marginwidth="0" marginheight="0" leftmargin="0" topmargin="0" rightmargin="0">
+
+<script language="JavaScript">
+
+function autoResize(id){
+ var newheight;
+
+ if(document.getElementById){
+ newheight=document.getElementById(id).contentWindow.document .body.scrollHeight;
+ }
+
+ document.getElementById(id).height= (newheight) + "px";
+
+}
+</script>
+
+<!-- start accessibility prolog -->
+<div class="skip"><a href="#left-nav" accesskey="1">Skip to navigation</a></div>
+<div class="skip"><a href="#content" accesskey="2">Skip to main content</a></div>
+<div id="access-info">
+ <p class="access" >The access keys for this page are:</p>
+ <ul class="access">
+ <li>ALT plus 1 skips to navigation.</li>
+ <li>ALT plus 2 skips to main content.</li>
+ </ul>
+</div>
+<!-- end accessibility prolog -->
+<table width="100%" cellpadding="0" cellspacing="0" border="0" id="rootfragment">
+
+ <!-- Header -->
+ <%@ include file="./banner.jsp" %>
+
+ <tr>
+ <td>
+ <table width="100%" border="0" cellpadding="0" cellspacing="0">
+ <!-- Spacer -->
+ <tr>
+ <td class="Gutter"> </td>
+ <td> </td>
+ <td class="Gutter"> </td>
+ <td> </td>
+ <td class="Gutter"> </td>
+ </tr>
+
+ <!-- Start of Body -->
+ <tr>
+ <!-- Navigation Column -->
+ <td class="Gutter"> </td> <!-- Spacer -->
+ <td width="200px" class="Selection" valign="top">
+ <div id="left-nav">
+ <table width="100%" border="0" cellpadding="0" cellspacing="0">
+ <tr>
+ <td >
+ <!-- Include Navigation.jsp here -->
+ <jsp:include page="navigation.jsp"/>
+ </td>
+ </tr>
+ </table>
+ </div>
+ </td>
+
+ <!-- Portlet Section -->
+ <td class="Gutter"> </td> <!-- Spacer -->
+ <td valign="top">
+
+ <!-- Content block: portlets are divided into two columns/groups -->
+ <!--<div id="body-block" style="height:100%">-->
+ <div id="content">
+ <pluto:isMaximized var="isMax" />
+
+ <c:forEach var="portlet" varStatus="status" items="${currentPage.portletIds}">
+ <c:set var="portlet" value="${portlet}" scope="request" />
+ <jsp:include page="portlet-skin.jsp" />
+ </c:forEach>
+
+ </div>
+
+ <iframe src="" id="portletsFrame" width="100%" height="100%" scrolling="no" frameborder="0" onload='autoResize("portletsFrame")'>
+
+ </iframe>
+ </td>
+
+ <td class="Gutter"> </td> <!-- Spacer -->
+ <td class="Gutter"> </td> <!-- Spacer -->
+ </tr>
+ <!-- End of Body -->
+ </table>
+ </td>
+ </tr>
+</table>
+</body>
+
Propchange: geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/WEB-INF/themes/portlets-with-tree.jsp
------------------------------------------------------------------------------
svn:eol-style = native
Added: geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/images/folderClosed_new.gif
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/images/folderClosed_new.gif?rev=896846&view=auto
==============================================================================
Binary file - no diff available.
Propchange: geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/images/folderClosed_new.gif
------------------------------------------------------------------------------
svn:mime-type = image/gif
Added: geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/images/folderOpened_new.gif
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/images/folderOpened_new.gif?rev=896846&view=auto
==============================================================================
Binary file - no diff available.
Propchange: geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/images/folderOpened_new.gif
------------------------------------------------------------------------------
svn:mime-type = image/gif
Modified: geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/index.jsp?rev=896846&r1=896845&r2=896846&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/index.jsp (original)
+++ geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/index.jsp Thu Jan 7 11:05:18 2010
@@ -18,5 +18,5 @@
--%>
<%
- response.sendRedirect("./portal/Welcome");
+ response.sendRedirect("./portal/0/Welcome?noxssShowTree=true");
%>
Modified: geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/logout.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/logout.jsp?rev=896846&r1=896845&r2=896846&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/logout.jsp (original)
+++ geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/logout.jsp Thu Jan 7 11:05:18 2010
@@ -19,5 +19,5 @@
<%
request.getSession().invalidate();
- response.sendRedirect("./portal/Welcome");
+ response.sendRedirect("./portal/0/Welcome?noxssShowTree=true");
%>
Modified: geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/main.css
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/main.css?rev=896846&r1=896845&r2=896846&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/main.css (original)
+++ geronimo/server/branches/2.2/plugins/console/console-portal-driver/src/main/webapp/main.css Thu Jan 7 11:05:18 2010
@@ -122,147 +122,50 @@
display: none;
}
-.Menu .Selection
+.Selection
{
background-color: #F2F2F2;
font-size: 12px;
font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
}
-.Menu .Selection .CollapsedLeft
-{
- width: 12px;
- height: 12px;
- color: #000000;
- background-color: #F2F2F2;
-}
-
-.Menu .Selection .Indent
-{
- width: 2px;
- background-color: #F2F2F2;
-}
-
-.Menu .Selection .CollapsedRight
-{
- width: 8px;
- height: 12px;
- background-color: #F2F2F2;
-}
-
-.Menu .Selection .TopLeft
-{
- width: 8px;
- height: 16px;
- background-color: #F2F2F2;
-}
-.Menu .Selection .TopMiddle
-{
- color: #000000;
- text-decoration: none;
- background-color: #F2F2F2;
- font-size: 11px;
-}
-
-.Menu .SelectedSubselection .TopMiddle a:link,
-.Menu .SelectedSubselection .TopMiddle a:visited
+.Gutter
{
- color: #000000;
- text-decoration: none;
+ width: 5px;
}
-.Menu .SelectedSubselection .TopMiddle a:hover
-{
- text-decoration: underline;
-}
-.Menu .Selection .TopRight
-{
- width: 8px;
- height: 16px;
- background-color: #F2F2F2;
-}
-
-.Menu .Selection .Spacer
-{
- height: 5px;
-}
+.tundra .dijitLeaf {
-.Menu .Hidden
-{
- visibility: hidden;
+ width: 0px;
height: 0px;
- display: none;
-}
-
-.Menu .Subselection .Left
-{
- width: 12px;
- background-color: #F2F2F2;
-}
-
-.Menu .Subselection .Indent
-{
- width: 2px;
- background-color: #F2F2F2;
-}
-
-.Menu .Subselection .Middle
-{
- font-size: 12px;
- font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
- background-color: #F2F2F2;
- color:#000000;
+
}
-
-.Menu .Subselection .Middle a:hover
-{
- color: #5FA3D6;
+.tundra .dijitFolderOpened {
+ position: relative;
+ left: 4px;
+ background: url('images/folderOpened_new.gif') no-repeat;
}
-
-.Menu .Subselection .Right
-{
- width: 8px;
- background-color: #F2F2F2;
+.tundra .dijitFolderClosed {
+ position: relative;
+ left: 4px;
+ background: url('images/folderClosed_new.gif') no-repeat;
}
-.Menu .Subselection .BottomLeft
-{
- width: 8px;
- height: 8px;
- background-color: #F2F2F2;
-}
-
-.Menu .Subselection .BottomMiddle
-{
- height: 8px;
- background-color: #F2F2F2;
-}
-
-.Menu .Subselection .BottomRight
-{
- width: 8px;
- height: 8px;
- background-color: #F2F2F2;
-}
-
-.Menu .SelectedSubselection .Middle a{
- color: #000;
- text-decoration: none;
-}
-
-.Menu .SelectedSubselection .Middle a:hover{
- color: #000;
- text-decoration: underline;
-}
-
-.Gutter
-{
- width: 5px;
+.tundra .dijitTreeRow {
+ padding-bottom: 3px;
}
+.tundra .dijitTreeContent {
+ position: relative;
+ left: -4px;
+ min-height: 18px;
+ min-width: 18px;
+ }
+
+
.Content .TopLeft
{
width: 18px;
Modified: geronimo/server/branches/2.2/plugins/console/console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/console/console-tomcat/src/main/plan/plan.xml?rev=896846&r1=896845&r2=896846&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/console/console-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.2/plugins/console/console-tomcat/src/main/plan/plan.xml Thu Jan 7 11:05:18 2010
@@ -65,7 +65,7 @@
</reference>
</gbean>
<gbean name="Welcome" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Welcome</attribute>
+ <attribute name="pageTitle">0/Welcome</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[Welcome]</attribute>
<reference name="PortalContainerServices">
@@ -73,7 +73,7 @@
</reference>
</gbean>
<gbean name="ServerInfo" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Server/Information</attribute>
+ <attribute name="pageTitle">1-1/Server/Information</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[ServerInfo]</attribute>
<attribute name="icon">/images/ico_servinfo_16x16.gif</attribute>
@@ -82,7 +82,7 @@
</reference>
</gbean>
<gbean name="JavaSysInfo" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Server/Java System Info</attribute>
+ <attribute name="pageTitle">1-2/Server/Java System Info</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[JavaSysInfo]</attribute>
<attribute name="icon">/images/ico_info_16x16.gif</attribute>
@@ -91,7 +91,7 @@
</reference>
</gbean>
<gbean name="Logs" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Server/Server Logs</attribute>
+ <attribute name="pageTitle">1-3/Server/Server Logs</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[LogManager, LogViewer, WebAccessLogViewer]</attribute>
<attribute name="icon">/images/ico_look_16x16.gif</attribute>
@@ -100,7 +100,7 @@
</reference>
</gbean>
<gbean name="Shutdown" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Server/Shutdown</attribute>
+ <attribute name="pageTitle">1-4/Server/Shutdown</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[ServerManager]</attribute>
<attribute name="icon">/images/ico_x_16x16.gif</attribute>
@@ -109,7 +109,7 @@
</reference>
</gbean>
<gbean name="WebServer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Server/Web Server</attribute>
+ <attribute name="pageTitle">1-5/Server/Web Server</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[WebServerManager, ConnectorManager]</attribute>
<attribute name="icon">/images/ico_webserv_16x16.gif</attribute>
@@ -118,7 +118,7 @@
</reference>
</gbean>
<gbean name="ThreadPool" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Server/Thread Pools</attribute>
+ <attribute name="pageTitle">1-6/Server/Thread Pools</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[ThreadPool]</attribute>
<attribute name="icon">/images/ico_threads_16x16.gif</attribute>
@@ -127,7 +127,7 @@
</reference>
</gbean>
<gbean name="ApacheJK" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Server/Apache HTTP</attribute>
+ <attribute name="pageTitle">1-7/Server/Apache HTTP</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[ApacheJK]</attribute>
<attribute name="icon">/images/ico_web_16x16.gif</attribute>
@@ -136,7 +136,7 @@
</reference>
</gbean>
<gbean name="Aliases" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Server/JAR Aliases</attribute>
+ <attribute name="pageTitle">1-9/Server/JAR Aliases</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[Artifact]</attribute>
<attribute name="icon">/images/ico_connect_16x16.gif</attribute>
@@ -145,7 +145,7 @@
</reference>
</gbean>
<gbean name="RepositoryViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Services/Repository</attribute>
+ <attribute name="pageTitle">2-1/Services/Repository</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[RepositoryViewer]</attribute>
<attribute name="icon">/images/ico_repo_16x16.gif</attribute>
@@ -154,7 +154,7 @@
</reference>
</gbean>
<gbean name="WARModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Applications/Web App WARs</attribute>
+ <attribute name="pageTitle">3-1/Applications/Web App WARs</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[WARModules]</attribute>
<attribute name="icon">/images/ico_webapp_16x16.gif</attribute>
@@ -163,7 +163,7 @@
</reference>
</gbean>
<gbean name="SystemModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Applications/System Modules</attribute>
+ <attribute name="pageTitle">3-2/Applications/System Modules</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[SystemModules]</attribute>
<attribute name="icon">/images/ico_car_16x16.gif</attribute>
@@ -172,7 +172,7 @@
</reference>
</gbean>
<gbean name="EARModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Applications/Application EARs</attribute>
+ <attribute name="pageTitle">3-3/Applications/Application EARs</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[EARModules]</attribute>
<attribute name="icon">/images/ico_ear_16x16.gif</attribute>
@@ -181,7 +181,7 @@
</reference>
</gbean>
<gbean name="EJBModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Applications/EJB JARs</attribute>
+ <attribute name="pageTitle">3-4/Applications/EJB JARs</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[EJBModules]</attribute>
<attribute name="icon">/images/ico_beanjar_16x16.gif</attribute>
@@ -190,7 +190,7 @@
</reference>
</gbean>
<gbean name="RARModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Applications/J2EE Connectors</attribute>
+ <attribute name="pageTitle">3-5/Applications/J2EE Connectors</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[RARModules]</attribute>
<attribute name="icon">/images/ico_connect_16x16.gif</attribute>
@@ -199,7 +199,7 @@
</reference>
</gbean>
<gbean name="ClientModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Applications/App Clients</attribute>
+ <attribute name="pageTitle">3-6/Applications/App Clients</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[ClientModules]</attribute>
<attribute name="icon">/images/ico_jar_16x16.gif</attribute>
@@ -208,7 +208,7 @@
</reference>
</gbean>
<gbean name="UsersGroups" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Security/Users and Groups</attribute>
+ <attribute name="pageTitle">4-1/Security/Users and Groups</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[SEUsers, SEGroups]</attribute>
<attribute name="icon">/images/ico_usergroup_16x16.gif</attribute>
@@ -217,7 +217,7 @@
</reference>
</gbean>
<gbean name="Keystores" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Security/Keystores</attribute>
+ <attribute name="pageTitle">4-2/Security/Keystores</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[Keystores]</attribute>
<attribute name="icon">/images/ico_keystore_16x16.gif</attribute>
@@ -226,7 +226,7 @@
</reference>
</gbean>
<gbean name="CertificationAuthority" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Security/Certificate Authority</attribute>
+ <attribute name="pageTitle">4-3/Security/Certificate Authority</attribute>
<attribute name="portletContext">/console-base</attribute>
<attribute name="portletList">[CertificationAuthority]</attribute>
<attribute name="icon">/images/ico_cert_16x16.gif</attribute>
Modified: geronimo/server/branches/2.2/plugins/console/plugin-console-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/console/plugin-console-jetty/src/main/plan/plan.xml?rev=896846&r1=896845&r2=896846&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/console/plugin-console-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.2/plugins/console/plugin-console-jetty/src/main/plan/plan.xml Thu Jan 7 11:05:18 2010
@@ -41,7 +41,7 @@
<!-- Start off a ACEGBean, this is the lifecycle for the portlet -->
<gbean name="Deployment" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Applications/Deploy New</attribute>
+ <attribute name="pageTitle">3-8/Applications/Deploy New</attribute>
<attribute name="portletContext">/plugin</attribute>
<attribute name="portletList">[Deployment]</attribute>
<attribute name="icon">/images/ico_deploy_16x16.gif</attribute>
@@ -50,7 +50,7 @@
</reference>
</gbean>
<gbean name="PluginManagement" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Applications/Plugins</attribute>
+ <attribute name="pageTitle">3-9/Applications/Plugins</attribute>
<attribute name="portletContext">/plugin</attribute>
<attribute name="portletList">[ImportExport, CreatePlugin, AssembleServer]</attribute>
<attribute name="icon">/images/ico_plugin_16x16.gif</attribute>
@@ -58,9 +58,9 @@
<name>PlutoPortalServices</name>
</reference>
</gbean>
-
+
<gbean name="RealmWizard" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Security/Security Realms</attribute>
+ <attribute name="pageTitle">4-4/Security/Security Realms</attribute>
<attribute name="portletContext">/plugin</attribute>
<attribute name="portletList">[RealmWizard]</attribute>
<attribute name="icon">/images/ico_secrealm_16x16.gif</attribute>
Modified: geronimo/server/branches/2.2/plugins/console/plugin-console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/console/plugin-console-tomcat/src/main/plan/plan.xml?rev=896846&r1=896845&r2=896846&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/console/plugin-console-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.2/plugins/console/plugin-console-tomcat/src/main/plan/plan.xml Thu Jan 7 11:05:18 2010
@@ -41,7 +41,7 @@
<!-- Start off a ACEGBean, this is the lifecycle for the portlet -->
<gbean name="Deployment" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Applications/Deploy New</attribute>
+ <attribute name="pageTitle">3-8/Applications/Deploy New</attribute>
<attribute name="portletContext">/plugin</attribute>
<attribute name="portletList">[Deployment]</attribute>
<attribute name="icon">/images/ico_deploy_16x16.gif</attribute>
@@ -50,7 +50,7 @@
</reference>
</gbean>
<gbean name="PluginManagement" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Applications/Plugins</attribute>
+ <attribute name="pageTitle">3-9/Applications/Plugins</attribute>
<attribute name="portletContext">/plugin</attribute>
<attribute name="portletList">[ImportExport, CreatePlugin, AssembleServer]</attribute>
<attribute name="icon">/images/ico_plugin_16x16.gif</attribute>
@@ -60,7 +60,7 @@
</gbean>
<gbean name="RealmWizard" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Security/Security Realms</attribute>
+ <attribute name="pageTitle">4-4/Security/Security Realms</attribute>
<attribute name="portletContext">/plugin</attribute>
<attribute name="portletList">[RealmWizard]</attribute>
<attribute name="icon">/images/ico_secrealm_16x16.gif</attribute>
Modified: geronimo/server/branches/2.2/plugins/debugviews/debugviews-console-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/debugviews/debugviews-console-jetty/src/main/plan/plan.xml?rev=896846&r1=896845&r2=896846&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/debugviews/debugviews-console-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.2/plugins/debugviews/debugviews-console-jetty/src/main/plan/plan.xml Thu Jan 7 11:05:18 2010
@@ -37,8 +37,8 @@
</reference>
</gbean>
- <gbean name="JMXViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Debug Views/JMX Viewer</attribute>
+ <gbean name="JMXViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+ <attribute name="pageTitle">5-1/Debug Views/JMX Viewer</attribute>
<attribute name="portletContext">/debug-views</attribute>
<attribute name="portletList">[JMXViewer]</attribute>
<attribute name="icon">/images/ico_viewer_16x16.gif</attribute>
@@ -48,7 +48,7 @@
</gbean>
<gbean name="LDAPViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Debug Views/LDAP Viewer</attribute>
+ <attribute name="pageTitle">5-2/Debug Views/LDAP Viewer</attribute>
<attribute name="portletContext">/debug-views</attribute>
<attribute name="portletList">[LDAPViewer]</attribute>
<attribute name="icon">/images/ico_viewer_16x16.gif</attribute>
@@ -58,7 +58,7 @@
</gbean>
<gbean name="ClassLoaderViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Debug Views/ClassLoader Viewer</attribute>
+ <attribute name="pageTitle">5-3/Debug Views/ClassLoader Viewer</attribute>
<attribute name="portletContext">/debug-views</attribute>
<attribute name="portletList">[ClassLoaderViewer]</attribute>
<attribute name="icon">/images/ico_viewer_16x16.gif</attribute>
@@ -68,7 +68,7 @@
</gbean>
<gbean name="JNDIViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Debug Views/JNDI Viewer</attribute>
+ <attribute name="pageTitle">5-4/Debug Views/JNDI Viewer</attribute>
<attribute name="portletContext">/debug-views</attribute>
<attribute name="portletList">[JNDIViewer]</attribute>
<attribute name="icon">/images/ico_viewer_16x16.gif</attribute>
@@ -78,7 +78,7 @@
</gbean>
<gbean name="DependencyViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Debug Views/Dependency Viewer</attribute>
+ <attribute name="pageTitle">5-5/Debug Views/Dependency Viewer</attribute>
<attribute name="portletContext">/debug-views</attribute>
<attribute name="portletList">[DependencyViewer]</attribute>
<attribute name="icon">/images/ico_viewer_16x16.gif</attribute>
Modified: geronimo/server/branches/2.2/plugins/debugviews/debugviews-console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/debugviews/debugviews-console-tomcat/src/main/plan/plan.xml?rev=896846&r1=896845&r2=896846&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/debugviews/debugviews-console-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.2/plugins/debugviews/debugviews-console-tomcat/src/main/plan/plan.xml Thu Jan 7 11:05:18 2010
@@ -39,7 +39,7 @@
</gbean>
<gbean name="JMXViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Debug Views/JMX Viewer</attribute>
+ <attribute name="pageTitle">5-1/Debug Views/JMX Viewer</attribute>
<attribute name="portletContext">/debug-views</attribute>
<attribute name="portletList">[JMXViewer]</attribute>
<attribute name="icon">/images/ico_viewer_16x16.gif</attribute>
@@ -49,7 +49,7 @@
</gbean>
<gbean name="LDAPViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Debug Views/LDAP Viewer</attribute>
+ <attribute name="pageTitle">5-2/Debug Views/LDAP Viewer</attribute>
<attribute name="portletContext">/debug-views</attribute>
<attribute name="portletList">[LDAPViewer]</attribute>
<attribute name="icon">/images/ico_viewer_16x16.gif</attribute>
@@ -59,7 +59,7 @@
</gbean>
<gbean name="ClassLoaderViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Debug Views/ClassLoader Viewer</attribute>
+ <attribute name="pageTitle">5-3/Debug Views/ClassLoader Viewer</attribute>
<attribute name="portletContext">/debug-views</attribute>
<attribute name="portletList">[ClassLoaderViewer]</attribute>
<attribute name="icon">/images/ico_viewer_16x16.gif</attribute>
@@ -69,7 +69,7 @@
</gbean>
<gbean name="JNDIViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Debug Views/JNDI Viewer</attribute>
+ <attribute name="pageTitle">5-4/Debug Views/JNDI Viewer</attribute>
<attribute name="portletContext">/debug-views</attribute>
<attribute name="portletList">[JNDIViewer]</attribute>
<attribute name="icon">/images/ico_viewer_16x16.gif</attribute>
@@ -79,7 +79,7 @@
</gbean>
<gbean name="DependencyViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Debug Views/Dependency Viewer</attribute>
+ <attribute name="pageTitle">5-5/Debug Views/Dependency Viewer</attribute>
<attribute name="portletContext">/debug-views</attribute>
<attribute name="portletList">[DependencyViewer]</attribute>
<attribute name="icon">/images/ico_viewer_16x16.gif</attribute>
Modified: geronimo/server/branches/2.2/plugins/monitoring/mconsole-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/monitoring/mconsole-jetty/src/main/plan/plan.xml?rev=896846&r1=896845&r2=896846&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/monitoring/mconsole-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.2/plugins/monitoring/mconsole-jetty/src/main/plan/plan.xml Thu Jan 7 11:05:18 2010
@@ -39,7 +39,7 @@
</gbean>
<gbean name="MonitoringPortlet" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Server/Monitoring</attribute>
+ <attribute name="pageTitle">1-8/Server/Monitoring</attribute>
<attribute name="portletContext">/monitoring</attribute>
<attribute name="portletList">[monitoring]</attribute>
<attribute name="icon">/images/ico_monitor_16x16.gif</attribute>
Modified: geronimo/server/branches/2.2/plugins/monitoring/mconsole-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/monitoring/mconsole-tomcat/src/main/plan/plan.xml?rev=896846&r1=896845&r2=896846&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/monitoring/mconsole-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.2/plugins/monitoring/mconsole-tomcat/src/main/plan/plan.xml Thu Jan 7 11:05:18 2010
@@ -39,7 +39,7 @@
</gbean>
<gbean name="MonitoringPortlet" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Server/Monitoring</attribute>
+ <attribute name="pageTitle">1-8/Server/Monitoring</attribute>
<attribute name="portletContext">/monitoring</attribute>
<attribute name="portletList">[monitoring]</attribute>
<attribute name="icon">/images/ico_monitor_16x16.gif</attribute>
Modified: geronimo/server/branches/2.2/plugins/openejb/openejb-console-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/openejb/openejb-console-jetty/src/main/plan/plan.xml?rev=896846&r1=896845&r2=896846&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/openejb/openejb-console-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.2/plugins/openejb/openejb-console-jetty/src/main/plan/plan.xml Thu Jan 7 11:05:18 2010
@@ -39,7 +39,7 @@
<!-- Start off a ACEGBean, this is the lifecycle for the portlet -->
<gbean name="EJBServerACEGBean" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Server/EJB Server</attribute>
+ <attribute name="pageTitle">1-11/Server/EJB Server</attribute>
<attribute name="portletContext">/openejb-server</attribute>
<attribute name="portletList">[EJBServerPortlet]</attribute>
<attribute name="icon">/images/ico_beanjar_16x16.gif</attribute>
Modified: geronimo/server/branches/2.2/plugins/openejb/openejb-console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/openejb/openejb-console-tomcat/src/main/plan/plan.xml?rev=896846&r1=896845&r2=896846&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/openejb/openejb-console-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.2/plugins/openejb/openejb-console-tomcat/src/main/plan/plan.xml Thu Jan 7 11:05:18 2010
@@ -42,7 +42,7 @@
<!-- Start off a ACEGBean, this is the lifecycle for the portlet -->
<gbean name="EJBServerACEGBean" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Server/EJB Server</attribute>
+ <attribute name="pageTitle">1-11/Server/EJB Server</attribute>
<attribute name="portletContext">/openejb-server</attribute>
<attribute name="portletList">[EJBServerPortlet]</attribute>
<attribute name="icon">/images/ico_beanjar_16x16.gif</attribute>
Modified: geronimo/server/branches/2.2/plugins/plancreator/plancreator-console-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/plancreator/plancreator-console-jetty/src/main/plan/plan.xml?rev=896846&r1=896845&r2=896846&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/plancreator/plancreator-console-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.2/plugins/plancreator/plancreator-console-jetty/src/main/plan/plan.xml Thu Jan 7 11:05:18 2010
@@ -39,7 +39,7 @@
<!-- Start off a ACEGBean, this is the lifecycle for the portlet -->
<gbean name="PlanCreator" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Applications/Plan Creator</attribute>
+ <attribute name="pageTitle">3-7/Applications/Plan Creator</attribute>
<attribute name="portletContext">/plan-creator</attribute>
<attribute name="portletList">[PlanCreator]</attribute>
<attribute name="icon">/images/ico_xml_16x16.gif</attribute>
Modified: geronimo/server/branches/2.2/plugins/plancreator/plancreator-console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/plancreator/plancreator-console-tomcat/src/main/plan/plan.xml?rev=896846&r1=896845&r2=896846&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/plancreator/plancreator-console-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.2/plugins/plancreator/plancreator-console-tomcat/src/main/plan/plan.xml Thu Jan 7 11:05:18 2010
@@ -42,7 +42,7 @@
<!-- Start off a ACEGBean, this is the lifecycle for the portlet -->
<gbean name="PlanCreator" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Applications/Plan Creator</attribute>
+ <attribute name="pageTitle">3-7/Applications/Plan Creator</attribute>
<attribute name="portletContext">/plan-creator</attribute>
<attribute name="portletList">[PlanCreator]</attribute>
<attribute name="icon">/images/ico_xml_16x16.gif</attribute>
Modified: geronimo/server/branches/2.2/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml?rev=896846&r1=896845&r2=896846&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.2/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml Thu Jan 7 11:05:18 2010
@@ -38,7 +38,7 @@
</gbean>
<gbean name="DBWizard" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Services/Database Pools</attribute>
+ <attribute name="pageTitle">2-3/Services/Database Pools</attribute>
<attribute name="portletContext">/system-database</attribute>
<attribute name="portletList">[DBWizard,RunSQLDS]</attribute>
<attribute name="icon">/images/ico_db_16x16.gif</attribute>
@@ -48,7 +48,7 @@
</gbean>
<gbean name="InternalDB" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Embedded DB/DB Info</attribute>
+ <attribute name="pageTitle">6-1/Embedded DB/DB Info</attribute>
<attribute name="portletContext">/system-database</attribute>
<attribute name="portletList">[InternalDB]</attribute>
<attribute name="icon">/images/ico_dbinfo_16x16.gif</attribute>
@@ -58,7 +58,7 @@
</gbean>
<gbean name="DBViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Embedded DB/DB Manager</attribute>
+ <attribute name="pageTitle">6-2/Embedded DB/DB Manager</attribute>
<attribute name="portletContext">/system-database</attribute>
<attribute name="portletList">[DBViewer,RunSQL]</attribute>
<attribute name="icon">/images/ico_dbmgr_16x16.gif</attribute>
@@ -68,7 +68,7 @@
</gbean>
<gbean name="DerbyLogViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Server/Server Logs</attribute>
+ <attribute name="pageTitle">6-3/Embedded DB/Derby Logs</attribute>
<attribute name="portletContext">/system-database</attribute>
<attribute name="portletList">[DerbyLogViewer]</attribute>
<attribute name="icon">/images/ico_look_16x16.gif</attribute>
Modified: geronimo/server/branches/2.2/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml?rev=896846&r1=896845&r2=896846&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.2/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml Thu Jan 7 11:05:18 2010
@@ -39,7 +39,7 @@
</gbean>
<gbean name="DBWizard" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Services/Database Pools</attribute>
+ <attribute name="pageTitle">2-3/Services/Database Pools</attribute>
<attribute name="portletContext">/system-database</attribute>
<attribute name="portletList">[DBWizard,RunSQLDS]</attribute>
<attribute name="icon">/images/ico_db_16x16.gif</attribute>
@@ -49,7 +49,7 @@
</gbean>
<gbean name="InternalDB" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Embedded DB/DB Info</attribute>
+ <attribute name="pageTitle">6-1/Embedded DB/DB Info</attribute>
<attribute name="portletContext">/system-database</attribute>
<attribute name="portletList">[InternalDB]</attribute>
<attribute name="icon">/images/ico_dbinfo_16x16.gif</attribute>
@@ -59,7 +59,7 @@
</gbean>
<gbean name="DBViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Embedded DB/DB Manager</attribute>
+ <attribute name="pageTitle">6-2/Embedded DB/DB Manager</attribute>
<attribute name="portletContext">/system-database</attribute>
<attribute name="portletList">[DBViewer,RunSQL]</attribute>
<attribute name="icon">/images/ico_dbmgr_16x16.gif</attribute>
@@ -69,7 +69,7 @@
</gbean>
<gbean name="DerbyLogViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
- <attribute name="pageTitle">Server/Server Logs</attribute>
+ <attribute name="pageTitle">6-3/Embedded DB/Derby Logs</attribute>
<attribute name="portletContext">/system-database</attribute>
<attribute name="portletList">[DerbyLogViewer]</attribute>
<attribute name="icon">/images/ico_look_16x16.gif</attribute>