geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmcma...@apache.org
Subject svn commit: r548868 [2/2] - in /geronimo/sandbox/portals: ./ geronimo-console-standard/ geronimo-console-standard/src/main/java/org/apache/geronimo/console/util/ geronimo-console-standard/src/main/webapp/ geronimo-console-standard/src/main/webapp/WEB-I...
Date Tue, 19 Jun 2007 22:10:24 GMT
Modified: geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/web.xml?view=diff&rev=548868&r1=547039&r2=548868
==============================================================================
--- geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/WEB-INF/web.xml Tue Jun 19 15:10:23 2007
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <!--
 Licensed to the Apache Software Foundation (ASF) under one or more
 contributor license agreements.  See the NOTICE file distributed with
@@ -17,1164 +17,653 @@
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-
-<!-- $Rev$ $Date$ -->
-
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-         version="2.4">
-
+<web-app xmlns="http://java.sun.com/xml/ns/javaee" version="2.5" metadata-complete="true">
     <display-name>Geronimo Management Console Portlets</display-name>
-
-     <servlet>
-        <description>Automated generated Portlet Wrapper</description>
-        <display-name>Pluto Wrapper for Welcome Portlet</display-name>
-        <servlet-name>Welcome</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.welcome.WelcomePortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.Welcome</param-value>
-        </init-param>
-    </servlet>
     <servlet>
-        <display-name>Pluto Wrapper for EJB Server Portlet</display-name>
-        <servlet-name>EJBServer</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.EmptyPortlet</param-value>
-        </init-param>
+        <servlet-name>dwr-invoker</servlet-name>
+        <servlet-class>uk.ltd.getahead.dwr.DWRServlet</servlet-class>
         <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.EJBServer</param-value>
+            <param-name>debug</param-name>
+            <param-value>true</param-value>
         </init-param>
     </servlet>
     <servlet>
-        <display-name>Pluto Wrapper for J2CA Server Portlet</display-name>
-        <servlet-name>J2CAServer</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.EmptyPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.J2CAServer</param-value>
-        </init-param>
+        <servlet-name>car-export</servlet-name>
+        <servlet-class>org.apache.geronimo.console.car.CARExportServlet</servlet-class>
     </servlet>
     <servlet>
-        <display-name>Pluto Wrapper for CORBA Server Portlet</display-name>
-        <servlet-name>CORBAServer</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.EmptyPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.CORBAServer</param-value>
-        </init-param>
+        <servlet-name>maven-repo</servlet-name>
+        <servlet-class>org.apache.geronimo.console.car.GeronimoAsMavenServlet</servlet-class>
     </servlet>
     <servlet>
-        <display-name>Pluto Wrapper for UDDI Server Portlet</display-name>
-        <servlet-name>UDDIServer</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.EmptyPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.UDDIServer</param-value>
-        </init-param>
+        <servlet-name>plan-export</servlet-name>
+        <servlet-class>org.apache.geronimo.console.configmanager.PlanExportServlet</servlet-class>
     </servlet>
     <servlet>
-        <display-name>Pluto Wrapper for Mail Server Portlet</display-name>
-        <servlet-name>MailServer</servlet-name>
+        <servlet-name>Welcome</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.EmptyPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.MailServer</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>Welcome</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-        <display-name>Pluto Wrapper for EARModules Portlet</display-name>
-        <servlet-name>EARModules</servlet-name>
+        <servlet-name>ServerInfo</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.configmanager.ConfigManagerPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.EARModules</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>ServerInfo</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-        <display-name>Pluto Wrapper for WARModules Portlet</display-name>
-        <servlet-name>WARModules</servlet-name>
+        <servlet-name>JavaSysInfo</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.configmanager.ConfigManagerPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.WARModules</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>JavaSysInfo</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-        <display-name>Pluto Wrapper for EJBModules Portlet</display-name>
-        <servlet-name>EJBModules</servlet-name>
+        <servlet-name>LogManager</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.configmanager.ConfigManagerPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.EJBModules</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>LogManager</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-        <display-name>Pluto Wrapper for RARModules Portlet</display-name>
-        <servlet-name>RARModules</servlet-name>
+        <servlet-name>LogViewer</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.configmanager.ConfigManagerPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.RARModules</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>LogViewer</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-        <display-name>Pluto Wrapper for ClientModules Portlet</display-name>
-        <servlet-name>ClientModules</servlet-name>
+        <servlet-name>DerbyLogViewer</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.configmanager.ConfigManagerPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.ClientModules</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>DerbyLogViewer</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-        <display-name>Pluto Wrapper for SystemModules Portlet</display-name>
-        <servlet-name>SystemModules</servlet-name>
+        <servlet-name>WebAccessLogViewer</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.configmanager.ConfigManagerPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.SystemModules</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>WebAccessLogViewer</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-        <display-name>Pluto Wrapper for SecurityRealms Portlet</display-name>
-        <servlet-name>SecurityRealms</servlet-name>
+        <servlet-name>ServerManager</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.EmptyPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.SecurityRealms</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>ServerManager</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-        <display-name>Pluto Wrapper for Apache mod_jk Portlet</display-name>
-        <servlet-name>ApacheJK</servlet-name>
+        <servlet-name>WebServerManager</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.apache.jk.ApacheConfigPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.ApacheJK</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>WebServerManager</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-        <display-name>Pluto Wrapper for Thread Pool Portlet</display-name>
-        <servlet-name>ThreadPool</servlet-name>
+        <servlet-name>ConnectorManager</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.threads.ThreadPoolPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.ThreadPool</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>ConnectorManager</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-        <display-name>Pluto Wrapper for New Keystore Portlet</display-name>
-        <servlet-name>Keystores</servlet-name>
+        <servlet-name>EJBServer</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.keystores.KeystoresPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.Keystores</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>EJBServer</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-        <display-name>Pluto Wrapper for Certification Authority Portlet</display-name>
-        <servlet-name>CertificationAuthority</servlet-name>
+        <servlet-name>JMSServerManager</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.ca.CertificationAuthorityPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.CertificationAuthority</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>JMSServerManager</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
-
-
     <servlet>
