directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r440791 - in /directory/sandbox/akarasulu/apacheds-2.0/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/asn1ber/messages/bind: BindRequestAsn1Ber.java SaslCredentialsAsn1Ber.java SimpleAuthenticationAsn1Ber.java
Date Wed, 06 Sep 2006 16:52:17 GMT
Author: elecharny
Date: Wed Sep  6 09:52:17 2006
New Revision: 440791

URL: http://svn.apache.org/viewvc?view=rev&rev=440791
Log:
Reflect the renaming of interfaces and classes

Modified:
    directory/sandbox/akarasulu/apacheds-2.0/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/asn1ber/messages/bind/BindRequestAsn1Ber.java
    directory/sandbox/akarasulu/apacheds-2.0/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/asn1ber/messages/bind/SaslCredentialsAsn1Ber.java
    directory/sandbox/akarasulu/apacheds-2.0/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/asn1ber/messages/bind/SimpleAuthenticationAsn1Ber.java

Modified: directory/sandbox/akarasulu/apacheds-2.0/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/asn1ber/messages/bind/BindRequestAsn1Ber.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/apacheds-2.0/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/asn1ber/messages/bind/BindRequestAsn1Ber.java?view=diff&rev=440791&r1=440790&r2=440791
==============================================================================
--- directory/sandbox/akarasulu/apacheds-2.0/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/asn1ber/messages/bind/BindRequestAsn1Ber.java
(original)
+++ directory/sandbox/akarasulu/apacheds-2.0/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/asn1ber/messages/bind/BindRequestAsn1Ber.java
Wed Sep  6 09:52:17 2006
@@ -22,8 +22,9 @@
 import org.apache.directory.shared.asn1.ber.Decoder;
 import org.apache.directory.shared.asn1.ber.Encoder;
 import org.apache.directory.shared.asn1.ber.tlv.Length;
+import org.apache.directory.shared.ldap.messages.Message;
+import org.apache.directory.shared.ldap.messages.bind.AuthenticationDecorator;
 import org.apache.directory.shared.ldap.messages.bind.BindRequestDecorator;
-import org.apache.directory.shared.ldap.messages.bind.BindRequest;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -52,9 +53,9 @@
      *
      * @param bindRequest The bindRequest object to decorate
      */
-    public BindRequestAsn1Ber( BindRequest bindRequest )
+    public BindRequestAsn1Ber( Message message )
     {
-        super( bindRequest );
+        super( message );
     }
 
     /**
@@ -79,20 +80,21 @@
         bindRequestLength += 1 + Length.getNbBytes( LdapDN.getNbBytes( getName() ) ) + LdapDN.getNbBytes(
getName() );
 
         // The authentication
+        AuthenticationDecorator authenticationDecorator = null;
+        
+        // We have to select the correct decorator
         if ( getAuthentication().isSimple() )
         {
-            SimpleAuthenticationAsn1Ber authenticationDecorator = 
+            authenticationDecorator = 
                     new SimpleAuthenticationAsn1Ber( getAuthentication() );
-
-            bindRequestLength += authenticationDecorator.computeLength();
         }
         else
         {
-            SaslCredentialsAsn1Ber authenticationDecorator = 
+            authenticationDecorator = 
                     new SaslCredentialsAsn1Ber( getAuthentication() );
-            
-            bindRequestLength += authenticationDecorator.computeLength();
         }
+
+        bindRequestLength += authenticationDecorator.computeLength();
 
         // Return the result.
         int length = 1 + Length.getNbBytes( bindRequestLength ) + bindRequestLength;

Modified: directory/sandbox/akarasulu/apacheds-2.0/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/asn1ber/messages/bind/SaslCredentialsAsn1Ber.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/apacheds-2.0/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/asn1ber/messages/bind/SaslCredentialsAsn1Ber.java?view=diff&rev=440791&r1=440790&r2=440791
==============================================================================
--- directory/sandbox/akarasulu/apacheds-2.0/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/asn1ber/messages/bind/SaslCredentialsAsn1Ber.java
(original)
+++ directory/sandbox/akarasulu/apacheds-2.0/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/asn1ber/messages/bind/SaslCredentialsAsn1Ber.java
Wed Sep  6 09:52:17 2006
@@ -22,7 +22,7 @@
 import org.apache.directory.shared.asn1.ber.Decoder;
 import org.apache.directory.shared.asn1.ber.Encoder;
 import org.apache.directory.shared.asn1.ber.tlv.Length;
-import org.apache.directory.shared.ldap.messages.bind.AuthenticationOperation;
+import org.apache.directory.shared.ldap.messages.bind.Authentication;
 import org.apache.directory.shared.ldap.messages.bind.SaslCredentialsDecorator;
 import org.apache.directory.shared.ldap.utils.StringTools;
 import org.slf4j.Logger;
@@ -45,6 +45,7 @@
     /** The mechanism length */
     private transient int mechanismLength;
     
+    /** The mechanism bytes */
     private transient byte[] mechanismBytes;
 
     /** The credentials length */
@@ -55,7 +56,7 @@
      *
      * @param authentication The authentication object to decorate.
      */
-    public SaslCredentialsAsn1Ber( AuthenticationOperation authentication )
+    public SaslCredentialsAsn1Ber( Authentication authentication )
     {
         super( authentication );
     }

Modified: directory/sandbox/akarasulu/apacheds-2.0/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/asn1ber/messages/bind/SimpleAuthenticationAsn1Ber.java
URL: http://svn.apache.org/viewvc/directory/sandbox/akarasulu/apacheds-2.0/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/asn1ber/messages/bind/SimpleAuthenticationAsn1Ber.java?view=diff&rev=440791&r1=440790&r2=440791
==============================================================================
--- directory/sandbox/akarasulu/apacheds-2.0/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/asn1ber/messages/bind/SimpleAuthenticationAsn1Ber.java
(original)
+++ directory/sandbox/akarasulu/apacheds-2.0/shared/ldap/src/main/java/org/apache/directory/shared/ldap/codec/asn1ber/messages/bind/SimpleAuthenticationAsn1Ber.java
Wed Sep  6 09:52:17 2006
@@ -22,7 +22,7 @@
 import org.apache.directory.shared.asn1.ber.Decoder;
 import org.apache.directory.shared.asn1.ber.Encoder;
 import org.apache.directory.shared.asn1.ber.tlv.Length;
-import org.apache.directory.shared.ldap.messages.bind.AuthenticationOperation;
+import org.apache.directory.shared.ldap.messages.bind.Authentication;
 import org.apache.directory.shared.ldap.messages.bind.SimpleAuthenticationDecorator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -46,7 +46,7 @@
      *
      * @param authentication The authentication object to decorate.
      */
-    public SimpleAuthenticationAsn1Ber( AuthenticationOperation authentication )
+    public SimpleAuthenticationAsn1Ber( Authentication authentication )
     {
         super( authentication );
     }



Mime
View raw message