Return-Path: 
 <scm-return-21132-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org>
Delivered-To: apmail-geronimo-scm-archive@www.apache.org
Received: (qmail 6264 invoked from network); 13 Aug 2007 17:00:06 -0000
Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2)
  by minotaur.apache.org with SMTP; 13 Aug 2007 17:00:06 -0000
Received: (qmail 44969 invoked by uid 500); 13 Aug 2007 17:00:03 -0000
Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org
Received: (qmail 44933 invoked by uid 500); 13 Aug 2007 17:00:03 -0000
Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm
Precedence: bulk
list-help: <mailto:scm-help@geronimo.apache.org>
list-unsubscribe: <mailto:scm-unsubscribe@geronimo.apache.org>
List-Post: <mailto:scm@geronimo.apache.org>
Reply-To: dev@geronimo.apache.org
List-Id: <scm.geronimo.apache.org>
Delivered-To: mailing list scm@geronimo.apache.org
Received: (qmail 44922 invoked by uid 99); 13 Aug 2007 17:00:03 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Aug 2007 10:00:03 -0700
X-ASF-Spam-Status: No, hits=-100.0 required=10.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 13 Aug 2007 17:00:14 +0000
Received: by eris.apache.org (Postfix, from userid 65534)
	id 2114D1A981A; Mon, 13 Aug 2007 09:59:40 -0700 (PDT)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r565417 - in
 /geronimo/sandbox/portals/plugins/console/trunk:
 console-base-portlets/src/main/webapp/
 console-base-portlets/src/main/webapp/WEB-INF/
 console-base-portlets/src/main/webapp/WEB-INF/view/car/
 console-portal-driver/src/main/resou...
Date: Mon, 13 Aug 2007 16:59:39 -0000
To: scm@geronimo.apache.org
From: pmcmahan@apache.org
X-Mailer: svnmailer-1.1.0
Message-Id: <20070813165940.2114D1A981A@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Author: pmcmahan
Date: Mon Aug 13 09:59:38 2007
New Revision: 565417

URL: http://svn.apache.org/viewvc?view=rev&rev=565417
Log:
GERONIMO-3345 changing context for driver from /pluto to /console.  Changing context for
base portlets from /console to /console-base.

Modified:
    geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/car/addRepository.jsp
    geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/car/index.jsp
    geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/web.xml
    geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/webapp/index.html
    geronimo/sandbox/portals/plugins/console/trunk/console-portal-driver/src/main/resources/pluto-portal-driver-config.xml
    geronimo/sandbox/portals/plugins/console/trunk/console-portal-driver/src/main/webapp/WEB-INF/pluto-portal-driver-services-config.xml
    geronimo/sandbox/portals/plugins/console/trunk/console-portal-driver/src/main/webapp/WEB-INF/web.xml
    geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/src/plan/plan.xml

Modified: geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/car/addRepository.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/car/addRepository.jsp?view=diff&rev=565417&r1=565416&r2=565417
==============================================================================
--- geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/car/addRepository.jsp (original)
+++ geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/car/addRepository.jsp Mon Aug 13 09:59:38 2007
@@ -38,7 +38,7 @@
 <p>You can also download running configurations from another Geronimo server
 just as if you're browsing and installing third-party plugins.
  If you want to point to a remote Geronimo server, enter a URL such as
-<tt>http://geronimo-server:8080/console-standard/maven-repo/</tt></p>
+<tt>http://geronimo-server:8080/console/maven-repo/</tt></p>
 
 <form name="<portlet:namespace/>PluginForm" action="<portlet:actionURL/>">
     <input type="hidden" name="mode" value="addRepository-after" />

Modified: geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/car/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/car/index.jsp?view=diff&rev=565417&r1=565416&r2=565417
==============================================================================
--- geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/car/index.jsp (original)
+++ geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/view/car/index.jsp Mon Aug 13 09:59:38 2007
@@ -31,7 +31,7 @@
 <p>You can also download running configurations from another Geronimo server
 just as if you're browsing and installing third-party plugins.
  If you want to point to a remote Geronimo server, enter a URL such as
-<tt>http://geronimo-server:8080/console-standard/maven-repo/</tt> and the enter
+<tt>http://geronimo-server:8080/console/maven-repo/</tt> and the enter
 the administrator username and password in the optional authentication fields.</p>
 
 <form name="<portlet:namespace/>PluginForm" action="<portlet:actionURL/>">

