geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akulshresh...@apache.org
Subject svn commit: r585475 - in /geronimo/sandbox/monitoring: ./ client/ client/client-ear/ client/client-war/ mrc-server/ mrc-server/mrc-ear/ mrc-server/mrc-ejb/ mrc-server/mrc-ejb/src/main/java/org/apache/geronimo/monitor/ mrc-server/mrc-ejb/src/main/java/o...
Date Wed, 17 Oct 2007 13:01:10 GMT
Author: akulshreshtha
Date: Wed Oct 17 06:01:08 2007
New Revision: 585475

URL: http://svn.apache.org/viewvc?rev=585475&view=rev
Log:
GERONIMO-3533 Monitoring Plugin cleanup, Patch by Viet H. Nguyen

Modified:
    geronimo/sandbox/monitoring/client/client-ear/pom.xml
    geronimo/sandbox/monitoring/client/client-war/pom.xml
    geronimo/sandbox/monitoring/client/pom.xml
    geronimo/sandbox/monitoring/mrc-server/mrc-ear/pom.xml
    geronimo/sandbox/monitoring/mrc-server/mrc-ejb/pom.xml
    geronimo/sandbox/monitoring/mrc-server/mrc-ejb/src/main/java/org/apache/geronimo/monitor/MasterRemoteControl.java
    geronimo/sandbox/monitoring/mrc-server/mrc-ejb/src/main/java/org/apache/geronimo/monitor/snapshot/SnapshotThread.java
    geronimo/sandbox/monitoring/mrc-server/pom.xml
    geronimo/sandbox/monitoring/pom.xml

Modified: geronimo/sandbox/monitoring/client/client-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/client/client-ear/pom.xml?rev=585475&r1=585474&r2=585475&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/client/client-ear/pom.xml (original)
+++ geronimo/sandbox/monitoring/client/client-ear/pom.xml Wed Oct 17 06:01:08 2007
@@ -69,27 +69,9 @@
                 </configuration>
             </plugin>
 
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>install</phase>
-                        <id>copy-parent-target</id>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <echo>Copying ${pom.build.finalName}.ear file to parent</echo>
-                                <copy file ="${project.build.directory}/${pom.artifactId}-${pom.version}.ear"
todir="${pom.basedir}/.." failonerror="false" overwrite="true" />
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 
 </project>
+
 

Modified: geronimo/sandbox/monitoring/client/client-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/client/client-war/pom.xml?rev=585475&r1=585474&r2=585475&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/client/client-war/pom.xml (original)
+++ geronimo/sandbox/monitoring/client/client-war/pom.xml Wed Oct 17 06:01:08 2007
@@ -86,29 +86,4 @@
         
     </dependencies>
 
-    <build>
-        <plugins>
-            <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>process-resources</phase>
-                        <id>copy-parent-site</id>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                              <echo>Copying site directory from parent</echo>
-                                <copy todir="${project.build.directory}/${pom.artifactId}-1.0-SNAPSHOT"
failonerror="false" overwrite="true">
-                                    <fileset dir="${pom.basedir}/../docs"/>
-                                </copy>
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
 </project>

Modified: geronimo/sandbox/monitoring/client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/client/pom.xml?rev=585475&r1=585474&r2=585475&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/client/pom.xml (original)
+++ geronimo/sandbox/monitoring/client/pom.xml Wed Oct 17 06:01:08 2007
@@ -223,13 +223,6 @@
 
         <plugins>
             <plugin>
-                <artifactId>maven-site-plugin</artifactId>
-                <inherited>false</inherited>
-                <configuration>
-                  <outputDirectory>${project.basedir}/docs</outputDirectory>
-                </configuration>
-            </plugin>
-                    <plugin>
                 <groupId>org.apache.geronimo.genesis.plugins</groupId>
                 <artifactId>tools-maven-plugin</artifactId>
                 <!-- Tools includes custom packagings, install as extension to pick them
up -->

Modified: geronimo/sandbox/monitoring/mrc-server/mrc-ear/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/mrc-server/mrc-ear/pom.xml?rev=585475&r1=585474&r2=585475&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/mrc-server/mrc-ear/pom.xml (original)
+++ geronimo/sandbox/monitoring/mrc-server/mrc-ear/pom.xml Wed Oct 17 06:01:08 2007
@@ -37,6 +37,12 @@
 
     <dependencies>
         <dependency>
+            <groupId>org.tranql</groupId>
+            <artifactId>tranql-connector-ra</artifactId>
+            <version>1.3</version>
+            <type>rar</type>
+        </dependency>
+        <dependency>
             <groupId>org.apache.geronimo.plugins.mrc</groupId>
             <artifactId>mrc-server-ejb</artifactId>
             <version>1.0-SNAPSHOT</version>
