You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by pm...@apache.org on 2007/09/04 19:08:32 UTC

svn commit: r572737 - in /geronimo/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF: portlet.xml web.xml

Author: pmcmahan
Date: Tue Sep  4 10:08:31 2007
New Revision: 572737

URL: http://svn.apache.org/viewvc?rev=572737&view=rev
Log:
GERONIMO-3413 collapse some white spacing in portlet.xml and web.xml.  Remove unneeded portlet definitions.

Modified:
    geronimo/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml
    geronimo/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/web.xml

Modified: geronimo/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml?rev=572737&r1=572736&r2=572737&view=diff
==============================================================================
--- geronimo/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml (original)
+++ geronimo/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml Tue Sep  4 10:08:31 2007
@@ -26,19 +26,14 @@
         <description>Initial portlet with Geronimo informat.</description>
         <portlet-name>Welcome</portlet-name>
         <display-name>Welcome Portlet</display-name>
-
         <portlet-class>org.apache.geronimo.console.welcome.WelcomePortlet</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>Welcome</title>
             <short-title>Welcome</short-title>
@@ -46,25 +41,18 @@
         </portlet-info>
     </portlet>
 
-<!-- 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>
             <portlet-mode>VIEW</portlet-mode>
             <portlet-mode>HELP</portlet-mode>
         </supports>
-
         <supported-locale>en</supported-locale>
-
         <portlet-info>
             <title>Server Info</title>
             <short-title>ServerInfo</short-title>
@@ -76,19 +64,14 @@
         <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>
-
         <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>System Property values for the Server JVM</title>
             <short-title>System</short-title>
@@ -100,19 +83,14 @@
         <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>
-
         <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>Log Manager</title>
             <short-title>Log Manager</short-title>
@@ -124,19 +102,14 @@
         <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>
-
         <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 Log Viewer</title>
             <short-title>Server Log Viewer</short-title>
@@ -148,19 +121,14 @@
         <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>
-
         <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>Web Access Log Viewer</title>
             <short-title>Web Access Log Viewer</short-title>
@@ -172,19 +140,14 @@
         <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>
             <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>
@@ -196,91 +159,33 @@
         <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>
             <portlet-mode>VIEW</portlet-mode>
             <portlet-mode>HELP</portlet-mode>
         </supports>
-
         <supported-locale>en</supported-locale>
-
         <portlet-info>
             <title>Web Server Manager</title>
             <short-title>Web Servers</short-title>
             <keywords>Web Servers</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>
-
-        <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>HTTP Connectors</title>
-            <short-title>HTTP Connectors</short-title>
-            <keywords>HTTP Connectors</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>
 
-        <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>HTTPS Connectors</title>
-            <short-title>HTTPS Connectors</short-title>
-            <keywords>HTTPS Connectors</keywords>
-        </portlet-info>
-    </portlet>
--->
     <portlet>
         <description>Portlet for managing Network Listeners</description>
         <portlet-name>ConnectorManager</portlet-name>
         <display-name>Network Listener Portlet</display-name>
-
         <portlet-class>org.apache.geronimo.console.webmanager.ConnectorPortlet</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>Network Listeners</title>
             <short-title>Listeners</short-title>
@@ -289,46 +194,17 @@
     </portlet>
 
     <portlet>
-        <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 configuring Thread Pools</description>
         <portlet-name>ThreadPool</portlet-name>
         <display-name>Thread Pool Portlet</display-name>
-
         <portlet-class>org.apache.geronimo.console.threads.ThreadPoolPortlet</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>Thread Pool Configuration</title>
             <short-title>Thread Pools</short-title>
@@ -340,19 +216,14 @@
         <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>
@@ -361,44 +232,16 @@
     </portlet>
 
     <portlet>
-        <description>Portlet for managing database pools</description>
-        <portlet-name>DBWizard</portlet-name>
-        <display-name>Database Pool Wizard</display-name>
-
-        <portlet-class>org.apache.geronimo.console.databasemanager.wizard.DatabasePoolPortlet</portlet-class>
-
-        <expiration-cache>-1</expiration-cache>
-
-        <supports>
-            <mime-type>text/html</mime-type>
-            <portlet-mode>VIEW</portlet-mode>
-        </supports>
-
-        <supported-locale>en</supported-locale>
-
-        <portlet-info>
-            <title>Database Pools</title>
-            <short-title>Database Pools</short-title>
-            <keywords>Database Pool Wizard</keywords>
-        </portlet-info>
-    </portlet>
-
-    <portlet>
         <description>Portlet for managing security realms</description>
         <portlet-name>RealmWizard</portlet-name>
         <display-name>Security Realm Wizard</display-name>
