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

ARTEMIS-90 add acceptor factory to service registry

This commit is contained in:
jbertram 2015-06-17 10:37:07 -05:00 committed by Clebert Suconic
parent 61bd181499
commit f60950cd3d
3 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
artemis-server/src/main/java/org/apache/activemq/artemis/core/remoting/server/impl/RemotingServiceImpl.java
View File

@ -229,15 +229,11 @@ public class RemotingServiceImpl implements RemotingService, ConnectionLifeCycle
threadPool = Executors.newCachedThreadPool(tFactory);
ClassLoader loader = Thread.currentThread().getContextClassLoader();
for (TransportConfiguration info : acceptorsConfig)
{
try
{
Class<?> clazz = loader.loadClass(info.getFactoryClassName());
AcceptorFactory factory = (AcceptorFactory) clazz.newInstance();
AcceptorFactory factory = server.getServiceRegistry().getAcceptorFactory(info.getName(), info.getFactoryClassName());
Map<String, ProtocolManager> supportedProtocols = new ConcurrentHashMap();

5
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/ServiceRegistry.java
View File

@ -20,6 +20,7 @@ import org.apache.activemq.artemis.api.core.Interceptor;
import org.apache.activemq.artemis.api.core.Pair;
import org.apache.activemq.artemis.core.config.ConnectorServiceConfiguration;
import org.apache.activemq.artemis.core.server.cluster.Transformer;
import org.apache.activemq.artemis.spi.core.remoting.AcceptorFactory;
import java.util.Collection;
import java.util.concurrent.ExecutorService;
@ -63,4 +64,8 @@ public interface ServiceRegistry
Transformer getDivertTransformer(String name);
Transformer getBridgeTransformer(String name);
AcceptorFactory getAcceptorFactory(String name, String className);
void addAcceptorFactory(String name, AcceptorFactory acceptorFactory);
}

34
artemis-server/src/main/java/org/apache/activemq/artemis/core/server/impl/ServiceRegistryImpl.java
View File

@ -16,6 +16,8 @@
*/
package org.apache.activemq.artemis.core.server.impl;
import java.security.AccessController;
import java.security.PrivilegedAction;
import java.util.Collection;
import java.util.Collections;
import java.util.Map;
@ -29,6 +31,8 @@ import org.apache.activemq.artemis.core.config.ConnectorServiceConfiguration;
import org.apache.activemq.artemis.core.server.ConnectorServiceFactory;
import org.apache.activemq.artemis.core.server.ServiceRegistry;
import org.apache.activemq.artemis.core.server.cluster.Transformer;
import org.apache.activemq.artemis.spi.core.remoting.AcceptorFactory;
import org.apache.activemq.artemis.utils.ClassloadingUtil;
public class ServiceRegistryImpl implements ServiceRegistry
{
@ -47,6 +51,8 @@ public class ServiceRegistryImpl implements ServiceRegistry
private Map<String, Transformer> bridgeTransformers;
private Map<String, AcceptorFactory> acceptorFactories;
private Map<String, Pair<ConnectorServiceFactory, ConnectorServiceConfiguration>> connectorServices;
public ServiceRegistryImpl()
@ -56,6 +62,7 @@ public class ServiceRegistryImpl implements ServiceRegistry
this.connectorServices = new ConcurrentHashMap<>();
this.divertTransformers = new ConcurrentHashMap<>();
this.bridgeTransformers = new ConcurrentHashMap<>();
this.acceptorFactories = new ConcurrentHashMap<>();
}
public ExecutorService getExecutorService()
@ -153,4 +160,31 @@ public class ServiceRegistryImpl implements ServiceRegistry
{
return bridgeTransformers.get(name);
}
@Override
public AcceptorFactory getAcceptorFactory(String name, final String className)
{
AcceptorFactory factory = acceptorFactories.get(name);
if (factory == null)
{
factory = AccessController.doPrivileged(new PrivilegedAction<AcceptorFactory>()
{
public AcceptorFactory run()
{
return (AcceptorFactory) ClassloadingUtil.newInstanceFromClassLoader(className);
}
});
addAcceptorFactory(name, factory);
}
return factory;
}
@Override
public void addAcceptorFactory(String name, AcceptorFactory acceptorFactory)
{
acceptorFactories.put(name, acceptorFactory);
}
}