geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r1145514 - in /geronimo/server/trunk: plugingroups/console-tomcat/ plugingroups/javaee6-tomcat/ plugingroups/javaee6-web-tomcat/ plugins/monitoring/ plugins/monitoring/agent-car-ejb/ plugins/monitoring/agent-car-ejb/src/main/plan/ plugins/m...
Date Tue, 12 Jul 2011 09:52:06 GMT
Author: genspring
Date: Tue Jul 12 09:52:05 2011
New Revision: 1145514

URL: http://svn.apache.org/viewvc?rev=1145514&view=rev
Log:
GERONIMO-5599 Reenable monitoring admin console portlets, Patch from Shenghao Fang.

Added:
    geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/ejb/
    geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/ejb/MasterRemoteControl.java
  (contents, props changed)
      - copied, changed from r1145439, geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/MasterRemoteControl.java
    geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/ejb/MasterRemoteControlLocal.java
      - copied, changed from r1145439, geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/MasterRemoteControlLocal.java
    geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/ejb/MasterRemoteControlRemote.java
      - copied, changed from r1145439, geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/MasterRemoteControlRemote.java
    geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/ejb/snapshot/
    geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/ejb/snapshot/SnapshotProcessor.java
      - copied, changed from r1145439, geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/snapshot/SnapshotProcessor.java
    geronimo/server/trunk/plugins/monitoring/agent-sql/src/main/resources/
    geronimo/server/trunk/plugins/monitoring/agent-sql/src/main/resources/org/
    geronimo/server/trunk/plugins/monitoring/agent-sql/src/main/resources/org/apache/
    geronimo/server/trunk/plugins/monitoring/agent-sql/src/main/resources/org/apache/geronimo/
    geronimo/server/trunk/plugins/monitoring/agent-sql/src/main/resources/org/apache/geronimo/monitoring/
    geronimo/server/trunk/plugins/monitoring/agent-sql/src/main/resources/org/apache/geronimo/monitoring/sql/
    geronimo/server/trunk/plugins/monitoring/agent-sql/src/main/resources/org/apache/geronimo/monitoring/sql/createTables.sql
      - copied, changed from r1145439, geronimo/server/trunk/plugins/monitoring/agent-sql/src/main/database/derby/createTables.sql
Removed:
    geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/MasterRemoteControl.java
    geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/MasterRemoteControlLocal.java
    geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/MasterRemoteControlRemote.java
    geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/snapshot/SnapshotProcessor.java
    geronimo/server/trunk/plugins/monitoring/agent-sql/src/main/database/derby/createTables.sql
    geronimo/server/trunk/plugins/monitoring/readme.txt
Modified:
    geronimo/server/trunk/plugingroups/console-tomcat/pom.xml
    geronimo/server/trunk/plugingroups/javaee6-tomcat/pom.xml
    geronimo/server/trunk/plugingroups/javaee6-web-tomcat/pom.xml
    geronimo/server/trunk/plugins/monitoring/agent-car-ejb/pom.xml
    geronimo/server/trunk/plugins/monitoring/agent-car-ejb/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/monitoring/agent-car-jmx/pom.xml
    geronimo/server/trunk/plugins/monitoring/agent-ds/pom.xml
    geronimo/server/trunk/plugins/monitoring/agent-ds/src/main/plan/plan.xml
    geronimo/server/trunk/plugins/monitoring/agent-jmx/pom.xml
    geronimo/server/trunk/plugins/monitoring/agent-jmx/src/main/java/org/apache/geronimo/monitoring/jmx/MasterRemoteControlJMX.java
    geronimo/server/trunk/plugins/monitoring/agent-sql/pom.xml
    geronimo/server/trunk/plugins/monitoring/mconsole-jetty/pom.xml
    geronimo/server/trunk/plugins/monitoring/mconsole-jetty/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/pom.xml
    geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/monitoring/mconsole-war/pom.xml
    geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MRCConnector.java
    geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/web.xml

