geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r817133 - in /geronimo/server/trunk: plugingroups/javaee5-jetty/ plugingroups/javaee5-jetty/src/main/history/ plugingroups/javaee5-tomcat/ plugingroups/javaee5-tomcat/src/main/history/ plugins/monitoring/ plugins/monitoring/agent-car-ejb/ p...
Date Mon, 21 Sep 2009 02:13:58 GMT
Author: genspring
Date: Mon Sep 21 02:13:57 2009
New Revision: 817133

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

Added:
    geronimo/server/trunk/plugins/monitoring/agent-car-ejb/
      - copied from r812187, geronimo/server/trunk/plugins/monitoring/agent/
Removed:
    geronimo/server/trunk/plugins/monitoring/agent/
Modified:
    geronimo/server/trunk/plugingroups/javaee5-jetty/pom.xml
    geronimo/server/trunk/plugingroups/javaee5-jetty/src/main/history/dependencies.xml
    geronimo/server/trunk/plugingroups/javaee5-tomcat/pom.xml
    geronimo/server/trunk/plugingroups/javaee5-tomcat/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/monitoring/agent-car-ejb/pom.xml
    geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddServer.jsp
    geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditServer.jsp
    geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringHelp.jsp
    geronimo/server/trunk/plugins/monitoring/pom.xml

Modified: geronimo/server/trunk/plugingroups/javaee5-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/javaee5-jetty/pom.xml?rev=817133&r1=817132&r2=817133&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/javaee5-jetty/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/javaee5-jetty/pom.xml Mon Sep 21 02:13:57 2009
@@ -163,7 +163,14 @@
 
         <dependency>
             <groupId>org.apache.geronimo.plugins.monitoring</groupId>
-            <artifactId>agent</artifactId>
+            <artifactId>agent-car-ejb</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.plugins.monitoring</groupId>
+            <artifactId>agent-car-jmx</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/plugingroups/javaee5-jetty/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/javaee5-jetty/src/main/history/dependencies.xml?rev=817133&r1=817132&r2=817133&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/javaee5-jetty/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugingroups/javaee5-jetty/src/main/history/dependencies.xml Mon
Sep 21 02:13:57 2009
@@ -118,7 +118,12 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.plugins.monitoring</groupId>
-        <artifactId>agent</artifactId>
+        <artifactId>agent-car-ejb</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.plugins.monitoring</groupId>
+        <artifactId>agent-car-jmx</artifactId>
         <type>car</type>
     </dependency>
     <dependency>

Modified: geronimo/server/trunk/plugingroups/javaee5-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/javaee5-tomcat/pom.xml?rev=817133&r1=817132&r2=817133&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/javaee5-tomcat/pom.xml (original)
+++ geronimo/server/trunk/plugingroups/javaee5-tomcat/pom.xml Mon Sep 21 02:13:57 2009
@@ -155,7 +155,14 @@
 
         <dependency>
             <groupId>org.apache.geronimo.plugins.monitoring</groupId>
-            <artifactId>agent</artifactId>
+            <artifactId>agent-car-ejb</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.plugins.monitoring</groupId>
+            <artifactId>agent-car-jmx</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/plugingroups/javaee5-tomcat/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugingroups/javaee5-tomcat/src/main/history/dependencies.xml?rev=817133&r1=817132&r2=817133&view=diff
==============================================================================
--- geronimo/server/trunk/plugingroups/javaee5-tomcat/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugingroups/javaee5-tomcat/src/main/history/dependencies.xml Mon
Sep 21 02:13:57 2009
@@ -118,7 +118,12 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.plugins.monitoring</groupId>
-        <artifactId>agent</artifactId>
+        <artifactId>agent-car-ejb</artifactId>
+        <type>car</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.plugins.monitoring</groupId>
+        <artifactId>agent-car-jmx</artifactId>
         <type>car</type>
     </dependency>
     <dependency>

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=817133&r1=812187&r2=817133&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/agent-car-ejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/agent-car-ejb/pom.xml Mon Sep 21 02:13:57 2009
@@ -28,8 +28,8 @@
         <version>3.0-SNAPSHOT</version>
     </parent>
     
-    <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>
@@ -87,6 +87,11 @@
                         <type>jar</type>
                     </module>
                     <category>Monitoring</category>
+                    <instance>
+                        <plugin-artifact>
+                            <config-xml-content load="false" />
+                        </plugin-artifact>
+                    </instance>
                     <osiApproved>true</osiApproved>
                 </configuration>
             </plugin>

Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddServer.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddServer.jsp?rev=817133&r1=817132&r2=817133&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddServer.jsp
(original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringAddServer.jsp
Mon Sep 21 02:13:57 2009
@@ -47,8 +47,8 @@
 }
 else
 {
-    protocol = "EJB";
-    if(port == null)        port = "4201";
+    protocol = "JMX";
+    if(port == null)        port = "1099";
 }
 
 %>
