Apache
/
activemq
mirror of https://github.com/apache/activemq.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

http://jira.activemq.org/jira//browse/AMQ-568 

git-svn-id: https://svn.apache.org/repos/asf/incubator/activemq/trunk@378626 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Hiram R. Chirino 2006-02-17 21:01:04 +00:00
parent f680f3ab51
commit 236a1ac422
1 changed files with 21 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
activemq-core/src/main/java/org/apache/activemq/broker/BrokerService.java
View File

@ -16,8 +16,19 @@
*/ */
package org.apache.activemq.broker; package org.apache.activemq.broker;
import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList; import java.io.File;
import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean; import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
import javax.management.MBeanServer;
import javax.management.ObjectName;
import org.apache.activemq.ActiveMQConnectionMetaData; import org.apache.activemq.ActiveMQConnectionMetaData;
import org.apache.activemq.Service; import org.apache.activemq.Service;
@ -30,7 +41,6 @@ import org.apache.activemq.broker.jmx.ConnectorViewMBean;
import org.apache.activemq.broker.jmx.FTConnectorView; import org.apache.activemq.broker.jmx.FTConnectorView;
import org.apache.activemq.broker.jmx.JmsConnectorView; import org.apache.activemq.broker.jmx.JmsConnectorView;
import org.apache.activemq.broker.jmx.ManagedRegionBroker; import org.apache.activemq.broker.jmx.ManagedRegionBroker;
import org.apache.activemq.broker.jmx.ManagedTransportConnector;
import org.apache.activemq.broker.jmx.ManagementContext; import org.apache.activemq.broker.jmx.ManagementContext;
import org.apache.activemq.broker.jmx.NetworkConnectorView; import org.apache.activemq.broker.jmx.NetworkConnectorView;
import org.apache.activemq.broker.jmx.NetworkConnectorViewMBean; import org.apache.activemq.broker.jmx.NetworkConnectorViewMBean;
@ -55,19 +65,8 @@ import org.apache.activemq.util.URISupport;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import javax.management.MBeanServer; import edu.emory.mathcs.backport.java.util.concurrent.CopyOnWriteArrayList;
import javax.management.ObjectName; import edu.emory.mathcs.backport.java.util.concurrent.atomic.AtomicBoolean;
import java.io.File;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
/** /**
* Represents a running broker service which consists of a number of transport * Represents a running broker service which consists of a number of transport
@ -152,15 +151,16 @@ public class BrokerService implements Service {
*/ */
public TransportConnector addConnector(TransportConnector connector) throws Exception { public TransportConnector addConnector(TransportConnector connector) throws Exception {
if (isUseJmx()) {
connector = connector.asManagedConnector(getManagementContext().getMBeanServer(), getBrokerObjectName());
registerConnectorMBean(connector);
}
connector.setBroker(getBroker()); connector.setBroker(getBroker());
connector.setBrokerName(getBrokerName()); connector.setBrokerName(getBrokerName());
connector.setTaskRunnerFactory(getTaskRunnerFactory()); connector.setTaskRunnerFactory(getTaskRunnerFactory());
transportConnectors.add(connector); transportConnectors.add(connector);
if (isUseJmx()) {
connector = connector.asManagedConnector(getManagementContext().getMBeanServer(), getBrokerObjectName());
registerConnectorMBean(connector);
}
return connector; return connector;
} }
@ -924,15 +924,8 @@ public class BrokerService implements Service {
} }
protected TransportConnector createTransportConnector(Broker broker, URI brokerURI) throws Exception { protected TransportConnector createTransportConnector(Broker broker, URI brokerURI) throws Exception {
TransportServer transport = TransportFactory.bind(getBrokerName(),brokerURI); TransportServer transport = TransportFactory.bind(getBrokerName(),brokerURI);
if (isUseJmx()) { return new TransportConnector(broker, transport);
MBeanServer mbeanServer = getManagementContext().getMBeanServer();
return new ManagedTransportConnector(mbeanServer, getBrokerObjectName(), broker, transport);
}
else {
return new TransportConnector(broker, transport);
}
} }
/** /**