Modified: geronimo/server/trunk/plugingroups/console-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/console-tomcat/pom.xml?rev=1145514&r1=1145513&r2=1145514&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/console-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/console-tomcat/pom.xml Tue Jul 12 09:52:05 2011
@@ -66,12 +66,12 @@
             <!--<type>car</type>-->
         <!--</dependency>-->
 
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.plugins.monitoring</groupId>-->
-            <!--<artifactId>mconsole-tomcat</artifactId>-->
-            <!--<version>${project.version}</version>-->
-            <!--<type>car</type>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>org.apache.geronimo.plugins.monitoring</groupId>
+            <artifactId>mconsole-tomcat</artifactId>
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>

Modified: geronimo/server/trunk/plugingroups/javaee6-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/javaee6-tomcat/pom.xml?rev=1145514&r1=1145513&r2=1145514&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/javaee6-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/javaee6-tomcat/pom.xml Tue Jul 12 09:52:05 2011
@@ -95,19 +95,19 @@
             <type>car</type>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.plugins.monitoring</groupId>-->
-            <!--<artifactId>agent-car-ejb</artifactId>-->
-            <!--<version>${project.version}</version>-->
-            <!--<type>car</type>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>org.apache.geronimo.plugins.monitoring</groupId>
+            <artifactId>agent-car-ejb</artifactId>
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>
         
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.plugins.monitoring</groupId>-->
-            <!--<artifactId>agent-car-jmx</artifactId>-->
-            <!--<version>${project.version}</version>-->
-            <!--<type>car</type>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>org.apache.geronimo.plugins.monitoring</groupId>
+            <artifactId>agent-car-jmx</artifactId>
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>
         
         
         

Modified: geronimo/server/trunk/plugingroups/javaee6-web-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/javaee6-web-tomcat/pom.xml?rev=1145514&r1=1145513&r2=1145514&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/javaee6-web-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/javaee6-web-tomcat/pom.xml Tue Jul 12 09:52:05 2011
@@ -95,19 +95,19 @@
             <type>car</type>
         </dependency>
 
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.plugins.monitoring</groupId>-->
-            <!--<artifactId>agent-car-ejb</artifactId>-->
-            <!--<version>${project.version}</version>-->
-            <!--<type>car</type>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>org.apache.geronimo.plugins.monitoring</groupId>
+            <artifactId>agent-car-ejb</artifactId>
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>
         
-        <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.plugins.monitoring</groupId>-->
-            <!--<artifactId>agent-car-jmx</artifactId>-->
-            <!--<version>${project.version}</version>-->
-            <!--<type>car</type>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>org.apache.geronimo.plugins.monitoring</groupId>
+            <artifactId>agent-car-jmx</artifactId>
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>

Modified: geronimo/server/trunk/plugins/monitoring/agent-car-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/agent-car-ejb/pom.xml?rev=1145514&r1=1145513&r2=1145514&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/agent-car-ejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/agent-car-ejb/pom.xml Tue Jul 12 09:52:05 2011
@@ -44,14 +44,14 @@
         <dependency>
             <groupId>org.apache.geronimo.plugins.monitoring</groupId>
             <artifactId>agent-ds</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.plugins.monitoring</groupId>
             <artifactId>agent-ejb</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <type>jar</type>
             <scope>provided</scope>
         </dependency>
@@ -66,7 +66,7 @@
         <dependency>
             <groupId>org.apache.geronimo.plugins.monitoring</groupId>
             <artifactId>agent-jar</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 

Modified: geronimo/server/trunk/plugins/monitoring/agent-car-ejb/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/agent-car-ejb/src/main/plan/plan.xml?rev=1145514&r1=1145513&r2=1145514&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/agent-car-ejb/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/agent-car-ejb/src/main/plan/plan.xml Tue Jul
12 09:52:05 2011
@@ -25,6 +25,11 @@
         xmlns:nam="http://geronimo.apache.org/xml/ns/naming-1.2"
         xmlns:cs="http://geronimo.apache.org/xml/ns/credentialstore-1.0">
 
+    <environment>
+        <export-package>
+            org.apache.geronimo.monitoring.ejb
+        </export-package>
+    </environment>
 
     <enterprise-beans>
         <session>

Modified: geronimo/server/trunk/plugins/monitoring/agent-car-jmx/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/agent-car-jmx/pom.xml?rev=1145514&r1=1145513&r2=1145514&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/agent-car-jmx/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/agent-car-jmx/pom.xml Tue Jul 12 09:52:05 2011
@@ -36,21 +36,21 @@
         <dependency>
             <groupId>org.apache.geronimo.plugins.monitoring</groupId>
             <artifactId>agent-jmx</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <type>jar</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.plugins.monitoring</groupId>
             <artifactId>agent-jar</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <type>jar</type>
         </dependency>
     
         <dependency>
             <groupId>org.apache.geronimo.plugins.monitoring</groupId>
             <artifactId>agent-ds</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
     </dependencies>

