Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 35785 invoked from network); 6 Apr 2009 21:30:48 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 6 Apr 2009 21:30:48 -0000 Received: (qmail 33324 invoked by uid 500); 6 Apr 2009 21:30:48 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 33267 invoked by uid 500); 6 Apr 2009 21:30:48 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 33258 invoked by uid 99); 6 Apr 2009 21:30:48 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Apr 2009 21:30:48 +0000 X-ASF-Spam-Status: No, hits=-1998.8 required=10.0 tests=ALL_TRUSTED,FS_REPLICA 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, 06 Apr 2009 21:30:47 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 536BC23889E3; Mon, 6 Apr 2009 21:30:27 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r762514 - in /directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap: LdapProtocolHandler.java handlers/bind/AbstractSaslCallbackHandler.java Date: Mon, 06 Apr 2009 21:30:26 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20090406213027.536BC23889E3@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Mon Apr 6 21:30:24 2009 New Revision: 762514 URL: http://svn.apache.org/viewvc?rev=762514&view=rev Log: o Renamed the MutableControl to InternalControl o Renamed the AbstractMutableControlImpl to AbstractInternalControl Modified: directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java Modified: directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java?rev=762514&r1=762513&r2=762514&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java (original) +++ directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java Mon Apr 6 21:30:24 2009 @@ -24,7 +24,7 @@ import org.apache.directory.shared.ldap.message.InternalExtendedRequest; import org.apache.directory.shared.ldap.message.ExtendedRequestImpl; -import org.apache.directory.shared.ldap.message.MutableControl; +import org.apache.directory.shared.ldap.message.InternalControl; import org.apache.directory.shared.ldap.message.InternalRequest; import org.apache.directory.shared.ldap.message.ResponseCarryingMessageException; import org.apache.directory.shared.ldap.message.ResultCodeEnum; @@ -179,7 +179,7 @@ InternalResultResponseRequest req = ( InternalResultResponseRequest ) message; for ( Control control1 : req.getControls().values() ) { - MutableControl control = ( MutableControl ) control1; + InternalControl control = ( InternalControl ) control1; if ( control.isCritical() && ! ldapService.getSupportedControls().contains( control.getID() ) ) { InternalResultResponse resp = req.getResultResponse(); Modified: directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java?rev=762514&r1=762513&r2=762514&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java (original) +++ directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java Mon Apr 6 21:30:24 2009 @@ -29,7 +29,7 @@ import org.apache.directory.shared.ldap.exception.LdapException; import org.apache.directory.shared.ldap.message.InternalBindRequest; import org.apache.directory.shared.ldap.message.InternalLdapResult; -import org.apache.directory.shared.ldap.message.MutableControl; +import org.apache.directory.shared.ldap.message.InternalControl; import org.apache.directory.shared.ldap.message.ResultCodeEnum; import org.apache.directory.shared.ldap.name.LdapDN; import org.apache.directory.shared.ldap.util.ExceptionUtils; @@ -65,7 +65,7 @@ private static final Logger LOG = LoggerFactory.getLogger( AbstractSaslCallbackHandler.class ); /** An empty control array */ - private static final MutableControl[] EMPTY = new MutableControl[0]; + private static final InternalControl[] EMPTY = new InternalControl[0]; private String username; private String realm; @@ -237,7 +237,7 @@ try { - MutableControl[] connCtls = bindRequest.getControls().values().toArray( EMPTY ); + InternalControl[] connCtls = bindRequest.getControls().values().toArray( EMPTY ); env.put( DirectoryService.JNDI_KEY, directoryService ); ctx = new InitialLdapContext( env, connCtls ); }