geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pmcma...@apache.org
Subject svn commit: r582884 [1/3] - in /geronimo/server/trunk: ./ plugins/ plugins/activemq/ plugins/activemq/activemq-jetty/ plugins/activemq/activemq-portlets/ plugins/activemq/activemq-tomcat/ plugins/console/ plugins/console/console-base-portlets/ plugins/...
Date Mon, 08 Oct 2007 16:58:29 GMT
Author: pmcmahan
Date: Mon Oct  8 09:58:21 2007
New Revision: 582884

URL: http://svn.apache.org/viewvc?rev=582884&view=rev
Log:
GERONIMO-3509 copy the new admin console and its plugins into the server project so they
can be built and released together.

also, merge recent improvements made to the old admin console into the new console:
 revs 581420 580352 576651 574637 573719 573616

Added:
    geronimo/server/trunk/plugins/
    geronimo/server/trunk/plugins/activemq/
      - copied from r581958, geronimo/plugins/activemq/trunk/
    geronimo/server/trunk/plugins/activemq/LICENSE.txt
      - copied unchanged from r582837, geronimo/plugins/activemq/trunk/LICENSE.txt
    geronimo/server/trunk/plugins/activemq/NOTICE.txt
      - copied unchanged from r582837, geronimo/plugins/activemq/trunk/NOTICE.txt
    geronimo/server/trunk/plugins/activemq/activemq-jetty/
      - copied from r582837, geronimo/plugins/activemq/trunk/activemq-jetty/
    geronimo/server/trunk/plugins/activemq/activemq-portlets/
      - copied from r582837, geronimo/plugins/activemq/trunk/activemq-portlets/
    geronimo/server/trunk/plugins/activemq/activemq-tomcat/
      - copied from r582837, geronimo/plugins/activemq/trunk/activemq-tomcat/
    geronimo/server/trunk/plugins/activemq/pom.xml
      - copied, changed from r582837, geronimo/plugins/activemq/trunk/pom.xml
    geronimo/server/trunk/plugins/console/
      - copied from r581958, geronimo/plugins/console/trunk/
    geronimo/server/trunk/plugins/console/LICENSE.txt
      - copied unchanged from r582837, geronimo/plugins/console/trunk/LICENSE.txt
    geronimo/server/trunk/plugins/console/NOTICE.txt
      - copied unchanged from r582837, geronimo/plugins/console/trunk/NOTICE.txt
    geronimo/server/trunk/plugins/console/console-base-portlets/
      - copied from r582837, geronimo/plugins/console/trunk/console-base-portlets/
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/util/TimeUtils.java
      - copied unchanged from r580352, geronimo/server/trunk/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/util/TimeUtils.java
    geronimo/server/trunk/plugins/console/console-core/
      - copied from r582837, geronimo/plugins/console/trunk/console-core/
    geronimo/server/trunk/plugins/console/console-core/src/main/java/org/apache/geronimo/console/util/TimeUtils.java
      - copied unchanged from r582337, geronimo/server/branches/2.0/applications/console/geronimo-console-standard/src/main/java/org/apache/geronimo/console/util/TimeUtils.java
    geronimo/server/trunk/plugins/console/console-ear/
      - copied from r582837, geronimo/plugins/console/trunk/console-ear/
    geronimo/server/trunk/plugins/console/console-jetty/
      - copied from r582837, geronimo/plugins/console/trunk/console-jetty/
    geronimo/server/trunk/plugins/console/console-portal-driver/
      - copied from r582837, geronimo/plugins/console/trunk/console-portal-driver/
    geronimo/server/trunk/plugins/console/console-tomcat/
      - copied from r582837, geronimo/plugins/console/trunk/console-tomcat/
    geronimo/server/trunk/plugins/console/pom.xml
      - copied, changed from r582837, geronimo/plugins/console/trunk/pom.xml
    geronimo/server/trunk/plugins/debugviews/
      - copied from r581958, geronimo/plugins/debugviews/trunk/
    geronimo/server/trunk/plugins/debugviews/LICENSE.txt
      - copied unchanged from r582837, geronimo/plugins/debugviews/trunk/LICENSE.txt
    geronimo/server/trunk/plugins/debugviews/NOTICE.txt
      - copied unchanged from r582837, geronimo/plugins/debugviews/trunk/NOTICE.txt
    geronimo/server/trunk/plugins/debugviews/debugviews-jetty/
      - copied from r582837, geronimo/plugins/debugviews/trunk/debugviews-jetty/
    geronimo/server/trunk/plugins/debugviews/debugviews-portlets/
      - copied from r582837, geronimo/plugins/debugviews/trunk/debugviews-portlets/
    geronimo/server/trunk/plugins/debugviews/debugviews-tomcat/
      - copied from r582837, geronimo/plugins/debugviews/trunk/debugviews-tomcat/
    geronimo/server/trunk/plugins/debugviews/pom.xml
      - copied, changed from r582837, geronimo/plugins/debugviews/trunk/pom.xml
    geronimo/server/trunk/plugins/plancreator/
      - copied from r581958, geronimo/plugins/plancreator/trunk/
    geronimo/server/trunk/plugins/plancreator/LICENSE.txt
      - copied unchanged from r582837, geronimo/plugins/plancreator/trunk/LICENSE.txt
    geronimo/server/trunk/plugins/plancreator/NOTICE.txt
      - copied unchanged from r582837, geronimo/plugins/plancreator/trunk/NOTICE.txt
    geronimo/server/trunk/plugins/plancreator/plancreator-jetty/
      - copied from r582837, geronimo/plugins/plancreator/trunk/plancreator-jetty/
    geronimo/server/trunk/plugins/plancreator/plancreator-portlets/
      - copied from r582837, geronimo/plugins/plancreator/trunk/plancreator-portlets/
    geronimo/server/trunk/plugins/plancreator/plancreator-tomcat/
      - copied from r582837, geronimo/plugins/plancreator/trunk/plancreator-tomcat/
    geronimo/server/trunk/plugins/plancreator/pom.xml
      - copied, changed from r582837, geronimo/plugins/plancreator/trunk/pom.xml
    geronimo/server/trunk/plugins/pluto/
      - copied from r581958, geronimo/plugins/pluto/trunk/
    geronimo/server/trunk/plugins/pluto/LICENSE.txt
      - copied unchanged from r582837, geronimo/plugins/pluto/trunk/LICENSE.txt
    geronimo/server/trunk/plugins/pluto/NOTICE.txt
      - copied unchanged from r582837, geronimo/plugins/pluto/trunk/NOTICE.txt
    geronimo/server/trunk/plugins/pluto/geronimo-pluto/
      - copied from r582837, geronimo/plugins/pluto/trunk/geronimo-pluto/
    geronimo/server/trunk/plugins/pluto/pluto-support/
      - copied from r582837, geronimo/plugins/pluto/trunk/pluto-support/
    geronimo/server/trunk/plugins/pluto/pom.xml
      - copied, changed from r582837, geronimo/plugins/pluto/trunk/pom.xml
    geronimo/server/trunk/plugins/pom.xml
      - copied, changed from r581909, geronimo/server/trunk/configs/pom.xml
    geronimo/server/trunk/plugins/system-database/
      - copied from r581958, geronimo/plugins/system-database/trunk/
    geronimo/server/trunk/plugins/system-database/LICENSE.txt
      - copied unchanged from r582837, geronimo/plugins/system-database/trunk/LICENSE.txt
    geronimo/server/trunk/plugins/system-database/NOTICE.txt
      - copied unchanged from r582837, geronimo/plugins/system-database/trunk/NOTICE.txt
    geronimo/server/trunk/plugins/system-database/pom.xml
      - copied, changed from r582837, geronimo/plugins/system-database/trunk/pom.xml
    geronimo/server/trunk/plugins/system-database/system-database-jetty/
      - copied from r582837, geronimo/plugins/system-database/trunk/system-database-jetty/
    geronimo/server/trunk/plugins/system-database/system-database-portlets/
      - copied from r582837, geronimo/plugins/system-database/trunk/system-database-portlets/
    geronimo/server/trunk/plugins/system-database/system-database-tomcat/
      - copied from r582837, geronimo/plugins/system-database/trunk/system-database-tomcat/
