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/08/24 06:54:34 UTC

svn commit: r988385 - in /geronimo/server/trunk/plugins: activemq/activemq-console-jetty/src/main/plan/ activemq/activemq-console-tomcat/src/main/plan/ console/console-jetty/src/main/plan/ console/console-portal-driver/src/main/webapp/ console/console-...

Author: genspring
Date: Tue Aug 24 04:54:34 2010
New Revision: 988385

URL: http://svn.apache.org/viewvc?rev=988385&view=rev
Log:
GERONIMO-4950 Improve usability of Geronimo Console, thanks Chi Runhua for the patch !

Modified:
    geronimo/server/trunk/plugins/activemq/activemq-console-jetty/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/console/console-jetty/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/main.css
    geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/console/plugin-console-jetty/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/console/plugin-console-tomcat/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/debugviews/debugviews-console-tomcat/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/openejb/openejb-console-jetty/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/plancreator/plancreator-console-jetty/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml

Modified: geronimo/server/trunk/plugins/activemq/activemq-console-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-console-jetty/src/main/plan/plan.xml?rev=988385&r1=988384&r2=988385&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-console-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-console-jetty/src/main/plan/plan.xml Tue Aug 24 04:54:34 2010
@@ -38,7 +38,7 @@ limitations under the License.
     </gbean>
     
     <gbean name="JMSServerManager" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-        <attribute name="pageTitle">1-10/Server/JMS Server</attribute>
+        <attribute name="pageTitle">1-3/Application 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 @@ limitations under the License.
     </gbean>
 
     <gbean name="JMSWizard" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-        <attribute name="pageTitle">2-2/Services/JMS Resources</attribute>
+        <attribute name="pageTitle">3-2/Resources/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/trunk/plugins/activemq/activemq-console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/src/main/plan/plan.xml?rev=988385&r1=988384&r2=988385&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-console-tomcat/src/main/plan/plan.xml Tue Aug 24 04:54:34 2010
@@ -39,7 +39,7 @@ limitations under the License.
     </gbean>
     
     <gbean name="JMSServerManager" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-        <attribute name="pageTitle">1-10/Server/JMS Server</attribute>
+        <attribute name="pageTitle">1-3/Application 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 @@ limitations under the License.
     </gbean>
     
     <gbean name="JMSWizard" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-        <attribute name="pageTitle">2-2/Services/JMS Resources</attribute>
+        <attribute name="pageTitle">3-2/Resources/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/trunk/plugins/console/console-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-jetty/src/main/plan/plan.xml?rev=988385&r1=988384&r2=988385&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/console/console-jetty/src/main/plan/plan.xml Tue Aug 24 04:54:34 2010
@@ -78,7 +78,7 @@
                 </reference>
             </gbean>
             <gbean name="ServerInfo" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-                <attribute name="pageTitle">1-1/Server/Information</attribute>
+                <attribute name="pageTitle">1-1-1/Application Server/System Information/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">1-2/Server/Java System Info</attribute>
+                <attribute name="pageTitle">1-1-2/Application Server/System Information/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">1-3/Server/Server Logs</attribute>
+                <attribute name="pageTitle">5-2-2/Monitoring and Troubleshooting/Logs/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">1-4/Server/Shutdown</attribute>
+                <attribute name="pageTitle">1-6/Application 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">1-5/Server/Web Server</attribute>
+                <attribute name="pageTitle">1-2/Application 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>
@@ -123,7 +123,7 @@
                 </reference>
             </gbean>
             <gbean name="ThreadPool" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-                <attribute name="pageTitle">1-6/Server/Thread Pools</attribute>
+                <attribute name="pageTitle">1-1-4/Application Server/System Information/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">1-7/Server/Apache HTTP</attribute>
+                <attribute name="pageTitle">3-6/Resources/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">1-9/Server/JAR Aliases</attribute>
+                <attribute name="pageTitle">3-4/Resources/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">2-1/Services/Repository</attribute>
+                <attribute name="pageTitle">23-5/Resources/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">3-1/Applications/Web App WARs</attribute>
+                <attribute name="pageTitle">2-2-1/Applications/User Assets/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">3-2/Applications/System Modules</attribute>
+                <attribute name="pageTitle">3-7/Resources/System Modules</attribute>
                 <attribute name="portletContext">/console-base</attribute>
                 <attribute name="portletList">[SystemModules]</attribute>
                 <attribute name="icon">/images/ico_car_16x16.gif</attribute>