-        <description>Automated generated Portlet Wrapper</description>
-        <display-name>Pluto Wrapper for Applications Portlet</display-name>
-        <servlet-name>Applications</servlet-name>
+        <servlet-name>JMSConnectorManager</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.configmanager.ConfigManagerPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.Applications</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>JMSConnectorManager</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-        <description>Automated generated Portlet Wrapper</description>
-        <display-name>Pluto Wrapper for Applications Portlet</display-name>
-        <servlet-name>Deployment</servlet-name>
+        <servlet-name>ThreadPool</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.configmanager.DeploymentPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.Deployment</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>ThreadPool</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-        <description>Automated generated Portlet Wrapper</description>
-        <display-name>Pluto Wrapper for Database Wizard Portlet</display-name>
-        <servlet-name>DBWizard</servlet-name>
+        <servlet-name>J2CAServer</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.databasemanager.wizard.DatabasePoolPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.DBWizard</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>J2CAServer</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-        <description>Automated generated Portlet Wrapper</description>
-        <display-name>Pluto Wrapper for JMS Wizard Portlet</display-name>
-        <servlet-name>JMSWizard</servlet-name>
+        <servlet-name>CORBAServer</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.jmsmanager.wizard.JMSResourcePortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.JMSWizard</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>CORBAServer</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-        <description>Automated generated Portlet Wrapper</description>
-        <display-name>Pluto Wrapper for Security Realm Wizard Portlet</display-name>
-        <servlet-name>RealmWizard</servlet-name>
+        <servlet-name>UDDIServer</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.securitymanager.realm.SecurityRealmPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.RealmWizard</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>UDDIServer</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-        <description>Automated generated Portlet Wrapper</description>
-        <display-name>Pluto Wrapper for JMS ConnectionFactory Portlet</display-name>
-        <servlet-name>JMSConnections</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.jmsmanager.JMSConnectionFactoryManagerPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.JMSConnections</param-value>
-        </init-param>
-    </servlet>
-
-   <servlet>
-        <description>Automated generated Portlet Wrapper</description>
-        <display-name>Pluto Wrapper for Gluecode SE Users Portlet</display-name>
-        <servlet-name>SEUsers</servlet-name>
+        <servlet-name>RepositoryViewer</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.securitymanager.SEUsersPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.SEUsers</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>RepositoryViewer</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
-
     <servlet>
-        <description>Automated generated Portlet Wrapper</description>
-        <display-name>Pluto Wrapper for Gluecode SE Groups Portlet</display-name>
-        <servlet-name>SEGroups</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.securitymanager.SEGroupsPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.SEGroups</param-value>
-        </init-param>
-    </servlet>
-
-
-      <servlet>
-        <description>Automated generated Portlet Wrapper</description>
-        <display-name>Pluto Wrapper for Log Manager Portlet</display-name>
-        <servlet-name>LogManager</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.logmanager.LogManagerPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.LogManager</param-value>
-        </init-param>
-   </servlet>
-   <servlet>
-        <description>Automated generated Portlet Wrapper</description>
-        <display-name>Pluto Wrapper for Log Viewer Portlet</display-name>
-        <servlet-name>LogViewer</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.logmanager.LogViewerPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.LogViewer</param-value>
-        </init-param>
-    </servlet>
-   <servlet>
-        <description>Automated generated Portlet Wrapper</description>
-        <display-name>Pluto Wrapper for Derby Log Viewer Portlet</display-name>
-        <servlet-name>DerbyLogViewer</servlet-name>
+        <servlet-name>DBWizard</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.derbylogmanager.DerbyLogViewerPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.DerbyLogViewer</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>DBWizard</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
-   <servlet>
-        <description>Automated generated Portlet Wrapper</description>
-        <display-name>Pluto Wrapper for Web Access Viewer Portlet</display-name>
-        <servlet-name>WebAccessLogViewer</servlet-name>
+    <servlet>
+        <servlet-name>JMSWizard</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.logmanager.WebAccessLogViewerPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.WebAccessLogViewer</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>JMSWizard</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-        <description>Automated generated Portlet Wrapper</description>
-        <display-name>Pluto Wrapper for Servlet Info Portlet</display-name>
-        <servlet-name>ServerInfo</servlet-name>
+        <servlet-name>RealmWizard</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.infomanager.ServerInfoPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.ServerInfo</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>RealmWizard</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-        <description>Automated generated Portlet Wrapper</description>
-        <display-name>Pluto Wrapper for Java System Info Portlet</display-name>
-        <servlet-name>JavaSysInfo</servlet-name>
+        <servlet-name>ApacheJK</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.infomanager.JavaSystemInfoPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.JavaSysInfo</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>ApacheJK</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
-
-    <!--
     <servlet>
-        <description>Automated generated Portlet Wrapper</description>
-        <display-name>Pluto Wrapper for Mail Managemer Portlet</display-name>
-        <servlet-name>MailManager</servlet-name>
+        <servlet-name>Keystores</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.mailmanager.MailManagerPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.MailManager</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>Keystores</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
-    -->
-
-    <!-- BPM Portlets -->
     <servlet>
-        <description>Automated generated Portlet Wrapper</description>
-        <display-name>Pluto Wrapper for BPM Deployment Portlet</display-name>
-        <servlet-name>BPMDeployment</servlet-name>
+        <servlet-name>CertificationAuthority</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>com.gluecode.se.console.standard.bpmmanager.BPMDeploymentPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.BPMDeployment</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>CertificationAuthority</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-        <description>Automated generated Portlet Wrapper</description>
-        <display-name>Pluto Wrapper for BPM Instance Portlet</display-name>
-        <servlet-name>BPMInstance</servlet-name>
+        <servlet-name>JMSConnections</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>com.gluecode.se.console.standard.bpmmanager.BPMInstancePortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.BPMInstance</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>JMSConnections</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-        <description>Automated generated Portlet Wrapper</description>
-        <display-name>Pluto Wrapper for BPM Task List Portlet</display-name>
-        <servlet-name>BPMTaskList</servlet-name>
+        <servlet-name>JMSManager</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>com.gluecode.se.console.standard.bpmmanager.BPMTaskListPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.BPMTaskList</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>JMSManager</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-        <description>Automated generated Portlet Wrapper</description>
-        <display-name>Pluto Wrapper for BPM Notification Portlet</display-name>
-        <servlet-name>BPMNotification</servlet-name>
+        <servlet-name>MailServer</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>com.gluecode.se.console.standard.bpmmanager.BPMNotificationPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.BPMNotification</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>MailServer</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-        <description>Automated generated Portlet Wrapper</description>
-        <display-name>Pluto Wrapper for BPM Operational Statistics Portlet</display-name>
-        <servlet-name>BPMStatistics</servlet-name>
+        <servlet-name>Applications</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>com.gluecode.se.console.standard.bpmmanager.BPMStatisticsPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.BPMStatistics</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>Applications</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
-
     <servlet>
