geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r610984 - in /geronimo/server/trunk: applications/monitoring/mconsole-war/src/main/webapp/WEB-INF/ plugins/activemq/activemq-jetty/src/main/plan/ plugins/activemq/activemq-tomcat/src/main/plan/ plugins/console/console-jetty/src/main/plan/ p...
Date Thu, 10 Jan 2008 23:20:46 GMT
Author: djencks
Date: Thu Jan 10 15:20:43 2008
New Revision: 610984

URL: http://svn.apache.org/viewvc?rev=610984&view=rev
Log:
GERONIMO-3745 clean up AdminConsoleExtensionGBean

Removed:
    geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/AdminConsoleExtension.java
    geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/PlutoAccessInterface.java
Modified:
    geronimo/server/trunk/applications/monitoring/mconsole-war/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/server/trunk/plugins/activemq/activemq-jetty/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/activemq/activemq-tomcat/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/console/console-jetty/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/console/console-plugin-jetty/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/console/console-plugin-tomcat/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/pluto-portal-driver-config.xml
    geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/debugviews/debugviews-jetty/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/debugviews/debugviews-tomcat/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/plancreator/plancreator-jetty/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/plancreator/plancreator-tomcat/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/AdminConsoleExtensionGBean.java
    geronimo/server/trunk/plugins/system-database/system-database-jetty/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/system-database/system-database-tomcat/src/main/plan/plan.xml

Modified: geronimo/server/trunk/applications/monitoring/mconsole-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/applications/monitoring/mconsole-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=610984&r1=610983&r2=610984&view=diff
==============================================================================
--- geronimo/server/trunk/applications/monitoring/mconsole-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/server/trunk/applications/monitoring/mconsole-war/src/main/webapp/WEB-INF/geronimo-web.xml Thu Jan 10 15:20:43 2008
@@ -52,6 +52,9 @@
         <attribute name="pageTitle">Server/Monitoring</attribute>
         <attribute name="portletContext">/monitoring</attribute>
         <attribute name="portletList">[monitoring]</attribute>
+        <reference name="PortalContainerServices">
+            <name>PlutoPortalServices</name>
+        </reference>
     </gbean>
   
 </web-app>

Modified: geronimo/server/trunk/plugins/activemq/activemq-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-jetty/src/main/plan/plan.xml?rev=610984&r1=610983&r2=610984&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-jetty/src/main/plan/plan.xml Thu Jan 10 15:20:43 2008
@@ -17,7 +17,7 @@
 limitations under the License.
 -->
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2">
-    
+
     <!-- This is where the files are accessed from. (aka - portletContext) -->
     <context-root>/activemq</context-root>
 
@@ -25,21 +25,27 @@
     <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-mappings>
     </security>
-    
+
     <gbean name="JMSServerManager" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Server/JMS Server</attribute>
         <attribute name="portletContext">/activemq</attribute>
         <attribute name="portletList">[JMSServerManager,JMSConnectorManager]</attribute>
+        <reference name="PortalContainerServices">
+            <name>PlutoPortalServices</name>
+        </reference>
     </gbean>
-    
+
     <gbean name="JMSWizard" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Services/JMS Resources</attribute>
         <attribute name="portletContext">/activemq</attribute>
         <attribute name="portletList">[JMSWizard]</attribute>
+        <reference name="PortalContainerServices">
+            <name>PlutoPortalServices</name>
+        </reference>
     </gbean>
 
 

Modified: geronimo/server/trunk/plugins/activemq/activemq-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-tomcat/src/main/plan/plan.xml?rev=610984&r1=610983&r2=610984&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-tomcat/src/main/plan/plan.xml Thu Jan 10 15:20:43 2008
@@ -35,12 +35,18 @@
         <attribute name="pageTitle">Server/JMS Server</attribute>
         <attribute name="portletContext">/activemq</attribute>
         <attribute name="portletList">[JMSServerManager,JMSConnectorManager]</attribute>
+        <reference name="PortalContainerServices">
+            <name>PlutoPortalServices</name>
+        </reference>
     </gbean>
     
     <gbean name="JMSWizard" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Services/JMS Resources</attribute>
         <attribute name="portletContext">/activemq</attribute>
         <attribute name="portletList">[JMSWizard]</attribute>
+        <reference name="PortalContainerServices">
+            <name>PlutoPortalServices</name>
+        </reference>
     </gbean>
 
 

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=610984&r1=610983&r2=610984&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 Thu Jan 10 15:20:43 2008
@@ -83,101 +83,160 @@
                 </reference>
             </gbean>
 
-<!-- TODO: can't start these gbeans here because the ContainerServicesGBean hasn't been
-           initialized by spring yet.  since they can't be defined here they are instead
-           defined in the renderConfig section of pluto's pluto-portal-driver-config.xml,
-           which is not ideal.  maybe the deps can be moved around so that this section
-           can be reenabled and the pages removed from the driver config xml.
-           <gbean name="Welcome" class="org.apache.geronimo.pluto.ACEGBean">
+           <gbean name="Welcome" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
                <attribute name="pageTitle">Welcome</attribute>
                <attribute name="portletContext">/console-base</attribute>
                <attribute name="portletList">[Welcome]</attribute>
+               <reference name="PortalContainerServices">
+                   <name>PlutoPortalServices</name>
+               </reference>
            </gbean>
 
-           <gbean name="ServerInfo" class="org.apache.geronimo.pluto.ACEGBean">
+           <gbean name="ServerInfo" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
                <attribute name="pageTitle">Server/Information</attribute>
                <attribute name="portletContext">/console-base</attribute>
                <attribute name="portletList">[ServerInfo]</attribute>
+               <reference name="PortalContainerServices">
+                   <name>PlutoPortalServices</name>
+               </reference>
            </gbean>
-           <gbean name="JavaSysInfo" class="org.apache.geronimo.pluto.ACEGBean">
+           <gbean name="JavaSysInfo" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
                <attribute name="pageTitle">Server/Java System Info</attribute>
                <attribute name="portletContext">/console-base</attribute>
                <attribute name="portletList">[JavaSysInfo]</attribute>
+               <reference name="PortalContainerServices">
+                   <name>PlutoPortalServices</name>
+               </reference>
            </gbean>
