Author: dejanb
Date: Thu Dec 30 17:03:35 2010
New Revision: 1053942
URL: http://svn.apache.org/viewvc?rev=1053942&view=rev
Log:
https://issues.apache.org/jira/browse/AMQ-3109 - mbeans for bridges created by
duplex connector
Added:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/MBeanNetworkListener.java
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/NetworkBridgeView.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/NetworkBridgeViewMBean.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/DuplexNetworkMBeanTest.java
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java?rev=1053942&r1=1053941&r2=1053942&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
(original)
+++
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
Thu Dec 30 17:03:35 2010
@@ -1702,6 +1702,14 @@ public class BrokerService implements Se
+ "NetworkConnectorName=" +
JMXSupport.encodeObjectNamePart(connector.getName()));
}
+
+ public ObjectName createDuplexNetworkConnectorObjectName(String transport)
+ throws MalformedObjectNameException {
+ return new ObjectName(getManagementContext().getJmxDomainName() + ":"
+ "BrokerName="
+ + JMXSupport.encodeObjectNamePart(getBrokerName()) + "," +
"Type=NetworkConnector,"
+ + "NetworkConnectorName=duplex" +
JMXSupport.encodeObjectNamePart(transport));
+ }
+
protected void unregisterNetworkConnectorMBean(NetworkConnector connector)
{
if (isUseJmx()) {
try {
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java?rev=1053942&r1=1053941&r2=1053942&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java
(original)
+++
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/TransportConnection.java
Thu Dec 30 17:03:35 2010
@@ -33,6 +33,7 @@ import java.util.concurrent.atomic.Atomi
import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.locks.ReentrantReadWriteLock;
+import javax.management.ObjectName;
import javax.transaction.xa.XAResource;
import org.apache.activemq.broker.ft.MasterBroker;
@@ -72,9 +73,7 @@ import org.apache.activemq.command.Shutd
import org.apache.activemq.command.TransactionId;
import org.apache.activemq.command.TransactionInfo;
import org.apache.activemq.command.WireFormatInfo;
-import org.apache.activemq.network.DemandForwardingBridge;
-import org.apache.activemq.network.NetworkBridgeConfiguration;
-import org.apache.activemq.network.NetworkBridgeFactory;
+import org.apache.activemq.network.*;
import org.apache.activemq.security.MessageAuthorizationPolicy;
import org.apache.activemq.state.CommandVisitor;
import org.apache.activemq.state.ConnectionState;
@@ -1209,7 +1208,13 @@ public class TransportConnection impleme
uri = URISupport.createURIWithQuery(uri,
URISupport.createQueryString(map));
Transport localTransport = TransportFactory.connect(uri);
Transport remoteBridgeTransport = new
ResponseCorrelator(transport);
- duplexBridge = NetworkBridgeFactory.createBridge(config,
localTransport, remoteBridgeTransport);
+ String duplexName = localTransport.toString();
+ if (duplexName.contains("#")) {
+ duplexName =
duplexName.substring(duplexName.lastIndexOf("#"));
+ }
+ MBeanNetworkListener listener = new
MBeanNetworkListener(broker.getBrokerService(),
broker.getBrokerService().createDuplexNetworkConnectorObjectName(duplexName));
+ listener.setCreatedByDuplex(true);
+ duplexBridge = NetworkBridgeFactory.createBridge(config,
localTransport, remoteBridgeTransport, listener);
duplexBridge.setBrokerService(broker.getBrokerService());
// now turn duplex off this side
info.setDuplexConnection(false);
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/NetworkBridgeView.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/NetworkBridgeView.java?rev=1053942&r1=1053941&r2=1053942&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/NetworkBridgeView.java
(original)
+++
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/NetworkBridgeView.java
Thu Dec 30 17:03:35 2010
@@ -21,6 +21,7 @@ import org.apache.activemq.network.Netwo
public class NetworkBridgeView implements NetworkBridgeViewMBean {
private final NetworkBridge bridge;
+ private boolean createByDuplex = false;
public NetworkBridgeView(NetworkBridge bridge) {
this.bridge = bridge;
@@ -58,4 +59,11 @@ public class NetworkBridgeView implement
return bridge.getDequeueCounter();
}
+ public boolean isCreatedByDuplex() {
+ return createByDuplex;
+ }
+
+ public void setCreateByDuplex(boolean createByDuplex) {
+ this.createByDuplex = createByDuplex;
+ }
}
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/NetworkBridgeViewMBean.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/NetworkBridgeViewMBean.java?rev=1053942&r1=1053941&r2=1053942&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/NetworkBridgeViewMBean.java
(original)
+++
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/broker/jmx/NetworkBridgeViewMBean.java
Thu Dec 30 17:03:35 2010
@@ -32,4 +32,6 @@ public interface NetworkBridgeViewMBean
long getDequeueCounter();
+ boolean isCreatedByDuplex();
+
}
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java?rev=1053942&r1=1053941&r2=1053942&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
(original)
+++
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DemandForwardingBridgeSupport.java
Thu Dec 30 17:03:35 2010
@@ -148,6 +148,7 @@ public abstract class DemandForwardingBr
this.duplexInitiatingConnection = connection;
start();
serviceRemoteCommand(remoteBrokerInfo);
+ brokerService.getBroker().networkBridgeStarted(remoteBrokerInfo);
}
public void start() throws Exception {
Modified:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java?rev=1053942&r1=1053941&r2=1053942&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java
(original)
+++
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/DiscoveryNetworkConnector.java
Thu Dec 30 17:03:35 2010
@@ -23,6 +23,7 @@ import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+import org.apache.activemq.broker.BrokerService;
import org.apache.activemq.broker.SslContext;
import org.apache.activemq.command.DiscoveryEvent;
import org.apache.activemq.transport.Transport;
@@ -39,6 +40,8 @@ import org.apache.activemq.util.URISuppo
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import javax.management.ObjectName;
+
/**
* A network connector which uses a discovery agent to detect the remote
brokers
* available and setup a connection to each available remote broker
@@ -206,7 +209,11 @@ public class DiscoveryNetworkConnector e
}
protected NetworkBridge createBridge(Transport localTransport, Transport
remoteTransport, final DiscoveryEvent event) {
- NetworkBridgeListener listener = new NetworkBridgeListener() {
+ class DiscoverNetworkBridgeListener extends MBeanNetworkListener {
+
+ public DiscoverNetworkBridgeListener(BrokerService brokerService,
ObjectName connectorName) {
+ super(brokerService, connectorName);
+ }
public void bridgeFailed() {
if (!serviceSupport.isStopped()) {
@@ -217,16 +224,9 @@ public class DiscoveryNetworkConnector e
}
}
+ }
+ NetworkBridgeListener listener = new
DiscoverNetworkBridgeListener(getBrokerService(), getObjectName());
- public void onStart(NetworkBridge bridge) {
- registerNetworkBridgeMBean(bridge);
- }
-
- public void onStop(NetworkBridge bridge) {
- unregisterNetworkBridgeMBean(bridge);
- }
-
- };
DemandForwardingBridge result =
NetworkBridgeFactory.createBridge(this, localTransport, remoteTransport,
listener);
result.setBrokerService(getBrokerService());
return configureBridge(result);
Added:
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/MBeanNetworkListener.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/MBeanNetworkListener.java?rev=1053942&view=auto
==============================================================================
---
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/MBeanNetworkListener.java
(added)
+++
activemq/trunk/activemq-core/src/main/java/org/apache/activemq/network/MBeanNetworkListener.java
Thu Dec 30 17:03:35 2010
@@ -0,0 +1,89 @@
+/**
+ * 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.activemq.network;
+
+import org.apache.activemq.broker.BrokerService;
+import org.apache.activemq.broker.jmx.AnnotatedMBean;
+import org.apache.activemq.broker.jmx.NetworkBridgeView;
+import org.apache.activemq.broker.jmx.NetworkBridgeViewMBean;
+import org.apache.activemq.util.JMXSupport;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+import java.util.HashMap;
+import java.util.Map;
+
+public class MBeanNetworkListener implements NetworkBridgeListener {
+
+ private static final Log LOG =
LogFactory.getLog(MBeanNetworkListener.class);
+
+ BrokerService brokerService;
+ ObjectName connectorName;
+ boolean createdByDuplex = false;
+
+ public MBeanNetworkListener(BrokerService brokerService, ObjectName
connectorName) {
+ this.brokerService = brokerService;
+ this.connectorName = connectorName;
+ }
+
+ @Override
+ public void bridgeFailed() {
+
+ }
+
+ @Override
+ public void onStart(NetworkBridge bridge) {
+ if (!brokerService.isUseJmx()) {
+ return;
+ }
+ NetworkBridgeViewMBean view = new NetworkBridgeView(bridge);
+ ((NetworkBridgeView)view).setCreateByDuplex(createdByDuplex);
+ try {
+ ObjectName objectName = createNetworkBridgeObjectName(bridge);
+ AnnotatedMBean.registerMBean(brokerService.getManagementContext(),
view, objectName);
+ } catch (Throwable e) {
+ LOG.debug("Network bridge could not be registered in JMX: " +
e.getMessage(), e);
+ }
+ }
+
+ @Override
+ public void onStop(NetworkBridge bridge) {
+ if (!brokerService.isUseJmx()) {
+ return;
+ }
+ try {
+ ObjectName objectName = createNetworkBridgeObjectName(bridge);
+ brokerService.getManagementContext().unregisterMBean(objectName);
+ } catch (Throwable e) {
+ LOG.debug("Network bridge could not be unregistered in JMX: " +
e.getMessage(), e);
+ }
+ }
+
+
+ protected ObjectName createNetworkBridgeObjectName(NetworkBridge bridge)
throws MalformedObjectNameException {
+ Map<String, String> map = new HashMap<String,
String>(connectorName.getKeyPropertyList());
+ return new ObjectName(connectorName.getDomain() + ":" + "BrokerName="
+ JMXSupport.encodeObjectNamePart((String) map.get("BrokerName")) + "," +
"Type=NetworkBridge,"
+ + "NetworkConnectorName=" +
JMXSupport.encodeObjectNamePart((String)map.get("NetworkConnectorName")) + ","
+ "Name="
+ +
JMXSupport.encodeObjectNamePart(JMXSupport.encodeObjectNamePart(bridge.getRemoteAddress())));
+ }
+
+ public void setCreatedByDuplex(boolean createdByDuplex) {
+ this.createdByDuplex = createdByDuplex;
+ }
+}
Modified:
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/DuplexNetworkMBeanTest.java
URL:
http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/DuplexNetworkMBeanTest.java?rev=1053942&r1=1053941&r2=1053942&view=diff
==============================================================================
---
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/DuplexNetworkMBeanTest.java
(original)
+++
activemq/trunk/activemq-core/src/test/java/org/apache/activemq/network/DuplexNetworkMBeanTest.java
Thu Dec 30 17:03:35 2010
@@ -68,10 +68,12 @@ public class DuplexNetworkMBeanTest {
networkedBroker = createNetworkedBroker();
networkedBroker.start();
assertEquals(1, countMbeans(networkedBroker, "NetworkBridge",
2000));
+ assertEquals(1, countMbeans(broker, "NetworkBridge", 2000));
assertEquals(1, countMbeans(broker, "Connection"));
networkedBroker.stop();
networkedBroker.waitUntilStopped();
assertEquals(0, countMbeans(networkedBroker, "stopped"));
+ assertEquals(0, countMbeans(broker, "NetworkBridge"));
}
assertEquals(0, countMbeans(networkedBroker, "NetworkBridge"));
