Return-Path: X-Original-To: apmail-qpid-commits-archive@www.apache.org Delivered-To: apmail-qpid-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0BF6CF5B7 for ; Mon, 1 Apr 2013 16:20:48 +0000 (UTC) Received: (qmail 42327 invoked by uid 500); 1 Apr 2013 16:20:48 -0000 Delivered-To: apmail-qpid-commits-archive@qpid.apache.org Received: (qmail 42271 invoked by uid 500); 1 Apr 2013 16:20:47 -0000 Mailing-List: contact commits-help@qpid.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@qpid.apache.org Delivered-To: mailing list commits@qpid.apache.org Received: (qmail 42255 invoked by uid 99); 1 Apr 2013 16:20:47 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Apr 2013 16:20:47 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 01 Apr 2013 16:20:39 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 4C5EA23888CD; Mon, 1 Apr 2013 16:20:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1463185 - in /qpid/branches/0.22/qpid/java: ./ amqp-1-0-client-jms/ amqp-1-0-client/ amqp-1-0-common/ broker/ broker/bin/ broker/src/main/java/org/apache/qpid/server/message/ broker/src/main/java/org/apache/qpid/server/protocol/ broker/src... Date: Mon, 01 Apr 2013 16:20:19 -0000 To: commits@qpid.apache.org From: robbie@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130401162019.4C5EA23888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: robbie Date: Mon Apr 1 16:20:18 2013 New Revision: 1463185 URL: http://svn.apache.org/r1463185 Log: QPID-4462: simply return the PlainSaslServer directly instead of looking up it, bypassing the lack of previous registration Fix suggested by Alex Rudyy merged from trunk r1463063 Modified: qpid/branches/0.22/qpid/java/ (props changed) qpid/branches/0.22/qpid/java/amqp-1-0-client/ (props changed) qpid/branches/0.22/qpid/java/amqp-1-0-client-jms/ (props changed) qpid/branches/0.22/qpid/java/amqp-1-0-common/ (props changed) qpid/branches/0.22/qpid/java/broker/ (props changed) qpid/branches/0.22/qpid/java/broker/bin/ (props changed) qpid/branches/0.22/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java (props changed) qpid/branches/0.22/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java (props changed) qpid/branches/0.22/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java (props changed) qpid/branches/0.22/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/ (props changed) qpid/branches/0.22/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ (props changed) qpid/branches/0.22/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManager.java qpid/branches/0.22/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ (props changed) qpid/branches/0.22/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java (props changed) qpid/branches/0.22/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java (props changed) qpid/branches/0.22/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java (props changed) qpid/branches/0.22/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java (props changed) qpid/branches/0.22/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java (props changed) qpid/branches/0.22/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java (props changed) qpid/branches/0.22/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java (props changed) qpid/branches/0.22/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java (props changed) qpid/branches/0.22/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java (props changed) qpid/branches/0.22/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java (props changed) qpid/branches/0.22/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java (props changed) qpid/branches/0.22/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java (props changed) qpid/branches/0.22/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (props changed) qpid/branches/0.22/qpid/java/test-profiles/ (props changed) qpid/branches/0.22/qpid/java/test-profiles/CPPExcludes (props changed) qpid/branches/0.22/qpid/java/test-profiles/Excludes (props changed) qpid/branches/0.22/qpid/java/test-profiles/JavaBDBExcludes (props changed) qpid/branches/0.22/qpid/java/test-profiles/JavaExcludes (props changed) qpid/branches/0.22/qpid/java/test-profiles/JavaPre010Excludes (props changed) qpid/branches/0.22/qpid/java/test-profiles/JavaTransientExcludes (props changed) qpid/branches/0.22/qpid/java/test-profiles/XAExcludes (props changed) qpid/branches/0.22/qpid/java/test-profiles/cpp.async.testprofile (props changed) qpid/branches/0.22/qpid/java/test-profiles/cpp.cluster.testprofile (props changed) qpid/branches/0.22/qpid/java/test-profiles/cpp.noprefetch.testprofile (props changed) qpid/branches/0.22/qpid/java/test-profiles/cpp.ssl.excludes (props changed) qpid/branches/0.22/qpid/java/test-profiles/cpp.ssl.testprofile (props changed) qpid/branches/0.22/qpid/java/test-profiles/cpp.testprofile (props changed) qpid/branches/0.22/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile (props changed) qpid/branches/0.22/qpid/java/test-profiles/java-bdb.0-9-1.testprofile (props changed) qpid/branches/0.22/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile (props changed) qpid/branches/0.22/qpid/java/test-profiles/java-dby.0-9-1.testprofile (props changed) qpid/branches/0.22/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile (props changed) qpid/branches/0.22/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile (props changed) qpid/branches/0.22/qpid/java/test-profiles/java-mms.0-9-1.testprofile (props changed) qpid/branches/0.22/qpid/java/test-profiles/log4j-test.xml (props changed) qpid/branches/0.22/qpid/java/test-profiles/test-provider.properties (props changed) qpid/branches/0.22/qpid/java/test-profiles/test_resources/ (props changed) qpid/branches/0.22/qpid/java/test-profiles/testprofile.defaults (props changed) Propchange: qpid/branches/0.22/qpid/java/ ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java:r1463063 Propchange: qpid/branches/0.22/qpid/java/amqp-1-0-client/ ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/amqp-1-0-client:r1463063 Propchange: qpid/branches/0.22/qpid/java/amqp-1-0-client-jms/ ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/amqp-1-0-client-jms:r1463063 Propchange: qpid/branches/0.22/qpid/java/amqp-1-0-common/ ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/amqp-1-0-common:r1463063 Propchange: qpid/branches/0.22/qpid/java/broker/ ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/broker:r1463063 Propchange: qpid/branches/0.22/qpid/java/broker/bin/ ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/broker/bin:r1463063 Propchange: qpid/branches/0.22/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/message/MessageMetaData_1_0.java:r1463063 Propchange: qpid/branches/0.22/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0.java:r1463063 Propchange: qpid/branches/0.22/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/ProtocolEngine_1_0_0_SASL.java:r1463063 Propchange: qpid/branches/0.22/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0/ ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/protocol/v1_0:r1463063 Propchange: qpid/branches/0.22/qpid/java/broker/src/main/java/org/apache/qpid/server/queue/ ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/queue:r1463063 Modified: qpid/branches/0.22/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManager.java URL: http://svn.apache.org/viewvc/qpid/branches/0.22/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManager.java?rev=1463185&r1=1463184&r2=1463185&view=diff ============================================================================== --- qpid/branches/0.22/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManager.java (original) +++ qpid/branches/0.22/qpid/java/broker/src/main/java/org/apache/qpid/server/security/auth/manager/SimpleLDAPAuthenticationManager.java Mon Apr 1 16:20:18 2013 @@ -21,7 +21,6 @@ package org.apache.qpid.server.security. import java.io.IOException; import java.security.Principal; -import java.util.HashMap; import java.util.Hashtable; import javax.naming.AuthenticationException; @@ -37,7 +36,6 @@ import javax.security.auth.callback.Call import javax.security.auth.callback.NameCallback; import javax.security.auth.callback.UnsupportedCallbackException; import javax.security.sasl.AuthorizeCallback; -import javax.security.sasl.Sasl; import javax.security.sasl.SaslException; import javax.security.sasl.SaslServer; import org.apache.log4j.Logger; @@ -45,6 +43,7 @@ import org.apache.qpid.server.security.a import org.apache.qpid.server.security.auth.AuthenticationResult.AuthenticationStatus; import org.apache.qpid.server.security.auth.UsernamePrincipal; import org.apache.qpid.server.security.auth.sasl.plain.PlainPasswordCallback; +import org.apache.qpid.server.security.auth.sasl.plain.PlainSaslServer; public class SimpleLDAPAuthenticationManager implements AuthenticationManager { @@ -83,9 +82,7 @@ public class SimpleLDAPAuthenticationMan { if(PLAIN_MECHANISM.equals(mechanism)) { - return Sasl.createSaslServer(PLAIN_MECHANISM, "AMQP", localFQDN, - new HashMap(), new PlainCallbackHandler()); - + return new PlainSaslServer(new SimpleLDAPPlainCallbackHandler()); } else { @@ -214,7 +211,7 @@ public class SimpleLDAPAuthenticationMan } } - private class PlainCallbackHandler implements CallbackHandler + private class SimpleLDAPPlainCallbackHandler implements CallbackHandler { @Override Propchange: qpid/branches/0.22/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost/ ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/broker/src/main/java/org/apache/qpid/server/virtualhost:r1463063 Propchange: qpid/branches/0.22/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/LoggingManagement.java:r1463063 Propchange: qpid/branches/0.22/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedBroker.java:r1463063 Propchange: qpid/branches/0.22/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedConnection.java:r1463063 Propchange: qpid/branches/0.22/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedExchange.java:r1463063 Propchange: qpid/branches/0.22/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/ManagedQueue.java:r1463063 Propchange: qpid/branches/0.22/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/UserManagement.java:r1463063 Propchange: qpid/branches/0.22/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanAttribute.java:r1463063 Propchange: qpid/branches/0.22/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanConstructor.java:r1463063 Propchange: qpid/branches/0.22/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanDescription.java:r1463063 Propchange: qpid/branches/0.22/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperation.java:r1463063 Propchange: qpid/branches/0.22/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/management/common/src/main/java/org/apache/qpid/management/common/mbeans/annotations/MBeanOperationParameter.java:r1463063 Propchange: qpid/branches/0.22/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/server/SupportedProtocolVersionsTest.java:r1463063 Propchange: qpid/branches/0.22/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java:r1463063 Propchange: qpid/branches/0.22/qpid/java/test-profiles/ ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles:r1463063 Propchange: qpid/branches/0.22/qpid/java/test-profiles/CPPExcludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/CPPExcludes:r1463063 Propchange: qpid/branches/0.22/qpid/java/test-profiles/Excludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/Excludes:r1463063 Propchange: qpid/branches/0.22/qpid/java/test-profiles/JavaBDBExcludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/JavaBDBExcludes:r1463063 Propchange: qpid/branches/0.22/qpid/java/test-profiles/JavaExcludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/JavaExcludes:r1463063 Propchange: qpid/branches/0.22/qpid/java/test-profiles/JavaPre010Excludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/JavaPre010Excludes:r1463063 Propchange: qpid/branches/0.22/qpid/java/test-profiles/JavaTransientExcludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/JavaTransientExcludes:r1463063 Propchange: qpid/branches/0.22/qpid/java/test-profiles/XAExcludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/XAExcludes:r1463063 Propchange: qpid/branches/0.22/qpid/java/test-profiles/cpp.async.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/cpp.async.testprofile:r1463063 Propchange: qpid/branches/0.22/qpid/java/test-profiles/cpp.cluster.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/cpp.cluster.testprofile:r1463063 Propchange: qpid/branches/0.22/qpid/java/test-profiles/cpp.noprefetch.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/cpp.noprefetch.testprofile:r1463063 Propchange: qpid/branches/0.22/qpid/java/test-profiles/cpp.ssl.excludes ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/cpp.ssl.excludes:r1463063 Propchange: qpid/branches/0.22/qpid/java/test-profiles/cpp.ssl.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/cpp.ssl.testprofile:r1463063 Propchange: qpid/branches/0.22/qpid/java/test-profiles/cpp.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/cpp.testprofile:r1463063 Propchange: qpid/branches/0.22/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/java-bdb-spawn.0-9-1.testprofile:r1463063 Propchange: qpid/branches/0.22/qpid/java/test-profiles/java-bdb.0-9-1.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/java-bdb.0-9-1.testprofile:r1463063 Propchange: qpid/branches/0.22/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/java-dby-spawn.0-9-1.testprofile:r1463063 Propchange: qpid/branches/0.22/qpid/java/test-profiles/java-dby.0-9-1.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/java-dby.0-9-1.testprofile:r1463063 Propchange: qpid/branches/0.22/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-10.testprofile:r1463063 Propchange: qpid/branches/0.22/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/java-mms-spawn.0-9-1.testprofile:r1463063 Propchange: qpid/branches/0.22/qpid/java/test-profiles/java-mms.0-9-1.testprofile ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/java-mms.0-9-1.testprofile:r1463063 Propchange: qpid/branches/0.22/qpid/java/test-profiles/log4j-test.xml ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/log4j-test.xml:r1463063 Propchange: qpid/branches/0.22/qpid/java/test-profiles/test-provider.properties ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/test-provider.properties:r1463063 Propchange: qpid/branches/0.22/qpid/java/test-profiles/test_resources/ ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/test_resources:r1463063 Propchange: qpid/branches/0.22/qpid/java/test-profiles/testprofile.defaults ------------------------------------------------------------------------------ Merged /qpid/trunk/qpid/java/test-profiles/testprofile.defaults:r1463063 --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org For additional commands, e-mail: commits-help@qpid.apache.org