geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r224485 - in /geronimo/trunk/sandbox: ./ console-framework/src/webapp/WEB-INF/aggregation/ console-framework/src/webapp/WEB-INF/data/ console-standard/src/java/org/apache/geronimo/console/ console-standard/src/java/org/apache/geronimo/conso...
Date Sat, 23 Jul 2005 17:51:09 GMT
Author: ammulder
Date: Sat Jul 23 10:51:01 2005
New Revision: 224485

URL: http://svn.apache.org/viewcvs?rev=224485&view=rev
Log:
Add placeholders for the portlets I would like to see added
Rearrange the page hierarchy
Change navigation bar to show tree fully expanded

Added:
    geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/EmptyPortlet.java   (with props)
Modified:
    geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/aggregation/TabNavigation.jsp
    geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/data/pageregistry.xml
    geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/data/portletentityregistry.xml
    geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/util/PortletManager.java
    geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/portlet.xml
    geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/web.xml
    geronimo/trunk/sandbox/console.sh

Modified: geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/aggregation/TabNavigation.jsp
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/aggregation/TabNavigation.jsp?rev=224485&r1=224484&r2=224485&view=diff
==============================================================================
--- geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/aggregation/TabNavigation.jsp (original)
+++ geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/aggregation/TabNavigation.jsp Sat Jul 23 10:51:01 2005
@@ -32,6 +32,32 @@
 <%
     PortalURL url = PortalEnvironment.getPortalEnvironment(request).getRequestedPortalURL();
     NavigationTreeBean[] tree = fragment.getNavigationView(url);