Modified: geronimo/server/trunk/plugins/monitoring/agent-ds/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/agent-ds/pom.xml?rev=1145514&r1=1145513&r2=1145514&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/agent-ds/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/agent-ds/pom.xml Tue Jul 12 09:52:05 2011
@@ -58,7 +58,7 @@
         <dependency>
             <groupId>org.apache.geronimo.plugins.monitoring</groupId>
             <artifactId>agent-sql</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 

Modified: geronimo/server/trunk/plugins/monitoring/agent-ds/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/agent-ds/src/main/plan/plan.xml?rev=1145514&r1=1145513&r2=1145514&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/agent-ds/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/agent-ds/src/main/plan/plan.xml Tue Jul 12 09:52:05
2011
@@ -66,14 +66,14 @@
     <!-- These two GBeans will create the tables for the database automatically -->
     <gbean name="ActiveDSGBean" class="org.apache.geronimo.connector.wrapper.DatabaseInitializationGBean">
         <attribute name="testSQL">SELECT t.tablename FROM SYS.SYSTABLES t WHERE lower(t.tablename)='statistics'</attribute>
-        <attribute name="path">META-INF/database/derby/createTables.sql</attribute>
+        <attribute name="path">org/apache/geronimo/monitoring/sql/createTables.sql</attribute>
         <reference name="DataSource">
             <name>jdbc/ActiveDS</name>
         </reference>
     </gbean>
     <gbean name="ArchiveDSGBean" class="org.apache.geronimo.connector.wrapper.DatabaseInitializationGBean">
         <attribute name="testSQL">SELECT t.tablename FROM SYS.SYSTABLES t WHERE lower(t.tablename)='statistics'</attribute>
-        <attribute name="path">META-INF/database/derby/createTables.sql</attribute>
+        <attribute name="path">org/apache/geronimo/monitoring/sql/createTables.sql</attribute>
         <reference name="DataSource">
             <name>jdbc/ArchiveDS</name>
         </reference>

