Author: gawor
Date: Wed Feb 23 06:46:56 2011
New Revision: 1073619

URL: http://svn.apache.org/viewvc?rev=1073619&view=rev
Log:
(somewhat) consistent application portlet naming, titles, icons and synch things between tomcat & jetty

Modified:
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml
    geronimo/server/trunk/plugins/console/console-jetty/src/main/plan/plan.xml
    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

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml?rev=1073619&r1=1073618&r2=1073619&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml Wed Feb 23 06:46:56 2011
@@ -365,7 +365,7 @@ limitations under the License.
         <supported-locale>ja</supported-locale>
         <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
-            <title>Installed Web Applications</title>
+            <title>Installed Web Applications (WAR)</title>
             <short-title>WAR Modules</short-title>
             <keywords>Web Application WAR Module</keywords>
         </portlet-info>
@@ -390,8 +390,8 @@ limitations under the License.
         <supported-locale>ja</supported-locale>
         <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
-            <title>Installed EBA Applications</title>
-            <short-title>EBA Modules</short-title>
+            <title>Installed Enterprise Business Applications (EBA)</title>
+            <short-title>EBAModules</short-title>
             <keywords>EBA Application EBA Module</keywords>
         </portlet-info>
         <init-param>
@@ -414,7 +414,7 @@ limitations under the License.
         <supported-locale>ja</supported-locale>
         <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
-            <title>Installed WAB Applications</title>
+            <title>Installed Web Application Bundles (WAB)</title>
             <short-title>WAB Modules</short-title>
             <keywords>WAB Application WAB Module</keywords>
         </portlet-info>
@@ -531,7 +531,7 @@ limitations under the License.
         <supported-locale>ja</supported-locale>
         <resource-bundle>portletinfo</resource-bundle>
         <portlet-info>
-            <title>Installed Application EARs</title>
+            <title>Installed Enterprise Applications (EAR)</title>
             <short-title>EARModules</short-title>
             <keywords></keywords>
         </portlet-info>

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=1073619&r1=1073618&r2=1073619&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 Wed Feb 23 06:46:56 2011
@@ -22,24 +22,20 @@
 
     <module>
         <web>portal-driver.war</web>
-        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2"
-                 xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
             <context-root>/console</context-root>
             <security-realm-name>geronimo-admin</security-realm-name>
-            <gbean name="CARExportForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean"
-                   xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+            <gbean name="CARExportForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <attribute name="portalPathPrefix">/car-export</attribute>
                 <attribute name="portletContextPath">/plugin</attribute>
                 <attribute name="portletServletPath">/car-export</attribute>
             </gbean>
-            <gbean name="SVGForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean"
-                   xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+            <gbean name="SVGForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <attribute name="portalPathPrefix">/graphs</attribute>
                 <attribute name="portletContextPath">/console-base</attribute>
                 <attribute name="portletServletPath">/graphs</attribute>
             </gbean>
-            <gbean name="PlanExportForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean"
-                   xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+            <gbean name="PlanExportForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <attribute name="portalPathPrefix">/plan-export</attribute>
                 <attribute name="portletContextPath">/plugin</attribute>
                 <attribute name="portletServletPath">/plan-export</attribute>
@@ -49,12 +45,10 @@
 
     <module>
         <web>base-portlets.war</web>
-        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2"
-                 xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
             <context-root>/console-base</context-root>
             <security-realm-name>geronimo-admin</security-realm-name>
-            <gbean name="PropertiesLoginManager"
-                   class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">
+            <gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">
                 <reference name="ServerInfo">
                     <name>ServerInfo</name>
                 </reference>
@@ -63,8 +57,7 @@
                 </reference>
             </gbean>
             <!-- i18n support -->
-            <gbean name="ConsoleResourceGBean" class="org.apache.geronimo.console.i18n.ConsoleResourceGBean"
-                   xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+            <gbean name="ConsoleResourceGBean" class="org.apache.geronimo.console.i18n.ConsoleResourceGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
                 <reference name="ConsoleResourceRegistry">
                     <name>ConsoleResourceRegistry</name>
                 </reference>
@@ -150,7 +143,7 @@
                 </reference>
             </gbean>
             <gbean name="RepositoryViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-                <attribute name="pageTitle">23-5/Resources/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>
@@ -158,31 +151,31 @@
                     <name>PlutoPortalServices</name>
                 </reference>
             </gbean>
-            <gbean name="WARModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-                <attribute name="pageTitle">2-2-1/Applications/User Assets/Web App WARs</attribute>
+            <gbean name="SystemModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+                <attribute name="pageTitle">3-7/Resources/System Modules</attribute>
                 <attribute name="portletContext">/console-base</attribute>
