geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmcma...@apache.org
Subject svn commit: r552901 - in /geronimo/sandbox/portals: ./ geronimo-console-standard/ geronimo-console/ geronimo-console/src/ geronimo-console/src/main/java/org/apache/geronimo/console/classloaderview/ geronimo-console/src/main/java/org/apache/geronimo/con...
Date Tue, 03 Jul 2007 16:30:01 GMT
Author: pmcmahan
Date: Tue Jul  3 09:29:58 2007
New Revision: 552901

URL: http://svn.apache.org/viewvc?view=rev&rev=552901
Log:
make the pluto based admin console work in the geronimo 2.0 minimal assemblies.
there are still some rough edges.

Added:
    geronimo/sandbox/portals/geronimo-console/
      - copied from r548868, geronimo/sandbox/portals/geronimo-console-standard/
    geronimo/sandbox/portals/geronimo-console/LICENSE.txt
      - copied unchanged from r552899, geronimo/sandbox/portals/geronimo-console-standard/LICENSE.txt
    geronimo/sandbox/portals/geronimo-console/NOTICE.txt
      - copied unchanged from r552899, geronimo/sandbox/portals/geronimo-console-standard/NOTICE.txt
    geronimo/sandbox/portals/geronimo-console/pom.xml
      - copied, changed from r552899, geronimo/sandbox/portals/geronimo-console-standard/pom.xml
    geronimo/sandbox/portals/geronimo-console/src/
      - copied from r552899, geronimo/sandbox/portals/geronimo-console-standard/src/
Removed:
    geronimo/sandbox/portals/geronimo-console-standard/
    geronimo/sandbox/portals/geronimo-console/src/main/java/org/apache/geronimo/console/classloaderview/
    geronimo/sandbox/portals/geronimo-console/src/main/java/org/apache/geronimo/console/databasemanager/
    geronimo/sandbox/portals/geronimo-console/src/main/java/org/apache/geronimo/console/dependencyview/
    geronimo/sandbox/portals/geronimo-console/src/main/java/org/apache/geronimo/console/derbylogmanager/
    geronimo/sandbox/portals/geronimo-console/src/main/java/org/apache/geronimo/console/internaldb/
    geronimo/sandbox/portals/geronimo-console/src/main/java/org/apache/geronimo/console/jmsmanager/
    geronimo/sandbox/portals/geronimo-console/src/main/java/org/apache/geronimo/console/jmxmanager/
    geronimo/sandbox/portals/geronimo-console/src/main/java/org/apache/geronimo/console/jndiview/
    geronimo/sandbox/portals/geronimo-console/src/main/java/org/apache/geronimo/console/ldapmanager/
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/view/dbwizard/
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/view/derbylogmanager/
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/view/internaldb/
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/view/jmsmanager/
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/view/jmswizard/
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/view/jmxmanager/
Modified:
    geronimo/sandbox/portals/README.txt
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/dwr.xml
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/portlet.xml
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/web.xml
    geronimo/sandbox/portals/geronimo-console/src/main/webapp/index.html
    geronimo/sandbox/portals/pluto-portal/src/main/resources/pluto-portal-driver-config.xml
    geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/geronimo-web.xml
    geronimo/sandbox/portals/pom.xml

