directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r760727 - in /directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec: ./ abandon/ bind/
Date Tue, 31 Mar 2009 23:26:01 GMT
Author: elecharny
Date: Tue Mar 31 23:26:00 2009
New Revision: 760727

URL: http://svn.apache.org/viewvc?rev=760727&view=rev
Log:
o Renamed classes from class codec 
o Modified the code to reflect the renaming of codec and standard messages

Added:
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequestCodec.java
      - copied, changed from r759581, directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequest.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/BindRequestCodec.java
      - copied, changed from r759581, directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/BindRequest.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/BindResponseCodec.java
      - copied, changed from r759581, directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/BindResponse.java
Modified:
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessage.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixTransformer.java

Modified: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessage.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessage.java?rev=760727&r1=760726&r2=760727&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessage.java
(original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessage.java
Tue Mar 31 23:26:00 2009
@@ -32,11 +32,11 @@
 import org.apache.directory.shared.asn1.ber.tlv.UniversalTag;
 import org.apache.directory.shared.asn1.ber.tlv.Value;
 import org.apache.directory.shared.asn1.codec.EncoderException;
-import org.apache.directory.shared.ldap.codec.abandon.AbandonRequest;
+import org.apache.directory.shared.ldap.codec.abandon.AbandonRequestCodec;
 import org.apache.directory.shared.ldap.codec.add.AddRequest;
 import org.apache.directory.shared.ldap.codec.add.AddResponse;
-import org.apache.directory.shared.ldap.codec.bind.BindRequest;
-import org.apache.directory.shared.ldap.codec.bind.BindResponse;
+import org.apache.directory.shared.ldap.codec.bind.BindRequestCodec;
+import org.apache.directory.shared.ldap.codec.bind.BindResponseCodec;
 import org.apache.directory.shared.ldap.codec.compare.CompareRequest;
 import org.apache.directory.shared.ldap.codec.compare.CompareResponse;
 import org.apache.directory.shared.ldap.codec.del.DelRequest;
@@ -301,9 +301,9 @@
      * 
      * @return Returns the AbandonRequest ldapObject.
      */
-    public AbandonRequest getAbandonRequest()
+    public AbandonRequestCodec getAbandonRequest()
     {
-        return ( AbandonRequest ) protocolOp;
+        return ( AbandonRequestCodec ) protocolOp;
     }
 
 
@@ -337,9 +337,9 @@
      * 
      * @return Returns the BindRequest ldapObject.
      */
-    public BindRequest getBindRequest()
+    public BindRequestCodec getBindRequest()
     {
-        return ( BindRequest ) protocolOp;
+        return ( BindRequestCodec ) protocolOp;
     }
 
 
@@ -349,9 +349,9 @@
      * 
      * @return Returns the BindResponse ldapObject.
      */
-    public BindResponse getBindResponse()
+    public BindResponseCodec getBindResponse()
     {
-        return ( BindResponse ) protocolOp;
+        return ( BindResponseCodec ) protocolOp;
     }
 
 

Modified: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java?rev=760727&r1=760726&r2=760727&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java
(original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java
Tue Mar 31 23:26:00 2009
@@ -38,7 +38,7 @@
 import org.apache.directory.shared.asn1.util.BooleanDecoderException;
 import org.apache.directory.shared.asn1.util.IntegerDecoder;
 import org.apache.directory.shared.asn1.util.IntegerDecoderException;
-import org.apache.directory.shared.ldap.codec.abandon.AbandonRequest;
+import org.apache.directory.shared.ldap.codec.abandon.AbandonRequestCodec;
 import org.apache.directory.shared.ldap.codec.actions.AttributeDescAction;
 import org.apache.directory.shared.ldap.codec.actions.ControlValueAction;
 import org.apache.directory.shared.ldap.codec.actions.ControlsInitAction;
@@ -73,8 +73,8 @@
 import org.apache.directory.shared.ldap.codec.actions.ValueAction;
 import org.apache.directory.shared.ldap.codec.add.AddRequest;
 import org.apache.directory.shared.ldap.codec.add.AddResponse;
-import org.apache.directory.shared.ldap.codec.bind.BindRequest;
-import org.apache.directory.shared.ldap.codec.bind.BindResponse;
+import org.apache.directory.shared.ldap.codec.bind.BindRequestCodec;
+import org.apache.directory.shared.ldap.codec.bind.BindResponseCodec;
 import org.apache.directory.shared.ldap.codec.bind.SaslCredentials;
 import org.apache.directory.shared.ldap.codec.bind.SimpleAuthentication;
 import org.apache.directory.shared.ldap.codec.compare.CompareRequest;
@@ -450,7 +450,7 @@
 
                         // Ok, the Message ID is correct. We have to store it
                         // in the AbandonRequest Object
-                        AbandonRequest abandonRequest = new AbandonRequest();
+                        AbandonRequestCodec abandonRequest = new AbandonRequestCodec();
                         abandonRequest.setAbandonedMessageId( abandonnedMessageId );
                         ldapMessage.setProtocolOP( abandonRequest );
 
@@ -516,7 +516,7 @@
                     }
 
                     // Now, we can allocate the BindRequest Object
-                    ldapMessage.setProtocolOP( new BindRequest() );
+                    ldapMessage.setProtocolOP( new BindRequestCodec() );
                 }
             } );
 