-           <gbean name="Logs" class="org.apache.geronimo.pluto.ACEGBean">
+           <gbean name="Logs" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
                <attribute name="pageTitle">Server/Server Logs</attribute>
                <attribute name="portletContext">/console-base</attribute>
                <attribute name="portletList">[LogManager, LogViewer, WebAccessLogViewer]</attribute>
+               <reference name="PortalContainerServices">
+                   <name>PlutoPortalServices</name>
+               </reference>
            </gbean>
-           <gbean name="Shutdown" class="org.apache.geronimo.pluto.ACEGBean">
+           <gbean name="Shutdown" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
                <attribute name="pageTitle">Server/Shutdown</attribute>
                <attribute name="portletContext">/console-base</attribute>
                <attribute name="portletList">[ServerManager]</attribute>
+               <reference name="PortalContainerServices">
+                   <name>PlutoPortalServices</name>
+               </reference>
            </gbean>
-           <gbean name="WebServer" class="org.apache.geronimo.pluto.ACEGBean">
+           <gbean name="WebServer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
                <attribute name="pageTitle">Server/Web Server</attribute>
                <attribute name="portletContext">/console-base</attribute>
                <attribute name="portletList">[WebServerManager, ConnectorManager]</attribute>
+               <reference name="PortalContainerServices">
+                   <name>PlutoPortalServices</name>
+               </reference>
            </gbean>
-           <gbean name="ThreadPool" class="org.apache.geronimo.pluto.ACEGBean">
+           <gbean name="ThreadPool" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
                <attribute name="pageTitle">Server/Thread Pools</attribute>
                <attribute name="portletContext">/console-base</attribute>
                <attribute name="portletList">[ThreadPool]</attribute>
+               <reference name="PortalContainerServices">
+                   <name>PlutoPortalServices</name>
+               </reference>
            </gbean>
-           <gbean name="ApacheJK" class="org.apache.geronimo.pluto.ACEGBean">
+           <gbean name="ApacheJK" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
                <attribute name="pageTitle">Server/Apache HTTP</attribute>
                <attribute name="portletContext">/console-base</attribute>
                <attribute name="portletList">[ApacheJK]</attribute>
+               <reference name="PortalContainerServices">
+                   <name>PlutoPortalServices</name>
+               </reference>
            </gbean>
 
-           <gbean name="RepositoryViewer" class="org.apache.geronimo.pluto.ACEGBean">
+           <gbean name="RepositoryViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
                <attribute name="pageTitle">Services/Repository</attribute>
                <attribute name="portletContext">/console-base</attribute>
                <attribute name="portletList">[RepositoryViewer]</attribute>
+               <reference name="PortalContainerServices">
+                   <name>PlutoPortalServices</name>
+               </reference>
            </gbean>
-
-           <gbean name="Deployment" class="org.apache.geronimo.pluto.ACEGBean">
-               <attribute name="pageTitle">Applications/Deploy New</attribute>
-               <attribute name="portletContext">/console-base</attribute>
-               <attribute name="portletList">[Deployment]</attribute>
-           </gbean>
-           <gbean name="WARModules" class="org.apache.geronimo.pluto.ACEGBean">
+           <gbean name="WARModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
                <attribute name="pageTitle">Applications/Web Apps</attribute>
                <attribute name="portletContext">/console-base</attribute>
                <attribute name="portletList">[WARModules]</attribute>
+               <reference name="PortalContainerServices">
+                   <name>PlutoPortalServices</name>
+               </reference>
            </gbean>
-           <gbean name="SystemModules" class="org.apache.geronimo.pluto.ACEGBean">
+           <gbean name="SystemModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
                <attribute name="pageTitle">Applications/System Modules</attribute>
                <attribute name="portletContext">/console-base</attribute>
                <attribute name="portletList">[SystemModules]</attribute>
+               <reference name="PortalContainerServices">
+                   <name>PlutoPortalServices</name>
+               </reference>
+           </gbean>
+            <gbean name="EARModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+                <attribute name="pageTitle">Applications/Application EARs</attribute>
+                <attribute name="portletContext">/console-base</attribute>
+                <attribute name="portletList">[EARModules]</attribute>
+                <reference name="PortalContainerServices">
+                    <name>PlutoPortalServices</name>
+                </reference>
+            </gbean>
+           <gbean name="EJBModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+               <attribute name="pageTitle">Applications/EJB JARs</attribute>
+               <attribute name="portletContext">/console-base</attribute>
+               <attribute name="portletList">[EJBModules]</attribute>
+               <reference name="PortalContainerServices">
+                   <name>PlutoPortalServices</name>
+               </reference>
+           </gbean>
+           <gbean name="RARModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+               <attribute name="pageTitle">Applications/J2EE Connectors</attribute>
+               <attribute name="portletContext">/console-base</attribute>
+               <attribute name="portletList">[RARModules]</attribute>
+               <reference name="PortalContainerServices">
+                   <name>PlutoPortalServices</name>
+               </reference>
+           </gbean>
+           <gbean name="ClientModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+               <attribute name="pageTitle">Applications/App Clients</attribute>
+               <attribute name="portletContext">/console-base</attribute>
+               <attribute name="portletList">[ClientModules]</attribute>
+               <reference name="PortalContainerServices">
+                   <name>PlutoPortalServices</name>
+               </reference>
            </gbean>
-           <gbean name="ImportExport" class="org.apache.geronimo.pluto.ACEGBean">
-               <attribute name="pageTitle">Applications/Plugins</attribute>
-               <attribute name="portletContext">/console-base</attribute>
-               <attribute name="portletList">[ImportExport]</attribute>
-           </gbean>
-
-           <gbean name="UsersGroups" class="org.apache.geronimo.pluto.ACEGBean">
+           <gbean name="UsersGroups" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
                <attribute name="pageTitle">Security/Users and Groups</attribute>
                <attribute name="portletContext">/console-base</attribute>
                <attribute name="portletList">[SEUsers, SEGroups]</attribute>
+               <reference name="PortalContainerServices">
+                   <name>PlutoPortalServices</name>
+               </reference>
            </gbean>
-           <gbean name="RealmWizard" class="org.apache.geronimo.pluto.ACEGBean">
+           <gbean name="RealmWizard" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
                <attribute name="pageTitle">Security/Security Realms</attribute>
                <attribute name="portletContext">/console-base</attribute>
                <attribute name="portletList">[RealmWizard]</attribute>