-
         <portlet-class>org.apache.geronimo.console.securitymanager.realm.SecurityRealmPortlet</portlet-class>
-
         <expiration-cache>-1</expiration-cache>
-
         <supports>
             <mime-type>text/html</mime-type>
             <portlet-mode>VIEW</portlet-mode>
         </supports>
-
         <supported-locale>en</supported-locale>
-
         <portlet-info>
             <title>Security Realms</title>
             <short-title>Security Realms</short-title>
@@ -410,18 +253,13 @@
         <description>Portlet for configuring Geronimo with Apache via mod_jk</description>
         <portlet-name>ApacheJK</portlet-name>
         <display-name>Apache mod_jk Wizard</display-name>
-
         <portlet-class>org.apache.geronimo.console.apache.jk.ApacheConfigPortlet</portlet-class>
-
         <expiration-cache>-1</expiration-cache>
-
         <supports>
             <mime-type>text/html</mime-type>
             <portlet-mode>VIEW</portlet-mode>
         </supports>
-
         <supported-locale>en</supported-locale>
-
         <portlet-info>
             <title>Apache mod_jk Configuration</title>
             <short-title>Apache mod_jk</short-title>
@@ -433,18 +271,13 @@
         <description>New Portlet for configuring Keystores</description>
         <portlet-name>Keystores</portlet-name>
         <display-name>Keystore Wizard</display-name>
-
         <portlet-class>org.apache.geronimo.console.keystores.KeystoresPortlet</portlet-class>
-
         <expiration-cache>-1</expiration-cache>
-
         <supports>
             <mime-type>text/html</mime-type>
             <portlet-mode>VIEW</portlet-mode>
         </supports>
-
         <supported-locale>en</supported-locale>
-
         <portlet-info>
             <title>Keystore Configuration</title>
             <short-title>Keystores</short-title>
@@ -456,18 +289,13 @@
         <description>Portlet for Certification Authority</description>
         <portlet-name>CertificationAuthority</portlet-name>
         <display-name>Certification Authority</display-name>
-
         <portlet-class>org.apache.geronimo.console.ca.CertificationAuthorityPortlet</portlet-class>
-
         <expiration-cache>-1</expiration-cache>
-
         <supports>
             <mime-type>text/html</mime-type>
             <portlet-mode>VIEW</portlet-mode>
         </supports>
-
         <supported-locale>en</supported-locale>
-
         <portlet-info>
             <title>Certification Authority</title>
             <short-title>CA</short-title>
@@ -479,19 +307,14 @@
         <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>
             <portlet-mode>VIEW</portlet-mode>
             <portlet-mode>HELP</portlet-mode>
         </supports>
-
         <supported-locale>en</supported-locale>
-
         <portlet-info>
             <title>Installed Applications</title>
             <short-title>Applications</short-title>
@@ -503,19 +326,14 @@
         <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>
             <portlet-mode>VIEW</portlet-mode>
             <portlet-mode>HELP</portlet-mode>
         </supports>
-
         <supported-locale>en</supported-locale>
-
         <portlet-info>
             <title>Install New Applications</title>
             <short-title>Install Application</short-title>
@@ -524,58 +342,22 @@
     </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.configmanager.ConfigManagerPortlet</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 EARs</title>
-            <short-title>EAR Modules</short-title>
-            <keywords>Application EAR Module</keywords>
-        </portlet-info>
-        
-        <init-param>
-            <name>config-type</name>
-            <value>EAR</value>
-        </init-param>
-        
-    </portlet>
-
-    <portlet>
         <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.configmanager.ConfigManagerPortlet</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>
-        
         <init-param>
             <name>config-type</name>
             <value>WAR</value>
@@ -583,140 +365,40 @@
     </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.configmanager.ConfigManagerPortlet</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>
-        
-        <init-param>
-            <name>config-type</name>
-            <value>EJB</value>
-        </init-param>
-    </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.configmanager.ConfigManagerPortlet</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>
-        
-        <init-param>
-            <name>config-type</name>
-            <value>RAR</value>
-        </init-param>
-    </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.configmanager.ConfigManagerPortlet</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>
-        
-        <init-param>
-            <name>config-type</name>
-            <value>CAR</value>
-        </init-param>        
-    </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.configmanager.ConfigManagerPortlet</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 System Modules</title>
             <short-title>System Modules</short-title>
             <keywords>System Module</keywords>
         </portlet-info>
