Author: ritchiem
Date: Fri Oct 24 08:41:36 2008
New Revision: 707657
URL: http://svn.apache.org/viewvc?rev=707657&view=rev
Log:
QPID-1390 : Allow Authentication Manager to correctly close
Modified:
incubator/qpid/trunk/qpid/java/08ExcludeList
incubator/qpid/trunk/qpid/java/08ExcludeList-nonvm
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManager.java
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
Modified: incubator/qpid/trunk/qpid/java/08ExcludeList
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/08ExcludeList?rev=707657&r1=707656&r2=707657&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/08ExcludeList (original)
+++ incubator/qpid/trunk/qpid/java/08ExcludeList Fri Oct 24 08:41:36 2008
@@ -7,7 +7,5 @@
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#*
Modified: incubator/qpid/trunk/qpid/java/08ExcludeList-nonvm
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/08ExcludeList-nonvm?rev=707657&r1=707656&r2=707657&view=diff
==============================================================================
--- incubator/qpid/trunk/qpid/java/08ExcludeList-nonvm (original)
+++ incubator/qpid/trunk/qpid/java/08ExcludeList-nonvm Fri Oct 24 08:41:36 2008
@@ -22,14 +22,11 @@
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#*
Modified:
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java?rev=707657&r1=707656&r2=707657&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
(original)
+++
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/registry/ApplicationRegistry.java
Fri Oct 24 08:41:36 2008
@@ -27,8 +27,11 @@
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 @@
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()
Modified:
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManager.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManager.java?rev=707657&r1=707656&r2=707657&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManager.java
(original)
+++
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/AuthenticationManager.java
Fri Oct 24 08:41:36 2008
@@ -34,4 +34,5 @@
AuthenticationResult authenticate(SaslServer server, byte[] response);
+ void close();
}
Modified:
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
URL:
http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java?rev=707657&r1=707656&r2=707657&view=diff
==============================================================================
---
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
(original)
+++
incubator/qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/PrincipalDatabaseAuthenticationManager.java
Fri Oct 24 08:41:36 2008
@@ -233,4 +233,9 @@
return new
AuthenticationResult(AuthenticationResult.AuthenticationStatus.ERROR, e);
}
}
+
+ public void close()
+ {
+ Security.removeProvider(PROVIDER_NAME);
+ }
}