Modified: geronimo/sandbox/portals/README.txt
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/README.txt?view=diff&rev=552901&r1=552900&r2=552901
==============================================================================
--- geronimo/sandbox/portals/README.txt (original)
+++ geronimo/sandbox/portals/README.txt Tue Jul  3 09:29:58 2007
@@ -8,4 +8,5 @@
 $GERONIMO_DIR/bin/deploy.sh install-plugin pluto-container/target/*.car
 $GERONIMO_DIR/bin/deploy.sh deploy pluto-portal/target/*.war
 $GERONIMO_DIR/bin/deploy.sh deploy pluto-testsuite/target/*.war
-$GERONIMO_DIR/bin/deploy.sh deploy geronimo-console-standard/target/*.war
+$GERONIMO_DIR/bin/deploy.sh deploy geronimo-console/target/*.war
+navigate to http://localhost:8080/console

Copied: geronimo/sandbox/portals/geronimo-console/pom.xml (from r552899, geronimo/sandbox/portals/geronimo-console-standard/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/geronimo-console/pom.xml?view=diff&rev=552901&p1=geronimo/sandbox/portals/geronimo-console-standard/pom.xml&r1=552899&p2=geronimo/sandbox/portals/geronimo-console/pom.xml&r2=552901
==============================================================================
--- geronimo/sandbox/portals/geronimo-console-standard/pom.xml (original)
+++ geronimo/sandbox/portals/geronimo-console/pom.xml Tue Jul  3 09:29:58 2007
@@ -29,8 +29,8 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>geronimo-manager</artifactId>
-    <name>Geronimo Manager Console Portlets</name>
+    <artifactId>geronimo-console</artifactId>
+    <name>Geronimo Console</name>
     <packaging>war</packaging>
 
     <dependencies>
@@ -40,6 +40,8 @@
             <artifactId>geronimo-upgrade</artifactId>
             <version>${geronimoVersion}</version>
             <scope>provided</scope>
+<!-- should look into providing geronimo-upgrade in the minimal assembly
+-->
         </dependency>
 
         <dependency>
@@ -47,13 +49,8 @@
             <artifactId>geronimo-converter</artifactId>
             <version>${geronimoVersion}</version>
             <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-derby</artifactId>
-            <version>${geronimoVersion}</version>
-            <scope>provided</scope>
+<!-- should look into providing geronimo-converter in the minimal assembly
+-->
         </dependency>
 
         <dependency>
@@ -86,8 +83,6 @@
         <dependency>
             <groupId>org.apache.geronimo.applications.console</groupId>
             <artifactId>geronimo-console-core</artifactId>
-            <version>${geronimoVersion}</version>
-            <scope>provided</scope>
         </dependency>
         
         <dependency>
@@ -99,27 +94,16 @@
         <dependency>
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
-            <scope>provided</scope>
         </dependency>
         
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        
-        <!-- JMS dependencies -->
-        
-        <dependency>
-            <groupId>org.apache.activemq</groupId>
-            <artifactId>activemq-core</artifactId>
-            <scope>provided</scope>
         </dependency>
         
         <dependency>
             <groupId>dwr</groupId>
             <artifactId>dwr</artifactId>
-            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -132,7 +116,6 @@
     
   <!-- Build configuration -->
   <build>
-    <finalName>geronimo-manager</finalName>
     <resources>
       <resource>
         <directory>src/main/resources</directory>

Modified: geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/dwr.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/dwr.xml?view=diff&rev=552901&r1=552899&r2=552901
==============================================================================
--- geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/dwr.xml (original)
+++ geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/dwr.xml Tue Jul  3 09:29:58 2007
@@ -28,11 +28,5 @@
     <create creator="new" javascript="ProgressMonitor">
       <param name="class" value="org.apache.geronimo.console.ajax.ProgressMonitor"/>
     </create>
-    <create creator="new" javascript="JMXHelper">
-      <param name="class" value="org.apache.geronimo.console.jmxmanager.JMXManagerHelper"/>
-    </create>
-    <create creator="new" javascript="LDAPHelper">
-      <param name="class" value="org.apache.geronimo.console.ldapmanager.LDAPManagerHelper"/>
-    </create>
   </allow>
 </dwr>

Modified: geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/geronimo-web.xml?view=diff&rev=552901&r1=552899&r2=552901
==============================================================================
--- geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/geronimo-web.xml Tue Jul  3 09:29:58 2007
@@ -24,7 +24,7 @@
   <dep:environment>
     <dep:moduleId>
       <dep:groupId>org.apache.geronimo.portals</dep:groupId>
-      <dep:artifactId>geronimo-manager</dep:artifactId>
+      <dep:artifactId>geronimo-console</dep:artifactId>
       <dep:version>1.0-SNAPSHOT</dep:version>
       <dep:type>war</dep:type>
     </dep:moduleId>
@@ -38,51 +38,24 @@
         <dep:type>car</dep:type>
       </dep:dependency>
 
+<!--  TODO: consider adding this to the minimal assembly instead of including it in WEB-INF/lib
       <dep:dependency>
         <dep:groupId>org.apache.geronimo.modules</dep:groupId>
         <dep:artifactId>geronimo-converter</dep:artifactId>
         <dep:type>jar</dep:type>
       </dep:dependency>
-
-<!--
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.modules</dep:groupId>
-        <dep:artifactId>geronimo-kernel</dep:artifactId>
-        <dep:type>jar</dep:type>
-      </dep:dependency>
 -->
-
-<!-- copied from deps generated by maven-car-plugin for server/trunk/configs/webconsole-tomcat -->
       <dep:dependency>
           <dep:groupId>commons-digester</dep:groupId>
           <dep:artifactId>commons-digester</dep:artifactId>
           <dep:type>jar</dep:type>
       </dep:dependency>
       <dep:dependency>
-          <dep:groupId>commons-fileupload</dep:groupId>
-          <dep:artifactId>commons-fileupload</dep:artifactId>
-          <dep:type>jar</dep:type>
-      </dep:dependency>
-      <dep:dependency>
-          <dep:groupId>commons-io</dep:groupId>
-          <dep:artifactId>commons-io</dep:artifactId>
-          <dep:type>jar</dep:type>
-      </dep:dependency>
-      <dep:dependency>
-          <dep:groupId>dwr</dep:groupId>
-          <dep:artifactId>dwr</dep:artifactId>
-          <dep:type>jar</dep:type>
-      </dep:dependency>
-      <dep:dependency>
         <dep:groupId>org.apache.geronimo.configs</dep:groupId>
         <dep:artifactId>connector-deployer</dep:artifactId>
         <dep:type>car</dep:type>
       </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
-        <dep:artifactId>j2ee-corba-yoko</dep:artifactId>
-        <dep:type>car</dep:type>
-      </dep:dependency>
+<!--  TODO: consider adding this to the minimal assembly instead of including it in WEB-INF/lib
       <dep:dependency>
         <dep:groupId>org.apache.geronimo.modules</dep:groupId>
         <dep:artifactId>geronimo-upgrade</dep:artifactId>
@@ -90,14 +63,8 @@
         <dep:type>jar</dep:type>
         <dep:import>classes</dep:import>
       </dep:dependency>
-
-<!--  I don't think this one needs to be explicitly declared
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
-        <dep:artifactId>jasper</dep:artifactId>
-        <dep:type>car</dep:type>
-      </dep:dependency>
 -->
+
       <dep:dependency>
         <dep:groupId>org.apache.geronimo.modules</dep:groupId>
         <dep:artifactId>geronimo-management</dep:artifactId>
@@ -106,37 +73,12 @@
         <dep:import>classes</dep:import>
       </dep:dependency>
       <dep:dependency>
-        <dep:groupId>org.apache.geronimo.modules</dep:groupId>
-        <dep:artifactId>geronimo-activemq-management</dep:artifactId>
-        <dep:version>2.0-SNAPSHOT</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.applications.console</dep:groupId>
-        <dep:artifactId>geronimo-console-core</dep:artifactId>
-        <dep:version>2.0-SNAPSHOT</dep:version>
-        <dep:type>jar</dep:type>
-        <dep:import>classes</dep:import>
-      </dep:dependency>
-      <dep:dependency>
           <dep:groupId>org.apache.geronimo.modules</dep:groupId>
           <dep:artifactId>geronimo-deploy-jsr88</dep:artifactId>
           <dep:version>2.0-SNAPSHOT</dep:version>
           <dep:type>jar</dep:type>
           <dep:import>classes</dep:import>
       </dep:dependency>
-
-
-
-
-
-
-
-
-
-
-
     </dep:dependencies>
     <dep:hidden-classes>
        <filter>org.apache.commons.digester</filter>
@@ -144,7 +86,7 @@
     <dep:non-overridable-classes/>
   </dep:environment>
 
-  <context-root>/manager</context-root>
+  <context-root>/console</context-root>
 
   <container-config>
     <tomcat xmlns="http://geronimo.apache.org/xml/ns/web/tomcat/config-1.0">
@@ -172,7 +114,6 @@
   </gbean>
 -->
 
-<!--
             <gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">
                 <reference name="ServerInfo">
                     <name>ServerInfo</name>
@@ -181,288 +122,6 @@
                     <name>properties-login</name>
                 </reference>
             </gbean>
--->
-            <gbean name="Database0" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="name">DaffodilDB Embedded</attribute>
-                <attribute name="URLPrototype">jdbc:daffodilDB_embedded:{Database}</attribute>
-                <attribute name="driverClassName">in.co.daffodil.db.jdbc.DaffodilDBDriver</attribute>
-                <attribute name="defaultPort">0</attribute>
-                <attribute name="XA">false</attribute>
-                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
-            </gbean>
-            <gbean name="Database1" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="name">DaffodilDB Server</attribute>
-                <attribute name="URLPrototype">jdbc:daffodilDB://{Host}:{Port}/{Database}</attribute>
-                <attribute name="driverClassName">in.co.daffodil.db.rmi.RmiDaffodilDBDriver</attribute>
-                <attribute name="defaultPort">3456</attribute>
-                <attribute name="XA">false</attribute>
-                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
-            </gbean>
-            <gbean name="Database2" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="name">DB2</attribute>
-                <attribute name="URLPrototype">jdbc:db2://{Host}:{Port}/{Database}</attribute>
-                <attribute name="driverClassName">com.ibm.db2.jcc.DB2Driver</attribute>
-                <attribute name="defaultPort">50000</attribute>
-                <attribute name="XA">false</attribute>
-                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
-            </gbean>
-            <gbean name="Database3" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="name">DB2 (DataDirect)</attribute>
-                <attribute name="URLPrototype">jdbc:datadirect:db2://{Host}:{Port};DatabaseName={Database}</attribute>
-                <attribute name="driverClassName">com.ddtek.jdbc.db2.DB2Driver</attribute>
-                <attribute name="defaultPort">50000</attribute>
-                <attribute name="XA">false</attribute>
-                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
-            </gbean>
-            <gbean name="Database4" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="name">Derby embedded</attribute>
-                <attribute name="URLPrototype">jdbc:derby:{Database}</attribute>
-                <attribute name="driverClassName">org.apache.derby.jdbc.EmbeddedDriver</attribute>
-                <attribute name="defaultPort">0</attribute>
-                <attribute name="XA">false</attribute>
-                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
-            </gbean>
-            <gbean name="Database5" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="name">Derby network</attribute>
-                <attribute name="URLPrototype">jdbc:derby://{Host}:{Port}/{Database}</attribute>
-                <attribute name="driverClassName">org.apache.derby.jdbc.ClientDriver</attribute>
-                <attribute name="defaultPort">1527</attribute>
-                <attribute name="XA">false</attribute>
-                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
-            </gbean>
-            <gbean name="Database6" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="name">Derby embedded XA</attribute>
-                <attribute name="URLPrototype">null</attribute>
-                <attribute name="driverClassName">null</attribute>
-                <attribute name="defaultPort">0</attribute>
-                <attribute name="XA">true</attribute>
-                <attribute name="RARName">org.tranql/tranql-connector-derby-embed-xa//rar</attribute>
-            </gbean>
-            <gbean name="Database7" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="name">Derby network XA</attribute>
-                <attribute name="URLPrototype">null</attribute>
-                <attribute name="driverClassName">null</attribute>
-                <attribute name="defaultPort">0</attribute>
-                <attribute name="XA">true</attribute>
-                <attribute name="RARName">org.tranql/tranql-connector-derby-client-xa//rar</attribute>
-            </gbean>
-            <gbean name="Database8" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="name">FrontBase</attribute>
-                <attribute name="URLPrototype">jdbc:FrontBase://{Host}:{Port}/{Database}</attribute>
-                <attribute name="driverClassName">com.frontbase.jdbc.FBJDriver</attribute>
-                <attribute name="defaultPort">0</attribute>
-                <attribute name="XA">false</attribute>
-                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
-            </gbean>
-            <gbean name="Database9" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="name">HSQLDB embedded</attribute>
-                <attribute name="URLPrototype">jdbc:hsqldb:{Database}</attribute>
-                <attribute name="driverClassName">org.hsqldb.jdbcDriver</attribute>
-                <attribute name="defaultPort">0</attribute>
-                <attribute name="XA">false</attribute>
-                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
-            </gbean>
-            <gbean name="Database10" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="name">HSQLDB server</attribute>
-                <attribute name="URLPrototype">jdbc:hsqldb:hsql://{Host}:{Port}/{Database}</attribute>
-                <attribute name="driverClassName">org.hsqldb.jdbcDriver</attribute>
-                <attribute name="defaultPort">0</attribute>
-                <attribute name="XA">false</attribute>
-                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
-            </gbean>
-            <gbean name="Database11" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="name">Informix</attribute>
-                <attribute name="URLPrototype">jdbc:informix-sqli://{Host}:{Port}/{Database}:informixserver={dbservername}</attribute>
-                <attribute name="driverClassName">com.informix.jdbc.IfxDriver</attribute>
-                <attribute name="defaultPort">0</attribute>
-                <attribute name="XA">false</attribute>
-                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
-            </gbean>
-            <gbean name="Database12" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="name">Informix (DataDirect)</attribute>
-                <attribute name="URLPrototype">jdbc:datadirect:informix://{Host}:{Port};informixServer={dbservername};DatabaseName={Database}</attribute>
-                <attribute name="driverClassName">com.ddtek.jdbc.informix.InformixDriver</attribute>
-                <attribute name="defaultPort">0</attribute>
-                <attribute name="XA">false</attribute>
-                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
-            </gbean>
-            <gbean name="Database13" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="name">InterSystems Cache</attribute>
-                <attribute name="URLPrototype">jdbc:Cache://{Host}:{Port}/{namespace}</attribute>
-                <attribute name="driverClassName">com.intersys.jdbc.CacheDriver</attribute>
-                <attribute name="defaultPort">0</attribute>
-                <attribute name="XA">false</attribute>
-                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
-            </gbean>
-            <gbean name="Database14" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="name">JDataStore</attribute>
-                <attribute name="URLPrototype">jdbc:borland:dslocal:{file}</attribute>
-                <attribute name="driverClassName">com.borland.datastore.jdbc.DataStoreDriver</attribute>
-                <attribute name="defaultPort">0</attribute>
-                <attribute name="XA">false</attribute>
-                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
-            </gbean>
-            <gbean name="Database15" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="name">JDBC/ODBC Bridge</attribute>
-                <attribute name="URLPrototype">jdbc:odbc:{datasource}</attribute>
-                <attribute name="driverClassName">sun.jdbc.odbc.JdbcOdbcDriver</attribute>
-                <attribute name="defaultPort">0</attribute>
-                <attribute name="XA">false</attribute>
-                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
-            </gbean>
-            <gbean name="Database16" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="name">McKoi embedded</attribute>
-                <attribute name="URLPrototype">jdbc:mckoi:local://{ConfigPath}/{Schema}/</attribute>
-                <attribute name="driverClassName">com.mckoi.JDBCDriver</attribute>
-                <attribute name="defaultPort">0</attribute>
-                <attribute name="XA">false</attribute>
-                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
-            </gbean>
-            <gbean name="Database17" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="name">McKoi server</attribute>
-                <attribute name="URLPrototype">jdbc:mckoi://{Host}:{Port}/{Schema}/</attribute>
-                <attribute name="driverClassName">com.mckoi.JDBCDriver</attribute>
-                <attribute name="defaultPort">0</attribute>
-                <attribute name="XA">false</attribute>
-                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
-            </gbean>
-            <gbean name="Database18" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="name">Mimer</attribute>
-                <attribute name="URLPrototype">jdbc:mimer://{Host}:{Port}/{Database}</attribute>
-                <attribute name="driverClassName">com.mimer.jdbc.Driver</attribute>
-                <attribute name="defaultPort">0</attribute>
-                <attribute name="XA">false</attribute>
-                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
-            </gbean>
-            <gbean name="Database19" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="name">MySQL</attribute>
-                <attribute name="URLPrototype">jdbc:mysql://{Host}:{Port}/{Database}</attribute>
-                <attribute name="driverClassName">com.mysql.jdbc.Driver</attribute>
-                <attribute name="defaultPort">3306</attribute>
-                <attribute name="XA">false</attribute>
-                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
-            </gbean>
-            <gbean name="Database20" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="name">Oracle Thin</attribute>
-                <attribute name="URLPrototype">jdbc:oracle:thin:@{Host}:{Port}:{SID}</attribute>
-                <attribute name="driverClassName">oracle.jdbc.OracleDriver</attribute>
-                <attribute name="defaultPort">1521</attribute>
-                <attribute name="XA">false</attribute>
-                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
-            </gbean>
-            <gbean name="Database21" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="name">Oracle OCI</attribute>
-                <attribute name="URLPrototype">jdbc:oracle:oci:@{Host}:{Port}:{SID}</attribute>
-                <attribute name="driverClassName">oracle.jdbc.OracleDriver</attribute>
-                <attribute name="defaultPort">1521</attribute>
-                <attribute name="XA">false</attribute>
-                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
-            </gbean>
-            <gbean name="Database22" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="name">Oracle (DataDirect)</attribute>
-                <attribute name="URLPrototype">jdbc:datadirect:oracle://{Host}:{Port};ServiceName={SID}</attribute>
-                <attribute name="driverClassName">com.ddtek.jdbc.oracle.OracleDriver</attribute>
-                <attribute name="defaultPort">1521</attribute>
-                <attribute name="XA">false</attribute>
-                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
-            </gbean>
-            <gbean name="Database23" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="name">Pervasive</attribute>
-                <attribute name="URLPrototype">jdbc:pervasive://{Host}:{Port}/{Database}</attribute>
-                <attribute name="driverClassName">com.pervasive.jdbc.v2.Driver</attribute>
-                <attribute name="defaultPort">0</attribute>
-                <attribute name="XA">false</attribute>
-                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
-            </gbean>
-            <gbean name="Database24" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="name">Pointbase server</attribute>
-                <attribute name="URLPrototype">jdbc:pointbase:server://{Host}:{Port}/{Database}</attribute>
-                <attribute name="driverClassName">com.pointbase.jdbc.jdbcUniversalDriver</attribute>
-                <attribute name="defaultPort">0</attribute>
-                <attribute name="XA">false</attribute>
-                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
-            </gbean>
-            <gbean name="Database25" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="name">PostgreSQL</attribute>
-                <attribute name="URLPrototype">jdbc:postgresql://{Host}:{Port}/{Database}</attribute>
-                <attribute name="driverClassName">org.postgresql.Driver</attribute>
-                <attribute name="defaultPort">5432</attribute>
-                <attribute name="XA">false</attribute>
-                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
-            </gbean>
-            <gbean name="Database26" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="name">Progress</attribute>
-                <attribute name="URLPrototype">jdbc:jdbcProgress:T:{Host}:{Port}:{Database}</attribute>
-                <attribute name="driverClassName">com.progress.sql.jdbc.JdbcProgressDriver</attribute>
-                <attribute name="defaultPort">0</attribute>
-                <attribute name="XA">false</attribute>
-                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
-            </gbean>
-            <gbean name="Database27" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="name">MaxDB</attribute>
-                <attribute name="URLPrototype">jdbc:sapdb://{Host}:{Port}/{Database}</attribute>
-                <attribute name="driverClassName">com.sap.dbtech.jdbc.DriverSapDB</attribute>
-                <attribute name="defaultPort">0</attribute>
-                <attribute name="XA">false</attribute>
-                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
-            </gbean>
-            <gbean name="Database28" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="name">SQL Server</attribute>
-                <attribute name="URLPrototype">jdbc:microsoft:sqlserver://{Host}:{Port};DatabaseName={Database}</attribute>
-                <attribute name="driverClassName">com.microsoft.jdbc.sqlserver.SQLServerDriver</attribute>
-                <attribute name="defaultPort">1433</attribute>
-                <attribute name="XA">false</attribute>
-                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
-            </gbean>
-            <gbean name="Database29" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="name">SQL Server (jTDS)</attribute>
-                <attribute name="URLPrototype">jdbc:jtds:sqlserver://{Host}:{Port};DatabaseName={Database}</attribute>
-                <attribute name="driverClassName">net.sourceforge.jtds.jdbc.Driver</attribute>
-                <attribute name="defaultPort">1433</attribute>
-                <attribute name="XA">false</attribute>
-                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
-            </gbean>
-            <gbean name="Database30" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="name">SQL Server (DataDirect)</attribute>
-                <attribute name="URLPrototype">jdbc:datadirect:sqlserver://{Host}:{Port};DatabaseName={Database}</attribute>
-                <attribute name="driverClassName">com.ddtek.jdbc.sqlserver.SQLServerDriver</attribute>
-                <attribute name="defaultPort">1433</attribute>
-                <attribute name="XA">false</attribute>
-                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
-            </gbean>
-            <gbean name="Database31" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="name">Sybase ASE</attribute>
-                <attribute name="URLPrototype">jdbc:sybase:Tds:{Host}:{Port}/{Database}</attribute>
-                <attribute name="driverClassName">com.sybase.jdbc3.jdbc.SybDriver</attribute>
-                <attribute name="defaultPort">2048</attribute>
-                <attribute name="XA">false</attribute>
-                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
-            </gbean>
-            <gbean name="Database32" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="name">Sybase ASA</attribute>
-                <attribute name="URLPrototype">jdbc:sybase:Tds:{Host}:{Port}/{Database}</attribute>
-                <attribute name="driverClassName">com.sybase.jdbc3.jdbc.SybDriver</attribute>
-                <attribute name="defaultPort">2638</attribute>
-                <attribute name="XA">false</attribute>
-                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
-            </gbean>
-            <gbean name="Database33" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="name">Sybase (DataDirect)</attribute>
-                <attribute name="URLPrototype">jdbc:datadirect:sybase://{Host}:{Port};DatabaseName={Database}</attribute>
-                <attribute name="driverClassName">com.ddtek.jdbc.sybase.SybaseDriver</attribute>
-                <attribute name="defaultPort">0</attribute>
-                <attribute name="XA">false</attribute>
-                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
-            </gbean>
-            <gbean name="Database34" class="org.apache.geronimo.console.databasemanager.wizard.DatabaseDriverGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="name">Other</attribute>
-                <attribute name="URLPrototype"></attribute>
-                <attribute name="driverClassName"></attribute>
-                <attribute name="defaultPort">0</attribute>
-                <attribute name="XA">false</attribute>
-                <attribute name="RARName">org.tranql/tranql-connector-ra//rar</attribute>
-            </gbean>
-
 <!-- TODO: what is this? -->
     <gbean name="DeploymentFactory" class="org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryWithKernel" />
 

Modified: geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/portlet.xml?view=diff&rev=552901&r1=552899&r2=552901
==============================================================================
--- geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/portlet.xml (original)
+++ geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/portlet.xml Tue Jul  3 09:29:58 2007
@@ -145,30 +145,6 @@
     </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>
-
-        <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>Derby Log Viewer</title>
-            <short-title>Derby Log Viewer</short-title>
-            <keywords>Derby, Log, Viewer</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>
@@ -337,54 +313,6 @@
     </portlet>
 
     <portlet>
-        <description>Portlet for managing the JMS server</description>
-        <portlet-name>JMSServerManager</portlet-name>
-        <display-name>JMS Server Mangement Portlet</display-name>
-
-        <portlet-class>org.apache.geronimo.console.jmsmanager.server.JMSBrokerPortlet</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>JMS Server Manager</title>
-            <short-title>JMS Servers</short-title>
-            <keywords>JMS Servers</keywords>
-        </portlet-info>
-    </portlet>
-
-    <portlet>
-        <description>Portlet for managing JMS network listeners</description>
-        <portlet-name>JMSConnectorManager</portlet-name>
-        <display-name>JMS Network Listener Portlet</display-name>
-
-        <portlet-class>org.apache.geronimo.console.jmsmanager.server.JMSConnectorPortlet</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>JMS Network Listeners</title>
-            <short-title>JMS Listeners</short-title>
-            <keywords>JMS Network Listeners Connectors</keywords>
-        </portlet-info>
-    </portlet>
-
-    <portlet>
         <description>Portlet for configuring Thread Pools</description>
         <portlet-name>ThreadPool</portlet-name>
         <display-name>Thread Pool Portlet</display-name>
@@ -409,80 +337,6 @@
     </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>
@@ -530,29 +384,6 @@
     </portlet>
 
     <portlet>
-        <description>Portlet for managing JMS Resources</description>
-        <portlet-name>JMSWizard</portlet-name>
-        <display-name>JMS Resource Wizard</display-name>
-
-        <portlet-class>org.apache.geronimo.console.jmsmanager.wizard.JMSResourcePortlet</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>JMS Resources</title>
-            <short-title>JMS Resources</short-title>
-            <keywords>JMS Resource Connection Factory Destination 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>
@@ -645,80 +476,6 @@
     </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>
-            <portlet-mode>VIEW</portlet-mode>
-            <portlet-mode>HELP</portlet-mode>
-        </supports>
-
-        <supported-locale>en</supported-locale>
-
-        <portlet-info>
-            <title>JMS Connection Factories</title>
-            <short-title>JMS Connection Factories</short-title>
-            <keywords>JMS</keywords>
-        </portlet-info>
-    </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>
-            <portlet-mode>VIEW</portlet-mode>
-            <portlet-mode>HELP</portlet-mode>
-        </supports>
-
-        <supported-locale>en</supported-locale>
-
-        <portlet-info>
-            <title>JMS Destination Manager</title>
-            <short-title>JMSManager</short-title>
-            <keywords>JMS Manager</keywords>
-        </portlet-info>
-    </portlet>
-
-    <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>
-            <portlet-mode>VIEW</portlet-mode>
-<!--            <portlet-mode>HELP</portlet-mode>-->
-        </supports>
-
-        <supported-locale>en</supported-locale>
-
-        <portlet-info>
-            <title>Java Mail Configuration</title>
-            <short-title>Mail Server</short-title>
-            <keywords>Java Mail Server</keywords>
-        </portlet-info>
-    </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>
@@ -1112,124 +869,5 @@
         </portlet-info>
     </portlet>
 
-    <portlet>
-        <description>Portlet for viewing JMX server</description>
-        <portlet-name>JMXViewer</portlet-name>
-        <display-name>JMX Viewer Portlet</display-name>
-
-        <portlet-class>org.apache.geronimo.console.jmxmanager.JMXManagerPortlet</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>JMX Viewer</title>
-            <short-title>JMX Viewer</short-title>
-            <keywords>JMX Viewer</keywords>
-        </portlet-info>
-    </portlet>
-
-    <portlet>
-        <description>Portlet for viewing LDAP server contents</description>
-        <portlet-name>LDAPViewer</portlet-name>
-        <display-name>LDAP Viewer Portlet</display-name>
-
-        <portlet-class>org.apache.geronimo.console.ldapmanager.LDAPManagerPortlet</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>LDAP Viewer</title>
-            <short-title>LDAP Viewer</short-title>
-            <keywords>LDAP Viewer</keywords>
-        </portlet-info>
-    </portlet>
-
-    <portlet>
-        <description>Portlet for viewing Classloader tree</description>
-        <portlet-name>ClassLoaderViewer</portlet-name>
-        <display-name>ClassLoader Viewer Portlet</display-name>
-                       
-        <portlet-class>org.apache.geronimo.console.classloaderview.ClassLoaderViewPortlet</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>ClassLoader Viewer</title>
-            <short-title>ClassLoader Viewer</short-title>
-            <keywords>ClassLoader Viewer</keywords>
-        </portlet-info>
-    </portlet>
-
-    <portlet>
-        <description>Portlet for viewing JNDI tree</description>
-        <portlet-name>JNDIViewer</portlet-name>
-        <display-name>JNDI Viewer Portlet</display-name>
-                       
-        <portlet-class>org.apache.geronimo.console.jndiview.JNDIViewPortlet</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>JNDI Viewer</title>
-            <short-title>JNDI Viewer</short-title>
-            <keywords>JNDI Viewer</keywords>
-        </portlet-info>
-    </portlet>
-
-    <portlet>
-        <description>Portlet for viewing Dependency tree</description>
-        <portlet-name>DependencyViewer</portlet-name>
-        <display-name>Dependency Viewer Portlet</display-name>
-                       
-        <portlet-class>org.apache.geronimo.console.dependencyview.DependencyViewPortlet</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>Dependency Viewer</title>
-            <short-title>Dependency Viewer</short-title>
-            <keywords>Dependency Viewer</keywords>
-        </portlet-info>
-    </portlet>
     <!-- End of console portlets -->
 </portlet-app>

Modified: geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp?view=diff&rev=552901&r1=552899&r2=552901
==============================================================================
--- geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp (original)
+++ geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/view/welcome/welcomeNormal.jsp Tue Jul  3 09:29:58 2007
@@ -69,14 +69,6 @@
                     </td>
                 </tr>
                 <tr>
-                    <td bgcolor="#FFFFFF" nowrap>
-                        &nbsp;<br />
-                        <img src='<%=renderResponse.encodeURL(renderRequest.getContextPath() + "/images/ico_db_16x16.gif")%>'/><a href="${pageContext.request.contextPath}/DBWizard">Database Pools</a><br />
-
-                        <img src='<%=renderResponse.encodeURL(renderRequest.getContextPath() + "/images/ico_lock_16x16.gif")%>'/><a href="${pageContext.request.contextPath}/RealmWizard">Security Realms</a><br />
-
-                        <img src='<%=renderResponse.encodeURL(renderRequest.getContextPath() + "/images/ico_beanjar_16x16.gif")%>'/><a href="${pageContext.request.contextPath}/JMSServerManager">JMS Resources</a><br />
-
                         <img src='<%=renderResponse.encodeURL(renderRequest.getContextPath() + "/images/ico_list_16x16.gif")%>'/><a href="${pageContext.request.contextPath}/Deployment">Deploy Applications</a><br />
 
                         <img src='<%=renderResponse.encodeURL(renderRequest.getContextPath() + "/images/ico_servcomp_16x16.gif")%>'/><a href="${pageContext.request.contextPath}/WebServerManager">Web Server Ports</a><br />

Modified: geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/web.xml?view=diff&rev=552901&r1=552899&r2=552901
==============================================================================
--- geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/sandbox/portals/geronimo-console/src/main/webapp/WEB-INF/web.xml Tue Jul  3 09:29:58 2007
@@ -85,15 +85,6 @@
         <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-        <servlet-name>DerbyLogViewer</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>DerbyLogViewer</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
         <servlet-name>WebAccessLogViewer</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
@@ -139,24 +130,6 @@
         <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-        <servlet-name>JMSServerManager</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>JMSServerManager</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>JMSConnectorManager</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>JMSConnectorManager</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>
@@ -166,33 +139,6 @@
         <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-        <servlet-name>J2CAServer</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>J2CAServer</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>CORBAServer</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>CORBAServer</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>UDDIServer</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>UDDIServer</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
         <servlet-name>RepositoryViewer</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
@@ -202,24 +148,6 @@
         <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-        <servlet-name>DBWizard</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>DBWizard</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>JMSWizard</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>JMSWizard</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
         <servlet-name>RealmWizard</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
@@ -256,33 +184,6 @@
         <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-        <servlet-name>JMSConnections</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>JMSConnections</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>JMSManager</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>JMSManager</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>MailServer</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>MailServer</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
         <servlet-name>Applications</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
@@ -382,33 +283,6 @@
         <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-        <servlet-name>InternalDB</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>InternalDB</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>DBViewer</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>DBViewer</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>RunSQL</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>RunSQL</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
         <servlet-name>ImportExport</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
@@ -417,51 +291,6 @@
         </init-param>
         <load-on-startup>1</load-on-startup>
     </servlet>
-    <servlet>
-        <servlet-name>JMXViewer</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>JMXViewer</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>LDAPViewer</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>LDAPViewer</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>ClassLoaderViewer</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>ClassLoaderViewer</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>JNDIViewer</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>JNDIViewer</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
-    <servlet>
-        <servlet-name>DependencyViewer</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>DependencyViewer</param-value>
-        </init-param>
-        <load-on-startup>1</load-on-startup>
-    </servlet>
     <servlet-mapping>
         <servlet-name>dwr-invoker</servlet-name>
         <url-pattern>/dwr/*</url-pattern>
@@ -499,10 +328,6 @@
         <url-pattern>/PlutoInvoker/LogViewer</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>DerbyLogViewer</servlet-name>
-        <url-pattern>/PlutoInvoker/DerbyLogViewer</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
         <servlet-name>WebAccessLogViewer</servlet-name>
         <url-pattern>/PlutoInvoker/WebAccessLogViewer</url-pattern>
     </servlet-mapping>
@@ -519,46 +344,14 @@
         <url-pattern>/PlutoInvoker/ConnectorManager</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>EJBServer</servlet-name>
-        <url-pattern>/PlutoInvoker/EJBServer</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>JMSServerManager</servlet-name>
-        <url-pattern>/PlutoInvoker/JMSServerManager</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>JMSConnectorManager</servlet-name>
-        <url-pattern>/PlutoInvoker/JMSConnectorManager</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
         <servlet-name>ThreadPool</servlet-name>
         <url-pattern>/PlutoInvoker/ThreadPool</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>J2CAServer</servlet-name>
-        <url-pattern>/PlutoInvoker/J2CAServer</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>CORBAServer</servlet-name>
-        <url-pattern>/PlutoInvoker/CORBAServer</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>UDDIServer</servlet-name>
-        <url-pattern>/PlutoInvoker/UDDIServer</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
         <servlet-name>RepositoryViewer</servlet-name>
         <url-pattern>/PlutoInvoker/RepositoryViewer</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>DBWizard</servlet-name>
-        <url-pattern>/PlutoInvoker/DBWizard</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>JMSWizard</servlet-name>
-        <url-pattern>/PlutoInvoker/JMSWizard</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
         <servlet-name>RealmWizard</servlet-name>
         <url-pattern>/PlutoInvoker/RealmWizard</url-pattern>
     </servlet-mapping>
@@ -575,18 +368,6 @@
         <url-pattern>/PlutoInvoker/CertificationAuthority</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>JMSConnections</servlet-name>
-        <url-pattern>/PlutoInvoker/JMSConnections</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>JMSManager</servlet-name>
-        <url-pattern>/PlutoInvoker/JMSManager</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>MailServer</servlet-name>
-        <url-pattern>/PlutoInvoker/MailServer</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
         <servlet-name>Applications</servlet-name>
         <url-pattern>/PlutoInvoker/Applications</url-pattern>
     </servlet-mapping>
@@ -631,39 +412,7 @@
         <url-pattern>/PlutoInvoker/SecurityRealms</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>InternalDB</servlet-name>
-        <url-pattern>/PlutoInvoker/InternalDB</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>DBViewer</servlet-name>
-        <url-pattern>/PlutoInvoker/DBViewer</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>RunSQL</servlet-name>
-        <url-pattern>/PlutoInvoker/RunSQL</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
         <servlet-name>ImportExport</servlet-name>
         <url-pattern>/PlutoInvoker/ImportExport</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>JMXViewer</servlet-name>
-        <url-pattern>/PlutoInvoker/JMXViewer</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>LDAPViewer</servlet-name>
-        <url-pattern>/PlutoInvoker/LDAPViewer</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>ClassLoaderViewer</servlet-name>
-        <url-pattern>/PlutoInvoker/ClassLoaderViewer</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>JNDIViewer</servlet-name>
-        <url-pattern>/PlutoInvoker/JNDIViewer</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>DependencyViewer</servlet-name>
-        <url-pattern>/PlutoInvoker/DependencyViewer</url-pattern>
     </servlet-mapping>
 </web-app>

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

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

Modified: geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/geronimo-web.xml?view=diff&rev=552901&r1=552900&r2=552901
==============================================================================
--- geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/sandbox/portals/pluto-portal/src/main/webapp/WEB-INF/geronimo-web.xml Tue Jul  3 09:29:58 2007
@@ -34,11 +34,6 @@
         <dep:version>1.0-SNAPSHOT</dep:version>
         <dep:type>car</dep:type>
       </dep:dependency>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.configs</dep:groupId>
-        <dep:artifactId>dojo-tomcat</dep:artifactId>
-        <dep:type>car</dep:type>
-      </dep:dependency>
     </dep:dependencies>
     <dep:hidden-classes/>
     <dep:non-overridable-classes/>

Modified: geronimo/sandbox/portals/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/portals/pom.xml?view=diff&rev=552901&r1=552900&r2=552901
==============================================================================
--- geronimo/sandbox/portals/pom.xml (original)
+++ geronimo/sandbox/portals/pom.xml Tue Jul  3 09:29:58 2007
@@ -265,6 +265,28 @@
                 <groupId>dwr</groupId>
                 <artifactId>dwr</artifactId>
                 <version>1.1.3</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>bsf</groupId>
+                        <artifactId>bsf</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-logging</groupId>
+                        <artifactId>commons-loggingbsf</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>dom4j</groupId>
+                        <artifactId>dom4j</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>jdom</groupId>
+                        <artifactId>jdom</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>xom</groupId>
+                        <artifactId>xom</artifactId>
+                    </exclusion>
+                </exclusions>
             </dependency>
 
             <dependency>
@@ -297,6 +319,18 @@
                 <version>${geronimoVersion}</version>
             </dependency>
 
+             <dependency>
+                <groupId>org.apache.geronimo.applications.console</groupId>
+                <artifactId>geronimo-console-core</artifactId>
+                <version>${geronimoVersion}</version>
+                <exclusions>
+                    <exclusion>
+                        <groupId>org.apache.geronimo.modules</groupId>
+                        <artifactId>geronimo-connector</artifactId>
+                    </exclusion>
+                </exclusions>
+            </dependency>
+
         </dependencies>
     </dependencyManagement>
 
@@ -469,7 +503,7 @@
                 <module>pluto-container</module>
                 <module>pluto-portal</module>
                 <module>pluto-testsuite</module>
-                <module>geronimo-console-standard</module>
+                <module>geronimo-console</module>
             </modules>
         </profile>
     </profiles>



Mime
View raw message