Removed:
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/StatisticsHelper.java
Modified:
    geronimo/server/trunk/plugins/activemq/activemq-jetty/pom.xml
    geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml
    geronimo/server/trunk/plugins/activemq/activemq-tomcat/pom.xml
    geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/car/PluginInfoBean.java
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/WebManagerPortlet.java
    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/view/configmanager/normal.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/normal.jsp
    geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/web.xml
    geronimo/server/trunk/plugins/console/console-core/pom.xml
    geronimo/server/trunk/plugins/console/console-ear/pom.xml
    geronimo/server/trunk/plugins/console/console-jetty/pom.xml
    geronimo/server/trunk/plugins/console/console-portal-driver/pom.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/debugviews/debugviews-jetty/pom.xml
    geronimo/server/trunk/plugins/debugviews/debugviews-portlets/pom.xml
    geronimo/server/trunk/plugins/debugviews/debugviews-portlets/src/main/java/org/apache/geronimo/console/jmxmanager/JMXManagerHelper.java
    geronimo/server/trunk/plugins/debugviews/debugviews-tomcat/pom.xml
    geronimo/server/trunk/plugins/plancreator/plancreator-jetty/pom.xml
    geronimo/server/trunk/plugins/plancreator/plancreator-portlets/pom.xml
    geronimo/server/trunk/plugins/plancreator/plancreator-tomcat/pom.xml
    geronimo/server/trunk/plugins/pluto/geronimo-pluto/pom.xml
    geronimo/server/trunk/plugins/pluto/pluto-support/pom.xml
    geronimo/server/trunk/plugins/system-database/system-database-jetty/pom.xml
    geronimo/server/trunk/plugins/system-database/system-database-portlets/pom.xml
    geronimo/server/trunk/plugins/system-database/system-database-tomcat/pom.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/plugins/activemq/activemq-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-jetty/pom.xml?rev=582884&r1=582837&r2=582884&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-jetty/pom.xml Mon Oct  8 09:58:21 2007
@@ -25,13 +25,12 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>activemq</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>activemq-jetty</artifactId>
-    <name>ActiveMQ :: Jetty plugin</name>
+    <name>Geronimo Plugins :: ActiveMQ - Jetty</name>
     <packaging>car</packaging>
 
     <dependencies>
