directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r760808 - /directory/apacheds/branches/apacheds-replication/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java
Date Wed, 01 Apr 2009 07:52:35 GMT
Author: elecharny
Date: Wed Apr  1 07:52:35 2009
New Revision: 760808

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

Modified:
    directory/apacheds/branches/apacheds-replication/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java

Modified: directory/apacheds/branches/apacheds-replication/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-replication/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java?rev=760808&r1=760807&r2=760808&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-replication/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java
(original)
+++ directory/apacheds/branches/apacheds-replication/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java
Wed Apr  1 07:52:35 2009
@@ -41,9 +41,9 @@
 import org.apache.directory.shared.asn1.codec.DecoderException;
 import org.apache.directory.shared.asn1.codec.EncoderException;
 import org.apache.directory.shared.ldap.codec.LdapDecoder;
-import org.apache.directory.shared.ldap.codec.LdapMessage;
+import org.apache.directory.shared.ldap.codec.LdapMessageCodec;
 import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
-import org.apache.directory.shared.ldap.codec.LdapResult;
+import org.apache.directory.shared.ldap.codec.LdapResultCodec;
 import org.apache.directory.shared.ldap.codec.add.AddRequest;
 import org.apache.directory.shared.ldap.codec.bind.BindRequestCodec;
 import org.apache.directory.shared.ldap.codec.bind.BindResponseCodec;
@@ -145,10 +145,10 @@
     }
 
 
-    private LdapMessage readResponse( ByteBuffer bb ) throws IOException, DecoderException,
NamingException
+    private LdapMessageCodec readResponse( ByteBuffer bb ) throws IOException, DecoderException,
NamingException
     {
 
-        LdapMessage messageResp = null;
+        LdapMessageCodec messageResp = null;
 
         while ( true )
         {
@@ -241,7 +241,7 @@
             }
         }
 
-        LdapMessage message = new LdapMessage();
+        LdapMessageCodec message = new LdapMessageCodec();
 
         message.setProtocolOP( addRequest );
         message.setMessageId( messageId );
@@ -255,9 +255,9 @@
         bb.clear();
 
         // Get the response
-        LdapMessage response = readResponse( bb );
+        LdapMessageCodec response = readResponse( bb );
 
-        LdapResult result = response.getAddResponse().getLdapResult();
+        LdapResultCodec result = response.getAddResponse().getLdapResult();
 
         if ( result.getResultCode() == ResultCodeEnum.SUCCESS )
         {
@@ -301,7 +301,7 @@
 
         delRequest.setEntry( new LdapDN( dn ) );
 
-        LdapMessage message = new LdapMessage();
+        LdapMessageCodec message = new LdapMessageCodec();
 
         message.setProtocolOP( delRequest );
         message.setMessageId( messageId );
@@ -315,9 +315,9 @@
         bb.clear();
 
         // Get the response
-        LdapMessage response = readResponse( bb );
+        LdapMessageCodec response = readResponse( bb );
 
-        LdapResult result = response.getDelResponse().getLdapResult();
+        LdapResultCodec result = response.getDelResponse().getLdapResult();
 
         if ( result.getResultCode() == ResultCodeEnum.SUCCESS )
         {
@@ -367,7 +367,7 @@
             modifyDNRequest.setNewSuperior( new LdapDN( entry.getNewSuperior() ) );
         }
 
-        LdapMessage message = new LdapMessage();
+        LdapMessageCodec message = new LdapMessageCodec();
 
         message.setProtocolOP( modifyDNRequest );
         message.setMessageId( messageId );
@@ -381,9 +381,9 @@
         bb.clear();
 
         // Get the response
-        LdapMessage response = readResponse( bb );
+        LdapMessageCodec response = readResponse( bb );
 
-        LdapResult result = response.getModifyDNResponse().getLdapResult();
+        LdapResultCodec result = response.getModifyDNResponse().getLdapResult();
 
         if ( result.getResultCode() == ResultCodeEnum.SUCCESS )
         {
@@ -436,7 +436,7 @@
             }
         }
 
-        LdapMessage message = new LdapMessage();
+        LdapMessageCodec message = new LdapMessageCodec();
 
         message.setProtocolOP( modifyRequest );
         message.setMessageId( messageId );
@@ -450,9 +450,9 @@
         bb.clear();
 
         // Get the response
-        LdapMessage response = readResponse( bb );
+        LdapMessageCodec response = readResponse( bb );
 
-        LdapResult result = response.getModifyResponse().getLdapResult();
+        LdapResultCodec result = response.getModifyResponse().getLdapResult();
 
         if ( result.getResultCode() == ResultCodeEnum.SUCCESS )
         {
@@ -514,7 +514,7 @@
     private void bind( int messageId ) throws NamingException, EncoderException, DecoderException,
IOException
     {
         BindRequestCodec bindRequest = new BindRequestCodec();
-        LdapMessage message = new LdapMessage();
+        LdapMessageCodec message = new LdapMessageCodec();
         LdapAuthentication authentication = null;
 
         if ( "simple".equals( auth ) )
@@ -540,9 +540,9 @@
         bb.clear();
 
         // Get the bind response
-        LdapMessage response = readResponse( bb );
+        LdapMessageCodec response = readResponse( bb );
 
-        LdapResult result = response.getBindResponse().getLdapResult();
+        LdapResultCodec result = response.getBindResponse().getLdapResult();
 
         if ( result.getResultCode() == ResultCodeEnum.SUCCESS )
         {
@@ -573,7 +573,7 @@
     private void unbind( int messageId ) throws InvalidNameException, EncoderException, DecoderException,
IOException
     {
         UnBindRequest unbindRequest = new UnBindRequest();
-        LdapMessage message = new LdapMessage();
+        LdapMessageCodec message = new LdapMessageCodec();
 
         message.setProtocolOP( unbindRequest );
         message.setMessageId( messageId );



Mime
View raw message