@@ -536,7 +536,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
container;
-                    BindRequest bindRequestMessage = ldapMessageContainer.getLdapMessage().getBindRequest();
+                    BindRequestCodec bindRequestMessage = ldapMessageContainer.getLdapMessage().getBindRequest();
 
                     // The current TLV should be a integer between 1 and 127
                     // We get it and store it in Version
@@ -585,7 +585,7 @@
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
container;
                     LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
-                    BindRequest bindRequestMessage = ldapMessage.getBindRequest();
+                    BindRequestCodec bindRequestMessage = ldapMessage.getBindRequest();
 
                     // Get the Value and store it in the BindRequest
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -646,7 +646,7 @@
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
container;
 
-                    BindRequest bindRequestMessage = ldapMessageContainer.getLdapMessage().getBindRequest();
+                    BindRequestCodec bindRequestMessage = ldapMessageContainer.getLdapMessage().getBindRequest();
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
                     // Allocate the Authentication Object
@@ -710,7 +710,7 @@
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
container;
                     LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
-                    BindRequest bindRequestMessage = ldapMessage.getBindRequest();
+                    BindRequestCodec bindRequestMessage = ldapMessage.getBindRequest();
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
                     // We will check that the sasl is not null
@@ -757,7 +757,7 @@
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
container;
                     LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
-                    BindRequest bindRequestMessage = ldapMessage.getBindRequest();
+                    BindRequestCodec bindRequestMessage = ldapMessage.getBindRequest();
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
                     // Get the SaslCredentials Object
@@ -802,7 +802,7 @@
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer )
container;
 
-                    BindRequest bindRequestMessage = ldapMessageContainer.getLdapMessage().getBindRequest();
+                    BindRequestCodec bindRequestMessage = ldapMessageContainer.getLdapMessage().getBindRequest();
 
                     // Get the Value and store it in the BindRequest
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -870,7 +870,7 @@
                     LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // Now, we can allocate the BindRequest Object
-                    BindResponse bindResponse = new BindResponse();
+                    BindResponseCodec bindResponse = new BindResponseCodec();
 
                     // As this is a new Constructed object, we have to init its
                     // length