+               <reference name="PortalContainerServices">
+                   <name>PlutoPortalServices</name>
+               </reference>
            </gbean>
-           <gbean name="Keystores" class="org.apache.geronimo.pluto.ACEGBean">
+           <gbean name="Keystores" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
                <attribute name="pageTitle">Security/Keystores</attribute>
                <attribute name="portletContext">/console-base</attribute>
                <attribute name="portletList">[Keystores]</attribute>
+               <reference name="PortalContainerServices">
+                   <name>PlutoPortalServices</name>
+               </reference>
            </gbean>
-           <gbean name="CertificationAuthority" class="org.apache.geronimo.pluto.ACEGBean">
+           <gbean name="CertificationAuthority" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
                <attribute name="pageTitle">Security/Certificate Authority</attribute>
                <attribute name="portletContext">/console-base</attribute>
                <attribute name="portletList">[CertificationAuthority]</attribute>
+               <reference name="PortalContainerServices">
+                   <name>PlutoPortalServices</name>
+               </reference>
            </gbean>
--->
 
         </web-app>
     </module>

Modified: geronimo/server/trunk/plugins/console/console-plugin-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-plugin-jetty/src/main/plan/plan.xml?rev=610984&r1=610983&r2=610984&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-plugin-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/console/console-plugin-jetty/src/main/plan/plan.xml Thu Jan 10 15:20:43 2008
@@ -37,11 +37,17 @@
         <attribute name="pageTitle">Applications/Deploy New</attribute>
         <attribute name="portletContext">/plugin</attribute>
         <attribute name="portletList">[Deployment]</attribute>
+        <reference name="PortalContainerServices">
+            <name>PlutoPortalServices</name>
+        </reference>
     </gbean>
     <gbean name="PluginManagement" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Applications/Plugins</attribute>
         <attribute name="portletContext">/plugin</attribute>
         <attribute name="portletList">[ImportExport]</attribute>
+        <reference name="PortalContainerServices">
+            <name>PlutoPortalServices</name>
+        </reference>
     </gbean>
     
     <!-- Deployment factory for use inside server -->

Modified: geronimo/server/trunk/plugins/console/console-plugin-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-plugin-tomcat/src/main/plan/plan.xml?rev=610984&r1=610983&r2=610984&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-plugin-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/console/console-plugin-tomcat/src/main/plan/plan.xml Thu Jan 10 15:20:43 2008
@@ -37,11 +37,17 @@
         <attribute name="pageTitle">Applications/Deploy New</attribute>
         <attribute name="portletContext">/plugin</attribute>
         <attribute name="portletList">[Deployment]</attribute>
+        <reference name="PortalContainerServices">
+            <name>PlutoPortalServices</name>
+        </reference>
     </gbean>
     <gbean name="PluginManagement" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Applications/Plugins</attribute>
         <attribute name="portletContext">/plugin</attribute>
         <attribute name="portletList">[ImportExport]</attribute>
+        <reference name="PortalContainerServices">
+            <name>PlutoPortalServices</name>
+        </reference>
     </gbean>
 
     <!-- Deployment factory for use inside server -->

Modified: geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/pluto-portal-driver-config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/pluto-portal-driver-config.xml?rev=610984&r1=610983&r2=610984&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/pluto-portal-driver-config.xml (original)
+++ geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/pluto-portal-driver-config.xml Thu Jan 10 15:20:43 2008
@@ -38,103 +38,6 @@
 
   <!-- Render configuration which defines the portal pages. -->
   <render-config default="Welcome">
-    <page name="Welcome" uri="/WEB-INF/themes/default-theme.jsp">
-      <portlet context="/console-base" name="Welcome"/>
-    </page>
-
-<!-- SERVER -->
-    <page name="Server/Information" uri="/WEB-INF/themes/default-theme.jsp">
-      <portlet context="/console-base" name="ServerInfo"/>
-    </page>
-
-    <page name="Server/Java System Info" uri="/WEB-INF/themes/default-theme.jsp">
-      <portlet context="/console-base" name="JavaSysInfo"/>
-    </page>
-
-    <page name="Server/Server Logs" uri="/WEB-INF/themes/default-theme.jsp">
-      <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-base" name="ServerManager"/>
-    </page>
-
-    <page name="Server/Web Server" uri="/WEB-INF/themes/default-theme.jsp">
-      <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-base" name="ThreadPool"/>
-    </page>
-
-    <page name="Server/Apache HTTP" uri="/WEB-INF/themes/default-theme.jsp">
-      <portlet context="/console-base" name="ApacheJK"/>
-    </page>
-
-<!-- SERVICES -->
-    <page name="Services/Repository" uri="/WEB-INF/themes/default-theme.jsp">
-      <portlet context="/console-base" name="RepositoryViewer"/>
-    </page>
-
-<!-- APPLICATIONS -->
-<!--
-    <page name="Applications/Deploy New" uri="/WEB-INF/themes/default-theme.jsp">
-      <portlet context="/console-base" name="Deployment"/>
-    </page>
--->
-
-    <page name="Applications/Web App WARs" uri="/WEB-INF/themes/default-theme.jsp">
-      <portlet context="/console-base" name="WARModules"/>
-    </page>
-
-    <page name="Applications/System Modules" uri="/WEB-INF/themes/default-theme.jsp">
-      <portlet context="/console-base" name="SystemModules"/>
-    </page>
-
-    <page name="Applications/Application EARs" uri="/WEB-INF/themes/default-theme.jsp">
-      <portlet context="/console-base" name="EARModules"/>
-    </page>
-
-    <page name="Applications/EJB JARs" uri="/WEB-INF/themes/default-theme.jsp">
-      <portlet context="/console-base" name="EJBModules"/>
-    </page>
-
-    <page name="Applications/J2EE Connectors" uri="/WEB-INF/themes/default-theme.jsp">
-      <portlet context="/console-base" name="RARModules"/>
-    </page>
-
-    <page name="Applications/App Clients" uri="/WEB-INF/themes/default-theme.jsp">
-      <portlet context="/console-base" name="ClientModules"/>
-    </page>
-
-<!--
-    <page name="Applications/Plugins" uri="/WEB-INF/themes/default-theme.jsp">
-      <portlet context="/console-base" name="ImportExport"/>
-    </page>
--->
-
-<!-- SECURITY -->
-    <page name="Security/Users and Groups" uri="/WEB-INF/themes/default-theme.jsp">
-      <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-base" name="RealmWizard"/>
-    </page>
-
-    <page name="Security/Keystores" uri="/WEB-INF/themes/default-theme.jsp">
-      <portlet context="/console-base" name="Keystores"/>
-    </page>
-
-    <page name="Security/Certificate Authority" uri="/WEB-INF/themes/default-theme.jsp">
-      <portlet context="/console-base" name="CertificationAuthority"/>
-    </page>
-
-<!-- OTHER -->
 
   </render-config>
   

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=610984&r1=610983&r2=610984&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 Thu Jan 10 15:20:43 2008
@@ -85,101 +85,160 @@
                 </reference>
             </gbean>
 