@@ -177,7 +177,7 @@
                 </reference>
             </gbean>
              <gbean name="EARModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-                 <attribute name="pageTitle">3-3/Applications/Application EARs</attribute>
+                 <attribute name="pageTitle">2-2-2/Applications/User Assets/Application EARs</attribute>
                  <attribute name="portletContext">/console-base</attribute>
                  <attribute name="portletList">[EARModules]</attribute>
                  <attribute name="icon">/images/ico_ear_16x16.gif</attribute>
@@ -186,7 +186,7 @@
                  </reference>
              </gbean>
             <gbean name="EJBModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-                <attribute name="pageTitle">3-4/Applications/EJB JARs</attribute>
+                <attribute name="pageTitle">2-2-3/Applications/User Assets/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">3-5/Applications/J2EE Connectors</attribute>
+                <attribute name="pageTitle">3-3/Resources/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">3-6/Applications/App Clients</attribute>
+                <attribute name="pageTitle">2-2-4/Applications/User Assets/App Clients</attribute>
                 <attribute name="portletContext">/console-base</attribute>
                 <attribute name="portletList">[ClientModules]</attribute>
                 <attribute name="icon">/images/ico_jar_16x16.gif</attribute>

Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/main.css
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/main.css?rev=988385&r1=988384&r2=988385&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/main.css (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/webapp/main.css Tue Aug 24 04:54:34 2010
@@ -143,15 +143,22 @@ a:hover 
 
 .tundra .dijitFolderOpened {
     background: url('images/folderOpened_new.gif') no-repeat;
+    display: none;
 }
 .tundra .dijitFolderClosed {
     background: url('images/folderClosed_new.gif') no-repeat;
+    display: none;
 }
 
 .tundra .dijitTreeRow {	
     padding-bottom: 3px;
 }
 
+.tundra .dijitTreeIcon {
+    display: none;
+    height: 16px;
+    width: 16px;
+}
  
 .Content .TopLeft
 {

Modified: geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml?rev=988385&r1=988384&r2=988385&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml Tue Aug 24 04:54:34 2010
@@ -73,7 +73,7 @@
                 </reference>
             </gbean>
             <gbean name="ServerInfo" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-                <attribute name="pageTitle">1-1/Server/Information</attribute>
+                <attribute name="pageTitle">1-1-1/Application Server/System Information/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">1-2/Server/Java System Info</attribute>
+                <attribute name="pageTitle">1-1-2/Application Server/System Information/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">1-3/Server/Server Logs</attribute>
+                <attribute name="pageTitle">5-2-2/Monitoring and Troubleshooting/Logs/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">1-4/Server/Shutdown</attribute>
+                <attribute name="pageTitle">1-6/Application 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">1-5/Server/Web Server</attribute>
+                <attribute name="pageTitle">1-2/Application 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">1-6/Server/Thread Pools</attribute>
+                <attribute name="pageTitle">1-1-4/Application Server/System Information/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">1-7/Server/Apache HTTP</attribute>
+                <attribute name="pageTitle">3-6/Resources/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">1-9/Server/JAR Aliases</attribute>
+                <attribute name="pageTitle">3-4/Resources/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">2-1/Services/Repository</attribute>
+                <attribute name="pageTitle">3-5/Resources/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">3-1/Applications/Web App WARs</attribute>
+                <attribute name="pageTitle">2-2-1/Applications/User Assets/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">3-2/Applications/System Modules</attribute>
+                <attribute name="pageTitle">3-7/Resources/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">3-3/Applications/Application EARs</attribute>
+                 <attribute name="pageTitle">2-2-2/Applications/User Assets/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">3-4/Applications/EJB JARs</attribute>
+                <attribute name="pageTitle">2-2-3/Applications/User Assets/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">3-5/Applications/J2EE Connectors</attribute>
+                <attribute name="pageTitle">3-3/Resources/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">3-6/Applications/App Clients</attribute>
+                <attribute name="pageTitle">2-2-4/Applications/User Assets/App Clients</attribute>
                 <attribute name="portletContext">/console-base</attribute>
                 <attribute name="portletList">[ClientModules]</attribute>
                 <attribute name="icon">/images/ico_jar_16x16.gif</attribute>

Modified: geronimo/server/trunk/plugins/console/plugin-console-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-console-jetty/src/main/plan/plan.xml?rev=988385&r1=988384&r2=988385&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-console-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/console/plugin-console-jetty/src/main/plan/plan.xml Tue Aug 24 04:54:34 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">3-8/Applications/Deploy New</attribute>
+        <attribute name="pageTitle">2-3/Applications/Deployer</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">3-9/Applications/Plugins</attribute>
+        <attribute name="pageTitle">3-7/Resources/Plugins</attribute>
         <attribute name="portletContext">/plugin</attribute>
         <attribute name="portletList">[ImportExport, CreatePlugin, AssembleServer]</attribute>
         <attribute name="icon">/images/ico_plugin_16x16.gif</attribute>

Modified: geronimo/server/trunk/plugins/console/plugin-console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/plugin-console-tomcat/src/main/plan/plan.xml?rev=988385&r1=988384&r2=988385&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/plugin-console-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/console/plugin-console-tomcat/src/main/plan/plan.xml Tue Aug 24 04:54:34 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">3-8/Applications/Deploy New</attribute>
+        <attribute name="pageTitle">2-1/Applications/Deployer</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">3-9/Applications/Plugins</attribute>
+        <attribute name="pageTitle">3-7/Resources/Plugins</attribute>
         <attribute name="portletContext">/plugin</attribute>
         <attribute name="portletList">[ImportExport, CreatePlugin, AssembleServer]</attribute>
         <attribute name="icon">/images/ico_plugin_16x16.gif</attribute>

Modified: geronimo/server/trunk/plugins/debugviews/debugviews-console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-console-tomcat/src/main/plan/plan.xml?rev=988385&r1=988384&r2=988385&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-console-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-console-tomcat/src/main/plan/plan.xml Tue Aug 24 04:54:34 2010
@@ -39,7 +39,7 @@ limitations under the License.
     </gbean>
 
     <gbean name="JMXViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-        <attribute name="pageTitle">5-1/Debug Views/JMX Viewer</attribute>
+        <attribute name="pageTitle">5-3-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 @@ limitations under the License.
     </gbean>
 
     <gbean name="LDAPViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-        <attribute name="pageTitle">5-2/Debug Views/LDAP Viewer</attribute>
+        <attribute name="pageTitle">5-3-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 @@ limitations under the License.
     </gbean>
 
     <gbean name="ClassLoaderViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-        <attribute name="pageTitle">5-3/Debug Views/ClassLoader Viewer</attribute>
+        <attribute name="pageTitle">5-3-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 @@ limitations under the License.
     </gbean>
 
     <gbean name="JNDIViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-        <attribute name="pageTitle">5-4/Debug Views/JNDI Viewer</attribute>
+        <attribute name="pageTitle">5-3-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 @@ limitations under the License.
     </gbean>
 
     <gbean name="DependencyViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-        <attribute name="pageTitle">5-5/Debug Views/Dependency Viewer</attribute>
+        <attribute name="pageTitle">5-3-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/trunk/plugins/monitoring/mconsole-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/src/main/plan/plan.xml?rev=988385&r1=988384&r2=988385&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/src/main/plan/plan.xml Tue Aug 24 04:54:34 2010
@@ -39,7 +39,7 @@
     </gbean>
     
     <gbean name="MonitoringPortlet" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-        <attribute name="pageTitle">1-8/Server/Monitoring</attribute>
+        <attribute name="pageTitle">5-1/Monitoring and Troubleshooting/Monitoring</attribute>
         <attribute name="portletContext">/monitoring</attribute>
         <attribute name="portletList">[monitoring]</attribute>
         <attribute name="icon">/images/ico_monitor_16x16.gif</attribute>

Modified: geronimo/server/trunk/plugins/openejb/openejb-console-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-console-jetty/src/main/plan/plan.xml?rev=988385&r1=988384&r2=988385&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-console-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-console-jetty/src/main/plan/plan.xml Tue Aug 24 04:54:34 2010
@@ -39,7 +39,7 @@ limitations under the License.
     
     <!-- Start off a ACEGBean, this is the lifecycle for the portlet -->
     <gbean name="EJBServerACEGBean" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-        <attribute name="pageTitle">1-11/Server/EJB Server</attribute>
+        <attribute name="pageTitle">1-4/Application 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/trunk/plugins/openejb/openejb-console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/src/main/plan/plan.xml?rev=988385&r1=988384&r2=988385&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb-console-tomcat/src/main/plan/plan.xml Tue Aug 24 04:54:34 2010
@@ -42,7 +42,7 @@ limitations under the License.
     
     <!-- Start off a ACEGBean, this is the lifecycle for the portlet -->
     <gbean name="EJBServerACEGBean" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-        <attribute name="pageTitle">1-11/Server/EJB Server</attribute>
+        <attribute name="pageTitle">1-4/Application 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/trunk/plugins/plancreator/plancreator-console-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-console-jetty/src/main/plan/plan.xml?rev=988385&r1=988384&r2=988385&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-console-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-console-jetty/src/main/plan/plan.xml Tue Aug 24 04:54:34 2010
@@ -39,7 +39,7 @@ limitations under the License.
 
     <!-- Start off a ACEGBean, this is the lifecycle for the portlet -->
     <gbean name="PlanCreator" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-        <attribute name="pageTitle">3-7/Applications/Plan Creator</attribute>
+        <attribute name="pageTitle">2-3/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/trunk/plugins/plancreator/plancreator-console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/src/main/plan/plan.xml?rev=988385&r1=988384&r2=988385&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-console-tomcat/src/main/plan/plan.xml Tue Aug 24 04:54:34 2010
@@ -42,7 +42,7 @@ limitations under the License.
     
     <!-- Start off a ACEGBean, this is the lifecycle for the portlet -->
     <gbean name="PlanCreator" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-        <attribute name="pageTitle">3-7/Applications/Plan Creator</attribute>
+        <attribute name="pageTitle">2-3/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/trunk/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml?rev=988385&r1=988384&r2=988385&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-console-jetty/src/main/plan/plan.xml Tue Aug 24 04:54:34 2010
@@ -38,7 +38,7 @@ limitations under the License.
     </gbean>
     
     <gbean name="DBWizard" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-        <attribute name="pageTitle">2-3/Services/Database Pools</attribute>
+        <attribute name="pageTitle">3-1/Resources/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 @@ limitations under the License.
     </gbean>
 
     <gbean name="InternalDB" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-        <attribute name="pageTitle">6-1/Embedded DB/DB Info</attribute>
+        <attribute name="pageTitle">1-5-1/Application Server/Derby Server/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 @@ limitations under the License.
     </gbean>
 
     <gbean name="DBViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-        <attribute name="pageTitle">6-2/Embedded DB/DB Manager</attribute>
+        <attribute name="pageTitle">1-5-2/Application Server/Derby Server/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 @@ limitations under the License.
     </gbean>
 
     <gbean name="DerbyLogViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-        <attribute name="pageTitle">6-3/Embedded DB/Derby Logs</attribute>
+        <attribute name="pageTitle">5-2-2/Monitoring and Troubleshooting/Logs/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/trunk/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml?rev=988385&r1=988384&r2=988385&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/system-database/sysdb-console-tomcat/src/main/plan/plan.xml Tue Aug 24 04:54:34 2010
@@ -39,7 +39,7 @@ limitations under the License.
     </gbean>
     
     <gbean name="DBWizard" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-        <attribute name="pageTitle">2-3/Services/Database Pools</attribute>
+        <attribute name="pageTitle">3-1/Resources/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 @@ limitations under the License.
     </gbean>
 
     <gbean name="InternalDB" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-        <attribute name="pageTitle">6-1/Embedded DB/DB Info</attribute>
+        <attribute name="pageTitle">1-5-1/Application Server/Derby Server/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 @@ limitations under the License.
     </gbean>
 
     <gbean name="DBViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-        <attribute name="pageTitle">6-2/Embedded DB/DB Manager</attribute>
+        <attribute name="pageTitle">1-5-2/Application Server/Derby Server/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 @@ limitations under the License.
     </gbean>
 
     <gbean name="DerbyLogViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-        <attribute name="pageTitle">6-3/Embedded DB/Derby Logs</attribute>
+        <attribute name="pageTitle">5-2-2/Monitoring and Troubleshooting/Logs/Derby Logs</attribute>
         <attribute name="portletContext">/system-database</attribute>
         <attribute name="portletList">[DerbyLogViewer]</attribute>
         <attribute name="icon">/images/ico_look_16x16.gif</attribute>