geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r610590 [1/2] - in /geronimo/server/trunk: assemblies/geronimo-jetty6-javaee5/ assemblies/geronimo-tomcat6-javaee5/ plugins/console/ plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ajax/ plugins/console/conso...
Date Wed, 09 Jan 2008 21:54:47 GMT
Author: djencks
Date: Wed Jan  9 13:53:11 2008
New Revision: 610590

URL: http://svn.apache.org/viewvc?rev=610590&view=rev
Log:
GERONIMO-3732 step 3 Move plugin and deployment pages into a console plugin

Added:
    geronimo/server/trunk/plugins/console/console-plugin/
      - copied from r609514, geronimo/server/trunk/plugins/console/console-base-portlets/
    geronimo/server/trunk/plugins/console/console-plugin-jetty/
      - copied from r610227, geronimo/server/trunk/plugins/console/console-jetty/
    geronimo/server/trunk/plugins/console/console-plugin-jetty/LICENSE.txt
      - copied unchanged from r610569, geronimo/server/trunk/plugins/console/console-jetty/LICENSE.txt
    geronimo/server/trunk/plugins/console/console-plugin-jetty/NOTICE.txt
      - copied unchanged from r610569, geronimo/server/trunk/plugins/console/console-jetty/NOTICE.txt
    geronimo/server/trunk/plugins/console/console-plugin-jetty/pom.xml
      - copied, changed from r610569, geronimo/server/trunk/plugins/console/console-jetty/pom.xml
    geronimo/server/trunk/plugins/console/console-plugin-jetty/src/
      - copied from r610569, geronimo/server/trunk/plugins/console/console-jetty/src/
    geronimo/server/trunk/plugins/console/console-plugin-tomcat/
      - copied from r610227, geronimo/server/trunk/plugins/console/console-tomcat/
    geronimo/server/trunk/plugins/console/console-plugin-tomcat/LICENSE.txt
      - copied unchanged from r610569, geronimo/server/trunk/plugins/console/console-tomcat/LICENSE.txt
    geronimo/server/trunk/plugins/console/console-plugin-tomcat/NOTICE.txt
      - copied unchanged from r610569, geronimo/server/trunk/plugins/console/console-tomcat/NOTICE.txt
    geronimo/server/trunk/plugins/console/console-plugin-tomcat/pom.xml
      - copied, changed from r610569, geronimo/server/trunk/plugins/console/console-tomcat/pom.xml
    geronimo/server/trunk/plugins/console/console-plugin-tomcat/src/
      - copied from r610569, geronimo/server/trunk/plugins/console/console-tomcat/src/
    geronimo/server/trunk/plugins/console/console-plugin/LICENSE.txt
      - copied unchanged from r610569, geronimo/server/trunk/plugins/console/console-base-portlets/LICENSE.txt
    geronimo/server/trunk/plugins/console/console-plugin/NOTICE.txt
      - copied unchanged from r610569, geronimo/server/trunk/plugins/console/console-base-portlets/NOTICE.txt
    geronimo/server/trunk/plugins/console/console-plugin/pom.xml
      - copied, changed from r610569, geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml
    geronimo/server/trunk/plugins/console/console-plugin/src/
      - copied from r610569, geronimo/server/trunk/plugins/console/console-base-portlets/src/
Removed:
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/ajax/
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/car/
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/configmanager/DeploymentPortlet.java
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/configmanager/PlanExportServlet.java
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/ajax/
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/car/
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/deployHelp.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/maximized.jsp
    geronimo/server/trunk/plugins/console/console-plugin/src/main/java/org/apache/geronimo/console/apache/
    geronimo/server/trunk/plugins/console/console-plugin/src/main/java/org/apache/geronimo/console/ca/
    geronimo/server/trunk/plugins/console/console-plugin/src/main/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java
    geronimo/server/trunk/plugins/console/console-plugin/src/main/java/org/apache/geronimo/console/infomanager/
    geronimo/server/trunk/plugins/console/console-plugin/src/main/java/org/apache/geronimo/console/jsr77/
    geronimo/server/trunk/plugins/console/console-plugin/src/main/java/org/apache/geronimo/console/keystores/
    geronimo/server/trunk/plugins/console/console-plugin/src/main/java/org/apache/geronimo/console/logmanager/
    geronimo/server/trunk/plugins/console/console-plugin/src/main/java/org/apache/geronimo/console/repository/
    geronimo/server/trunk/plugins/console/console-plugin/src/main/java/org/apache/geronimo/console/securitymanager/
    geronimo/server/trunk/plugins/console/console-plugin/src/main/java/org/apache/geronimo/console/servermanager/
    geronimo/server/trunk/plugins/console/console-plugin/src/main/java/org/apache/geronimo/console/threads/
    geronimo/server/trunk/plugins/console/console-plugin/src/main/java/org/apache/geronimo/console/util/
    geronimo/server/trunk/plugins/console/console-plugin/src/main/java/org/apache/geronimo/console/webmanager/
    geronimo/server/trunk/plugins/console/console-plugin/src/main/java/org/apache/geronimo/console/welcome/
    geronimo/server/trunk/plugins/console/console-plugin/src/main/resources/jms-resource-providers.properties
    geronimo/server/trunk/plugins/console/console-plugin/src/main/webapp/WEB-INF/classes/login-modules.properties
    geronimo/server/trunk/plugins/console/console-plugin/src/main/webapp/WEB-INF/view/apache/
    geronimo/server/trunk/plugins/console/console-plugin/src/main/webapp/WEB-INF/view/ca/
    geronimo/server/trunk/plugins/console/console-plugin/src/main/webapp/WEB-INF/view/dependencyview/
    geronimo/server/trunk/plugins/console/console-plugin/src/main/webapp/WEB-INF/view/infomanager/
    geronimo/server/trunk/plugins/console/console-plugin/src/main/webapp/WEB-INF/view/jndiview/
    geronimo/server/trunk/plugins/console/console-plugin/src/main/webapp/WEB-INF/view/keystore/
    geronimo/server/trunk/plugins/console/console-plugin/src/main/webapp/WEB-INF/view/logmanager/
    geronimo/server/trunk/plugins/console/console-plugin/src/main/webapp/WEB-INF/view/realmwizard/
    geronimo/server/trunk/plugins/console/console-plugin/src/main/webapp/WEB-INF/view/repository/
    geronimo/server/trunk/plugins/console/console-plugin/src/main/webapp/WEB-INF/view/securityrealmmanager/
    geronimo/server/trunk/plugins/console/console-plugin/src/main/webapp/WEB-INF/view/servermanager/
    geronimo/server/trunk/plugins/console/console-plugin/src/main/webapp/WEB-INF/view/threads/
    geronimo/server/trunk/plugins/console/console-plugin/src/main/webapp/WEB-INF/view/webaccesslogmanager/
    geronimo/server/trunk/plugins/console/console-plugin/src/main/webapp/WEB-INF/view/webmanager/
    geronimo/server/trunk/plugins/console/console-plugin/src/main/webapp/WEB-INF/view/welcome/
    geronimo/server/trunk/plugins/console/console-plugin/src/main/webapp/graphs/memoryGraphJS.jsp
    geronimo/server/trunk/plugins/console/console-plugin/src/main/webapp/graphs/memoryGraphSVG.jsp
    geronimo/server/trunk/plugins/console/console-plugin/src/main/webapp/graphs/updatingGraphJS.jsp