@@ -66,21 +66,21 @@
     document.getElementById(x).style.display='';
 }
 function validate() {
-	if (! (document.addServer.name.value 
-		&& document.addServer.ip.value 
-		&& document.addServer.username.value
-		&& document.addServer.password.value
-		&& document.addServer.port.value ))
-	{
-		alert("Name, Address, Protocol, Port, Username, and Password are all required fields");
-		return false;
-	}
-	if (document.addServer.password.value != document.addServer.password2.value)
-	{
-		alert("Passwords do not match");
-		return false;
-	}
-	return true;
+    if (! (document.addServer.name.value 
+        && document.addServer.ip.value 
+        && document.addServer.username.value
+        && document.addServer.password.value
+        && document.addServer.port.value ))
+    {
+        alert("Name, Address, Protocol, Port, Username, and Password are all required fields");
+        return false;
+    }
+    if (document.addServer.password.value != document.addServer.password2.value)
+    {
+        alert("Passwords do not match");
+        return false;
+    }
+    return true;
 }
 function noAlpha(obj) {
     reg = /[^0-9]/g;
@@ -88,9 +88,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>
@@ -126,8 +126,9 @@
       <td><fmt:message key="monitor.server.protocol"/></td>
       <td>&nbsp;</td>
       <td align="right">
-      	<input type="radio" name="protocol" id="<portlet:namespace/>protocol1" onchange='setPort()'
value="EJB" <%if (protocol.equals("EJB")){ %>checked="checked"<%} %>><label
for="<portlet:namespace/>protocol1">EJB</label>
-      	<input type="radio" name="protocol" id="<portlet:namespace/>protocol2" onchange='setPort()'
value="JMX" <%if (protocol.equals("JMX")){ %>checked="checked"<%} %>><label
for="<portlet:namespace/>protocol2">JMX</label></td>
+          <input type="radio" name="protocol" id="<portlet:namespace/>protocol2"
onchange='setPort()' value="JMX" <%if (protocol.equals("JMX")){ %>checked="checked"<%}
%>><label for="<portlet:namespace/>protocol2">JMX</label>
+          <input type="radio" name="protocol" id="<portlet:namespace/>protocol1"
onchange='setPort()' value="EJB" <%if (protocol.equals("EJB")){ %>checked="checked"<%}
%>><label for="<portlet:namespace/>protocol1">EJB</label>
+      </td>
       <td></td>
     </tr>
     <tr>

Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditServer.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditServer.jsp?rev=817133&r1=817132&r2=817133&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditServer.jsp
(original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringEditServer.jsp
Mon Sep 21 02:13:57 2009
@@ -33,14 +33,14 @@
 String retention = (String) request.getAttribute("retention");
 if(snapshot == null)    snapshot = "";
 if(retention == null)   retention = "";
-if(node.getProtocol() == null || node.getProtocol().equals("EJB"))
+if(node.getProtocol() == null || node.getProtocol().equals("JMX"))
 {
-    node.setProtocol("EJB");
-    if(node.getPort() == 0)        node.setPort(4201);
+    node.setProtocol("JMX");
+    if(node.getPort() == 0)        node.setPort(1099);
 }
 else
 {
-    if(node.getPort() == 0)        node.setPort(1099);
+    if(node.getPort() == 0)        node.setPort(4201);
 }
 MRCConnector mrc = null;
 boolean isOnline = true;
@@ -53,10 +53,10 @@
         try {
             if(retention.equals("") || snapshot.equals("")) {
                 mrc = new MRCConnector(node);
-		        // get the snapshot on the first call or any subsequent valid connections
-		        snapshot = snapshot == "" ?  "" + mrc.getSnapshotDuration() / 1000 / 60 : snapshot;
-		        // get the retention on the first call or any subsequent valid connection
-		        retention = retention == "" ? "" + mrc.getSnapshotRetention() : retention;
+                // get the snapshot on the first call or any subsequent valid connections
+                snapshot = snapshot == "" ?  "" + mrc.getSnapshotDuration() / 1000 / 60 :
snapshot;
+                // get the retention on the first call or any subsequent valid connection
+                retention = retention == "" ? "" + mrc.getSnapshotRetention() : retention;
             }
         } catch(Exception ee) {
             // the password in the db does not work
@@ -121,9 +121,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>
@@ -177,8 +177,8 @@
       <td><fmt:message key="monitor.server.protocol"/></td>
       <td>&nbsp;</td>
       <td align="right">
-      		<input type="radio" name="protocol" id="<portlet:namespace/>protocol1" onchange='setPort()'
value="EJB" <%if (node.getProtocol().equals("EJB")){ %>checked="checked"<%} %>><label
for="<portlet:namespace/>protocol1">EJB</label>
-      		<input type="radio" name="protocol" id="<portlet:namespace/>protocol2" onchange='setPort()'
value="JMX" <%if (node.getProtocol().equals("JMX")){ %>checked="checked"<%} %>><label
for="<portlet:namespace/>protocol2">JMX</label>
+              <input type="radio" name="protocol" id="<portlet:namespace/>protocol2"
onchange='setPort()' value="JMX" <%if (node.getProtocol().equals("JMX")){ %>checked="checked"<%}
%>><label for="<portlet:namespace/>protocol2">JMX</label>
+              <input type="radio" name="protocol" id="<portlet:namespace/>protocol1"
onchange='setPort()' value="EJB" <%if (node.getProtocol().equals("EJB")){ %>checked="checked"<%}
%>><label for="<portlet:namespace/>protocol1">EJB</label>
       </td>
       <td></td>
     </tr>

Modified: geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringHelp.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringHelp.jsp?rev=817133&r1=817132&r2=817133&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringHelp.jsp
(original)
+++ geronimo/server/trunk/plugins/monitoring/mconsole-war/src/main/webapp/WEB-INF/view/monitoringHelp.jsp
Mon Sep 21 02:13:57 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/trunk/plugins/monitoring/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/monitoring/pom.xml?rev=817133&r1=817132&r2=817133&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/monitoring/pom.xml (original)
+++ geronimo/server/trunk/plugins/monitoring/pom.xml Mon Sep 21 02:13:57 2009
@@ -52,10 +52,10 @@
     </dependencyManagement>
 
     <modules>
-        <module>agent</module>
         <module>agent-ds</module>
         <module>agent-jar</module>
         <module>agent-ejb</module>
+        <module>agent-car-ejb</module>
         <module>agent-jmx</module>
         <module>agent-car-jmx</module>
         <module>agent-sql</module>



Mime
View raw message