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 2010/05/20 17:19:00 UTC
svn commit: r946667 - in /qpid/trunk/qpid/java:
broker/src/main/java/org/apache/qpid/qmf/
broker/src/main/java/org/apache/qpid/server/connection/
broker/src/main/java/org/apache/qpid/server/management/
broker/src/main/java/org/apache/qpid/server/plugin...
Author: ritchiem
Date: Thu May 20 15:18:59 2010
New Revision: 946667
URL: http://svn.apache.org/viewvc?rev=946667&view=rev
Log:
QPID-2622 : Add Closeable interface and update Broker components to use it and add close method in ApplicationRegistry to safely perform the close.
Added:
qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/common/Closeable.java
- copied, changed from r946665, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManager.java
Modified:
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ManagedObjectRegistry.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/NoopManagedObjectRegistry.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManager.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java
qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostRegistry.java
qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/NullApplicationRegistry.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java?rev=946667&r1=946666&r2=946667&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/qmf/QMFService.java Thu May 20 15:18:59 2010
@@ -22,6 +22,7 @@
package org.apache.qpid.qmf;
import org.apache.qpid.AMQException;
+import org.apache.qpid.common.Closeable;
import org.apache.qpid.qmf.schema.BrokerSchema;
import org.apache.qpid.server.configuration.*;
import org.apache.qpid.server.registry.IApplicationRegistry;
@@ -34,7 +35,7 @@ import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.CopyOnWriteArrayList;
-public class QMFService implements ConfigStore.ConfigEventListener
+public class QMFService implements ConfigStore.ConfigEventListener, Closeable
{
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java?rev=946667&r1=946666&r2=946667&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/connection/ConnectionRegistry.java Thu May 20 15:18:59 2010
@@ -20,7 +20,8 @@
*/
package org.apache.qpid.server.connection;
-import org.apache.qpid.server.virtualhost.VirtualHost;
+import org.apache.log4j.Logger;
+import org.apache.qpid.common.Closeable;
import org.apache.qpid.server.protocol.AMQProtocolSession;
import org.apache.qpid.AMQException;
import org.apache.qpid.AMQConnectionException;
@@ -29,16 +30,11 @@ import org.apache.qpid.protocol.AMQConst
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.List;
-public class ConnectionRegistry implements IConnectionRegistry
+public class ConnectionRegistry implements IConnectionRegistry, Closeable
{
private List<AMQProtocolSession> _registry = new CopyOnWriteArrayList<AMQProtocolSession>();
- private VirtualHost _virtualHost;
-
- public ConnectionRegistry(VirtualHost virtualHost)
- {
- _virtualHost = virtualHost;
- }
+ private Logger _logger = Logger.getLogger(ConnectionRegistry.class);
public void initialise()
{
@@ -54,17 +50,24 @@ public class ConnectionRegistry implemen
}
/** Close all of the currently open connections. */
- public void close() throws AMQException
+ public void close()
{
while (!_registry.isEmpty())
{
AMQProtocolSession connection = _registry.get(0);
- connection.closeConnection(0, new AMQConnectionException(AMQConstant.INTERNAL_ERROR, "Broker is shutting down",
- 0, 0,
- connection.getProtocolOutputConverter().getProtocolMajorVersion(),
- connection.getProtocolOutputConverter().getProtocolMinorVersion(),
- (Throwable) null), true);
+ try
+ {
+ connection.closeConnection(0, new AMQConnectionException(AMQConstant.INTERNAL_ERROR, "Broker is shutting down",
+ 0, 0,
+ connection.getProtocolOutputConverter().getProtocolMajorVersion(),
+ connection.getProtocolOutputConverter().getProtocolMinorVersion(),
+ (Throwable) null), true);
+ }
+ catch (AMQException e)
+ {
+ _logger.warn("Error closing connection:" + e.getMessage());
+ }
}
}
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ManagedObjectRegistry.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ManagedObjectRegistry.java?rev=946667&r1=946666&r2=946667&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ManagedObjectRegistry.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/ManagedObjectRegistry.java Thu May 20 15:18:59 2010
@@ -23,6 +23,7 @@ package org.apache.qpid.server.managemen
import javax.management.JMException;
import org.apache.commons.configuration.ConfigurationException;
+import org.apache.qpid.common.Closeable;
import java.rmi.RemoteException;
import java.io.IOException;
@@ -39,13 +40,11 @@ import java.io.IOException;
* be the obvious choice for managed objects.
*
*/
-public interface ManagedObjectRegistry
+public interface ManagedObjectRegistry extends Closeable
{
void start() throws IOException, ConfigurationException;
void registerObject(ManagedObject managedObject) throws JMException;
void unregisterObject(ManagedObject managedObject) throws JMException;
-
- void close() throws RemoteException;
}
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/NoopManagedObjectRegistry.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/NoopManagedObjectRegistry.java?rev=946667&r1=946666&r2=946667&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/NoopManagedObjectRegistry.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/management/NoopManagedObjectRegistry.java Thu May 20 15:18:59 2010
@@ -53,7 +53,7 @@ public class NoopManagedObjectRegistry i
{
}
- public void close() throws RemoteException
+ public void close()
{
}
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java?rev=946667&r1=946666&r2=946667&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/plugins/PluginManager.java Thu May 20 15:18:59 2010
@@ -24,6 +24,7 @@ import org.apache.felix.framework.Felix;
import org.apache.felix.framework.util.FelixConstants;
import org.apache.felix.framework.util.StringMap;
import org.apache.felix.main.AutoProcessor;
+import org.apache.qpid.common.Closeable;
import org.apache.qpid.server.configuration.plugins.ConfigurationPluginFactory;
import org.apache.qpid.server.exchange.ExchangeType;
import org.apache.qpid.server.security.access.ACLPlugin;
@@ -50,7 +51,7 @@ import java.util.Map;
* Provides access to pluggable elements, such as exchanges
*/
-public class PluginManager
+public class PluginManager implements Closeable
{
private ServiceTracker _exchangeTracker = null;
private ServiceTracker _securityTracker = null;
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java?rev=946667&r1=946666&r2=946667&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java Thu May 20 15:18:59 2010
@@ -23,6 +23,7 @@ package org.apache.qpid.server.registry;
import org.apache.commons.configuration.ConfigurationException;
import org.apache.log4j.Logger;
import org.apache.qpid.AMQException;
+import org.apache.qpid.common.Closeable;
import org.apache.qpid.common.QpidProperties;
import org.apache.qpid.qmf.QMFService;
import org.apache.qpid.server.configuration.BrokerConfig;
@@ -339,73 +340,52 @@ public abstract class ApplicationRegistr
}
}
- public void close() throws Exception
+ /**
+ * Close non-null Closeable items and log any errors
+ * @param close
+ */
+ private void close(Closeable close)
{
- if (_logger.isInfoEnabled())
+ try
{
- _logger.info("Shutting down ApplicationRegistry:" + this);
+ if (close != null)
+ {
+ close.close();
+ }
}
-
- try
+ catch (Throwable e)
{
- //Stop incoming connections
- unbind();
+ _logger.error("Error thrown whilst closing " + close.getClass().getSimpleName(), e);
}
- finally
+ }
+
+
+ public void close()
+ {
+ if (_logger.isInfoEnabled())
{
- try
- {
-// Replace with this
-// _virtualHostRegistry.close();
+ _logger.info("Shutting down ApplicationRegistry:" + this);
+ }
- //Shutdown virtualhosts
- for (VirtualHost virtualHost : getVirtualHostRegistry().getVirtualHosts())
- {
- virtualHost.close();
- }
- }
- finally
- {
-// _accessManager.close();
+ //Stop incoming connections
+ unbind();
+
+ //Shutdown virtualhosts
+ close(_virtualHostRegistry);
+
+// close(_accessManager);
//
-// _databaseManager.close();
+// close(_databaseManager);
- try
- {
- _authenticationManager.close();
- }
- finally
- {
- try
- {
- // close the rmi registry(if any) started for management
- if (_managedObjectRegistry != null)
- {
- _managedObjectRegistry.close();
- }
- }
- finally
- {
- try
- {
- _qmfService.close();
- }
- finally
- {
- try
- {
- _pluginManager.close();
- }
- finally
- {
- CurrentActor.get().message(BrokerMessages.BRK_STOPPED());
- }
- }
- }
+ close(_authenticationManager);
- }
- }
- }
+ close(_managedObjectRegistry);
+
+ close(_qmfService);
+
+ close(_pluginManager);
+
+ CurrentActor.get().message(BrokerMessages.BRK_STOPPED());
}
private void unbind()
@@ -415,8 +395,17 @@ public abstract class ApplicationRegistr
for (InetSocketAddress bindAddress : _acceptors.keySet())
{
QpidAcceptor acceptor = _acceptors.get(bindAddress);
- acceptor.getNetworkDriver().close();
- CurrentActor.get().message(BrokerMessages.BRK_SHUTTING_DOWN(acceptor.toString(), bindAddress.getPort()));
+
+ try
+ {
+ acceptor.getNetworkDriver().close();
+ }
+ catch (Throwable e)
+ {
+ _logger.error("Unable to close network driver due to:" + e.getMessage());
+ }
+
+ CurrentActor.get().message(BrokerMessages.BRK_SHUTTING_DOWN(acceptor.toString(), bindAddress.getPort()));
}
}
}
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java?rev=946667&r1=946666&r2=946667&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ConfigurationFileApplicationRegistry.java Thu May 20 15:18:59 2010
@@ -40,14 +40,13 @@ public class ConfigurationFileApplicatio
@Override
- public void close() throws Exception
+ public void close()
{
//Set the Actor for Broker Shutdown
CurrentActor.set(new BrokerActor(_registryName, _rootMessageLogger));
try
{
super.close();
- _qmfService.close();
}
finally
{
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java?rev=946667&r1=946666&r2=946667&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/IApplicationRegistry.java Thu May 20 15:18:59 2010
@@ -53,9 +53,8 @@ public interface IApplicationRegistry
/**
* Shutdown this Registry
- * @throws Exception - //fixme needs to be made more specific
*/
- void close() throws Exception;
+ void close();
/**
* Get the low level configuration. For use cases where the configured object approach is not required
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManager.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManager.java?rev=946667&r1=946666&r2=946667&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManager.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManager.java Thu May 20 15:18:59 2010
@@ -20,19 +20,18 @@
*/
package org.apache.qpid.server.security.auth.manager;
+import org.apache.qpid.common.Closeable;
import org.apache.qpid.server.virtualhost.VirtualHost;
import org.apache.qpid.server.security.auth.AuthenticationResult;
import javax.security.sasl.SaslException;
import javax.security.sasl.SaslServer;
-public interface AuthenticationManager
+public interface AuthenticationManager extends Closeable
{
String getMechanisms();
SaslServer createSaslServer(String mechanism, String localFQDN) throws SaslException;
AuthenticationResult authenticate(SaslServer server, byte[] response);
-
- void close();
}
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java?rev=946667&r1=946666&r2=946667&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHost.java Thu May 20 15:18:59 2010
@@ -20,6 +20,7 @@
*/
package org.apache.qpid.server.virtualhost;
+import org.apache.qpid.common.Closeable;
import org.apache.qpid.server.connection.IConnectionRegistry;
import org.apache.qpid.server.federation.BrokerLink;
import org.apache.qpid.server.configuration.VirtualHostConfiguration;
@@ -42,7 +43,7 @@ import java.util.UUID;
import java.util.TimerTask;
import java.util.concurrent.FutureTask;
-public interface VirtualHost extends DurableConfigurationStore.Source, VirtualHostConfig
+public interface VirtualHost extends DurableConfigurationStore.Source, VirtualHostConfig, Closeable
{
IConnectionRegistry getConnectionRegistry();
@@ -66,7 +67,7 @@ public interface VirtualHost extends Dur
ACLManager getAccessManager();
- void close() throws Exception;
+ void close();
ManagedObject getManagedObject();
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java?rev=946667&r1=946666&r2=946667&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostImpl.java Thu May 20 15:18:59 2010
@@ -217,7 +217,7 @@ public class VirtualHostImpl implements
_virtualHostMBean = new VirtualHostMBean();
- _connectionRegistry = new ConnectionRegistry(this);
+ _connectionRegistry = new ConnectionRegistry();
_houseKeepingTasks = new ScheduledThreadPoolExecutor(_configuration.getHouseKeepingThreadCount());
@@ -607,9 +607,8 @@ public class VirtualHostImpl implements
return _accessManager;
}
- public void close() throws Exception
+ public void close()
{
-
//Stop Connections
_connectionRegistry.close();
@@ -627,16 +626,32 @@ public class VirtualHostImpl implements
{
_houseKeepingTasks.shutdown();
- if (!_houseKeepingTasks.awaitTermination(HOUSEKEEPING_SHUTDOWN_TIMEOUT, TimeUnit.SECONDS))
+ try
+ {
+ if (!_houseKeepingTasks.awaitTermination(HOUSEKEEPING_SHUTDOWN_TIMEOUT, TimeUnit.SECONDS))
+ {
+ _houseKeepingTasks.shutdownNow();
+ }
+ }
+ catch (InterruptedException e)
{
- _houseKeepingTasks.shutdownNow();
+ _logger.warn("Interrupted during Housekeeping shutdown:" + e.getMessage());
+ // Swallowing InterruptedException ok as we are shutting down.
}
}
//Close MessageStore
if (_messageStore != null)
{
- _messageStore.close();
+ //Remove MessageStore Interface should not throw Exception
+ try
+ {
+ _messageStore.close();
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace(); //To change body of catch statement use File | Settings | File Templates.
+ }
}
CurrentActor.get().message(VirtualHostMessages.VHT_CLOSED());
Modified: qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostRegistry.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostRegistry.java?rev=946667&r1=946666&r2=946667&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostRegistry.java (original)
+++ qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/VirtualHostRegistry.java Thu May 20 15:18:59 2010
@@ -20,6 +20,7 @@
*/
package org.apache.qpid.server.virtualhost;
+import org.apache.qpid.common.Closeable;
import org.apache.qpid.server.registry.ApplicationRegistry;
import org.apache.qpid.server.configuration.ConfigStore;
@@ -29,7 +30,7 @@ import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-public class VirtualHostRegistry
+public class VirtualHostRegistry implements Closeable
{
private final Map<String, VirtualHost> _registry = new ConcurrentHashMap<String, VirtualHost>();
@@ -91,4 +92,13 @@ public class VirtualHostRegistry
{
return _applicationRegistry.getConfigStore();
}
+
+ public void close()
+ {
+ for (VirtualHost virtualHost : getVirtualHosts())
+ {
+ virtualHost.close();
+ }
+
+ }
}
Modified: qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/NullApplicationRegistry.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/NullApplicationRegistry.java?rev=946667&r1=946666&r2=946667&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/NullApplicationRegistry.java (original)
+++ qpid/trunk/qpid/java/broker/src/test/java/org/apache/qpid/server/util/NullApplicationRegistry.java Thu May 20 15:18:59 2010
@@ -94,7 +94,7 @@ public class NullApplicationRegistry ext
@Override
- public void close() throws Exception
+ public void close()
{
try
{
Copied: qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/common/Closeable.java (from r946665, qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManager.java)
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/common/Closeable.java?p2=qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/common/Closeable.java&p1=qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManager.java&r1=946665&r2=946667&rev=946667&view=diff
==============================================================================
--- qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManager.java (original)
+++ qpid/trunk/qpid/java/common/src/main/java/org/apache/qpid/common/Closeable.java Thu May 20 15:18:59 2010
@@ -7,9 +7,9 @@
* to you 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
@@ -18,21 +18,10 @@
* under the License.
*
*/
-package org.apache.qpid.server.security.auth.manager;
-
-import org.apache.qpid.server.virtualhost.VirtualHost;
-import org.apache.qpid.server.security.auth.AuthenticationResult;
+package org.apache.qpid.common;
-import javax.security.sasl.SaslException;
-import javax.security.sasl.SaslServer;
-public interface AuthenticationManager
+public interface Closeable
{
- String getMechanisms();
-
- SaslServer createSaslServer(String mechanism, String localFQDN) throws SaslException;
-
- AuthenticationResult authenticate(SaslServer server, byte[] response);
-
- void close();
+ public void close();
}
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java?rev=946667&r1=946666&r2=946667&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidTestCase.java Thu May 20 15:18:59 2010
@@ -524,11 +524,12 @@ public class QpidTestCase extends TestCa
}
catch (Exception e)
{
+ _logger.error("Broker initialise failed due to:",e);
try
{
registry.close();
}
- catch (Exception closeE)
+ catch (Throwable closeE)
{
closeE.printStackTrace();
}
---------------------------------------------------------------------
Apache Qpid - AMQP Messaging Implementation
Project: http://qpid.apache.org
Use/Interact: mailto:commits-subscribe@qpid.apache.org