Modified: geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/web.xml?view=diff&rev=565417&r1=565416&r2=565417
==============================================================================
--- geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/web.xml Mon Aug 13 09:59:38 2007
@@ -462,7 +462,7 @@
 
     <!--
     For security reasons requests to the dwr servlet go through
-    the "pluto" web-app context. The purpose of dwr-filter is
+    the "/console" web-app context. The purpose of dwr-filter is
     to map the attributes such as pathInfo, requestURI, etc. of
     the original request into the request that is delivered to
     the dwr-invoker servlet.  The dwr-invoker servlet uses those

Modified: geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/webapp/index.html?view=diff&rev=565417&r1=565416&r2=565417
==============================================================================
--- geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/webapp/index.html (original)
+++ geronimo/sandbox/portals/plugins/console/trunk/console-base-portlets/src/main/webapp/index.html Mon Aug 13 09:59:38 2007
@@ -16,11 +16,11 @@
 -->
 <html>
   <head>
-    <META HTTP-EQUIV="Refresh" CONTENT="0; URL=/pluto/portal/Welcome">
+    <META HTTP-EQUIV="Refresh" CONTENT="0; URL=/console/portal/Welcome">
     <title>Redirect to Portal</title>
   </head>
   <body bgcolor="white">
     <p>This web application contains raw portlets.  It is not useful
-      to a user.  Please see /pluto/portal/Welcome instead.</p>
+      to a user.  Please see /console/portal/Welcome instead.</p>
   </body>
 </html>

Modified: geronimo/sandbox/portals/plugins/console/trunk/console-portal-driver/src/main/resources/pluto-portal-driver-config.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/console/trunk/console-portal-driver/src/main/resources/pluto-portal-driver-config.xml?view=diff&rev=565417&r1=565416&r2=565417
==============================================================================
--- geronimo/sandbox/portals/plugins/console/trunk/console-portal-driver/src/main/resources/pluto-portal-driver-config.xml (original)
+++ geronimo/sandbox/portals/plugins/console/trunk/console-portal-driver/src/main/resources/pluto-portal-driver-config.xml Mon Aug 13 09:59:38 2007
@@ -39,79 +39,79 @@
   <!-- Render configuration which defines the portal pages. -->
   <render-config default="Welcome">
     <page name="Welcome" uri="/WEB-INF/themes/default-theme.jsp">
-      <portlet context="/console" name="Welcome"/>
+      <portlet context="/console-base" name="Welcome"/>
     </page>
 
 <!-- SERVER -->
     <page name="Server/Information" uri="/WEB-INF/themes/default-theme.jsp">
-      <portlet context="/console" name="ServerInfo"/>
+      <portlet context="/console-base" name="ServerInfo"/>
     </page>
 
     <page name="Server/Java System Info" uri="/WEB-INF/themes/default-theme.jsp">
-      <portlet context="/console" name="JavaSysInfo"/>
+      <portlet context="/console-base" name="JavaSysInfo"/>
     </page>
 
     <page name="Server/Server Logs" uri="/WEB-INF/themes/default-theme.jsp">
-      <portlet context="/console" name="LogManager"/>
-      <portlet context="/console" name="LogViewer"/>
-      <portlet context="/console" name="WebAccessLogViewer"/>
+      <portlet context="/console-base" name="LogManager"/>
+      <portlet context="/console-base" name="LogViewer"/>
+      <portlet context="/console-base" name="WebAccessLogViewer"/>
     </page>
 
     <page name="Server/Shutdown" uri="/WEB-INF/themes/default-theme.jsp">
-      <portlet context="/console" name="ServerManager"/>
+      <portlet context="/console-base" name="ServerManager"/>
     </page>
 
     <page name="Server/Web Server" uri="/WEB-INF/themes/default-theme.jsp">
-      <portlet context="/console" name="WebServerManager"/>
-      <portlet context="/console" name="ConnectorManager"/>
+      <portlet context="/console-base" name="WebServerManager"/>
+      <portlet context="/console-base" name="ConnectorManager"/>
     </page>
 
     <page name="Server/Thread Pools" uri="/WEB-INF/themes/default-theme.jsp">