@@ -45,6 +51,12 @@
     </dependencies>
 
     <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <artifactId>maven-ear-plugin</artifactId>
@@ -59,30 +71,16 @@
                             <bundleFileName>mrc-server-ejb-1.0-SNAPSHOT.jar</bundleFileName>
                         </ejbModule>
                     </modules>
+                    <resourcesDir>${project.build.outputDirectory}</resourcesDir>
+                        <archive>
+                            <!-- Do not include META-INF/maven to avoid long file problems
on windows -->
+                            <addMavenDescriptor>false</addMavenDescriptor>
+                        </archive>
                 </configuration>
             </plugin>
-
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <phase>install</phase>
-                        <id>copy-parent-target</id>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                        <configuration>
-                            <tasks>
-                                <echo>Copying ${pom.build.finalName}.ear file to parent</echo>
-                                <copy file ="${project.build.directory}/${pom.artifactId}-${pom.version}.ear"
todir="${pom.basedir}/.." failonerror="false" overwrite="true" />
-                            </tasks>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 
 </project>
+
 

Modified: geronimo/sandbox/monitoring/mrc-server/mrc-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/mrc-server/mrc-ejb/pom.xml?rev=585475&r1=585474&r2=585475&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/mrc-server/mrc-ejb/pom.xml (original)
+++ geronimo/sandbox/monitoring/mrc-server/mrc-ejb/pom.xml Wed Oct 17 06:01:08 2007
@@ -36,15 +36,33 @@
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee</artifactId>
-            <version>2.1-SNAPSHOT</version>
+            <version>${geronimoVersion}</version>
             <type>jar</type>
+            <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-management</artifactId>
-            <version>2.1-SNAPSHOT</version>
+            <version>${geronimoVersion}</version>
             <type>jar</type>
+            <scope>provided</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-kernel</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>jar</type>
+            <scope>provided</scope>
+        </dependency>
+
+         <dependency>
+            <groupId>org.apache.geronimo.applications</groupId>
+            <artifactId>geronimo-mejb</artifactId>
+            <version>${geronimoVersion}</version>
+            <type>jar</type>
+            <scope>provided</scope>
         </dependency>
     </dependencies>
 
@@ -56,4 +74,5 @@
 
 
 </project>
+
 

Modified: geronimo/sandbox/monitoring/mrc-server/mrc-ejb/src/main/java/org/apache/geronimo/monitor/MasterRemoteControl.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/mrc-server/mrc-ejb/src/main/java/org/apache/geronimo/monitor/MasterRemoteControl.java?rev=585475&r1=585474&r2=585475&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/mrc-server/mrc-ejb/src/main/java/org/apache/geronimo/monitor/MasterRemoteControl.java
(original)
+++ geronimo/sandbox/monitoring/mrc-server/mrc-ejb/src/main/java/org/apache/geronimo/monitor/MasterRemoteControl.java
Wed Oct 17 06:01:08 2007
@@ -46,14 +46,11 @@
 
 import org.apache.geronimo.monitor.MBeanHelper;
 
-import org.apache.geronimo.j2ee.mejb.MEJB;
-
 import org.apache.geronimo.management.geronimo.stats.WebModuleStats;
 import org.apache.geronimo.management.stats.WebModuleStatsImpl;
 import org.apache.geronimo.monitor.snapshot.SnapshotThread;
 import org.apache.geronimo.monitor.snapshot.SnapshotXMLBuilder;
-import org.apache.geronimo.monitor.snapshot.SnapshotConfigXMLBuilder;
-
+import org.apache.geronimo.monitor.snapshot.SnapshotConfigXMLBuilder; 
 /**
  * This is the GBean that will be the bottleneck for the communication
  * between the management node and the data in the server node.
@@ -69,7 +66,7 @@
     private static MBeanServer mbServer = null;
     
     // mangement ejb - use this to do the monitoring
-    private static MEJB mejb = null;
+    private static Management mejb = null;
     
     // threads
     private static SnapshotThread snapshotThread = null;
@@ -95,7 +92,8 @@
             mbServer = MBeanServerFactory.createMBeanServer(GERONIMO_DEFAULT_DOMAIN);
         }
         // instantiate the MEJB, which will be out gateway to communicate to MBeans
-        mejb = new MEJB(null, mbServer);
+        
+        
         // instantiate teh mbean helper to query mbean names
         mbeanHelper = new MBeanHelper();
     }
@@ -145,7 +143,7 @@
      * 
      * @return Handle of an MEJB
      */