-                <attribute name="portletList">[WARModules]</attribute>
-                <attribute name="icon">/images/ico_webapp_16x16.gif</attribute>
-                <attribute name="mode">basic</attribute>
+                <attribute name="portletList">[SystemModules]</attribute>
+                <attribute name="icon">/images/ico_car_16x16.gif</attribute>
                 <reference name="PortalContainerServices">
                     <name>PlutoPortalServices</name>
                 </reference>
             </gbean>
-            <gbean name="SystemModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-                <attribute name="pageTitle">3-7/Resources/System Modules</attribute>
+            <gbean name="WARModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+                <attribute name="pageTitle">2-2-1/Applications/User Assets/Web Apps (WAR)</attribute>
                 <attribute name="portletContext">/console-base</attribute>
-                <attribute name="portletList">[SystemModules]</attribute>
-                <attribute name="icon">/images/ico_car_16x16.gif</attribute>
+                <attribute name="portletList">[WARModules]</attribute>
+                <attribute name="icon">/images/ico_webapp_16x16.gif</attribute>
+                <attribute name="mode">basic</attribute>
                 <reference name="PortalContainerServices">
                     <name>PlutoPortalServices</name>
                 </reference>
             </gbean>
              <gbean name="EARModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-                 <attribute name="pageTitle">2-2-2/Applications/User Assets/Application EARs</attribute>
+                 <attribute name="pageTitle">2-2-2/Applications/User Assets/Applications (EAR)</attribute>
                  <attribute name="portletContext">/console-base</attribute>
                  <attribute name="portletList">[EARModules]</attribute>
                  <attribute name="icon">/images/ico_ear_16x16.gif</attribute>
-                <attribute name="mode">basic</attribute>
+                 <attribute name="mode">basic</attribute>
                  <reference name="PortalContainerServices">
                      <name>PlutoPortalServices</name>
                  </reference>
@@ -196,15 +189,6 @@
                     <name>PlutoPortalServices</name>
                 </reference>
             </gbean>
-            <gbean name="RARModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-                <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>
-                <reference name="PortalContainerServices">
-                    <name>PlutoPortalServices</name>
-                </reference>
-            </gbean>
             <gbean name="ClientModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
                 <attribute name="pageTitle">2-2-4/Applications/User Assets/App Clients</attribute>
                 <attribute name="portletContext">/console-base</attribute>
@@ -215,14 +199,33 @@
                 </reference>
             </gbean>
             <gbean name="EBAModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-                <attribute name="pageTitle">2-2-5/Applications/User Assets/Application EBAs</attribute>
+                <attribute name="pageTitle">2-2-6/Applications/User Assets/OSGi Applications (EBA)</attribute>
                 <attribute name="portletContext">/console-base</attribute>
                 <attribute name="portletList">[EBAModules]</attribute>
-                <attribute name="icon">/images/ico_jar_16x16.gif</attribute>
+                <attribute name="icon">/images/ico_ear_16x16.gif</attribute>
                 <attribute name="mode">basic</attribute>
                 <reference name="PortalContainerServices">
                     <name>PlutoPortalServices</name>
                 </reference>
+            </gbean>            
+             <gbean name="WABModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+                <attribute name="pageTitle">2-2-5/Applications/User Assets/OSGi Web Apps (WAB)</attribute>
+                <attribute name="portletContext">/console-base</attribute>
+                <attribute name="portletList">[WABModules]</attribute>
+                <attribute name="icon">/images/ico_webapp_16x16.gif</attribute>
+                <attribute name="mode">basic</attribute>
+                <reference name="PortalContainerServices">
+                    <name>PlutoPortalServices</name>
+                </reference>
+            </gbean>
+            <gbean name="RARModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+                <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>
+                <reference name="PortalContainerServices">
+                    <name>PlutoPortalServices</name>
+                </reference>
             </gbean>
             <gbean name="UsersGroups" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
                 <attribute name="pageTitle">4-1/Security/Users and Groups</attribute>
@@ -257,16 +260,15 @@
     <security xmlns="http://geronimo.apache.org/xml/ns/security-1.2">
         <role-mappings>
             <role role-name="admin">
-                <principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="admin"/>
+                <principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="admin" />
             </role>
             <role role-name="monitor">
-                <principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="monitor"/>
+                <principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal" name="monitor" />
             </role>
         </role-mappings>
     </security>
 
     <!-- i18n support -->
-    <gbean name="ConsoleResourceRegistry" class="org.apache.geronimo.console.i18n.ConsoleResourceRegistry"
-           xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2"/>
+    <gbean name="ConsoleResourceRegistry" class="org.apache.geronimo.console.i18n.ConsoleResourceRegistry" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2"/>
 
 </application>

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=1073619&r1=1073618&r2=1073619&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 Wed Feb 23 06:46:56 2011
@@ -153,27 +153,27 @@
                     <name>PlutoPortalServices</name>
                 </reference>
             </gbean>
