You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ri...@apache.org on 2006/09/25 12:59:24 UTC
svn commit: r449643 - in /incubator/qpid/trunk/qpid/java/broker: ./
src/org/apache/qpid/server/protocol/ src/org/apache/qpid/server/registry/
src/org/apache/qpid/server/security/auth/ src/org/apache/qpid/server/store/
src/org/apache/qpid/server/util/ t...
Author: ritchiem
Date: Mon Sep 25 03:59:23 2006
New Revision: 449643
URL: http://svn.apache.org/viewvc?view=rev&rev=449643
Log:
AMQPFastProtocolHandler.java - Added (Integer appRegId) constructor to allow the AMQPFastProtocolHandler to request the ApplicationRegistry instance.
ApplicationRegistry.java - Modified to allow multiple ARs to exist each indexed by an integer id. Default AR of 0 always exists.
NullApplicationRegistry.java - Copied from Test cases but modified to have a simple MemoryMessageStore.
MemoryMessageStore.java - Added a configure() that uses the class defaults.
NullAuthenticationManager.java - Moved from Test
Renamed NullApplicationRegistry.java to TestApplicationRegistry.java for the Test cases.
Added:
incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/security/auth/NullAuthenticationManager.java
- copied, changed from r449625, incubator/qpid/trunk/qpid/java/broker/test/src/org/apache/qpid/server/util/NullAuthenticationManager.java
incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/util/NullApplicationRegistry.java (with props)
incubator/qpid/trunk/qpid/java/broker/test/src/org/apache/qpid/server/util/TestApplicationRegistry.java
- copied, changed from r449625, incubator/qpid/trunk/qpid/java/broker/test/src/org/apache/qpid/server/util/NullApplicationRegistry.java
Removed:
incubator/qpid/trunk/qpid/java/broker/test/src/org/apache/qpid/server/util/NullApplicationRegistry.java
incubator/qpid/trunk/qpid/java/broker/test/src/org/apache/qpid/server/util/NullAuthenticationManager.java
Modified:
incubator/qpid/trunk/qpid/java/broker/ (props changed)
incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/protocol/AMQPFastProtocolHandler.java
incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/registry/ApplicationRegistry.java
incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/store/MemoryMessageStore.java
incubator/qpid/trunk/qpid/java/broker/test/src/org/apache/qpid/server/exchange/HeadersExchangeTest.java
incubator/qpid/trunk/qpid/java/broker/test/src/org/apache/qpid/server/queue/AckTest.java
incubator/qpid/trunk/qpid/java/broker/test/src/org/apache/qpid/server/queue/DeliveryManagerTest.java
incubator/qpid/trunk/qpid/java/broker/test/src/org/apache/qpid/server/queue/MessageTestHelper.java
incubator/qpid/trunk/qpid/java/broker/test/src/org/apache/qpid/server/queue/SendPerfTest.java
Propchange: incubator/qpid/trunk/qpid/java/broker/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Sep 25 03:59:23 2006
@@ -1,2 +1,3 @@
*.iml
intellijclasses
+log
Modified: incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/protocol/AMQPFastProtocolHandler.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/protocol/AMQPFastProtocolHandler.java?view=diff&rev=449643&r1=449642&r2=449643
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/protocol/AMQPFastProtocolHandler.java (original)
+++ incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/protocol/AMQPFastProtocolHandler.java Mon Sep 25 03:59:23 2006
@@ -23,6 +23,7 @@
import org.apache.qpid.server.exchange.ExchangeRegistry;
import org.apache.qpid.server.queue.QueueRegistry;
import org.apache.qpid.server.registry.ApplicationRegistry;
+import org.apache.qpid.server.registry.IApplicationRegistry;
import org.apache.qpid.server.transport.ConnectorConfiguration;
import org.apache.qpid.ssl.BogusSSLContextFactory;
import org.apache.log4j.Logger;
@@ -45,7 +46,7 @@
* the state for the connection.
*
*/
-public class AMQPFastProtocolHandler extends IoHandlerAdapter implements ProtocolVersionList
+public class AMQPFastProtocolHandler extends IoHandlerAdapter implements ProtocolVersionList
{
private static final Logger _logger = Logger.getLogger(AMQPFastProtocolHandler.class);
@@ -62,6 +63,15 @@
private final ExchangeRegistry _exchangeRegistry;
private boolean _useSSL;
+
+ public AMQPFastProtocolHandler(Integer applicationRegistryInstance)
+ {
+ IApplicationRegistry registry = ApplicationRegistry.getInstance(applicationRegistryInstance);
+
+ _queueRegistry = registry.getQueueRegistry();
+ _exchangeRegistry = registry.getExchangeRegistry();
+ _logger.debug("AMQPFastProtocolHandler created");
+ }
public AMQPFastProtocolHandler(QueueRegistry queueRegistry,
ExchangeRegistry exchangeRegistry)
Modified: incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/registry/ApplicationRegistry.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/registry/ApplicationRegistry.java?view=diff&rev=449643&r1=449642&r2=449643
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/registry/ApplicationRegistry.java (original)
+++ incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/registry/ApplicationRegistry.java Mon Sep 25 03:59:23 2006
@@ -22,33 +22,58 @@
import org.apache.qpid.server.configuration.Configurator;
import java.util.HashMap;
+import java.util.Iterator;
import java.util.Map;
/**
* An abstract application registry that 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.
- *
*/
public abstract class ApplicationRegistry implements IApplicationRegistry
{
private static final Logger _logger = Logger.getLogger(ApplicationRegistry.class);
- private static IApplicationRegistry _instance;
+ private static Map _instanceMap = new HashMap();
private final Map<Class<?>, Object> _configuredObjects = new HashMap<Class<?>, Object>();
protected final Configuration _configuration;
+ public static final int DEFAULT_INSTANCE = 0;
+ public static final String DEFAULT_APPLICATION_REGISTRY = "org.apache.qpid.server.util.NullApplicationRegistry";
+
+ static
+ {
+ Runtime.getRuntime().addShutdownHook(new Thread(new ShutdownService()));
+ }
+
private static class ShutdownService implements Runnable
{
public void run()
{
- _logger.info("Shutting down application registry...");
+ _logger.info("Shutting down application registries...");
try
{
- _instance.getMessageStore().close();
+ synchronized (ApplicationRegistry.class)
+ {
+ Iterator keyIterator = _instanceMap.keySet().iterator();
+
+ while (keyIterator.hasNext())
+ {
+ int key = (Integer) keyIterator.next();
+ IApplicationRegistry instance = (IApplicationRegistry) _instanceMap.get(key);
+
+ if ((instance != null))
+ {
+ if (instance.getMessageStore() != null)
+ {
+ instance.getMessageStore().close();
+ }
+ }
+ }
+ }
}
catch (Exception e)
{
@@ -59,11 +84,49 @@
public static void initialise(IApplicationRegistry instance) throws Exception
{
- _instance = instance;
- instance.initialise();
- Runtime.getRuntime().addShutdownHook(new Thread(new ShutdownService()));
+ initialise(instance, DEFAULT_INSTANCE);
+ }
+
+ public static void initialise(IApplicationRegistry instance, int instanceID) throws Exception
+ {
+ if (instance != null)
+ {
+ _logger.info("Initialising Application Registry:" + instanceID);
+ _instanceMap.put(instanceID, instance);
+
+ try
+ {
+ instance.initialise();
+ }
+ catch (Exception e)
+ {
+ _instanceMap.remove(instanceID);
+ throw e;
+ }
+ }
+ else
+ {
+ remove(instanceID);
+ }
}
+ public static void remove(int instanceID)
+ {
+ try
+ {
+ ((IApplicationRegistry) _instanceMap.get(instanceID)).getMessageStore().close();
+ }
+ catch (Exception e)
+ {
+
+ }
+ finally
+ {
+ _instanceMap.remove(instanceID);
+ }
+ }
+
+
protected ApplicationRegistry(Configuration configuration)
{
_configuration = configuration;
@@ -71,13 +134,33 @@
public static IApplicationRegistry getInstance()
{
- if (_instance == null)
+ return getInstance(DEFAULT_INSTANCE);
+ }
+
+ public static IApplicationRegistry getInstance(int instanceID)
+ {
+ IApplicationRegistry instance = (IApplicationRegistry) _instanceMap.get(instanceID);
+
+ if (instance == null)
{
- throw new RuntimeException("Application registry not initialised");
+ try
+ {
+ _logger.info("Creating DEFAULT_APPLICATION_REGISTRY: " + DEFAULT_APPLICATION_REGISTRY + " : Instance:" + instanceID);
+ IApplicationRegistry registry = (IApplicationRegistry) Class.forName(DEFAULT_APPLICATION_REGISTRY).getConstructor((Class[]) null).newInstance((Object[]) null);
+ ApplicationRegistry.initialise(registry, instanceID);
+ _logger.info("Initialised Application Registry:" + instanceID);
+ return registry;
+ }
+ catch (Exception e)
+ {
+ _logger.error("Error configuring application: " + e, e);
+ //throw new AMQBrokerCreationException(instanceID, "Unable to create Application Registry instance " + instanceID);
+ throw new RuntimeException("Unable to create Application Registry");
+ }
}
else
{
- return _instance;
+ return instance;
}
}
Copied: incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/security/auth/NullAuthenticationManager.java (from r449625, incubator/qpid/trunk/qpid/java/broker/test/src/org/apache/qpid/server/util/NullAuthenticationManager.java)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/security/auth/NullAuthenticationManager.java?view=diff&rev=449643&p1=incubator/qpid/trunk/qpid/java/broker/test/src/org/apache/qpid/server/util/NullAuthenticationManager.java&r1=449625&p2=incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/security/auth/NullAuthenticationManager.java&r2=449643
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/test/src/org/apache/qpid/server/util/NullAuthenticationManager.java (original)
+++ incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/security/auth/NullAuthenticationManager.java Mon Sep 25 03:59:23 2006
@@ -15,7 +15,7 @@
* limitations under the License.
*
*/
-package org.apache.qpid.server.util;
+package org.apache.qpid.server.security.auth;
import org.apache.qpid.server.security.auth.AuthenticationManager;
import org.apache.qpid.server.security.auth.AuthenticationResult;
Modified: incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/store/MemoryMessageStore.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/store/MemoryMessageStore.java?view=diff&rev=449643&r1=449642&r2=449643
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/store/MemoryMessageStore.java (original)
+++ incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/store/MemoryMessageStore.java Mon Sep 25 03:59:23 2006
@@ -45,6 +45,12 @@
private final AtomicLong _messageId = new AtomicLong(1);
+ public void configure()
+ {
+ _log.info("Using capacity " + DEFAULT_HASHTABLE_CAPACITY + " for hash table");
+ _messageMap = new ConcurrentHashMap<Long, AMQMessage>(DEFAULT_HASHTABLE_CAPACITY);
+ }
+
public void configure(String base, Configuration config)
{
int hashtableCapacity = config.getInt(base + "." + HASHTABLE_CAPACITY_CONFIG, DEFAULT_HASHTABLE_CAPACITY);
Added: incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/util/NullApplicationRegistry.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/util/NullApplicationRegistry.java?view=auto&rev=449643
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/util/NullApplicationRegistry.java (added)
+++ incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/util/NullApplicationRegistry.java Mon Sep 25 03:59:23 2006
@@ -0,0 +1,106 @@
+/*
+ *
+ * Copyright (c) 2006 The Apache Software Foundation
+ *
+ * Licensed 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.qpid.server.util;
+
+import org.apache.qpid.server.exchange.DefaultExchangeFactory;
+import org.apache.qpid.server.exchange.DefaultExchangeRegistry;
+import org.apache.qpid.server.exchange.ExchangeFactory;
+import org.apache.qpid.server.exchange.ExchangeRegistry;
+import org.apache.qpid.server.management.ManagedObjectRegistry;
+import org.apache.qpid.server.management.NoopManagedObjectRegistry;
+import org.apache.qpid.server.queue.DefaultQueueRegistry;
+import org.apache.qpid.server.queue.QueueRegistry;
+import org.apache.qpid.server.registry.ApplicationRegistry;
+import org.apache.qpid.server.security.auth.AuthenticationManager;
+import org.apache.qpid.server.security.auth.NullAuthenticationManager;
+import org.apache.qpid.server.store.MessageStore;
+import org.apache.qpid.server.store.MemoryMessageStore;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.MapConfiguration;
+
+import java.util.HashMap;
+
+public class NullApplicationRegistry extends ApplicationRegistry
+{
+ private QueueRegistry _queueRegistry;
+
+ private ExchangeRegistry _exchangeRegistry;
+
+ private ExchangeFactory _exchangeFactory;
+
+ private ManagedObjectRegistry _managedObjectRegistry;
+
+ private AuthenticationManager _authenticationManager;
+
+ private MessageStore _messageStore;
+
+
+ public NullApplicationRegistry()
+ {
+ super(new MapConfiguration(new HashMap()));
+ }
+
+ public void initialise() throws Exception
+ {
+ _managedObjectRegistry = new NoopManagedObjectRegistry();
+ _queueRegistry = new DefaultQueueRegistry();
+ _exchangeFactory = new DefaultExchangeFactory();
+ _exchangeRegistry = new DefaultExchangeRegistry(_exchangeFactory);
+ _authenticationManager = new NullAuthenticationManager();
+ _messageStore = new MemoryMessageStore();
+ ((MemoryMessageStore)_messageStore).configure();
+
+ _configuration.addProperty("heartbeat.delay", 10 * 60); // 10 minutes
+ }
+
+ public Configuration getConfiguration()
+ {
+ return _configuration;
+ }
+
+ public QueueRegistry getQueueRegistry()
+ {
+ return _queueRegistry;
+ }
+
+ public ExchangeRegistry getExchangeRegistry()
+ {
+ return _exchangeRegistry;
+ }
+
+ public ExchangeFactory getExchangeFactory()
+ {
+ return _exchangeFactory;
+ }
+
+ public ManagedObjectRegistry getManagedObjectRegistry()
+ {
+ return _managedObjectRegistry;
+ }
+
+ public AuthenticationManager getAuthenticationManager()
+ {
+ return _authenticationManager;
+ }
+
+ public MessageStore getMessageStore()
+ {
+ return _messageStore;
+ }
+}
+
Propchange: incubator/qpid/trunk/qpid/java/broker/src/org/apache/qpid/server/util/NullApplicationRegistry.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: incubator/qpid/trunk/qpid/java/broker/test/src/org/apache/qpid/server/exchange/HeadersExchangeTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/test/src/org/apache/qpid/server/exchange/HeadersExchangeTest.java?view=diff&rev=449643&r1=449642&r2=449643
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/test/src/org/apache/qpid/server/exchange/HeadersExchangeTest.java (original)
+++ incubator/qpid/trunk/qpid/java/broker/test/src/org/apache/qpid/server/exchange/HeadersExchangeTest.java Mon Sep 25 03:59:23 2006
@@ -21,7 +21,7 @@
import org.junit.Before;
import org.apache.qpid.AMQException;
import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.util.NullApplicationRegistry;
+import org.apache.qpid.server.util.TestApplicationRegistry;
import junit.framework.JUnit4TestAdapter;
public class HeadersExchangeTest extends AbstractHeadersExchangeTest
@@ -29,7 +29,7 @@
@Before
public void init() throws Exception
{
- ApplicationRegistry.initialise(new NullApplicationRegistry());
+ ApplicationRegistry.initialise(new TestApplicationRegistry());
}
@Test
Modified: incubator/qpid/trunk/qpid/java/broker/test/src/org/apache/qpid/server/queue/AckTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/test/src/org/apache/qpid/server/queue/AckTest.java?view=diff&rev=449643&r1=449642&r2=449643
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/test/src/org/apache/qpid/server/queue/AckTest.java (original)
+++ incubator/qpid/trunk/qpid/java/broker/test/src/org/apache/qpid/server/queue/AckTest.java Mon Sep 25 03:59:23 2006
@@ -28,7 +28,7 @@
import org.apache.qpid.server.AMQChannel;
import org.apache.qpid.server.registry.ApplicationRegistry;
import org.apache.qpid.server.store.TestableMemoryMessageStore;
-import org.apache.qpid.server.util.NullApplicationRegistry;
+import org.apache.qpid.server.util.TestApplicationRegistry;
import org.apache.log4j.Logger;
import java.util.Iterator;
@@ -55,7 +55,7 @@
public AckTest() throws Exception
{
- ApplicationRegistry.initialise(new NullApplicationRegistry());
+ ApplicationRegistry.initialise(new TestApplicationRegistry());
}
@Before
Modified: incubator/qpid/trunk/qpid/java/broker/test/src/org/apache/qpid/server/queue/DeliveryManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/test/src/org/apache/qpid/server/queue/DeliveryManagerTest.java?view=diff&rev=449643&r1=449642&r2=449643
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/test/src/org/apache/qpid/server/queue/DeliveryManagerTest.java (original)
+++ incubator/qpid/trunk/qpid/java/broker/test/src/org/apache/qpid/server/queue/DeliveryManagerTest.java Mon Sep 25 03:59:23 2006
@@ -21,8 +21,6 @@
import static org.junit.Assert.assertTrue;
import org.junit.Test;
import org.apache.qpid.server.handler.OnCurrentThreadExecutor;
-import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.util.NullApplicationRegistry;
import org.apache.qpid.AMQException;
import junit.framework.JUnit4TestAdapter;
Modified: incubator/qpid/trunk/qpid/java/broker/test/src/org/apache/qpid/server/queue/MessageTestHelper.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/test/src/org/apache/qpid/server/queue/MessageTestHelper.java?view=diff&rev=449643&r1=449642&r2=449643
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/test/src/org/apache/qpid/server/queue/MessageTestHelper.java (original)
+++ incubator/qpid/trunk/qpid/java/broker/test/src/org/apache/qpid/server/queue/MessageTestHelper.java Mon Sep 25 03:59:23 2006
@@ -22,7 +22,7 @@
import org.apache.qpid.server.store.MessageStore;
import org.apache.qpid.server.store.SkeletonMessageStore;
import org.apache.qpid.server.registry.ApplicationRegistry;
-import org.apache.qpid.server.util.NullApplicationRegistry;
+import org.apache.qpid.server.util.TestApplicationRegistry;
import org.apache.qpid.AMQException;
class MessageTestHelper
@@ -31,7 +31,7 @@
MessageTestHelper() throws Exception
{
- ApplicationRegistry.initialise(new NullApplicationRegistry());
+ ApplicationRegistry.initialise(new TestApplicationRegistry());
}
AMQMessage message() throws AMQException
Modified: incubator/qpid/trunk/qpid/java/broker/test/src/org/apache/qpid/server/queue/SendPerfTest.java
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/test/src/org/apache/qpid/server/queue/SendPerfTest.java?view=diff&rev=449643&r1=449642&r2=449643
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/test/src/org/apache/qpid/server/queue/SendPerfTest.java (original)
+++ incubator/qpid/trunk/qpid/java/broker/test/src/org/apache/qpid/server/queue/SendPerfTest.java Mon Sep 25 03:59:23 2006
@@ -35,7 +35,7 @@
import org.apache.qpid.server.store.MessageStore;
import org.apache.qpid.server.store.SkeletonMessageStore;
import org.apache.qpid.server.util.AveragedRun;
-import org.apache.qpid.server.util.NullApplicationRegistry;
+import org.apache.qpid.server.util.TestApplicationRegistry;
import org.apache.qpid.server.util.TimedRun;
import java.util.ArrayList;
@@ -77,7 +77,7 @@
public static void main(String[] argv) throws Exception
{
- ApplicationRegistry.initialise(new NullApplicationRegistry());
+ ApplicationRegistry.initialise(new TestApplicationRegistry());
int clients = Integer.parseInt(argv[0]);
int messages = Integer.parseInt(argv[1]);
int iterations = Integer.parseInt(argv[2]);
Copied: incubator/qpid/trunk/qpid/java/broker/test/src/org/apache/qpid/server/util/TestApplicationRegistry.java (from r449625, incubator/qpid/trunk/qpid/java/broker/test/src/org/apache/qpid/server/util/NullApplicationRegistry.java)
URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/test/src/org/apache/qpid/server/util/TestApplicationRegistry.java?view=diff&rev=449643&p1=incubator/qpid/trunk/qpid/java/broker/test/src/org/apache/qpid/server/util/NullApplicationRegistry.java&r1=449625&p2=incubator/qpid/trunk/qpid/java/broker/test/src/org/apache/qpid/server/util/TestApplicationRegistry.java&r2=449643
==============================================================================
--- incubator/qpid/trunk/qpid/java/broker/test/src/org/apache/qpid/server/util/NullApplicationRegistry.java (original)
+++ incubator/qpid/trunk/qpid/java/broker/test/src/org/apache/qpid/server/util/TestApplicationRegistry.java Mon Sep 25 03:59:23 2006
@@ -27,6 +27,7 @@
import org.apache.qpid.server.queue.QueueRegistry;
import org.apache.qpid.server.registry.ApplicationRegistry;
import org.apache.qpid.server.security.auth.AuthenticationManager;
+import org.apache.qpid.server.security.auth.NullAuthenticationManager;
import org.apache.qpid.server.store.MessageStore;
import org.apache.qpid.server.store.TestableMemoryMessageStore;
import org.apache.commons.configuration.Configuration;
@@ -34,7 +35,7 @@
import java.util.HashMap;
-public class NullApplicationRegistry extends ApplicationRegistry
+public class TestApplicationRegistry extends ApplicationRegistry
{
private QueueRegistry _queueRegistry;
@@ -48,7 +49,7 @@
private MessageStore _messageStore;
- public NullApplicationRegistry()
+ public TestApplicationRegistry()
{
super(new MapConfiguration(new HashMap()));
}