diff options
| author | Robert Gemmell <robbie@apache.org> | 2011-06-09 10:38:20 +0000 |
|---|---|---|
| committer | Robert Gemmell <robbie@apache.org> | 2011-06-09 10:38:20 +0000 |
| commit | b83ba1c0bc269d2b9dddd73dfe8a90d4d3723e58 (patch) | |
| tree | 8d674ad91fbf4b4dff1a7610c76f63a1cc6a6259 /qpid/java/broker-plugins | |
| parent | 46af35ba4c7867098a1c5e1cea9bd24275cbad40 (diff) | |
| download | qpid-python-b83ba1c0bc269d2b9dddd73dfe8a90d4d3723e58.tar.gz | |
QPID-3296: update RMIPasswordAuthenticator to authenticate users via AuthenticationManager instead of a PrincipalDatabase
Applied patch from Keith Wall <keith.wall@gmail.com>
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1133781 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/broker-plugins')
2 files changed, 0 insertions, 11 deletions
diff --git a/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/AppInfo.java b/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/AppInfo.java index a5d267282b..9bdd4b9d17 100644 --- a/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/AppInfo.java +++ b/qpid/java/broker-plugins/experimental/info/src/main/java/org/apache/qpid/info/AppInfo.java @@ -74,8 +74,6 @@ public class AppInfo appInfoMap.put("port", sc.getPorts().toString()); appInfoMap.put("version", QpidProperties.getReleaseVersion()); appInfoMap.put("vhosts", "standalone"); - appInfoMap.put("JMXPrincipalDatabase", sc - .getJMXPrincipalDatabase()); appInfoMap.put("KeystorePath", sc.getKeystorePath()); appInfoMap.put("PluginDirectory", sc.getPluginDirectory()); appInfoMap.put("CertType", sc.getCertType()); diff --git a/qpid/java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallConfigurationTest.java b/qpid/java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallConfigurationTest.java index ebede414f4..c0cb4aedce 100644 --- a/qpid/java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallConfigurationTest.java +++ b/qpid/java/broker-plugins/firewall/src/test/java/org/apache/qpid/server/security/access/FirewallConfigurationTest.java @@ -92,9 +92,6 @@ public class FirewallConfigurationTest extends InternalBrokerBaseCase out.write("\t\t\t\t</attributes>\n"); out.write("\t\t\t</principal-database>\n"); out.write("\t\t</principal-databases>\n"); - out.write("\t\t<jmx>\n"); - out.write("\t\t\t<principal-database>passwordfile</principal-database>\n"); - out.write("\t\t</jmx>\n"); out.write("\t\t<firewall>\n"); out.write("\t\t\t<xml fileName=\"" + fileB.getAbsolutePath() + "\"/>"); out.write("\t\t</firewall>\n"); @@ -192,9 +189,6 @@ public class FirewallConfigurationTest extends InternalBrokerBaseCase out.write("\t\t\t\t</attributes>\n"); out.write("\t\t\t</principal-database>\n"); out.write("\t\t</principal-databases>\n"); - out.write("\t\t<jmx>\n"); - out.write("\t\t\t<principal-database>passwordfile</principal-database>\n"); - out.write("\t\t</jmx>\n"); out.write("\t\t<firewall>\n"); out.write("\t\t\t<xml fileName=\"" + fileB.getAbsolutePath() + "\"/>"); out.write("\t\t</firewall>\n"); @@ -301,9 +295,6 @@ public class FirewallConfigurationTest extends InternalBrokerBaseCase out.write("\t\t\t\t</attributes>\n"); out.write("\t\t\t</principal-database>\n"); out.write("\t\t</principal-databases>\n"); - out.write("\t\t<jmx>\n"); - out.write("\t\t\t<principal-database>passwordfile</principal-database>\n"); - out.write("\t\t</jmx>\n"); out.write("\t\t<firewall>\n"); out.write("\t\t\t<rule access=\""+ ((allow) ? "allow" : "deny") +"\" network=\"127.0.0.1\"/>"); out.write("\t\t</firewall>\n"); |