geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r656740 - in /geronimo/server/branches/2.1/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-j...
Date Thu, 15 May 2008 17:09:20 GMT
Author: djencks
Date: Thu May 15 10:09:19 2008
New Revision: 656740

URL: http://svn.apache.org/viewvc?rev=656740&view=rev
Log:
GERONIMO-4014 port of monitoring console simplifications from trunk

Removed:
    geronimo/server/branches/2.1/plugins/monitoring/agent-ear/
    geronimo/server/branches/2.1/plugins/monitoring/agent-ejb/src/main/resources/META-INF/openejb-jar.xml
    geronimo/server/branches/2.1/plugins/monitoring/mconsole-ear/
    geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/geronimo-web.xml
Modified:
    geronimo/server/branches/2.1/plugins/monitoring/agent-jmx/src/main/java/org/apache/geronimo/monitoring/MasterRemoteControlJMX.java
    geronimo/server/branches/2.1/plugins/monitoring/agent/pom.xml
    geronimo/server/branches/2.1/plugins/monitoring/agent/src/main/plan/plan.xml
    geronimo/server/branches/2.1/plugins/monitoring/mconsole-jetty/pom.xml
    geronimo/server/branches/2.1/plugins/monitoring/mconsole-jetty/src/main/plan/plan.xml
    geronimo/server/branches/2.1/plugins/monitoring/mconsole-tomcat/pom.xml
    geronimo/server/branches/2.1/plugins/monitoring/mconsole-tomcat/src/main/plan/plan.xml
    geronimo/server/branches/2.1/plugins/monitoring/pom.xml

Modified: geronimo/server/branches/2.1/plugins/monitoring/agent-jmx/src/main/java/org/apache/geronimo/monitoring/MasterRemoteControlJMX.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/agent-jmx/src/main/java/org/apache/geronimo/monitoring/MasterRemoteControlJMX.java?rev=656740&r1=656739&r2=656740&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/agent-jmx/src/main/java/org/apache/geronimo/monitoring/MasterRemoteControlJMX.java
(original)
+++ geronimo/server/branches/2.1/plugins/monitoring/agent-jmx/src/main/java/org/apache/geronimo/monitoring/MasterRemoteControlJMX.java
Thu May 15 10:09:19 2008
@@ -106,8 +106,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");
 //          activeDS = (DataSource)((NestedWritableContext)ic.lookup("jms:conn")).lookup("jdbc/ActiveDS");
 //          archiveDS = (DataSource)((NestedWritableContext)ic.lookup("jms:conn")).lookup("jdbc/ArchiveDS");
         } catch(Exception e) {

Modified: geronimo/server/branches/2.1/plugins/monitoring/agent/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/agent/pom.xml?rev=656740&r1=656739&r2=656740&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/agent/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/monitoring/agent/pom.xml Thu May 15 10:09:19 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/branches/2.1/plugins/monitoring/agent/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/agent/src/main/plan/plan.xml?rev=656740&r1=656739&r2=656740&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/agent/src/main/plan/plan.xml (original)
+++ geronimo/server/branches/2.1/plugins/monitoring/agent/src/main/plan/plan.xml Thu May 15
10:09:19 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/branches/2.1/plugins/monitoring/mconsole-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/mconsole-jetty/pom.xml?rev=656740&r1=656739&r2=656740&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/mconsole-jetty/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/monitoring/mconsole-jetty/pom.xml Thu May 15 10:09:19
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/branches/2.1/plugins/monitoring/mconsole-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/mconsole-jetty/src/main/plan/plan.xml?rev=656740&r1=656739&r2=656740&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/mconsole-jetty/src/main/plan/plan.xml
(original)
+++ geronimo/server/branches/2.1/plugins/monitoring/mconsole-jetty/src/main/plan/plan.xml
Thu May 15 10:09:19 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/branches/2.1/plugins/monitoring/mconsole-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/mconsole-tomcat/pom.xml?rev=656740&r1=656739&r2=656740&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/mconsole-tomcat/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/monitoring/mconsole-tomcat/pom.xml Thu May 15 10:09:19
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/branches/2.1/plugins/monitoring/mconsole-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/mconsole-tomcat/src/main/plan/plan.xml?rev=656740&r1=656739&r2=656740&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/mconsole-tomcat/src/main/plan/plan.xml
(original)
+++ geronimo/server/branches/2.1/plugins/monitoring/mconsole-tomcat/src/main/plan/plan.xml
Thu May 15 10:09:19 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/branches/2.1/plugins/monitoring/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/pom.xml?rev=656740&r1=656739&r2=656740&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/monitoring/pom.xml Thu May 15 10:09:19 2008
@@ -62,13 +62,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>



Mime
View raw message