Modified: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixTransformer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixTransformer.java?rev=760727&r1=760726&r2=760727&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixTransformer.java
(original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixTransformer.java
Tue Mar 31 23:26:00 2009
@@ -29,11 +29,11 @@
 import org.apache.directory.shared.asn1.Asn1Object;
 import org.apache.directory.shared.asn1.codec.DecoderException;
 import org.apache.directory.shared.asn1.primitives.OID;
-import org.apache.directory.shared.ldap.codec.abandon.AbandonRequest;
+import org.apache.directory.shared.ldap.codec.abandon.AbandonRequestCodec;
 import org.apache.directory.shared.ldap.codec.add.AddRequest;
 import org.apache.directory.shared.ldap.codec.add.AddResponse;
-import org.apache.directory.shared.ldap.codec.bind.BindRequest;
-import org.apache.directory.shared.ldap.codec.bind.BindResponse;
+import org.apache.directory.shared.ldap.codec.bind.BindRequestCodec;
+import org.apache.directory.shared.ldap.codec.bind.BindResponseCodec;
 import org.apache.directory.shared.ldap.codec.bind.SaslCredentials;
 import org.apache.directory.shared.ldap.codec.bind.SimpleAuthentication;
 import org.apache.directory.shared.ldap.codec.compare.CompareRequest;
@@ -154,7 +154,7 @@
     public static Message transformAbandonRequest( LdapMessage twixMessage, int messageId
)
     {
         AbandonRequestImpl snickersMessage = new AbandonRequestImpl( messageId );
-        AbandonRequest abandonRequest = twixMessage.getAbandonRequest();
+        AbandonRequestCodec abandonRequest = twixMessage.getAbandonRequest();
 
         // Twix : int abandonnedMessageId -> Snickers : int abandonId
         snickersMessage.setAbandoned( abandonRequest.getAbandonedMessageId() );
@@ -195,7 +195,7 @@
     public static Message transformBindRequest( LdapMessage twixMessage, int messageId )
     {
         BindRequestImpl snickersMessage = new BindRequestImpl( messageId );
-        BindRequest bindRequest = twixMessage.getBindRequest();
+        BindRequestCodec bindRequest = twixMessage.getBindRequest();
 
         // Twix : int version -> Snickers : boolean isVersion3
         snickersMessage.setVersion3( bindRequest.isLdapV3() );
@@ -238,7 +238,7 @@
     public static Message transformBindResponse( LdapMessage twixMessage, int messageId )
     {
         BindResponseImpl snickersMessage = new BindResponseImpl( messageId );
-        BindResponse bindResponse = twixMessage.getBindResponse();
+        BindResponseCodec bindResponse = twixMessage.getBindResponse();
 
         // Twix : byte[] serverSaslcreds -> Snickers : byte[] serverSaslCreds
         snickersMessage.setServerSaslCreds( bindResponse.getServerSaslCreds() );
@@ -1160,7 +1160,7 @@
     {
         BindResponseImpl snickersBindResponse = ( BindResponseImpl ) snickersMessage;
 
-        BindResponse bindResponse = new BindResponse();
+        BindResponseCodec bindResponse = new BindResponseCodec();
 
         // Snickers : byte [] serverSaslCreds -> Twix : OctetString
         // serverSaslCreds
@@ -1189,7 +1189,7 @@
     {
         BindRequestImpl snickersBindRequest = ( BindRequestImpl ) snickersMessage;
 
-        BindRequest bindRequest = new BindRequest();
+        BindRequestCodec bindRequest = new BindRequestCodec();
         
         if ( snickersBindRequest.isSimple() )
         {

Copied: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequestCodec.java
(from r759581, directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequest.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequestCodec.java?p2=directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequestCodec.java&p1=directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequest.java&r1=759581&r2=760727&rev=760727&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequest.java
(original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequestCodec.java
Tue Mar 31 23:26:00 2009
@@ -44,10 +44,10 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$, 
  */
-public class AbandonRequest extends LdapMessage
+public class AbandonRequestCodec extends LdapMessage
 {
     /** The logger */
-    private static Logger log = LoggerFactory.getLogger( AbandonRequest.class );
+    private static Logger log = LoggerFactory.getLogger( AbandonRequestCodec.class );
 
     /** Speedup for logs */
     private static final boolean IS_DEBUG = log.isDebugEnabled();
@@ -65,7 +65,7 @@
     /**
      * Creates a new AbandonRequest object.
      */
-    public AbandonRequest()
+    public AbandonRequestCodec()
     {
         super();
     }

Copied: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/BindRequestCodec.java
(from r759581, directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/BindRequest.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/BindRequestCodec.java?p2=directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/BindRequestCodec.java&p1=directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/BindRequest.java&r1=759581&r2=760727&rev=760727&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/BindRequest.java
(original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/BindRequestCodec.java
Tue Mar 31 23:26:00 2009
@@ -39,7 +39,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$, 
  */
-public class BindRequest extends LdapMessage
+public class BindRequestCodec extends LdapMessage
 {
     // ~ Instance fields
     // ----------------------------------------------------------------------------
@@ -59,7 +59,7 @@
     /**
      * Creates a new BindRequest object.
      */
-    public BindRequest()
+    public BindRequestCodec()
     {
         super();
     }

Copied: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/BindResponseCodec.java
(from r759581, directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/BindResponse.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/BindResponseCodec.java?p2=directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/BindResponseCodec.java&p1=directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/BindResponse.java&r1=759581&r2=760727&rev=760727&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/BindResponse.java
(original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/BindResponseCodec.java
Tue Mar 31 23:26:00 2009
@@ -43,7 +43,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$, 
  */
-public class BindResponse extends LdapResponse
+public class BindResponseCodec extends LdapResponse
 {
     // ~ Instance fields
     // ----------------------------------------------------------------------------
@@ -61,7 +61,7 @@
     /**
      * Creates a new BindResponse object.
      */
-    public BindResponse()
+    public BindResponseCodec()
     {
         super();
     }



Mime
View raw message