+
+    // Aaron's code -- to force the navigation tree to render fully expanded, and not offer links to non-leaf nodes
+    //                 todo this is pretty bad and should be replaced by a subclass of TabNavigation
+    //                 see http://svn.apache.org/repos/asf/portals/pluto/trunk/portal/src/java/org/apache/pluto/portalImpl/aggregation/navigation/
+    java.util.List list = new java.util.ArrayList();
+    java.util.Stack stack = new java.util.Stack();
+    Navigation root = fragment.getRootNavigation();
+    java.util.List childList = (java.util.List)root.getChildren();
+    java.util.Map map = new java.util.HashMap();
+    for(int i=childList.size()-1; i>=0; i--) {
+        stack.push(childList.get(i));
+        map.put(stack.peek(), new Integer(0));
+    }
+    while(!stack.isEmpty()) {
+        Navigation nav = (Navigation) stack.pop();
+        Integer depth = (Integer) map.get(nav);
+        list.add(new NavigationTreeBean(nav, nav.getChildren().size() > 0 || url.isPartOfGlobalNavigation(nav.getLinkedFragment().getId()), depth.intValue()));
+        childList = (java.util.List)nav.getChildren();
+        for(int i=childList.size()-1; i>=0; i--) {
+            stack.push(childList.get(i));
+            map.put(stack.peek(), new Integer(depth.intValue()+1));
+        }
+    }
+    tree = (NavigationTreeBean[]) list.toArray(new NavigationTreeBean[list.size()]);
+    // End Aaron's Code
+
     for (int i=0; i<tree.length; i++) {
 %>
 <%

Modified: geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/data/pageregistry.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/data/pageregistry.xml?rev=224485&r1=224484&r2=224485&view=diff
==============================================================================
--- geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/data/pageregistry.xml (original)
+++ geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/data/pageregistry.xml Sat Jul 23 10:51:01 2005
@@ -20,249 +20,484 @@
     <fragment name="navigation" class="org.apache.pluto.portalImpl.aggregation.navigation.TabNavigation">
     </fragment>
 
-    <fragment name="info" type="page">
+    <fragment name="server" type="page">
         <navigation>
-            <title>Server Info</title>
-            <description>Show info about this server</description>
+            <title>Server</title>
+            <description>Holds all settings about the running server</description>
         </navigation>
 
-        <fragment name="row2" type="row">
-            <fragment name="col2" type="column">
-                <fragment name="p7" type="portlet">
-                    <property name="portlet" value="5.8"/>
+        <fragment name="info" type="page">
+            <navigation>
+                <title>Information</title>
+                <description>Shows various information on the current server</description>
+            </navigation>
+
+            <fragment name="row1" type="row">
+                <fragment name="col1" type="column">
+                    <fragment name="p1" type="portlet">
+                        <property name="portlet" value="5.8"/>
+                    </fragment>
                 </fragment>
             </fragment>
         </fragment>
-        <fragment name="row3" type="row">
-            <fragment name="col2" type="column">
-                <fragment name="p7" type="portlet">
-                    <property name="portlet" value="5.24"/>
+
+        <fragment name="jvm" type="page">
+            <navigation>
+                <title>JVM</title>
+                <description>Shows JVM properties for the current server</description>
+            </navigation>
+
+            <fragment name="row1" type="row">
+                <fragment name="col1" type="column">
+                    <fragment name="p1" type="portlet">
+                        <property name="portlet" value="5.24"/>
+                    </fragment>
                 </fragment>
             </fragment>
         </fragment>
-    </fragment>
 
-    <fragment name="server" type="page">
-        <navigation>
-            <title>Server Management</title>
-            <description>Manage this server</description>
-        </navigation>
+        <fragment name="logs" type="page">
+            <navigation>
+                <title>Server Logs</title>
+                <description>View Log Files</description>
+            </navigation>
+            <fragment name="row1" type="row">
+                <fragment name="col1" type="column">
+                    <fragment name="p2" type="portlet">
+                        <property name="portlet" value="5.10"/>
+                    </fragment>
+                </fragment>
+            </fragment>
+            <fragment name="row2" type="row">
+                <fragment name="col1" type="column">
+                    <fragment name="p2" type="portlet">
+                        <property name="portlet" value="5.26"/>
+                    </fragment>
+                </fragment>
+            </fragment>
+            <fragment name="row3" type="row">
+                <fragment name="col1" type="column">
+                    <fragment name="p2" type="portlet">
+                        <property name="portlet" value="5.27"/>
+                    </fragment>
+                </fragment>
+            </fragment>
+            <fragment name="row4" type="row">
+                <fragment name="col1" type="column">
+                    <fragment name="p2" type="portlet">
+                        <property name="portlet" value="5.28"/>
+                    </fragment>
+                </fragment>
+            </fragment>
 
-        <fragment name="row2" type="row">
-            <fragment name="col2" type="column">
-                <fragment name="p7" type="portlet">
-                    <property name="portlet" value="5.30"/>
+        </fragment>
+
+        <fragment name="mgmt" type="page">
+            <navigation>
+                <title>Shutdown/Restart</title>
+                <description>Manage this server</description>
+            </navigation>
+
+            <fragment name="row1" type="row">
+                <fragment name="col1" type="column">
+                    <fragment name="p1" type="portlet">
+                        <property name="portlet" value="5.30"/>
+                    </fragment>
                 </fragment>
             </fragment>
         </fragment>
-    </fragment>
 
-    <fragment name="logs" type="page">
-        <navigation>
-            <title>Logs</title>
-            <description>View Log Files</description>
-        </navigation>
-        <fragment name="row1" type="row">
-            <fragment name="col1" type="column">
-                <fragment name="p2" type="portlet">
-                <property name="portlet" value="5.10"/>
+        <fragment name="web" type="page">
+            <navigation>
+                <title>Web Server</title>
+                <description>Configure Web Server</description>
+            </navigation>
+            <fragment name="row1" type="row">
+                <fragment name="col1" type="column">
+                    <fragment name="p1" type="portlet">
+                        <property name="portlet" value="5.18"/>
+                    </fragment>
+                </fragment>
+            </fragment>
+            <fragment name="row2" type="row">
+                <fragment name="col1" type="column">
+                    <fragment name="p2" type="portlet">
+                        <property name="portlet" value="5.19"/>
+                    </fragment>
+                </fragment>
+            </fragment>
+            <fragment name="row3" type="row">
+                <fragment name="col1" type="column">
+                    <fragment name="p3" type="portlet">
+                        <property name="portlet" value="5.20"/>
+                    </fragment>
+                </fragment>
+            </fragment>
+            <fragment name="row4" type="row">
+                <fragment name="col1" type="column">
+                    <fragment name="p4" type="portlet">
+                        <property name="portlet" value="5.21"/>
+                    </fragment>
                 </fragment>
             </fragment>
         </fragment>
-        <fragment name="row2" type="row">
-            <fragment name="col1" type="column">
-                <fragment name="p2" type="portlet">
-                <property name="portlet" value="5.26"/>
+
+        <fragment name="ejb" type="page">
+            <navigation>
+                <title>EJB Server</title>
+                <description>Configures the EJB server</description>
+            </navigation>
+
+            <fragment name="row1" type="row">
+                <fragment name="col1" type="column">
+                    <fragment name="p1" type="portlet">
+                        <property name="portlet" value="5.50"/>
+                    </fragment>
                 </fragment>
             </fragment>
         </fragment>
-        <fragment name="row3" type="row">
-            <fragment name="col1" type="column">
-                <fragment name="p2" type="portlet">
-                <property name="portlet" value="5.27"/>
+
+        <fragment name="j2ca" type="page">
+            <navigation>
+                <title>J2EE Connectors</title>
+                <description>Configures the J2EE Connector server features</description>
+            </navigation>
+
+            <fragment name="row1" type="row">
+                <fragment name="col1" type="column">
+                    <fragment name="p1" type="portlet">
+                        <property name="portlet" value="5.51"/>
+                    </fragment>
                 </fragment>
             </fragment>
         </fragment>
-        <fragment name="row4" type="row">
-            <fragment name="col1" type="column">
-                <fragment name="p2" type="portlet">
-                <property name="portlet" value="5.28"/>
+
+        <fragment name="corba" type="page">
+            <navigation>
+                <title>CORBA/IIOP</title>
+                <description>Configures the CORBA/IIOP server features</description>
+            </navigation>
+
+            <fragment name="row1" type="row">
+                <fragment name="col1" type="column">
+                    <fragment name="p1" type="portlet">
+                        <property name="portlet" value="5.52"/>
+                    </fragment>
                 </fragment>
             </fragment>
         </fragment>
 
+        <fragment name="uddi" type="page">
+            <navigation>
+                <title>UDDI Server</title>
+                <description>Configures the UDDI Server application</description>
+            </navigation>
+
+            <fragment name="row1" type="row">
+                <fragment name="col1" type="column">
+                    <fragment name="p1" type="portlet">
+                        <property name="portlet" value="5.53"/>
+                    </fragment>
+                </fragment>
+            </fragment>
+        </fragment>
     </fragment>
 
-    <fragment name="apps" type="page">
+    <fragment name="services" type="page">
         <navigation>
-            <title>Applications</title>
-            <description>Manage applications on this server</description>
+            <title>Services</title>
+            <description>Manage services available on this server</description>
         </navigation>
 
-        <fragment name="row2" type="row">
-            <fragment name="col2" type="column">
-                <fragment name="p3" type="portlet">
-                    <property name="portlet" value="5.1"/>
+        <fragment name="repo" type="page">
+            <navigation>
+                <title>Common Libraries</title>
+                <description>View Repository</description>
+            </navigation>
+            <fragment name="row1" type="row">
+                <fragment name="col1" type="column">
+                    <fragment name="p1" type="portlet">
+                        <property name="portlet" value="5.29"/>
+                    </fragment>
                 </fragment>
             </fragment>
         </fragment>
-        <fragment name="row3" type="row">
-            <fragment name="col2" type="column">
-                <fragment name="p3" type="portlet">
-                    <property name="portlet" value="5.22"/>
+
+        <fragment name="jdbc" type="page">
+            <navigation>
+                <title>Database Pools</title>
+                <description>Manage database connections</description>
+            </navigation>
+
+            <fragment name="row1" type="row">
+                <fragment name="col1" type="column">
+                    <fragment name="p1" type="portlet">
+                        <property name="portlet" value="5.2"/>
+                    </fragment>
                 </fragment>
             </fragment>
         </fragment>
-    </fragment>
 
-    <fragment name="repo" type="page">
-        <navigation>
-            <title>Repository</title>
-            <description>View Repository</description>
-        </navigation>
-        <fragment name="row2" type="row">
-            <fragment name="col2" type="column">
-                <fragment name="p3" type="portlet">
-                    <property name="portlet" value="5.29"/>
+        <fragment name="jms" type="page">
+            <navigation>
+                <title>JMS</title>
+                <description>Configure Java Message Service</description>
+            </navigation>
+            <fragment name="row1" type="row">
+                <fragment name="col1" type="column">
+                    <fragment name="p1" type="portlet">
+                        <property name="portlet" value="5.31"/>
+                    </fragment>
+                </fragment>
+            </fragment>
+            <fragment name="row2" type="row">
+                <fragment name="col1" type="column">
+                    <fragment name="p2" type="portlet">
+                        <property name="portlet" value="5.17"/>
+                    </fragment>
                 </fragment>
             </fragment>
         </fragment>
-    </fragment>
 
-    <fragment name="jdbc" type="page">
-        <navigation>
-            <title>Databases</title>
-            <description>Manage database connections</description>
-        </navigation>
 
-        <fragment name="row3" type="row">
-            <fragment name="col3" type="column">
-                <fragment name="p4" type="portlet">
-                    <property name="portlet" value="5.2"/>
+        <fragment name="mail" type="page">
+            <navigation>
+                <title>Java Mail</title>
+                <description>Configure Java Mail service</description>
+            </navigation>
+
+            <fragment name="row1" type="row">
+                <fragment name="col1" type="column">
+                    <fragment name="p1" type="portlet">
+                        <property name="portlet" value="5.54"/>
+                    </fragment>
                 </fragment>
             </fragment>
         </fragment>
     </fragment>
 
-    <fragment name="jms" type="page">
+    <fragment name="apps" type="page">
         <navigation>
-            <title>JMS</title>
-            <description>Configure Java Message Service</description>
+            <title>Applications</title>
+            <description>Manage applications on this server</description>
         </navigation>
-        <fragment name="row3" type="row">
-            <fragment name="col3" type="column">
-                <fragment name="p4" type="portlet">
-                    <property name="portlet" value="5.31"/>
+
+        <fragment name="all" type="page">
+            <navigation>
+                <title>All Configurations</title>
+                <description>This should be replaced</description>
+            </navigation>
+
+            <fragment name="row2" type="row">
+                <fragment name="col2" type="column">
+                    <fragment name="p3" type="portlet">
+                        <property name="portlet" value="5.1"/>
+                    </fragment>
                 </fragment>
             </fragment>
-        </fragment>           
-        <fragment name="row4" type="row">
-            <fragment name="col4" type="column">
-                <fragment name="p5" type="portlet">
-                    <property name="portlet" value="5.17"/>
+            <fragment name="row3" type="row">
+                <fragment name="col2" type="column">
+                    <fragment name="p3" type="portlet">
+                        <property name="portlet" value="5.22"/>
+                    </fragment>
                 </fragment>
             </fragment>
         </fragment>
-    </fragment>
 
-   <fragment name="Security" type="page">
-      <navigation>
-         <title>Security</title>
-         <description>Manage security on this server</description>
-      </navigation>
-        <fragment name="Console" type="page">
-           <navigation>
-              <title>Console Realm</title>
-              <description>Manage the console security realm on this server</description>
-           </navigation>
-            <fragment name="row1" type="row">
-               <fragment name="col1" type="column">
-                  <fragment name="p2" type="portlet">
-                     <property name="portlet" value="5.3"/>
-                  </fragment>
-               </fragment>
+        <fragment name="ear" type="page">
+            <navigation>
+                <title>Application EARs</title>
+                <description>Manage EARs on this server</description>
+            </navigation>
+
+            <fragment name="row1" type="row">
+                <fragment name="col1" type="column">
+                    <fragment name="p1" type="portlet">
+                        <property name="portlet" value="5.55"/>
+                    </fragment>
+                </fragment>
             </fragment>
-            <fragment name="row2" type="row">
+        </fragment>
+
+        <fragment name="war" type="page">
+            <navigation>
+                <title>Web App WARs</title>
+                <description>Manage EARs on this server</description>
+            </navigation>
+
+            <fragment name="row1" type="row">
                 <fragment name="col1" type="column">
-                    <fragment name="p3" type="portlet">
-                        <property name="portlet" value="5.4" />
+                    <fragment name="p1" type="portlet">
+                        <property name="portlet" value="5.56"/>
                     </fragment>
                 </fragment>
             </fragment>
-         </fragment>
-    </fragment>
-    <fragment name="web" type="page">
-        <navigation>
-            <title>Web Server</title>
-            <description>Configure Web Server</description>
-        </navigation>
-        <fragment name="row1" type="row">
-            <fragment name="col1" type="column">
-                <fragment name="p1" type="portlet">
-                    <property name="portlet" value="5.18"/>
+        </fragment>
+
+        <fragment name="ejb" type="page">
+            <navigation>
+                <title>EJB JARs</title>
+                <description>Manage EJB JARs on this server</description>
+            </navigation>
+
+            <fragment name="row1" type="row">
+                <fragment name="col1" type="column">
+                    <fragment name="p1" type="portlet">
+                        <property name="portlet" value="5.57"/>
+                    </fragment>
                 </fragment>
             </fragment>
         </fragment>
-        <fragment name="row2" type="row">
-            <fragment name="col1" type="column">
-                <fragment name="p2" type="portlet">
-                    <property name="portlet" value="5.19"/>
+
+        <fragment name="rar" type="page">
+            <navigation>
+                <title>J2EE Connectors</title>
+                <description>Manage RARs on this server</description>
+            </navigation>
+
+            <fragment name="row1" type="row">
+                <fragment name="col1" type="column">
+                    <fragment name="p1" type="portlet">
+                        <property name="portlet" value="5.58"/>
+                    </fragment>
                 </fragment>
             </fragment>
         </fragment>
-        <fragment name="row3" type="row">
-            <fragment name="col1" type="column">
-                <fragment name="p3" type="portlet">
-                    <property name="portlet" value="5.20"/>
+
+        <fragment name="client" type="page">
+            <navigation>
+                <title>App Clients</title>
+                <description>Manage client JARs on this server</description>
+            </navigation>
+
+            <fragment name="row1" type="row">
+                <fragment name="col1" type="column">
+                    <fragment name="p1" type="portlet">
+                        <property name="portlet" value="5.59"/>
+                    </fragment>
                 </fragment>
             </fragment>
         </fragment>
-        <fragment name="row4" type="row">
-            <fragment name="col1" type="column">
-                <fragment name="p4" type="portlet">
-                    <property name="portlet" value="5.21"/>
+
+        <fragment name="system" type="page">
+            <navigation>
+                <title>System Modules</title>
+                <description>Manage system deployments on this server</description>
+            </navigation>
+
+            <fragment name="row1" type="row">
+                <fragment name="col1" type="column">
+                    <fragment name="p1" type="portlet">
+                        <property name="portlet" value="5.60"/>
+                    </fragment>
                 </fragment>
             </fragment>
         </fragment>
+
     </fragment>
-    <fragment name="internalDB" type="page">
+
+    <fragment name="Security" type="page">
         <navigation>
-            <title>Internal DB</title>
-            <description>Show info about the server's internal database</description>
+            <title>Security</title>
+            <description>Manage security on this server</description>
         </navigation>
+        <fragment name="Console" type="page">
+            <navigation>
+                <title>Console Realm</title>
+                <description>Manage the console security realm on this server</description>
+            </navigation>
+            <fragment name="row1" type="row">
+                <fragment name="col1" type="column">
+                    <fragment name="p2" type="portlet">
+                        <property name="portlet" value="5.3"/>
+                    </fragment>
+                </fragment>
+            </fragment>
+            <fragment name="row2" type="row">
+                <fragment name="col1" type="column">
+                    <fragment name="p3" type="portlet">
+                        <property name="portlet" value="5.4"/>
+                    </fragment>
+                </fragment>
+            </fragment>
+        </fragment>
 
-        <fragment name="DBInfo" type="page">
+        <fragment name="realms" type="page">
             <navigation>
-                <title>DB Info</title>
-                <description>Information about the internal database/s</description>
+                <title>All Realms</title>
+                <description>Manage all security realms on this server</description>
             </navigation>
 
-            <fragment name="row2" type="row">
-                <fragment name="col2" type="column">
-                    <fragment name="p8" type="portlet">
-                        <property name="portlet" value="5.32"/>
+            <fragment name="row1" type="row">
+                <fragment name="col1" type="column">
+                    <fragment name="p1" type="portlet">
+                        <property name="portlet" value="5.61"/>
                     </fragment>
                 </fragment>
             </fragment>
         </fragment>
 
-        <fragment name="DBManager" type="page">
+        <fragment name="keystore" type="page">
             <navigation>
-                <title>DB Manager</title>
-                <description>Manage the internal database/s</description>
+                <title>Keystore</title>
+                <description>Manage the keystore for this server</description>
             </navigation>
 
-            <fragment name="row3" type="row">
-                <fragment name="col2" type="column">
-                    <fragment name="p9" type="portlet">
-                        <property name="portlet" value="5.33"/>
+            <fragment name="row1" type="row">
+                <fragment name="col1" type="column">
+                    <fragment name="p1" type="portlet">
+                        <property name="portlet" value="5.62"/>
                     </fragment>
                 </fragment>
             </fragment>
-            <fragment name="row2" type="row">
-                <fragment name="col2" type="column">
-                    <fragment name="p9" type="portlet">
-                        <property name="portlet" value="5.34"/>
+        </fragment>
+    </fragment>
+
+    <fragment name="misc" type="page">
+        <navigation>
+            <title>Misc</title>
+            <description>Other management features</description>
+        </navigation>
+
+        <fragment name="internalDB" type="page">
+            <navigation>
+                <title>Embedded DB</title>
+                <description>Show info about the server's internal database</description>
+            </navigation>
+
+            <fragment name="DBInfo" type="page">
+                <navigation>
+                    <title>DB Info</title>
+                    <description>Information about the internal database/s</description>
+                </navigation>
+
+                <fragment name="row2" type="row">
+                    <fragment name="col2" type="column">
+                        <fragment name="p8" type="portlet">
+                            <property name="portlet" value="5.32"/>
+                        </fragment>
+                    </fragment>
+                </fragment>
+            </fragment>
+
+            <fragment name="DBManager" type="page">
+                <navigation>
+                    <title>DB Manager</title>
+                    <description>Manage the internal database/s</description>
+                </navigation>
+
+                <fragment name="row3" type="row">
+                    <fragment name="col2" type="column">
+                        <fragment name="p9" type="portlet">
+                            <property name="portlet" value="5.33"/>
+                        </fragment>
+                    </fragment>
+                </fragment>
+                <fragment name="row2" type="row">
+                    <fragment name="col2" type="column">
+                        <fragment name="p9" type="portlet">
+                            <property name="portlet" value="5.34"/>
+                        </fragment>
                     </fragment>
                 </fragment>
             </fragment>

Modified: geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/data/portletentityregistry.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/data/portletentityregistry.xml?rev=224485&r1=224484&r2=224485&view=diff
==============================================================================
--- geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/data/portletentityregistry.xml (original)
+++ geronimo/trunk/sandbox/console-framework/src/webapp/WEB-INF/data/portletentityregistry.xml Sat Jul 23 10:51:01 2005
@@ -87,5 +87,47 @@
         <portlet id="34">
             <definition-id>console-standard.RunSQL</definition-id>
         </portlet>
+
+<!-- Aaron Added -->
+        <portlet id="50">
+            <definition-id>console-standard.EJBServer</definition-id>
+        </portlet>
+        <portlet id="51">
+            <definition-id>console-standard.J2CAServer</definition-id>
+        </portlet>
+        <portlet id="52">
+            <definition-id>console-standard.CORBAServer</definition-id>
+        </portlet>
+        <portlet id="53">
+            <definition-id>console-standard.UDDIServer</definition-id>
+        </portlet>
+
+        <portlet id="54">
+            <definition-id>console-standard.MailServer</definition-id>
+        </portlet>
+        <portlet id="55">
+            <definition-id>console-standard.EARModules</definition-id>
+        </portlet>
+        <portlet id="56">
+            <definition-id>console-standard.WARModules</definition-id>
+        </portlet>
+        <portlet id="57">
+            <definition-id>console-standard.EJBModules</definition-id>
+        </portlet>
+        <portlet id="58">
+            <definition-id>console-standard.RARModules</definition-id>
+        </portlet>
+        <portlet id="59">
+            <definition-id>console-standard.ClientModules</definition-id>
+        </portlet>
+        <portlet id="60">
+            <definition-id>console-standard.SystemModules</definition-id>
+        </portlet>
+        <portlet id="61">
+            <definition-id>console-standard.SecurityRealms</definition-id>
+        </portlet>
+        <portlet id="62">
+            <definition-id>console-standard.Keystore</definition-id>
+        </portlet>
     </application>
 </portlet-entity-registry>

Added: geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/EmptyPortlet.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/EmptyPortlet.java?rev=224485&view=auto
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/EmptyPortlet.java (added)
+++ geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/EmptyPortlet.java Sat Jul 23 10:51:01 2005
@@ -0,0 +1,34 @@
+/**
+ *
+ * Copyright 2003-2004 The Apache Software Foundation
+ *
+ *  Licensed under the Apache License, Version 2.0 (the "License");
+ *  you may not use this file except in compliance with the License.
+ *  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.console;
+
+import java.io.IOException;
+import javax.portlet.GenericPortlet;
+import javax.portlet.RenderRequest;
+import javax.portlet.RenderResponse;
+import javax.portlet.PortletException;
+
+/**
+ * @version $Rev: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $
+ */
+public class EmptyPortlet extends GenericPortlet {
+    protected void doView(RenderRequest renderRequest, RenderResponse renderResponse) throws PortletException, IOException {
+        renderResponse.setContentType("text/html");
+        renderResponse.getWriter().println("<p>This portlet is not yet implemented</p>");
+        renderResponse.getWriter().println("<p>I am currently using <tt>"+getClass().getName()+"</tt></p>");
+    }
+}

Propchange: geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/EmptyPortlet.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/util/PortletManager.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/util/PortletManager.java?rev=224485&r1=224484&r2=224485&view=diff
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/util/PortletManager.java (original)
+++ geronimo/trunk/sandbox/console-standard/src/java/org/apache/geronimo/console/util/PortletManager.java Sat Jul 23 10:51:01 2005
@@ -18,29 +18,45 @@
 
 import javax.portlet.PortletRequest;
 import javax.portlet.PortletSession;
+import javax.naming.InitialContext;
+import javax.naming.NamingException;
 import org.apache.geronimo.kernel.KernelRegistry;
+import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.j2ee.management.J2EEDomain;
 import org.apache.geronimo.j2ee.management.J2EEServer;
 import org.apache.geronimo.j2ee.management.geronimo.JVM;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 
 /**
  * @version $Rev: 46019 $ $Date: 2004-09-14 05:56:06 -0400 (Tue, 14 Sep 2004) $
  */
 public class PortletManager {
+    private final static Log log = LogFactory.getLog(PortletManager.class);
     private final static String HELPER_KEY = "org.apache.geronimo.console.ManagementHelper";
     private final static String DOMAIN_KEY = "org.apache.geronimo.console.J2EEDomain";
     private final static String SERVER_KEY = "org.apache.geronimo.console.J2EEServer";
     private final static String JVM_KEY = "org.apache.geronimo.console.JVM";
 
-    private static ManagementHelper createHelper() {
+    private static ManagementHelper createHelper(PortletRequest request) {
         //todo: consider making this configurable; we could easily connect to a remote kernel if we wanted to
-        return new KernelManagementHelper(KernelRegistry.getSingleKernel());
+        Kernel kernel = null;
+        try {
+            kernel = (Kernel) new InitialContext().lookup("java:comp/env/GeronimoKernel");
+        } catch (NamingException e) {
+//            log.error("Unable to look up kernel in JNDI", e);
+        }
+        if(kernel == null) {
+            log.warn("Unable to find kernel in JNDI; using KernelRegistry instead");
+            kernel = KernelRegistry.getSingleKernel();
+        }
+        return new KernelManagementHelper(kernel);
     }
 
     public static ManagementHelper getManagementHelper(PortletRequest request) {
         ManagementHelper helper = (ManagementHelper) request.getPortletSession(true).getAttribute(HELPER_KEY, PortletSession.APPLICATION_SCOPE);
         if(helper == null) {
-            helper = createHelper();
+            helper = createHelper(request);
             request.getPortletSession().setAttribute(HELPER_KEY, helper, PortletSession.APPLICATION_SCOPE);
         }
         return helper;

Modified: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/portlet.xml?rev=224485&r1=224484&r2=224485&view=diff
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/portlet.xml (original)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/portlet.xml Sat Jul 23 10:51:01 2005
@@ -21,83 +21,87 @@
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xsi:schemaLocation="http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd
                         http://java.sun.com/xml/ns/portlet/portlet-app_1_0.xsd">
-	<portlet>
-        <description>Portlet for managing applications</description>
-        <portlet-name>Applications</portlet-name>
-        <display-name>Applications Portlet</display-name>
-		
-        <portlet-class>org.apache.geronimo.console.configmanager.ConfigManagerPortlet</portlet-class>
+
+<!-- Server Tab -->
+
+    <portlet>
+        <description>Portlet for displaying server info</description>
+        <portlet-name>ServerInfo</portlet-name>
+        <display-name>Server Info Portlet</display-name>
+
+        <portlet-class>org.apache.geronimo.console.infomanager.ServerInfoPortlet</portlet-class>
 
         <expiration-cache>-1</expiration-cache>
-		        
+
         <supports>
-			<mime-type>text/html</mime-type>
+            <mime-type>text/html</mime-type>
             <portlet-mode>VIEW</portlet-mode>
             <portlet-mode>HELP</portlet-mode>
-		</supports>
+        </supports>
 
-        <supported-locale>en</supported-locale>        
+        <supported-locale>en</supported-locale>
 
-		<portlet-info>
-			<title>Installed Applications</title>
-			<short-title>Applications</short-title>
-			<keywords>Applications</keywords>
+        <portlet-info>
+            <title>Server Info</title>
+            <short-title>ServerInfo</short-title>
+            <keywords>ServerInfo</keywords>
         </portlet-info>
-	</portlet>
+    </portlet>
 
-	<portlet>
-        <description>Portlet for deploying applications</description>
-        <portlet-name>Deployment</portlet-name>
-        <display-name>Application Deployment Portlet</display-name>
+    <portlet>
+        <description>Portlet for displaying java system info</description>
+        <portlet-name>JavaSysInfo</portlet-name>
+        <display-name>Java System Info Portlet</display-name>
 
-        <portlet-class>org.apache.geronimo.console.configmanager.DeploymentPortlet</portlet-class>
+        <portlet-class>org.apache.geronimo.console.infomanager.JavaSystemInfoPortlet</portlet-class>
 
         <expiration-cache>-1</expiration-cache>
 
         <supports>
-			<mime-type>text/html</mime-type>
+            <mime-type>text/html</mime-type>
             <portlet-mode>VIEW</portlet-mode>
             <portlet-mode>HELP</portlet-mode>
-		</supports>
+        </supports>
 
         <supported-locale>en</supported-locale>
 
-		<portlet-info>
-			<title>Install New Applications</title>
-			<short-title>Install Application</short-title>
-			<keywords>Deployment</keywords>
+        <portlet-info>
+            <title>System Property values for the Server JVM</title>
+            <short-title>System</short-title>
+            <keywords>System Properties</keywords>
         </portlet-info>
-	</portlet>
+    </portlet>
 
-	<portlet>
-        <description>Portlet for managing database connections</description>
-        <portlet-name>Databases</portlet-name>
-        <display-name>Database Portlet</display-name>
+    <portlet>
+        <description>Portlet for managing Logging.</description>
+        <portlet-name>LogManager</portlet-name>
+        <display-name>Log Manager Portlet</display-name>
 
-        <portlet-class>org.apache.geronimo.console.databasemanager.DatabaseManagerPortlet</portlet-class>
+        <portlet-class>org.apache.geronimo.console.logmanager.LogManagerPortlet</portlet-class>
 
         <expiration-cache>-1</expiration-cache>
 
         <supports>
-			<mime-type>text/html</mime-type>
+            <mime-type>text/html</mime-type>
             <portlet-mode>VIEW</portlet-mode>
             <portlet-mode>HELP</portlet-mode>
-		</supports>
+        </supports>
 
         <supported-locale>en</supported-locale>
 
-		<portlet-info>
-			<title>Database Connections</title>
-			<short-title>Databases</short-title>
-			<keywords>Databases</keywords>
+        <portlet-info>
+            <title>Log Manager</title>
+            <short-title>Log Manager</short-title>
+            <keywords>Log, Manager</keywords>
         </portlet-info>
-	</portlet>
+    </portlet>
+
     <portlet>
-        <description>Portlet for managing JMS connections</description>
-        <portlet-name>JMSConnections</portlet-name>
-        <display-name>JMS Connection Factory Portlet</display-name>
+        <description>Portlet for viewing the server logs.</description>
+        <portlet-name>LogViewer</portlet-name>
+        <display-name>Server Log Viewer Portlet</display-name>
 
-        <portlet-class>org.apache.geronimo.console.jmsmanager.JMSConnectionFactoryManagerPortlet</portlet-class>
+        <portlet-class>org.apache.geronimo.console.logmanager.LogViewerPortlet</portlet-class>
 
         <expiration-cache>-1</expiration-cache>
 
@@ -110,413 +114,737 @@
         <supported-locale>en</supported-locale>
 
         <portlet-info>
-            <title>JMS Connection Factories</title>
-            <short-title>JMS Connection Factories</short-title>
-            <keywords>JMS</keywords>
+            <title>Server Log Viewer</title>
+            <short-title>Server Log Viewer</short-title>
+            <keywords>Log, Viewer</keywords>
         </portlet-info>
     </portlet>
-    
+
     <portlet>
-        <description>Portlet for managing users from the Geronimo Console realm.</description>
-        <portlet-name>SEUsers</portlet-name>
-        <display-name>Geronimo Console Users Portlet</display-name>
-		
-        <portlet-class>org.apache.geronimo.console.securitymanager.SEUsersPortlet</portlet-class>
+        <description>Portlet for viewing the derby System database logs.</description>
+        <portlet-name>DerbyLogViewer</portlet-name>
+        <display-name>Derby Log Viewer Portlet</display-name>
+
+        <portlet-class>org.apache.geronimo.console.derbylogmanager.DerbyLogViewerPortlet</portlet-class>
 
         <expiration-cache>-1</expiration-cache>
-		        
+
         <supports>
-			<mime-type>text/html</mime-type>
+            <mime-type>text/html</mime-type>
             <portlet-mode>VIEW</portlet-mode>
             <portlet-mode>HELP</portlet-mode>
-		</supports>
+        </supports>
 
-        <supported-locale>en</supported-locale>        
+        <supported-locale>en</supported-locale>
 
-		<portlet-info>
-			<title>Console Realm Users</title>
-			<short-title>Users</short-title>
-			<keywords>Console Realm Users</keywords>
+        <portlet-info>
+            <title>Derby Log Viewer</title>
+            <short-title>Derby Log Viewer</short-title>
+            <keywords>Derby, Log, Viewer</keywords>
         </portlet-info>
-	</portlet>
+    </portlet>
 
+    <portlet>
+        <description>Portlet for viewing the web access logs.</description>
+        <portlet-name>WebAccessLogViewer</portlet-name>
+        <display-name>Web Access Viewer Portlet</display-name>
 
-	<portlet>
-        <description>Portlet for managing groups from the Console realm.</description>
-        <portlet-name>SEGroups</portlet-name>
-        <display-name>Console Realm Portlet</display-name>
-		
-        <portlet-class>org.apache.geronimo.console.securitymanager.SEGroupsPortlet</portlet-class>
+        <portlet-class>org.apache.geronimo.console.logmanager.WebAccessLogViewerPortlet</portlet-class>
 
         <expiration-cache>-1</expiration-cache>
-		        
+
         <supports>
-			<mime-type>text/html</mime-type>
+            <mime-type>text/html</mime-type>
             <portlet-mode>VIEW</portlet-mode>
             <portlet-mode>HELP</portlet-mode>
-		</supports>
+        </supports>
 
-        <supported-locale>en</supported-locale>        
+        <supported-locale>en</supported-locale>
 
-		<portlet-info>
-			<title>Console Realm Groups</title>
-			<short-title>Groups</short-title>
-			<keywords>Console Realm Groups</keywords>
+        <portlet-info>
+            <title>Web Access Log Viewer</title>
+            <short-title>Web Access Log Viewer</short-title>
+            <keywords>Web, Access, Log, Viewer</keywords>
         </portlet-info>
-	</portlet>
-	
-        <!-- log manager portlets -->
-	<portlet>
-        <description>Portlet for managing Logging.</description>
-        <portlet-name>LogManager</portlet-name>
-        <display-name>Log Manager Portlet</display-name>
-		
-        <portlet-class>org.apache.geronimo.console.logmanager.LogManagerPortlet</portlet-class>
+    </portlet>
+
+    <portlet>
+        <description>Portlet for Stopping or Rebooting the server</description>
+        <portlet-name>ServerManager</portlet-name>
+        <display-name>Server Management Portlet</display-name>
+
+        <portlet-class>org.apache.geronimo.console.servermanager.ServerManagerPortlet</portlet-class>
 
         <expiration-cache>-1</expiration-cache>
-		        
+
         <supports>
-			<mime-type>text/html</mime-type>
+            <mime-type>text/html</mime-type>
             <portlet-mode>VIEW</portlet-mode>
             <portlet-mode>HELP</portlet-mode>
-		</supports>
+        </supports>
 
-        <supported-locale>en</supported-locale>        
+        <supported-locale>en</supported-locale>
 
-		<portlet-info>
-			<title>Log Manager</title>
-			<short-title>Log Manager</short-title>
-			<keywords>Log, Manager</keywords>
+        <portlet-info>
+            <title>Server Manager</title>
+            <short-title>Server Manager</short-title>
+            <keywords>Server</keywords>
         </portlet-info>
-	</portlet>
-	<portlet>
-        <description>Portlet for viewing the server logs.</description>
-        <portlet-name>LogViewer</portlet-name>
-        <display-name>Server Log Viewer Portlet</display-name>
-		
-        <portlet-class>org.apache.geronimo.console.logmanager.LogViewerPortlet</portlet-class>
+    </portlet>
+
+    <portlet>
+        <description>Portlet for managing the web server</description>
+        <portlet-name>WebServerManager</portlet-name>
+        <display-name>Web Server Mangement Portlet</display-name>
+
+        <portlet-class>org.apache.geronimo.console.webmanager.WebManagerPortlet</portlet-class>
 
         <expiration-cache>-1</expiration-cache>
-		        
+
         <supports>
-			<mime-type>text/html</mime-type>
+            <mime-type>text/html</mime-type>
             <portlet-mode>VIEW</portlet-mode>
             <portlet-mode>HELP</portlet-mode>
-		</supports>
+        </supports>
 
-        <supported-locale>en</supported-locale>        
+        <supported-locale>en</supported-locale>
 
-		<portlet-info>
-			<title>Server Log Viewer</title>
-			<short-title>Server Log Viewer</short-title>
-			<keywords>Log, Viewer</keywords>
+        <portlet-info>
+            <title>Web Server Manager</title>
+            <short-title>Web Servers</short-title>
+            <keywords>Web Servers</keywords>
         </portlet-info>
-	</portlet>
-	<portlet>
-        <description>Portlet for viewing the derby System database logs.</description>
-        <portlet-name>DerbyLogViewer</portlet-name>
-        <display-name>Derby Log Viewer Portlet</display-name>
-		
-        <portlet-class>org.apache.geronimo.console.derbylogmanager.DerbyLogViewerPortlet</portlet-class>
+    </portlet>
+
+    <portlet>
+        <description>Portlet for managing HTTP connectors</description>
+        <portlet-name>HTTPConnectorManager</portlet-name>
+        <display-name>HTTP Connector Mangement Portlet</display-name>
+
+        <portlet-class>org.apache.geronimo.console.webmanager.HttpManagerPortlet</portlet-class>
 
         <expiration-cache>-1</expiration-cache>
-		        
+
         <supports>
-			<mime-type>text/html</mime-type>
+            <mime-type>text/html</mime-type>
             <portlet-mode>VIEW</portlet-mode>
             <portlet-mode>HELP</portlet-mode>
-		</supports>
+        </supports>
 
-        <supported-locale>en</supported-locale>        
+        <supported-locale>en</supported-locale>
 
-		<portlet-info>
-			<title>Derby Log Viewer</title>
-			<short-title>Derby Log Viewer</short-title>
-			<keywords>Derby, Log, Viewer</keywords>
+        <portlet-info>
+            <title>HTTP Connectors</title>
+            <short-title>HTTP Connectors</short-title>
+            <keywords>HTTP Connectors</keywords>
         </portlet-info>
-	</portlet>
-	<portlet>
-        <description>Portlet for viewing the web access logs.</description>
-        <portlet-name>WebAccessLogViewer</portlet-name>
-        <display-name>Web Access Viewer Portlet</display-name>
-		
-        <portlet-class>org.apache.geronimo.console.logmanager.WebAccessLogViewerPortlet</portlet-class>
+    </portlet>
+
+    <portlet>
+        <description>Portlet for managing HTTPS connectors</description>
+        <portlet-name>HTTPSConnectorManager</portlet-name>
+        <display-name>HTTPS Connector Mangement Portlet</display-name>
+
+        <portlet-class>org.apache.geronimo.console.webmanager.HttpsManagerPortlet</portlet-class>
 
         <expiration-cache>-1</expiration-cache>
-		        
+
         <supports>
-			<mime-type>text/html</mime-type>
+            <mime-type>text/html</mime-type>
             <portlet-mode>VIEW</portlet-mode>
             <portlet-mode>HELP</portlet-mode>
-		</supports>
+        </supports>
 
-        <supported-locale>en</supported-locale>        
+        <supported-locale>en</supported-locale>
 
-		<portlet-info>
-			<title>Web Access Log Viewer</title>
-			<short-title>Web Access Log Viewer</short-title>
-			<keywords>Web, Access, Log, Viewer</keywords>
+        <portlet-info>
+            <title>HTTPS Connectors</title>
+            <short-title>HTTPS Connectors</short-title>
+            <keywords>HTTPS Connectors</keywords>
         </portlet-info>
-	</portlet>
+    </portlet>
+
     <portlet>
-        <description>Portlet for displaying server info</description>
-        <portlet-name>ServerInfo</portlet-name>
-        <display-name>Server Info Portlet</display-name>
-		
-        <portlet-class>org.apache.geronimo.console.infomanager.ServerInfoPortlet</portlet-class>
+        <description>Portlet for managing AJP13 connectors</description>
+        <portlet-name>AJP13ConnectorManager</portlet-name>
+        <display-name>AJP13 Connector Mangement Portlet</display-name>
+
+        <portlet-class>org.apache.geronimo.console.webmanager.AJP13ManagerPortlet</portlet-class>
 
         <expiration-cache>-1</expiration-cache>
-		        
+
         <supports>
-			      <mime-type>text/html</mime-type>
+            <mime-type>text/html</mime-type>
             <portlet-mode>VIEW</portlet-mode>
             <portlet-mode>HELP</portlet-mode>
-		    </supports>
+        </supports>
 
         <supported-locale>en</supported-locale>
 
-		    <portlet-info>
-			      <title>Server Info</title>
-			      <short-title>ServerInfo</short-title>
-			      <keywords>ServerInfo</keywords>
+        <portlet-info>
+            <title>AJP13 Connectors</title>
+            <short-title>AJP13 Connectors</short-title>
+            <keywords>AJP13 Connectors</keywords>
         </portlet-info>
     </portlet>
 
     <portlet>
-        <description>Portlet for displaying java system info</description>
-        <portlet-name>JavaSysInfo</portlet-name>
-        <display-name>Java System Info Portlet</display-name>
-		
-        <portlet-class>org.apache.geronimo.console.infomanager.JavaSystemInfoPortlet</portlet-class>
+        <description>Portlet for displaying EJB server info</description>
+        <portlet-name>EJBServer</portlet-name>
+        <display-name>EJB Server Portlet</display-name>
+
+        <portlet-class>org.apache.geronimo.console.EmptyPortlet</portlet-class>
+
+        <expiration-cache>-1</expiration-cache>
+
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+<!--            <portlet-mode>HELP</portlet-mode>-->
+        </supports>
+
+        <supported-locale>en</supported-locale>
+
+        <portlet-info>
+            <title>EJB Server</title>
+            <short-title>EJB Server</short-title>
+            <keywords>EJB Server</keywords>
+        </portlet-info>
+    </portlet>
+
+    <portlet>
+        <description>Portlet for displaying J2CA server info</description>
+        <portlet-name>J2CAServer</portlet-name>
+        <display-name>J2CA Server Portlet</display-name>
+
+        <portlet-class>org.apache.geronimo.console.EmptyPortlet</portlet-class>
+
+        <expiration-cache>-1</expiration-cache>
+
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+<!--            <portlet-mode>HELP</portlet-mode>-->
+        </supports>
+
+        <supported-locale>en</supported-locale>
+
+        <portlet-info>
+            <title>J2EE Connector Server Coniguration</title>
+            <short-title>J2CA Server</short-title>
+            <keywords>J2CA Server</keywords>
+        </portlet-info>
+    </portlet>
+
+    <portlet>
+        <description>Portlet for displaying CORBA/IIOP server info</description>
+        <portlet-name>CORBAServer</portlet-name>
+        <display-name>CORBA/IIOP Server Portlet</display-name>
+
+        <portlet-class>org.apache.geronimo.console.EmptyPortlet</portlet-class>
+
+        <expiration-cache>-1</expiration-cache>
+
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+<!--            <portlet-mode>HELP</portlet-mode>-->
+        </supports>
+
+        <supported-locale>en</supported-locale>
+
+        <portlet-info>
+            <title>CORBA/IIOP Server Configuration</title>
+            <short-title>CORBA Server</short-title>
+            <keywords>CORBA IIOP Server</keywords>
+        </portlet-info>
+    </portlet>
+
+    <portlet>
+        <description>Portlet for displaying UDDI server info</description>
+        <portlet-name>UDDIServer</portlet-name>
+        <display-name>UDDI Server Portlet</display-name>
+
+        <portlet-class>org.apache.geronimo.console.EmptyPortlet</portlet-class>
+
+        <expiration-cache>-1</expiration-cache>
+
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+<!--            <portlet-mode>HELP</portlet-mode>-->
+        </supports>
+
+        <supported-locale>en</supported-locale>
+
+        <portlet-info>
+            <title>UDDI Server Configuration</title>
+            <short-title>UDDI Server</short-title>
+            <keywords>UDDI Server</keywords>
+        </portlet-info>
+    </portlet>
+
+<!-- Services Tab -->
+
+    <portlet>
+        <description>Portlet for viewing Repository</description>
+        <portlet-name>RepositoryViewer</portlet-name>
+        <display-name>Repository Viewer Portlet</display-name>
+
+        <portlet-class>org.apache.geronimo.console.repository.RepositoryViewPortlet</portlet-class>
+
+        <expiration-cache>-1</expiration-cache>
+
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+        </supports>
+
+        <supported-locale>en</supported-locale>
+
+        <portlet-info>
+            <title>Repository Viewer</title>
+            <short-title>Repository Viewer</short-title>
+            <keywords>Repository</keywords>
+        </portlet-info>
+    </portlet>
+
+    <portlet>
+        <description>Portlet for managing database connections</description>
+        <portlet-name>Databases</portlet-name>
+        <display-name>Database Portlet</display-name>
+
+        <portlet-class>org.apache.geronimo.console.databasemanager.DatabaseManagerPortlet</portlet-class>
+
+        <expiration-cache>-1</expiration-cache>
+
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+            <portlet-mode>HELP</portlet-mode>
+        </supports>
+
+        <supported-locale>en</supported-locale>
+
+        <portlet-info>
+            <title>Database Connections</title>
+            <short-title>Databases</short-title>
+            <keywords>Databases</keywords>
+        </portlet-info>
+    </portlet>
+
+    <portlet>
+        <description>Portlet for managing JMS connections</description>
+        <portlet-name>JMSConnections</portlet-name>
+        <display-name>JMS Connection Factory Portlet</display-name>
+
+        <portlet-class>org.apache.geronimo.console.jmsmanager.JMSConnectionFactoryManagerPortlet</portlet-class>
 
         <expiration-cache>-1</expiration-cache>
-		        
+
         <supports>
-			      <mime-type>text/html</mime-type>
+            <mime-type>text/html</mime-type>
             <portlet-mode>VIEW</portlet-mode>
             <portlet-mode>HELP</portlet-mode>
-		    </supports>
+        </supports>
 
         <supported-locale>en</supported-locale>
 
-		    <portlet-info>
-			      <title>System Property values for the Server JVM</title>
-			      <short-title>System</short-title>
-			      <keywords>System Properties</keywords>
+        <portlet-info>
+            <title>JMS Connection Factories</title>
+            <short-title>JMS Connection Factories</short-title>
+            <keywords>JMS</keywords>
         </portlet-info>
     </portlet>
 
-	<!--  JMS Management Portlet -->
     <portlet>
         <description>Portlet for managing JMS Topics and Queues.</description>
         <portlet-name>JMSManager</portlet-name>
         <display-name>JMS Portlet</display-name>
-		
+
         <portlet-class>org.apache.geronimo.console.jmsmanager.JMSManagerPortlet</portlet-class>
 
         <expiration-cache>-1</expiration-cache>
-		        
+
         <supports>
-	    <mime-type>text/html</mime-type>
+            <mime-type>text/html</mime-type>
             <portlet-mode>VIEW</portlet-mode>
             <portlet-mode>HELP</portlet-mode>
-	</supports>
+        </supports>
 
-        <supported-locale>en</supported-locale>        
+        <supported-locale>en</supported-locale>
 
-		<portlet-info>
-			<title>JMS Destination Manager</title>
-			<short-title>JMSManager</short-title>
-			<keywords>JMS Manager</keywords>
-                </portlet-info>
+        <portlet-info>
+            <title>JMS Destination Manager</title>
+            <short-title>JMSManager</short-title>
+            <keywords>JMS Manager</keywords>
+        </portlet-info>
     </portlet>
 
-	<portlet>
-        <description>Portlet for managing the web server</description>
-        <portlet-name>WebServerManager</portlet-name>
-        <display-name>Web Server Mangement Portlet</display-name>
-		
-        <portlet-class>org.apache.geronimo.console.webmanager.WebManagerPortlet</portlet-class>
+    <portlet>
+        <description>Portlet for displaying JavaMail info</description>
+        <portlet-name>MailServer</portlet-name>
+        <display-name>Java Mail Server Portlet</display-name>
+
+        <portlet-class>org.apache.geronimo.console.EmptyPortlet</portlet-class>
 
         <expiration-cache>-1</expiration-cache>
-		        
+
         <supports>
-			<mime-type>text/html</mime-type>
+            <mime-type>text/html</mime-type>
             <portlet-mode>VIEW</portlet-mode>
-            <portlet-mode>HELP</portlet-mode>
-		</supports>
+<!--            <portlet-mode>HELP</portlet-mode>-->
+        </supports>
 
-        <supported-locale>en</supported-locale>        
+        <supported-locale>en</supported-locale>
 
-		<portlet-info>
-			<title>Web Server Manager</title>
-			<short-title>Web Servers</short-title>
-			<keywords>Web Servers</keywords>
+        <portlet-info>
+            <title>Java Mail Configuration</title>
+            <short-title>Mail Server</short-title>
+            <keywords>Java Mail Server</keywords>
         </portlet-info>
-	</portlet>
-	<portlet>
-        <description>Portlet for managing HTTP connectors</description>
-        <portlet-name>HTTPConnectorManager</portlet-name>
-        <display-name>HTTP Connector Mangement Portlet</display-name>
-		
-        <portlet-class>org.apache.geronimo.console.webmanager.HttpManagerPortlet</portlet-class>
+    </portlet>
+
+<!-- Applications Tab -->
+
+    <portlet>
+        <description>Portlet that lists and starts/stops/uninstalls applications</description>
+        <portlet-name>Applications</portlet-name>
+        <display-name>Applications Portlet</display-name>
+
+        <portlet-class>org.apache.geronimo.console.configmanager.ConfigManagerPortlet</portlet-class>
 
         <expiration-cache>-1</expiration-cache>
-		        
+
         <supports>
-			<mime-type>text/html</mime-type>
+            <mime-type>text/html</mime-type>
             <portlet-mode>VIEW</portlet-mode>
             <portlet-mode>HELP</portlet-mode>
-		</supports>
+        </supports>
 
-        <supported-locale>en</supported-locale>        
+        <supported-locale>en</supported-locale>
 
-		<portlet-info>
-			<title>HTTP Connectors</title>
-			<short-title>HTTP Connectors</short-title>
-			<keywords>HTTP Connectors</keywords>
+        <portlet-info>
+            <title>Installed Applications</title>
+            <short-title>Applications</short-title>
+            <keywords>Applications</keywords>
         </portlet-info>
-	</portlet>
-	<portlet>
-        <description>Portlet for managing HTTPS connectors</description>
-        <portlet-name>HTTPSConnectorManager</portlet-name>
-        <display-name>HTTPS Connector Mangement Portlet</display-name>
-		
-        <portlet-class>org.apache.geronimo.console.webmanager.HttpsManagerPortlet</portlet-class>
+    </portlet>
+
+    <portlet>
+        <description>Portlet for deploying applications</description>
+        <portlet-name>Deployment</portlet-name>
+        <display-name>Application Deployment Portlet</display-name>
+
+        <portlet-class>org.apache.geronimo.console.configmanager.DeploymentPortlet</portlet-class>
 
         <expiration-cache>-1</expiration-cache>
-		        
+
         <supports>
-			<mime-type>text/html</mime-type>
+            <mime-type>text/html</mime-type>
             <portlet-mode>VIEW</portlet-mode>
             <portlet-mode>HELP</portlet-mode>
-		</supports>
+        </supports>
 
-        <supported-locale>en</supported-locale>        
+        <supported-locale>en</supported-locale>
 
-		<portlet-info>
-			<title>HTTPS Connectors</title>
-			<short-title>HTTPS Connectors</short-title>
-			<keywords>HTTPS Connectors</keywords>
+        <portlet-info>
+            <title>Install New Applications</title>
+            <short-title>Install Application</short-title>
+            <keywords>Deployment</keywords>
         </portlet-info>
-	</portlet>
-	<portlet>
-        <description>Portlet for managing AJP13 connectors</description>
-        <portlet-name>AJP13ConnectorManager</portlet-name>
-        <display-name>AJP13 Connector Mangement Portlet</display-name>
-		
-        <portlet-class>org.apache.geronimo.console.webmanager.AJP13ManagerPortlet</portlet-class>
+    </portlet>
+
+    <portlet>
+        <description>Portlet for displaying EAR modules</description>
+        <portlet-name>EARModules</portlet-name>
+        <display-name>EAR Modules Portlet</display-name>
+
+        <portlet-class>org.apache.geronimo.console.EmptyPortlet</portlet-class>
 
         <expiration-cache>-1</expiration-cache>
-		        
+
         <supports>
-			<mime-type>text/html</mime-type>
+            <mime-type>text/html</mime-type>
             <portlet-mode>VIEW</portlet-mode>
-            <portlet-mode>HELP</portlet-mode>
-		</supports>
+<!--            <portlet-mode>HELP</portlet-mode>-->
+        </supports>
 
-        <supported-locale>en</supported-locale>        
+        <supported-locale>en</supported-locale>
 
-		<portlet-info>
-			<title>AJP13 Connectors</title>
-			<short-title>AJP13 Connectors</short-title>
-			<keywords>AJP13 Connectors</keywords>
+        <portlet-info>
+            <title>Installed Application EARs</title>
+            <short-title>EAR Modules</short-title>
+            <keywords>Application EAR Module</keywords>
         </portlet-info>
-	</portlet>
+    </portlet>
 
     <portlet>
-        <description>Portlet for viewing Repository</description>
-        <portlet-name>RepositoryViewer</portlet-name>
-        <display-name>Repository Viewer Portlet</display-name>
+        <description>Portlet for displaying WAR modules</description>
+        <portlet-name>WARModules</portlet-name>
+        <display-name>WAR Modules Portlet</display-name>
 
-        <portlet-class>org.apache.geronimo.console.repository.RepositoryViewPortlet</portlet-class>
+        <portlet-class>org.apache.geronimo.console.EmptyPortlet</portlet-class>
+
+        <expiration-cache>-1</expiration-cache>
+
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+<!--            <portlet-mode>HELP</portlet-mode>-->
+        </supports>
+
+        <supported-locale>en</supported-locale>
+
+        <portlet-info>
+            <title>Installed Web Applications</title>
+            <short-title>WAR Modules</short-title>
+            <keywords>Web Application WAR Module</keywords>
+        </portlet-info>
+    </portlet>
+
+    <portlet>
+        <description>Portlet for displaying EJB modules</description>
+        <portlet-name>EJBModules</portlet-name>
+        <display-name>EJB Modules Portlet</display-name>
+
+        <portlet-class>org.apache.geronimo.console.EmptyPortlet</portlet-class>
+
+        <expiration-cache>-1</expiration-cache>
+
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+<!--            <portlet-mode>HELP</portlet-mode>-->
+        </supports>
+
+        <supported-locale>en</supported-locale>
+
+        <portlet-info>
+            <title>Installed EJB JARs</title>
+            <short-title>EJB Modules</short-title>
+            <keywords>EJB JAR Module</keywords>
+        </portlet-info>
+    </portlet>
+
+    <portlet>
+        <description>Portlet for displaying J2EE Connector modules</description>
+        <portlet-name>RARModules</portlet-name>
+        <display-name>RAR Modules Portlet</display-name>
+
+        <portlet-class>org.apache.geronimo.console.EmptyPortlet</portlet-class>
+
+        <expiration-cache>-1</expiration-cache>
+
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+<!--            <portlet-mode>HELP</portlet-mode>-->
+        </supports>
+
+        <supported-locale>en</supported-locale>
+
+        <portlet-info>
+            <title>Installed J2EE Connectors</title>
+            <short-title>RAR Modules</short-title>
+            <keywords>J2EE Connector RAR Module</keywords>
+        </portlet-info>
+    </portlet>
+
+    <portlet>
+        <description>Portlet for displaying Client JAR modules</description>
+        <portlet-name>ClientModules</portlet-name>
+        <display-name>Client Modules Portlet</display-name>
+
+        <portlet-class>org.apache.geronimo.console.EmptyPortlet</portlet-class>
+
+        <expiration-cache>-1</expiration-cache>
+
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+<!--            <portlet-mode>HELP</portlet-mode>-->
+        </supports>
+
+        <supported-locale>en</supported-locale>
+
+        <portlet-info>
+            <title>Installed Application Clients</title>
+            <short-title>Client Modules</short-title>
+            <keywords>Application Client JAR Module</keywords>
+        </portlet-info>
+    </portlet>
+
+    <portlet>
+        <description>Portlet for displaying System modules</description>
+        <portlet-name>SystemModules</portlet-name>
+        <display-name>System Modules Portlet</display-name>
+
+        <portlet-class>org.apache.geronimo.console.EmptyPortlet</portlet-class>
 
         <expiration-cache>-1</expiration-cache>
 
         <supports>
-			<mime-type>text/html</mime-type>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+<!--            <portlet-mode>HELP</portlet-mode>-->
+        </supports>
+
+        <supported-locale>en</supported-locale>
+
+        <portlet-info>
+            <title>Installed System Modules</title>
+            <short-title>System Modules</short-title>
+            <keywords>System Module</keywords>
+        </portlet-info>
+    </portlet>
+
+<!-- Security Tab -->
+
+    <portlet>
+        <description>Portlet for managing users from the Geronimo Console realm.</description>
+        <portlet-name>SEUsers</portlet-name>
+        <display-name>Geronimo Console Users Portlet</display-name>
+
+        <portlet-class>org.apache.geronimo.console.securitymanager.SEUsersPortlet</portlet-class>
+
+        <expiration-cache>-1</expiration-cache>
+
+        <supports>
+            <mime-type>text/html</mime-type>
             <portlet-mode>VIEW</portlet-mode>
             <portlet-mode>HELP</portlet-mode>
-		</supports>
+        </supports>
 
         <supported-locale>en</supported-locale>
 
-		<portlet-info>
-			<title>Repository Viewer</title>
-			<short-title>Repository Viewer</short-title>
-			<keywords>Repository</keywords>
+        <portlet-info>
+            <title>Console Realm Users</title>
+            <short-title>Users</short-title>
+            <keywords>Console Realm Users</keywords>
         </portlet-info>
     </portlet>
 
     <portlet>
-        <description>Portlet for ManagingServer</description>
-        <portlet-name>ServerManager</portlet-name>
-        <display-name>Server Management Portlet</display-name>
+        <description>Portlet for managing groups from the Console realm.</description>
+        <portlet-name>SEGroups</portlet-name>
+        <display-name>Console Realm Portlet</display-name>
 
-        <portlet-class>org.apache.geronimo.console.servermanager.ServerManagerPortlet</portlet-class>
+        <portlet-class>org.apache.geronimo.console.securitymanager.SEGroupsPortlet</portlet-class>
 
         <expiration-cache>-1</expiration-cache>
 
         <supports>
-			<mime-type>text/html</mime-type>
+            <mime-type>text/html</mime-type>
             <portlet-mode>VIEW</portlet-mode>
             <portlet-mode>HELP</portlet-mode>
-		</supports>
+        </supports>
+
+        <supported-locale>en</supported-locale>
+
+        <portlet-info>
+            <title>Console Realm Groups</title>
+            <short-title>Groups</short-title>
+            <keywords>Console Realm Groups</keywords>
+        </portlet-info>
+    </portlet>
+
+    <portlet>
+        <description>Portlet for displaying security realms</description>
+        <portlet-name>SecurityRealms</portlet-name>
+        <display-name>Security Realms Portlet</display-name>
+
+        <portlet-class>org.apache.geronimo.console.EmptyPortlet</portlet-class>
+
+        <expiration-cache>-1</expiration-cache>
+
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+<!--            <portlet-mode>HELP</portlet-mode>-->
+        </supports>
 
         <supported-locale>en</supported-locale>
 
-		<portlet-info>
-			<title>Server Manager</title>
-			<short-title>Server Manager</short-title>
-			<keywords>Server</keywords>
+        <portlet-info>
+            <title>Installed Security Realms</title>
+            <short-title>Security Realms</short-title>
+            <keywords>Security Realms</keywords>
         </portlet-info>
     </portlet>
 
     <portlet>
+        <description>Portlet for configuring the server keystore</description>
+        <portlet-name>Keystore</portlet-name>
+        <display-name>Keystore Portlet</display-name>
+
+        <portlet-class>org.apache.geronimo.console.EmptyPortlet</portlet-class>
+
+        <expiration-cache>-1</expiration-cache>
+
+        <supports>
+            <mime-type>text/html</mime-type>
+            <portlet-mode>VIEW</portlet-mode>
+<!--            <portlet-mode>HELP</portlet-mode>-->
+        </supports>
+
+        <supported-locale>en</supported-locale>
+
+        <portlet-info>
+            <title>Keystore Configuration</title>
+            <short-title>Keystore</short-title>
+            <keywords>Keystore SSL</keywords>
+        </portlet-info>
+    </portlet>
+
+<!-- Other tab -->
+
+    <portlet>
         <description>Portlet for displaying internal DB info</description>
         <portlet-name>InternalDB</portlet-name>
         <display-name>Internal Database Portlet</display-name>
-		
+
         <portlet-class>org.apache.geronimo.console.internaldb.InternalDBPortlet</portlet-class>
 
         <expiration-cache>-1</expiration-cache>
-		        
+
         <supports>
-			      <mime-type>text/html</mime-type>
+            <mime-type>text/html</mime-type>
             <portlet-mode>VIEW</portlet-mode>
             <portlet-mode>HELP</portlet-mode>
-		    </supports>
+        </supports>
 
         <supported-locale>en</supported-locale>
 
-		    <portlet-info>
-			      <title>DB Info</title>
-			      <short-title>DB Info</short-title>
-			      <keywords>DB Info</keywords>
+        <portlet-info>
+            <title>DB Info</title>
+            <short-title>DB Info</short-title>
+            <keywords>DB Info</keywords>
         </portlet-info>
     </portlet>
-    
+
     <portlet>
         <description>Portlet for viewing database contents</description>
         <portlet-name>DBViewer</portlet-name>
         <display-name>Database Viewer Portlet</display-name>
-		
+
         <portlet-class>org.apache.geronimo.console.internaldb.DBViewerPortlet</portlet-class>
 
         <expiration-cache>-1</expiration-cache>
-		        
+
         <supports>
-			      <mime-type>text/html</mime-type>
+            <mime-type>text/html</mime-type>
             <portlet-mode>VIEW</portlet-mode>
             <portlet-mode>HELP</portlet-mode>
-		    </supports>
+        </supports>
 
         <supported-locale>en</supported-locale>
 
-		    <portlet-info>
-			      <title>DB Viewer</title>
-			      <short-title>DB Viewer</short-title>
-			      <keywords>DB Viewer</keywords>
+        <portlet-info>
+            <title>DB Viewer</title>
+            <short-title>DB Viewer</short-title>
+            <keywords>DB Viewer</keywords>
         </portlet-info>
     </portlet>
 
@@ -524,11 +852,11 @@
         <description>Portlet for running SQL commands</description>
         <portlet-name>RunSQL</portlet-name>
         <display-name>Run SQL Portlet</display-name>
-		
+
         <portlet-class>org.apache.geronimo.console.internaldb.RunSQLPortlet</portlet-class>
 
         <expiration-cache>-1</expiration-cache>
-		        
+
         <supports>
             <mime-type>text/html</mime-type>
             <portlet-mode>VIEW</portlet-mode>
@@ -537,10 +865,12 @@
 
         <supported-locale>en</supported-locale>
 
-		    <portlet-info>
-			      <title>Run SQL</title>
-			      <short-title>Run SQL</short-title>
-			      <keywords>Run SQL</keywords>
+        <portlet-info>
+            <title>Run SQL</title>
+            <short-title>Run SQL</short-title>
+            <keywords>Run SQL</keywords>
         </portlet-info>
     </portlet>
- </portlet-app>
+
+    <!-- End of console portlets -->
+</portlet-app>

Modified: geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/web.xml?rev=224485&r1=224484&r2=224485&view=diff
==============================================================================
--- geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/web.xml (original)
+++ geronimo/trunk/sandbox/console-standard/src/webapp/WEB-INF/web.xml Sat Jul 23 10:51:01 2005
@@ -20,7 +20,178 @@
          xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
          version="2.4">
 
-    <display-name>Gluecode SE Console Standard Portlets</display-name>
+    <display-name>Geronimo Management Console Portlets</display-name>
+
+    <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>
+        <init-param>
+            <param-name>portlet-guid</param-name>
+            <param-value>console-standard.EJBServer</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>
+    <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>
+    <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>
+    <servlet>
+        <display-name>Pluto Wrapper for Mail Server Portlet</display-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>org.apache.geronimo.console.EmptyPortlet</param-value>
+        </init-param>
+        <init-param>
+            <param-name>portlet-guid</param-name>
+            <param-value>console-standard.MailServer</param-value>
+        </init-param>
+    </servlet>
+    <servlet>
+        <display-name>Pluto Wrapper for EARModules Portlet</display-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.EmptyPortlet</param-value>
+        </init-param>
+        <init-param>
+            <param-name>portlet-guid</param-name>
+            <param-value>console-standard.EARModules</param-value>
+        </init-param>
+    </servlet>
+    <servlet>
+        <display-name>Pluto Wrapper for WARModules Portlet</display-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.EmptyPortlet</param-value>
+        </init-param>
+        <init-param>
+            <param-name>portlet-guid</param-name>
+            <param-value>console-standard.WARModules</param-value>
+        </init-param>
+    </servlet>
+    <servlet>
+        <display-name>Pluto Wrapper for EJBModules Portlet</display-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.EmptyPortlet</param-value>
+        </init-param>
+        <init-param>
+            <param-name>portlet-guid</param-name>
+            <param-value>console-standard.EJBModules</param-value>
+        </init-param>
+    </servlet>
+    <servlet>
+        <display-name>Pluto Wrapper for RARModules Portlet</display-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.EmptyPortlet</param-value>
+        </init-param>
+        <init-param>
+            <param-name>portlet-guid</param-name>
+            <param-value>console-standard.RARModules</param-value>
+        </init-param>
+    </servlet>
+    <servlet>
+        <display-name>Pluto Wrapper for ClientModules Portlet</display-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.EmptyPortlet</param-value>
+        </init-param>
+        <init-param>
+            <param-name>portlet-guid</param-name>
+            <param-value>console-standard.ClientModules</param-value>
+        </init-param>
+    </servlet>
+    <servlet>
+        <display-name>Pluto Wrapper for SystemModules Portlet</display-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.EmptyPortlet</param-value>
+        </init-param>
+        <init-param>
+            <param-name>portlet-guid</param-name>
+            <param-value>console-standard.SystemModules</param-value>
+        </init-param>
+    </servlet>
+    <servlet>
+        <display-name>Pluto Wrapper for SecurityRealms Portlet</display-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.EmptyPortlet</param-value>
+        </init-param>
+        <init-param>
+            <param-name>portlet-guid</param-name>
+            <param-value>console-standard.SecurityRealms</param-value>
+        </init-param>
+    </servlet>
+    <servlet>
+        <display-name>Pluto Wrapper for Keystore Portlet</display-name>
+        <servlet-name>Keystore</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.Keystore</param-value>
+        </init-param>
+    </servlet>
+
 
     <servlet>
         <description>Automated generated Portlet Wrapper</description>
@@ -443,6 +614,62 @@
         </init-param>
     </servlet>
 
+
+
+    <servlet-mapping>
+        <servlet-name>EJBServer</servlet-name>
+        <url-pattern>/EJBServer/*</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>J2CAServer</servlet-name>
+        <url-pattern>/J2CAServer/*</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>CORBAServer</servlet-name>
+        <url-pattern>/CORBAServer/*</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>UDDIServer</servlet-name>
+        <url-pattern>/UDDIServer/*</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>MailServer</servlet-name>
+        <url-pattern>/MailServer/*</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>EARModules</servlet-name>
+        <url-pattern>/EARModules/*</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>WARModules</servlet-name>
+        <url-pattern>/WARModules/*</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>EJBModules</servlet-name>
+        <url-pattern>/EJBModules/*</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>RARModules</servlet-name>
+        <url-pattern>/RARModules/*</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>ClientModules</servlet-name>
+        <url-pattern>/ClientModules/*</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>SystemModules</servlet-name>
+        <url-pattern>/SystemModules/*</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>SecurityRealms</servlet-name>
+        <url-pattern>/SecurityRealms/*</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>Keystore</servlet-name>
+        <url-pattern>/Keystore/*</url-pattern>
+    </servlet-mapping>
+
+
     <servlet-mapping>
         <servlet-name>Applications</servlet-name>
         <url-pattern>/Applications/*</url-pattern>
@@ -594,6 +821,13 @@
             <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>

Modified: geronimo/trunk/sandbox/console.sh
URL: http://svn.apache.org/viewcvs/geronimo/trunk/sandbox/console.sh?rev=224485&r1=224484&r2=224485&view=diff
==============================================================================
--- geronimo/trunk/sandbox/console.sh (original)
+++ geronimo/trunk/sandbox/console.sh Sat Jul 23 10:51:01 2005
@@ -12,4 +12,12 @@
 cp -rf ~/.maven/repository/pluto ../modules/assembly/target/geronimo-1.0-SNAPSHOT/repository/
 cp -rf ~/.maven/repository/geronimo/jars/geronimo-console-core*.jar ../modules/assembly/target/geronimo-1.0-SNAPSHOT/repository/geronimo/jars/
 cp -rf ~/.maven/repository/geronimo-console ../modules/assembly/target/geronimo-1.0-SNAPSHOT/repository/
+echo
+echo "To deploy for the first time, start Geronimo and:"
+echo
 echo "java -jar ../modules/assembly/target/geronimo-1.0-SNAPSHOT/bin/deployer.jar --user system --password manager deploy console-ear/target/geronimo-console-1.0-SNAPSHOT.ear"
+echo
+echo "To update an existing console deployment, try:"
+echo
+echo "java -jar ../modules/assembly/target/geronimo-1.0-SNAPSHOT/bin/deployer.jar --user system --password manager redeploy console-ear/target/geronimo-console-1.0-SNAPSHOT.ear org/apache/geronimo/Console"
+echo



Mime
View raw message