geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gdam...@apache.org
Subject svn commit: r555111 [2/2] - in /geronimo/server/trunk: assemblies/geronimo-boilerplate-minimal/src/main/resources/var/config/ assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/ configs/clustering/ configs/clustering/src/plan/ configs/jetty6...
Date Tue, 10 Jul 2007 23:25:34 GMT
Modified: geronimo/server/trunk/modules/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/ApplicationTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/ApplicationTest.java?view=diff&rev=555111&r1=555110&r2=555111
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/ApplicationTest.java
(original)
+++ geronimo/server/trunk/modules/geronimo-jetty6/src/test/java/org/apache/geronimo/jetty6/ApplicationTest.java
Tue Jul 10 16:25:31 2007
@@ -29,7 +29,6 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.apache.geronimo.clustering.BasicNode;
 import org.apache.geronimo.clustering.Node;
 import org.apache.geronimo.clustering.Session;
 import org.apache.geronimo.clustering.SessionAlreadyExistException;
@@ -71,7 +70,17 @@
 
     private static class MockSessionManager implements SessionManager {
 
-        Node node = new BasicNode("testNode");
+        Node node = new Node() {
+
+            public javax.management.remote.JMXConnector getJMXConnector() throws IOException
{
+                throw new UnsupportedOperationException();
+            }
+
+            public String getName() {
+                return "name";
+            }
+
+        };
 
         public Session createSession(String string) throws SessionAlreadyExistException {
             return null;

Modified: geronimo/server/trunk/modules/geronimo-jmx-remoting/src/main/java/org/apache/geronimo/jmxremoting/JMXConnector.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jmx-remoting/src/main/java/org/apache/geronimo/jmxremoting/JMXConnector.java?view=diff&rev=555111&r1=555110&r2=555111
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jmx-remoting/src/main/java/org/apache/geronimo/jmxremoting/JMXConnector.java
(original)
+++ geronimo/server/trunk/modules/geronimo-jmx-remoting/src/main/java/org/apache/geronimo/jmxremoting/JMXConnector.java
Tue Jul 10 16:25:31 2007
@@ -19,12 +19,13 @@
 import java.net.InetSocketAddress;
 import java.util.HashMap;
 import java.util.Map;
+
+import javax.management.MBeanServer;
+import javax.management.NotificationFilterSupport;
+import javax.management.remote.JMXConnectionNotification;
 import javax.management.remote.JMXConnectorServer;
 import javax.management.remote.JMXConnectorServerFactory;
 import javax.management.remote.JMXServiceURL;
-import javax.management.remote.JMXConnectionNotification;
-import javax.management.MBeanServer;
-import javax.management.NotificationFilterSupport;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
@@ -38,7 +39,7 @@
  *
  * @version $Rev$ $Date$
  */
-public class JMXConnector implements GBeanLifecycle {
+public class JMXConnector implements JMXConnectorInfo, GBeanLifecycle {
     private final MBeanServer mbeanServer;
     private final Log log;
     private final ClassLoader classLoader;
@@ -229,6 +230,8 @@
         infoFactory.addAttribute("urlPath", String.class, true, true);
         infoFactory.addAttribute("applicationConfigName", String.class, true, true);
 
+        infoFactory.addInterface(JMXConnectorInfo.class);
+        
         infoFactory.setConstructor(new String[]{"MBeanServerReference", "objectName", "classLoader"});
         GBEAN_INFO = infoFactory.getBeanInfo();
     }

Added: geronimo/server/trunk/modules/geronimo-jmx-remoting/src/main/java/org/apache/geronimo/jmxremoting/JMXConnectorInfo.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-jmx-remoting/src/main/java/org/apache/geronimo/jmxremoting/JMXConnectorInfo.java?view=auto&rev=555111
==============================================================================
--- geronimo/server/trunk/modules/geronimo-jmx-remoting/src/main/java/org/apache/geronimo/jmxremoting/JMXConnectorInfo.java
(added)
+++ geronimo/server/trunk/modules/geronimo-jmx-remoting/src/main/java/org/apache/geronimo/jmxremoting/JMXConnectorInfo.java
Tue Jul 10 16:25:31 2007
@@ -0,0 +1,43 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one or more
+ *  contributor license agreements.  See the NOTICE file distributed with
+ *  this work for additional information regarding copyright ownership.
+ *  The ASF licenses this file to You under the Apache License, Version 2.0
+ *  (the "License"); you may not use this file except in compliance with
+ *  the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing, software
+ *  distributed under the License is distributed on an "AS IS" BASIS,
+ *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *  See the License for the specific language governing permissions and
+ *  limitations under the License.
+ */
+package org.apache.geronimo.jmxremoting;
+
+import java.net.InetSocketAddress;
+
+/**
+ *
+ * @version $Rev: 476049 $ $Date: 2006-11-17 15:35:17 +1100 (Fri, 17 Nov 2006) $
+ */
+public interface JMXConnectorInfo {
+    InetSocketAddress getListenAddress();
+
+    String getProtocol();
+
+    void setProtocol(String protocol);
+
+    String getHost();
+
+    void setHost(String host);
+
+    int getPort();
+
+    void setPort(int port);
+
+    String getUrlPath();
+
+    void setUrlPath(String urlPath);
+}



Mime
View raw message