Modified:
    geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/web.xml
    geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/servlet/ForwardDispatchFilter.java
    geronimo/server/trunk/plugins/console/console-ear/pom.xml
    geronimo/server/trunk/plugins/console/console-jetty/pom.xml
    geronimo/server/trunk/plugins/console/console-jetty/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/console/console-plugin-jetty/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/console/console-plugin-tomcat/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/console/console-plugin/src/main/java/org/apache/geronimo/console/car/ManagementHelper.java
    geronimo/server/trunk/plugins/console/console-plugin/src/main/webapp/WEB-INF/portlet.xml
    geronimo/server/trunk/plugins/console/console-plugin/src/main/webapp/WEB-INF/view/ajax/progressbar.jsp
    geronimo/server/trunk/plugins/console/console-plugin/src/main/webapp/WEB-INF/web.xml
    geronimo/server/trunk/plugins/console/console-portal-driver/src/main/resources/pluto-portal-driver-config.xml
    geronimo/server/trunk/plugins/console/console-tomcat/pom.xml
    geronimo/server/trunk/plugins/console/console-tomcat/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/console/pom.xml

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml?rev=610590&r1=610589&r2=610590&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml Wed Jan  9 13:53:11 2008
@@ -378,6 +378,13 @@
 
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>console-plugin-jetty</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>debugviews-jetty</artifactId>
             <version>${version}</version>
             <type>car</type>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml?rev=610590&r1=610589&r2=610590&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml Wed Jan  9 13:53:11 2008
@@ -378,6 +378,13 @@
 
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>console-plugin-tomcat</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>debugviews-tomcat</artifactId>
             <version>${version}</version>
             <type>car</type>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml?rev=610590&r1=610589&r2=610590&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/portlet.xml Wed Jan  9 13:53:11 2008
@@ -323,25 +323,6 @@
     </portlet>
 
     <portlet>
-        <description>Portlet for deploying applications</description>
-        <portlet-name>Deployment</portlet-name>
-        <display-name>Application Deployment Portlet</display-name>
-        <portlet-class>org.apache.geronimo.console.configmanager.DeploymentPortlet</portlet-class>
-        <expiration-cache>-1</expiration-cache>
-        <supports>
-            <mime-type>text/html</mime-type>
-            <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>
-            <keywords>Deployment</keywords>
-        </portlet-info>
-    </portlet>
-
-    <portlet>
         <description>Portlet for displaying WAR modules</description>
         <portlet-name>WARModules</portlet-name>
         <display-name>WAR Modules Portlet</display-name>
@@ -444,23 +425,6 @@
         </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>
-            <keywords>Import Export Create Install Plugins Modules</keywords>
-        </portlet-info>
-    </portlet>
 
      <portlet>
         <description>Portlet for Managing EARs</description>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/web.xml?rev=610590&r1=610589&r2=610590&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/web.xml Wed Jan  9 13:53:11 2008
@@ -27,9 +27,7 @@
         <param-name>classes</param-name>
         <param-value>
             org.apache.geronimo.console.jsr77.Jsr77Lookup,
-            org.apache.geronimo.console.jsr77.DynamicServerInfo,
-            org.apache.geronimo.console.ajax.ProgressMonitor,
-            org.apache.geronimo.console.ajax.ProgressInfo
+            org.apache.geronimo.console.jsr77.DynamicServerInfo
         </param-value>
       </init-param>
       <init-param>
@@ -39,18 +37,6 @@
     </servlet>
 
     <servlet>
-        <servlet-name>car-export</servlet-name>
-        <servlet-class>org.apache.geronimo.console.car.CARExportServlet</servlet-class>
-    </servlet>
-    <servlet>
-        <servlet-name>maven-repo</servlet-name>
-        <servlet-class>org.apache.geronimo.console.car.GeronimoAsMavenServlet</servlet-class>
-    </servlet>
-    <servlet>
-        <servlet-name>plan-export</servlet-name>
-        <servlet-class>org.apache.geronimo.console.configmanager.PlanExportServlet</servlet-class>
-    </servlet>
-    <servlet>
         <servlet-name>Welcome</servlet-name>
         <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
         <init-param>
@@ -195,15 +181,6 @@
         <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet>
-        <servlet-name>Deployment</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
-        <init-param>
-            <param-name>portlet-name</param-name>
-            <param-value>Deployment</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>
@@ -249,15 +226,6 @@
         <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>
-            <param-name>portlet-name</param-name>
-            <param-value>ImportExport</param-value>
-        </init-param>
-        <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>
@@ -299,18 +267,6 @@
         <url-pattern>/dwr/*</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>car-export</servlet-name>
-        <url-pattern>/car-export</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>maven-repo</servlet-name>
-        <url-pattern>/maven-repo/*</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>plan-export</servlet-name>
-        <url-pattern>/plan-export</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
         <servlet-name>Welcome</servlet-name>
         <url-pattern>/PlutoInvoker/Welcome</url-pattern>
     </servlet-mapping>
@@ -375,10 +331,6 @@
         <url-pattern>/PlutoInvoker/Applications</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-        <servlet-name>Deployment</servlet-name>
-        <url-pattern>/PlutoInvoker/Deployment</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
         <servlet-name>WARModules</servlet-name>
         <url-pattern>/PlutoInvoker/WARModules</url-pattern>
     </servlet-mapping>
@@ -397,10 +349,6 @@
     <servlet-mapping>
         <servlet-name>SecurityRealms</servlet-name>
         <url-pattern>/PlutoInvoker/SecurityRealms</url-pattern>
-    </servlet-mapping>
-    <servlet-mapping>
-        <servlet-name>ImportExport</servlet-name>
-        <url-pattern>/PlutoInvoker/ImportExport</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
         <servlet-name>EARModules</servlet-name>

Modified: geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/servlet/ForwardDispatchFilter.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/servlet/ForwardDispatchFilter.java?rev=610590&r1=610589&r2=610590&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/servlet/ForwardDispatchFilter.java (original)
+++ geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/servlet/ForwardDispatchFilter.java Wed Jan  9 13:53:11 2008
@@ -73,8 +73,8 @@
      * # javax.servlet.forward.path_info
      * # javax.servlet.forward.query_string
      */