-      <portlet context="/console" name="ThreadPool"/>
+      <portlet context="/console-base" name="ThreadPool"/>
     </page>
 
     <page name="Server/Apache HTTP" uri="/WEB-INF/themes/default-theme.jsp">
-      <portlet context="/console" name="ApacheJK"/>
+      <portlet context="/console-base" name="ApacheJK"/>
     </page>
 
 <!-- SERVICES -->
     <page name="Services/Repository" uri="/WEB-INF/themes/default-theme.jsp">
-      <portlet context="/console" name="RepositoryViewer"/>
+      <portlet context="/console-base" name="RepositoryViewer"/>
     </page>
 
 <!-- APPLICATIONS -->
     <page name="Applications/Deploy New" uri="/WEB-INF/themes/default-theme.jsp">
-      <portlet context="/console" name="Deployment"/>
+      <portlet context="/console-base" name="Deployment"/>
     </page>
 
     <page name="Applications/Web App WARs" uri="/WEB-INF/themes/default-theme.jsp">
-      <portlet context="/console" name="WARModules"/>
+      <portlet context="/console-base" name="WARModules"/>
     </page>
 
     <page name="Applications/System Modules" uri="/WEB-INF/themes/default-theme.jsp">
-      <portlet context="/console" name="SystemModules"/>
+      <portlet context="/console-base" name="SystemModules"/>
     </page>
 
     <page name="Applications/Plugins" uri="/WEB-INF/themes/default-theme.jsp">
-      <portlet context="/console" name="ImportExport"/>
+      <portlet context="/console-base" name="ImportExport"/>
     </page>
 
 <!-- SECURITY -->
     <page name="Security/Users and Groups" uri="/WEB-INF/themes/default-theme.jsp">
-      <portlet context="/console" name="SEUsers"/>
-      <portlet context="/console" name="SEGroups"/>
+      <portlet context="/console-base" name="SEUsers"/>
+      <portlet context="/console-base" name="SEGroups"/>
     </page>
 
     <page name="Security/Security Realms" uri="/WEB-INF/themes/default-theme.jsp">
-      <portlet context="/console" name="RealmWizard"/>
+      <portlet context="/console-base" name="RealmWizard"/>
     </page>
 
     <page name="Security/Keystores" uri="/WEB-INF/themes/default-theme.jsp">
-      <portlet context="/console" name="Keystores"/>
+      <portlet context="/console-base" name="Keystores"/>
     </page>
 
     <page name="Security/Certificate Authority" uri="/WEB-INF/themes/default-theme.jsp">
-      <portlet context="/console" name="CertificationAuthority"/>
+      <portlet context="/console-base" name="CertificationAuthority"/>
     </page>
 
 <!-- OTHER -->

Modified: geronimo/sandbox/portals/plugins/console/trunk/console-portal-driver/src/main/webapp/WEB-INF/pluto-portal-driver-services-config.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/console/trunk/console-portal-driver/src/main/webapp/WEB-INF/pluto-portal-driver-services-config.xml?view=diff&rev=565417&r1=565416&r2=565417
==============================================================================
--- geronimo/sandbox/portals/plugins/console/trunk/console-portal-driver/src/main/webapp/WEB-INF/pluto-portal-driver-services-config.xml (original)
+++ geronimo/sandbox/portals/plugins/console/trunk/console-portal-driver/src/main/webapp/WEB-INF/pluto-portal-driver-services-config.xml Mon Aug 13 09:59:38 2007
@@ -134,7 +134,7 @@
     <!-- ================================================ -->
     <bean id="GeronimoPortalServices"
           class="org.apache.geronimo.pluto.PortalContainerServicesGBean"
-          factory-method="getInstance"
+          factory-method="getSingleton"
           singleton="true">
       <property name="renderConfigService"><ref bean="RenderConfigService"/></property>
       <property name="portalCallbackService"><ref bean="PortalCallbackService"/></property>

Modified: geronimo/sandbox/portals/plugins/console/trunk/console-portal-driver/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/console/trunk/console-portal-driver/src/main/webapp/WEB-INF/web.xml?view=diff&rev=565417&r1=565416&r2=565417
==============================================================================
--- geronimo/sandbox/portals/plugins/console/trunk/console-portal-driver/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/sandbox/portals/plugins/console/trunk/console-portal-driver/src/main/webapp/WEB-INF/web.xml Mon Aug 13 09:59:38 2007
@@ -24,28 +24,13 @@
 
 <web-app>
 
