You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gr...@apache.org on 2011/03/03 02:55:20 UTC
svn commit: r1076491 - in /qpid/branches/grkvlt-network-20110301/qpid/java:
broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/
broker/src/main/java/org/apache/qpid/server/
broker/src/main/java/org/apache/qpid/server/configura...
Author: grkvlt
Date: Thu Mar 3 01:55:19 2011
New Revision: 1076491
URL: http://svn.apache.org/viewvc?rev=1076491&view=rev
Log:
QPID-3026: The application registry object should be a singleton
Modified:
qpid/branches/grkvlt-network-20110301/qpid/java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallConfigurationTest.java
qpid/branches/grkvlt-network-20110301/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerInstance.java
qpid/branches/grkvlt-network-20110301/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfig.java
qpid/branches/grkvlt-network-20110301/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfigImpl.java
qpid/branches/grkvlt-network-20110301/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
qpid/branches/grkvlt-network-20110301/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java
qpid/branches/grkvlt-network-20110301/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java
qpid/branches/grkvlt-network-20110301/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java
qpid/branches/grkvlt-network-20110301/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/MessageStoreTool.java
qpid/branches/grkvlt-network-20110301/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
qpid/branches/grkvlt-network-20110301/qpid/java/common/src/main/java/org/apache/qpid/transport/vm/VmBroker.java
qpid/branches/grkvlt-network-20110301/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/BrokerLifecycleAware.java
qpid/branches/grkvlt-network-20110301/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkBaseCase.java
qpid/branches/grkvlt-network-20110301/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureInVM.java
qpid/branches/grkvlt-network-20110301/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/InVMBrokerDecorator.java
Modified: qpid/branches/grkvlt-network-20110301/qpid/java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallConfigurationTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20110301/qpid/java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallConfigurationTest.java?rev=1076491&r1=1076490&r2=1076491&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20110301/qpid/java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallConfigurationTest.java (original)
+++ qpid/branches/grkvlt-network-20110301/qpid/java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallConfigurationTest.java Thu Mar 3 01:55:19 2011
@@ -45,7 +45,7 @@ public class FirewallConfigurationTest e
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 e
}
finally
{
- ApplicationRegistry.remove(1);
+ ApplicationRegistry.remove();
}
}
@@ -118,14 +118,14 @@ public class FirewallConfigurationTest e
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 e
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 e
}
finally
{
- ApplicationRegistry.remove(1);
+ ApplicationRegistry.remove();
}
}
@@ -219,7 +219,7 @@ public class FirewallConfigurationTest e
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 e
}
finally
{
- ApplicationRegistry.remove(1);
+ ApplicationRegistry.remove();
}
}
@@ -346,13 +346,20 @@ public class FirewallConfigurationTest e
// 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();
+ }
}
}
Modified: qpid/branches/grkvlt-network-20110301/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerInstance.java
URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20110301/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerInstance.java?rev=1076491&r1=1076490&r2=1076491&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20110301/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerInstance.java (original)
+++ qpid/branches/grkvlt-network-20110301/qpid/java/broker/src/main/java/org/apache/qpid/server/BrokerInstance.java Thu Mar 3 01:55:19 2011
@@ -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()));
}
Modified: qpid/branches/grkvlt-network-20110301/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfig.java
URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20110301/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfig.java?rev=1076491&r1=1076490&r2=1076491&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20110301/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfig.java (original)
+++ qpid/branches/grkvlt-network-20110301/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfig.java Thu Mar 3 01:55:19 2011
@@ -36,7 +36,7 @@ public interface SystemConfig extends Co
String getOSArchitecture();
- void addBroker(BrokerConfig broker);
+ void setBrokerConfig(BrokerConfig broker);
- void removeBroker(BrokerConfig broker);
+ BrokerConfig getBrokerConfig();
}
Modified: qpid/branches/grkvlt-network-20110301/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfigImpl.java
URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20110301/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfigImpl.java?rev=1076491&r1=1076490&r2=1076491&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20110301/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfigImpl.java (original)
+++ qpid/branches/grkvlt-network-20110301/qpid/java/broker/src/main/java/org/apache/qpid/server/configuration/SystemConfigImpl.java Thu Mar 3 01:55:19 2011
@@ -22,8 +22,6 @@
package org.apache.qpid.server.configuration;
import java.util.UUID;
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
import java.net.InetAddress;
import java.net.UnknownHostException;
@@ -35,10 +33,8 @@ public class SystemConfigImpl implements
private final UUID _id;
private String _name;
-
private final String _host;
-
- private final Map<UUID, BrokerConfig> _brokers = new ConcurrentHashMap<UUID, BrokerConfig>();
+ private BrokerConfig _broker;
private final long _createTime = System.currentTimeMillis();
private final ConfigStore _store;
@@ -60,7 +56,7 @@ public class SystemConfigImpl implements
}
catch (UnknownHostException e)
{
- host="localhost";
+ host = "localhost";
}
_host = host;
}
@@ -115,17 +111,16 @@ public class SystemConfigImpl implements
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()
Modified: qpid/branches/grkvlt-network-20110301/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20110301/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java?rev=1076491&r1=1076490&r2=1076491&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20110301/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java (original)
+++ qpid/branches/grkvlt-network-20110301/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java Thu Mar 3 01:55:19 2011
@@ -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.configurat
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.virtualhos
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.
- * <p/>
- * Subclasses should handle the construction of the "registered objects" such as the exchange registry.
+ * <p>
+ * Subclasses should handle the construction of the <em>registered objects</em>
+ * 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<Integer, IApplicationRegistry> _instanceMap = new HashMap<Integer, IApplicationRegistry>();
+ private static IApplicationRegistry _instance = null;
protected final ServerConfiguration _configuration;
@@ -114,54 +118,40 @@ public abstract class ApplicationRegistr
{
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);
-
- final ConfigStore store = ConfigStore.newInstance();
- store.setRoot(new SystemConfigImpl(store));
- instance.setConfigStore(store);
-
- BrokerConfig broker = new BrokerConfigAdapter(instance);
+ _logger.info("Initialising Application Registry(" + instance + ")");
+ _instance = instance;
- SystemConfig system = (SystemConfig) store.getRoot();
- system.addBroker(broker);
- instance.setBroker(broker);
+ final ConfigStore store = ConfigStore.newInstance();
+ store.setRoot(new SystemConfigImpl(store));
+ instance.setConfigStore(store);
+
+ BrokerConfig broker = new BrokerConfigAdapter(instance);
+
+ 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 ApplicationRegistr
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 ApplicationRegistr
_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 ApplicationRegistr
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 ApplicationRegistr
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 ApplicationRegistr
{
VirtualHostImpl virtualHost = new VirtualHostImpl(this, vhostConfig);
_virtualHostRegistry.registerVirtualHost(virtualHost);
- getBroker().addVirtualHost(virtualHost);
+ getBrokerConfig().addVirtualHost(virtualHost);
return virtualHost;
}
}
Modified: qpid/branches/grkvlt-network-20110301/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java
URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20110301/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java?rev=1076491&r1=1076490&r2=1076491&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20110301/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java (original)
+++ qpid/branches/grkvlt-network-20110301/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java Thu Mar 3 01:55:19 2011
@@ -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;
Modified: qpid/branches/grkvlt-network-20110301/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java
URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20110301/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java?rev=1076491&r1=1076490&r2=1076491&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20110301/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java (original)
+++ qpid/branches/grkvlt-network-20110301/qpid/java/broker/src/main/java/org/apache/qpid/server/transport/ServerConnectionDelegate.java Thu Mar 3 01:55:19 2011
@@ -38,7 +38,8 @@ public class ServerConnectionDelegate ex
public ServerConnectionDelegate(IApplicationRegistry appRegistry, String localFQDN)
{
- this(new HashMap<String,Object>(Collections.singletonMap("qpid.federation_tag",appRegistry.getBroker().getFederationTag())), Collections.singletonList((Object)"en_US"), appRegistry, localFQDN);
+ this(Collections.<String, Object>singletonMap("qpid.federation_tag", appRegistry.getBrokerConfig().getFederationTag()),
+ Collections.singletonList((Object) "en_US"), appRegistry, localFQDN);
}
Modified: qpid/branches/grkvlt-network-20110301/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java
URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20110301/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java?rev=1076491&r1=1076490&r2=1076491&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20110301/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java (original)
+++ qpid/branches/grkvlt-network-20110301/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java Thu Mar 3 01:55:19 2011
@@ -195,7 +195,7 @@ public class VirtualHostImpl implements
}
_appRegistry = appRegistry;
- _broker = _appRegistry.getBroker();
+ _broker = _appRegistry.getBrokerConfig();
_configuration = hostConfig;
_name = _configuration.getName();
Modified: qpid/branches/grkvlt-network-20110301/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/MessageStoreTool.java
URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20110301/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/MessageStoreTool.java?rev=1076491&r1=1076490&r2=1076491&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20110301/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/MessageStoreTool.java (original)
+++ qpid/branches/grkvlt-network-20110301/qpid/java/broker/src/main/java/org/apache/qpid/tools/messagestore/MessageStoreTool.java Thu Mar 3 01:55:19 2011
@@ -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 <config file>' 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 <broker config file>] : 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<Long> _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<Long> msgids)
@@ -647,6 +627,5 @@ public class MessageStoreTool
{
return _msgids;
}
- }//Class State
-
-}//Class MessageStoreTool
+ }
+}
Modified: qpid/branches/grkvlt-network-20110301/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java
URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20110301/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java?rev=1076491&r1=1076490&r2=1076491&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20110301/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java (original)
+++ qpid/branches/grkvlt-network-20110301/qpid/java/broker/src/test/java/org/apache/qpid/server/configuration/ServerConfigurationTest.java Thu Mar 3 01:55:19 2011
@@ -1040,7 +1040,7 @@ public class ServerConfigurationTest ext
// 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 ext
// 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 ext
// 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 ext
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 ext
try
{
ApplicationRegistry reg = new ConfigurationFileApplicationRegistry(mainFile);
- ApplicationRegistry.initialise(reg, 1);
+ ApplicationRegistry.initialise(reg);
fail("Multiple virtualhost XML configurations not allowed");
}
catch (ConfigurationException ce)
Modified: qpid/branches/grkvlt-network-20110301/qpid/java/common/src/main/java/org/apache/qpid/transport/vm/VmBroker.java
URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20110301/qpid/java/common/src/main/java/org/apache/qpid/transport/vm/VmBroker.java?rev=1076491&r1=1076490&r2=1076491&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20110301/qpid/java/common/src/main/java/org/apache/qpid/transport/vm/VmBroker.java (original)
+++ qpid/branches/grkvlt-network-20110301/qpid/java/common/src/main/java/org/apache/qpid/transport/vm/VmBroker.java Thu Mar 3 01:55:19 2011
@@ -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
{
Modified: qpid/branches/grkvlt-network-20110301/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/BrokerLifecycleAware.java
URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20110301/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/BrokerLifecycleAware.java?rev=1076491&r1=1076490&r2=1076491&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20110301/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/BrokerLifecycleAware.java (original)
+++ qpid/branches/grkvlt-network-20110301/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/BrokerLifecycleAware.java Thu Mar 3 01:55:19 2011
@@ -48,20 +48,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.
*
* @param failureMechanism The failure mechanism.
Modified: qpid/branches/grkvlt-network-20110301/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkBaseCase.java
URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20110301/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkBaseCase.java?rev=1076491&r1=1076490&r2=1076491&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20110301/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkBaseCase.java (original)
+++ qpid/branches/grkvlt-network-20110301/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/FrameworkBaseCase.java Thu Mar 3 01:55:19 2011
@@ -252,24 +252,6 @@ public class FrameworkBaseCase extends Q
}
/**
- * 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.
*
* @param failureMechanism The failure mechanism.
Modified: qpid/branches/grkvlt-network-20110301/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureInVM.java
URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20110301/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureInVM.java?rev=1076491&r1=1076490&r2=1076491&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20110301/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureInVM.java (original)
+++ qpid/branches/grkvlt-network-20110301/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/CauseFailureInVM.java Thu Mar 3 01:55:19 2011
@@ -50,8 +50,7 @@ public class CauseFailureInVM implements
// 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
*/
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);
}
}
Modified: qpid/branches/grkvlt-network-20110301/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/InVMBrokerDecorator.java
URL: http://svn.apache.org/viewvc/qpid/branches/grkvlt-network-20110301/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/InVMBrokerDecorator.java?rev=1076491&r1=1076490&r2=1076491&view=diff
==============================================================================
--- qpid/branches/grkvlt-network-20110301/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/InVMBrokerDecorator.java (original)
+++ qpid/branches/grkvlt-network-20110301/qpid/java/systests/src/main/java/org/apache/qpid/test/framework/qpid/InVMBrokerDecorator.java Thu Mar 3 01:55:19 2011
@@ -88,7 +88,6 @@ public class InVMBrokerDecorator extends
// 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
{
// 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
{
BrokerLifecycleAware inVMTest = (BrokerLifecycleAware) test;
inVMTest.setInVmBrokers();
- inVMTest.setLiveBroker(1);
inVMTest.setFailureMechanism(new CauseFailureInVM(inVMTest));
}
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org