directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r760801 - /directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/
Date Wed, 01 Apr 2009 07:40:42 GMT
Author: elecharny
Date: Wed Apr  1 07:40:39 2009
New Revision: 760801

URL: http://svn.apache.org/viewvc?rev=760801&view=rev
Log:
Renamed the Ldap message elements in codec, adding a Codec postfix to them

Added:
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ControlCodec.java
      - copied, changed from r759581, directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/Control.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageCodec.java
      - copied, changed from r760727, 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/LdapResponseCodec.java
      - copied, changed from r759581, directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResponse.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResultCodec.java
      - copied, changed from r759581, directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResult.java
Modified:
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageContainer.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/TwixEncoder.java
    directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixTransformer.java

Copied: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ControlCodec.java (from r759581, directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/Control.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ControlCodec.java?p2=directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ControlCodec.java&p1=directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/Control.java&r1=759581&r2=760801&rev=760801&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/Control.java (original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ControlCodec.java Wed Apr  1 07:40:39 2009
@@ -38,7 +38,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$, 
  */
-public class Control extends AbstractAsn1Object
+public class ControlCodec extends AbstractAsn1Object
 {
     // ~ Instance fields
     // ----------------------------------------------------------------------------
@@ -64,7 +64,7 @@
     /**
      * Default constructor.
      */
-    public Control()
+    public ControlCodec()
     {
         super();
     }

Copied: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageCodec.java (from r760727, 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/LdapMessageCodec.java?p2=directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageCodec.java&p1=directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessage.java&r1=760727&r2=760801&rev=760801&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/LdapMessageCodec.java Wed Apr  1 07:40:39 2009
@@ -62,7 +62,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$, 
  */
-public class LdapMessage extends AbstractAsn1Object
+public class LdapMessageCodec extends AbstractAsn1Object
 {
     // ~ Instance fields
     // ----------------------------------------------------------------------------
@@ -74,10 +74,10 @@
     private Asn1Object protocolOp;
 
     /** The controls */
-    private List<Control> controls;
+    private List<ControlCodec> controls;
 
     /** The current control */
-    private Control currentControl;
+    private ControlCodec currentControl;
 
     /** The LdapMessage length */
     private int ldapMessageLength;
@@ -95,7 +95,7 @@
     /**
      * Creates a new LdapMessage object.
      */
-    public LdapMessage()
+    public LdapMessageCodec()
     {
         super();
         // We should not create this kind of object directly
@@ -111,7 +111,7 @@
      * @param i The index of the Control Object to get
      * @return The selected Control Object
      */
-    public Control getControls( int i )
+    public ControlCodec getControls( int i )
     {
         if ( controls != null )
         {
@@ -129,7 +129,7 @@
      * 
      * @return The Control Objects
      */
-    public List<Control> getControls()
+    public List<ControlCodec> getControls()
     {
         return controls;
     }
@@ -140,7 +140,7 @@
      * 
      * @return The current Control Object
      */
-    public Control getCurrentControl()
+    public ControlCodec getCurrentControl()
     {
         return currentControl;
     }
@@ -151,13 +151,13 @@
      * 
      * @param control The Control to add
      */
-    public void addControl( Control control )
+    public void addControl( ControlCodec control )
     {
         currentControl = control;
         
         if ( controls == null )
         {
-            controls = new ArrayList<Control>();
+            controls = new ArrayList<ControlCodec>();
         }
         
         controls.add( control );
@@ -169,7 +169,7 @@
      */
     public void initControls()
     {
-        controls = new ArrayList<Control>();
+        controls = new ArrayList<ControlCodec>();
     }
 
 
@@ -202,7 +202,7 @@
      */
     public int getMessageType()
     {
-        return ( ( LdapMessage ) protocolOp ).getMessageType();
+        return ( ( LdapMessageCodec ) protocolOp ).getMessageType();
     }
 
 
@@ -213,7 +213,7 @@
      */
     public String getMessageTypeName()
     {
-        switch ( ( ( LdapMessage ) protocolOp ).getMessageType() )
+        switch ( ( ( LdapMessageCodec ) protocolOp ).getMessageType() )
         {
             case LdapConstants.ABANDON_REQUEST:
                 return "ABANDON_REQUEST";
@@ -289,9 +289,9 @@
      * 
      * @return Returns the Ldap response.
      */
-    public LdapResponse getLdapResponse()
+    public LdapResponseCodec getLdapResponse()
     {
-        return ( LdapResponse ) protocolOp;
+        return ( LdapResponseCodec ) protocolOp;
     }
 
 
@@ -609,7 +609,7 @@
             controlsSequenceLength = 0;
 
             // We may have more than one control. ControlsLength is L4.
-            for ( Control control:controls )
+            for ( ControlCodec control:controls )
             {
                 controlsSequenceLength += control.computeLength();
             }
@@ -684,7 +684,7 @@
             bb.put( TLV.getBytes( controlsLength ) );
 
             // Encode each control
-            for ( Control control:controls )
+            for ( ControlCodec control:controls )
             {
                 control.encode( bb );
             }
@@ -709,7 +709,7 @@
 
         if ( controls != null )
         {
-            for ( Control control:controls )
+            for ( ControlCodec control:controls )
             {
                 sb.append( control );
             }

Modified: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageContainer.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageContainer.java?rev=760801&r1=760800&r2=760801&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageContainer.java (original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageContainer.java Wed Apr  1 07:40:39 2009
@@ -38,7 +38,7 @@
     // ----------------------------------------------------------------------------
 
     /** The ldap message */
-    private LdapMessage ldapMessage;
+    private LdapMessageCodec ldapMessage;
 
     /** checks if attribute is binary */
     private final BinaryAttributeDetector binaryAttributeDetector;
@@ -47,7 +47,7 @@
     private int messageId;
     
     /** The current control */
-    private Control currentControl;
+    private ControlCodec currentControl;
 
     // ~ Constructors
     // -------------------------------------------------------------------------------
@@ -89,7 +89,7 @@
     /**
      * @return Returns the ldapMessage.
      */
-    public LdapMessage getLdapMessage()
+    public LdapMessageCodec getLdapMessage()
     {
         return ldapMessage;
     }
@@ -101,7 +101,7 @@
      * 
      * @param ldapMessage The message to set.
      */
-    public void setLdapMessage( LdapMessage ldapMessage )
+    public void setLdapMessage( LdapMessageCodec ldapMessage )
     {
         this.ldapMessage = ldapMessage;
     }
@@ -147,7 +147,7 @@
     /**
      * @return the current control being created
      */
-    public Control getCurrentControl()
+    public ControlCodec getCurrentControl()
     {
         return currentControl;
     }
@@ -156,7 +156,7 @@
      * Store a newly created control
      * @param currentControl The control to store
      */
-    public void setCurrentControl( Control currentControl )
+    public void setCurrentControl( ControlCodec currentControl )
     {
         this.currentControl = currentControl;
     }

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=760801&r1=760800&r2=760801&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 Wed Apr  1 07:40:39 2009
@@ -181,7 +181,7 @@
                     }
 
                     // First, create a empty LdapMessage Object
-                    LdapMessage ldapMessage = new LdapMessage();
+                    LdapMessageCodec ldapMessage = new LdapMessageCodec();
 
                     // Then stores it into the container
                     ldapMessageContainer.setLdapMessage( ldapMessage );
@@ -211,7 +211,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // The current TLV should be a integer
                     // We get it and store it in MessageId
@@ -293,7 +293,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
                     int expectedLength = tlv.getLength();
@@ -348,7 +348,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // We can allocate the DelRequest Object
                     DelRequest delRequest = new DelRequest();
@@ -427,7 +427,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // The current TLV should be a integer
                     // We get it and store it in MessageId
@@ -501,7 +501,7 @@
                 public void action( IAsn1Container container ) throws DecoderException
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // We will check that the request is not null
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -584,7 +584,7 @@
                 public void action( IAsn1Container container ) throws DecoderException
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
                     BindRequestCodec bindRequestMessage = ldapMessage.getBindRequest();
 
                     // Get the Value and store it in the BindRequest
@@ -709,7 +709,7 @@
                 public void action( IAsn1Container container ) throws DecoderException
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
                     BindRequestCodec bindRequestMessage = ldapMessage.getBindRequest();
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -756,7 +756,7 @@
                 public void action( IAsn1Container container ) throws DecoderException
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
                     BindRequestCodec bindRequestMessage = ldapMessage.getBindRequest();
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -867,7 +867,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // Now, we can allocate the BindRequest Object
                     BindResponseCodec bindResponse = new BindResponseCodec();
@@ -1058,9 +1058,9 @@
                 public void action( IAsn1Container container ) throws DecoderException
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
-                    LdapResponse response = ldapMessage.getLdapResponse();
-                    LdapResult ldapResult = response.getLdapResult();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapResponseCodec response = ldapMessage.getLdapResponse();
+                    LdapResultCodec ldapResult = response.getLdapResult();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -1140,7 +1140,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // Now, we can allocate the SearchResultEntry Object
                     // And we associate it to the ldapMessage Object
@@ -1164,7 +1164,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
                     SearchResultEntry searchResultEntry = ldapMessage.getSearchResultEntry();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -1270,7 +1270,7 @@
                 public void action( IAsn1Container container ) throws DecoderException
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
                     SearchResultEntry searchResultEntry = ldapMessage.getSearchResultEntry();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -1409,7 +1409,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // Now, we can allocate the SearchResultDone Object
                     ldapMessage.setProtocolOP( new SearchResultDone() );
@@ -1448,7 +1448,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // Now, we can allocate the ModifyRequest Object
                     // And we associate it to the ldapMessage Object
@@ -1472,7 +1472,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
                     ModifyRequest modifyRequest = ldapMessage.getModifyRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -1530,7 +1530,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
                     ModifyRequest modifyRequest = ldapMessage.getModifyRequest();
 
                     modifyRequest.initModifications();
@@ -1567,7 +1567,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
                     ModifyRequest modifyRequest = ldapMessage.getModifyRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -1651,7 +1651,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
                     ModifyRequest modifyRequest = ldapMessage.getModifyRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -1836,7 +1836,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // We associate it to the ldapMessage Object
                     ldapMessage.setProtocolOP( new ModifyResponse() );
@@ -1875,7 +1875,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // We will check that the request is not null
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -1911,7 +1911,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
                     AddRequest addRequest = ldapMessage.getAddRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -1996,7 +1996,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
                     AddRequest addRequest = ldapMessage.getAddRequest();
@@ -2107,7 +2107,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // We will check that the request is not null
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -2166,7 +2166,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // Now, we can allocate the DelResponse Object
 
@@ -2207,7 +2207,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // Now, we can allocate the ModifyDNRequest Object
                     // And we associate it to the ldapMessage Object
@@ -2232,7 +2232,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     ModifyDNRequest modifyDNRequest = ldapMessage.getModifyDNRequest();
 
@@ -2298,7 +2298,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     ModifyDNRequest modifyDNRequest = ldapMessage.getModifyDNRequest();
 
@@ -2365,7 +2365,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
@@ -2427,7 +2427,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     ModifyDNRequest modifyDNRequest = ldapMessage.getModifyDNRequest();
 
@@ -2527,7 +2527,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // And we associate it to the ldapMessage Object
                     ldapMessage.setProtocolOP( new ModifyDNResponse() );
@@ -2570,7 +2570,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // We can allocate the CompareRequest Object
                     ldapMessage.setProtocolOP( new CompareRequest() );
@@ -2593,7 +2593,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // We can allocate the CompareRequest Object
                     CompareRequest compareRequest = ldapMessage.getCompareRequest();
@@ -2669,7 +2669,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // Get the CompareRequest Object
                     CompareRequest compareRequest = ldapMessage.getCompareRequest();
@@ -2717,7 +2717,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // Get the CompareRequest Object
                     CompareRequest compareRequest = ldapMessage.getCompareRequest();
@@ -2786,7 +2786,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // We will check that the request is not null
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -2836,7 +2836,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // Now, we can allocate the BindRequest Object
                     SearchResultReference searchResultReference = new SearchResultReference();
@@ -2899,7 +2899,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // We can allocate the ExtendedRequest Object
                     ldapMessage.setProtocolOP( new ExtendedRequest() );
@@ -2922,7 +2922,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // We can allocate the ExtendedRequest Object
                     ExtendedRequest extendedRequest = ldapMessage.getExtendedRequest();
@@ -2985,7 +2985,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // We can allocate the ExtendedRequest Object
                     ExtendedRequest extendedRequest = ldapMessage.getExtendedRequest();
@@ -3053,7 +3053,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // We can allocate the ExtendedResponse Object
                     ldapMessage.setProtocolOP( new ExtendedResponse() );
@@ -3267,7 +3267,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // We can allocate the IntermediateResponse Object
                     ldapMessage.setProtocolOP( new IntermediateResponse() );
@@ -3290,7 +3290,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // We can get the IntermediateResponse Object
                     IntermediateResponse intermediateResponse = ldapMessage.getIntermediateResponse();
@@ -3354,7 +3354,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // We can get the IntermediateResponse Object
                     IntermediateResponse intermediateResponse = ldapMessage.getIntermediateResponse();
@@ -3399,7 +3399,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // We can allocate the ExtendedRequest Object
                     IntermediateResponse intermediateResponse = ldapMessage.getIntermediateResponse();
@@ -3461,7 +3461,7 @@
             public void action( IAsn1Container container ) throws DecoderException
             {
                 LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                LdapMessage message = ldapMessageContainer.getLdapMessage();
+                LdapMessageCodec message = ldapMessageContainer.getLdapMessage();
 
                 TLV tlv = ldapMessageContainer.getCurrentTLV();
                 int expectedLength = tlv.getLength();
@@ -3476,7 +3476,7 @@
                 }
 
                 // Create a new control
-                Control control = new Control();
+                ControlCodec control = new ControlCodec();
 
                 // Store the control into the container
                 message.addControl( control );
@@ -3508,12 +3508,12 @@
                 public void action( IAsn1Container container ) throws DecoderException
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage message = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec message = ldapMessageContainer.getLdapMessage();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
                     // Get the current control
-                    Control control = message.getCurrentControl();
+                    ControlCodec control = message.getCurrentControl();
 
                     // Store the type
                     // We have to handle the special case of a 0 length OID
@@ -3572,12 +3572,12 @@
                 public void action( IAsn1Container container ) throws DecoderException
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage message = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec message = ldapMessageContainer.getLdapMessage();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
 
                     // Get the current control
-                    Control control = message.getCurrentControl();
+                    ControlCodec control = message.getCurrentControl();
 
                     // Store the criticality
                     // We get the value. If it's a 0, it's a FALSE. If it's
@@ -3683,7 +3683,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
 
                     // Now, we can allocate the SearchRequest
                     // And we associate it to the ldapMessage Object
@@ -3707,7 +3707,7 @@
                 {
 
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
                     SearchRequest searchRequest = ldapMessage.getSearchRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -5141,7 +5141,7 @@
                 public void action( IAsn1Container container ) throws DecoderException
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
                     SearchRequest searchRequest = ldapMessage.getSearchRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -5215,7 +5215,7 @@
                 public void action( IAsn1Container container ) throws DecoderException
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
                     SearchRequest searchRequest = ldapMessage.getSearchRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -6136,7 +6136,7 @@
                 public void action( IAsn1Container container ) throws DecoderException
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
                     SearchRequest searchRequest = ldapMessage.getSearchRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();
@@ -6263,7 +6263,7 @@
                 public void action( IAsn1Container container ) throws DecoderException
                 {
                     LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
-                    LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
+                    LdapMessageCodec ldapMessage = ldapMessageContainer.getLdapMessage();
                     SearchRequest searchRequest = ldapMessage.getSearchRequest();
 
                     TLV tlv = ldapMessageContainer.getCurrentTLV();

Copied: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResponseCodec.java (from r759581, directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResponse.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResponseCodec.java?p2=directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResponseCodec.java&p1=directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResponse.java&r1=759581&r2=760801&rev=760801&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResponse.java (original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResponseCodec.java Wed Apr  1 07:40:39 2009
@@ -31,13 +31,13 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$, 
  */
-public class LdapResponse extends LdapMessage
+public class LdapResponseCodec extends LdapMessageCodec
 {
     // ~ Instance fields
     // ----------------------------------------------------------------------------
 
     /** The LdapResult element */
-    private LdapResult ldapResult;
+    private LdapResultCodec ldapResult;
 
     /** The response length */
     private int ldapResponseLength;
@@ -49,7 +49,7 @@
     /**
      * Creates a new LdapResponse object.
      */
-    public LdapResponse()
+    public LdapResponseCodec()
     {
         super();
     }
@@ -63,7 +63,7 @@
      * 
      * @return Returns the ldapResult.
      */
-    public LdapResult getLdapResult()
+    public LdapResultCodec getLdapResult()
     {
         return ldapResult;
     }
@@ -74,7 +74,7 @@
      * 
      * @param ldapResult The ldapResult to set.
      */
-    public void setLdapResult( LdapResult ldapResult )
+    public void setLdapResult( LdapResultCodec ldapResult )
     {
         this.ldapResult = ldapResult;
     }

Copied: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResultCodec.java (from r759581, directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResult.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResultCodec.java?p2=directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResultCodec.java&p1=directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResult.java&r1=759581&r2=760801&rev=760801&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResult.java (original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResultCodec.java Wed Apr  1 07:40:39 2009
@@ -42,7 +42,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$, 
  */
-public class LdapResult extends AbstractAsn1Object
+public class LdapResultCodec extends AbstractAsn1Object
 {
     // ~ Instance fields
     // ----------------------------------------------------------------------------
@@ -126,7 +126,7 @@
     /**
      * Creates a new LdapResult object.
      */
-    public LdapResult()
+    public LdapResultCodec()
     {
         super();
     }

Modified: directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixEncoder.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixEncoder.java?rev=760801&r1=760800&r2=760801&view=diff
==============================================================================
--- directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixEncoder.java (original)
+++ directory/shared/branches/shared-replication/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixEncoder.java Wed Apr  1 07:40:39 2009
@@ -93,7 +93,7 @@
             }
 
             ( ( OutputCallback ) encodeCallback ).attach( out );
-            encodeCallback.encodeOccurred( null, ( ( LdapMessage ) obj ).encode( null ) );
+            encodeCallback.encodeOccurred( null, ( ( LdapMessageCodec ) obj ).encode( null ) );
         }
         catch ( EncoderException e )
         {
@@ -122,7 +122,7 @@
                 log.debug( "Encoding this LdapMessage : " + obj );
             }
 
-            ByteBuffer pdu = ( ( LdapMessage ) obj ).encode( null );
+            ByteBuffer pdu = ( ( LdapMessageCodec ) obj ).encode( null );
 
             if ( IS_DEBUG )
             {
@@ -159,7 +159,7 @@
                 log.debug( "Encoding this LdapMessage : " + obj );
             }
 
-            byte[] pdu = ( ( LdapMessage ) obj ).encode( null ).array();
+            byte[] pdu = ( ( LdapMessageCodec ) obj ).encode( null ).array();
 
             if ( IS_DEBUG )
             {

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=760801&r1=760800&r2=760801&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 Wed Apr  1 07:40:39 2009
@@ -151,7 +151,7 @@
      * @param messageId The message Id
      * @return A Snickers AbandonRequestImpl
      */
-    public static Message transformAbandonRequest( LdapMessage twixMessage, int messageId )
+    public static Message transformAbandonRequest( LdapMessageCodec twixMessage, int messageId )
     {
         AbandonRequestImpl snickersMessage = new AbandonRequestImpl( messageId );
         AbandonRequestCodec abandonRequest = twixMessage.getAbandonRequest();
@@ -170,7 +170,7 @@
      * @param messageId The message Id
      * @return A Snickers AddRequestImpl
      */
-    public static Message transformAddRequest( LdapMessage twixMessage, int messageId )
+    public static Message transformAddRequest( LdapMessageCodec twixMessage, int messageId )
     {
         AddRequestImpl snickersMessage = new AddRequestImpl( messageId );
         AddRequest addRequest = twixMessage.getAddRequest();
@@ -192,7 +192,7 @@
      * @param messageId The message Id
      * @return A Snickers BindRequestImpl
      */
-    public static Message transformBindRequest( LdapMessage twixMessage, int messageId )
+    public static Message transformBindRequest( LdapMessageCodec twixMessage, int messageId )
     {
         BindRequestImpl snickersMessage = new BindRequestImpl( messageId );
         BindRequestCodec bindRequest = twixMessage.getBindRequest();
@@ -235,7 +235,7 @@
      * @param messageId The message Id
      * @return a Snickers BindResponseImpl
      */
-    public static Message transformBindResponse( LdapMessage twixMessage, int messageId )
+    public static Message transformBindResponse( LdapMessageCodec twixMessage, int messageId )
     {
         BindResponseImpl snickersMessage = new BindResponseImpl( messageId );
         BindResponseCodec bindResponse = twixMessage.getBindResponse();
@@ -255,7 +255,7 @@
      * @param twixResult the Twix LdapResult representation
      * @param snickersResult the Snickers LdapResult representation
      */
-    public static void transformLdapResultTwixToSnickers( LdapResult twixResult, 
+    public static void transformLdapResultTwixToSnickers( LdapResultCodec twixResult, 
         org.apache.directory.shared.ldap.message.LdapResult snickersResult )
     {
         snickersResult.setErrorMessage( twixResult.getErrorMessage() );
@@ -299,7 +299,7 @@
      * @param messageId The message Id
      * @return A Snickers CompareRequestImpl
      */
-    public static Message transformCompareRequest( LdapMessage twixMessage, int messageId )
+    public static Message transformCompareRequest( LdapMessageCodec twixMessage, int messageId )
     {
         CompareRequestImpl snickersMessage = new CompareRequestImpl( messageId );
         CompareRequest compareRequest = twixMessage.getCompareRequest();
@@ -331,7 +331,7 @@
      * @param messageId The message Id
      * @return A Snickers DeleteRequestImpl
      */
-    public static Message transformDelRequest( LdapMessage twixMessage, int messageId )
+    public static Message transformDelRequest( LdapMessageCodec twixMessage, int messageId )
     {
         DeleteRequestImpl snickersMessage = new DeleteRequestImpl( messageId );
         DelRequest delRequest = twixMessage.getDelRequest();
@@ -351,7 +351,7 @@
      * @param messageId The message Id
      * @return A Snickers ExtendedRequestImpl
      */
-    public static Message transformExtendedRequest( LdapMessage twixMessage, int messageId )
+    public static Message transformExtendedRequest( LdapMessageCodec twixMessage, int messageId )
     {
         ExtendedRequest extendedRequest = twixMessage.getExtendedRequest();
         ExtendedRequestImpl snickersMessage;
@@ -383,7 +383,7 @@
      * @param messageId The message Id
      * @return A Snickers ModifyDNRequestImpl
      */
-    public static Message transformModifyDNRequest( LdapMessage twixMessage, int messageId )
+    public static Message transformModifyDNRequest( LdapMessageCodec twixMessage, int messageId )
     {
         ModifyDnRequestImpl snickersMessage = new ModifyDnRequestImpl( messageId );
         ModifyDNRequest modifyDNRequest = twixMessage.getModifyDNRequest();
@@ -411,7 +411,7 @@
      * @param messageId The message Id
      * @return A Snickers ModifyRequestImpl
      */
-    public static Message transformModifyRequest( LdapMessage twixMessage, int messageId )
+    public static Message transformModifyRequest( LdapMessageCodec twixMessage, int messageId )
     {
         ModifyRequestImpl snickersMessage = new ModifyRequestImpl( messageId );
         ModifyRequest modifyRequest = twixMessage.getModifyRequest();
@@ -752,7 +752,7 @@
      * @param messageId The message Id
      * @return A Snickers SearchRequestImpl
      */
-    public static Message transformSearchRequest( LdapMessage twixMessage, int messageId )
+    public static Message transformSearchRequest( LdapMessageCodec twixMessage, int messageId )
     {
         SearchRequestImpl snickersMessage = new SearchRequestImpl( messageId );
         SearchRequest searchRequest = twixMessage.getSearchRequest();
@@ -826,7 +826,7 @@
      * @param messageId The message Id
      * @return A Snickers UnBindRequestImpl
      */
-    public static Message transformUnBindRequest( LdapMessage twixMessage, int messageId )
+    public static Message transformUnBindRequest( LdapMessageCodec twixMessage, int messageId )
     {
         return new UnbindRequestImpl( messageId );
     }
@@ -840,7 +840,7 @@
      */
     public static Message transform( Object obj )
     {
-        LdapMessage twixMessage = ( LdapMessage ) obj;
+        LdapMessageCodec twixMessage = ( LdapMessageCodec ) obj;
         int messageId = twixMessage.getMessageId();
 
         if ( IS_DEBUG )
@@ -917,11 +917,11 @@
         }
 
         // Transform the controls, too
-        List<org.apache.directory.shared.ldap.codec.Control> twixControls = twixMessage.getControls();
+        List<org.apache.directory.shared.ldap.codec.ControlCodec> twixControls = twixMessage.getControls();
 
         if ( twixControls != null )
         {
-            for ( final Control twixControl:twixControls )
+            for ( final ControlCodec twixControl:twixControls )
             {
                 AbstractMutableControlImpl neutralControl = null;
 
@@ -1089,9 +1089,9 @@
      * @param snickersLdapResult the Snickers LdapResult to transform
      * @return A Twix LdapResult
      */
-    public static LdapResult transformLdapResult( LdapResultImpl snickersLdapResult )
+    public static LdapResultCodec transformLdapResult( LdapResultImpl snickersLdapResult )
     {
-        LdapResult twixLdapResult = new LdapResult();
+        LdapResultCodec twixLdapResult = new LdapResultCodec();
 
         // Snickers : ResultCodeEnum resultCode -> Twix : int resultCode
         twixLdapResult.setResultCode( snickersLdapResult.getResultCode() );
@@ -1136,7 +1136,7 @@
      * @param twixMessage The Twix AddResponse to produce
      * @param snickersMessage The incoming Snickers AddResponse
      */
-    public static void transformAddResponse( LdapMessage twixMessage, Message snickersMessage )
+    public static void transformAddResponse( LdapMessageCodec twixMessage, Message snickersMessage )
     {
         AddResponseImpl snickersAddResponse = ( AddResponseImpl ) snickersMessage;
 
@@ -1156,7 +1156,7 @@
      * @param twixMessage The Twix BindResponse to produce
      * @param snickersMessage The incoming Snickers BindResponse
      */
-    public static void transformBindResponse( LdapMessage twixMessage, Message snickersMessage )
+    public static void transformBindResponse( LdapMessageCodec twixMessage, Message snickersMessage )
     {
         BindResponseImpl snickersBindResponse = ( BindResponseImpl ) snickersMessage;
 
@@ -1185,7 +1185,7 @@
      * @param twixMessage The Twix BindRequest to produce
      * @param snickersMessage The incoming Snickers BindRequest
      */
-    public static void transformBindRequest( LdapMessage twixMessage, Message snickersMessage )
+    public static void transformBindRequest( LdapMessageCodec twixMessage, Message snickersMessage )
     {
         BindRequestImpl snickersBindRequest = ( BindRequestImpl ) snickersMessage;
 
@@ -1220,7 +1220,7 @@
      * @param twixMessage The Twix CompareResponse to produce
      * @param snickersMessage The incoming Snickers CompareResponse
      */
-    public static void transformCompareResponse( LdapMessage twixMessage, Message snickersMessage )
+    public static void transformCompareResponse( LdapMessageCodec twixMessage, Message snickersMessage )
     {
         CompareResponseImpl snickersCompareResponse = ( CompareResponseImpl ) snickersMessage;
 
@@ -1241,7 +1241,7 @@
      * @param twixMessage The Twix DelResponse to produce
      * @param snickersMessage The incoming Snickers DelResponse
      */
-    public static void transformDelResponse( LdapMessage twixMessage, Message snickersMessage )
+    public static void transformDelResponse( LdapMessageCodec twixMessage, Message snickersMessage )
     {
         DeleteResponseImpl snickersDelResponse = ( DeleteResponseImpl ) snickersMessage;
 
@@ -1261,7 +1261,7 @@
      * @param twixMessage The Twix ExtendedResponse to produce
      * @param snickersMessage The incoming Snickers ExtendedResponse
      */
-    public static void transformExtendedResponse( LdapMessage twixMessage, Message snickersMessage )
+    public static void transformExtendedResponse( LdapMessageCodec twixMessage, Message snickersMessage )
     {
         ExtendedResponseImpl snickersExtendedResponse = ( ExtendedResponseImpl ) snickersMessage;
         ExtendedResponse extendedResponse = new ExtendedResponse();
@@ -1295,7 +1295,7 @@
      * @param twixMessage The Twix ModifyResponse to produce
      * @param snickersMessage The incoming Snickers ModifyResponse
      */
-    public static void transformModifyResponse( LdapMessage twixMessage, Message snickersMessage )
+    public static void transformModifyResponse( LdapMessageCodec twixMessage, Message snickersMessage )
     {
         ModifyResponseImpl snickersModifyResponse = ( ModifyResponseImpl ) snickersMessage;
 
@@ -1315,7 +1315,7 @@
      * @param twixMessage The Twix ModifyDNResponse to produce
      * @param snickersMessage The incoming Snickers ModifyDNResponse
      */
-    public static void transformModifyDNResponse( LdapMessage twixMessage, Message snickersMessage )
+    public static void transformModifyDNResponse( LdapMessageCodec twixMessage, Message snickersMessage )
     {
         ModifyDnResponseImpl snickersModifyDNResponse = ( ModifyDnResponseImpl ) snickersMessage;
 
@@ -1336,7 +1336,7 @@
      * @param twixMessage The Twix SearchResultDone to produce
      * @param snickersMessage The incoming Snickers SearchResponseDone
      */
-    public static void transformSearchResultDone( LdapMessage twixMessage, Message snickersMessage )
+    public static void transformSearchResultDone( LdapMessageCodec twixMessage, Message snickersMessage )
     {
         SearchResponseDoneImpl snickersSearchResponseDone = ( SearchResponseDoneImpl ) snickersMessage;
         SearchResultDone searchResultDone = new SearchResultDone();
@@ -1356,7 +1356,7 @@
      * @param twixMessage The Twix SearchResultEntry to produce
      * @param snickersMessage The incoming Snickers SearchResponseEntry
      */
-    public static void transformSearchResultEntry( LdapMessage twixMessage, Message snickersMessage )
+    public static void transformSearchResultEntry( LdapMessageCodec twixMessage, Message snickersMessage )
     {
         SearchResponseEntryImpl snickersSearchResultResponse = ( SearchResponseEntryImpl ) snickersMessage;
         SearchResultEntry searchResultEntry = new SearchResultEntry();
@@ -1380,7 +1380,7 @@
      * @param twixMessage The Twix SearchResultReference to produce
      * @param snickersMessage The incoming Snickers SearchResponseReference
      */
-    public static void transformSearchResultReference( LdapMessage twixMessage, Message snickersMessage )
+    public static void transformSearchResultReference( LdapMessageCodec twixMessage, Message snickersMessage )
     {
         SearchResponseReferenceImpl snickersSearchResponseReference = ( SearchResponseReferenceImpl ) snickersMessage;
         SearchResultReference searchResultReference = new SearchResultReference();
@@ -1428,7 +1428,7 @@
             LOG.debug( "Transforming message type " + msg.getType() );
         }
 
-        LdapMessage twixMessage = new LdapMessage();
+        LdapMessageCodec twixMessage = new LdapMessageCodec();
 
         twixMessage.setMessageId( msg.getMessageId() );
 
@@ -1502,14 +1502,14 @@
      * @param twixMessage the Twix message
      * @param msg the Snickers message
      */
-    public static void transformControlsTwixToSnickers( LdapMessage twixMessage, Message msg )
+    public static void transformControlsTwixToSnickers( LdapMessageCodec twixMessage, Message msg )
     {
         if ( twixMessage.getControls() == null )
         {
             return;
         }
         
-        for ( Control control:twixMessage.getControls() )
+        for ( ControlCodec control:twixMessage.getControls() )
         {
             LOG.debug( "Not decoding response control: {}", control );
         }
@@ -1521,11 +1521,11 @@
      * @param twixMessage The Twix SearchResultReference to produce
      * @param msg The incoming Snickers SearchResponseReference
      */
-    public static void transformControls( LdapMessage twixMessage, Message msg )
+    public static void transformControls( LdapMessageCodec twixMessage, Message msg )
     {
         for ( javax.naming.ldap.Control control:msg.getControls().values() )
         {
-            org.apache.directory.shared.ldap.codec.Control twixControl = new org.apache.directory.shared.ldap.codec.Control();
+            org.apache.directory.shared.ldap.codec.ControlCodec twixControl = new org.apache.directory.shared.ldap.codec.ControlCodec();
             twixMessage.addControl( twixControl );
             twixControl.setCriticality( control.isCritical() );
             



Mime
View raw message