-    protected class ForwardRequest extends HttpServletRequestWrapper {
-        HttpServletRequest request;
+    protected static class ForwardRequest extends HttpServletRequestWrapper {
+        private final HttpServletRequest request;
         public ForwardRequest(HttpServletRequest req) {
             super(req);
             request = req;

Modified: geronimo/server/trunk/plugins/console/console-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-ear/pom.xml?rev=610590&r1=610589&r2=610590&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-ear/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-ear/pom.xml Wed Jan  9 13:53:11 2008
@@ -37,14 +37,14 @@
         
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>console-base-portlets</artifactId>
+            <artifactId>console-portal-driver</artifactId>
             <version>${version}</version>
             <type>war</type>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>console-portal-driver</artifactId>
+            <artifactId>console-base-portlets</artifactId>
             <version>${version}</version>
             <type>war</type>
         </dependency>
@@ -63,15 +63,15 @@
                     <modules>
                         <webModule>
                             <groupId>org.apache.geronimo.plugins</groupId>
-                            <artifactId>console-base-portlets</artifactId>
-                            <contextRoot>/console</contextRoot>
-                            <bundleFileName>base-portlets.war</bundleFileName>
-                        </webModule>
-                        <webModule>
-                            <groupId>org.apache.geronimo.plugins</groupId>
                             <artifactId>console-portal-driver</artifactId>
                             <contextRoot>/pluto</contextRoot>
                             <bundleFileName>portal-driver.war</bundleFileName>
+                        </webModule>
+                        <webModule>
+                            <groupId>org.apache.geronimo.plugins</groupId>
+                            <artifactId>console-base-portlets</artifactId>
+                            <contextRoot>/console</contextRoot>
+                            <bundleFileName>base-portlets.war</bundleFileName>
                         </webModule>
                     </modules>
                 </configuration>

Modified: geronimo/server/trunk/plugins/console/console-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-jetty/pom.xml?rev=610590&r1=610589&r2=610590&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-jetty/pom.xml Wed Jan  9 13:53:11 2008
@@ -44,22 +44,22 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>pluto-support</artifactId>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-security</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-deployer</artifactId>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>pluto-support</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        <!-- TODO temporary? -->
+        <!-- TODO temporary? for realm wizard-->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>plugin</artifactId>
+            <artifactId>geronimo-gbean-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
@@ -86,6 +86,13 @@
         </dependency>
 
         <!-- to force build order -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>j2ee-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jetty6-deployer</artifactId>

Modified: geronimo/server/trunk/plugins/console/console-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-jetty/src/main/plan/plan.xml?rev=610590&r1=610589&r2=610590&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/console/console-jetty/src/main/plan/plan.xml Wed Jan  9 13:53:11 2008
@@ -190,7 +190,5 @@
         </role-mappings>
     </security>
 
-    <!-- TODO: what is this? -->
-    <gbean name="DeploymentFactory" class="org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryWithKernel" />
 
 </application>

Copied: geronimo/server/trunk/plugins/console/console-plugin-jetty/pom.xml (from r610569, geronimo/server/trunk/plugins/console/console-jetty/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-plugin-jetty/pom.xml?p2=geronimo/server/trunk/plugins/console/console-plugin-jetty/pom.xml&p1=geronimo/server/trunk/plugins/console/console-jetty/pom.xml&r1=610569&r2=610590&rev=610590&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-plugin-jetty/pom.xml Wed Jan  9 13:53:11 2008
@@ -29,23 +29,23 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>console-jetty</artifactId>
-    <name>Geronimo Plugins :: Administration Console - Jetty</name>
+    <artifactId>console-plugin-jetty</artifactId>
+    <name>Geronimo Plugins :: Administration Console Plugin and Deployment Portlets - Jetty</name>
     <packaging>car</packaging>
 
     <dependencies>
         
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>console-ear</artifactId>
+            <artifactId>console-plugin</artifactId>
             <version>${version}</version>
-            <type>ear</type>
+            <type>war</type>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>pluto-support</artifactId>
+            <artifactId>console-jetty</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
@@ -56,7 +56,7 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        <!-- TODO temporary? -->
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>plugin</artifactId>
@@ -74,17 +74,6 @@
             <artifactId>commons-io</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>console-core</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.directwebremoting</groupId>
-            <artifactId>dwr</artifactId>
-        </dependency>
-
         <!-- to force build order -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -101,20 +90,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- make sure these get into the plugin dependencies -->
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jasper</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jetty6</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
     </dependencies>
 
     <build>
@@ -138,9 +113,9 @@
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.plugins</groupId>
-                        <artifactId>console-ear</artifactId>
+                        <artifactId>console-plugin</artifactId>
                         <version>${version}</version>
-                        <type>ear</type>
+                        <type>war</type>
                     </module>
                     <category>Administration</category>
                     <osiApproved>true</osiApproved>
@@ -148,22 +123,6 @@
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-<!--
-                    <instance>
-                        <plugin-artifact>
-                            <prerequisite>
-                                <id>
-                                    <groupId>org.apache.geronimo.configs</groupId>
-                                    <artifactId>jetty6</artifactId>
-                                </id>
-                                <resource-type>Web Container</resource-type>
-                                <description>
-                                    This version of the plugin works with the Geronimo/Jetty distribution.
-                                </description>
-                            </prerequisite>
-                        </plugin-artifact>
-                    </instance>
--->
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugins/console/console-plugin-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-plugin-jetty/src/main/plan/plan.xml?rev=610590&r1=610569&r2=610590&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-plugin-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/console/console-plugin-jetty/src/main/plan/plan.xml Wed Jan  9 13:53:11 2008
@@ -18,170 +18,12 @@
 
 <!-- $Rev$ $Date$ -->
 
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2">
 
-    <module>
-        <web>portal-driver.war</web>
-        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
-            <dep:environment>
-                <dep:moduleId>
-                    <dep:groupId>org.apache.geronimo.plugins</dep:groupId>
-                    <dep:artifactId>console-portal-driver</dep:artifactId>
-                    <dep:version>1.0-SNAPSHOT</dep:version>
-                    <dep:type>war</dep:type>
-                </dep:moduleId>
-                <dep:dependencies/> <!-- deps are declared in pom.xml -->
-                <dep:hidden-classes />
-                <dep:non-overridable-classes />
-            </dep:environment>
-            <context-root>/console</context-root>
-            <security-realm-name>geronimo-admin</security-realm-name>
-            <gbean name="CARExportForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="portalPathPrefix">/car-export</attribute>
-                <attribute name="portletContextPath">/console-base</attribute>
-                <attribute name="portletServletPath">/car-export</attribute>
-            </gbean>
-            <gbean name="SVGForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="portalPathPrefix">/graphs</attribute>
-                <attribute name="portletContextPath">/console-base</attribute>
-                <attribute name="portletServletPath">/graphs</attribute>
-            </gbean>
-            <gbean name="PlanExportForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="portalPathPrefix">/plan-export</attribute>
-                <attribute name="portletContextPath">/console-base</attribute>
-                <attribute name="portletServletPath">/plan-export</attribute>
-            </gbean>
-        </web-app>
-    </module>
-
-    <module>
-        <web>base-portlets.war</web>
-        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
-            <dep:environment>
-                <dep:moduleId>
-                    <dep:groupId>org.apache.geronimo.plugins</dep:groupId>
-                    <dep:artifactId>console-base-portlets</dep:artifactId>
-                    <dep:version>1.0-SNAPSHOT</dep:version>
-                    <dep:type>war</dep:type>
-                </dep:moduleId>
-                <dep:dependencies/> <!-- deps are declared in pom.xml -->
-                <dep:hidden-classes>
-                    <filter>org.apache.commons.digester</filter>
-                </dep:hidden-classes>
-                <dep:non-overridable-classes />
-            </dep:environment>
-
-            <context-root>/console-base</context-root>
-            <security-realm-name>geronimo-admin</security-realm-name>
-
-            <gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">
-                <reference name="ServerInfo">
-                    <name>ServerInfo</name>
-                </reference>
-                <reference name="LoginModule">
-                    <name>properties-login</name>
-                </reference>
-            </gbean>
-
-<!-- TODO: can't start these gbeans here because the ContainerServicesGBean hasn't been
-           initialized by spring yet.  since they can't be defined here they are instead
-           defined in the renderConfig section of pluto's pluto-portal-driver-config.xml,
-           which is not ideal.  maybe the deps can be moved around so that this section
-           can be reenabled and the pages removed from the driver config xml.
-           <gbean name="Welcome" class="org.apache.geronimo.pluto.ACEGBean">
-               <attribute name="pageTitle">Welcome</attribute>
-               <attribute name="portletContext">/console-base</attribute>
-               <attribute name="portletList">[Welcome]</attribute>
-           </gbean>
-
-           <gbean name="ServerInfo" class="org.apache.geronimo.pluto.ACEGBean">
-               <attribute name="pageTitle">Server/Information</attribute>
-               <attribute name="portletContext">/console-base</attribute>
-               <attribute name="portletList">[ServerInfo]</attribute>
-           </gbean>
-           <gbean name="JavaSysInfo" class="org.apache.geronimo.pluto.ACEGBean">
-               <attribute name="pageTitle">Server/Java System Info</attribute>
-               <attribute name="portletContext">/console-base</attribute>
-               <attribute name="portletList">[JavaSysInfo]</attribute>
-           </gbean>
-           <gbean name="Logs" class="org.apache.geronimo.pluto.ACEGBean">
-               <attribute name="pageTitle">Server/Server Logs</attribute>
-               <attribute name="portletContext">/console-base</attribute>
-               <attribute name="portletList">[LogManager, LogViewer, WebAccessLogViewer]</attribute>
-           </gbean>
-           <gbean name="Shutdown" class="org.apache.geronimo.pluto.ACEGBean">
-               <attribute name="pageTitle">Server/Shutdown</attribute>
-               <attribute name="portletContext">/console-base</attribute>
-               <attribute name="portletList">[ServerManager]</attribute>
-           </gbean>
-           <gbean name="WebServer" class="org.apache.geronimo.pluto.ACEGBean">
-               <attribute name="pageTitle">Server/Web Server</attribute>
-               <attribute name="portletContext">/console-base</attribute>
-               <attribute name="portletList">[WebServerManager, ConnectorManager]</attribute>
-           </gbean>
-           <gbean name="ThreadPool" class="org.apache.geronimo.pluto.ACEGBean">
-               <attribute name="pageTitle">Server/Thread Pools</attribute>
-               <attribute name="portletContext">/console-base</attribute>
-               <attribute name="portletList">[ThreadPool]</attribute>
-           </gbean>
-           <gbean name="ApacheJK" class="org.apache.geronimo.pluto.ACEGBean">
-               <attribute name="pageTitle">Server/Apache HTTP</attribute>
-               <attribute name="portletContext">/console-base</attribute>
-               <attribute name="portletList">[ApacheJK]</attribute>
-           </gbean>
-
-           <gbean name="RepositoryViewer" class="org.apache.geronimo.pluto.ACEGBean">
-               <attribute name="pageTitle">Services/Repository</attribute>
-               <attribute name="portletContext">/console-base</attribute>
-               <attribute name="portletList">[RepositoryViewer]</attribute>
-           </gbean>
-
-           <gbean name="Deployment" class="org.apache.geronimo.pluto.ACEGBean">
-               <attribute name="pageTitle">Applications/Deploy New</attribute>
-               <attribute name="portletContext">/console-base</attribute>
-               <attribute name="portletList">[Deployment]</attribute>
-           </gbean>
-           <gbean name="WARModules" class="org.apache.geronimo.pluto.ACEGBean">
-               <attribute name="pageTitle">Applications/Web Apps</attribute>
-               <attribute name="portletContext">/console-base</attribute>
-               <attribute name="portletList">[WARModules]</attribute>
-           </gbean>
-           <gbean name="SystemModules" class="org.apache.geronimo.pluto.ACEGBean">
-               <attribute name="pageTitle">Applications/System Modules</attribute>
-               <attribute name="portletContext">/console-base</attribute>
-               <attribute name="portletList">[SystemModules]</attribute>
-           </gbean>
-           <gbean name="ImportExport" class="org.apache.geronimo.pluto.ACEGBean">
-               <attribute name="pageTitle">Applications/Plugins</attribute>
-               <attribute name="portletContext">/console-base</attribute>
-               <attribute name="portletList">[ImportExport]</attribute>
-           </gbean>
-
-           <gbean name="UsersGroups" class="org.apache.geronimo.pluto.ACEGBean">
-               <attribute name="pageTitle">Security/Users and Groups</attribute>
-               <attribute name="portletContext">/console-base</attribute>
-               <attribute name="portletList">[SEUsers, SEGroups]</attribute>
-           </gbean>
-           <gbean name="RealmWizard" class="org.apache.geronimo.pluto.ACEGBean">
-               <attribute name="pageTitle">Security/Security Realms</attribute>
-               <attribute name="portletContext">/console-base</attribute>
-               <attribute name="portletList">[RealmWizard]</attribute>
-           </gbean>
-           <gbean name="Keystores" class="org.apache.geronimo.pluto.ACEGBean">
-               <attribute name="pageTitle">Security/Keystores</attribute>
-               <attribute name="portletContext">/console-base</attribute>
-               <attribute name="portletList">[Keystores]</attribute>
-           </gbean>
-           <gbean name="CertificationAuthority" class="org.apache.geronimo.pluto.ACEGBean">
-               <attribute name="pageTitle">Security/Certificate Authority</attribute>
-               <attribute name="portletContext">/console-base</attribute>
-               <attribute name="portletList">[CertificationAuthority]</attribute>
-           </gbean>
--->
-
-        </web-app>
-    </module>
+    <!-- This is where the files are accessed from. (aka - portletContext) -->
+    <context-root>/plugin</context-root>
 
+    <security-realm-name>geronimo-admin</security-realm-name>
     <security xmlns="http://geronimo.apache.org/xml/ns/security-1.2">
         <role-mappings>
             <role role-name="admin">
@@ -190,7 +32,18 @@
         </role-mappings>
     </security>
 
-    <!-- TODO: what is this? -->
+    <!-- Start off a ACEGBean, this is the lifecycle for the portlet -->
+    <gbean name="Deployment" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+        <attribute name="pageTitle">Applications/Deploy New</attribute>
+        <attribute name="portletContext">/plugin</attribute>
+        <attribute name="portletList">[Deployment]</attribute>
+    </gbean>
+    <gbean name="PluginManagement" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+        <attribute name="pageTitle">Applications/Plugins</attribute>
+        <attribute name="portletContext">/plugin</attribute>
+        <attribute name="portletList">[ImportExport]</attribute>
+    </gbean>
+    
+    <!-- Deployment factory for use inside server -->
     <gbean name="DeploymentFactory" class="org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryWithKernel" />
-
-</application>
+</web-app>

Copied: geronimo/server/trunk/plugins/console/console-plugin-tomcat/pom.xml (from r610569, geronimo/server/trunk/plugins/console/console-tomcat/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-plugin-tomcat/pom.xml?p2=geronimo/server/trunk/plugins/console/console-plugin-tomcat/pom.xml&p1=geronimo/server/trunk/plugins/console/console-tomcat/pom.xml&r1=610569&r2=610590&rev=610590&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-plugin-tomcat/pom.xml Wed Jan  9 13:53:11 2008
@@ -29,23 +29,23 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>console-tomcat</artifactId>
-    <name>Geronimo Plugins :: Administration Console - Tomcat</name>
+    <artifactId>console-plugin-tomcat</artifactId>
+    <name>Geronimo Plugins :: Administration Console Plugin and Deployment Portlets - Tomcat</name>
     <packaging>car</packaging>
 
     <dependencies>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>console-ear</artifactId>
+            <artifactId>console-plugin</artifactId>
             <version>${version}</version>
-            <type>ear</type>
+            <type>war</type>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>pluto-support</artifactId>
+            <artifactId>console-tomcat</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
@@ -56,14 +56,14 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        <!-- TODO temporary? -->
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>plugin</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
- 
+
         <dependency>
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
@@ -74,18 +74,7 @@
             <artifactId>commons-io</artifactId>
         </dependency>
 
-	<dependency>
-            <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>console-core</artifactId>
-            <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.directwebremoting</groupId>
-            <artifactId>dwr</artifactId>
-        </dependency>
-
-         <!-- to force build order -->
+        <!-- to force build order -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat6-deployer</artifactId>
@@ -101,29 +90,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jasper-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-       </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>activemq-ra</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-            <scope>provided</scope>
-       </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-jaxws</artifactId>
-            <version>${version}</version>
-            <scope>provided</scope>
-       </dependency>
-
     </dependencies>
 
     <build>
@@ -147,9 +113,9 @@
                     </deploymentConfigs>
                     <module>
                         <groupId>org.apache.geronimo.plugins</groupId>
-                        <artifactId>console-ear</artifactId>
+                        <artifactId>console-plugin</artifactId>
                         <version>${version}</version>
-                        <type>ear</type>
+                        <type>war</type>
                     </module>
                     <category>Administration</category>
                     <osiApproved>true</osiApproved>
@@ -157,20 +123,6 @@
                         <value>true</value>
                         <includeVersion>true</includeVersion>
                     </useMavenDependencies>
-                    <instance>
-                        <plugin-artifact>
-                            <prerequisite>
-                                <id>
-                                    <groupId>org.apache.geronimo.configs</groupId>
-                                    <artifactId>tomcat6</artifactId>
-                                </id>
-                                <resource-type>Web Container</resource-type>
-                                <description>
-                                    This version of the plugin works with the Geronimo/Tomcat distribution.
-                                </description>
-                            </prerequisite>
-                        </plugin-artifact>
-                    </instance>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugins/console/console-plugin-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-plugin-tomcat/src/main/plan/plan.xml?rev=610590&r1=610569&r2=610590&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-plugin-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/console/console-plugin-tomcat/src/main/plan/plan.xml Wed Jan  9 13:53:11 2008
@@ -18,172 +18,12 @@
 
 <!-- $Rev$ $Date$ -->
 
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2">
 
-    <module>
-        <web>portal-driver.war</web>
-        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
-            <dep:environment>
-                <dep:moduleId>
-                    <dep:groupId>org.apache.geronimo.plugins</dep:groupId>
-                    <dep:artifactId>console-portal-driver</dep:artifactId>
-                    <dep:version>1.0-SNAPSHOT</dep:version>
-                    <dep:type>war</dep:type>
-                </dep:moduleId>
-                <dep:dependencies/> <!-- deps are declared in pom.xml -->
-                <dep:hidden-classes />
-                <dep:non-overridable-classes />
-            </dep:environment>
-            <context-root>/console</context-root>
-            <cross-context />
-            <security-realm-name>geronimo-admin</security-realm-name>
-            <gbean name="CARExportForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="portalPathPrefix">/car-export</attribute>
-                <attribute name="portletContextPath">/console-base</attribute>
-                <attribute name="portletServletPath">/car-export</attribute>
-            </gbean>
-            <gbean name="SVGForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="portalPathPrefix">/graphs</attribute>
-                <attribute name="portletContextPath">/console-base</attribute>
-                <attribute name="portletServletPath">/graphs</attribute>
-            </gbean>
-            <gbean name="PlanExportForward" class="org.apache.geronimo.console.gbean.ContextForwardGBean" xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <attribute name="portalPathPrefix">/plan-export</attribute>
-                <attribute name="portletContextPath">/console-base</attribute>
-                <attribute name="portletServletPath">/plan-export</attribute>
-            </gbean>
-        </web-app>
-    </module>
-
-    <module>
-        <web>base-portlets.war</web>
-        <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web/tomcat-1.2" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
-            <dep:environment>
-                <dep:moduleId>
-                    <dep:groupId>org.apache.geronimo.plugins</dep:groupId>
-                    <dep:artifactId>console-base-portlets</dep:artifactId>
-                    <dep:version>1.0-SNAPSHOT</dep:version>
-                    <dep:type>war</dep:type>
-                </dep:moduleId>
-                <dep:dependencies/> <!-- deps are declared in pom.xml -->
-                <dep:hidden-classes>
-                    <filter>org.apache.commons.digester</filter>
-                </dep:hidden-classes>
-                <dep:non-overridable-classes />
-            </dep:environment>
-
-            <context-root>/console-base</context-root>
-            <cross-context />
-            <security-realm-name>geronimo-admin</security-realm-name>
-
-            <gbean name="PropertiesLoginManager" class="org.apache.geronimo.console.core.security.PropertiesLoginModuleManager">
-                <reference name="ServerInfo">
-                    <name>ServerInfo</name>
-                </reference>
-                <reference name="LoginModule">
-                    <name>properties-login</name>
-                </reference>
-            </gbean>
-
-<!-- TODO: can't start these gbeans here because the ContainerServicesGBean hasn't been
-           initialized by spring yet.  since they can't be defined here they are instead
-           defined in the renderConfig section of pluto's pluto-portal-driver-config.xml,
-           which is not ideal.  maybe the deps can be moved around so that this section
-           can be reenabled and the pages removed from the driver config xml.
-           <gbean name="Welcome" class="org.apache.geronimo.pluto.ACEGBean">
-               <attribute name="pageTitle">Welcome</attribute>
-               <attribute name="portletContext">/console-base</attribute>
-               <attribute name="portletList">[Welcome]</attribute>
-           </gbean>
-
-           <gbean name="ServerInfo" class="org.apache.geronimo.pluto.ACEGBean">
-               <attribute name="pageTitle">Server/Information</attribute>
-               <attribute name="portletContext">/console-base</attribute>
-               <attribute name="portletList">[ServerInfo]</attribute>
-           </gbean>
-           <gbean name="JavaSysInfo" class="org.apache.geronimo.pluto.ACEGBean">
-               <attribute name="pageTitle">Server/Java System Info</attribute>
-               <attribute name="portletContext">/console-base</attribute>
-               <attribute name="portletList">[JavaSysInfo]</attribute>
-           </gbean>
-           <gbean name="Logs" class="org.apache.geronimo.pluto.ACEGBean">
-               <attribute name="pageTitle">Server/Server Logs</attribute>
-               <attribute name="portletContext">/console-base</attribute>
-               <attribute name="portletList">[LogManager, LogViewer, WebAccessLogViewer]</attribute>
-           </gbean>
-           <gbean name="Shutdown" class="org.apache.geronimo.pluto.ACEGBean">
-               <attribute name="pageTitle">Server/Shutdown</attribute>
-               <attribute name="portletContext">/console-base</attribute>
-               <attribute name="portletList">[ServerManager]</attribute>
-           </gbean>
-           <gbean name="WebServer" class="org.apache.geronimo.pluto.ACEGBean">
-               <attribute name="pageTitle">Server/Web Server</attribute>
-               <attribute name="portletContext">/console-base</attribute>
-               <attribute name="portletList">[WebServerManager, ConnectorManager]</attribute>
-           </gbean>
-           <gbean name="ThreadPool" class="org.apache.geronimo.pluto.ACEGBean">
-               <attribute name="pageTitle">Server/Thread Pools</attribute>
-               <attribute name="portletContext">/console-base</attribute>
-               <attribute name="portletList">[ThreadPool]</attribute>
-           </gbean>
-           <gbean name="ApacheJK" class="org.apache.geronimo.pluto.ACEGBean">
-               <attribute name="pageTitle">Server/Apache HTTP</attribute>
-               <attribute name="portletContext">/console-base</attribute>
-               <attribute name="portletList">[ApacheJK]</attribute>
-           </gbean>
-
-           <gbean name="RepositoryViewer" class="org.apache.geronimo.pluto.ACEGBean">
-               <attribute name="pageTitle">Services/Repository</attribute>
-               <attribute name="portletContext">/console-base</attribute>
-               <attribute name="portletList">[RepositoryViewer]</attribute>
-           </gbean>
-
-           <gbean name="Deployment" class="org.apache.geronimo.pluto.ACEGBean">
-               <attribute name="pageTitle">Applications/Deploy New</attribute>
-               <attribute name="portletContext">/console-base</attribute>
-               <attribute name="portletList">[Deployment]</attribute>
-           </gbean>
-           <gbean name="WARModules" class="org.apache.geronimo.pluto.ACEGBean">
-               <attribute name="pageTitle">Applications/Web Apps</attribute>
-               <attribute name="portletContext">/console-base</attribute>
-               <attribute name="portletList">[WARModules]</attribute>
-           </gbean>
-           <gbean name="SystemModules" class="org.apache.geronimo.pluto.ACEGBean">
-               <attribute name="pageTitle">Applications/System Modules</attribute>
-               <attribute name="portletContext">/console-base</attribute>
-               <attribute name="portletList">[SystemModules]</attribute>
-           </gbean>
-           <gbean name="ImportExport" class="org.apache.geronimo.pluto.ACEGBean">
-               <attribute name="pageTitle">Applications/Plugins</attribute>
-               <attribute name="portletContext">/console-base</attribute>
-               <attribute name="portletList">[ImportExport]</attribute>
-           </gbean>
-
-           <gbean name="UsersGroups" class="org.apache.geronimo.pluto.ACEGBean">
-               <attribute name="pageTitle">Security/Users and Groups</attribute>
-               <attribute name="portletContext">/console-base</attribute>
-               <attribute name="portletList">[SEUsers, SEGroups]</attribute>
-           </gbean>
-           <gbean name="RealmWizard" class="org.apache.geronimo.pluto.ACEGBean">
-               <attribute name="pageTitle">Security/Security Realms</attribute>
-               <attribute name="portletContext">/console-base</attribute>
-               <attribute name="portletList">[RealmWizard]</attribute>
-           </gbean>
-           <gbean name="Keystores" class="org.apache.geronimo.pluto.ACEGBean">
-               <attribute name="pageTitle">Security/Keystores</attribute>
-               <attribute name="portletContext">/console-base</attribute>
-               <attribute name="portletList">[Keystores]</attribute>
-           </gbean>
-           <gbean name="CertificationAuthority" class="org.apache.geronimo.pluto.ACEGBean">
-               <attribute name="pageTitle">Security/Certificate Authority</attribute>
-               <attribute name="portletContext">/console-base</attribute>
-               <attribute name="portletList">[CertificationAuthority]</attribute>
-           </gbean>
--->
-
-        </web-app>
-    </module>
+    <!-- This is where the files are accessed from. (aka - portletContext) -->
+    <context-root>/plugin</context-root>
 
+    <security-realm-name>geronimo-admin</security-realm-name>
     <security xmlns="http://geronimo.apache.org/xml/ns/security-1.2">
         <role-mappings>
             <role role-name="admin">
@@ -192,7 +32,18 @@
         </role-mappings>
     </security>
 
-    <!-- TODO: what is this? -->
-    <gbean name="DeploymentFactory" class="org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryWithKernel" />
+    <!-- Start off a ACEGBean, this is the lifecycle for the portlet -->
+    <gbean name="Deployment" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+        <attribute name="pageTitle">Applications/Deploy New</attribute>
+        <attribute name="portletContext">/plugin</attribute>
+        <attribute name="portletList">[Deployment]</attribute>
+    </gbean>
+    <gbean name="PluginManagement" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+        <attribute name="pageTitle">Applications/Plugins</attribute>
+        <attribute name="portletContext">/plugin</attribute>
+        <attribute name="portletList">[ImportExport]</attribute>
+    </gbean>
 
-</application>
+    <!-- Deployment factory for use inside server -->
+    <gbean name="DeploymentFactory" class="org.apache.geronimo.deployment.plugin.factories.DeploymentFactoryWithKernel" />
+</web-app>

Copied: geronimo/server/trunk/plugins/console/console-plugin/pom.xml (from r610569, geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-plugin/pom.xml?p2=geronimo/server/trunk/plugins/console/console-plugin/pom.xml&p1=geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml&r1=610569&r2=610590&rev=610590&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-plugin/pom.xml Wed Jan  9 13:53:11 2008
@@ -29,8 +29,8 @@
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>console-base-portlets</artifactId>
-    <name>Geronimo Plugins :: Administration Console Base Portlets</name>
+    <artifactId>console-plugin</artifactId>
+    <name>Geronimo Plugins :: Administration Console Plugin and Deployment Portlets</name>
     <packaging>war</packaging>
 
     <dependencies>
@@ -52,23 +52,16 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
+        <dependency> 
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-upgrade</artifactId>
-            <version>${version}</version>
-            <scope>provided</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-converter</artifactId>
+            <artifactId>geronimo-connector-builder</artifactId>
             <version>${version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-connector-builder</artifactId>
+            <artifactId>geronimo-upgrade</artifactId>
             <version>${version}</version>
             <scope>provided</scope>
         </dependency>

Modified: geronimo/server/trunk/plugins/console/console-plugin/src/main/java/org/apache/geronimo/console/car/ManagementHelper.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-plugin/src/main/java/org/apache/geronimo/console/car/ManagementHelper.java?rev=610590&r1=610569&r2=610590&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-plugin/src/main/java/org/apache/geronimo/console/car/ManagementHelper.java (original)
+++ geronimo/server/trunk/plugins/console/console-plugin/src/main/java/org/apache/geronimo/console/car/ManagementHelper.java Wed Jan  9 13:53:11 2008
@@ -36,7 +36,7 @@
 import org.apache.geronimo.console.util.PortletManager;
 
 /**
- * @version $Rev:$ $Date:$
+ * @version $Rev$ $Date$
  */
 public class ManagementHelper {
 

Modified: geronimo/server/trunk/plugins/console/console-plugin/src/main/webapp/WEB-INF/portlet.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-plugin/src/main/webapp/WEB-INF/portlet.xml?rev=610590&r1=610569&r2=610590&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-plugin/src/main/webapp/WEB-INF/portlet.xml (original)
+++ geronimo/server/trunk/plugins/console/console-plugin/src/main/webapp/WEB-INF/portlet.xml Wed Jan  9 13:53:11 2008
@@ -22,305 +22,6 @@
 
 <portlet-app version="1.0">
 
-     <portlet>
-        <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>
-            <keywords>Welcome</keywords>
-        </portlet-info>
-    </portlet>
-
-    <portlet>
-        <description>Portlet for displaying server info</description>
-        <portlet-name>ServerInfo</portlet-name>
-        <display-name>Server Info Portlet</display-name>
-        <portlet-class>org.apache.geronimo.console.infomanager.ServerInfoPortlet</portlet-class>
-        <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>
-            <keywords>ServerInfo</keywords>
-        </portlet-info>
-    </portlet>
-
-    <portlet>
-        <description>Portlet for displaying java system info</description>
-        <portlet-name>JavaSysInfo</portlet-name>
-        <display-name>Java System Info Portlet</display-name>
-        <portlet-class>org.apache.geronimo.console.infomanager.JavaSystemInfoPortlet</portlet-class>
-        <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>
-            <keywords>System Properties</keywords>
-        </portlet-info>
-    </portlet>
-
-    <portlet>
-        <description>Portlet for managing Logging.</description>
-        <portlet-name>LogManager</portlet-name>
-        <display-name>Log Manager Portlet</display-name>
-        <portlet-class>org.apache.geronimo.console.logmanager.LogManagerPortlet</portlet-class>
-        <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>
-            <keywords>Log, Manager</keywords>
-        </portlet-info>
-    </portlet>
-
-    <portlet>
-        <description>Portlet for viewing the server logs.</description>
-        <portlet-name>LogViewer</portlet-name>
-        <display-name>Server Log Viewer Portlet</display-name>
-        <portlet-class>org.apache.geronimo.console.logmanager.LogViewerPortlet</portlet-class>
-        <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>
-            <keywords>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>
-        <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>
-            <keywords>Web, Access, Log, Viewer</keywords>
-        </portlet-info>
-    </portlet>
-
-    <portlet>
-        <description>Portlet for Stopping or Rebooting the server</description>
-        <portlet-name>ServerManager</portlet-name>
-        <display-name>Server Management Portlet</display-name>
-        <portlet-class>org.apache.geronimo.console.servermanager.ServerManagerPortlet</portlet-class>
-        <expiration-cache>-1</expiration-cache>
-        <supports>
-            <mime-type>text/html</mime-type>
-            <portlet-mode>VIEW</portlet-mode>
-            <portlet-mode>HELP</portlet-mode>
-        </supports>
-        <supported-locale>en</supported-locale>
-        <portlet-info>
-            <title>Server Manager</title>
-            <short-title>Server Manager</short-title>
-            <keywords>Server</keywords>
-        </portlet-info>
-    </portlet>
-
-    <portlet>
-        <description>Portlet for managing the web server</description>
-        <portlet-name>WebServerManager</portlet-name>
-        <display-name>Web Server Mangement Portlet</display-name>
-        <portlet-class>org.apache.geronimo.console.webmanager.WebManagerPortlet</portlet-class>
-        <expiration-cache>-1</expiration-cache>
-        <supports>
-            <mime-type>text/html</mime-type>
-            <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 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>
-            <keywords>HTTP HTTPS AJP 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>
-        <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>
-            <keywords>Thread Pool</keywords>
-        </portlet-info>
-    </portlet>
-
-    <portlet>
-        <description>Portlet for viewing Repository</description>
-        <portlet-name>RepositoryViewer</portlet-name>
-        <display-name>Repository Viewer Portlet</display-name>
-        <portlet-class>org.apache.geronimo.console.repository.RepositoryViewPortlet</portlet-class>
-        <expiration-cache>-1</expiration-cache>
-        <supports>
-            <mime-type>text/html</mime-type>
-            <portlet-mode>VIEW</portlet-mode>
-            <portlet-mode>HELP</portlet-mode>
-        </supports>
-        <supported-locale>en</supported-locale>
-        <portlet-info>
-            <title>Repository Viewer</title>
-            <short-title>Repository Viewer</short-title>
-            <keywords>Repository</keywords>
-        </portlet-info>
-    </portlet>
-
-    <portlet>
-        <description>Portlet for managing 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>
-            <keywords>Security Realm Wizard</keywords>
-        </portlet-info>
-    </portlet>
-
-    <portlet>
-        <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>
-            <keywords>Apache http mod_jk jk ajp</keywords>
-        </portlet-info>
-    </portlet>
-
-    <portlet>
-        <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>
-            <keywords>Keystore Keytool SSL</keywords>
-        </portlet-info>
-    </portlet>
-
-    <portlet>
-        <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>
-            <keywords>Certification Certificate Authority</keywords>
-        </portlet-info>
-    </portlet>
-
-    <portlet>
-        <description>Portlet that lists and starts/stops/uninstalls applications</description>
-        <portlet-name>Applications</portlet-name>
-        <display-name>Applications Portlet</display-name>
-        <portlet-class>org.apache.geronimo.console.configmanager.ConfigManagerPortlet</portlet-class>
-        <expiration-cache>-1</expiration-cache>
-        <supports>
-            <mime-type>text/html</mime-type>
-            <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>
-            <keywords>Applications</keywords>
-        </portlet-info>
-    </portlet>
 
     <portlet>
         <description>Portlet for deploying applications</description>
@@ -341,108 +42,6 @@
         </portlet-info>
     </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>
-        </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>
-
-    <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>
-            <keywords>Console Realm Users</keywords>
-        </portlet-info>
-    </portlet>
-
-    <portlet>
-        <description>Portlet for managing groups from the Console realm.</description>
-        <portlet-name>SEGroups</portlet-name>
-        <display-name>Console Realm Portlet</display-name>
-        <portlet-class>org.apache.geronimo.console.securitymanager.SEGroupsPortlet</portlet-class>
-        <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>
-            <keywords>Console Realm Groups</keywords>
-        </portlet-info>
-    </portlet>
-
-    <portlet>
-        <description>Portlet for displaying security realms</description>
-        <portlet-name>SecurityRealms</portlet-name>
-        <display-name>Security Realms Portlet</display-name>
-        <portlet-class>org.apache.geronimo.console.EmptyPortlet</portlet-class>
-        <expiration-cache>-1</expiration-cache>
-        <supports>
-            <mime-type>text/html</mime-type>
-            <portlet-mode>VIEW</portlet-mode>
-<!--            <portlet-mode>HELP</portlet-mode>-->
-        </supports>
-        <supported-locale>en</supported-locale>
-        <portlet-info>
-            <title>Installed Security Realms</title>
-            <short-title>Security Realms</short-title>
-            <keywords>Security Realms</keywords>
-        </portlet-info>
-    </portlet>
 
     <portlet>
         <description>Portlet for CAR Import/Export</description>
@@ -460,94 +59,6 @@
             <short-title>Create/Install Plugins</short-title>
             <keywords>Import Export Create Install Plugins Modules</keywords>
         </portlet-info>
-    </portlet>
-
-     <portlet>
-        <description>Portlet for Managing EARs</description>
-        <portlet-name>EARModules</portlet-name>
-        <display-name>EARModules</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>
-        </supports>
-        <supported-locale>en</supported-locale>
-        <portlet-info>
-            <title>Installed Application EARs</title>
-            <short-title>EARModules</short-title>
-            <keywords></keywords>
-        </portlet-info>
-        <init-param>
-            <name>config-type</name>
-            <value>EAR</value>
-        </init-param>
-    </portlet>
-
-     <portlet>
-        <description>Portlet for Managing EJB Modules</description>
-        <portlet-name>EJBModules</portlet-name>
-        <display-name>EJBModules</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>
-        </supports>
-        <supported-locale>en</supported-locale>
-        <portlet-info>
-            <title>Installed EJB JARs</title>
-            <short-title>EJBModules</short-title>
-            <keywords></keywords>
-        </portlet-info>
-        <init-param>
-            <name>config-type</name>
-            <value>EJB</value>
-        </init-param>
-    </portlet>
-
-     <portlet>
-        <description>Portlet for Managing RAR modules</description>
-        <portlet-name>RARModules</portlet-name>
-        <display-name>RARModules</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>
-        </supports>
-        <supported-locale>en</supported-locale>
-        <portlet-info>
-            <title>Installed J2EE Connectors</title>
-            <short-title>RARModules</short-title>
-            <keywords></keywords>
-        </portlet-info>
-        <init-param>
-            <name>config-type</name>
-            <value>RAR</value>
-        </init-param>
-    </portlet>
-
-     <portlet>
-        <description>Portlet for Managing client modules</description>
-        <portlet-name>ClientModules</portlet-name>
-        <display-name>ClientModules</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>
-        </supports>
-        <supported-locale>en</supported-locale>
-        <portlet-info>
-            <title>Installed Application Clients</title>
-            <short-title>ClientModules</short-title>
-            <keywords></keywords>
-        </portlet-info>
-        <init-param>
-            <name>config-type</name>
-            <value>CAR</value>
-        </init-param>
     </portlet>
 
 </portlet-app>

Modified: geronimo/server/trunk/plugins/console/console-plugin/src/main/webapp/WEB-INF/view/ajax/progressbar.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-plugin/src/main/webapp/WEB-INF/view/ajax/progressbar.jsp?rev=610590&r1=610569&r2=610590&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-plugin/src/main/webapp/WEB-INF/view/ajax/progressbar.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-plugin/src/main/webapp/WEB-INF/view/ajax/progressbar.jsp Wed Jan  9 13:53:11 2008
@@ -18,9 +18,9 @@
 <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%>
 <fmt:setBundle basename="consolebase"/>
 <portlet:defineObjects/>
-<script type='text/javascript' src='/console/dwr/interface/ProgressMonitor.js'></script>
-<script type='text/javascript' src='/console/dwr/engine.js'></script>
-<script type='text/javascript' src='/console/dwr/util.js'></script>
+<script type='text/javascript' src='/plugin/dwr/interface/ProgressMonitor.js'></script>
+<script type='text/javascript' src='/plugin/dwr/engine.js'></script>
+<script type='text/javascript' src='/plugin/dwr/util.js'></script>
 
 <script type="text/javascript">
 dwr.engine.setErrorHandler(<portlet:namespace/>onError);



Mime
View raw message