-<!-- TODO: can't start these gbeans here because the ContainerServicesGBean hasn't been
-           initialized by spring yet.  since they can't be defined here they are instead
-           defined in the renderConfig section of pluto's pluto-portal-driver-config.xml,
-           which is not ideal.  maybe the deps can be moved around so that this section
-           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-base</attribute>
-               <attribute name="portletList">[Welcome]</attribute>
-           </gbean>
+            <gbean name="Welcome" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+                <attribute name="pageTitle">Welcome</attribute>
+                <attribute name="portletContext">/console-base</attribute>
+                <attribute name="portletList">[Welcome]</attribute>
+                <reference name="PortalContainerServices">
+                    <name>PlutoPortalServices</name>
+                </reference>
+            </gbean>
 
-           <gbean name="ServerInfo" class="org.apache.geronimo.pluto.ACEGBean">
-               <attribute name="pageTitle">Server/Information</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-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-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-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-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-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-base</attribute>
-               <attribute name="portletList">[ApacheJK]</attribute>
-           </gbean>
+            <gbean name="ServerInfo" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+                <attribute name="pageTitle">Server/Information</attribute>
+                <attribute name="portletContext">/console-base</attribute>
+                <attribute name="portletList">[ServerInfo]</attribute>
+                <reference name="PortalContainerServices">
+                    <name>PlutoPortalServices</name>
+                </reference>
+            </gbean>
+            <gbean name="JavaSysInfo" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+                <attribute name="pageTitle">Server/Java System Info</attribute>
+                <attribute name="portletContext">/console-base</attribute>
+                <attribute name="portletList">[JavaSysInfo]</attribute>
+                <reference name="PortalContainerServices">
+                    <name>PlutoPortalServices</name>
+                </reference>
+            </gbean>
+            <gbean name="Logs" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+                <attribute name="pageTitle">Server/Server Logs</attribute>
+                <attribute name="portletContext">/console-base</attribute>
+                <attribute name="portletList">[LogManager, LogViewer, WebAccessLogViewer]</attribute>
+                <reference name="PortalContainerServices">
+                    <name>PlutoPortalServices</name>
+                </reference>
+            </gbean>
+            <gbean name="Shutdown" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+                <attribute name="pageTitle">Server/Shutdown</attribute>
+                <attribute name="portletContext">/console-base</attribute>
+                <attribute name="portletList">[ServerManager]</attribute>
+                <reference name="PortalContainerServices">
+                    <name>PlutoPortalServices</name>
+                </reference>
+            </gbean>
+            <gbean name="WebServer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+                <attribute name="pageTitle">Server/Web Server</attribute>
+                <attribute name="portletContext">/console-base</attribute>
+                <attribute name="portletList">[WebServerManager, ConnectorManager]</attribute>
+                <reference name="PortalContainerServices">
+                    <name>PlutoPortalServices</name>
+                </reference>
+            </gbean>
+            <gbean name="ThreadPool" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+                <attribute name="pageTitle">Server/Thread Pools</attribute>
+                <attribute name="portletContext">/console-base</attribute>
+                <attribute name="portletList">[ThreadPool]</attribute>
+                <reference name="PortalContainerServices">
+                    <name>PlutoPortalServices</name>
+                </reference>
+            </gbean>
+            <gbean name="ApacheJK" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+                <attribute name="pageTitle">Server/Apache HTTP</attribute>
+                <attribute name="portletContext">/console-base</attribute>
+                <attribute name="portletList">[ApacheJK]</attribute>
+                <reference name="PortalContainerServices">
+                    <name>PlutoPortalServices</name>
+                </reference>
+            </gbean>
 
