You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by jb...@apache.org on 2020/02/11 20:24:18 UTC
[activemq] branch master updated (ff02246 -> 5838228)
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/activemq.git.
from ff02246 [AMQ-7401] This closes #447
new f1d0100 Provide RMI registry implementation to prevent re-bind
new b7dca5e [AMQ-7400] Fix OSGi statement about sun.rmi
new 5838228 [AMQ-7400] This closes #443
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../activemq/broker/jmx/ManagementContext.java | 67 +++++++++++++++++++---
activemq-osgi/pom.xml | 1 +
2 files changed, 59 insertions(+), 9 deletions(-)
[activemq] 03/03: [AMQ-7400] This closes #443
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq.git
commit 58382283330f7c7b110c7afd8ef4ca2648786532
Merge: ff02246 b7dca5e
Author: jbonofre <jb...@apache.org>
AuthorDate: Tue Feb 11 21:24:09 2020 +0100
[AMQ-7400] This closes #443
.../activemq/broker/jmx/ManagementContext.java | 67 +++++++++++++++++++---
activemq-osgi/pom.xml | 1 +
2 files changed, 59 insertions(+), 9 deletions(-)
[activemq] 02/03: [AMQ-7400] Fix OSGi statement about sun.rmi
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq.git
commit b7dca5e0738639f2bffe7f97b9c782372fc2188e
Author: jbonofre <jb...@apache.org>
AuthorDate: Tue Feb 11 21:22:28 2020 +0100
[AMQ-7400] Fix OSGi statement about sun.rmi
---
activemq-osgi/pom.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/activemq-osgi/pom.xml b/activemq-osgi/pom.xml
index 2c31c4b..f0158b6 100644
--- a/activemq-osgi/pom.xml
+++ b/activemq-osgi/pom.xml
@@ -41,6 +41,7 @@
!com.google.j2objc.annotations,
sun.misc*;resolution:=optional,
sun.nio*;resolution:=optional,
+ sun.rmi*;resolution:=optional,
javax.jmdns*;resolution:=optional,
javax.resource*;resolution:=optional,
javax.servlet*;resolution:=optional,
[activemq] 01/03: Provide RMI registry implementation to prevent
re-bind
Posted by jb...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jbonofre pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/activemq.git
commit f1d0100832d5bd1609cb1c31aded3ab094ae395d
Author: Jonathan Gallimore <jo...@jrg.me.uk>
AuthorDate: Thu Jan 30 15:00:48 2020 +0000
Provide RMI registry implementation to prevent re-bind
---
.../activemq/broker/jmx/ManagementContext.java | 67 +++++++++++++++++++---
1 file changed, 58 insertions(+), 9 deletions(-)
diff --git a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java
index c5f829d..080570c 100644
--- a/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java
+++ b/activemq-broker/src/main/java/org/apache/activemq/broker/jmx/ManagementContext.java
@@ -17,11 +17,17 @@
package org.apache.activemq.broker.jmx;
import java.io.IOException;
+import java.lang.management.ManagementFactory;
import java.lang.reflect.Method;
+import java.rmi.AccessException;
+import java.rmi.AlreadyBoundException;
import java.rmi.NoSuchObjectException;
-import java.rmi.registry.LocateRegistry;
+import java.rmi.NotBoundException;
+import java.rmi.Remote;
+import java.rmi.RemoteException;
import java.rmi.registry.Registry;
import java.rmi.server.UnicastRemoteObject;
+import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
@@ -42,8 +48,9 @@ import javax.management.ObjectInstance;
import javax.management.ObjectName;
import javax.management.QueryExp;
import javax.management.remote.JMXConnectorServer;
-import javax.management.remote.JMXConnectorServerFactory;
import javax.management.remote.JMXServiceURL;
+import javax.management.remote.rmi.RMIConnectorServer;
+import javax.management.remote.rmi.RMIJRMPServerImpl;
import org.apache.activemq.Service;
import org.slf4j.Logger;
@@ -98,6 +105,8 @@ public class ManagementContext implements Service {
private String brokerName;
private String suppressMBean;
private List<ObjectName> suppressMBeanList;
+ private Remote serverStub;
+ private RMIJRMPServerImpl server;
public ManagementContext() {
this(null);
@@ -140,20 +149,20 @@ public class ManagementContext implements Service {
MDC.put("activemq.broker", brokerName);
}
try {
- JMXConnectorServer server = connectorServer;
if (started.get() && server != null) {
LOG.debug("Starting JMXConnectorServer...");
try {
// need to remove MDC as we must not inherit MDC in child threads causing leaks
MDC.remove("activemq.broker");
- server.start();
+ connectorServer.start();
+ serverStub = server.toStub();
} finally {
if (brokerName != null) {
MDC.put("activemq.broker", brokerName);
}
connectorStarted.countDown();
}
- LOG.info("JMX consoles can connect to {}", server.getAddress());
+ LOG.info("JMX consoles can connect to {}", connectorServer.getAddress());
}
} catch (IOException e) {
LOG.warn("Failed to start JMX connector {}. Will restart management to re-create JMX connector, trying to remedy this issue.", e.getMessage());
@@ -546,8 +555,9 @@ public class ManagementContext implements Service {
try {
if (registry == null) {
LOG.debug("Creating RMIRegistry on port {}", connectorPort);
- registry = LocateRegistry.createRegistry(connectorPort);
+ registry = new JmxRegistry(connectorPort);
}
+
namingServiceObjectName = ObjectName.getInstance("naming:type=rmiregistry");
// Do not use the createMBean as the mx4j jar may not be in the
@@ -570,10 +580,14 @@ public class ManagementContext implements Service {
// This is handy to use if you have a firewall and need to force JMX to use fixed ports.
rmiServer = ""+getConnectorHost()+":" + rmiServerPort;
}
- String serviceURL = "service:jmx:rmi://" + rmiServer + "/jndi/rmi://" +getConnectorHost()+":" + connectorPort + connectorPath;
- JMXServiceURL url = new JMXServiceURL(serviceURL);
- connectorServer = JMXConnectorServerFactory.newJMXConnectorServer(url, environment, mbeanServer);
+ final Map<String,Object> env = new HashMap<>();
+ server = new RMIJRMPServerImpl(connectorPort, null, null, environment);
+
+ final String serviceURL = "service:jmx:rmi://" + rmiServer + "/jndi/rmi://" +getConnectorHost()+":" + connectorPort + connectorPath;
+ final JMXServiceURL url = new JMXServiceURL(serviceURL);
+
+ connectorServer = new RMIConnectorServer(url, env, server, ManagementFactory.getPlatformMBeanServer());
LOG.debug("Created JMXConnectorServer {}", connectorServer);
}
@@ -664,4 +678,39 @@ public class ManagementContext implements Service {
public String getSuppressMBean() {
return suppressMBean;
}
+
+ /*
+ * Better to use the internal API than re-invent the wheel.
+ */
+ @SuppressWarnings("restriction")
+ private class JmxRegistry extends sun.rmi.registry.RegistryImpl {
+ public static final String LOOKUP_NAME = "jmxrmi";
+
+ public JmxRegistry(int port) throws RemoteException {
+ super(port);
+ }
+
+ @Override
+
+ public Remote lookup(String s) throws RemoteException, NotBoundException {
+ return LOOKUP_NAME.equals(s) ? serverStub : null;
+ }
+
+ @Override
+ public void bind(String s, Remote remote) throws RemoteException, AlreadyBoundException, AccessException {
+ }
+
+ @Override
+ public void unbind(String s) throws RemoteException, NotBoundException, AccessException {
+ }
+
+ @Override
+ public void rebind(String s, Remote remote) throws RemoteException, AccessException {
+ }
+
+ @Override
+ public String[] list() throws RemoteException {
+ return new String[] {LOOKUP_NAME};
+ }
+ }
}