geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r817129 - in /geronimo/server/branches/2.1: assemblies/geronimo-jetty6-javaee5/ assemblies/geronimo-tomcat6-javaee5/ plugins/monitoring/ plugins/monitoring/agent-car-ejb/ plugins/monitoring/agent/ plugins/monitoring/agent/src/ plugins/monit...
Date Mon, 21 Sep 2009 01:45:59 GMT
Author: genspring
Date: Mon Sep 21 01:45:58 2009
New Revision: 817129

URL: http://svn.apache.org/viewvc?rev=817129&view=rev
Log:
GERONIMO-4883 ship agent-car-jmx and make it default agent,  mark ejb agent as   "load=false".

Added:
    geronimo/server/branches/2.1/plugins/monitoring/agent-car-ejb/
      - copied from r810760, geronimo/server/branches/2.1/plugins/monitoring/agent/
Removed:
    geronimo/server/branches/2.1/plugins/monitoring/agent/LICENSE.txt
    geronimo/server/branches/2.1/plugins/monitoring/agent/NOTICE.txt
    geronimo/server/branches/2.1/plugins/monitoring/agent/pom.xml
    geronimo/server/branches/2.1/plugins/monitoring/agent/src/
Modified:
    geronimo/server/branches/2.1/assemblies/geronimo-jetty6-javaee5/pom.xml
    geronimo/server/branches/2.1/assemblies/geronimo-tomcat6-javaee5/pom.xml
    geronimo/server/branches/2.1/plugins/monitoring/agent-car-ejb/pom.xml
    geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MRCConnector.java
    geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddServer.jsp
    geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditServer.jsp
    geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringHelp.jsp
    geronimo/server/branches/2.1/plugins/monitoring/pom.xml

Modified: geronimo/server/branches/2.1/assemblies/geronimo-jetty6-javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/assemblies/geronimo-jetty6-javaee5/pom.xml?rev=817129&r1=817128&r2=817129&view=diff
==============================================================================
--- geronimo/server/branches/2.1/assemblies/geronimo-jetty6-javaee5/pom.xml (original)
+++ geronimo/server/branches/2.1/assemblies/geronimo-jetty6-javaee5/pom.xml Mon Sep 21 01:45:58
2009
@@ -533,8 +533,15 @@
 
         <!-- Monitoring plugins -->
         <dependency>
-            <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>agent</artifactId>
+            <groupId>org.apache.geronimo.plugins.monitoring</groupId>
+            <artifactId>agent-car-jmx</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.plugins.monitoring</groupId>
+            <artifactId>agent-car-ejb</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/branches/2.1/assemblies/geronimo-tomcat6-javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/assemblies/geronimo-tomcat6-javaee5/pom.xml?rev=817129&r1=817128&r2=817129&view=diff
==============================================================================
--- geronimo/server/branches/2.1/assemblies/geronimo-tomcat6-javaee5/pom.xml (original)
+++ geronimo/server/branches/2.1/assemblies/geronimo-tomcat6-javaee5/pom.xml Mon Sep 21 01:45:58
2009
@@ -533,8 +533,15 @@
 
         <!-- Monitoring plugins -->
         <dependency>
-            <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>agent</artifactId>
+            <groupId>org.apache.geronimo.plugins.monitoring</groupId>
+            <artifactId>agent-car-jmx</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.plugins.monitoring</groupId>
+            <artifactId>agent-car-ejb</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/branches/2.1/plugins/monitoring/agent-car-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/agent-car-ejb/pom.xml?rev=817129&r1=810760&r2=817129&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/agent-car-ejb/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/monitoring/agent-car-ejb/pom.xml Mon Sep 21 01:45:58
2009
@@ -30,9 +30,8 @@
         <version>2.1.5-SNAPSHOT</version>
     </parent>
     