-    public static MEJB getMEJB() {
+    public static Management getMEJB() {
         return mejb;
     }
     
@@ -301,7 +299,12 @@
      * @return A set containing all mbean names
      */
     public Set<ObjectName> getAllMBeanNames() {
-        return (Set<ObjectName>)mejb.queryNames(null, null);
+        try {
+            return (Set<ObjectName>)mejb.queryNames(null, null);
+        } catch(Exception e) {
+            e.printStackTrace();
+            return new HashSet<ObjectName>();
+        }
     }
     
     public void doFail() {

Modified: geronimo/sandbox/monitoring/mrc-server/mrc-ejb/src/main/java/org/apache/geronimo/monitor/snapshot/SnapshotThread.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/mrc-server/mrc-ejb/src/main/java/org/apache/geronimo/monitor/snapshot/SnapshotThread.java?rev=585475&r1=585474&r2=585475&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/mrc-server/mrc-ejb/src/main/java/org/apache/geronimo/monitor/snapshot/SnapshotThread.java
(original)
+++ geronimo/sandbox/monitoring/mrc-server/mrc-ejb/src/main/java/org/apache/geronimo/monitor/snapshot/SnapshotThread.java
Wed Oct 17 06:01:08 2007
@@ -22,11 +22,11 @@
 import java.util.Iterator;
 import java.util.Set;
 
+import javax.management.j2ee.Management;
 import javax.management.MBeanServer;
 import javax.management.MalformedObjectNameException;
 import javax.management.ObjectName;
 
-import org.apache.geronimo.j2ee.mejb.MEJB;
 import org.apache.geronimo.monitor.snapshot.SnapshotXMLBuilder;
 import org.apache.geronimo.monitor.MasterRemoteControl;
 
@@ -153,7 +153,7 @@
      * @param mbeanList
      */
     private void setStatsOn(ArrayList<String> mbeanList) {
-        MEJB mejb = MasterRemoteControl.getMEJB();
+        Management mejb = MasterRemoteControl.getMEJB();
         // for each mbean name in the list
         for(int i = 0; i < mbeanList.size(); i++) {
             // turn the statistics collection on

Modified: geronimo/sandbox/monitoring/mrc-server/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/mrc-server/pom.xml?rev=585475&r1=585474&r2=585475&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/mrc-server/pom.xml (original)
+++ geronimo/sandbox/monitoring/mrc-server/pom.xml Wed Oct 17 06:01:08 2007
@@ -39,16 +39,7 @@
     <artifactId>mrc-server</artifactId>
     <name>Geronimo Stats :: Server</name>
     <packaging>pom</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-kernel</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <type>jar</type>
-        </dependency>
-    </dependencies>
-
+    
     <description>
         Geronimo MRC sample created from an archetype.
     </description>
@@ -59,18 +50,6 @@
         <module>mrc-ejb</module>
         <module>mrc-ear</module>
     </modules>
-
-    <build>
-        <plugins>
-            <plugin>
-                <artifactId>maven-site-plugin</artifactId>
-                <inherited>false</inherited>
-                <configuration>
-                    <outputDirectory>${project.basedir}/docs</outputDirectory>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
 
     <repositories>
         <repository>

Modified: geronimo/sandbox/monitoring/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/monitoring/pom.xml?rev=585475&r1=585474&r2=585475&view=diff
==============================================================================
--- geronimo/sandbox/monitoring/pom.xml (original)
+++ geronimo/sandbox/monitoring/pom.xml Wed Oct 17 06:01:08 2007
@@ -65,96 +65,6 @@
         <!-- deployers needed to create the CAR files -->
     </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-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.specs</groupId>
-                <artifactId>geronimo-servlet_2.5_spec</artifactId>
-                <version>${geronimoServletSpecVersion}</version>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.modules</groupId>
-                <artifactId>geronimo-j2ee</artifactId>
-                <version>${geronimoVersion}</version>
-                </dependency>
-
-            <dependency>
-                <groupId>org.apache.xbean</groupId>
-                <artifactId>xbean-naming</artifactId>
-                <version>${xbeanVersion}</version>
-            </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>dojo-jetty6</artifactId>
-                <version>${geronimoVersion}</version>
-                <type>car</type>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.geronimo.configs</groupId>
-                <artifactId>dojo-tomcat</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>
@@ -316,8 +226,8 @@
                 <activeByDefault>true</activeByDefault>
             </activation>
             <modules>
-                <module>mrc-server</module>
                 <module>client</module>
+                <module>mrc-server</module>
             </modules>
         </profile>
     </profiles>



Mime
View raw message