-
         <init-param>
             <name>config-type</name>
             <value>SERVICE</value>
         </init-param>
     </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>
-
         <supported-locale>en</supported-locale>
-
         <portlet-info>
             <title>Console Realm Users</title>
             <short-title>Users</short-title>
@@ -728,19 +410,14 @@
         <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>
-
         <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>Console Realm Groups</title>
             <short-title>Groups</short-title>
@@ -752,19 +429,14 @@
         <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>Installed Security Realms</title>
             <short-title>Security Realms</short-title>
@@ -772,96 +444,17 @@
         </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>
-            <portlet-mode>VIEW</portlet-mode>
-            <portlet-mode>HELP</portlet-mode>
-        </supports>
-
-        <supported-locale>en</supported-locale>
-
-        <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>
-            <portlet-mode>VIEW</portlet-mode>
-            <portlet-mode>HELP</portlet-mode>
-        </supports>
-
-        <supported-locale>en</supported-locale>
-
-        <portlet-info>
-            <title>DB Viewer</title>
-            <short-title>DB Viewer</short-title>
-            <keywords>DB Viewer</keywords>
-        </portlet-info>
-    </portlet>
-
-    <portlet>
-        <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>
-            <portlet-mode>HELP</portlet-mode>
-        </supports>
-
-        <supported-locale>en</supported-locale>
-
-        <portlet-info>
-            <title>Run SQL</title>
-            <short-title>Run SQL</short-title>
-            <keywords>Run SQL</keywords>
-        </portlet-info>
-    </portlet>
-
     <portlet>
         <description>Portlet for CAR Import/Export</description>
         <portlet-name>ImportExport</portlet-name>
         <display-name>CAR Import/Export Portlet</display-name>
-
         <portlet-class>org.apache.geronimo.console.car.ImportExportPortlet</portlet-class>
-
         <expiration-cache>-1</expiration-cache>
-
         <supports>
             <mime-type>text/html</mime-type>
             <portlet-mode>VIEW</portlet-mode>
         </supports>
-
         <supported-locale>en</supported-locale>
-
         <portlet-info>
             <title>Create and Install Plugins</title>
             <short-title>Create/Install Plugins</short-title>
@@ -869,5 +462,4 @@
         </portlet-info>
     </portlet>
 
-    <!-- End of console portlets -->
 </portlet-app>

Modified: geronimo/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/web.xml?rev=572737&r1=572736&r2=572737&view=diff
==============================================================================
--- geronimo/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/plugins/console/trunk/console-base-portlets/src/main/webapp/WEB-INF/web.xml Tue Sep  4 10:08:31 2007
@@ -36,12 +36,6 @@
           <param-name>activeReverseAjaxEnabled</param-name>
           <param-value>true</param-value>
       </init-param>
-<!--
-      <init-param>
-          <param-name>crossDomainSessionSecurity</param-name>
-          <param-value>false</param-value>
-      </init-param>
--->
     </servlet>
 
     <servlet>
@@ -138,15 +132,6 @@
         <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-        <servlet-name>EJBServer</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>EJBServer</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
         <servlet-name>ThreadPool</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
@@ -219,15 +204,6 @@
         <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-        <servlet-name>EARModules</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>EARModules</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
         <servlet-name>WARModules</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
@@ -237,33 +213,6 @@
         <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-        <servlet-name>EJBModules</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>EJBModules</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>RARModules</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>RARModules</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>ClientModules</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>ClientModules</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
         <servlet-name>SystemModules</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
@@ -393,24 +342,8 @@
         <url-pattern>/PlutoInvoker/Deployment</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>EARModules</servlet-name>
-        <url-pattern>/PlutoInvoker/EARModules</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
         <servlet-name>WARModules</servlet-name>
         <url-pattern>/PlutoInvoker/WARModules</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>EJBModules</servlet-name>
-        <url-pattern>/PlutoInvoker/EJBModules</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>RARModules</servlet-name>
-        <url-pattern>/PlutoInvoker/RARModules</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>ClientModules</servlet-name>
-        <url-pattern>/PlutoInvoker/ClientModules</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
         <servlet-name>SystemModules</servlet-name>