-    <groupId>org.apache.geronimo.plugins</groupId>
-    <artifactId>agent</artifactId>
-    <name>Geronimo Plugins, Monitoring :: Agent</name>
+    <artifactId>agent-car-ejb</artifactId>
+    <name>Geronimo Plugins, Monitoring :: Agent EJB CAR</name>
     <packaging>car</packaging>
 
     <dependencies>
@@ -90,6 +89,11 @@
                         <type>jar</type>
                     </module>
                     <category>Monitoring</category>
+                    <instance>
+                        <plugin-artifact>
+                            <config-xml-content load="false" />
+                        </plugin-artifact>
+                    </instance>
                     <osiApproved>true</osiApproved>
                     <useMavenDependencies>
                         <value>true</value>

Modified: geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MRCConnector.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MRCConnector.java?rev=817129&r1=817128&r2=817129&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MRCConnector.java
(original)
+++ geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/java/org/apache/geronimo/monitoring/console/MRCConnector.java
Mon Sep 21 01:45:58 2009
@@ -71,7 +71,7 @@
         password = (String) EncryptionManager.decrypt(password);
         Protocol = protocol;
 
-        if (Protocol == 1) {
+        if (Protocol == 2) {
 
             try {
                 Properties props = new Properties();
@@ -162,7 +162,7 @@
      *             If the connection to the MRC-Server fails
      */
     public Long getSnapshotDuration() throws Exception {
-        if (Protocol == 1) {
+        if (Protocol == 2) {
 
             return mrc.getSnapshotDuration();
 
@@ -185,7 +185,7 @@
 
         HashMap<String, ArrayList<String>> DataNameList = new HashMap<String,
ArrayList<String>>();
 
-        if (Protocol == 1) {
+        if (Protocol == 2) {
 
             try {
                 DataNameList = mrc.getAllSnapshotStatAttributes();
@@ -227,7 +227,7 @@
     public ArrayList<HashMap<String, HashMap<String, Object>>> getSnapshots(
             int snapCount, int skipCount) throws Exception {
         ArrayList<HashMap<String, HashMap<String, Object>>> snapshotList
= null;
-        if (Protocol == 1) {
+        if (Protocol == 2) {
 
             snapshotList = mrc.fetchSnapshotData(snapCount, skipCount);
 
@@ -376,7 +376,7 @@
             String statsName, int snapCount, int skipCount, boolean showArchive)
             throws Exception {
         TreeMap<Long, Long> snapshotList = null;
-        if (Protocol == 1) {
+        if (Protocol == 2) {
 
             snapshotList = mrc.getSpecificStatistics(mbeanName, statsName,
                     snapCount, skipCount, showArchive);
@@ -440,7 +440,7 @@
         int snapCount = 1;
         int skipCount = 1;
         ArrayList<HashMap<String, HashMap<String, Object>>> snapshotList
= null;
-        if (Protocol == 1) {
+        if (Protocol == 2) {
 
             snapshotList = mrc.fetchSnapshotData(snapCount, skipCount);
 
@@ -464,7 +464,7 @@
      *             If the connection to the MRC-Server fails
      */
     public boolean stopSnapshotThread() throws Exception {
-        if (Protocol == 1) {
+        if (Protocol == 2) {
 
             return mrc.stopSnapshot();
 
@@ -480,7 +480,7 @@
      *             If the connection to the MRC-Server fails
      */
     public boolean startSnapshotThread(long time) throws Exception {
-        if (Protocol == 1) {
+        if (Protocol == 2) {
 
             return mrc.startSnapshot(time);
 
@@ -493,7 +493,7 @@
 
     public int isSnapshotRunning() {
         Integer running = 0;
-        if (Protocol == 1) {
+        if (Protocol == 2) {
 
             try {
                 if (mrc.isSnapshotRunning())
@@ -516,7 +516,7 @@
 
     @SuppressWarnings("unchecked")
     public Set<String> getAllMbeanNames() throws Exception {
-        if (Protocol == 1) {
+        if (Protocol == 2) {
 
             return mrc.getAllMBeanNames();
 
@@ -528,7 +528,7 @@
 
     @SuppressWarnings("unchecked")
     public Set<String> getStatisticsProviderBeanNames() throws Exception {
-        if (Protocol == 1) {
+        if (Protocol == 2) {
 
             return mrc.getStatisticsProviderMBeanNames();
 
@@ -542,7 +542,7 @@
     @SuppressWarnings("unchecked")
     public HashMap<String, ArrayList<String>> getAllSnapshotStatAttributes()
             throws Exception {
-        if (Protocol == 1) {
+        if (Protocol == 2) {
 
             return mrc.getAllSnapshotStatAttributes();
 
@@ -555,7 +555,7 @@
 
     @SuppressWarnings("unchecked")
     public Set<String> getTrackedBeans() throws Exception {
-        if (Protocol == 1) {
+        if (Protocol == 2) {
 
             return mrc.getTrackedMBeans();
 
@@ -718,7 +718,7 @@
 
     @SuppressWarnings("unchecked")
     public boolean stopTrackingMbean(String MBean) throws Exception {
-        if (Protocol == 1) {
+        if (Protocol == 2) {
 
             mrc.removeMBeanForSnapshot(MBean);
 
@@ -734,7 +734,7 @@
 
     @SuppressWarnings("unchecked")
     public boolean startTrackingMbean(String MBean) throws Exception {
-        if (Protocol == 1) {
+        if (Protocol == 2) {
 
             mrc.addMBeanForSnapshot(MBean);
 
@@ -749,7 +749,7 @@
 
     @SuppressWarnings("unchecked")
     public HashMap<String, Long> getStats(String MBean) throws Exception {
-        if (Protocol == 1) {
+        if (Protocol == 2) {
 
             return mrc.getStats(MBean);
 
@@ -761,7 +761,7 @@
     }
 
     public void setSnapshotDuration(long duration) {
-        if (Protocol == 1) {
+        if (Protocol == 2) {
 
             mrc.setSnapshotDuration(new Long(duration));
 
@@ -779,7 +779,7 @@
     }
 
     public int getSnapshotRetention() {
-        if (Protocol == 1) {
+        if (Protocol == 2) {
 
             return Integer.parseInt(mrc.getSnapshotRetention());
 
@@ -796,7 +796,7 @@
     }
 
     public void setSnapshotRetention(int duration) {
-        if (Protocol == 1) {
+        if (Protocol == 2) {
 
             mrc.setSnapshotRetention(duration);
 

Modified: geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddServer.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddServer.jsp?rev=817129&r1=817128&r2=817129&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddServer.jsp
(original)
+++ geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddServer.jsp
Mon Sep 21 01:45:58 2009
@@ -52,16 +52,16 @@
 if(protocol == null)    protocol = "";
 if(protocol.equals("1"))    
 {
-    if(port == null)        port = "4201";
+    if(port == null)        port = "1099";
 }
 else if(protocol.equals("2"))
 {
-    if(port == null)        port = "1099";
+    if(port == null)        port = "4201";
 }
 else
 {
     protocol = "1";
-    if(port == null)        port = "4201";
+    if(port == null)        port = "1099";
 }
 
 %>
@@ -102,9 +102,9 @@
 }
 function setPort() {
     if (document.addServer.protocol[0].checked == true)
-        document.addServer.port.value = "4201";
-    else
         document.addServer.port.value = "1099";
+    else
+        document.addServer.port.value = "4201";
 }
 //-->
 </script>
@@ -139,7 +139,7 @@
     <tr>
       <td><fmt:message key="monitor.server.protocol"/></td>
       <td>&nbsp;</td>
-      <td align="right"><input type="radio" name="protocol" onchange='setPort()'
value="1" <%if (protocol.equals("1")){ %>checked="checked"<%} %>>EJB <input
type="radio" name="protocol" onchange='setPort()' value="2" <%if (protocol.equals("2")){
%>checked="checked"<%} %>>JMX</td>
+      <td align="right"><input type="radio" name="protocol" onchange='setPort()'
value="1" <%if (protocol.equals("1")){ %>checked="checked"<%} %>>JMX<input
type="radio" name="protocol" onchange='setPort()' value="2" <%if (protocol.equals("2")){
%>checked="checked"<%} %>>EJB</td>
       <td></td>
     </tr>
     <tr>

Modified: geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditServer.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditServer.jsp?rev=817129&r1=817128&r2=817129&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditServer.jsp
(original)
+++ geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditServer.jsp
Mon Sep 21 01:45:58 2009
@@ -61,16 +61,16 @@
 if(protocol == null)    protocol = "";
 if(protocol.equals("1"))    
 {
-    if(port == null)        port = "4201";
+    if(port == null)        port = "1099";
 }
 else if(protocol.equals("2"))
 {
-    if(port == null)        port = "1099";
+    if(port == null)        port = "4201";
 }
 else
 {
     protocol = "1";
-    if(port == null)        port = "4201";
+    if(port == null)        port = "1099";
 }
 
 DBManager DBase = new DBManager();
@@ -178,9 +178,9 @@
  }
 function setPort() {
     if (document.editServer.protocol[0].checked)
-        document.editServer.port.value = "4201";
-    else
         document.editServer.port.value = "1099";
+    else
+        document.editServer.port.value = "4201";
 }
 //-->
 </script>
@@ -233,7 +233,7 @@
     <tr>
       <td><fmt:message key="monitor.server.protocol"/></td>
       <td>&nbsp;</td>
-      <td align="right"><input type="radio" name="protocol" onchange='setPort()'
value="1" <%if (protocol.equals("1")){ %>checked="checked"<%} %>>EJB <input
type="radio" name="protocol" onchange='setPort()' value="2" <%if (protocol.equals("2")){
%>checked="checked"<%} %>>JMX</td>
+      <td align="right"><input type="radio" name="protocol" onchange='setPort()'
value="1" <%if (protocol.equals("1")){ %>checked="checked"<%} %>>JMX <input
type="radio" name="protocol" onchange='setPort()' value="2" <%if (protocol.equals("2")){
%>checked="checked"<%} %>>EJB</td>
       <td></td>
     </tr>
     <tr>

Modified: geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringHelp.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringHelp.jsp?rev=817129&r1=817128&r2=817129&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringHelp.jsp
(original)
+++ geronimo/server/branches/2.1/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringHelp.jsp
Mon Sep 21 01:45:58 2009
@@ -25,7 +25,7 @@
     <ul style="list-style:none">
       <li><fmt:message key="monitor.common.name"/> = localhost</li>
       <li><fmt:message key="monitor.server.ip"/>/<fmt:message key="monitor.server.hostname"/>
= 127.0.0.1</li>
-      <li><fmt:message key="monitor.server.port"/> = 4201</li>
+      <li><fmt:message key="monitor.server.port"/> = 1099</li>
       <li><fmt:message key="monitor.server.username"/> = system</li>
       <li><fmt:message key="monitor.server.pwd"/> = manager</li>
     </ul>

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=817129&r1=817128&r2=817129&view=diff
==============================================================================
--- geronimo/server/branches/2.1/plugins/monitoring/pom.xml (original)
+++ geronimo/server/branches/2.1/plugins/monitoring/pom.xml Mon Sep 21 01:45:58 2009
@@ -59,11 +59,11 @@
     </dependencies>
     
     <modules>
-        <module>agent</module>
         <module>agent-ds</module>
         <module>agent-jar</module>
         <module>agent-ejb</module>
-	<module>agent-jmx</module>
+        <module>agent-car-ejb</module>
+        <module>agent-jmx</module>
         <module>agent-car-jmx</module>
         <module>agent-sql</module>
         <module>mconsole-ds</module>



Mime
View raw message