From 3db640c26ba5de4ab4161fb93813c66e5e99af77 Mon Sep 17 00:00:00 2001 From: Andrew Donald Kennedy Date: Thu, 3 Mar 2011 01:55:19 +0000 Subject: QPID-3026: The application registry object should be a singleton git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/grkvlt-network-20110301@1076491 13f79535-47bb-0310-9956-ffa450edef68 --- .../security/access/FirewallConfigurationTest.java | 39 +++--- .../org/apache/qpid/server/BrokerInstance.java | 4 +- .../qpid/server/configuration/SystemConfig.java | 4 +- .../server/configuration/SystemConfigImpl.java | 17 +-- .../qpid/server/registry/ApplicationRegistry.java | 140 +++++++-------------- .../qpid/server/registry/IApplicationRegistry.java | 6 +- .../server/transport/ServerConnectionDelegate.java | 3 +- .../qpid/server/virtualhost/VirtualHostImpl.java | 2 +- .../qpid/tools/messagestore/MessageStoreTool.java | 55 +++----- .../configuration/ServerConfigurationTest.java | 10 +- .../org/apache/qpid/transport/vm/VmBroker.java | 8 -- .../qpid/test/framework/BrokerLifecycleAware.java | 14 --- .../qpid/test/framework/FrameworkBaseCase.java | 18 --- .../qpid/test/framework/qpid/CauseFailureInVM.java | 11 +- .../test/framework/qpid/InVMBrokerDecorator.java | 3 - 15 files changed, 114 insertions(+), 220 deletions(-) diff --git a/qpid/java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallConfigurationTest.java b/qpid/java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallConfigurationTest.java index ab8957e7ef..bb340f433d 100644 --- a/qpid/java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallConfigurationTest.java +++ b/qpid/java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallConfigurationTest.java @@ -45,7 +45,7 @@ public class FirewallConfigurationTest extends InternalBrokerBaseCase ApplicationRegistry reg = new ConfigurationFileApplicationRegistry(mainFile); try { - ApplicationRegistry.initialise(reg, 1); + ApplicationRegistry.initialise(reg); // Test config assertFalse(reg.getSecurityManager().accessVirtualhost("test", new InetSocketAddress("127.0.0.1", 65535))); @@ -53,7 +53,7 @@ public class FirewallConfigurationTest extends InternalBrokerBaseCase } finally { - ApplicationRegistry.remove(1); + ApplicationRegistry.remove(); } } @@ -118,14 +118,14 @@ public class FirewallConfigurationTest extends InternalBrokerBaseCase ApplicationRegistry reg = new ConfigurationFileApplicationRegistry(mainFile); try { - ApplicationRegistry.initialise(reg, 1); + ApplicationRegistry.initialise(reg); // Test config assertFalse(reg.getSecurityManager().accessVirtualhost("test", new InetSocketAddress("127.0.0.1", 65535))); } finally { - ApplicationRegistry.remove(1); + ApplicationRegistry.remove(); } } @@ -141,7 +141,7 @@ public class FirewallConfigurationTest extends InternalBrokerBaseCase ApplicationRegistry reg = new ConfigurationFileApplicationRegistry(mainFile); try { - ApplicationRegistry.initialise(reg, 1); + ApplicationRegistry.initialise(reg); // Test config assertFalse(reg.getSecurityManager().accessVirtualhost("test", new InetSocketAddress("127.0.0.1", 65535))); @@ -155,7 +155,7 @@ public class FirewallConfigurationTest extends InternalBrokerBaseCase } finally { - ApplicationRegistry.remove(1); + ApplicationRegistry.remove(); } } @@ -219,7 +219,7 @@ public class FirewallConfigurationTest extends InternalBrokerBaseCase ApplicationRegistry reg = new ConfigurationFileApplicationRegistry(mainFile); try { - ApplicationRegistry.initialise(reg, 1); + ApplicationRegistry.initialise(reg); // Test config assertFalse(reg.getSecurityManager().accessVirtualhost("test", new InetSocketAddress("127.0.0.1", 65535))); @@ -256,7 +256,7 @@ public class FirewallConfigurationTest extends InternalBrokerBaseCase } finally { - ApplicationRegistry.remove(1); + ApplicationRegistry.remove(); } } @@ -346,13 +346,20 @@ public class FirewallConfigurationTest extends InternalBrokerBaseCase // Load config ApplicationRegistry reg = new ConfigurationFileApplicationRegistry(mainFile); - ApplicationRegistry.initialise(reg, 1); - - // Test config - VirtualHostRegistry virtualHostRegistry = reg.getVirtualHostRegistry(); - VirtualHost virtualHost = virtualHostRegistry.getVirtualHost("test"); - - assertEquals("Incorrect virtualhost count", 1, virtualHostRegistry.getVirtualHosts().size()); - assertEquals("Incorrect virtualhost name", "test", virtualHost.getName()); + try + { + ApplicationRegistry.initialise(reg); + + // Test config + VirtualHostRegistry virtualHostRegistry = reg.getVirtualHostRegistry(); + VirtualHost virtualHost = virtualHostRegistry.getVirtualHost("test"); + + assertEquals("Incorrect virtualhost count", 1, virtualHostRegistry.getVirtualHosts().size()); + assertEquals("Incorrect virtualhost name", "test", virtualHost.getName()); + } + finally + { + ApplicationRegistry.remove(); + } } } diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerInstance.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerInstance.java index 7ff4c8b3c7..75ba99169c 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerInstance.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerInstance.java @@ -231,7 +231,7 @@ public class BrokerInstance ReceiverFactory factory = new BrokerReceiverFactory(host, supported); transport.accept(settings, factory, sslFactory); - ApplicationRegistry.getInstance().registerTransport(port, transport); + config.registerTransport(port, transport); CurrentActor.get().message(BrokerMessages.LISTENING(protocol.toUpperCase(), port)); } } @@ -245,7 +245,7 @@ public class BrokerInstance ReceiverFactory factory = new BrokerReceiverFactory(host, EnumSet.allOf(VERSION.class)); transport.accept(settings, factory, sslFactory); - ApplicationRegistry.getInstance().registerTransport(serverConfig.getSSLPort(), transport); + config.registerTransport(serverConfig.getSSLPort(), transport); CurrentActor.get().message(BrokerMessages.LISTENING(protocol.toUpperCase() + "/SSL", serverConfig.getSSLPort())); } diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfig.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfig.java index 8a9029fbfd..2554410f9f 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfig.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfig.java @@ -36,7 +36,7 @@ public interface SystemConfig extends ConfiguredObject _brokers = new ConcurrentHashMap(); + private BrokerConfig _broker; private final long _createTime = System.currentTimeMillis(); private final ConfigStore _store; @@ -60,7 +56,7 @@ public class SystemConfigImpl implements SystemConfig } catch (UnknownHostException e) { - host="localhost"; + host = "localhost"; } _host = host; } @@ -115,17 +111,16 @@ public class SystemConfigImpl implements SystemConfig return false; } - public void addBroker(final BrokerConfig broker) + public void setBrokerConfig(final BrokerConfig broker) { broker.setSystem(this); _store.addConfiguredObject(broker); - _brokers.put(broker.getId(), broker); + _broker = broker; } - public void removeBroker(final BrokerConfig broker) + public BrokerConfig getBrokerConfig() { - _brokers.remove(broker.getId()); - _store.removeConfiguredObject(broker); + return _broker; } public long getCreateTime() diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java index fd544a7a76..07b84af31c 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java @@ -20,7 +20,6 @@ */ package org.apache.qpid.server.registry; -import java.net.InetSocketAddress; import java.util.HashMap; import java.util.Map; import java.util.UUID; @@ -41,7 +40,6 @@ import org.apache.qpid.server.configuration.VirtualHostConfiguration; import org.apache.qpid.server.logging.CompositeStartupMessageLogger; import org.apache.qpid.server.logging.Log4jMessageLogger; import org.apache.qpid.server.logging.RootMessageLogger; -import org.apache.qpid.server.logging.AbstractRootMessageLogger; import org.apache.qpid.server.logging.SystemOutMessageLogger; import org.apache.qpid.server.logging.actors.BrokerActor; import org.apache.qpid.server.logging.actors.CurrentActor; @@ -60,16 +58,22 @@ import org.apache.qpid.server.virtualhost.VirtualHostRegistry; import org.apache.qpid.transport.network.NetworkTransport; /** - * An abstract application registry that provides access to configuration information and handles the + * An abstract application registry. + * + * This class provides access to configuration information and handles the * construction and caching of configurable objects. - *

- * Subclasses should handle the construction of the "registered objects" such as the exchange registry. + *

+ * Subclasses should handle the construction of the registered objects + * such as the exchange registry. + * + * @see ConfigurationFileApplicationRegistry + * @see TestApplicationRegistry */ public abstract class ApplicationRegistry implements IApplicationRegistry { protected static final Logger _logger = Logger.getLogger(ApplicationRegistry.class); - private static Map _instanceMap = new HashMap(); + private static IApplicationRegistry _instance = null; protected final ServerConfiguration _configuration; @@ -114,54 +118,40 @@ public abstract class ApplicationRegistry implements IApplicationRegistry { public void run() { - removeAll(); + remove(); } } public static void initialise(IApplicationRegistry instance) throws Exception { - initialise(instance, DEFAULT_INSTANCE); - } - - @SuppressWarnings("finally") - public static void initialise(IApplicationRegistry instance, int instanceID) throws Exception - { - if (instance != null) - { - _logger.info("Initialising Application Registry(" + instance + "):" + instanceID); - _instanceMap.put(instanceID, instance); + _logger.info("Initialising Application Registry(" + instance + ")"); + _instance = instance; - final ConfigStore store = ConfigStore.newInstance(); - store.setRoot(new SystemConfigImpl(store)); - instance.setConfigStore(store); + final ConfigStore store = ConfigStore.newInstance(); + store.setRoot(new SystemConfigImpl(store)); + instance.setConfigStore(store); - BrokerConfig broker = new BrokerConfigAdapter(instance); + BrokerConfig broker = new BrokerConfigAdapter(instance); - SystemConfig system = (SystemConfig) store.getRoot(); - system.addBroker(broker); - instance.setBroker(broker); + SystemConfig system = (SystemConfig) store.getRoot(); + system.setBrokerConfig(broker); + instance.setBrokerConfig(broker); + try + { + instance.initialise(); + } + catch (Exception e) + { try { - instance.initialise(instanceID); + remove(); } - catch (Exception e) + finally { - _instanceMap.remove(instanceID); - try - { - system.removeBroker(broker); - } - finally - { - throw e; - } + throw e; } } - else - { - remove(instanceID); - } } public ConfigStore getConfigStore() @@ -176,57 +166,31 @@ public abstract class ApplicationRegistry implements IApplicationRegistry public static boolean isConfigured() { - return isConfigured(DEFAULT_INSTANCE); - } - - public static boolean isConfigured(int instanceID) - { - return _instanceMap.containsKey(instanceID); + return _instance != null; } /** Method to cleanly shutdown the default registry running in this JVM */ public static void remove() - { - remove(DEFAULT_INSTANCE); - } - - /** - * Method to cleanly shutdown specified registry running in this JVM - * - * @param instanceID the instance to shutdown - */ - public static void remove(int instanceID) { try { - IApplicationRegistry instance = _instanceMap.get(instanceID); - if (instance != null) + if (isConfigured()) { if (_logger.isInfoEnabled()) { - _logger.info("Shutting down ApplicationRegistry(" + instanceID + "):" + instance); + _logger.info("Shutting down ApplicationRegistry (" + _instance + ")"); } - instance.close(); - instance.getBroker().getSystem().removeBroker(instance.getBroker()); + _instance.setBrokerConfig(null); + _instance.close(); } } catch (Exception e) { - _logger.error("Error shutting down Application Registry(" + instanceID + "): " + e, e); + _logger.error("Error shutting down ApplicationRegistry (" + _instance + ") " + e.getMessage(), e); } finally { - _instanceMap.remove(instanceID); - } - } - - /** Method to cleanly shutdown all registries currently running in this JVM */ - public static void removeAll() - { - Object[] keys = _instanceMap.keySet().toArray(); - for (Object k : keys) - { - remove((Integer) k); + _instance = null; } } @@ -251,11 +215,11 @@ public abstract class ApplicationRegistry implements IApplicationRegistry _configuration.initialise(); } - public void initialise(int instanceID) throws Exception + public void initialise() throws Exception { //Create the RootLogger to be used during broker operation _rootMessageLogger = new Log4jMessageLogger(_configuration); - _registryName = String.valueOf(instanceID); + _registryName = _instance.getBrokerId().toString(); //Create the composite (log4j+SystemOut MessageLogger to be used during startup RootMessageLogger[] messageLoggers = {new SystemOutMessageLogger(), _rootMessageLogger}; @@ -323,23 +287,13 @@ public abstract class ApplicationRegistry implements IApplicationRegistry public static IApplicationRegistry getInstance() { - return getInstance(DEFAULT_INSTANCE); - } - - public static IApplicationRegistry getInstance(int instanceID) - { - synchronized (IApplicationRegistry.class) + if (!isConfigured()) { - IApplicationRegistry instance = _instanceMap.get(instanceID); - - if (instance == null) - { - throw new IllegalStateException("Application Registry (" + instanceID + ") not created"); - } - else - { - return instance; - } + throw new IllegalStateException("Application Registry not created"); + } + else + { + return _instance; } } @@ -479,12 +433,12 @@ public abstract class ApplicationRegistry implements IApplicationRegistry return _qmfService; } - public BrokerConfig getBroker() + public BrokerConfig getBrokerConfig() { return _broker; } - public void setBroker(final BrokerConfig broker) + public void setBrokerConfig(final BrokerConfig broker) { _broker = broker; } @@ -493,7 +447,7 @@ public abstract class ApplicationRegistry implements IApplicationRegistry { VirtualHostImpl virtualHost = new VirtualHostImpl(this, vhostConfig); _virtualHostRegistry.registerVirtualHost(virtualHost); - getBroker().addVirtualHost(virtualHost); + getBrokerConfig().addVirtualHost(virtualHost); return virtualHost; } } diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java index 272c10b79a..36f2c3dbb6 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java @@ -46,7 +46,7 @@ public interface IApplicationRegistry * initialise in the constructor will lead to failures since the registry reference will not have been set. * @param instanceID the instanceID that we can use to identify this AR. */ - void initialise(int instanceID) throws Exception; + void initialise() throws Exception; /** * Shutdown this Registry @@ -85,9 +85,9 @@ public interface IApplicationRegistry QMFService getQMFService(); - void setBroker(BrokerConfig broker); + void setBrokerConfig(BrokerConfig broker); - BrokerConfig getBroker(); + BrokerConfig getBrokerConfig(); VirtualHost createVirtualHost(VirtualHostConfiguration vhostConfig) throws Exception; diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java index 68724b2504..4bdb126cbd 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java @@ -38,7 +38,8 @@ public class ServerConnectionDelegate extends ServerDelegate public ServerConnectionDelegate(IApplicationRegistry appRegistry, String localFQDN) { - this(new HashMap(Collections.singletonMap("qpid.federation_tag",appRegistry.getBroker().getFederationTag())), Collections.singletonList((Object)"en_US"), appRegistry, localFQDN); + this(Collections.singletonMap("qpid.federation_tag", appRegistry.getBrokerConfig().getFederationTag()), + Collections.singletonList((Object) "en_US"), appRegistry, localFQDN); } diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java index a550283a38..43b6b0cca7 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java @@ -195,7 +195,7 @@ public class VirtualHostImpl implements VirtualHost } _appRegistry = appRegistry; - _broker = _appRegistry.getBroker(); + _broker = _appRegistry.getBrokerConfig(); _configuration = hostConfig; _name = _configuration.getName(); diff --git a/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/MessageStoreTool.java b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/MessageStoreTool.java index dca165fa7e..406da0a4d7 100644 --- a/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/MessageStoreTool.java +++ b/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/MessageStoreTool.java @@ -96,7 +96,6 @@ public class MessageStoreTool public static void main(String[] args) throws Configuration.InitException { - MessageStoreTool tool = new MessageStoreTool(args); tool.start(); @@ -124,16 +123,16 @@ public class MessageStoreTool _config.processCommandline(args); } - + @SuppressWarnings("static-access") private void setOptions() { Option help = new Option("h", "help", false, "print this message"); Option version = new Option("v", "version", false, "print the version information and exit"); Option configFile = OptionBuilder.withArgName("file").hasArg() - .withDescription("use given configuration file By " - + "default looks for a file named " - + Configuration.DEFAULT_CONFIG_FILE + " in " + Configuration.QPID_HOME) + .withDescription("use given configuration file By " + + "default looks for a file named " + + Configuration.DEFAULT_CONFIG_FILE + " in " + Configuration.QPID_HOME) .withLongOpt("config") .create("c"); @@ -192,11 +191,10 @@ public class MessageStoreTool if (_initialised) { - ApplicationRegistry.remove(1); + ApplicationRegistry.remove(); } _console.println("...exiting"); - _console.close(); } @@ -218,7 +216,6 @@ public class MessageStoreTool } _console.println(""); - _console.println(BOILER_PLATE); runCLI(); @@ -227,7 +224,6 @@ public class MessageStoreTool private void setup() { loadDefaultVirtualHosts(); - loadCommands(); _state.clearAll(); @@ -236,7 +232,8 @@ public class MessageStoreTool private void loadCommands() { _commands.clear(); - //todo Dynamically load the classes that exis in com.redhat.etp.qpid.commands + + // TODO Dynamically load the classes that exis in com.redhat.etp.qpid.commands _commands.put("close", new Clear(this)); _commands.put("copy", new Copy(this)); _commands.put("dump", new Dump(this)); @@ -252,14 +249,13 @@ public class MessageStoreTool private void loadDefaultVirtualHosts() { - final File configFile = _config.getConfigFile(); + File configFile = _config.getConfigFile(); loadVirtualHosts(configFile); } private void loadVirtualHosts(File configFile) { - if (!configFile.exists()) { _devlog.error("Config file not found:" + configFile.getAbsolutePath()); @@ -273,11 +269,8 @@ public class MessageStoreTool try { ConfigurationFileApplicationRegistry registry = new ConfigurationFileApplicationRegistry(configFile); - - ApplicationRegistry.remove(1); - + ApplicationRegistry.remove(); ApplicationRegistry.initialise(registry); - checkMessageStores(); _initialised = true; } @@ -291,8 +284,6 @@ public class MessageStoreTool _console.println("Unable to load configuration due to: " + e.getMessage()); e.printStackTrace(); } - - } private void checkMessageStores() @@ -304,8 +295,8 @@ public class MessageStoreTool { if (vhost.getMessageStore() instanceof MemoryMessageStore) { - _console.println("WARNING: Virtualhost '" + vhost.getName() + "' is using a MemoryMessageStore. " - + "Changes will not persist."); + _console.println("WARNING: Virtualhost '" + vhost.getName() + "' is using a MemoryMessageStore. " + + "Changes will not persist."); warning = true; } } @@ -313,8 +304,8 @@ public class MessageStoreTool if (warning) { _console.println(""); - _console.println("Please ensure you are using the correct config file currently using '" - + _config.getConfigFile().getAbsolutePath() + "'"); + _console.println("Please ensure you are using the correct config file currently using '" + + _config.getConfigFile().getAbsolutePath() + "'"); _console.println("New config file can be specifed by 'load ' or -c on the commandline."); _console.println(""); } @@ -353,7 +344,6 @@ public class MessageStoreTool _console.print(prompt()); } - /** * Execute a script (batch mode). * @@ -361,7 +351,7 @@ public class MessageStoreTool */ protected void runScripts(String script) { - //Store Current State + // Store Current State boolean oldBatch = _batchMode; CommandParser oldParser = _console.getCommandParser(); setBatchMode(true); @@ -379,7 +369,7 @@ public class MessageStoreTool _devlog.error("Script not found: '" + script + "' due to:" + e.getMessage()); } - //Restore previous state + // Restore previous state _console.setCommandParser(oldParser); setBatchMode(oldBatch); } @@ -424,7 +414,6 @@ public class MessageStoreTool } } - /** * Displays usage info. */ @@ -435,13 +424,10 @@ public class MessageStoreTool System.out.println(" [-c ] : Defaults to \"$QPID_HOME/etc/config.xml\""); } - /** * This class is used to store the current state of the tool. * * This is then interrogated by the various commands to augment their behaviour. - * - * */ public static class State { @@ -450,10 +436,6 @@ public class MessageStoreTool private Exchange _exchange = null; private java.util.List _msgids = null; - public State() - { - } - public void setQueue(AMQQueue queue) { _queue = queue; @@ -515,7 +497,6 @@ public class MessageStoreTool return status.toString(); } - public String printMessages() { StringBuilder sb = new StringBuilder(); @@ -635,7 +616,6 @@ public class MessageStoreTool _msgids.add(Long.parseLong(next)); } } - } public void setMessages(java.util.List msgids) @@ -647,6 +627,5 @@ public class MessageStoreTool { return _msgids; } - }//Class State - -}//Class MessageStoreTool + } +} diff --git a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java index 106239c583..f7d8aa1d8d 100644 --- a/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java +++ b/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java @@ -1040,7 +1040,7 @@ public class ServerConfigurationTest extends InternalBrokerBaseCase // Load config ApplicationRegistry reg = new ConfigurationFileApplicationRegistry(mainFile); - ApplicationRegistry.initialise(reg, 1); + ApplicationRegistry.initialise(reg); // Test config VirtualHostRegistry virtualHostRegistry = reg.getVirtualHostRegistry(); @@ -1072,7 +1072,7 @@ public class ServerConfigurationTest extends InternalBrokerBaseCase // Load config ApplicationRegistry reg = new ConfigurationFileApplicationRegistry(mainFile); - ApplicationRegistry.initialise(reg, 1); + ApplicationRegistry.initialise(reg); // Test config VirtualHostRegistry virtualHostRegistry = reg.getVirtualHostRegistry(); @@ -1106,7 +1106,7 @@ public class ServerConfigurationTest extends InternalBrokerBaseCase // Load config ApplicationRegistry reg = new ConfigurationFileApplicationRegistry(mainFile); - ApplicationRegistry.initialise(reg, 1); + ApplicationRegistry.initialise(reg); // Test config VirtualHostRegistry virtualHostRegistry = reg.getVirtualHostRegistry(); @@ -1150,7 +1150,7 @@ public class ServerConfigurationTest extends InternalBrokerBaseCase try { ApplicationRegistry reg = new ConfigurationFileApplicationRegistry(mainFile); - ApplicationRegistry.initialise(reg, 1); + ApplicationRegistry.initialise(reg); fail("Different virtualhost XML configurations not allowed"); } catch (ConfigurationException ce) @@ -1184,7 +1184,7 @@ public class ServerConfigurationTest extends InternalBrokerBaseCase try { ApplicationRegistry reg = new ConfigurationFileApplicationRegistry(mainFile); - ApplicationRegistry.initialise(reg, 1); + ApplicationRegistry.initialise(reg); fail("Multiple virtualhost XML configurations not allowed"); } catch (ConfigurationException ce) diff --git a/qpid/java/common/src/main/java/org/apache/qpid/transport/vm/VmBroker.java b/qpid/java/common/src/main/java/org/apache/qpid/transport/vm/VmBroker.java index 2c42659b45..84ad07572b 100644 --- a/qpid/java/common/src/main/java/org/apache/qpid/transport/vm/VmBroker.java +++ b/qpid/java/common/src/main/java/org/apache/qpid/transport/vm/VmBroker.java @@ -21,15 +21,8 @@ package org.apache.qpid.transport.vm; import java.lang.reflect.Method; -import java.util.HashMap; -import java.util.Map; -import java.util.Set; import org.apache.qpid.BrokerOptions; -import org.apache.qpid.protocol.ReceiverFactory; -import org.apache.qpid.transport.ConnectionSettings; -import org.apache.qpid.transport.network.NetworkTransport; -import org.apache.qpid.transport.network.Transport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -43,7 +36,6 @@ public class VmBroker private static final Logger _logger = LoggerFactory.getLogger(VmBroker.class); private static Object _instance = null; - private static BrokerOptions _options = null; public static void createVMBroker() throws VMBrokerCreationException { diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/BrokerLifecycleAware.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/BrokerLifecycleAware.java index 41614f92fc..a23edeeb2a 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/BrokerLifecycleAware.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/BrokerLifecycleAware.java @@ -47,20 +47,6 @@ public interface BrokerLifecycleAware */ public boolean usingInVmBroker(); - /** - * Sets the currently live in-vm broker. - * - * @param i The currently live in-vm broker. - */ - public void setLiveBroker(int i); - - /** - * Reports the currently live in-vm broker. - * - * @return The currently live in-vm broker. - */ - public int getLiveBroker(); - /** * Accepts a failure mechanism. * diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkBaseCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkBaseCase.java index f866cd572f..70d1389bbb 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkBaseCase.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkBaseCase.java @@ -251,24 +251,6 @@ public class FrameworkBaseCase extends QpidBrokerTestCase implements FrameworkTe return isUsingInVM; } - /** - * Sets the currently live in-vm broker. - * - * @param i The currently live in-vm broker. - */ - public void setLiveBroker(int i) - { } - - /** - * Reports the currently live in-vm broker. - * - * @return The currently live in-vm broker. - */ - public int getLiveBroker() - { - return 0; - } - /** * Accepts a failure mechanism. * diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureInVM.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureInVM.java index de393b9105..b4607230cc 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureInVM.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureInVM.java @@ -50,8 +50,7 @@ public class CauseFailureInVM implements CauseFailure // Check that the test is really using in-vm brokers. if (!inVMTest.usingInVmBroker()) { - throw new RuntimeException( - "Cannot create in-vm broker failure mechanism for a test that is not using in-vm brokers."); + throw new RuntimeException("Cannot create in-vm broker failure mechanism for a test that is not using in-vm brokers."); } this.inVMTest = inVMTest; @@ -62,9 +61,11 @@ public class CauseFailureInVM implements CauseFailure */ public void causeFailure() { - int liveBroker = inVMTest.getLiveBroker(); - + if (!inVMTest.usingInVmBroker()) + { + throw new RuntimeException("Test is not using in-vm brokers."); + } + VmBroker.killVMBroker(); - ApplicationRegistry.remove(liveBroker); } } diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/InVMBrokerDecorator.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/InVMBrokerDecorator.java index 97a4592486..7ffd8ca2a4 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/InVMBrokerDecorator.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/InVMBrokerDecorator.java @@ -88,7 +88,6 @@ public class InVMBrokerDecorator extends WrappedSuiteTestDecorator // Ensure that the in-vm broker is created. try { - ApplicationRegistry.getInstance(1); VmBroker.createVMBroker(); } catch (VMBrokerCreationException e) @@ -104,7 +103,6 @@ public class InVMBrokerDecorator extends WrappedSuiteTestDecorator { // Ensure that the in-vm broker is cleaned up so that the next test starts afresh. VmBroker.killVMBroker(); - ApplicationRegistry.remove(1); } }); @@ -114,7 +112,6 @@ public class InVMBrokerDecorator extends WrappedSuiteTestDecorator { BrokerLifecycleAware inVMTest = (BrokerLifecycleAware) test; inVMTest.setInVmBrokers(); - inVMTest.setLiveBroker(1); inVMTest.setFailureMechanism(new CauseFailureInVM(inVMTest)); } } -- cgit v1.2.1