-           <gbean name="RepositoryViewer" class="org.apache.geronimo.pluto.ACEGBean">
-               <attribute name="pageTitle">Services/Repository</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-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-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-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-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-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-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-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-base</attribute>
-               <attribute name="portletList">[CertificationAuthority]</attribute>
-           </gbean>
--->
+            <gbean name="RepositoryViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+                <attribute name="pageTitle">Services/Repository</attribute>
+                <attribute name="portletContext">/console-base</attribute>
+                <attribute name="portletList">[RepositoryViewer]</attribute>
+                <reference name="PortalContainerServices">
+                    <name>PlutoPortalServices</name>
+                </reference>
+            </gbean>
+            <gbean name="WARModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+                <attribute name="pageTitle">Applications/Web Apps</attribute>
+                <attribute name="portletContext">/console-base</attribute>
+                <attribute name="portletList">[WARModules]</attribute>
+                <reference name="PortalContainerServices">
+                    <name>PlutoPortalServices</name>
+                </reference>
+            </gbean>
+            <gbean name="SystemModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+                <attribute name="pageTitle">Applications/System Modules</attribute>
+                <attribute name="portletContext">/console-base</attribute>
+                <attribute name="portletList">[SystemModules]</attribute>
+                <reference name="PortalContainerServices">
+                    <name>PlutoPortalServices</name>
+                </reference>
+            </gbean>
+             <gbean name="EARModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+                 <attribute name="pageTitle">Applications/Application EARs</attribute>
+                 <attribute name="portletContext">/console-base</attribute>
+                 <attribute name="portletList">[EARModules]</attribute>
+                 <reference name="PortalContainerServices">
+                     <name>PlutoPortalServices</name>
+                 </reference>
+             </gbean>
+            <gbean name="EJBModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+                <attribute name="pageTitle">Applications/EJB JARs</attribute>
+                <attribute name="portletContext">/console-base</attribute>
+                <attribute name="portletList">[EJBModules]</attribute>
+                <reference name="PortalContainerServices">
+                    <name>PlutoPortalServices</name>
+                </reference>
+            </gbean>
+            <gbean name="RARModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+                <attribute name="pageTitle">Applications/J2EE Connectors</attribute>
+                <attribute name="portletContext">/console-base</attribute>
+                <attribute name="portletList">[RARModules]</attribute>
+                <reference name="PortalContainerServices">
+                    <name>PlutoPortalServices</name>
+                </reference>
+            </gbean>
+            <gbean name="ClientModules" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+                <attribute name="pageTitle">Applications/App Clients</attribute>
+                <attribute name="portletContext">/console-base</attribute>
+                <attribute name="portletList">[ClientModules]</attribute>
+                <reference name="PortalContainerServices">
+                    <name>PlutoPortalServices</name>
+                </reference>
+            </gbean>
+            <gbean name="UsersGroups" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+                <attribute name="pageTitle">Security/Users and Groups</attribute>
+                <attribute name="portletContext">/console-base</attribute>
+                <attribute name="portletList">[SEUsers, SEGroups]</attribute>
+                <reference name="PortalContainerServices">
+                    <name>PlutoPortalServices</name>
+                </reference>
+            </gbean>
+            <gbean name="RealmWizard" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+                <attribute name="pageTitle">Security/Security Realms</attribute>
+                <attribute name="portletContext">/console-base</attribute>
+                <attribute name="portletList">[RealmWizard]</attribute>
+                <reference name="PortalContainerServices">
+                    <name>PlutoPortalServices</name>
+                </reference>
+            </gbean>
+            <gbean name="Keystores" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+                <attribute name="pageTitle">Security/Keystores</attribute>
+                <attribute name="portletContext">/console-base</attribute>
+                <attribute name="portletList">[Keystores]</attribute>
+                <reference name="PortalContainerServices">
+                    <name>PlutoPortalServices</name>
+                </reference>
+            </gbean>
+            <gbean name="CertificationAuthority" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+                <attribute name="pageTitle">Security/Certificate Authority</attribute>
+                <attribute name="portletContext">/console-base</attribute>
+                <attribute name="portletList">[CertificationAuthority]</attribute>
+                <reference name="PortalContainerServices">
+                    <name>PlutoPortalServices</name>
+                </reference>
+            </gbean>
 
         </web-app>
     </module>

Modified: geronimo/server/trunk/plugins/debugviews/debugviews-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-jetty/src/main/plan/plan.xml?rev=610984&r1=610983&r2=610984&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-jetty/src/main/plan/plan.xml Thu Jan 10 15:20:43 2008
@@ -34,30 +34,45 @@
         <attribute name="pageTitle">Debug Views/JMX Viewer</attribute>
         <attribute name="portletContext">/debug-views</attribute>
         <attribute name="portletList">[JMXViewer]</attribute>
+        <reference name="PortalContainerServices">
+            <name>PlutoPortalServices</name>
+        </reference>
     </gbean>
 
     <gbean name="LDAPViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Debug Views/LDAP Viewer</attribute>
         <attribute name="portletContext">/debug-views</attribute>
         <attribute name="portletList">[LDAPViewer]</attribute>
+        <reference name="PortalContainerServices">
+            <name>PlutoPortalServices</name>
+        </reference>
     </gbean>
 
     <gbean name="ClassLoaderViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Debug Views/ClassLoader Viewer</attribute>
         <attribute name="portletContext">/debug-views</attribute>
         <attribute name="portletList">[ClassLoaderViewer]</attribute>
+        <reference name="PortalContainerServices">
+            <name>PlutoPortalServices</name>
+        </reference>
     </gbean>
 
     <gbean name="JNDIViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Debug Views/JNDI Viewer</attribute>
         <attribute name="portletContext">/debug-views</attribute>
         <attribute name="portletList">[JNDIViewer]</attribute>
+        <reference name="PortalContainerServices">
+            <name>PlutoPortalServices</name>
+        </reference>
     </gbean>
 
     <gbean name="DependencyViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Debug Views/Dependency Viewer</attribute>
         <attribute name="portletContext">/debug-views</attribute>
         <attribute name="portletList">[DependencyViewer]</attribute>
+        <reference name="PortalContainerServices">
+            <name>PlutoPortalServices</name>
+        </reference>
     </gbean>
 
 </web-app>

Modified: geronimo/server/trunk/plugins/debugviews/debugviews-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/debugviews/debugviews-tomcat/src/main/plan/plan.xml?rev=610984&r1=610983&r2=610984&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/debugviews/debugviews-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/debugviews/debugviews-tomcat/src/main/plan/plan.xml Thu Jan 10 15:20:43 2008
@@ -35,30 +35,45 @@
         <attribute name="pageTitle">Debug Views/JMX Viewer</attribute>
         <attribute name="portletContext">/debug-views</attribute>
         <attribute name="portletList">[JMXViewer]</attribute>
+        <reference name="PortalContainerServices">
+            <name>PlutoPortalServices</name>
+        </reference>
     </gbean>
 
     <gbean name="LDAPViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Debug Views/LDAP Viewer</attribute>
         <attribute name="portletContext">/debug-views</attribute>
         <attribute name="portletList">[LDAPViewer]</attribute>
+        <reference name="PortalContainerServices">
+            <name>PlutoPortalServices</name>
+        </reference>
     </gbean>
 
     <gbean name="ClassLoaderViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Debug Views/ClassLoader Viewer</attribute>
         <attribute name="portletContext">/debug-views</attribute>
         <attribute name="portletList">[ClassLoaderViewer]</attribute>
+        <reference name="PortalContainerServices">
+            <name>PlutoPortalServices</name>
+        </reference>
     </gbean>
 
     <gbean name="JNDIViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Debug Views/JNDI Viewer</attribute>
         <attribute name="portletContext">/debug-views</attribute>
         <attribute name="portletList">[JNDIViewer]</attribute>
+        <reference name="PortalContainerServices">
+            <name>PlutoPortalServices</name>
+        </reference>
     </gbean>
 
     <gbean name="DependencyViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Debug Views/Dependency Viewer</attribute>
         <attribute name="portletContext">/debug-views</attribute>
         <attribute name="portletList">[DependencyViewer]</attribute>