@@ -47,52 +46,74 @@
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>console-jetty</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>console-core</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>activemq-ra</artifactId>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>connector-deployer</artifactId>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
+            <version>${version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-management</artifactId>
+            <version>${version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-deploy-jsr88</artifactId>
+            <version>${version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-activemq-ra</artifactId>
+            <version>${version}</version>
             <type>rar</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jsr88-rar-configurer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <!-- for jspc. why is this needed? -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jasper</artifactId>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
@@ -123,11 +144,8 @@
                         <version>${version}</version>
                         <type>war</type>
                     </module>
-                    <category>Application</category>
+                    <category>JMS</category>
                     <osiApproved>true</osiApproved>
-                    <geronimoVersions>
-                        <value>2.1-SNAPSHOT</value>
-                    </geronimoVersions>
                     <useMavenDependencies>
                         <value>true</value>
                         <includeVersion>true</includeVersion>
@@ -144,9 +162,6 @@
                                     This version of the plugin works with the Geronimo/Jetty distribution.
                                 </description>
                             </prerequisite>
-                            <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
-                            <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
-                            <source-repository>http://repo1.maven.org/maven2/</source-repository>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Modified: geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml?rev=582884&r1=582837&r2=582884&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-portlets/pom.xml Mon Oct  8 09:58:21 2007
@@ -25,36 +25,58 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>activemq</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>activemq-portlets</artifactId>
-    <name>ActiveMQ :: Admin Console Portlets</name>
+    <name>Geronimo Plugins :: ActiveMQ Portlets</name>
     <packaging>war</packaging>
 
     <dependencies>
 
+        <!-- for jspc maven plugin -->
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jee-specs</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <!-- for jspc maven plugin -->
+        <dependency>
+            <groupId>org.apache.pluto</groupId>
+            <artifactId>pluto-taglib</artifactId>
+            <version>${plutoVersion}</version>
+            <scope>provided</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>console-core</artifactId>
+            <version>${version}</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
+            <version>${version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-connector-builder</artifactId>
+            <version>${version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-management</artifactId>
+            <version>${version}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -67,12 +89,14 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-deploy-jsr88</artifactId>
+            <version>${version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee</artifactId>
+            <version>${version}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -86,6 +110,16 @@
         <filtering>true</filtering>
       </resource>
     </resources>
+    <plugins>
+      <plugin>
+          <groupId>org.codehaus.mojo.jspc</groupId>
+          <artifactId>jspc-maven-plugin</artifactId>
+      </plugin>
+      <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-war-plugin</artifactId>
+      </plugin>
+    </plugins>
   </build>
     
 </project>

Modified: geronimo/server/trunk/plugins/activemq/activemq-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-tomcat/pom.xml?rev=582884&r1=582837&r2=582884&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-tomcat/pom.xml Mon Oct  8 09:58:21 2007
@@ -25,13 +25,12 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>activemq</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>activemq-tomcat</artifactId>
-    <name>ActiveMQ :: Tomcat plugin</name>
+    <name>Geronimo Plugins :: ActiveMQ - Tomcat</name>
     <packaging>car</packaging>
 
     <dependencies>
@@ -47,52 +46,66 @@
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>console-tomcat</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>console-core</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>activemq-ra</artifactId>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>connector-deployer</artifactId>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-kernel</artifactId>
+            <version>${version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-management</artifactId>
+            <version>${version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-deploy-jsr88</artifactId>
+            <version>${version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-activemq-ra</artifactId>
+            <version>${version}</version>
             <type>rar</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jsr88-rar-configurer</artifactId>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
@@ -123,11 +136,8 @@
                         <version>${version}</version>
                         <type>war</type>
                     </module>
-                    <category>Application</category>
+                    <category>JMS</category>
                     <osiApproved>true</osiApproved>
-                    <geronimoVersions>
-                        <value>2.1-SNAPSHOT</value>
-                    </geronimoVersions>
                     <useMavenDependencies>
                         <value>true</value>
                         <includeVersion>true</includeVersion>
@@ -144,9 +154,6 @@
                                     This version of the plugin works with the Geronimo/Tomcat distribution.
                                 </description>
                             </prerequisite>
-                            <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
-                            <source-repository>http://people.apache.org/repo/m2-incubating-repository/</source-repository>
-                            <source-repository>http://repo1.maven.org/maven2/</source-repository>
                         </plugin-artifact>
                     </instance>
                 </configuration>

Copied: geronimo/server/trunk/plugins/activemq/pom.xml (from r582837, geronimo/plugins/activemq/trunk/pom.xml)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/pom.xml?p2=geronimo/server/trunk/plugins/activemq/pom.xml&p1=geronimo/plugins/activemq/trunk/pom.xml&r1=582837&r2=582884&rev=582884&view=diff
==============================================================================
--- geronimo/plugins/activemq/trunk/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/pom.xml Mon Oct  8 09:58:21 2007
@@ -23,325 +23,25 @@
     <modelVersion>4.0.0</modelVersion>
 
     <parent>
-        <groupId>org.apache.geronimo.genesis.config</groupId>
-        <artifactId>project-config</artifactId>
-        <version>1.2</version>
+        <groupId>org.apache.geronimo.plugins</groupId>
+        <artifactId>plugins</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>activemq</artifactId>
-    <name>ActiveMQ</name>
+    <name>Geronimo Plugins :: ActiveMQ</name>
     <packaging>pom</packaging>
 
-    <version>1.0-SNAPSHOT</version>
-
     <description>
         ActiveMQ plugin
     </description>
 
-    <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/geronimo/plugins/activemq/trunk</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/geronimo/plugins/activemq/trunk</developerConnection>
-        <url>http://svn.apache.org/viewvc/geronimo/plugins/activemq/trunk</url>
-    </scm>
-
-    <properties>
-        <!--
-        NOTE: Project version, to be used instead of ${pom.version} since that
-              value magically changes when using SNAPSHOT versions.
-
-              This value *must* be kept in sync with the value of the <version>
-              element, and it will need to be changed manually before a release,
-              as the maven-release-plugin will not update this value.
-        -->
-        <version>1.0-SNAPSHOT</version>
-        <geronimoVersion>2.1-SNAPSHOT</geronimoVersion>
-        <plutoVersion>1.2.0-SNAPSHOT</plutoVersion>
-        <consoleVersion>1.0-SNAPSHOT</consoleVersion>
-
-        <!-- deployers needed to create the CAR files -->
-        <gbeanDeployer>org.apache.geronimo.configs/geronimo-gbean-deployer/${geronimoVersion}/car</gbeanDeployer>
-        <j2eeDeployer>org.apache.geronimo.configs/j2ee-deployer/${geronimoVersion}/car</j2eeDeployer>
-        <tomcatDeployer>org.apache.geronimo.configs/tomcat6-deployer/${geronimoVersion}/car</tomcatDeployer>
-        <jetty6Deployer>org.apache.geronimo.configs/jetty6-deployer/${geronimoVersion}/car</jetty6Deployer>
-        <jasperDeployer>org.apache.geronimo.configs/jasper-deployer/${geronimoVersion}/car</jasperDeployer>
-    </properties>
-
-    <dependencyManagement>
-        <dependencies>
-
-            <dependency>
-                <groupId>javax.portlet</groupId>
-                <artifactId>portlet-api</artifactId>
-                <version>1.0</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-connector-builder</artifactId>
-                <version>${geronimoVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-activemq-ra</artifactId>
-                <version>${geronimoVersion}</version>
-                <type>rar</type>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-j2ee</artifactId>
-                <version>${geronimoVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-kernel</artifactId>
-                <version>${geronimoVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-management</artifactId>
-                <version>${geronimoVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-deploy-jsr88</artifactId>
-                <version>${geronimoVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>activemq-ra</artifactId>
-                <version>${geronimoVersion}</version>
-                <type>car</type>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>geronimo-gbean-deployer</artifactId>
-                <version>${geronimoVersion}</version>
-                <type>car</type>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>jsr88-rar-configurer</artifactId>
-                <version>${geronimoVersion}</version>
-                <type>car</type>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>connector-deployer</artifactId>
-                <version>${geronimoVersion}</version>
-                <type>car</type>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.plugins</groupId>
-                <artifactId>console-core</artifactId>
-                <version>${consoleVersion}</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.geronimo.modules</groupId>
-                        <artifactId>geronimo-connector</artifactId>
-                    </exclusion>
-
-                    <exclusion>
-                        <groupId>javax.portlet</groupId>
-                        <artifactId>portlet-api</artifactId>
-                    </exclusion>
-
-                    <exclusion>
-                        <groupId>org.apache.geronimo.modules</groupId>
-                        <artifactId>geronimo-deploy-jsr88</artifactId>
-                    </exclusion>
-
-                    <exclusion>
-                        <groupId>org.apache.geronimo.specs</groupId>
-                        <artifactId>geronimo-servlet_2.5_spec</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-        </dependencies>
-    </dependencyManagement>
-
-    <build>
-        <pluginManagement>
-            <plugins>
-                <plugin>
-                    <groupId>org.apache.geronimo.plugins</groupId>
-                    <artifactId>car-maven-plugin</artifactId>
-                    <version>${geronimoVersion}</version>
-                    <extensions>true</extensions>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-enforcer-plugin</artifactId>
-                    <version>1.0-alpha-2</version>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-dependency-plugin</artifactId>
-                    <version>2.0-alpha-4</version>
-                </plugin>
-
-                <!--
-                FIXME: Should not configure war to assume jsp by default
-                -->
-
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-war-plugin</artifactId>
-                    <version>2.0.2</version>
-                    <configuration>
-                        <warSourceDirectory>${pom.basedir}/src/main/webapp</warSourceDirectory>
-                        <archiveClasses>true</archiveClasses>
-                        <archive>
-                            <!-- Do not include META-INF/maven to avoid long file problems on windows -->
-                            <addMavenDescriptor>false</addMavenDescriptor>
-                        </archive>
-                        
-                        <!--
-                        HACK: Include legal files explicity, otherwise they will end up in the wrong path
-                              or in another jar file in the war.
-                        
-                        NOTE: targetPath is broken for webResources (as documented)
-                        -->
-                        <webResources>
-                            <resource>
-                                <directory>${project.build.outputDirectory}</directory>
-                                <includes>
-                                    <include>META-INF/LICENSE*</include>
-                                    <include>META-INF/NOTICE*</include>
-                                    <include>META-INF/DISCLAIMER*</include>
-                                </includes>
-                            </resource>
-                        </webResources>
-                    </configuration>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.pluto</groupId>
-                    <artifactId>maven-pluto-plugin</artifactId>
-                    <version>${plutoVersion}</version>
-                </plugin>
-
-            </plugins>
-
-        </pluginManagement>
-
-        <plugins>
-            
-            <plugin>
-                <groupId>org.apache.geronimo.genesis.plugins</groupId>
-                <artifactId>tools-maven-plugin</artifactId>
-
-                <!-- Tools includes custom packagings, install as extension to pick them up -->
-                <extensions>true</extensions>
-
-                <executions>
-                    <execution>
-                        <id>install-legal-files</id>
-                        <phase>generate-resources</phase>
-                        <goals>
-                            <goal>copy-legal-files</goal>
-                        </goals>
-                        <configuration>
-                            <!-- Fail the build if no legal files were copied -->
-                            <strict>true</strict>
-                        </configuration>
-                    </execution>
-
-                    <execution>
-                        <id>verify-legal-files</id>
-                        <phase>verify</phase>
-                        <goals>
-                            <goal>verify-legal-files</goal>
-                        </goals>
-                        <configuration>
-                            <!-- Fail the build if no legal files were found -->
-                            <strict>true</strict>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-release-plugin</artifactId>
-                <configuration>
-                    <tagBase>https://svn.apache.org/repos/asf/geronimo/sandbox/portals/tags</tagBase>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <repositories>
-        <!--
-        NOTE: The default repositories are picked up by Genesis, but need to
-              specify where Genesis lives to pick it up  any additional repositories.
-        -->
-
-        <repository>
-            <id>apache-snapshots</id>
-            <name>Apache Snapshots Repository</name>
-            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
-            <layout>default</layout>
-            <snapshots>
-                <enabled>true</enabled>
-                <updatePolicy>daily</updatePolicy>
-                <checksumPolicy>ignore</checksumPolicy>
-            </snapshots>
-            <releases>
-                <enabled>false</enabled>
-            </releases>
-        </repository>
-
-    </repositories>
-
-    <distributionManagement>
-        <!--
-        NOTE: The repository and snapshotRepository are picked up from Genesis.
-        -->
-
-        <site>
-            <id>geronimo-website</id>
-            <url>scp://people.apache.org/www/geronimo.apache.org/maven/portals</url>
-        </site>
-    </distributionManagement>
-
-    <profiles>
-        <profile>
-            <id>default</id>
-
-            <activation>
-                <activeByDefault>true</activeByDefault>
-            </activation>
-
-            <modules>
-                <module>activemq-portlets</module>
-                <module>activemq-tomcat</module>
-                <module>activemq-jetty</module>
-            </modules>
-        </profile>
-    </profiles>
+    <modules>
+        <module>activemq-portlets</module>
+        <module>activemq-tomcat</module>
+        <module>activemq-jetty</module>
+    </modules>
 
 </project>
 

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml?rev=582884&r1=582837&r2=582884&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/pom.xml Mon Oct  8 09:58:21 2007
@@ -25,12 +25,12 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>console</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>console-base-portlets</artifactId>
-    <name>Administration Console :: Base Portlets</name>
+    <name>Geronimo Plugins :: Administration Console Base Portlets</name>
     <packaging>war</packaging>
 
     <dependencies>
@@ -39,45 +39,51 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jee-specs</artifactId>
-            <scope>provided</scope>
+            <version>${version}</version>
             <type>car</type>
+            <scope>provided</scope>
         </dependency>
 
+        <!-- for jspc maven plugin -->
         <dependency>
             <groupId>org.apache.pluto</groupId>
             <artifactId>pluto-taglib</artifactId>
+            <version>${plutoVersion}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-upgrade</artifactId>
+            <version>${version}</version>
             <scope>provided</scope>
-<!-- should look into providing geronimo-upgrade in the minimal assembly -->
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-converter</artifactId>
+            <version>${version}</version>
             <scope>provided</scope>
-<!-- should look into providing geronimo-converter in the minimal assembly -->
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-connector-builder</artifactId>
+            <version>${version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-security-builder</artifactId>
+            <version>${version}</version>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-deploy-jsr88</artifactId>
+            <version>${version}</version>
             <scope>provided</scope>
         </dependency>
 
@@ -90,11 +96,14 @@
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>console-core</artifactId>
+            <version>${version}</version>
+            <scope>provided</scope>
         </dependency>
         
         <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
+            <scope>provided</scope>
         </dependency>
         
         <dependency>
@@ -103,6 +112,18 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.directwebremoting</groupId>
+            <artifactId>dwr</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+            <scope>provided</scope>
+        </dependency>
+
     </dependencies>
     
   <!-- Build configuration -->
@@ -158,21 +179,10 @@
       <plugin>
           <groupId>org.codehaus.mojo.jspc</groupId>
           <artifactId>jspc-maven-plugin</artifactId>
-          <executions>
-              <execution>
-                  <id>jspc</id>
-                  <goals>
-                      <goal>compile</goal>
-                  </goals>
-              </execution>
-          </executions>
       </plugin>
       <plugin>
           <groupId>org.apache.maven.plugins</groupId>
           <artifactId>maven-war-plugin</artifactId>
-          <configuration>
-              <webXml>${basedir}/target/jspweb.xml</webXml>
-          </configuration>
       </plugin>
     </plugins>
   </build>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/car/PluginInfoBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/car/PluginInfoBean.java?rev=582884&r1=582837&r2=582884&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/car/PluginInfoBean.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/car/PluginInfoBean.java Mon Oct  8 09:58:21 2007
@@ -19,6 +19,7 @@
 import java.util.List;
 
 import org.apache.geronimo.system.plugin.model.ArtifactType;
+import org.apache.geronimo.system.plugin.model.ConfigXmlContentType;
 import org.apache.geronimo.system.plugin.model.CopyFileType;
 import org.apache.geronimo.system.plugin.model.DependencyType;
 import org.apache.geronimo.system.plugin.model.HashType;
@@ -43,7 +44,7 @@
     protected List<ArtifactType> obsoletes;
     protected List<String> sourceRepository;
     protected List<CopyFileType> copyFile;
-    protected PluginArtifactType.ConfigXmlContent configXmlContent;
+    protected ConfigXmlContentType configXmlContent;
     protected List<PropertyType> artifactAlias;
     protected List<PropertyType> configSubstitution;
     protected String name;
@@ -88,11 +89,11 @@
         this.configSubstitution = configSubstitution;
     }
 
-    public PluginArtifactType.ConfigXmlContent getConfigXmlContent() {
+    public ConfigXmlContentType getConfigXmlContent() {
         return configXmlContent;
     }
 
-    public void setConfigXmlContent(PluginArtifactType.ConfigXmlContent configXmlContent) {
+    public void setConfigXmlContent(ConfigXmlContentType configXmlContent) {
         this.configXmlContent = configXmlContent;
     }
 

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java?rev=582884&r1=582837&r2=582884&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/configmanager/ConfigManagerPortlet.java Mon Oct  8 09:58:21 2007
@@ -386,17 +386,19 @@
         private String contextPath;     // only relevant for webapps
         private List parents = new ArrayList();
         private List children = new ArrayList();
+        private boolean expertConfig = false;   // used to mark this config as one that should only be managed (stop/uninstall) by expert users.
 
         public ModuleDetails(Artifact configId, ConfigurationModuleType type, State state) {
             this.configId = configId;
             this.type = type;
             this.state = state;
+            if (configId.toString().indexOf("org.apache.geronimo.configs/") == 0) {
+                this.expertConfig = true;
+            }
         }
 
         public ModuleDetails(Artifact configId, ConfigurationModuleType type, State state, List parents, List children) {
-            this.configId = configId;
-            this.type = type;
-            this.state = state;
+            this(configId, type, state);
             this.parents = parents;
             this.children = children;
         }
@@ -427,6 +429,10 @@
 
         public ConfigurationModuleType getType() {
             return type;
+        }
+
+        public boolean getExpertConfig() {
+            return expertConfig;
         }
 
         public List getParents() {

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/WebManagerPortlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/WebManagerPortlet.java?rev=582884&r1=582837&r2=582884&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/WebManagerPortlet.java (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/java/org/apache/geronimo/console/webmanager/WebManagerPortlet.java Mon Oct  8 09:58:21 2007
@@ -19,6 +19,7 @@
 
 import org.apache.geronimo.console.BasePortlet;
 import org.apache.geronimo.console.util.PortletManager;
+import org.apache.geronimo.console.util.TimeUtils;
 import org.apache.geronimo.management.geronimo.WebContainer;
 import org.apache.geronimo.management.geronimo.WebManager;
 import org.apache.geronimo.management.geronimo.stats.WebContainerStats;
@@ -60,11 +61,10 @@
                 if (containers != null) {
                     WebContainer container = containers[0];  //todo: handle multiple
                     String server = getWebServerType(container.getClass());
-                    String action = actionRequest.getParameter("stats");
-                    if (action != null) {
-                        boolean stats = action.equals("true");
+                    if (actionRequest.getParameter("stats") != null) {
+                        Boolean stats = actionRequest.getParameter("stats").equals("true") ? Boolean.TRUE : Boolean.FALSE;
                         if(server.equals(WEB_SERVER_JETTY)) {
-                            setProperty(container, "collectStatistics", stats ? Boolean.TRUE : Boolean.FALSE);
+                            setProperty(container, "collectStatistics", stats);
                         }
                         else if (server.equals(WEB_SERVER_TOMCAT)) {
                             //todo:   Any Tomcat specific processing?
@@ -75,7 +75,7 @@
                     }
                     if (actionRequest.getParameter("resetStats") != null) {
                         if(server.equals(WEB_SERVER_JETTY)) {
-                            callOperation(container, "resetStatistics", null);
+                            callOperation(container, "resetStats", null);
                         }
                         else if (server.equals(WEB_SERVER_TOMCAT)) {
                             //todo:   Any Tomcat specific processing?
@@ -114,28 +114,19 @@
                         if (webStats.isStatsOn()) {
                             renderRequest.setAttribute("statsOn", Boolean.TRUE);
                             renderRequest.setAttribute("totalRequestCount", new Long(webStats.getTotalRequestCount().getCount()));
-                            renderRequest.setAttribute("totalConnectionCount", new Long(webStats.getTotalConnectionCount().getCount()));
-                            renderRequest.setAttribute("totalErrorCount", new Long(webStats.getTotalErrorCount().getCount()));
                             renderRequest.setAttribute("activeRequestCountCurrent", new Long(webStats.getActiveRequestCount().getCurrent()));
                             renderRequest.setAttribute("activeRequestCountLow", new Long(webStats.getActiveRequestCount().getLowWaterMark()));
                             renderRequest.setAttribute("activeRequestCountHigh", new Long(webStats.getActiveRequestCount().getHighWaterMark()));
-                            renderRequest.setAttribute("connectionRequestCountCurrent", new Long(webStats.getConnectionRequestCount().getCurrent()));
-                            renderRequest.setAttribute("connectionRequestCountLow", new Long(webStats.getConnectionRequestCount().getLowWaterMark()));
-                            renderRequest.setAttribute("connectionRequestCountHigh", new Long(webStats.getConnectionRequestCount().getHighWaterMark()));
-    //                          renderRequest.setAttribute("connectionRequestsAve", new Long(0));   /* Can't really compute this for a range ... do we still need it (from old portlet) */
-                            renderRequest.setAttribute("openConnectionCountCurrent", new Long(webStats.getOpenConnectionCount().getCurrent()));
-                            renderRequest.setAttribute("openConnectionCountLow", new Long(webStats.getOpenConnectionCount().getLowWaterMark()));
-                            renderRequest.setAttribute("openConnectionCountHigh", new Long(webStats.getOpenConnectionCount().getHighWaterMark()));
-                            renderRequest.setAttribute("requestDurationCount", new Long(webStats.getRequestDuration().getCount()));
+                            renderRequest.setAttribute("requestDurationAvg", new Long(webStats.getRequestDurationAvg().getCount()));
                             renderRequest.setAttribute("requestDurationMinTime", new Long(webStats.getRequestDuration().getMinTime()));
                             renderRequest.setAttribute("requestDurationMaxTime", new Long(webStats.getRequestDuration().getMaxTime()));
                             renderRequest.setAttribute("requestDurationTotalTime", new Long(webStats.getRequestDuration().getTotalTime()));
-    //                          renderRequest.setAttribute("requestDurationAve", new Long(0));  /* Would this be valuable to calculate?  We used to show this in the old jetty only portlet */
-                            renderRequest.setAttribute("connectionDurationCount", new Long(webStats.getConnectionDuration().getCount()));
-                            renderRequest.setAttribute("connectionDurationMinTime", new Long(webStats.getConnectionDuration().getMinTime()));
-                            renderRequest.setAttribute("connectionDurationMaxTime", new Long(webStats.getConnectionDuration().getMaxTime()));
-                            renderRequest.setAttribute("connectionDurationTotalTime", new Long(webStats.getConnectionDuration().getTotalTime()));
-    //                          renderRequest.setAttribute("connectionDurationAve", new Long(0));   /* Wouldl this be valueable to calculate?  We used to show this in the old jetty only portlet */
+                            renderRequest.setAttribute("response1xx", new Long(webStats.getResponses1xx().getCount()));
+                            renderRequest.setAttribute("response2xx", new Long(webStats.getResponses2xx().getCount()));
+                            renderRequest.setAttribute("response3xx", new Long(webStats.getResponses3xx().getCount()));
+                            renderRequest.setAttribute("response4xx", new Long(webStats.getResponses4xx().getCount()));
+                            renderRequest.setAttribute("response5xx", new Long(webStats.getResponses5xx().getCount()));
+                            renderRequest.setAttribute("elapsedTime", TimeUtils.formatDuration(webStats.getStatsOnMs().getCount()));
                         } else {
                             renderRequest.setAttribute("statsSupported", Boolean.TRUE);
                             renderRequest.setAttribute("statsMessage", "Statistics are not currently being collected.");

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=582884&r1=582837&r2=582884&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 Mon Oct  8 09:58:21 2007
@@ -462,4 +462,92 @@
         </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>EARModules</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>EJBModules</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>RARModules</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>ClientModules</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-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp?rev=582884&r1=582837&r2=582884&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/configmanager/normal.jsp Mon Oct  8 09:58:21 2007
@@ -18,7 +18,189 @@
 <%@ taglib uri="http://java.sun.com/portlet" prefix="portlet"%>
 <portlet:defineObjects/>
 
+<script>
+var EXPERT_COOKIE = "org.apache.geronimo.configmanager.expertmode";
+
+// Check to see if a component is "safe" to stop within a running server.
+// Service components with names that begin with "org.apache.geronimo.configs/", for example,
+// may not be safe to stop because doing so might prevent other components
+// that depend on them (like the console itself) from functioning properly.
+// If the component is not safe to stop then prompt to make sure that
+// the user really intends to stop the component prior to any action.
+function promptIfUnsafeToStop(configId,expertConfig, type) {
+    // if the component is a Geronimo "expert" service then provide a stern warning
+    if ((type == 'SERVICE') && (expertConfig == 'true')) {
+        return confirm( configId + " is an Apache Geronimo service.\r\n \r\n" +
+                       "Stopping this component may prevent the server or the "+
+                       "administration console from functioning properly. " +
+                       "All dependent components and subsequent dependencies will also be stopped. " +
+                       "Reference the 'Child Components' list in the view for directly affected components.\r\n \r\n" +
+                       "Proceed with this action?");
+    }
+    // if the component is the web console provide an appropriate warning
+    if (configId.indexOf("org.apache.geronimo.configs/webconsole-") == 0) {
+        return confirm( configId + " provides the administration console interface " +
+                       "that you are currently viewing.\r\n \r\n Stopping it will cause the interface " +
+                       "to become unavailable and manual action will be required to restore the function.\r\n \r\n" +
+                       "Proceed with this action?");
+    }
+    // if the component is any other Geronimo "expert" component provide an appropriate warning
+    if (expertConfig == 'true') {
+        return confirm( configId + " is provided by Apache Geronimo and may be required by other " +
+                       "modules (reference the 'Child Components' listed in the view).\r\n \r\n " +
+                       "All dependent components and subsequent dependencies will also be stopped. \r\n \r\n" +
+                       "Proceed with this action?");
+    }
+    // otherwise don't challenge the stop operation
+    return true;
+}
+
+
+// Check to see if a component is "safe" to stop within a running server.
+// Service components with names that begin with "org.apache.geronimo.configs/", for example,
+// may not be safe to stop because doing so might prevent other components
+// that depend on them (like the console itself) from functioning properly.
+// If the component is not safe to stop then prompt to make sure that
+// the user really intends to stop the component prior to any action.
+function promptIfUnsafeToRestart(configId,expertConfig, type) {
+    // if the component is a Geronimo "expert" service then provide a stern warning
+    if ((type == 'SERVICE') && (expertConfig == 'true')) {
+        return confirm( configId + " is an Apache Geronimo service.\r\n \r\n " +
+                       "Restarting this component may prevent the server or the "+
+                       "administration console from functioning properly. " +
+                       "As part of the stop action, all dependent components and subsequent dependencies will also be stopped. " +
+                       "Only this component will be restarted. " +
+                       "Reference the 'Child Components' list in the view for directly affected components.\r\n \r\n " +
+                       "Proceed with this action?");
+    }
+    // if the component is the web console provide an appropriate warning
+    if (configId.indexOf("org.apache.geronimo.configs/webconsole-") == 0) {
+        return confirm( configId + " provides the administration console interface " +
+                       "that you are currently viewing.\r\n \r\n  Restarting it will cause the interface " +
+                       "to become unavailable and manual action may be necessary to restore the console function.\r\n \r\n" +
+                       "Proceed with this action?");
+    }
+    // if the component is a Geronimo "expert" component then provide an appropriate warning
+    if (expertConfig == 'true') {
+        return confirm( configId + " is provided by Apache Geronimo and may be required by other " +
+                       "modules (reference the 'Child Components' listed in the view).\r\n \r\n " +
+                       "As part of the stop action, all dependent components and subsequent dependencies will also be stopped. \r\n \r\n" +
+                       "Proceed with this action?");
+    }
+    // otherwise don't challenge the restart operation
+    return true;
+}
+
+
+// Uninstall is always a potentially dangerous action, so we should prompt the
+// the user to ensure that they really indent to do this.  Uninistalling
+// some modules is more destructive than others (such as modules which are
+// dependencies of the web console or dependencies of other core server 
+// modules.  In such cases. it may leave the server in a state where it 
+// cannot be restarted.  These situations require more stringent warnings.
+function uninstallPrompt(configId,expertConfig, type) {
+    // if the component is a geronimo "expert" service always provide the most stern warning
+    if ((type == 'SERVICE') && (expertConfig == 'true')) {
+        return confirm( configId + " is an Apache Geronimo service.\r\n \r\n" +
+                       "Uninstalling this component may have unexpected results "+
+                       "such as rendering the administration web console or even the "+
+                       "server itself unstable.  Reference the 'Child Components' view " + 
+                       "for directly affected components. \r\n \r\n" +
+                       "Are you certain you wish to proceed with this uninstall?");
+    }
+    // if the component is a the web console itself then provide an appropriate warning
+    if (configId.indexOf("org.apache.geronimo.configs/webconsole-") == 0) {
+        return confirm( configId + " provides the administration console user interface " +
+                       "that you are currently viewing.\r\n \r\n  Uninstalling it will cause the interface " +
+                       "to become unavailable and manual action will be required to restore the function.\r\n \r\n " +
+                       "Are you certain you wish to proceed with this uninstall?");
+    }
+    // if the component is any other Apache Geronimo "expert" component then provide an appropriate warning
+    if (expertConfig == 'true') {
+        return confirm( configId + " is provided by Apache Geronimo and may be required by other " +
+                       "modules (reference the 'Child Components' listed in the view). \r\n \r\n" +
+                       "Are you certain you wish to proceed with this uninstall?");
+    }
+    // if the component is none of the above provide a standard warning
+    return confirm("Are you certain you wish to uninstall " + configId + " ?");
+}
+
+// Toggle expert mode on and off with onClick
+function toggleExpertMode() {
+    if (document.checkExpert.expertMode.checked) {
+        //  Set attribute/parameter to indicated expertMode is checked
+        document.cookie=EXPERT_COOKIE+"=true";
+        var expertActions = getSpanElementsByName('expert');
+        for( var i = 0; i < expertActions.length; ++i ) {
+            expertActions[i].style.display='block' ;
+        }
+        var nonexpertActions = getSpanElementsByName('nonexpert');
+        for( var i = 0; i < nonexpertActions.length; ++i ) {
+            nonexpertActions[i].style.display='none' ;
+        }
+    }
+    else {
+        //  Set attribute/parameter to indicated expertMode is not checked
+        document.cookie=EXPERT_COOKIE+"=false";
+        var expertActions = getSpanElementsByName('expert');
+        for( var i = 0; i < expertActions.length; ++i ) {
+            expertActions[i].style.display='none' ;
+        }
+        var nonexpertActions = getSpanElementsByName('nonexpert');
+        for( var i = 0; i < nonexpertActions.length; ++i ) {
+            nonexpertActions[i].style.display='block' ;
+        }
+    }
+}
+
+
+// work around since IE doesn't support document.getElementsByName
+function getSpanElementsByName(name) {
+    var results = new Array();
+    var spans = document.getElementsByTagName("span");
+    for(i = 0,j = 0; i < spans.length; i++) {
+        nameValue = spans[i].getAttribute("name");
+        if(nameValue == name) {
+          results[j] = spans[i];
+          j++;
+        }
+    }
+    return results;
+}
+
+// get cookie utility routine
+function getCookie(name) {
+    var result = "";
+    var key = name + "=";
+    if (document.cookie.length > 0) {
+        start = document.cookie.indexOf(key);
+        if (start != -1) { 
+            start += key.length;
+            end = document.cookie.indexOf(";", start);
+            if (end == -1) end = document.cookie.length;
+            result=document.cookie.substring(start, end);
+        }
+    }
+    return result;
+}
+
+// initialization routine to set the initial display state for expert mode correctly
+function init() {
+    if (getCookie(EXPERT_COOKIE) == 'true') {
+        document.checkExpert.expertMode.checked = true;
+    }
+    else {
+        document.checkExpert.expertMode.checked = false;
+    }
+    toggleExpertMode();
+}
+</script>
+
+
 <br />
+<form name="checkExpert">
+<input type="checkbox" name="expertMode" onClick="toggleExpertMode();" />&nbsp;Expert User (enable all actions on Geronimo Provided Components)   
+</form>
 <br />
 <table width="100%">
     <tr class="DarkBackground">
@@ -31,36 +213,77 @@
     </tr>
   <c:set var="backgroundClass" value='MediumBackground'/>
   <c:forEach var="moduleDetails" items="${configurations}">
-        <c:choose>
-            <c:when test="${backgroundClass == 'MediumBackground'}" >
-                <c:set var="backgroundClass" value='LightBackground'/>
-            </c:when>
-            <c:otherwise>
-                <c:set var="backgroundClass" value='MediumBackground'/>
-            </c:otherwise>
-        </c:choose>
+      <c:choose>
+          <c:when test="${backgroundClass == 'MediumBackground'}" >
+              <c:set var="backgroundClass" value='LightBackground'/>
+          </c:when>
+          <c:otherwise>
+              <c:set var="backgroundClass" value='MediumBackground'/>
+          </c:otherwise>
+      </c:choose>
     <tr>
-        <td class="${backgroundClass}">&nbsp;${moduleDetails.configId}</td>
+        <!-- module id -->
+        <td class="${backgroundClass}">&nbsp;${moduleDetails.configId}&nbsp;
+
+        <!-- context path -->
         <c:if test="${showWebInfo}">
             <td class="${backgroundClass}">&nbsp;<c:if test="${moduleDetails.state.running}"><a href="${moduleDetails.contextPath}">${moduleDetails.contextPath}</a></c:if></td>
         </c:if>
+
+        <!-- state -->
         <td width="100" class="${backgroundClass}">&nbsp;${moduleDetails.state}</td>
+
+        <!-- Start/Stop actions -->
         <td width="75" class="${backgroundClass}">
-            <c:if test="${moduleDetails.state.running}">&nbsp;<a href="<portlet:actionURL><portlet:param name="configId" value="${moduleDetails.configId}"/><portlet:param name="action" value="stop"/></portlet:actionURL>">Stop</a></c:if>
-            <c:if test="${moduleDetails.state.stopped && (moduleDetails.type.name ne 'CAR')}">&nbsp;<a href="<portlet:actionURL><portlet:param name="configId" value="${moduleDetails.configId}"/><portlet:param name="action" value="start"/></portlet:actionURL>">Start</a></c:if>
-            <c:if test="${moduleDetails.state.failed}">&nbsp;<a href="<portlet:actionURL><portlet:param name="configId" value="${moduleDetails.configId}"/><portlet:param name="action" value="stop"/></portlet:actionURL>">Stop</a></c:if>
+            <c:if test="${moduleDetails.state.running || moduleDetails.state.failed}">
+                <span <c:if test="${moduleDetails.expertConfig}"> name=expert </c:if>> 
+                    &nbsp;<a href="<portlet:actionURL><portlet:param name='configId' value='${moduleDetails.configId}'/><portlet:param name='action' value='stop'/></portlet:actionURL>" onClick="return promptIfUnsafeToStop('${moduleDetails.configId}','${moduleDetails.expertConfig}','${moduleDetails.type.name}');">Stop</a>
+                </span>
+            </c:if>
+            <c:if test="${moduleDetails.expertConfig && (moduleDetails.state.running || moduleDetails.state.failed)}">
+                <span name=nonexpert> 
+                    &nbsp;<a>Stop</a>
+                </span>
+            </c:if>
+            <c:if test="${moduleDetails.state.stopped && (moduleDetails.type.name ne 'CAR')}">
+                &nbsp;<a href="<portlet:actionURL><portlet:param name='configId' value='${moduleDetails.configId}'/><portlet:param name='action' value='start'/></portlet:actionURL>">Start</a>
+            </c:if>
         </td>
+
+        <!-- Restart action -->
         <td width="75" class="${backgroundClass}">
-            <c:if test="${moduleDetails.state.running}">&nbsp;<a href="<portlet:actionURL><portlet:param name="configId" value="${moduleDetails.configId}"/><portlet:param name="action" value="restart"/></portlet:actionURL>">Restart</a></c:if>
+            <c:if test="${moduleDetails.state.running}">
+                <span <c:if test="${moduleDetails.expertConfig}"> name=expert </c:if>> 
+                    &nbsp;<a href="<portlet:actionURL><portlet:param name='configId' value='${moduleDetails.configId}'/><portlet:param name='action' value='restart'/></portlet:actionURL>" onClick="return promptIfUnsafeToRestart('${moduleDetails.configId}','${moduleDetails.expertConfig}','${moduleDetails.type.name}');">Restart</a>
+                </span>
+            </c:if>
+            <c:if test="${moduleDetails.expertConfig && moduleDetails.state.running}">
+                <span name=nonexpert> 
+                    &nbsp;<a>Restart</a>
+                </span>
+            </c:if>
         </td>
+
+        <!-- Uninstall action -->
         <td width="75" class="${backgroundClass}">
-            <a href="<portlet:actionURL><portlet:param name="configId" value="${moduleDetails.configId}"/><portlet:param name="action" value="uninstall"/></portlet:actionURL>" onClick="return confirm('Are you sure you want to uninstall ${moduleDetails.configId}?');">Uninstall</a>
+            <span <c:if test="${moduleDetails.expertConfig}"> name=expert </c:if>> 
+                &nbsp;<a href="<portlet:actionURL><portlet:param name='configId' value='${moduleDetails.configId}'/><portlet:param name='action' value='uninstall'/></portlet:actionURL>" onClick="return uninstallPrompt('${moduleDetails.configId}','${moduleDetails.expertConfig}','${moduleDetails.type.name}');">Uninstall</a>
+            </span>
+            <c:if test="${moduleDetails.expertConfig}">
+                <span name=nonexpert> 
+                    &nbsp;<a>Uninstall</a>
+                </span>
+            </c:if>
         </td>
+
+        <!-- Parents -->
         <td class="${backgroundClass}">
             <c:forEach var="parent" items="${moduleDetails.parents}">
                 ${parent} <br>
             </c:forEach>
         </td>
+
+        <!-- Children -->
         <td class="${backgroundClass}">
         <c:forEach var="child" items="${moduleDetails.children}">
             ${child} <br>
@@ -70,4 +293,11 @@
   </c:forEach>
 </table>
 
+<br />
 <p>${messageInstalled} ${messageStatus}</p>
+
+
+<script>
+// Call to set initial expert mode actions correctly 
+init();
+</script>

Modified: geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/normal.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/normal.jsp?rev=582884&r1=582837&r2=582884&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/normal.jsp (original)
+++ geronimo/server/trunk/plugins/console/console-base-portlets/src/main/webapp/WEB-INF/view/webmanager/normal.jsp Mon Oct  8 09:58:21 2007
@@ -21,19 +21,31 @@
 <table width="100%">
   <tr>
     <th width="25%" class="DarkBackground"><STRONG>Statistic</STRONG></th>
-    <th class="DarkBackground"><strong>Total</strong></th>
+    <th class="DarkBackground"><strong>Count</strong></th>
   </tr>
   <tr>
     <td align="right"  class="LightBackground"><strong>Total Request Count</strong></td>
     <td align="center" class="LightBackground">${totalRequestCount}</td>
   </tr>
   <tr>
-    <td align="right"  class="MediumBackground"><strong>Total Connection Count</strong></td>
-    <td align="center" class="MediumBackground">${totalConnectionCount}</td>
+    <td align="right"  class="MediumBackground"><strong>Total 1xx Responses</strong></td>
+    <td align="center" class="MediumBackground">${response1xx}</td>
+  </tr>
+  <tr>
+    <td align="right"  class="LightBackground"><strong>Total 2xx Responses</strong></td>
+    <td align="center" class="LightBackground">${response2xx}</td>
+  </tr>
+  <tr>
+    <td align="right"  class="MediumBackground"><strong>Total 3xx Responses</strong></td>
+    <td align="center" class="MediumBackground">${response3xx}</td>
+  </tr>
+  <tr>
+    <td align="right"  class="LightBackground"><strong>Total 4xx Responses</strong></td>
+    <td align="center" class="LightBackground">${response4xx}</td>
   </tr>
   <tr>
-    <td align="right"  class="LightBackground"><strong>Total Error Count</strong></td>
-    <td align="center" class="LightBackground">${totalErrorCount}</td>
+    <td align="right"  class="MediumBackground"><strong>Total 5xx Responses</strong></td>
+    <td align="center" class="MediumBackground">${response5xx}</td>
   </tr>
 </table>
 <table width="100%">
@@ -49,47 +61,38 @@
     <td align="center" class="LightBackground">${activeRequestCountLow}</td>
     <td align="center" class="LightBackground">${activeRequestCountHigh}</td>
   </tr>
-  <tr>
-    <td align="right"  class="MediumBackground"><strong>Connection Request Count</strong></td>
-     <td align="center" class="MediumBackground">${connectionRequestCountCurrent}</td>
-     <td align="center" class="MediumBackground">${connectionRequestCountLow}</td>
-    <td align="center" class="MediumBackground">${connectionRequestCountHigh}</td>
-  </tr>
-  <tr>
-    <td align="right"  class="LightBackground"><strong>Open Connection Count</strong></td>
-    <td align="center" class="LightBackground">${openConnectionCountCurrent}</td>
-    <td align="center" class="LightBackground">${openConnectionCountLow}</td>
-    <td align="center" class="LightBackground">${openConnectionCountHigh}</td>
-  </tr>
 </table>
 <table width="100%">
   <tr>
     <th width="25%" class="DarkBackground"> &nbsp; </th>
-    <th class="DarkBackground"><strong>Count</strong></th>
-    <th class="DarkBackground"><strong>Min Time</strong></th>
-    <th class="DarkBackground"><strong>Max Time</strong></th>
-    <th class="DarkBackground"><strong>Total Time</strong></th>
+    <th class="DarkBackground"><strong>Avg Time (ms) </strong></th>
+    <th class="DarkBackground"><strong>Min Time (ms)</strong></th>
+    <th class="DarkBackground"><strong>Max Time (ms)</strong></th>
+    <th class="DarkBackground"><strong>Total Time (ms)</strong></th>
   </tr>
   <tr>
     <td align="right"  class="LightBackground"><strong>Request Duration</strong></td>
-    <td align="center" class="LightBackground">${requestDurationCount}</td>
+    <td align="center" class="LightBackground">${requestDurationAvg}</td>
     <td align="center" class="LightBackground">${requestDurationMinTime}</td>
     <td align="center" class="LightBackground">${requestDurationMaxTime}</td>
     <td align="center" class="LightBackground">${requestDurationTotalTime}</td>
   </tr>
+  <tr><td colspan="5" align="left">&nbsp;</td></tr>
+  <tr>
+    <td colspan="5" align="left"><strong>Elapsed Time Since Collection Started (hh:mm:ss:SSS):</strong>&nbsp;${elapsedTime}</td>
+  </tr>
+  <tr><td colspan="5" align="left">&nbsp;</td></tr>
   <tr>
-    <td align="right"  class="MediumBackground"><strong>Connection Duration</strong></td>
-    <td align="center" class="MediumBackground">${connectionDurationCount}</td>
-    <td align="center" class="MediumBackground">${connectionDurationMinTime}</td>
-    <td align="center" class="MediumBackground">${connectionDurationMaxTime}</td>
-    <td align="center" class="MediumBackground">${connectionDurationTotalTime}</td>
+    <td colspan="5" align="left"> 
+      <a href="<portlet:actionURL><portlet:param name="stats" value="false"/></portlet:actionURL>">disable</a>&nbsp; 
+      <a href="<portlet:renderURL/>">refresh</a>&nbsp; 
+      <a href="<portlet:actionURL><portlet:param name="resetStats" value="true"/></portlet:actionURL>">reset</a> 
+    </td>
   </tr>
-  <tr><td colspan="5" align="left">&nbsp;&nbsp;</td></tr>
-  <tr><td colspan="5" align="left"> <a href="<portlet:renderURL/>">refresh</a>&nbsp; <a href="<portlet:actionURL><portlet:param name="stats" value="false"/></portlet:actionURL>">disable</a>&nbsp; <a href="<portlet:actionURL><portlet:param name="resetStats" value="true"/></portlet:actionURL>">reset</a> </td></tr>
 </table>
 </c:if>
 <c:if test="${!statsOn}">
-  ${statsMessage}<br/>
+  ${statsMessage}<br/><br/>
   <c:if test="${statsSupported}">
     <a href="<portlet:actionURL><portlet:param name="stats" value="true"/></portlet:actionURL>">enable</a>
   </c:if>

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=582884&r1=582837&r2=582884&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 Mon Oct  8 09:58:21 2007
@@ -257,6 +257,43 @@
         </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>
+            <param-name>portlet-name</param-name>
+            <param-value>EARModules</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+    <servlet>
+        <servlet-name>EJBModules</servlet-name>
+        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+        <init-param>
+            <param-name>portlet-name</param-name>
+            <param-value>EJBModules</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+    <servlet>
+        <servlet-name>RARModules</servlet-name>
+        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+        <init-param>
+            <param-name>portlet-name</param-name>
+            <param-value>RARModules</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+    <servlet>
+        <servlet-name>ClientModules</servlet-name>
+        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+        <init-param>
+            <param-name>portlet-name</param-name>
+            <param-value>ClientModules</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
+
     <servlet-mapping>
         <servlet-name>dwr-invoker</servlet-name>
         <url-pattern>/dwr/*</url-pattern>
@@ -364,6 +401,22 @@
     <servlet-mapping>
         <servlet-name>ImportExport</servlet-name>
         <url-pattern>/PlutoInvoker/ImportExport</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>EARModules</servlet-name>
+        <url-pattern>/PlutoInvoker/EARModules</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>EJBModules</servlet-name>
+        <url-pattern>/PlutoInvoker/EJBModules</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>RARModules</servlet-name>
+        <url-pattern>/PlutoInvoker/RARModules</url-pattern>
+    </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>ClientModules</servlet-name>
+        <url-pattern>/PlutoInvoker/ClientModules</url-pattern>
     </servlet-mapping>
 
     <security-constraint>

Modified: geronimo/server/trunk/plugins/console/console-core/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/console/console-core/pom.xml?rev=582884&r1=582837&r2=582884&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-core/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-core/pom.xml Mon Oct  8 09:58:21 2007
@@ -25,20 +25,24 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>console</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>console-core</artifactId>
-    <name>Administration Console :: Core Classes</name>
+    <name>Geronimo Plugins :: Administration Console Core Classes</name>
+    <packaging>jar</packaging>
     
     <dependencies>
         
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-connector</artifactId>
+            <version>${version}</version>
+            <scope>provided</scope>
         </dependency>
         
+        <!-- TODO: move the code that pulls in this dependency to the amq plugin -->
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-jms_1.1_spec</artifactId>
@@ -47,26 +51,32 @@
         <dependency>
             <groupId>javax.portlet</groupId>
             <artifactId>portlet-api</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>commons-fileupload</groupId>
             <artifactId>commons-fileupload</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-deploy-jsr88</artifactId>
+            <version>${version}</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_2.5_spec</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.directwebremoting</groupId>
             <artifactId>dwr</artifactId>
+            <scope>provided</scope>
         </dependency>
         
     </dependencies>

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=582884&r1=582837&r2=582884&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-ear/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-ear/pom.xml Mon Oct  8 09:58:21 2007
@@ -25,12 +25,12 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>console</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
     <artifactId>console-ear</artifactId>
-    <name>Administration Console :: EAR</name>
+    <name>Geronimo Plugins :: Administration Console EAR</name>
     <packaging>ear</packaging>
     
     <dependencies>

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=582884&r1=582837&r2=582884&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/console/console-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/console/console-jetty/pom.xml Mon Oct  8 09:58:21 2007
@@ -25,13 +25,12 @@
     <parent>
         <groupId>org.apache.geronimo.plugins</groupId>
         <artifactId>console</artifactId>
-        <version>1.0-SNAPSHOT</version>
+        <version>2.1-SNAPSHOT</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <groupId>org.apache.geronimo.plugins</groupId>
     <artifactId>console-jetty</artifactId>
-    <name>Administration Console :: Jetty plugin</name>
+    <name>Geronimo Plugins :: Administration Console - Jetty</name>
     <packaging>car</packaging>
 
     <dependencies>
@@ -47,32 +46,56 @@
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>pluto-support</artifactId>
-            <version>1.0-SNAPSHOT</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>geronimo-gbean-deployer</artifactId>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
 	<dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-deploy-jsr88</artifactId>
+            <version>${version}</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-security</artifactId>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-io</groupId>
+            <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>
+
         <!-- for jspc. why is this needed? -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jasper</artifactId>
-            <version>${geronimoVersion}</version>
+            <version>${version}</version>
             <type>car</type>
         </dependency>
 
@@ -105,9 +128,6 @@
                     </module>
                     <category>Administration</category>
                     <osiApproved>true</osiApproved>
-                    <geronimoVersions>
-                        <value>2.1-SNAPSHOT</value>
-                    </geronimoVersions>
                     <useMavenDependencies>
                         <value>true</value>
                         <includeVersion>true</includeVersion>
@@ -124,8 +144,6 @@
                                     This version of the plugin works with the Geronimo/Jetty distribution.
                                 </description>
                             </prerequisite>
-                            <source-repository>http://people.apache.org/repo/m2-snapshot-repository/</source-repository>
-                            <source-repository>http://repo1.maven.org/maven2/</source-repository>
                         </plugin-artifact>
                     </instance>
                 </configuration>



Mime
View raw message