-            <gbean name="WARModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-                <attribute name="pageTitle">2-2-1/Applications/User Assets/Web App WARs</attribute>
+            <gbean name="SystemModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+                <attribute name="pageTitle">3-7/Resources/System Modules</attribute>
                 <attribute name="portletContext">/console-base</attribute>
-                <attribute name="portletList">[WARModules]</attribute>
-                <attribute name="icon">/images/ico_webapp_16x16.gif</attribute>
-                <attribute name="mode">basic</attribute>
+                <attribute name="portletList">[SystemModules]</attribute>
+                <attribute name="icon">/images/ico_car_16x16.gif</attribute>
                 <reference name="PortalContainerServices">
                     <name>PlutoPortalServices</name>
                 </reference>
             </gbean>
-            <gbean name="SystemModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-                <attribute name="pageTitle">3-7/Resources/System Modules</attribute>
+            <gbean name="WARModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+                <attribute name="pageTitle">2-2-1/Applications/User Assets/Web Apps (WAR)</attribute>
                 <attribute name="portletContext">/console-base</attribute>
-                <attribute name="portletList">[SystemModules]</attribute>
-                <attribute name="icon">/images/ico_car_16x16.gif</attribute>
+                <attribute name="portletList">[WARModules]</attribute>
+                <attribute name="icon">/images/ico_webapp_16x16.gif</attribute>
+                <attribute name="mode">basic</attribute>
                 <reference name="PortalContainerServices">
                     <name>PlutoPortalServices</name>
                 </reference>
             </gbean>
              <gbean name="EARModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-                 <attribute name="pageTitle">2-2-2/Applications/User Assets/Application EARs</attribute>
+                 <attribute name="pageTitle">2-2-2/Applications/User Assets/Applications (EAR)</attribute>
                  <attribute name="portletContext">/console-base</attribute>
                  <attribute name="portletList">[EARModules]</attribute>
                  <attribute name="icon">/images/ico_ear_16x16.gif</attribute>
@@ -191,15 +191,6 @@
                     <name>PlutoPortalServices</name>
                 </reference>
             </gbean>
-            <gbean name="RARModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-                <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>
-                <reference name="PortalContainerServices">
-                    <name>PlutoPortalServices</name>
-                </reference>
-            </gbean>
             <gbean name="ClientModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
                 <attribute name="pageTitle">2-2-4/Applications/User Assets/App Clients</attribute>
                 <attribute name="portletContext">/console-base</attribute>
@@ -210,25 +201,34 @@
                 </reference>
             </gbean>
             <gbean name="EBAModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-                <attribute name="pageTitle">2-2-5/Applications/User Assets/Application EBAs</attribute>
+                <attribute name="pageTitle">2-2-6/Applications/User Assets/OSGi Applications (EBA)</attribute>
                 <attribute name="portletContext">/console-base</attribute>
                 <attribute name="portletList">[EBAModules]</attribute>
-                <attribute name="icon">/images/ico_jar_16x16.gif</attribute>
+                <attribute name="icon">/images/ico_ear_16x16.gif</attribute>
                 <attribute name="mode">basic</attribute>
                 <reference name="PortalContainerServices">
                     <name>PlutoPortalServices</name>
                 </reference>
             </gbean>            
              <gbean name="WABModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
-                <attribute name="pageTitle">2-2-6/Applications/User Assets/Application WABs</attribute>
+                <attribute name="pageTitle">2-2-5/Applications/User Assets/OSGi Web Apps (WAB)</attribute>
                 <attribute name="portletContext">/console-base</attribute>
                 <attribute name="portletList">[WABModules]</attribute>
-                <attribute name="icon">/images/ico_jar_16x16.gif</attribute>
+                <attribute name="icon">/images/ico_webapp_16x16.gif</attribute>
                 <attribute name="mode">basic</attribute>
                 <reference name="PortalContainerServices">
                     <name>PlutoPortalServices</name>
                 </reference>
             </gbean>
+            <gbean name="RARModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+                <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>
+                <reference name="PortalContainerServices">
+                    <name>PlutoPortalServices</name>
+                </reference>
+            </gbean>
             <gbean name="UsersGroups" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
                 <attribute name="pageTitle">4-1/Security/Users and Groups</attribute>
                 <attribute name="portletContext">/console-base</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=1073619&r1=1073618&r2=1073619&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 Wed Feb 23 06:46:56 2011
@@ -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">2-3/Applications/Deployer</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>