+        <reference name="PortalContainerServices">
+            <name>PlutoPortalServices</name>
+        </reference>
     </gbean>
 
 </web-app>

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-jetty/src/main/plan/plan.xml?rev=610984&r1=610983&r2=610984&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-jetty/src/main/plan/plan.xml Thu Jan 10 15:20:43 2008
@@ -35,5 +35,8 @@
         <attribute name="pageTitle">Applications/Plan Creator</attribute>
         <attribute name="portletContext">/plan-creator</attribute>
         <attribute name="portletList">[PlanCreator]</attribute>
+        <reference name="PortalContainerServices">
+            <name>PlutoPortalServices</name>
+        </reference>
     </gbean>
 </web-app>

Modified: geronimo/server/trunk/plugins/plancreator/plancreator-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/plancreator/plancreator-tomcat/src/main/plan/plan.xml?rev=610984&r1=610983&r2=610984&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/plancreator/plancreator-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/plancreator/plancreator-tomcat/src/main/plan/plan.xml Thu Jan 10 15:20:43 2008
@@ -38,5 +38,8 @@
         <attribute name="pageTitle">Applications/Plan Creator</attribute>
         <attribute name="portletContext">/plan-creator</attribute>
         <attribute name="portletList">[PlanCreator]</attribute>
+        <reference name="PortalContainerServices">
+            <name>PlutoPortalServices</name>
+        </reference>
     </gbean>
 </web-app>

Modified: geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/AdminConsoleExtensionGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/AdminConsoleExtensionGBean.java?rev=610984&r1=610983&r2=610984&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/AdminConsoleExtensionGBean.java (original)
+++ geronimo/server/trunk/plugins/pluto/geronimo-pluto/src/main/java/org/apache/geronimo/pluto/AdminConsoleExtensionGBean.java Thu Jan 10 15:20:43 2008
@@ -18,7 +18,6 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.Iterator;
 import java.util.List;
 
 import org.apache.commons.logging.Log;
@@ -26,8 +25,6 @@
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.gbean.GBeanLifecycle;
-import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.kernel.KernelRegistry;
 import org.apache.pluto.driver.services.portal.PageConfig;
 import org.apache.pluto.driver.services.portal.PortletWindowConfig;
 import org.apache.pluto.driver.services.portal.RenderConfigService;
@@ -43,46 +40,45 @@
  *    <attribute name="portletList">[portlet_id_1, portlet_id_2]</attribute>
  *  </gbean>
  */