-  <display-name>Apache Pluto Portal Driver</display-name>
+  <display-name>Geronimo Administration Console Portal Driver</display-name>
 
   <context-param>
     <param-name>contextConfigLocation</param-name>
     <param-value>/WEB-INF/pluto-portal-driver-services-config.xml</param-value>
   </context-param>
 
-  <filter>
-    <filter-name>plutoPortalDriver</filter-name>
-    <filter-class>org.apache.pluto.driver.PortalDriverFilter</filter-class>
-  </filter>
-
-  <filter-mapping>
-    <filter-name>plutoPortalDriver</filter-name>
-    <url-pattern>/about.jsp</url-pattern>
-  </filter-mapping>
-
-  <filter-mapping>
-    <filter-name>plutoPortalDriver</filter-name>
-    <url-pattern>/about.jsp/*</url-pattern>
-  </filter-mapping>
-
   <listener>
     <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
   </listener>
@@ -69,20 +54,6 @@
   </servlet>
 
   <servlet>
-    <servlet-name>portletApplicationPublisher</servlet-name>
-    <display-name>Portlet Application Publisher</display-name>
-    <description>Portlet Application Publisher Service</description>
-    <servlet-class>org.apache.pluto.driver.PublishServlet</servlet-class>
-  </servlet>
-
-  <servlet>
-    <servlet-name>tckDriver</servlet-name>
-    <display-name>Pluto TCK Driver</display-name>
-    <description>Pluto TCK Driver Controller</description>
-    <servlet-class>org.apache.pluto.driver.TCKDriverServlet</servlet-class>
-  </servlet>
-
-  <servlet>
     <display-name>DWR Forward Servlet</display-name>
     <servlet-name>dwr-forward</servlet-name>
     <servlet-class>org.apache.geronimo.console.servlet.ContextForwardServlet</servlet-class>
@@ -92,7 +63,7 @@
     </init-param>
     <init-param>
        <param-name>context-path</param-name>
-       <param-value>/console</param-value>
+       <param-value>/console-base</param-value>
     </init-param>
   </servlet>
 
@@ -106,24 +77,15 @@
     <url-pattern>/portal/*</url-pattern>
   </servlet-mapping>
     
-    <servlet-mapping>
-        <servlet-name>plutoPortalDriver</servlet-name>
-        <url-pattern>/secure/*</url-pattern>
-    </servlet-mapping>
-    
   <servlet-mapping>
-    <servlet-name>plutoPortalDriverLogout</servlet-name>
-    <url-pattern>/Logout</url-pattern>
+      <servlet-name>plutoPortalDriver</servlet-name>
+      <url-pattern>/secure/*</url-pattern>
   </servlet-mapping>
 
+  <!-- todo: is this necessary, or even safe? -->
   <servlet-mapping>
-    <servlet-name>portletApplicationPublisher</servlet-name>
-    <url-pattern>/admin/Publish</url-pattern>
-  </servlet-mapping>
-
-  <servlet-mapping>
-    <servlet-name>tckDriver</servlet-name>
-    <url-pattern>/tck/*</url-pattern>
+    <servlet-name>plutoPortalDriverLogout</servlet-name>
+    <url-pattern>/Logout</url-pattern>
   </servlet-mapping>
 
   <taglib>
@@ -143,7 +105,23 @@
 
   <security-constraint>
     <web-resource-collection>
-      <web-resource-name>portal</web-resource-name>
+      <web-resource-name>Login and HTTPS Required</web-resource-name>
+      <url-pattern>/secure/*</url-pattern>
+      <http-method>GET</http-method>
+      <http-method>POST</http-method>
+      <http-method>PUT</http-method>
+    </web-resource-collection>
+    <auth-constraint>
+      <role-name>admin</role-name>
+    </auth-constraint>
+    <user-data-constraint>
+      <transport-guarantee>CONFIDENTIAL</transport-guarantee>
+    </user-data-constraint>
+  </security-constraint>
+
+  <security-constraint>
+    <web-resource-collection>
+      <web-resource-name>console</web-resource-name>
       <url-pattern>/portal</url-pattern>
       <url-pattern>/portal/*</url-pattern>
       <http-method>GET</http-method>
@@ -154,21 +132,7 @@
       <role-name>admin</role-name>
     </auth-constraint>
   </security-constraint>
-	<security-constraint>
-	    <web-resource-collection>
-	        <web-resource-name>Login and HTTPS Required</web-resource-name>
-	        <url-pattern>/secure/*</url-pattern>
-	        <http-method>GET</http-method>
-	        <http-method>POST</http-method>
-	        <http-method>PUT</http-method>
-	    </web-resource-collection>
-	    <auth-constraint>
-	        <role-name>admin</role-name>
-	    </auth-constraint>
-	    <user-data-constraint>
-	        <transport-guarantee>CONFIDENTIAL</transport-guarantee>
-	    </user-data-constraint>
-	</security-constraint>
+
   <login-config>
     <auth-method>FORM</auth-method>
     <realm-name>geronimo-admin</realm-name>
@@ -178,10 +142,9 @@
     </form-login-config>
   </login-config>
 
-    <security-role>
+  <security-role>
     <role-name>admin</role-name>
   </security-role>
-
 
 </web-app>
 

Modified: geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/src/plan/plan.xml?view=diff&rev=565417&r1=565416&r2=565417
==============================================================================
--- geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/src/plan/plan.xml (original)
+++ geronimo/sandbox/portals/plugins/console/trunk/console-tomcat/src/plan/plan.xml Mon Aug 13 09:59:38 2007
@@ -34,7 +34,7 @@
                 <dep:hidden-classes />
                 <dep:non-overridable-classes />
             </dep:environment>
-            <context-root>/pluto</context-root>
+            <context-root>/console</context-root>
             <cross-context />
             <security-realm-name>geronimo-admin</security-realm-name>
         </web-app>
@@ -57,7 +57,7 @@
                 <dep:non-overridable-classes />
             </dep:environment>
 
-            <context-root>/console</context-root>
+            <context-root>/console-base</context-root>
             <cross-context />
             <security-realm-name>geronimo-admin</security-realm-name>
 
@@ -65,17 +65,17 @@
             <!---  TODO:  are these gbeans still needed ?
                 <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">/console-standard</attribute>
+                <attribute name="portletContextPath">/console-base</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">
                 <attribute name="portalPathPrefix">/graphs</attribute>
-                <attribute name="portletContextPath">/console-standard</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">
                 <attribute name="portalPathPrefix">/plan-export</attribute>
-                <attribute name="portletContextPath">/console-standard</attribute>
+                <attribute name="portletContextPath">/console-base</attribute>
                 <attribute name="portletServletPath">/plan-export</attribute>
                 </gbean>
             -->
@@ -96,91 +96,91 @@
            can be reenabled and the pages removed from the driver config xml.
            <gbean name="Welcome" class="org.apache.geronimo.pluto.ACEGBean">
                <attribute name="pageTitle">Welcome</attribute>
-               <attribute name="portletContext">/console</attribute>
+               <attribute name="portletContext">/console-base</attribute>
                <attribute name="portletList">[Welcome]</attribute>
            </gbean>
 
            <gbean name="ServerInfo" class="org.apache.geronimo.pluto.ACEGBean">
                <attribute name="pageTitle">Server/Information</attribute>
-               <attribute name="portletContext">/console</attribute>
+               <attribute name="portletContext">/console-base</attribute>
                <attribute name="portletList">[ServerInfo]</attribute>
            </gbean>
            <gbean name="JavaSysInfo" class="org.apache.geronimo.pluto.ACEGBean">
                <attribute name="pageTitle">Server/Java System Info</attribute>
-               <attribute name="portletContext">/console</attribute>
+               <attribute name="portletContext">/console-base</attribute>
                <attribute name="portletList">[JavaSysInfo]</attribute>
            </gbean>
            <gbean name="Logs" class="org.apache.geronimo.pluto.ACEGBean">
                <attribute name="pageTitle">Server/Server Logs</attribute>
-               <attribute name="portletContext">/console</attribute>
+               <attribute name="portletContext">/console-base</attribute>
                <attribute name="portletList">[LogManager, LogViewer, WebAccessLogViewer]</attribute>
            </gbean>
            <gbean name="Shutdown" class="org.apache.geronimo.pluto.ACEGBean">
                <attribute name="pageTitle">Server/Shutdown</attribute>
-               <attribute name="portletContext">/console</attribute>
+               <attribute name="portletContext">/console-base</attribute>
                <attribute name="portletList">[ServerManager]</attribute>
            </gbean>
            <gbean name="WebServer" class="org.apache.geronimo.pluto.ACEGBean">
                <attribute name="pageTitle">Server/Web Server</attribute>
-               <attribute name="portletContext">/console</attribute>
+               <attribute name="portletContext">/console-base</attribute>
                <attribute name="portletList">[WebServerManager, ConnectorManager]</attribute>
            </gbean>
            <gbean name="ThreadPool" class="org.apache.geronimo.pluto.ACEGBean">
                <attribute name="pageTitle">Server/Thread Pools</attribute>
-               <attribute name="portletContext">/console</attribute>
+               <attribute name="portletContext">/console-base</attribute>
                <attribute name="portletList">[ThreadPool]</attribute>
            </gbean>
            <gbean name="ApacheJK" class="org.apache.geronimo.pluto.ACEGBean">
                <attribute name="pageTitle">Server/Apache HTTP</attribute>
-               <attribute name="portletContext">/console</attribute>
+               <attribute name="portletContext">/console-base</attribute>
                <attribute name="portletList">[ApacheJK]</attribute>
            </gbean>
 
            <gbean name="RepositoryViewer" class="org.apache.geronimo.pluto.ACEGBean">
                <attribute name="pageTitle">Services/Repository</attribute>
-               <attribute name="portletContext">/console</attribute>
+               <attribute name="portletContext">/console-base</attribute>
                <attribute name="portletList">[RepositoryViewer]</attribute>
            </gbean>
 
            <gbean name="Deployment" class="org.apache.geronimo.pluto.ACEGBean">
                <attribute name="pageTitle">Applications/Deploy New</attribute>
-               <attribute name="portletContext">/console</attribute>
+               <attribute name="portletContext">/console-base</attribute>
                <attribute name="portletList">[Deployment]</attribute>
            </gbean>
            <gbean name="WARModules" class="org.apache.geronimo.pluto.ACEGBean">
                <attribute name="pageTitle">Applications/Web Apps</attribute>
-               <attribute name="portletContext">/console</attribute>
+               <attribute name="portletContext">/console-base</attribute>
                <attribute name="portletList">[WARModules]</attribute>
            </gbean>
            <gbean name="SystemModules" class="org.apache.geronimo.pluto.ACEGBean">
                <attribute name="pageTitle">Applications/System Modules</attribute>
-               <attribute name="portletContext">/console</attribute>
+               <attribute name="portletContext">/console-base</attribute>
                <attribute name="portletList">[SystemModules]</attribute>
            </gbean>
            <gbean name="ImportExport" class="org.apache.geronimo.pluto.ACEGBean">
                <attribute name="pageTitle">Applications/Plugins</attribute>
-               <attribute name="portletContext">/console</attribute>
+               <attribute name="portletContext">/console-base</attribute>
                <attribute name="portletList">[ImportExport]</attribute>
            </gbean>
 
            <gbean name="UsersGroups" class="org.apache.geronimo.pluto.ACEGBean">
                <attribute name="pageTitle">Security/Users and Groups</attribute>
-               <attribute name="portletContext">/console</attribute>
+               <attribute name="portletContext">/console-base</attribute>
                <attribute name="portletList">[SEUsers, SEGroups]</attribute>
            </gbean>
            <gbean name="RealmWizard" class="org.apache.geronimo.pluto.ACEGBean">
                <attribute name="pageTitle">Security/Security Realms</attribute>
-               <attribute name="portletContext">/console</attribute>
+               <attribute name="portletContext">/console-base</attribute>
                <attribute name="portletList">[RealmWizard]</attribute>
            </gbean>
            <gbean name="Keystores" class="org.apache.geronimo.pluto.ACEGBean">
                <attribute name="pageTitle">Security/Keystores</attribute>
-               <attribute name="portletContext">/console</attribute>
+               <attribute name="portletContext">/console-base</attribute>
                <attribute name="portletList">[Keystores]</attribute>
            </gbean>
            <gbean name="CertificationAuthority" class="org.apache.geronimo.pluto.ACEGBean">
                <attribute name="pageTitle">Security/Certificate Authority</attribute>
-               <attribute name="portletContext">/console</attribute>
+               <attribute name="portletContext">/console-base</attribute>
                <attribute name="portletList">[CertificationAuthority]</attribute>
            </gbean>
 -->