Copied: geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/ejb/MasterRemoteControl.java
(from r1145439, geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/MasterRemoteControl.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/ejb/MasterRemoteControl.java?p2=geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/ejb/MasterRemoteControl.java&p1=geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/MasterRemoteControl.java&r1=1145439&r2=1145514&rev=1145514&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/MasterRemoteControl.java
(original)
+++ geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/ejb/MasterRemoteControl.java
Tue Jul 12 09:52:05 2011
@@ -14,7 +14,8 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.monitoring;
+
+package org.apache.geronimo.monitoring.ejb;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -49,9 +50,11 @@ import javax.management.j2ee.statistics.
 import javax.naming.NamingException;
 import javax.sql.DataSource;
 
+import org.apache.geronimo.monitoring.MonitorConstants;
+import org.apache.geronimo.monitoring.MBeanHelper;
 import org.apache.geronimo.monitoring.snapshot.SnapshotConfigXMLBuilder;
 import org.apache.geronimo.monitoring.snapshot.SnapshotDBHelper;
-import org.apache.geronimo.monitoring.snapshot.SnapshotProcessor;
+import org.apache.geronimo.monitoring.ejb.snapshot.SnapshotProcessor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Propchange: geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/ejb/MasterRemoteControl.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/ejb/MasterRemoteControl.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/ejb/MasterRemoteControl.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Copied: geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/ejb/MasterRemoteControlLocal.java
(from r1145439, geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/MasterRemoteControlLocal.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/ejb/MasterRemoteControlLocal.java?p2=geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/ejb/MasterRemoteControlLocal.java&p1=geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/MasterRemoteControlLocal.java&r1=1145439&r2=1145514&rev=1145514&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/MasterRemoteControlLocal.java
(original)
+++ geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/ejb/MasterRemoteControlLocal.java
Tue Jul 12 09:52:05 2011
@@ -1,5 +1,3 @@
-package org.apache.geronimo.monitoring;
-
 /**
  *  Licensed to the Apache Software Foundation (ASF) under one or more
  *  contributor license agreements.  See the NOTICE file distributed with
@@ -17,6 +15,8 @@ package org.apache.geronimo.monitoring;
  *  limitations under the License.
  */
 
+package org.apache.geronimo.monitoring.ejb;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Set;

Copied: geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/ejb/MasterRemoteControlRemote.java
(from r1145439, geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/MasterRemoteControlRemote.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/ejb/MasterRemoteControlRemote.java?p2=geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/ejb/MasterRemoteControlRemote.java&p1=geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/MasterRemoteControlRemote.java&r1=1145439&r2=1145514&rev=1145514&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/MasterRemoteControlRemote.java
(original)
+++ geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/ejb/MasterRemoteControlRemote.java
Tue Jul 12 09:52:05 2011
@@ -1,5 +1,3 @@
-package org.apache.geronimo.monitoring;
-
 /**
  *  Licensed to the Apache Software Foundation (ASF) under one or more
  *  contributor license agreements.  See the NOTICE file distributed with
@@ -17,6 +15,8 @@ package org.apache.geronimo.monitoring;
  *  limitations under the License.
  */
 
+package org.apache.geronimo.monitoring.ejb;
+
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Set;

Copied: geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/ejb/snapshot/SnapshotProcessor.java
(from r1145439, geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/snapshot/SnapshotProcessor.java)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/ejb/snapshot/SnapshotProcessor.java?p2=geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/ejb/snapshot/SnapshotProcessor.java&p1=geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/snapshot/SnapshotProcessor.java&r1=1145439&r2=1145514&rev=1145514&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/snapshot/SnapshotProcessor.java
(original)
+++ geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/java/org/apache/geronimo/monitoring/ejb/snapshot/SnapshotProcessor.java
Tue Jul 12 09:52:05 2011
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.monitoring.snapshot;
+package org.apache.geronimo.monitoring.ejb.snapshot;
 
 import java.io.File;
 import java.lang.reflect.UndeclaredThrowableException;
@@ -26,7 +26,10 @@ import javax.management.ObjectName;
 
 import org.apache.geronimo.kernel.NoSuchOperationException;
 import org.apache.geronimo.monitoring.MBeanHelper;
-import org.apache.geronimo.monitoring.MasterRemoteControl;
+import org.apache.geronimo.monitoring.ejb.MasterRemoteControl;
+import org.apache.geronimo.monitoring.snapshot.SnapshotConfigXMLBuilder;
+import org.apache.geronimo.monitoring.snapshot.SnapshotDBHelper;
+
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

Modified: geronimo/server/trunk/plugins/monitoring/agent-jmx/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/agent-jmx/pom.xml?rev=1145514&r1=1145513&r2=1145514&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/agent-jmx/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/agent-jmx/pom.xml Tue Jul 12 09:52:05 2011
@@ -63,6 +63,14 @@
             <version>${project.version}</version>
             <type>car</type>
         </dependency>
+        
+        <dependency>
+            <groupId>org.tranql</groupId>
+            <artifactId>tranql-connector</artifactId>
+            <version>1.6</version>
+            <scope>provided</scope>
+        </dependency>
+        
     </dependencies>
 </project>
 

Modified: geronimo/server/trunk/plugins/monitoring/agent-jmx/src/main/java/org/apache/geronimo/monitoring/jmx/MasterRemoteControlJMX.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/agent-jmx/src/main/java/org/apache/geronimo/monitoring/jmx/MasterRemoteControlJMX.java?rev=1145514&r1=1145513&r2=1145514&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/agent-jmx/src/main/java/org/apache/geronimo/monitoring/jmx/MasterRemoteControlJMX.java
(original)
+++ geronimo/server/trunk/plugins/monitoring/agent-jmx/src/main/java/org/apache/geronimo/monitoring/jmx/MasterRemoteControlJMX.java
Tue Jul 12 09:52:05 2011
@@ -91,8 +91,8 @@ public class MasterRemoteControlJMX impl
         // Note: do not put this in the constructor...datasources are not injected by then
         try {
             InitialContext ic = new InitialContext();
-            activeDS = (DataSource)ic.lookup("jca:/org.apache.geronimo.plugins.monitoring/agent-ds/JCAManagedConnectionFactory/jdbc/ActiveDS");
-            archiveDS = (DataSource)ic.lookup("jca:/org.apache.geronimo.plugins.monitoring/agent-ds/JCAManagedConnectionFactory/jdbc/ArchiveDS");
+            activeDS = (DataSource)ic.lookup("jca:/org.apache.geronimo.plugins.monitoring/agent-ds/JCAConnectionManager/jdbc/ActiveDS");
+            archiveDS = (DataSource)ic.lookup("jca:/org.apache.geronimo.plugins.monitoring/agent-ds/JCAConnectionManager/jdbc/ArchiveDS");
         } catch(Exception e) {
             log.error(e.getMessage());
         }

Modified: geronimo/server/trunk/plugins/monitoring/agent-sql/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/agent-sql/pom.xml?rev=1145514&r1=1145513&r2=1145514&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/agent-sql/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/agent-sql/pom.xml Tue Jul 12 09:52:05 2011
@@ -30,19 +30,24 @@
     
     <artifactId>agent-sql</artifactId>
     <name>Geronimo Plugins, Monitoring :: Agent SQL</name>
-
+    <packaging>bundle</packaging>
+    
     <description>
        This module carries the Monitoring's SQL scripts for all databases.
     </description>
     
     <build>
-        <resources>
-            <resource>
-                <directory>${pom.basedir}/src/main</directory>
-                <targetPath>META-INF</targetPath>
-                <!-- <filtering>true</filtering> -->
-            </resource>
-        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <configuration>
+                    <instructions>
+                        <Export-Package>org.apache.geronimo.monitoring.sql</Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
     </build>
-
+    
 </project>
\ No newline at end of file

Copied: geronimo/server/trunk/plugins/monitoring/agent-sql/src/main/resources/org/apache/geronimo/monitoring/sql/createTables.sql
(from r1145439, geronimo/server/trunk/plugins/monitoring/agent-sql/src/main/database/derby/createTables.sql)
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/agent-sql/src/main/resources/org/apache/geronimo/monitoring/sql/createTables.sql?p2=geronimo/server/trunk/plugins/monitoring/agent-sql/src/main/resources/org/apache/geronimo/monitoring/sql/createTables.sql&p1=geronimo/server/trunk/plugins/monitoring/agent-sql/src/main/database/derby/createTables.sql&r1=1145439&r2=1145514&rev=1145514&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/agent-sql/src/main/database/derby/createTables.sql
(original)
+++ geronimo/server/trunk/plugins/monitoring/agent-sql/src/main/resources/org/apache/geronimo/monitoring/sql/createTables.sql
Tue Jul 12 09:52:05 2011
@@ -35,4 +35,4 @@ CREATE TABLE Statistics (
     statsValueList VARCHAR(512) NOT NULL,
     PRIMARY KEY(id),
     FOREIGN KEY (mbeanId) REFERENCES MBeans(id)
-);
\ No newline at end of file
+);

Modified: geronimo/server/trunk/plugins/monitoring/mconsole-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-jetty/pom.xml?rev=1145514&r1=1145513&r2=1145514&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-jetty/pom.xml Tue Jul 12 09:52:05 2011
@@ -67,28 +67,28 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>console-jetty</artifactId>
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.plugins.monitoring</groupId>
             <artifactId>mconsole-ds</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.plugins.monitoring</groupId>
             <artifactId>mconsole-war</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <type>war</type>
             <scope>provided</scope>
         </dependency>
-	
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>dojo-jetty</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>
 
         <!-- see if openejb-client can be used -->
         <dependency>
@@ -131,7 +131,7 @@
                     <module>
                         <groupId>org.apache.geronimo.plugins.monitoring</groupId>
                         <artifactId>mconsole-war</artifactId>
-                        <version>${pom.version}</version>
+                        <version>${project.version}</version>
                         <type>war</type>
                     </module>
                     <category>Administration Monitoring</category>

Modified: geronimo/server/trunk/plugins/monitoring/mconsole-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-jetty/src/main/history/dependencies.xml?rev=1145514&r1=1145513&r2=1145514&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-jetty/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-jetty/src/main/history/dependencies.xml
Tue Jul 12 09:52:05 2011
@@ -8,11 +8,6 @@
     </module-id>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>dojo-jetty</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>openejb</artifactId>
         <type>car</type>
     </dependency>

Modified: geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/pom.xml?rev=1145514&r1=1145513&r2=1145514&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/pom.xml Tue Jul 12 09:52:05 2011
@@ -67,11 +67,18 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.plugins</groupId>
+            <artifactId>console-tomcat</artifactId>
+            <version>${project.version}</version>
+            <type>car</type>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.plugins.monitoring</groupId>
             <artifactId>mconsole-ds</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <type>car</type>
         </dependency>
 
@@ -79,7 +86,7 @@
         <dependency>
             <groupId>org.apache.geronimo.plugins.monitoring</groupId>
             <artifactId>mconsole-war</artifactId>
-            <version>${pom.version}</version>
+            <version>${project.version}</version>
             <type>war</type>
             <scope>provided</scope>
         </dependency>
@@ -90,14 +97,7 @@
             <version>${project.version}</version>
             <type>car</type>
         </dependency>
-		
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>dojo-tomcat</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
-        </dependency>
-        
+
         <!-- see if openejb-client can be used -->
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
@@ -139,10 +139,11 @@
                     <module>
                         <groupId>org.apache.geronimo.plugins.monitoring</groupId>
                         <artifactId>mconsole-war</artifactId>
-                        <version>${pom.version}</version>
+                        <version>${project.version}</version>
                         <type>war</type>
                     </module>
                     <category>Administration Monitoring</category>
+                    <osiApproved>true</osiApproved>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/src/main/history/dependencies.xml?rev=1145514&r1=1145513&r2=1145514&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/src/main/history/dependencies.xml
Tue Jul 12 09:52:05 2011
@@ -8,11 +8,6 @@
     </module-id>
     <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
-        <artifactId>dojo-tomcat</artifactId>
-        <type>car</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>openejb</artifactId>
         <type>car</type>
     </dependency>

Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/pom.xml?rev=1145514&r1=1145513&r2=1145514&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/pom.xml Tue Jul 12 09:52:05 2011
@@ -40,6 +40,7 @@
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>console-filter</artifactId>
             <version>${project.version}</version>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
@@ -64,8 +65,15 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-servlet_3.0_spec</artifactId>
+            <scope>provided</scope>
         </dependency>
-
+        
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jpa_2.0_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>console-core</artifactId>
@@ -77,7 +85,6 @@
             <groupId>org.apache.geronimo.plugins.monitoring</groupId>
             <artifactId>agent-ejb</artifactId>
             <version>${project.version}</version>
-            <type>jar</type>
             <scope>provided</scope>
         </dependency>
 
@@ -90,10 +97,8 @@
 
         <!-- for jspc maven plugin -->
         <dependency>
-            <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>pluto-support</artifactId>
-            <version>${project.version}</version>
-            <type>car</type>
+            <groupId>org.apache.portals.pluto</groupId>
+            <artifactId>pluto-taglib</artifactId>
             <scope>provided</scope>
         </dependency>
     </dependencies>

Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MRCConnector.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MRCConnector.java?rev=1145514&r1=1145513&r2=1145514&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MRCConnector.java
(original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MRCConnector.java
Tue Jul 12 09:52:05 2011
@@ -42,7 +42,7 @@ import javax.naming.InitialContext;
 
 import org.apache.geronimo.console.util.PortletManager;
 import org.apache.geronimo.crypto.EncryptionManager;
-import org.apache.geronimo.monitoring.MasterRemoteControlRemote;
+import org.apache.geronimo.monitoring.ejb.MasterRemoteControlRemote;
 import org.apache.geronimo.monitoring.console.data.Node;
 import org.apache.geronimo.system.jmx.RealMBeanServerReference;
 

Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/web.xml?rev=1145514&r1=1145513&r2=1145514&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/web.xml
(original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/web.xml
Tue Jul 12 09:52:05 2011
@@ -49,7 +49,7 @@
 
     <servlet>
         <servlet-name>monitoring</servlet-name>
-        <servlet-class>org.apache.pluto.core.PortletServlet</servlet-class>
+        <servlet-class>org.apache.pluto.container.driver.PortletServlet</servlet-class>
         <init-param>
             <param-name>portlet-name</param-name>
             <param-value>monitoring</param-value>



Mime
View raw message