-        <description>Automated generated Portlet Wrapper</description>
-        <display-name>Pluto Wrapper for JMS Portlet</display-name>
-        <servlet-name>JMSManager</servlet-name>
+        <servlet-name>Deployment</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.jmsmanager.JMSManagerPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.JMSManager</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>Deployment</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
-
-    <!-- Web Server Manager Portlet -->
     <servlet>
-        <description>Automated generated Portlet Wrapper</description>
-        <display-name>Pluto Wrapper for Web Server Management Portlet</display-name>
-        <servlet-name>WebServerManager</servlet-name>
+        <servlet-name>EARModules</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.webmanager.WebManagerPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.WebServerManager</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>EARModules</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
-    <!--
     <servlet>
-        <description>Automated generated Portlet Wrapper</description>
-        <display-name>Pluto Wrapper for HTTP Connector Management Portlet</display-name>
-        <servlet-name>HTTPConnectorManager</servlet-name>
+        <servlet-name>WARModules</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.webmanager.HttpConnectorPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.HTTPConnectorManager</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>WARModules</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-        <description>Automated generated Portlet Wrapper</description>
-        <display-name>Pluto Wrapper for HTTP Connector Management Portlet</display-name>
-        <servlet-name>HTTPSConnectorManager</servlet-name>
+        <servlet-name>EJBModules</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.webmanager.HttpsConnectorPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.HTTPSConnectorManager</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>EJBModules</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
--->
     <servlet>
-        <description>Automated generated Portlet Wrapper</description>
-        <display-name>Pluto Wrapper for Connector Management Portlet</display-name>
-        <servlet-name>ConnectorManager</servlet-name>
+        <servlet-name>RARModules</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.webmanager.ConnectorPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.ConnectorManager</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>RARModules</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
-    <!-- JMS Server Manager Portlet -->
     <servlet>
-        <description>Automated generated Portlet Wrapper</description>
-        <display-name>Pluto Wrapper for JMS Server Management Portlet</display-name>
-        <servlet-name>JMSServerManager</servlet-name>
+        <servlet-name>ClientModules</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.jmsmanager.server.JMSBrokerPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.JMSServerManager</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>ClientModules</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-        <description>Automated generated Portlet Wrapper</description>
-        <display-name>Pluto Wrapper for JMS Connector Management Portlet</display-name>
-        <servlet-name>JMSConnectorManager</servlet-name>
+        <servlet-name>SystemModules</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.jmsmanager.server.JMSConnectorPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.JMSConnectorManager</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>SystemModules</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
-
-
     <servlet>
-        <description>Automated generated Portlet Wrapper</description>
-        <display-name>Pluto Wrapper for JNDI Portlet</display-name>
-        <servlet-name>JNDI</servlet-name>
+        <servlet-name>SEUsers</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.jndimanager.JNDIInfoPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.JNDI</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>SEUsers</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-        <description>Automated generated Portlet Wrapper</description>
-        <display-name>Pluto Wrapper for Repository Viewer Portlet</display-name>
-        <servlet-name>RepositoryViewer</servlet-name>
+        <servlet-name>SEGroups</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.repository.RepositoryViewPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.RepositoryViewer</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>SEGroups</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-        <description>Automated generated Portlet Wrapper</description>
-        <display-name>Pluto Wrapper for Server Manager Portlet</display-name>
-        <servlet-name>ServerManager</servlet-name>
+        <servlet-name>SecurityRealms</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.servermanager.ServerManagerPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.ServerManager</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>SecurityRealms</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
-
-    <!-- DB manager servlets -->
     <servlet>
-        <description>Automated generated Portlet Wrapper</description>
-        <display-name>Pluto Wrapper for Internal DB Portlet</display-name>
         <servlet-name>InternalDB</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.internaldb.InternalDBPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.InternalDB</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>InternalDB</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-        <description>Automated generated Portlet Wrapper</description>
-        <display-name>Pluto Wrapper for DB Viewer Portlet</display-name>
         <servlet-name>DBViewer</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.internaldb.DBViewerPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.DBViewer</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>DBViewer</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-        <description>Automated generated Portlet Wrapper</description>
-        <display-name>Pluto Wrapper for Run SQL Portlet</display-name>
         <servlet-name>RunSQL</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.internaldb.RunSQLPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.RunSQL</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>RunSQL</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-        <description>Automated generated Portlet Wrapper</description>
-        <display-name>Pluto Wrapper for CAR Import/Export Portlet</display-name>
         <servlet-name>ImportExport</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.car.ImportExportPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.ImportExport</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>ImportExport</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
-
     <servlet>
-      <display-name>DWR Servlet</display-name>
-      <servlet-name>dwr-invoker</servlet-name>
-      <servlet-class>uk.ltd.getahead.dwr.DWRServlet</servlet-class>
-      <init-param>
-         <param-name>debug</param-name>
-         <param-value>true</param-value>
-      </init-param>
-    </servlet>
-    <servlet>
-      <display-name>CAR Export Servlet</display-name>
-      <servlet-name>car-export</servlet-name>
-      <servlet-class>org.apache.geronimo.console.car.CARExportServlet</servlet-class>
-    </servlet>
-    <servlet>
-      <display-name>Geronimo as Maven Repo Servlet</display-name>
-      <servlet-name>maven-repo</servlet-name>
-      <servlet-class>org.apache.geronimo.console.car.GeronimoAsMavenServlet</servlet-class>
-    </servlet>
-    <servlet>
-      <display-name>Plan Export Servlet</display-name>
-      <servlet-name>plan-export</servlet-name>
-      <servlet-class>org.apache.geronimo.console.configmanager.PlanExportServlet</servlet-class>
-    </servlet>
-    <servlet>
-        <description>Automated generated Portlet Wrapper</description>
-        <display-name>Pluto Wrapper for JMX Viewer Portlet</display-name>
         <servlet-name>JMXViewer</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.jmxmanager.JMXManagerPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.JMXViewer</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>JMXViewer</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-        <description>Automated generated Portlet Wrapper</description>
