You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by dj...@apache.org on 2008/05/15 11:19:17 UTC
svn commit: r656565 - in /geronimo/server/trunk/plugins/monitoring: ./
agent-ear/ agent-ejb/src/main/resources/META-INF/
agent-jmx/src/main/java/org/apache/geronimo/monitoring/ agent/
agent/src/main/plan/ mconsole-ear/ mconsole-jetty/ mconsole-jetty/sr...
Author: djencks
Date: Thu May 15 02:19:17 2008
New Revision: 656565
URL: http://svn.apache.org/viewvc?rev=656565&view=rev
Log:
GERONIMO-4014 clean up monitoring plugin a little bit.
Removed:
geronimo/server/trunk/plugins/monitoring/agent-ear/
geronimo/server/trunk/plugins/monitoring/agent-ejb/src/main/resources/META-INF/openejb-jar.xml
geronimo/server/trunk/plugins/monitoring/mconsole-ear/
geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/geronimo-web.xml
Modified:
geronimo/server/trunk/plugins/monitoring/agent-jmx/src/main/java/org/apache/geronimo/monitoring/MasterRemoteControlJMX.java
geronimo/server/trunk/plugins/monitoring/agent/pom.xml
geronimo/server/trunk/plugins/monitoring/agent/src/main/plan/plan.xml
geronimo/server/trunk/plugins/monitoring/mconsole-jetty/pom.xml
geronimo/server/trunk/plugins/monitoring/mconsole-jetty/src/main/plan/plan.xml
geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/pom.xml
geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/src/main/plan/plan.xml
geronimo/server/trunk/plugins/monitoring/pom.xml
Modified: geronimo/server/trunk/plugins/monitoring/agent-jmx/src/main/java/org/apache/geronimo/monitoring/MasterRemoteControlJMX.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/agent-jmx/src/main/java/org/apache/geronimo/monitoring/MasterRemoteControlJMX.java?rev=656565&r1=656564&r2=656565&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/agent-jmx/src/main/java/org/apache/geronimo/monitoring/MasterRemoteControlJMX.java (original)
+++ geronimo/server/trunk/plugins/monitoring/agent-jmx/src/main/java/org/apache/geronimo/monitoring/MasterRemoteControlJMX.java Thu May 15 02:19:17 2008
@@ -101,8 +101,8 @@
// Note: do not put this in the constructor...datasources are not injected by then
try {
InitialContext ic = new InitialContext();
- activeDS = (DataSource)((ManagedConnectionFactoryWrapper)ic.lookup("jca:/org.apache.geronimo.plugins/agent-ds/JCAManagedConnectionFactory/jdbc/ActiveDS")).$getResource();
- archiveDS = (DataSource)((ManagedConnectionFactoryWrapper)ic.lookup("jca:/org.apache.geronimo.plugins/agent-ds/JCAManagedConnectionFactory/jdbc/ArchiveDS")).$getResource();
+ activeDS = (DataSource)ic.lookup("jca:/org.apache.geronimo.plugins/agent-ds/JCAManagedConnectionFactory/jdbc/ActiveDS");
+ archiveDS = (DataSource)ic.lookup("jca:/org.apache.geronimo.plugins/agent-ds/JCAManagedConnectionFactory/jdbc/ArchiveDS");
} catch(Exception e) {
log.error(e.getMessage());
e.printStackTrace();
Modified: geronimo/server/trunk/plugins/monitoring/agent/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/agent/pom.xml?rev=656565&r1=656564&r2=656565&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/agent/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/agent/pom.xml Thu May 15 02:19:17 2008
@@ -53,9 +53,10 @@
<dependency>
<groupId>org.apache.geronimo.plugins.monitoring</groupId>
- <artifactId>agent-ear</artifactId>
+ <artifactId>agent-ejb</artifactId>
<version>${monitoringConsoleVersion}</version>
- <type>ear</type>
+ <type>jar</type>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -64,6 +65,12 @@
<version>${version}</version>
<type>car</type>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.plugins.monitoring</groupId>
+ <artifactId>agent-jar</artifactId>
+ <version>${monitoringConsoleVersion}</version>
+ </dependency>
</dependencies>
<build>
@@ -79,8 +86,8 @@
</deploymentConfigs>
<module>
<groupId>org.apache.geronimo.plugins.monitoring</groupId>
- <artifactId>agent-ear</artifactId>
- <type>ear</type>
+ <artifactId>agent-ejb</artifactId>
+ <type>jar</type>
</module>
<category>Monitoring</category>
<osiApproved>true</osiApproved>
Modified: geronimo/server/trunk/plugins/monitoring/agent/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/agent/src/main/plan/plan.xml?rev=656565&r1=656564&r2=656565&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/agent/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/agent/src/main/plan/plan.xml Thu May 15 02:19:17 2008
@@ -18,5 +18,32 @@
<!-- $Rev$ $Date$ -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
-</application>
+<openejb-jar
+ xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1"
+ xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0"
+ xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-2.0">
+
+
+ <enterprise-beans>
+ <session>
+ <ejb-name>ejb/mgmt/MRC</ejb-name>
+ <jndi-name>ejb/mgmt/MRC</jndi-name>
+ </session>
+ </enterprise-beans>
+
+ <sec:security>
+ <sec:role-mappings>
+ <sec:role role-name="mejbuser">
+ <sec:principal name="admin"
+ class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal"/>
+ <sec:principal name="mejb-admin"
+ class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal"/>
+ </sec:role>
+
+ <sec:role role-name="mejbadmin">
+ <sec:principal name="mejb-admin"
+ class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal"/>
+ </sec:role>
+ </sec:role-mappings>
+ </sec:security>
+</openejb-jar>
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=656565&r1=656564&r2=656565&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-jetty/pom.xml Thu May 15 02:19:17 2008
@@ -76,9 +76,10 @@
<dependency>
<groupId>org.apache.geronimo.plugins.monitoring</groupId>
- <artifactId>mconsole-ear</artifactId>
+ <artifactId>mconsole-war</artifactId>
<version>${monitoringConsoleVersion}</version>
- <type>ear</type>
+ <type>war</type>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -111,9 +112,9 @@
</deploymentConfigs>
<module>
<groupId>org.apache.geronimo.plugins.monitoring</groupId>
- <artifactId>mconsole-ear</artifactId>
+ <artifactId>mconsole-war</artifactId>
<version>${monitoringConsoleVersion}</version>
- <type>ear</type>
+ <type>war</type>
</module>
<category>Monitoring</category>
</configuration>
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-jetty/src/main/plan/plan.xml?rev=656565&r1=656564&r2=656565&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-jetty/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-jetty/src/main/plan/plan.xml Thu May 15 02:19:17 2008
@@ -18,5 +18,25 @@
<!-- $Rev: 590502 $ $Date: 2007-10-30 18:59:24 -0400 (Tue, 30 Oct 2007) $ -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
-</application>
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2">
+
+ <context-root>/monitoring</context-root>
+ <!-- define a reference name to the db pool-->
+ <!--<resource-ref>-->
+ <!--<ref-name>MonitoringClientDS</ref-name>-->
+ <!--<pattern>-->
+ <!--<groupId>org.apache.geronimo.plugins</groupId>-->
+ <!--<artifactId>mconsole-ds</artifactId>-->
+ <!--<name>MonitoringClientDS</name>-->
+ <!--</pattern>-->
+ <!--</resource-ref>-->
+ <gbean name="MonitoringPortlet" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+ <attribute name="pageTitle">Server/Monitoring</attribute>
+ <attribute name="portletContext">/monitoring</attribute>
+ <attribute name="portletList">[monitoring]</attribute>
+ <reference name="PortalContainerServices">
+ <name>PlutoPortalServices</name>
+ </reference>
+ </gbean>
+
+</web-app>
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=656565&r1=656564&r2=656565&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/pom.xml Thu May 15 02:19:17 2008
@@ -76,9 +76,10 @@
<dependency>
<groupId>org.apache.geronimo.plugins.monitoring</groupId>
- <artifactId>mconsole-ear</artifactId>
+ <artifactId>mconsole-war</artifactId>
<version>${monitoringConsoleVersion}</version>
- <type>ear</type>
+ <type>war</type>
+ <scope>provided</scope>
</dependency>
<dependency>
@@ -119,9 +120,9 @@
</deploymentConfigs>
<module>
<groupId>org.apache.geronimo.plugins.monitoring</groupId>
- <artifactId>mconsole-ear</artifactId>
+ <artifactId>mconsole-war</artifactId>
<version>${monitoringConsoleVersion}</version>
- <type>ear</type>
+ <type>war</type>
</module>
<category>Monitoring</category>
</configuration>
Modified: geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/src/main/plan/plan.xml?rev=656565&r1=656564&r2=656565&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-tomcat/src/main/plan/plan.xml Thu May 15 02:19:17 2008
@@ -18,5 +18,25 @@
<!-- $Rev: 590502 $ $Date: 2007-10-30 18:59:24 -0400 (Tue, 30 Oct 2007) $ -->
-<application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
-</application>
+<web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2">
+
+ <context-root>/monitoring</context-root>
+ <!-- define a reference name to the db pool-->
+ <!--<resource-ref>-->
+ <!--<ref-name>MonitoringClientDS</ref-name>-->
+ <!--<pattern>-->
+ <!--<groupId>org.apache.geronimo.plugins</groupId>-->
+ <!--<artifactId>mconsole-ds</artifactId>-->
+ <!--<name>MonitoringClientDS</name>-->
+ <!--</pattern>-->
+ <!--</resource-ref>-->
+ <gbean name="MonitoringPortlet" class="org.apache.geronimo.pluto.AdminConsoleExtensionGBean">
+ <attribute name="pageTitle">Server/Monitoring</attribute>
+ <attribute name="portletContext">/monitoring</attribute>
+ <attribute name="portletList">[monitoring]</attribute>
+ <reference name="PortalContainerServices">
+ <name>PlutoPortalServices</name>
+ </reference>
+ </gbean>
+
+</web-app>
Modified: geronimo/server/trunk/plugins/monitoring/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/pom.xml?rev=656565&r1=656564&r2=656565&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/pom.xml Thu May 15 02:19:17 2008
@@ -49,13 +49,11 @@
<module>agent</module>
<module>agent-ds</module>
<module>agent-jar</module>
- <module>agent-ear</module>
<module>agent-ejb</module>
- <module>agent-jmx</module>
+ <module>agent-jmx</module>
<module>agent-car-jmx</module>
<module>agent-sql</module>
<module>mconsole-ds</module>
- <module>mconsole-ear</module>
<module>mconsole-jetty</module>
<module>mconsole-tomcat</module>
<module>mconsole-war</module>