-public class AdminConsoleExtensionGBean implements GBeanLifecycle, PlutoAccessInterface, AdminConsoleExtension {
+public class AdminConsoleExtensionGBean implements GBeanLifecycle {
     private static final Log log = LogFactory.getLog(AdminConsoleExtensionGBean.class);
     public static final GBeanInfo GBEAN_INFO;
-    private String pageTitle;
-    private String portletContext;
-    private ArrayList<String> portletList;
+    private final String pageTitle;
+    private final String portletContext;
+    private final ArrayList<String> portletList;
+    private final PortalContainerServices portletContainerServices;
 
     /* Constructor for GBean */
-    public AdminConsoleExtensionGBean(String pageTitle, String portletContext, ArrayList<String> portletList) {
+    public AdminConsoleExtensionGBean(String pageTitle, String portletContext, ArrayList<String> portletList, PortalContainerServices portalContainerServices) {
         super();
         this.pageTitle = pageTitle;
         this.portletContext = portletContext;
         this.portletList = portletList;
+        this.portletContainerServices = portalContainerServices;
     }
 
     /*
      * Add the PageConfig to pluto.  This will overwrite any existing pages with the same page name
      * @see org.apache.geronimo.pluto.PlutoAccessInterface#addPage(org.apache.pluto.driver.services.portal.PageConfig)
      */
-    public void addPage(PageConfig pageConfig) {
-        //Get the handle on the pluto service
-        PortalContainerServices container = getPortalContainerServices();
-
+    private void addPage(PageConfig pageConfig) {
         //Add the new PageConfig to Pluto
-        RenderConfigAdminService renderConfig = container.getAdminConfiguration().getRenderConfigAdminService();
+        RenderConfigAdminService renderConfig = portletContainerServices.getAdminConfiguration().getRenderConfigAdminService();
         renderConfig.addPage(pageConfig);
     }
-    
+
     /*
-     * This will add the portlets to the PageConfig in Pluto.
-     * @see org.apache.geronimo.pluto.PlutoAccessInterface#addPortlets(java.lang.String, java.lang.String, java.util.ArrayList)
-     */
-    public void addPortlets(String pageTitle, String portletContext, ArrayList<String> portletList) {
-        if(pageExists(pageTitle)){
-            PageConfig pageConfig = getPageConfigFromPluto(pageTitle);
+    * This will add the portlets to the PageConfig in Pluto.
+    * @see org.apache.geronimo.pluto.PlutoAccessInterface#addPortlets(java.lang.String, java.lang.String, java.util.ArrayList)
+    */
+    private void addPortlets() {
+        if (pageExists()) {
+            PageConfig pageConfig = getPageConfigFromPluto();
             int portletCount = portletList.size();
-            for (int i=0; i<portletCount; i++){
-                pageConfig.addPortlet(portletContext,portletList.get(i));
+            for (int i = 0; i < portletCount; i++) {
+                pageConfig.addPortlet(portletContext, portletList.get(i));
             }
-        }else{
+        } else {
             log.warn("Cannot add portlets to non-existent page " + pageTitle);
         }
     }
@@ -91,15 +87,12 @@
      * Removes a PageConfig object in Pluto with the pageTitle
      * @see org.apache.geronimo.pluto.PlutoAccessInterface#removePage(java.lang.String)
      */
-    public void removePage(String pageTitle) {
+    private void removePage() {
         //all we really need is a PageConfig with the page name
         PageConfig pageConfig = createPageConfig();
-        
-        //Get the handle on the pluto service
-        PortalContainerServices container = getPortalContainerServices();
-        
-        RenderConfigAdminService renderConfig = container.getAdminConfiguration().getRenderConfigAdminService();
-        
+
+        RenderConfigAdminService renderConfig = portletContainerServices.getAdminConfiguration().getRenderConfigAdminService();
+
         //This removePage method was added into Pluto as a patch (PLUTO-387). addPage functionality
         //was available, but removePage functionality was unavailable.
         //NOTE: getList returns a copy of the Map that stores page data in List form. Since it's a copy,
@@ -107,134 +100,107 @@
         //solution was just to try to patch the code.
         renderConfig.removePage(pageConfig);
     }
-    
+
     /*
-     * Removes the portletList from the PageConfig in Pluto
-     * @see org.apache.geronimo.pluto.PlutoAccessInterface#removePortlets(java.lang.String, java.util.ArrayList)
-     */
-    public void removePortlets(String pageTitle, ArrayList<String> portletList) {
-        if(pageExists(pageTitle)) {
-            PageConfig pageConfig = getPageConfigFromPluto(pageTitle);
+    * Removes the portletList from the PageConfig in Pluto
+    * @see org.apache.geronimo.pluto.PlutoAccessInterface#removePortlets(java.lang.String, java.util.ArrayList)
+    */
+    private void removePortlets() {
+        if (pageExists()) {
+            PageConfig pageConfig = getPageConfigFromPluto();
             int portletCount = portletList.size();
-            Collection list = pageConfig.getPortletIds();
-            
+            Collection<String> list = pageConfig.getPortletIds();
+
             //run through the list of portlets to remove
-            for (int i=0; i<portletCount; i++){
+            for (int i = 0; i < portletCount; i++) {
                 String portletName = portletList.get(i);
-                
+
                 //run through the list of portlets on this page and see if we can find a match
-                Iterator it = list.iterator();
-                while(it.hasNext()){
-                    String pid = (String) it.next();
+                for (String pid : list) {
                     String pletContext = PortletWindowConfig.parseContextPath(pid);
                     String pletName = PortletWindowConfig.parsePortletName(pid);
-                    if(portletContext.equals(pletContext) && portletName.equals(pletName)){
+                    if (portletContext.equals(pletContext) && portletName.equals(pletName)) {
                         pageConfig.removePortlet(pid);
                         break;
                     }
                 }
             }
-        }else{
+        } else {
             log.warn("can't remove portlets from non-existent page " + pageTitle);
         }
     }
-    
-    /*
-     * Gets the PortalContainerServices object from Geronimo
-     *  depends on the the PortalContainerServicesGBean
-     */
-    private PortalContainerServices getPortalContainerServices(){
-        Kernel kernel = KernelRegistry.getSingleKernel();     
-        PortalContainerServices container = null;    
-        try {      
-            container = (PortalContainerServices) kernel.getGBean(PortalContainerServices.class);   
-        } catch (Exception e) {
-            //If we fall into here, the likely (but not only) cause is that we couldn't find the
-            //PortalContainerService in the Kernel.
-            log.error("Cannot get the portal container services", e);
-        }
-        return container;
-    }
 
     /*
      * Creates a new PageConfig object with this GBean's pageTitle
      */
-    private PageConfig createPageConfig(){
+    private PageConfig createPageConfig() {
         //Create a new PageConfig
         PageConfig pageConfig = new PageConfig();
         pageConfig.setName(pageTitle);
         pageConfig.setUri("/WEB-INF/themes/default-theme.jsp");
         return pageConfig;
     }
-    
+
     /*
-     * Gets the PageConfig object from Pluto with that name
-     */
-    private PageConfig getPageConfigFromPluto(String pageTitle){
-        //Get the handle on the pluto service
-        PortalContainerServices container = getPortalContainerServices();
-        RenderConfigService service = container.getRenderConfigService();
-        
-        PageConfig pageConfig = service.getPage(pageTitle);
-        return pageConfig;
+    * Gets the PageConfig object from Pluto with that name
+    */
+    private PageConfig getPageConfigFromPluto() {
+        RenderConfigService service = portletContainerServices.getRenderConfigService();
+
+        return service.getPage(pageTitle);
     }
-    
+
     /*
-     * return true if Pluto contains a PageConfig with that name, else false
-     */
-    private boolean pageExists(String pageTitle){
+    * return true if Pluto contains a PageConfig with that name, else false
+    */
+    private boolean pageExists() {
         if (pageTitle == null) return false;
-        
-        //Get the handle on pluto's rendering service
-        PortalContainerServices container = getPortalContainerServices();
-        RenderConfigService service = container.getRenderConfigService();
-        
+
+        RenderConfigService service = portletContainerServices.getRenderConfigService();
+
         List<PageConfig> pageConfigs = service.getPages();
         for (PageConfig pageConfig : pageConfigs) {
             if (pageTitle.equals(pageConfig.getName())) {
                 return true;
             }
         }
-        
+
         return false;
     }
-    
+
     /*
-     * returns true if Pluto contains a PageConfig with that name and it has 0 or if there isn't a page with that name
-     */
-    private boolean pageIsEmpty(String pageTitle){
-        if(pageExists(pageTitle)){
-            PageConfig pageConfig = getPageConfigFromPluto(pageTitle);
-            return pageConfig.getPortletIds().size() > 0 ? false : true;
-        }else{
+    * returns true if Pluto contains a PageConfig with that name and it has 0 or if there isn't a page with that name
+    */
+    private boolean pageIsEmpty() {
+        if (pageExists()) {
+            PageConfig pageConfig = getPageConfigFromPluto();
+            return pageConfig.getPortletIds().size() == 0;
+        } else {
             log.debug("no pageConfig found for " + pageTitle);
             return true;
         }
     }
-    
+
     /*
-     * Called when the GBean is started
-     *   This adds/updates a Page in Pluto according to this GBean's specifications (ACE)
-     * @see org.apache.geronimo.gbean.GBeanLifecycle#doStart()
-     */
-    public synchronized void doStart() throws Exception{
-        //Get the handle on the pluto service
-        PortalContainerServices container = getPortalContainerServices();
-        
+    * Called when the GBean is started
+    *   This adds/updates a Page in Pluto according to this GBean's specifications (ACE)
+    * @see org.apache.geronimo.gbean.GBeanLifecycle#doStart()
+    */
+    public synchronized void doStart() throws Exception {
         // check to make sure that a portal driver has registered with the container services
-        if (container.getAdminConfiguration() == null) {
-            throw new RuntimeException ("No portal driver has been registered with the portal container services");
+        if (portletContainerServices.getAdminConfiguration() == null) {
+            throw new RuntimeException("No portal driver has been registered with the portal container services");
         }
-        
+
         //add the page if it doesn't exist yet
-        if(!pageExists(pageTitle)){
+        if (!pageExists()) {
             //create a PageConfig
             PageConfig newPageConfig = createPageConfig();
             addPage(newPageConfig);
         }
-        
+
         //add portlets to this newly created page
-        addPortlets(pageTitle, portletContext, portletList);
+        addPortlets();
         log.debug("Started AdminConsoleExtensionGBean for " + pageTitle);
     }
 
@@ -243,14 +209,14 @@
      *   This removes/updates a Page in Pluto according to this GBean's specifications
      * @see org.apache.geronimo.gbean.GBeanLifecycle#doStop()
      */
-    public synchronized void doStop() throws Exception{
+    public synchronized void doStop() throws Exception {
         try {
             //remove portlets from the page
-            removePortlets(pageTitle, portletList);
-            
+            removePortlets();
+
             //if the page has 0 portlets on it, then go ahead and remove it
-            if(pageIsEmpty(pageTitle)){
-                removePage(pageTitle);
+            if (pageIsEmpty()) {
+                removePage();
             }
         } catch (NullPointerException e) {
             // during normal server shutdown the portal driver has been shut down before
@@ -260,33 +226,35 @@
             // way to check to see if a service has been shut down.
             log.debug("could not remove portlets for " + pageTitle, e);
         }
-        
+
         log.debug("Stopped AdminConsoleExtensionGBean for " + pageTitle);
     }
-    
+
     /*
-     * Called when the GBean fails
-     * @see org.apache.geronimo.gbean.GBeanLifecycle#doFail()
-     */
+    * Called when the GBean fails
+    * @see org.apache.geronimo.gbean.GBeanLifecycle#doFail()
+    */
     public synchronized void doFail() {
         log.warn("AdminConsoleExtensionGBean for " + pageTitle + " failed.");
     }
-    
+
     /*
-     * Standard GBean information
-     */
+    * Standard GBean information
+    */
     static {
         GBeanInfoBuilder infoFactory = new GBeanInfoBuilder("AdminConsoleExtensionGBean", AdminConsoleExtensionGBean.class);
-        infoFactory.addInterface(AdminConsoleExtension.class);
         infoFactory.addAttribute("pageTitle", String.class, true, true);
         infoFactory.addAttribute("portletContext", String.class, true, true);
         infoFactory.addAttribute("portletList", ArrayList.class, true, true);
-        infoFactory.setConstructor(new String[] { 
-                "pageTitle", 
-                "portletContext", 
-                "portletList"});
+        infoFactory.addReference("PortalContainerServices", PortalContainerServices.class, "GBean");
+        infoFactory.setConstructor(new String[]{
+                "pageTitle",
+                "portletContext",
+                "portletList",
+                "PortalContainerServices"});
         GBEAN_INFO = infoFactory.getBeanInfo();
     }
+
     public static GBeanInfo getGBeanInfo() {
         return GBEAN_INFO;
     }

Modified: geronimo/server/trunk/plugins/system-database/system-database-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/system-database-jetty/src/main/plan/plan.xml?rev=610984&r1=610983&r2=610984&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/system-database-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/system-database/system-database-jetty/src/main/plan/plan.xml Thu Jan 10 15:20:43 2008
@@ -34,24 +34,36 @@
         <attribute name="pageTitle">Services/Database Pools</attribute>
         <attribute name="portletContext">/system-database</attribute>
         <attribute name="portletList">[DBWizard]</attribute>
+        <reference name="PortalContainerServices">
+            <name>PlutoPortalServices</name>
+        </reference>
     </gbean>
 
     <gbean name="InternalDB" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Embedded DB/DB Info</attribute>
         <attribute name="portletContext">/system-database</attribute>
         <attribute name="portletList">[InternalDB]</attribute>
+        <reference name="PortalContainerServices">
+            <name>PlutoPortalServices</name>
+        </reference>
     </gbean>
 
     <gbean name="DBViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Embedded DB/DB Manager</attribute>
         <attribute name="portletContext">/system-database</attribute>
         <attribute name="portletList">[DBViewer,RunSQL]</attribute>
+        <reference name="PortalContainerServices">
+            <name>PlutoPortalServices</name>
+        </reference>
     </gbean>
 
     <gbean name="DerbyLogViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Server/Server Logs</attribute>
         <attribute name="portletContext">/system-database</attribute>
         <attribute name="portletList">[DerbyLogViewer]</attribute>
+        <reference name="PortalContainerServices">
+            <name>PlutoPortalServices</name>
+        </reference>
     </gbean>
 
     <!-- database driver definitions -->

Modified: geronimo/server/trunk/plugins/system-database/system-database-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/system-database-tomcat/src/main/plan/plan.xml?rev=610984&r1=610983&r2=610984&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/system-database-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/system-database/system-database-tomcat/src/main/plan/plan.xml Thu Jan 10 15:20:43 2008
@@ -35,24 +35,36 @@
         <attribute name="pageTitle">Services/Database Pools</attribute>
         <attribute name="portletContext">/system-database</attribute>
         <attribute name="portletList">[DBWizard]</attribute>
+        <reference name="PortalContainerServices">
+            <name>PlutoPortalServices</name>
+        </reference>
     </gbean>
 
     <gbean name="InternalDB" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Embedded DB/DB Info</attribute>
         <attribute name="portletContext">/system-database</attribute>
         <attribute name="portletList">[InternalDB]</attribute>
+        <reference name="PortalContainerServices">
+            <name>PlutoPortalServices</name>
+        </reference>
     </gbean>
 
     <gbean name="DBViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Embedded DB/DB Manager</attribute>
         <attribute name="portletContext">/system-database</attribute>
         <attribute name="portletList">[DBViewer,RunSQL]</attribute>
+        <reference name="PortalContainerServices">
+            <name>PlutoPortalServices</name>
+        </reference>
     </gbean>
 
     <gbean name="DerbyLogViewer" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
         <attribute name="pageTitle">Server/Server Logs</attribute>
         <attribute name="portletContext">/system-database</attribute>
         <attribute name="portletList">[DerbyLogViewer]</attribute>
+        <reference name="PortalContainerServices">
+            <name>PlutoPortalServices</name>
+        </reference>
     </gbean>
 
     <!-- database driver definitions -->



Mime
View raw message