-        <display-name>Pluto Wrapper for LDAP Viewer Portlet</display-name>
         <servlet-name>LDAPViewer</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.ldapmanager.LDAPManagerPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.LDAPViewer</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>LDAPViewer</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-        <description>Automated generated Portlet Wrapper</description>
-        <display-name>Pluto Wrapper for ClassLoaderView Portlet</display-name>
         <servlet-name>ClassLoaderViewer</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.classloaderview.ClassLoaderViewPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.ClassLoaderViewer</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>ClassLoaderViewer</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-        <description>Automated generated Portlet Wrapper</description>
-        <display-name>Pluto Wrapper for JNDIView Portlet</display-name>
         <servlet-name>JNDIViewer</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.jndiview.JNDIViewPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.JNDIViewer</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>JNDIViewer</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-        <description>Automated generated Portlet Wrapper</description>
-        <display-name>Pluto Wrapper for DependencyView Portlet</display-name>
         <servlet-name>DependencyViewer</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
-            <param-name>portlet-class</param-name>
-            <param-value>org.apache.geronimo.console.dependencyview.DependencyViewPortlet</param-value>
-        </init-param>
-        <init-param>
-            <param-name>portlet-guid</param-name>
-            <param-value>console-standard.DependencyViewer</param-value>
+            <param-name>portlet-name</param-name>
+            <param-value>DependencyViewer</param-value>
         </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
