directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r680443 - in /directory/apacheds/branches/bigbang/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/bind: CramMd5MechanismHandler.java DigestMd5MechanismHandler.java GssapiMechanismHandler.java
Date Mon, 28 Jul 2008 19:01:47 GMT
Author: akarasulu
Date: Mon Jul 28 12:01:46 2008
New Revision: 680443

URL: http://svn.apache.org/viewvc?rev=680443&view=rev
Log:
do not need to have member and setter now for directoryService since sessions contain all
this

Modified:
    directory/apacheds/branches/bigbang/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/bind/CramMd5MechanismHandler.java
    directory/apacheds/branches/bigbang/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/bind/DigestMd5MechanismHandler.java
    directory/apacheds/branches/bigbang/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/bind/GssapiMechanismHandler.java

Modified: directory/apacheds/branches/bigbang/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/bind/CramMd5MechanismHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/bind/CramMd5MechanismHandler.java?rev=680443&r1=680442&r2=680443&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/bind/CramMd5MechanismHandler.java
(original)
+++ directory/apacheds/branches/bigbang/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/bind/CramMd5MechanismHandler.java
Mon Jul 28 12:01:46 2008
@@ -20,7 +20,6 @@
 package org.apache.directory.server.newldap.handlers.bind;
 
 
-import org.apache.directory.server.core.DirectoryService;
 import org.apache.directory.server.newldap.LdapSession;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
 import org.apache.directory.shared.ldap.message.BindRequest;
@@ -41,15 +40,6 @@
  */
 public class CramMd5MechanismHandler implements MechanismHandler
 {
-    private DirectoryService directoryService;
-
-
-    public void setDirectoryService( DirectoryService directoryService )
-    {
-        this.directoryService = directoryService;
-    }
-
-    
     public SaslServer handleMechanism( LdapSession session, BindRequest bindRequest ) throws
Exception
     {
         SaslServer ss;

Modified: directory/apacheds/branches/bigbang/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/bind/DigestMd5MechanismHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/bind/DigestMd5MechanismHandler.java?rev=680443&r1=680442&r2=680443&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/bind/DigestMd5MechanismHandler.java
(original)
+++ directory/apacheds/branches/bigbang/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/bind/DigestMd5MechanismHandler.java
Mon Jul 28 12:01:46 2008
@@ -20,7 +20,6 @@
 package org.apache.directory.server.newldap.handlers.bind;
 
 
-import org.apache.directory.server.core.DirectoryService;
 import org.apache.directory.server.newldap.LdapSession;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
 import org.apache.directory.shared.ldap.message.BindRequest;
@@ -40,15 +39,6 @@
  */
 public class DigestMd5MechanismHandler implements MechanismHandler
 {
-    private DirectoryService directoryService;
-
-
-    public void setDirectoryService( DirectoryService directoryService )
-    {
-        this.directoryService = directoryService;
-    }
-
-    
     public SaslServer handleMechanism( LdapSession session, BindRequest bindRequest ) throws
Exception
     {
         SaslServer ss;
@@ -62,7 +52,8 @@
             String saslHost = ( String ) session.getIoSession().getAttribute( "saslHost"
);
             Map<String, String> saslProps = ( Map<String, String> ) session.getIoSession().getAttribute(
"saslProps" );
 
-            CallbackHandler callbackHandler = new DigestMd5CallbackHandler( directoryService,
bindRequest );
+            CallbackHandler callbackHandler = new DigestMd5CallbackHandler( 
+                session.getCoreSession().getDirectoryService(), bindRequest );
 
             ss = Sasl.createSaslServer( SupportedSaslMechanisms.DIGEST_MD5, "ldap", saslHost,
saslProps, callbackHandler );
             session.getIoSession().setAttribute( SASL_CONTEXT, ss );

Modified: directory/apacheds/branches/bigbang/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/bind/GssapiMechanismHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/bind/GssapiMechanismHandler.java?rev=680443&r1=680442&r2=680443&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/bind/GssapiMechanismHandler.java
(original)
+++ directory/apacheds/branches/bigbang/protocol-newldap/src/main/java/org/apache/directory/server/newldap/handlers/bind/GssapiMechanismHandler.java
Mon Jul 28 12:01:46 2008
@@ -20,7 +20,6 @@
 package org.apache.directory.server.newldap.handlers.bind;
 
 
-import org.apache.directory.server.core.DirectoryService;
 import org.apache.directory.server.newldap.LdapSession;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
 import org.apache.directory.shared.ldap.message.BindRequest;
@@ -42,15 +41,6 @@
  */
 public class GssapiMechanismHandler implements MechanismHandler
 {
-    private DirectoryService directoryService;
-
-
-    public void setDirectoryService( DirectoryService directoryService )
-    {
-        this.directoryService = directoryService;
-    }
-
-    
     public SaslServer handleMechanism( LdapSession session, BindRequest bindRequest ) throws
Exception
     {
         SaslServer ss;
@@ -66,7 +56,8 @@
             final Map<String, String> saslProps = ( Map<String, String> ) session.getIoSession().getAttribute(
"saslProps" );
             final String saslHost = ( String ) session.getIoSession().getAttribute( "saslHost"
);
 
-            final CallbackHandler callbackHandler = new GssapiCallbackHandler( directoryService,
session.getIoSession(), bindRequest );
+            final CallbackHandler callbackHandler = new GssapiCallbackHandler( 
+                session.getCoreSession().getDirectoryService(), session.getIoSession(), bindRequest
);
 
             ss = ( SaslServer ) Subject.doAs( subject, new PrivilegedExceptionAction<SaslServer>()
             {



Mime
View raw message