QPID-1390 : Allow Authentication Manager to correctly close

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@707657 13f79535-47bb-0310-9956-ffa450edef68

5 files changed, 28 insertions, 11 deletions

diff --git a/java/08ExcludeList b/java/08ExcludeList
index 0e900736c0..6b1b3a61a8 100644
--- a/java/08ExcludeList
+++ b/java/08ExcludeList
@@ -7,7 +7,5 @@ org.apache.qpid.test.testcases.TTLTest#*
 org.apache.qpid.test.testcases.FailoverTest#*
 // This is a long running test so should exclude from normal runs
 org.apache.qpid.test.client.failover.FailoverTest#test4MinuteFailover
-// QPID-1225 : Temporary remove this test until the problem has been addressed
-org.apache.qpid.server.security.acl.SimpleACLTest#testClientPublishInvalidQueueSuccess
 // Those tests are written against the 0.10 path
-org.apache.qpid.test.unit.message.UTF8Test#*
\ No newline at end of file
+org.apache.qpid.test.unit.message.UTF8Test#*
diff --git a/java/08ExcludeList-nonvm b/java/08ExcludeList-nonvm
index d67e2bdaec..4694178f92 100644
--- a/java/08ExcludeList-nonvm
+++ b/java/08ExcludeList-nonvm
@@ -22,14 +22,11 @@ org.apache.qpid.test.client.QueueBrowserTransactedTest#testFailoverAsQueueBrowse
 org.apache.qpid.test.client.QueueBrowserTransactedTest#testFailoverWithQueueBrowser
 org.apache.qpid.test.testcases.FailoverTest#*
 org.apache.qpid.test.client.failover.FailoverTest#*
-// QPID-1225 : Temporary remove this test until the problem has been addressed
-org.apache.qpid.server.security.acl.SimpleACLTest#testClientPublishInvalidQueueSuccess
 
-// InVM Broker tests
+// InVM Broker tests awaiting resolution of QPID-1103
 org.apache.qpid.test.client.timeouts.SyncWaitDelayTest#*
-
-// QPID-1262, QPID-1119 : This test fails occasionally due to potential protocol issue.
 org.apache.qpid.test.client.timeouts.SyncWaitTimeoutDelayTest#*
+org.apache.qpid.server.security.acl.SimpleACLTest#
 
 // Those tests are written against the 0.10 path
-org.apache.qpid.test.unit.message.UTF8Test#*
\ No newline at end of file
+org.apache.qpid.test.unit.message.UTF8Test#*
diff --git a/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java b/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
index 63171d583a..c9c3acf61b 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
@@ -27,8 +27,11 @@ import org.apache.qpid.server.virtualhost.VirtualHost;
 import org.apache.qpid.server.virtualhost.VirtualHostRegistry;
 import org.apache.qpid.server.management.ManagedObjectRegistry;
 import org.apache.qpid.server.security.auth.manager.AuthenticationManager;
+import org.apache.qpid.server.security.auth.manager.PrincipalDatabaseAuthenticationManager;
 import org.apache.qpid.server.security.auth.database.PrincipalDatabaseManager;
+import org.apache.qpid.server.security.auth.database.ConfigurationFilePrincipalDatabaseManager;
 import org.apache.qpid.server.security.access.ACLPlugin;
+import org.apache.qpid.server.security.access.ACLManager;
 import org.apache.qpid.server.plugins.PluginManager;
 import org.apache.mina.common.IoAcceptor;
 
@@ -207,11 +210,24 @@ public abstract class ApplicationRegistry implements IApplicationRegistry
             virtualHost.close();
         }
 
+        // Replace above with this
+//        _virtualHostRegistry.close();
+
+//        _accessManager.close();
+
+//        _databaseManager.close();
+
+        _authenticationManager.close();
+
+//        _databaseManager.close();
+
         // close the rmi registry(if any) started for management
-        if (getManagedObjectRegistry() != null)
+        if (_managedObjectRegistry != null)
         {
-            getManagedObjectRegistry().close();
+            _managedObjectRegistry.close();
         }
+
+//        _pluginManager.close();
     }
 
     private void unbind()
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManager.java b/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManager.java
index bb94e0b7bf..d1803124a7 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManager.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManager.java
@@ -34,4 +34,5 @@ public interface AuthenticationManager
 
     AuthenticationResult authenticate(SaslServer server, byte[] response);
 
+    void close();
 }
diff --git a/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java b/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
index e5bf3edfca..7fbb68e861 100644
--- a/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
+++ b/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
@@ -233,4 +233,9 @@ public class PrincipalDatabaseAuthenticationManager implements AuthenticationMan
             return new AuthenticationResult(AuthenticationResult.AuthenticationStatus.ERROR, e);
         }
     }
+
+    public void close()
+    {
+        Security.removeProvider(PROVIDER_NAME);
+    }
 }