-
-    <servlet-mapping>
-        <servlet-name>LDAPViewer</servlet-name>
-        <url-pattern>/LDAPViewer/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>JMXViewer</servlet-name>
-        <url-pattern>/JMXViewer/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>ClassLoaderViewer</servlet-name>
-        <url-pattern>/ClassLoaderViewer/*</url-pattern>
-    </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>JNDIViewer</servlet-name>
-        <url-pattern>/JNDIViewer/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>DependencyViewer</servlet-name>
-        <url-pattern>/DependencyViewer/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-      <servlet-name>dwr-invoker</servlet-name>
-      <url-pattern>/dwr/*</url-pattern>
+        <servlet-name>dwr-invoker</servlet-name>
+        <url-pattern>/dwr/*</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-      <servlet-name>car-export</servlet-name>
-      <url-pattern>/car-export</url-pattern>
+        <servlet-name>car-export</servlet-name>
+        <url-pattern>/car-export</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-      <servlet-name>maven-repo</servlet-name>
-      <url-pattern>/maven-repo/*</url-pattern>
+        <servlet-name>maven-repo</servlet-name>
+        <url-pattern>/maven-repo/*</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-      <servlet-name>plan-export</servlet-name>
-      <url-pattern>/plan-export</url-pattern>
+        <servlet-name>plan-export</servlet-name>
+        <url-pattern>/plan-export</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
         <servlet-name>Welcome</servlet-name>
-        <url-pattern>/Welcome/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>EJBServer</servlet-name>
-        <url-pattern>/EJBServer/*</url-pattern>
+        <url-pattern>/PlutoInvoker/Welcome</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>J2CAServer</servlet-name>
-        <url-pattern>/J2CAServer/*</url-pattern>
+        <servlet-name>ServerInfo</servlet-name>
+        <url-pattern>/PlutoInvoker/ServerInfo</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>CORBAServer</servlet-name>
-        <url-pattern>/CORBAServer/*</url-pattern>
+        <servlet-name>JavaSysInfo</servlet-name>
+        <url-pattern>/PlutoInvoker/JavaSysInfo</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>UDDIServer</servlet-name>
-        <url-pattern>/UDDIServer/*</url-pattern>
+        <servlet-name>LogManager</servlet-name>
+        <url-pattern>/PlutoInvoker/LogManager</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>MailServer</servlet-name>
-        <url-pattern>/MailServer/*</url-pattern>
+        <servlet-name>LogViewer</servlet-name>
+        <url-pattern>/PlutoInvoker/LogViewer</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>EARModules</servlet-name>
-        <url-pattern>/EARModules/*</url-pattern>
+        <servlet-name>DerbyLogViewer</servlet-name>
+        <url-pattern>/PlutoInvoker/DerbyLogViewer</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>WARModules</servlet-name>
-        <url-pattern>/WARModules/*</url-pattern>
+        <servlet-name>WebAccessLogViewer</servlet-name>
+        <url-pattern>/PlutoInvoker/WebAccessLogViewer</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>EJBModules</servlet-name>
-        <url-pattern>/EJBModules/*</url-pattern>
+        <servlet-name>ServerManager</servlet-name>
+        <url-pattern>/PlutoInvoker/ServerManager</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>RARModules</servlet-name>
-        <url-pattern>/RARModules/*</url-pattern>
+        <servlet-name>WebServerManager</servlet-name>
+        <url-pattern>/PlutoInvoker/WebServerManager</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>ClientModules</servlet-name>
-        <url-pattern>/ClientModules/*</url-pattern>
+        <servlet-name>ConnectorManager</servlet-name>
+        <url-pattern>/PlutoInvoker/ConnectorManager</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>SystemModules</servlet-name>
-        <url-pattern>/SystemModules/*</url-pattern>
+        <servlet-name>EJBServer</servlet-name>
+        <url-pattern>/PlutoInvoker/EJBServer</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>SecurityRealms</servlet-name>
-        <url-pattern>/SecurityRealms/*</url-pattern>
+        <servlet-name>JMSServerManager</servlet-name>
+        <url-pattern>/PlutoInvoker/JMSServerManager</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>ApacheJK</servlet-name>
-        <url-pattern>/ApacheJK/*</url-pattern>
+        <servlet-name>JMSConnectorManager</servlet-name>
+        <url-pattern>/PlutoInvoker/JMSConnectorManager</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
         <servlet-name>ThreadPool</servlet-name>
-        <url-pattern>/ThreadPool/*</url-pattern>
+        <url-pattern>/PlutoInvoker/ThreadPool</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>Keystores</servlet-name>
-        <url-pattern>/Keystores/*</url-pattern>
+        <servlet-name>J2CAServer</servlet-name>
+        <url-pattern>/PlutoInvoker/J2CAServer</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>CertificationAuthority</servlet-name>
-        <url-pattern>/CertificationAuthority/*</url-pattern>
+        <servlet-name>CORBAServer</servlet-name>
+        <url-pattern>/PlutoInvoker/CORBAServer</url-pattern>
     </servlet-mapping>
-
-
     <servlet-mapping>
-        <servlet-name>Applications</servlet-name>
-        <url-pattern>/Applications/*</url-pattern>
+        <servlet-name>UDDIServer</servlet-name>
+        <url-pattern>/PlutoInvoker/UDDIServer</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>Deployment</servlet-name>
-        <url-pattern>/Deployment/*</url-pattern>
+        <servlet-name>RepositoryViewer</servlet-name>
+        <url-pattern>/PlutoInvoker/RepositoryViewer</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
         <servlet-name>DBWizard</servlet-name>
-        <url-pattern>/DBWizard/*</url-pattern>
+        <url-pattern>/PlutoInvoker/DBWizard</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
         <servlet-name>JMSWizard</servlet-name>
-        <url-pattern>/JMSWizard/*</url-pattern>
+        <url-pattern>/PlutoInvoker/JMSWizard</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
         <servlet-name>RealmWizard</servlet-name>
-        <url-pattern>/RealmWizard/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>SEUsers</servlet-name>
-        <url-pattern>/SEUsers/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>SEGroups</servlet-name>
-        <url-pattern>/SEGroups/*</url-pattern>
-    </servlet-mapping>
-
-    <servlet-mapping>
-        <servlet-name>SecurityRealms</servlet-name>
-        <url-pattern>/SecurityRealms/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>LogManager</servlet-name>
-        <url-pattern>/LogManager/*</url-pattern>
+        <url-pattern>/PlutoInvoker/RealmWizard</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>LogViewer</servlet-name>
-        <url-pattern>/LogViewer/*</url-pattern>
+        <servlet-name>ApacheJK</servlet-name>
+        <url-pattern>/PlutoInvoker/ApacheJK</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>DerbyLogViewer</servlet-name>
-        <url-pattern>/DerbyLogViewer/*</url-pattern>
+        <servlet-name>Keystores</servlet-name>
+        <url-pattern>/PlutoInvoker/Keystores</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>WebAccessLogViewer</servlet-name>
-        <url-pattern>/WebAccessLogViewer/*</url-pattern>
+        <servlet-name>CertificationAuthority</servlet-name>
+        <url-pattern>/PlutoInvoker/CertificationAuthority</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>ServerInfo</servlet-name>
-        <url-pattern>/ServerInfo/*</url-pattern>
+        <servlet-name>JMSConnections</servlet-name>
+        <url-pattern>/PlutoInvoker/JMSConnections</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>JavaSysInfo</servlet-name>
-        <url-pattern>/JavaSysInfo/*</url-pattern>
+        <servlet-name>JMSManager</servlet-name>
+        <url-pattern>/PlutoInvoker/JMSManager</url-pattern>
     </servlet-mapping>
-    <!--
     <servlet-mapping>
-        <servlet-name>MailManager</servlet-name>
-        <url-pattern>/MailManager/*</url-pattern>
+        <servlet-name>MailServer</servlet-name>
+        <url-pattern>/PlutoInvoker/MailServer</url-pattern>
     </servlet-mapping>
-    -->
-    <!-- BPM Servlet Mappings -->
     <servlet-mapping>
-        <servlet-name>BPMDeployment</servlet-name>
-        <url-pattern>/BPMDeployment/*</url-pattern>
+        <servlet-name>Applications</servlet-name>
+        <url-pattern>/PlutoInvoker/Applications</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>BPMInstance</servlet-name>
-        <url-pattern>/BPMInstance/*</url-pattern>
+        <servlet-name>Deployment</servlet-name>
+        <url-pattern>/PlutoInvoker/Deployment</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>BPMTaskList</servlet-name>
-        <url-pattern>/BPMTaskList/*</url-pattern>
+        <servlet-name>EARModules</servlet-name>
+        <url-pattern>/PlutoInvoker/EARModules</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>BPMNotification</servlet-name>
-        <url-pattern>/BPMNotification/*</url-pattern>
+        <servlet-name>WARModules</servlet-name>
+        <url-pattern>/PlutoInvoker/WARModules</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>BPMStatistics</servlet-name>
-        <url-pattern>/BPMStatistics/*</url-pattern>
+        <servlet-name>EJBModules</servlet-name>
+        <url-pattern>/PlutoInvoker/EJBModules</url-pattern>
     </servlet-mapping>
-    
-    <security-constraint>
-        <web-resource-collection>
-            <web-resource-name></web-resource-name>
-            <url-pattern>/</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>
-    </security-constraint>
-    <login-config>
-        <auth-method>BASIC</auth-method>
-        <realm-name>geronimo-admin</realm-name>
-    </login-config>
-    <security-role>
-        <role-name>admin</role-name>
-    </security-role>
-    
-
     <servlet-mapping>
-        <servlet-name>JMSManager</servlet-name>
-        <url-pattern>/JMSManager/*</url-pattern>
+        <servlet-name>RARModules</servlet-name>
+        <url-pattern>/PlutoInvoker/RARModules</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>JMSConnections</servlet-name>
-        <url-pattern>/JMSConnections/*</url-pattern>
+        <servlet-name>ClientModules</servlet-name>
+        <url-pattern>/PlutoInvoker/ClientModules</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>WebServerManager</servlet-name>
-        <url-pattern>/WebServerManager/*</url-pattern>
+        <servlet-name>SystemModules</servlet-name>
+        <url-pattern>/PlutoInvoker/SystemModules</url-pattern>
     </servlet-mapping>
-<!--
     <servlet-mapping>
-        <servlet-name>HTTPConnectorManager</servlet-name>
-        <url-pattern>/HTTPConnectorManager/*</url-pattern>
+        <servlet-name>SEUsers</servlet-name>
+        <url-pattern>/PlutoInvoker/SEUsers</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>HTTPSConnectorManager</servlet-name>
-        <url-pattern>/HTTPSConnectorManager/*</url-pattern>
+        <servlet-name>SEGroups</servlet-name>
+        <url-pattern>/PlutoInvoker/SEGroups</url-pattern>
     </servlet-mapping>
--->
     <servlet-mapping>
-        <servlet-name>ConnectorManager</servlet-name>
-        <url-pattern>/ConnectorManager/*</url-pattern>
+        <servlet-name>SecurityRealms</servlet-name>
+        <url-pattern>/PlutoInvoker/SecurityRealms</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>JMSServerManager</servlet-name>
-        <url-pattern>/JMSServerManager/*</url-pattern>
+        <servlet-name>InternalDB</servlet-name>
+        <url-pattern>/PlutoInvoker/InternalDB</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>JMSConnectorManager</servlet-name>
-        <url-pattern>/JMSConnectorManager/*</url-pattern>
+        <servlet-name>DBViewer</servlet-name>
+        <url-pattern>/PlutoInvoker/DBViewer</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>JNDI</servlet-name>
-        <url-pattern>/JNDI/*</url-pattern>
+        <servlet-name>RunSQL</servlet-name>
+        <url-pattern>/PlutoInvoker/RunSQL</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>RepositoryViewer</servlet-name>
-        <url-pattern>/RepositoryViewer/*</url-pattern>
+        <servlet-name>ImportExport</servlet-name>
+        <url-pattern>/PlutoInvoker/ImportExport</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>ServerManager</servlet-name>
-        <url-pattern>/ServerManager/*</url-pattern>
+        <servlet-name>JMXViewer</servlet-name>
+        <url-pattern>/PlutoInvoker/JMXViewer</url-pattern>
     </servlet-mapping>
-    <!-- DB manager servlet mappings -->
     <servlet-mapping>
-        <servlet-name>InternalDB</servlet-name>
-        <url-pattern>/InternalDB/*</url-pattern>
+        <servlet-name>LDAPViewer</servlet-name>
+        <url-pattern>/PlutoInvoker/LDAPViewer</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>DBViewer</servlet-name>
-        <url-pattern>/DBViewer/*</url-pattern>
+        <servlet-name>ClassLoaderViewer</servlet-name>
+        <url-pattern>/PlutoInvoker/ClassLoaderViewer</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>RunSQL</servlet-name>
-        <url-pattern>/RunSQL/*</url-pattern>
+        <servlet-name>JNDIViewer</servlet-name>
+        <url-pattern>/PlutoInvoker/JNDIViewer</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>ImportExport</servlet-name>
-        <url-pattern>/ImportExport/*</url-pattern>
+        <servlet-name>DependencyViewer</servlet-name>
+        <url-pattern>/PlutoInvoker/DependencyViewer</url-pattern>
     </servlet-mapping>
-
-<!-- org.apache.geronimo.console.core.securitymanager.SecurityRealmsPortlet
-    <security-role>
-        <role-name>tomcat</role-name>
-    </security-role>
-    -->
-    <welcome-file-list>
-        <welcome-file>index.html</welcome-file>
-    </welcome-file-list>
-
-    <jsp-config>
-        <taglib>
-            <taglib-uri>http://java.sun.com/portlet</taglib-uri>
-            <taglib-location>/WEB-INF/tld/portlet.tld</taglib-location>
-        </taglib>
-    </jsp-config>
-<!--
-    <env-entry>
-        <env-entry-name>GeronimoKernel</env-entry-name>
-        <env-entry-type>org.apache.geronimo.kernel.Kernel</env-entry-type>
-    </env-entry>
--->
-
-<!--
-    <taglib>
-        <taglib-uri>http://java.sun.com/portlet</taglib-uri>
-        <taglib-location>/WEB-INF/tld/portlet.tld</taglib-location>
-    </taglib>
--->
-
-<!--    <resource-ref>
-        <res-ref-name>SystemDatasource</res-ref-name>
-        <res-type>javax.sql.DataSource</res-type>
-        <res-auth>Container</res-auth>
-    </resource-ref>
-
-    <resource-ref>
-        <res-ref-name>GCMSSQLDataSource</res-ref-name>
-        <res-type>javax.sql.DataSource</res-type>
-        <res-auth>Container</res-auth>
-    </resource-ref> -->
-
-    <!-- 
-    For security reasons requests to the dwr servlet go through
-    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
-    attributes to create URLs that it sends back to the client.
-     -->    
-    <filter>
-        <filter-name>dwr-filter</filter-name>
-        <filter-class>org.apache.geronimo.console.servlet.ForwardDispatchFilter</filter-class>
-    </filter>
-    <filter-mapping>
-        <filter-name>dwr-filter</filter-name>
-        <servlet-name>dwr-invoker</servlet-name>
-        <dispatcher>FORWARD</dispatcher>
-    </filter-mapping>
-
 </web-app>

Modified: geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/index.html?view=diff&rev=548868&r1=547039&r2=548868
==============================================================================
--- geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/index.html (original)
+++ geronimo/sandbox/portals/geronimo-console-standard/src/main/webapp/index.html Tue Jun 19 15:10:23 2007
@@ -16,7 +16,7 @@
 -->
 <html>
   <head>
-    <META HTTP-EQUIV="Refresh" CONTENT="0; URL=../console">
+    <META HTTP-EQUIV="Refresh" CONTENT="0; URL=../pluto/manager">
     <title>Redirect to Portal</title>
   </head>
   <body bgcolor="white">

Modified: geronimo/sandbox/portals/pluto-portal/src/main/resources/pluto-portal-driver-config.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-portal/src/main/resources/pluto-portal-driver-config.xml?view=diff&rev=548868&r1=548867&r2=548868
==============================================================================
--- geronimo/sandbox/portals/pluto-portal/src/main/resources/pluto-portal-driver-config.xml (original)
+++ geronimo/sandbox/portals/pluto-portal/src/main/resources/pluto-portal-driver-config.xml Tue Jun 19 15:10:23 2007
@@ -37,19 +37,144 @@
 
 
   <!-- Render configuration which defines the portal pages. -->
-  <render-config default="Test Page">
-    <page name="Test Page" uri="/WEB-INF/themes/pluto-default-theme.jsp">
-      <portlet context="/testsuite" name="TestPortlet1"/>
-      <portlet context="/testsuite" name="TestPortlet2"/>
+  <render-config default="Welcome">
+    <page name="Welcome" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+      <portlet context="/manager" name="Welcome"/>
+    </page>
+
+    <page name="Server Info" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+      <portlet context="/manager" name="ServerInfo"/>
+    </page>
+
+    <page name="Java System Info" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+      <portlet context="/manager" name="JavaSysInfo"/>
+    </page>
+
+    <page name="Log Manager" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+      <portlet context="/manager" name="LogManager"/>
+      <portlet context="/manager" name="LogViewer"/>
+      <portlet context="/manager" name="DerbyLogViewer"/>
+      <portlet context="/manager" name="WebAccessLogViewer"/>
+    </page>
+
+    <page name="ServerManager" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+      <portlet context="/manager" name="ServerManager"/>
+    </page>
+
+    <page name="Web Server" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+      <portlet context="/manager" name="WebServerManager"/>
+      <portlet context="/manager" name="ConnectorManager"/>
+    </page>
+
+    <page name="JMS" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+      <portlet context="/manager" name="JMSServerManager"/>
+      <portlet context="/manager" name="JMSConnectorManager"/>
+<!--
+      <portlet context="/manager" name="JMSConnections"/>
+      <portlet context="/manager" name="JMSManager"/>
+      <portlet context="/manager" name="JMSWizard"/>
+-->
+    </page>
+
+    <page name="Thread Pool" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+      <portlet context="/manager" name="ThreadPool"/>
+    </page>
+
+    <page name="Repository" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+      <portlet context="/manager" name="RepositoryViewer"/>
+    </page>
+
+    <page name="Database Wizard" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+      <portlet context="/manager" name="DBWizard"/>
+    </page>
+
+    <page name="Security Realms" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+      <portlet context="/manager" name="RealmWizard"/>
+    </page>
+
+    <page name="Apache Mod JK" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+      <portlet context="/manager" name="ApacheJK"/>
+    </page>
+
+    <page name="Keystores" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+      <portlet context="/manager" name="Keystores"/>
+    </page>
+
+    <page name="Certification Authority" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+      <portlet context="/manager" name="CertificationAuthority"/>
+    </page>
+
+    <page name="Deploy New" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+      <portlet context="/manager" name="Deployment"/>
+    </page>
+
+    <page name="EAR Modules" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+      <portlet context="/manager" name="EARModules"/>
     </page>
-    <page name="Secondary Page" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+
+    <page name="WAR Modules" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+      <portlet context="/manager" name="WARModules"/>
+    </page>
+
+    <page name="RAR Modules" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+      <portlet context="/manager" name="RARModules"/>
+    </page>
+
+    <page name="Client Modules" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+      <portlet context="/manager" name="ClientModules"/>
+    </page>
+
+    <page name="System Modules" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+      <portlet context="/manager" name="SystemModules"/>
+    </page>
+
+    <page name="Plugins" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+      <portlet context="/manager" name="ImportExport"/>
+    </page>
+
+    <page name="Users and Groups" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+      <portlet context="/manager" name="SEUsers"/>
+      <portlet context="/manager" name="SEGroups"/>
+    </page>
+
+    <page name="Manage System Database" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+      <portlet context="/manager" name="DBViewer"/>
+      <portlet context="/manager" name="RunSQL"/>
+    </page>
+
+    <page name="System Database Properties" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+      <portlet context="/manager" name="InternalDB"/>
+    </page>
+
+    <page name="JMX Viewer" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+      <portlet context="/manager" name="JMXViewer"/>
+    </page>
+
+    <page name="LDAP Viewer" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+      <portlet context="/manager" name="LDAPViewer"/>
+    </page>
+
+    <page name="ClassLoader Viewer" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+      <portlet context="/manager" name="ClassLoaderViewer"/>
+    </page>
+
+    <page name="JNDI Viewer" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+      <portlet context="/manager" name="JNDIViewer"/>
+    </page>
+
+    <page name="Dependency Viewer" uri="/WEB-INF/themes/pluto-default-theme.jsp">
+      <portlet context="/manager" name="DependencyViewer"/>
+    </page>
+
+    <page name="Pluto Tests" uri="/WEB-INF/themes/pluto-default-theme.jsp">
       <portlet context="/testsuite" name="TestPortlet1"/>
-      <portlet context="/testsuite" name="TestPortlet2"/>
     </page>
+
     <page name="Pluto Admin" uri="/WEB-INF/themes/pluto-default-theme.jsp">
-      <portlet context="/pluto" name="PlutoPageAdmin"/>
       <portlet context="/pluto" name="AboutPortlet"/>
+      <portlet context="/pluto" name="PlutoPageAdmin"/>
     </page>
+
   </render-config>
   
 </pluto-portal-driver>

Modified: geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/geronimo-web.xml?view=diff&rev=548868&r1=548867&r2=548868
==============================================================================
--- geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/geronimo-web.xml Tue Jun 19 15:10:23 2007
@@ -34,6 +34,11 @@
         <dep:version>1.0-SNAPSHOT</dep:version>
         <dep:type>car</dep:type>
       </dep:dependency>
+      <dep:dependency>
+        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
+        <dep:artifactId>dojo-tomcat</dep:artifactId>
+        <dep:type>car</dep:type>
+      </dep:dependency>
     </dep:dependencies>
     <dep:hidden-classes>
        <filter>org.springframework</filter>

Modified: geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/themes/navigation.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/themes/navigation.jsp?view=diff&rev=548868&r1=548867&r2=548868
==============================================================================
--- geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/themes/navigation.jsp (original)
+++ geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/themes/navigation.jsp Tue Jun 19 15:10:23 2007
@@ -22,9 +22,11 @@
 <div id="navigation">
     <h2>Navigation:</h2>
     <ul>
+<!--
         <li>
         <a href='<c:out value="${pageContext.request.contextPath}"/>/about.jsp'>About Pluto</a>
         </li>
+-->
         <c:forEach var="page" items="${driverConfig.pages}">
             <c:choose>
                 <c:when test="${page == currentPage}">

Modified: geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/themes/pluto-default-theme.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/themes/pluto-default-theme.jsp?view=diff&rev=548868&r1=548867&r2=548868
==============================================================================
--- geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/themes/pluto-default-theme.jsp (original)
+++ geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/themes/pluto-default-theme.jsp Tue Jun 19 15:10:23 2007
@@ -35,6 +35,40 @@
         @import "<c:out value="${pageContext.request.contextPath}"/>/portlet-spec-1.0.css";
     </style>
     <script type="text/javascript" src="<c:out value="${pageContext.request.contextPath}"/>/pluto.js"></script>
+
+
+<!--  TODO: I don't like putting the dojo stuff here.  needs to be pulled in at the module level -->
+    <script type="text/javascript">
+        // var djConfig = { isDebug: true, debugAtAllCosts: true };
+    </script>
+
+    <script type="text/javascript" src="/dojo/dojo.js"></script>
+
+    <script type="text/javascript">
+        dojo.require("dojo.lang.*");
+        dojo.require("dojo.widget.*");
+        // Pane includes
+        dojo.require("dojo.widget.ContentPane");
+        dojo.require("dojo.widget.LayoutContainer"); // Before: LayoutPane
+        dojo.require("dojo.widget.SplitContainer"); // Before: SplitPane
+        // Tree includes
+        dojo.require("dojo.widget.Tree");
+        dojo.require("dojo.widget.TreeBasicController");
+        dojo.require("dojo.widget.TreeContextMenu");
+        dojo.require("dojo.widget.TreeSelector");
+        // Tab includes
+        dojo.require("dojo.widget.TabContainer");
+        // Etc includes
+        dojo.require("dojo.widget.SortableTable");
+        dojo.require("dojo.widget.ComboBox");
+        dojo.require("dojo.widget.Tooltip");
+        dojo.require("dojo.widget.validate");
+        // Includes Dojo source for debugging
+        // dojo.hostenv.writeIncludes();
+    </script>
+
+
+
 </head>
 
 <body>
@@ -60,35 +94,11 @@
         <pluto:isMaximized var="isMax"/>
 
         <!-- Left column -->
-        <c:choose>
-            <c:when test="${isMax}">
                     <c:forEach var="portlet" varStatus="status"
                                items="${currentPage.portletIds}">
                         <c:set var="portlet" value="${portlet}" scope="request"/>
                         <jsp:include page="portlet-skin.jsp"/>
                     </c:forEach>
-             </c:when>
-
-            <c:otherwise>
-                <div id="portlets-left-column">
-                    <c:forEach var="portlet" varStatus="status"
-                               items="${currentPage.portletIds}" step="2">
-                        <c:set var="portlet" value="${portlet}" scope="request"/>
-                        <jsp:include page="portlet-skin.jsp"/>
-                    </c:forEach>
-                </div>
-
-                <!-- Right column -->
-                <div id="portlets-right-column">
-                    <c:forEach var="portlet" varStatus="status"
-                               items="${currentPage.portletIds}" begin="1" step="2">
-                        <c:set var="portlet" value="${portlet}" scope="request"/>
-                        <jsp:include page="portlet-skin.jsp"/>
-                    </c:forEach>
-                </div>
-
-            </c:otherwise>
-        </c:choose>
 
     </div>
 

Modified: geronimo/sandbox/portals/pluto-testsuite/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-testsuite/pom.xml?view=diff&rev=548868&r1=548867&r2=548868
==============================================================================
--- geronimo/sandbox/portals/pluto-testsuite/pom.xml (original)
+++ geronimo/sandbox/portals/pluto-testsuite/pom.xml Tue Jun 19 15:10:23 2007
@@ -45,7 +45,6 @@
     <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-servlet_2.5_spec</artifactId>
-        <version>1.1-SNAPSHOT</version>
         <scope>provided</scope>
     </dependency>
 

Modified: geronimo/sandbox/portals/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pom.xml?view=diff&rev=548868&r1=548867&r2=548868
==============================================================================
--- geronimo/sandbox/portals/pom.xml (original)
+++ geronimo/sandbox/portals/pom.xml Tue Jun 19 15:10:23 2007
@@ -188,6 +188,36 @@
                 <version>1.1.1</version>
             </dependency>
 
+            <dependency>
+                <groupId>commons-io</groupId>
+                <artifactId>commons-io</artifactId>
+                <version>1.1</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.geronimo.specs</groupId>
+                <artifactId>geronimo-servlet_2.5_spec</artifactId>
+                <version>1.1-SNAPSHOT</version>
+            </dependency>
+
+            <dependency>
+                <groupId>org.apache.activemq</groupId>
+                <artifactId>activemq-core</artifactId>
+                <version>4.1.1</version>
+            </dependency>
+
+            <dependency>
+                <groupId>commons-fileupload</groupId>
+                <artifactId>commons-fileupload</artifactId>
+                <version>1.1.1</version>
+            </dependency>
+
+            <dependency>
+                <groupId>dwr</groupId>
+                <artifactId>dwr</artifactId>
+                <version>1.1.3</version>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 
@@ -359,6 +389,7 @@
                 <module>pluto-container</module>
                 <module>pluto-portal</module>
                 <module>pluto-testsuite</module>
+                <module>geronimo-console-standard</module>
             </modules>
         </profile>
     </profiles>



Mime
View raw message