directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r764357 [2/3] - in /directory/apacheds/branches/ldif-partition: core-api/src/main/java/org/apache/directory/server/core/ core-api/src/main/java/org/apache/directory/server/core/changelog/ core-api/src/main/java/org/apache/directory/server/c...
Date Mon, 13 Apr 2009 04:50:30 GMT
Modified: directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/AddHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/AddHandler.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/AddHandler.java (original)
+++ directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/AddHandler.java Mon Apr 13 04:50:28 2009
@@ -22,8 +22,8 @@
 
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.ldap.LdapSession;
-import org.apache.directory.shared.ldap.message.AddRequest;
-import org.apache.directory.shared.ldap.message.LdapResult;
+import org.apache.directory.shared.ldap.message.InternalAddRequest;
+import org.apache.directory.shared.ldap.message.InternalLdapResult;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 
 import org.slf4j.Logger;
@@ -36,7 +36,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public class AddHandler extends LdapRequestHandler<AddRequest>
+public class AddHandler extends LdapRequestHandler<InternalAddRequest>
 {
     /** The logger for this class */
     private static final Logger LOG = LoggerFactory.getLogger( AddHandler.class );
@@ -45,10 +45,10 @@
     /**
      * {@inheritDoc}
      */
-    public void handle( LdapSession session, AddRequest req ) 
+    public void handle( LdapSession session, InternalAddRequest req ) 
     {
         LOG.debug( "Handling request: {}", req );
-        LdapResult result = req.getResultResponse().getLdapResult();
+        InternalLdapResult result = req.getResultResponse().getLdapResult();
 
         try
         {

Modified: directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java (original)
+++ directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java Mon Apr 13 04:50:28 2009
@@ -48,9 +48,9 @@
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.exception.LdapAuthenticationException;
 import org.apache.directory.shared.ldap.exception.LdapException;
-import org.apache.directory.shared.ldap.message.BindRequest;
-import org.apache.directory.shared.ldap.message.BindResponse;
-import org.apache.directory.shared.ldap.message.LdapResult;
+import org.apache.directory.shared.ldap.message.InternalBindRequest;
+import org.apache.directory.shared.ldap.message.InternalBindResponse;
+import org.apache.directory.shared.ldap.message.InternalLdapResult;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.util.ExceptionUtils;
@@ -68,7 +68,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev: 664302 $, $Date: 2008-06-07 04:44:00 -0400 (Sat, 07 Jun 2008) $
  */
-public class BindHandler extends LdapRequestHandler<BindRequest>
+public class BindHandler extends LdapRequestHandler<InternalBindRequest>
 {
     private static final Logger LOG = LoggerFactory.getLogger( BindHandler.class );
 
@@ -93,7 +93,7 @@
      * @param message The BindRequest received
      * @throws Exception If the authentication cannot be done
      */
-    public void handleSimpleAuth( LdapSession ldapSession, BindRequest bindRequest ) throws Exception
+    public void handleSimpleAuth( LdapSession ldapSession, InternalBindRequest bindRequest ) throws Exception
     {
         // if the user is already bound, we have to unbind him
         if ( !ldapSession.isAnonymous() )
@@ -153,7 +153,7 @@
             if ( principalEntry == null )
             {
                 LOG.info( "The {} principalDN cannot be found in the server : bind failure.", bindRequest.getName() );
-                LdapResult result = bindRequest.getResultResponse().getLdapResult();
+                InternalLdapResult result = bindRequest.getResultResponse().getLdapResult();
                 result.setErrorMessage( "cannot bind the principalDn." );
                 result.setResultCode( ResultCodeEnum.INVALID_CREDENTIALS );
                 ldapSession.getIoSession().write( bindRequest.getResultResponse() );
@@ -164,7 +164,7 @@
                      SchemaConstants.REFERRAL_OC ) )
             {
                 LOG.info( "Bind principalDn points to referral." );
-                LdapResult result = bindRequest.getResultResponse().getLdapResult();
+                InternalLdapResult result = bindRequest.getResultResponse().getLdapResult();
                 result.setErrorMessage( "Bind principalDn points to referral." );
                 result.setResultCode( ResultCodeEnum.INVALID_CREDENTIALS );
                 ldapSession.getIoSession().write( bindRequest.getResultResponse() );
@@ -196,7 +196,7 @@
         {
             // Something went wrong. Write back an error message            
             ResultCodeEnum code = null;
-            LdapResult result = bindRequest.getResultResponse().getLdapResult();
+            InternalLdapResult result = bindRequest.getResultResponse().getLdapResult();
 
             if ( e instanceof LdapException )
             {
@@ -265,9 +265,9 @@
      * @param ss
      * @param bindRequest
      */
-    private void generateSaslChallenge( LdapSession ldapSession, SaslServer ss, BindRequest bindRequest )
+    private void generateSaslChallenge( LdapSession ldapSession, SaslServer ss, InternalBindRequest bindRequest )
     {
-        LdapResult result = bindRequest.getResultResponse().getLdapResult();
+        InternalLdapResult result = bindRequest.getResultResponse().getLdapResult();
 
         // SaslServer will throw an exception if the credentials are null.
         if ( bindRequest.getCredentials() == null )
@@ -303,7 +303,7 @@
                 
                 // Build the response
                 result.setResultCode( ResultCodeEnum.SASL_BIND_IN_PROGRESS );
-                BindResponse resp = ( BindResponse ) bindRequest.getResultResponse();
+                InternalBindResponse resp = ( InternalBindResponse ) bindRequest.getResultResponse();
 
                 // Store the challenge
                 resp.setServerSaslCreds( tokenBytes );
@@ -336,15 +336,15 @@
     /**
      * Send back an AUTH-METH-NOT-SUPPORTED error message to the client
      */
-    private void sendAuthMethNotSupported( LdapSession ldapSession, BindRequest bindRequest )
+    private void sendAuthMethNotSupported( LdapSession ldapSession, InternalBindRequest bindRequest )
     {
-        // First, r-einit the state to Anonymous, and clear the
+        // First, re-init the state to Anonymous, and clear the
         // saslProperty map
         ldapSession.clearSaslProperties();
         ldapSession.setAnonymous();
         
         // And send the response to the client
-        LdapResult bindResult = bindRequest.getResultResponse().getLdapResult();
+        InternalLdapResult bindResult = bindRequest.getResultResponse().getLdapResult();
         bindResult.setResultCode( ResultCodeEnum.AUTH_METHOD_NOT_SUPPORTED );
         bindResult.setErrorMessage( ResultCodeEnum.AUTH_METHOD_NOT_SUPPORTED.toString() + ": " 
             + bindRequest.getSaslMechanism() + " is not a supported mechanism." );
@@ -360,9 +360,9 @@
      * Send back an INVALID-CREDENTIAL error message to the user. If we have an exception
      * as a third argument, then send back the associated message to the client. 
      */
-    private void sendInvalidCredentials( LdapSession ldapSession, BindRequest bindRequest, Exception e )
+    private void sendInvalidCredentials( LdapSession ldapSession, InternalBindRequest bindRequest, Exception e )
     {
-        LdapResult result = bindRequest.getResultResponse().getLdapResult();
+        InternalLdapResult result = bindRequest.getResultResponse().getLdapResult();
         
         String message = "";
         
@@ -391,10 +391,10 @@
     /**
      * Send a SUCCESS message back to the client.
      */
-    private void sendBindSuccess( LdapSession ldapSession, BindRequest bindRequest, byte[] tokenBytes )
+    private void sendBindSuccess( LdapSession ldapSession, InternalBindRequest bindRequest, byte[] tokenBytes )
     {
         // Return the successful response
-        BindResponse response = ( BindResponse ) bindRequest.getResultResponse();
+        InternalBindResponse response = ( InternalBindResponse ) bindRequest.getResultResponse();
         response.getLdapResult().setResultCode( ResultCodeEnum.SUCCESS );
         response.setServerSaslCreds( tokenBytes );
         
@@ -423,7 +423,8 @@
     }
 
     
-    private void handleSaslAuthPending( LdapSession ldapSession, BindRequest bindRequest, DirectoryService ds ) throws Exception
+    private void handleSaslAuthPending( LdapSession ldapSession, InternalBindRequest bindRequest, DirectoryService ds ) 
+        throws Exception
     {
         // First, check that we have the same mechanism
         String saslMechanism = bindRequest.getSaslMechanism();
@@ -533,7 +534,7 @@
      * @param message The BindRequest received
      * @throws Exception If the authentication cannot be done
      */
-    public void handleSaslAuth( LdapSession ldapSession, BindRequest bindRequest ) throws Exception
+    public void handleSaslAuth( LdapSession ldapSession, InternalBindRequest bindRequest ) throws Exception
     {
         String saslMechanism = bindRequest.getSaslMechanism();
         DirectoryService ds = getLdapServer().getDirectoryService();
@@ -698,7 +699,7 @@
      * @throws Exception If the authentication cannot be handled
      */
     @Override
-    public void handle( LdapSession ldapSession, BindRequest bindRequest ) throws Exception
+    public void handle( LdapSession ldapSession, InternalBindRequest bindRequest ) throws Exception
     {
         LOG.debug( "Received: {}", bindRequest );
 
@@ -706,7 +707,7 @@
         if ( ! bindRequest.getVersion3() )
         {
             LOG.error( "Bind error : Only LDAP v3 is supported." );
-            LdapResult bindResult = bindRequest.getResultResponse().getLdapResult();
+            InternalLdapResult bindResult = bindRequest.getResultResponse().getLdapResult();
             bindResult.setResultCode( ResultCodeEnum.PROTOCOL_ERROR );
             bindResult.setErrorMessage( "Only LDAP v3 is supported." );
             ldapSession.getIoSession().write( bindRequest.getResultResponse() );

Modified: directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/CompareHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/CompareHandler.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/CompareHandler.java (original)
+++ directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/CompareHandler.java Mon Apr 13 04:50:28 2009
@@ -21,8 +21,8 @@
 
 
 import org.apache.directory.server.ldap.LdapSession;
-import org.apache.directory.shared.ldap.message.CompareRequest;
-import org.apache.directory.shared.ldap.message.LdapResult;
+import org.apache.directory.shared.ldap.message.InternalCompareRequest;
+import org.apache.directory.shared.ldap.message.InternalLdapResult;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.LdapDN;
 
@@ -36,7 +36,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev: 664302 $
  */
-public class CompareHandler extends LdapRequestHandler<CompareRequest>
+public class CompareHandler extends LdapRequestHandler<InternalCompareRequest>
 {
     private static final Logger LOG = LoggerFactory.getLogger( CompareHandler.class );
 
@@ -47,10 +47,10 @@
      * org.apache.directory.shared.ldap.message.SingleReplyRequest)
      */
     @Override
-    public void handle( LdapSession session, CompareRequest req )
+    public void handle( LdapSession session, InternalCompareRequest req )
     {
         LOG.debug( "Handling compare request while ignoring referrals: {}", req );
-        LdapResult result = req.getResultResponse().getLdapResult();
+        InternalLdapResult result = req.getResultResponse().getLdapResult();
         
         try
         {

Modified: directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/DeleteHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/DeleteHandler.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/DeleteHandler.java (original)
+++ directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/DeleteHandler.java Mon Apr 13 04:50:28 2009
@@ -22,8 +22,8 @@
 
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.ldap.LdapSession;
-import org.apache.directory.shared.ldap.message.DeleteRequest;
-import org.apache.directory.shared.ldap.message.LdapResult;
+import org.apache.directory.shared.ldap.message.InternalDeleteRequest;
+import org.apache.directory.shared.ldap.message.InternalLdapResult;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 
 import org.slf4j.Logger;
@@ -36,7 +36,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev: 664302 $
  */
-public class DeleteHandler extends LdapRequestHandler<DeleteRequest>
+public class DeleteHandler extends LdapRequestHandler<InternalDeleteRequest>
 {
     private static final Logger LOG = LoggerFactory.getLogger( DeleteHandler.class );
 
@@ -44,10 +44,10 @@
     /**
      * {@inheritDoc}
      */
-    public void handle( LdapSession session, DeleteRequest req )
+    public void handle( LdapSession session, InternalDeleteRequest req )
     {
         LOG.debug( "Handling request: {}", req );
-        LdapResult result = req.getResultResponse().getLdapResult();
+        InternalLdapResult result = req.getResultResponse().getLdapResult();
 
         try
         {

Modified: directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ExtendedHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ExtendedHandler.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ExtendedHandler.java (original)
+++ directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ExtendedHandler.java Mon Apr 13 04:50:28 2009
@@ -22,9 +22,9 @@
 
 import org.apache.directory.server.ldap.ExtendedOperationHandler;
 import org.apache.directory.server.ldap.LdapSession;
-import org.apache.directory.shared.ldap.message.ExtendedRequest;
-import org.apache.directory.shared.ldap.message.ExtendedResponse;
-import org.apache.directory.shared.ldap.message.LdapResult;
+import org.apache.directory.shared.ldap.message.InternalExtendedRequest;
+import org.apache.directory.shared.ldap.message.InternalExtendedResponse;
+import org.apache.directory.shared.ldap.message.InternalLdapResult;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.util.ExceptionUtils;
 
@@ -35,9 +35,9 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev: 664302 $
  */
-public class ExtendedHandler extends LdapRequestHandler<ExtendedRequest>
+public class ExtendedHandler extends LdapRequestHandler<InternalExtendedRequest>
 {
-    public void handle( LdapSession session, ExtendedRequest req ) throws Exception
+    public void handle( LdapSession session, InternalExtendedRequest req ) throws Exception
     {
         ExtendedOperationHandler handler = getLdapServer().getExtendedOperationHandler( req.getOid() );
 
@@ -46,7 +46,7 @@
             // As long as no extended operations are implemented, send appropriate
             // error back to the client.
             String msg = "Unrecognized extended operation EXTENSION_OID: " + req.getOid();
-            LdapResult result = req.getResultResponse().getLdapResult();
+            InternalLdapResult result = req.getResultResponse().getLdapResult();
             result.setResultCode( ResultCodeEnum.PROTOCOL_ERROR );
             result.setErrorMessage( msg );
             session.getIoSession().write( req.getResultResponse() );
@@ -59,12 +59,12 @@
         }
         catch ( Exception e )
         {
-            LdapResult result = req.getResultResponse().getLdapResult();
+            InternalLdapResult result = req.getResultResponse().getLdapResult();
             result.setResultCode( ResultCodeEnum.OTHER );
             result.setErrorMessage( ResultCodeEnum.OTHER  
                 + ": Extended operation handler for the specified EXTENSION_OID (" + req.getOid()
                 + ") has failed to process your request:\n" + ExceptionUtils.getStackTrace( e ) );
-            ExtendedResponse resp = ( ExtendedResponse ) req.getResultResponse();
+            InternalExtendedResponse resp = ( InternalExtendedResponse ) req.getResultResponse();
             resp.setResponse( new byte[0] );
             session.getIoSession().write( req.getResultResponse() );
         }

Modified: directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java (original)
+++ directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java Mon Apr 13 04:50:28 2009
@@ -28,16 +28,16 @@
 import org.apache.directory.server.ldap.handlers.extended.StartTlsHandler;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapReferralException;
-import org.apache.directory.shared.ldap.message.AbandonRequest;
-import org.apache.directory.shared.ldap.message.BindRequest;
-import org.apache.directory.shared.ldap.message.ExtendedRequest;
-import org.apache.directory.shared.ldap.message.LdapResult;
-import org.apache.directory.shared.ldap.message.Referral;
+import org.apache.directory.shared.ldap.message.InternalAbandonRequest;
+import org.apache.directory.shared.ldap.message.InternalBindRequest;
+import org.apache.directory.shared.ldap.message.InternalExtendedRequest;
+import org.apache.directory.shared.ldap.message.InternalLdapResult;
+import org.apache.directory.shared.ldap.message.InternalReferral;
 import org.apache.directory.shared.ldap.message.ReferralImpl;
-import org.apache.directory.shared.ldap.message.Request;
+import org.apache.directory.shared.ldap.message.InternalRequest;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.message.ResultResponse;
-import org.apache.directory.shared.ldap.message.ResultResponseRequest;
+import org.apache.directory.shared.ldap.message.InternalResultResponse;
+import org.apache.directory.shared.ldap.message.InternalResultResponseRequest;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.util.ExceptionUtils;
 import org.apache.mina.core.filterchain.IoFilterChain;
@@ -53,7 +53,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev: 541827 $
  */
-public abstract class LdapRequestHandler<T extends Request> implements MessageHandler<T>
+public abstract class LdapRequestHandler<T extends InternalRequest> implements MessageHandler<T>
 {
     /** The logger for this class */
     private static final Logger LOG = LoggerFactory.getLogger( LdapRequestHandler.class );
@@ -108,9 +108,9 @@
     }
 
     
-    public void rejectWithoutConfidentiality( IoSession session, ResultResponse resp ) 
+    public void rejectWithoutConfidentiality( IoSession session, InternalResultResponse resp ) 
     {
-        LdapResult result = resp.getLdapResult();
+        InternalLdapResult result = resp.getLdapResult();
         result.setResultCode( ResultCodeEnum.CONFIDENTIALITY_REQUIRED );
         result.setErrorMessage( "Confidentiality (TLS secured connection) is required." );
         session.write( resp );
@@ -131,10 +131,10 @@
         // protect against insecure conns when confidentiality is required 
         if ( ! isConfidentialityRequirementSatisfied( session ) )
         {
-            if ( message instanceof ExtendedRequest )
+            if ( message instanceof InternalExtendedRequest )
             {
                 // Reject all extended operations except StartTls  
-                ExtendedRequest req = ( ExtendedRequest ) message;
+                InternalExtendedRequest req = ( InternalExtendedRequest ) message;
                 if ( ! req.getID().equals( StartTlsHandler.EXTENSION_OID ) )
                 {
                     rejectWithoutConfidentiality( session, req.getResultResponse() );
@@ -143,10 +143,10 @@
                 
                 // Allow StartTls extended operations to go through
             }
-            else if ( message instanceof ResultResponseRequest )
+            else if ( message instanceof InternalResultResponseRequest )
             {
                 // Reject all other operations that have a result response  
-                rejectWithoutConfidentiality( session, ( ( ResultResponseRequest ) message ).getResultResponse() );
+                rejectWithoutConfidentiality( session, ( ( InternalResultResponseRequest ) message ).getResultResponse() );
                 return;
             }
             else // Just return from unbind, and abandon immediately
@@ -157,7 +157,7 @@
 
         // We should check that the server allows anonymous requests
         // only if it's not a BindRequest
-        if ( message instanceof BindRequest )
+        if ( message instanceof InternalBindRequest )
         {
             handle( ldapSession, message );
         }
@@ -180,7 +180,7 @@
             coreSession = getLdapServer().getDirectoryService().getSession();
             ldapSession.setCoreSession( coreSession );
 
-            if ( message instanceof AbandonRequest )
+            if ( message instanceof InternalAbandonRequest )
             {
                 return;
             }
@@ -203,9 +203,9 @@
     /**
      * Handles processing with referrals without ManageDsaIT control.
      */
-    public void handleException( LdapSession session, ResultResponseRequest req, Exception e )
+    public void handleException( LdapSession session, InternalResultResponseRequest req, Exception e )
     {
-        LdapResult result = req.getResultResponse().getLdapResult();
+        InternalLdapResult result = req.getResultResponse().getLdapResult();
 
         /*
          * Set the result code or guess the best option.
@@ -257,7 +257,7 @@
             // Add the referrals if necessary
             if ( e instanceof LdapReferralException )
             {
-                Referral referrals = new ReferralImpl();
+                InternalReferral referrals = new ReferralImpl();
                 
                 do
                 {

Modified: directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyDnHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyDnHandler.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyDnHandler.java (original)
+++ directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyDnHandler.java Mon Apr 13 04:50:28 2009
@@ -22,8 +22,8 @@
  
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.ldap.LdapSession;
-import org.apache.directory.shared.ldap.message.LdapResult;
-import org.apache.directory.shared.ldap.message.ModifyDnRequest;
+import org.apache.directory.shared.ldap.message.InternalLdapResult;
+import org.apache.directory.shared.ldap.message.InternalModifyDnRequest;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.LdapDN;
 
@@ -37,7 +37,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev: 664302 $
  */
-public class ModifyDnHandler extends LdapRequestHandler<ModifyDnRequest>
+public class ModifyDnHandler extends LdapRequestHandler<InternalModifyDnRequest>
 {
     private static final Logger LOG = LoggerFactory.getLogger( ModifyDnHandler.class );
 
@@ -58,9 +58,9 @@
      * - newSuperior : this is a move operation. The entry is removed from its
      * current location, and created in the new one.
      */
-    public void handle( LdapSession session, ModifyDnRequest req )
+    public void handle( LdapSession session, InternalModifyDnRequest req )
     {
-        LdapResult result = req.getResultResponse().getLdapResult();
+        InternalLdapResult result = req.getResultResponse().getLdapResult();
         LOG.debug( "Handling modify dn request while ignoring referrals: {}", req );
 
         if ( req.getName().isEmpty() )

Modified: directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyHandler.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyHandler.java (original)
+++ directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyHandler.java Mon Apr 13 04:50:28 2009
@@ -22,8 +22,8 @@
 
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.ldap.LdapSession;
-import org.apache.directory.shared.ldap.message.LdapResult;
-import org.apache.directory.shared.ldap.message.ModifyRequest;
+import org.apache.directory.shared.ldap.message.InternalLdapResult;
+import org.apache.directory.shared.ldap.message.InternalModifyRequest;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 
 import org.slf4j.Logger;
@@ -36,7 +36,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev: 664302 $
  */
-public class ModifyHandler extends LdapRequestHandler<ModifyRequest>
+public class ModifyHandler extends LdapRequestHandler<InternalModifyRequest>
 {
     private static final Logger LOG = LoggerFactory.getLogger( ModifyHandler.class );
 
@@ -44,10 +44,10 @@
     /**
      * {@inheritDoc}
      */
-    public void handle( LdapSession session, ModifyRequest req )
+    public void handle( LdapSession session, InternalModifyRequest req )
     {
         LOG.debug( "Handling request : {}", req );
-        LdapResult result = req.getResultResponse().getLdapResult();
+        InternalLdapResult result = req.getResultResponse().getLdapResult();
 
         try
         {

Modified: directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java (original)
+++ directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java Mon Apr 13 04:50:28 2009
@@ -33,9 +33,9 @@
 import org.apache.directory.server.ldap.LdapSession;
 import org.apache.directory.shared.ldap.codec.search.controls.ChangeType;
 import org.apache.directory.shared.ldap.message.AbandonListener;
-import org.apache.directory.shared.ldap.message.AbandonableRequest;
-import org.apache.directory.shared.ldap.message.SearchRequest;
-import org.apache.directory.shared.ldap.message.SearchResponseEntry;
+import org.apache.directory.shared.ldap.message.InternalAbandonableRequest;
+import org.apache.directory.shared.ldap.message.InternalSearchRequest;
+import org.apache.directory.shared.ldap.message.InternalSearchResponseEntry;
 import org.apache.directory.shared.ldap.message.SearchResponseEntryImpl;
 import org.apache.directory.shared.ldap.message.control.EntryChangeControl;
 import org.apache.directory.shared.ldap.message.control.PersistentSearchControl;
@@ -61,11 +61,11 @@
 {
     private static final Logger LOG = LoggerFactory.getLogger( PersistentSearchListener.class );
     final LdapSession session;
-    final SearchRequest req;
+    final InternalSearchRequest req;
     final PersistentSearchControl control;
 
 
-    PersistentSearchListener( LdapSession session, SearchRequest req )
+    PersistentSearchListener( LdapSession session, InternalSearchRequest req )
     {
         this.session = session;
         this.req = req;
@@ -94,7 +94,7 @@
     }
 
     
-    public void requestAbandoned( AbandonableRequest req )
+    public void requestAbandoned( InternalAbandonableRequest req )
     {
         try
         {
@@ -107,7 +107,7 @@
     }
     
     
-    private void setECResponseControl( SearchResponseEntry response, ChangeOperationContext opContext, ChangeType type )
+    private void setECResponseControl( InternalSearchResponseEntry response, ChangeOperationContext opContext, ChangeType type )
     {
         if ( control.isReturnECs() )
         {
@@ -136,7 +136,7 @@
             return;
         }
     
-        SearchResponseEntry respEntry = new SearchResponseEntryImpl( req.getMessageId() );
+        InternalSearchResponseEntry respEntry = new SearchResponseEntryImpl( req.getMessageId() );
         respEntry.setObjectName( opContext.getDn() );
         respEntry.setEntry( opContext.getEntry() );
         setECResponseControl( respEntry, opContext, ChangeType.ADD );
@@ -151,7 +151,7 @@
             return;
         }
     
-        SearchResponseEntry respEntry = new SearchResponseEntryImpl( req.getMessageId() );
+        InternalSearchResponseEntry respEntry = new SearchResponseEntryImpl( req.getMessageId() );
         respEntry.setObjectName( opContext.getDn() );
         respEntry.setEntry( opContext.getEntry() );
         setECResponseControl( respEntry, opContext, ChangeType.DELETE );
@@ -166,7 +166,7 @@
             return;
         }
     
-        SearchResponseEntry respEntry = new SearchResponseEntryImpl( req.getMessageId() );
+        InternalSearchResponseEntry respEntry = new SearchResponseEntryImpl( req.getMessageId() );
         respEntry.setObjectName( opContext.getDn() );
         respEntry.setEntry( opContext.getEntry() );
         setECResponseControl( respEntry, opContext, ChangeType.MODIFY );
@@ -181,7 +181,7 @@
             return;
         }
     
-        SearchResponseEntry respEntry = new SearchResponseEntryImpl( req.getMessageId() );
+        InternalSearchResponseEntry respEntry = new SearchResponseEntryImpl( req.getMessageId() );
         respEntry.setObjectName( opContext.getDn() );
         respEntry.setEntry( opContext.getEntry() );
         setECResponseControl( respEntry, opContext, ChangeType.MODDN );
@@ -202,7 +202,7 @@
             return;
         }
     
-        SearchResponseEntry respEntry = new SearchResponseEntryImpl( req.getMessageId() );
+        InternalSearchResponseEntry respEntry = new SearchResponseEntryImpl( req.getMessageId() );
         respEntry.setObjectName( opContext.getAlteredEntry().getDn() );
         respEntry.setEntry( opContext.getAlteredEntry() );
         setECResponseControl( respEntry, opContext, ChangeType.MODDN );

Modified: directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java (original)
+++ directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java Mon Apr 13 04:50:28 2009
@@ -31,12 +31,12 @@
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapException;
-import org.apache.directory.shared.ldap.message.LdapResult;
-import org.apache.directory.shared.ldap.message.Referral;
+import org.apache.directory.shared.ldap.message.InternalLdapResult;
+import org.apache.directory.shared.ldap.message.InternalReferral;
 import org.apache.directory.shared.ldap.message.ReferralImpl;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.message.ResultResponseRequest;
-import org.apache.directory.shared.ldap.message.SearchRequest;
+import org.apache.directory.shared.ldap.message.InternalResultResponseRequest;
+import org.apache.directory.shared.ldap.message.InternalSearchRequest;
 import org.apache.directory.shared.ldap.message.control.ManageDsaITControl;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.util.ExceptionUtils;
@@ -56,7 +56,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev$, $Date$
  */
-public abstract class ReferralAwareRequestHandler<T extends ResultResponseRequest> extends LdapRequestHandler<T>
+public abstract class ReferralAwareRequestHandler<T extends InternalResultResponseRequest> extends LdapRequestHandler<T>
 {
     private static final Logger LOG = LoggerFactory.getLogger( ReferralAwareRequestHandler.class );
     
@@ -93,7 +93,7 @@
             switch ( req.getType() )
             {
                 case SEARCH_REQUEST:
-                    handleWithReferrals( session, ( ( SearchRequest ) req ).getBase(), req );
+                    handleWithReferrals( session, ( ( InternalSearchRequest ) req ).getBase(), req );
                     break;
 
                 case EXTENDED_REQ:
@@ -188,14 +188,14 @@
      * @param referralAncestor the farthest referral ancestor of the missing 
      * entry  
      */
-    public Referral getReferralOnAncestor( LdapSession session, LdapDN reqTargetDn, T req, 
+    public InternalReferral getReferralOnAncestor( LdapSession session, LdapDN reqTargetDn, T req, 
         ClonedServerEntry referralAncestor ) throws Exception
     {
         LOG.debug( "Inside getReferralOnAncestor()" );
         
         ServerAttribute refAttr = ( ServerAttribute ) referralAncestor.getOriginalEntry()
             .get( SchemaConstants.REF_AT );
-        Referral referral = new ReferralImpl();
+        InternalReferral referral = new ReferralImpl();
 
         for ( Value<?> value : refAttr )
         {
@@ -287,14 +287,14 @@
      * @param referralAncestor the farthest referral ancestor of the missing 
      * entry  
      */
-    public Referral getReferralOnAncestorForSearch( LdapSession session, SearchRequest req, 
+    public InternalReferral getReferralOnAncestorForSearch( LdapSession session, InternalSearchRequest req, 
         ClonedServerEntry referralAncestor ) throws Exception
     {
         LOG.debug( "Inside getReferralOnAncestor()" );
      
         ServerAttribute refAttr = ( ServerAttribute ) referralAncestor.getOriginalEntry()
             .get( SchemaConstants.REF_AT );
-        Referral referral = new ReferralImpl();
+        InternalReferral referral = new ReferralImpl();
 
         for ( Value<?> value : refAttr )
         {
@@ -364,9 +364,9 @@
     /**
      * Handles processing with referrals without ManageDsaIT control.
      */
-    public void handleException( LdapSession session, ResultResponseRequest req, Exception e )
+    public void handleException( LdapSession session, InternalResultResponseRequest req, Exception e )
     {
-        LdapResult result = req.getResultResponse().getLdapResult();
+        InternalLdapResult result = req.getResultResponse().getLdapResult();
 
         /*
          * Set the result code or guess the best option.

Modified: directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchAbandonListener.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchAbandonListener.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchAbandonListener.java (original)
+++ directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchAbandonListener.java Mon Apr 13 04:50:28 2009
@@ -25,7 +25,7 @@
 import org.apache.directory.server.ldap.LdapService;
 import org.apache.directory.shared.ldap.exception.OperationAbandonedException;
 import org.apache.directory.shared.ldap.message.AbandonListener;
-import org.apache.directory.shared.ldap.message.AbandonableRequest;
+import org.apache.directory.shared.ldap.message.InternalAbandonableRequest;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -70,7 +70,7 @@
     }
     
     
-    public void requestAbandoned( AbandonableRequest req )
+    public void requestAbandoned( InternalAbandonableRequest req )
     {
         if ( listener != null )
         {

Modified: directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java (original)
+++ directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java Mon Apr 13 04:50:28 2009
@@ -40,17 +40,17 @@
 import org.apache.directory.shared.ldap.filter.EqualityNode;
 import org.apache.directory.shared.ldap.filter.OrNode;
 import org.apache.directory.shared.ldap.filter.PresenceNode;
-import org.apache.directory.shared.ldap.message.LdapResult;
+import org.apache.directory.shared.ldap.message.InternalLdapResult;
 import org.apache.directory.shared.ldap.message.ReferralImpl;
-import org.apache.directory.shared.ldap.message.Response;
+import org.apache.directory.shared.ldap.message.InternalResponse;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.filter.SearchScope;
-import org.apache.directory.shared.ldap.message.Referral;
-import org.apache.directory.shared.ldap.message.SearchRequest;
-import org.apache.directory.shared.ldap.message.SearchResponseDone;
-import org.apache.directory.shared.ldap.message.SearchResponseEntry;
+import org.apache.directory.shared.ldap.message.InternalReferral;
+import org.apache.directory.shared.ldap.message.InternalSearchRequest;
+import org.apache.directory.shared.ldap.message.InternalSearchResponseDone;
+import org.apache.directory.shared.ldap.message.InternalSearchResponseEntry;
 import org.apache.directory.shared.ldap.message.SearchResponseEntryImpl;
-import org.apache.directory.shared.ldap.message.SearchResponseReference;
+import org.apache.directory.shared.ldap.message.InternalSearchResponseReference;
 import org.apache.directory.shared.ldap.message.SearchResponseReferenceImpl;
 import org.apache.directory.shared.ldap.message.control.ManageDsaITControl;
 import org.apache.directory.shared.ldap.message.control.PagedSearchControl;
@@ -78,7 +78,7 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev: 664302 $
  */
-public class SearchHandler extends ReferralAwareRequestHandler<SearchRequest>
+public class SearchHandler extends ReferralAwareRequestHandler<InternalSearchRequest>
 {
     private static final Logger LOG = LoggerFactory.getLogger( SearchHandler.class );
 
@@ -122,7 +122,7 @@
      * @param psearchControl the persistent search control extracted
      * @throws Exception if failures are encountered while searching
      */
-    private void handlePersistentSearch( LdapSession session, SearchRequest req, 
+    private void handlePersistentSearch( LdapSession session, InternalSearchRequest req, 
         PersistentSearchControl psearchControl ) throws Exception 
     {
         /*
@@ -131,7 +131,7 @@
          */
         if ( ! psearchControl.isChangesOnly() )
         {
-            SearchResponseDone done = doSimpleSearch( session, req );
+            InternalSearchResponseDone done = doSimpleSearch( session, req );
             
             // ok if normal search beforehand failed somehow quickly abandon psearch
             if ( done.getLdapResult().getResultCode() != ResultCodeEnum.SUCCESS )
@@ -171,7 +171,7 @@
      * @param req the search request on the RootDSE
      * @throws Exception if failures are encountered while searching
      */
-    private void handleRootDseSearch( LdapSession session, SearchRequest req ) throws Exception
+    private void handleRootDseSearch( LdapSession session, InternalSearchRequest req ) throws Exception
     {
         EntryFilteringCursor cursor = null;
         
@@ -231,7 +231,7 @@
      * @param session the {@link LdapSession} on which search was requested
      * @param cursor the {@link EntryFilteringCursor} over the search results
      */
-    private void setTimeLimitsOnCursor( SearchRequest req, LdapSession session, final EntryFilteringCursor cursor )
+    private void setTimeLimitsOnCursor( InternalSearchRequest req, LdapSession session, final EntryFilteringCursor cursor )
     {
         // Don't bother setting time limits for administrators
         if ( session.getCoreSession().isAnAdministrator() && req.getTimeLimit() == NO_TIME_LIMIT )
@@ -283,7 +283,7 @@
     /**
      * Return the server size limit
      */
-    private int getServerSizeLimit( LdapSession session, SearchRequest request )
+    private int getServerSizeLimit( LdapSession session, InternalSearchRequest request )
     {
         if ( session.getCoreSession().isAnAdministrator() )
         {
@@ -310,7 +310,7 @@
     }
     
     
-    private void readResults( LdapSession session, SearchRequest req, LdapResult ldapResult,
+    private void readResults( LdapSession session, InternalSearchRequest req, InternalLdapResult ldapResult,
     EntryFilteringCursor cursor, int sizeLimit ) throws Exception
     {
         int count = 0;
@@ -342,7 +342,7 @@
     }
     
     
-    private void readPagedResults( LdapSession session, SearchRequest req, LdapResult ldapResult,  
+    private void readPagedResults( LdapSession session, InternalSearchRequest req, InternalLdapResult ldapResult,  
         EntryFilteringCursor cursor, int sizeLimit, int pagedLimit, boolean isPaged, 
         PagedSearchContext pagedContext, PagedResultsControl pagedResultsControl ) throws Exception
     {
@@ -438,7 +438,7 @@
      * Manage the abandoned Paged Search (when paged size = 0). We have to
      * remove the cookie and its associated cursor from the session.
      */
-    private SearchResponseDone abandonPagedSearch( LdapSession session, SearchRequest req ) 
+    private InternalSearchResponseDone abandonPagedSearch( LdapSession session, InternalSearchRequest req ) 
         throws Exception
     {
         PagedResultsControl pagedResultsControl = null;
@@ -469,10 +469,10 @@
         
         // and return
         // DO NOT WRITE THE RESPONSE - JUST RETURN IT
-        LdapResult ldapResult = req.getResultResponse().getLdapResult();
+        InternalLdapResult ldapResult = req.getResultResponse().getLdapResult();
         ldapResult.setResultCode( ResultCodeEnum.SUCCESS );
         req.getResultResponse().add( pagedResultsControl );
-        return ( SearchResponseDone ) req.getResultResponse();
+        return ( InternalSearchResponseDone ) req.getResultResponse();
     }
     
     
@@ -495,7 +495,7 @@
     /**
      * Handle a Paged Search request.
      */
-    private SearchResponseDone doPagedSearch( LdapSession session, SearchRequest req, PagedSearchControl control )
+    private InternalSearchResponseDone doPagedSearch( LdapSession session, InternalSearchRequest req, PagedSearchControl control )
         throws Exception
     {
         PagedSearchControl pagedSearchControl = ( PagedSearchControl )control;
@@ -536,7 +536,7 @@
         
         // Now, depending on the cookie, we will deal with case 2, 3, 4 and 5
         byte [] cookie= pagedSearchControl.getCookie();
-        LdapResult ldapResult = req.getResultResponse().getLdapResult();
+        InternalLdapResult ldapResult = req.getResultResponse().getLdapResult();
         
         if ( StringTools.isEmpty( cookie ) )
         {
@@ -571,7 +571,7 @@
                 
                 // If we had a cookie in the session, remove it
                 removeContext( session, pagedContext );
-                return ( SearchResponseDone ) req.getResultResponse();
+                return ( InternalSearchResponseDone ) req.getResultResponse();
             }
             else
             {
@@ -606,7 +606,7 @@
                 ldapResult.setErrorMessage( "Invalid cookie for this PagedSearch request." );
                 ldapResult.setResultCode( ResultCodeEnum.UNWILLING_TO_PERFORM );
                 
-                return ( SearchResponseDone ) req.getResultResponse();
+                return ( InternalSearchResponseDone ) req.getResultResponse();
             }
             
             if ( pagedContext.hasSameRequest( req, session ) )
@@ -663,7 +663,7 @@
             }
         }
         
-        return ( SearchResponseDone ) req.getResultResponse();
+        return ( InternalSearchResponseDone ) req.getResultResponse();
     }
 
     
@@ -678,10 +678,10 @@
      * @return the result done 
      * @throws Exception if there are failures while processing the request
      */
-    private SearchResponseDone doSimpleSearch( LdapSession session, SearchRequest req ) 
+    private InternalSearchResponseDone doSimpleSearch( LdapSession session, InternalSearchRequest req ) 
         throws Exception
     {
-        LdapResult ldapResult = req.getResultResponse().getLdapResult();
+        InternalLdapResult ldapResult = req.getResultResponse().getLdapResult();
         
         // Check if we are using the Paged Search Control
         Object control = req.getControls().get( PagedSearchControl.CONTROL_OID );
@@ -735,7 +735,7 @@
             }
         }
         
-        return ( SearchResponseDone ) req.getResultResponse();
+        return ( InternalSearchResponseDone ) req.getResultResponse();
     }
     
 
@@ -751,7 +751,7 @@
      * @return the response for the entry
      * @throws Exception if there are problems in generating the response
      */
-    private Response generateResponse( LdapSession session, SearchRequest req, ClonedServerEntry entry ) throws Exception
+    private InternalResponse generateResponse( LdapSession session, InternalSearchRequest req, ClonedServerEntry entry ) throws Exception
     {
         EntryAttribute ref = entry.getOriginalEntry().get( SchemaConstants.REF_AT );
         boolean hasManageDsaItControl = req.getControls().containsKey( ManageDsaITControl.CONTROL_OID );
@@ -759,7 +759,7 @@
         if ( ( ref != null ) && ! hasManageDsaItControl )
         {
             // The entry is a referral.
-            SearchResponseReference respRef;
+            InternalSearchResponseReference respRef;
             respRef = new SearchResponseReferenceImpl( req.getMessageId() );
             respRef.setReferral( new ReferralImpl() );
             
@@ -805,7 +805,7 @@
         else 
         {
             // The entry is not a referral, or the ManageDsaIt control is set
-            SearchResponseEntry respEntry;
+            InternalSearchResponseEntry respEntry;
             respEntry = new SearchResponseEntryImpl( req.getMessageId() );
             respEntry.setEntry( entry );
             respEntry.setObjectName( entry.getDn() );
@@ -841,7 +841,7 @@
      * @param req the request to get the original filter from
      * @throws Exception if there are schema access problems
      */
-    public void modifyFilter( LdapSession session, SearchRequest req ) throws Exception
+    public void modifyFilter( LdapSession session, InternalSearchRequest req ) throws Exception
     {
         if ( req.hasControl( ManageDsaITControl.CONTROL_OID ) )
         {
@@ -893,7 +893,7 @@
      * @param session the associated session
      * @param req the received SearchRequest
      */
-    public void handleIgnoringReferrals( LdapSession session, SearchRequest req )
+    public void handleIgnoringReferrals( LdapSession session, InternalSearchRequest req )
     {
         if ( IS_DEBUG )
         {
@@ -947,7 +947,7 @@
             // Handle regular search requests from here down
             // ===============================================================
 
-            SearchResponseDone done = doSimpleSearch( session, req );
+            InternalSearchResponseDone done = doSimpleSearch( session, req );
             session.getIoSession().write( done );
         }
         catch ( Exception e )
@@ -994,9 +994,9 @@
     /**
      * Handles processing with referrals without ManageDsaIT control.
      */
-    public void handleWithReferrals( LdapSession session, LdapDN reqTargetDn, SearchRequest req ) throws NamingException
+    public void handleWithReferrals( LdapSession session, LdapDN reqTargetDn, InternalSearchRequest req ) throws NamingException
     {
-        LdapResult result = req.getResultResponse().getLdapResult();
+        InternalLdapResult result = req.getResultResponse().getLdapResult();
         ClonedServerEntry entry = null;
         boolean isReferral = false;
         boolean isparentReferral = false;
@@ -1062,7 +1062,7 @@
                 {
                     LOG.debug( "Entry is a referral: {}", entry );
                     
-                    handleReferralEntryForSearch( session, ( SearchRequest ) req, entry );
+                    handleReferralEntryForSearch( session, ( InternalSearchRequest ) req, entry );
 
                     return;
                 }
@@ -1106,7 +1106,8 @@
                 // if we get here then we have a valid referral ancestor
                 try
                 {
-                    Referral referral = getReferralOnAncestorForSearch( session, ( SearchRequest ) req, referralAncestor );
+                    InternalReferral referral = getReferralOnAncestorForSearch( session, 
+                        ( InternalSearchRequest ) req, referralAncestor );
                     
                     result.setResultCode( ResultCodeEnum.REFERRAL );
                     result.setReferral( referral );
@@ -1131,10 +1132,10 @@
      * @param req the request
      * @param entry the entry associated with the request
      */
-    private void handleReferralEntryForSearch( LdapSession session, SearchRequest req, ClonedServerEntry entry )
+    private void handleReferralEntryForSearch( LdapSession session, InternalSearchRequest req, ClonedServerEntry entry )
         throws Exception
     {
-        LdapResult result = req.getResultResponse().getLdapResult();
+        InternalLdapResult result = req.getResultResponse().getLdapResult();
         ReferralImpl referral = new ReferralImpl();
         result.setReferral( referral );
         result.setResultCode( ResultCodeEnum.REFERRAL );
@@ -1189,7 +1190,7 @@
      * @param req the request issued
      * @return true if the search is on the RootDSE false otherwise
      */
-    private static boolean isRootDSESearch( SearchRequest req )
+    private static boolean isRootDSESearch( InternalSearchRequest req )
     {
         boolean isBaseIsRoot = req.getBase().isEmpty();
         boolean isBaseScope = req.getScope() == SearchScope.OBJECT;
@@ -1229,7 +1230,7 @@
      * 
      * @throws Exception the exception
      */
-    private static boolean isSubSchemaSubEntrySearch( LdapSession session, SearchRequest req ) throws Exception
+    private static boolean isSubSchemaSubEntrySearch( LdapSession session, InternalSearchRequest req ) throws Exception
     {
         LdapDN base = req.getBase();
         String baseNormForm = ( base.isNormalized() ? base.getNormName() : base.toNormName() );

Modified: directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/UnbindHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/UnbindHandler.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/UnbindHandler.java (original)
+++ directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/UnbindHandler.java Mon Apr 13 04:50:28 2009
@@ -21,7 +21,7 @@
 
 
 import org.apache.directory.server.ldap.LdapSession;
-import org.apache.directory.shared.ldap.message.UnbindRequest;
+import org.apache.directory.shared.ldap.message.InternalUnbindRequest;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -34,12 +34,12 @@
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  * @version $Rev: 664463 $
  */
-public class UnbindHandler extends LdapRequestHandler<UnbindRequest>
+public class UnbindHandler extends LdapRequestHandler<InternalUnbindRequest>
 {
     private static final Logger LOG = LoggerFactory.getLogger( UnbindHandler.class );
 
 
-    public void handle( LdapSession session, UnbindRequest request ) throws Exception
+    public void handle( LdapSession session, InternalUnbindRequest request ) throws Exception
     {
         try
         {

Modified: directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java (original)
+++ directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java Mon Apr 13 04:50:28 2009
@@ -27,9 +27,9 @@
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.exception.LdapException;
-import org.apache.directory.shared.ldap.message.BindRequest;
-import org.apache.directory.shared.ldap.message.LdapResult;
-import org.apache.directory.shared.ldap.message.MutableControl;
+import org.apache.directory.shared.ldap.message.InternalBindRequest;
+import org.apache.directory.shared.ldap.message.InternalLdapResult;
+import org.apache.directory.shared.ldap.message.InternalControl;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.util.ExceptionUtils;
@@ -65,7 +65,7 @@
     private static final Logger LOG = LoggerFactory.getLogger( AbstractSaslCallbackHandler.class );
 
     /** An empty control array */ 
-    private static final MutableControl[] EMPTY = new MutableControl[0];
+    private static final InternalControl[] EMPTY = new InternalControl[0];
 
     private String username;
     private String realm;
@@ -80,7 +80,7 @@
     protected final DirectoryService directoryService;
     
     /** The associated BindRequest */
-    protected final BindRequest bindRequest;
+    protected final InternalBindRequest bindRequest;
 
 
     /**
@@ -88,7 +88,7 @@
      *
      * @param directoryService
      */
-    protected AbstractSaslCallbackHandler( DirectoryService directoryService, BindRequest bindRequest )
+    protected AbstractSaslCallbackHandler( DirectoryService directoryService, InternalBindRequest bindRequest )
     {
         this.directoryService = directoryService;
         this.bindRequest = bindRequest;
@@ -229,15 +229,15 @@
      * @param env An environment to be used to acquire an {@link LdapContext}.
      * @return An {@link LdapContext} for the client.
      */
-    protected LdapContext getContext( IoSession session, BindRequest bindRequest, Hashtable<String, Object> env )
+    protected LdapContext getContext( IoSession session, InternalBindRequest bindRequest, Hashtable<String, Object> env )
     {
-        LdapResult result = bindRequest.getResultResponse().getLdapResult();
+        InternalLdapResult result = bindRequest.getResultResponse().getLdapResult();
 
         LdapContext ctx = null;
 
         try
         {
-            MutableControl[] connCtls = bindRequest.getControls().values().toArray( EMPTY );
+            InternalControl[] connCtls = bindRequest.getControls().values().toArray( EMPTY );
             env.put( DirectoryService.JNDI_KEY, directoryService );
             ctx = new InitialLdapContext( env, connCtls );
         }

Modified: directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslServer.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslServer.java (original)
+++ directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslServer.java Mon Apr 13 04:50:28 2009
@@ -19,12 +19,13 @@
  */
 package org.apache.directory.server.ldap.handlers.bind;
 
+
 import javax.security.sasl.SaslException;
 import javax.security.sasl.SaslServer;
 
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.ldap.LdapSession;
-import org.apache.directory.shared.ldap.message.BindRequest;
+import org.apache.directory.shared.ldap.message.InternalBindRequest;
 import org.apache.directory.shared.ldap.util.StringTools;
 
 
@@ -38,7 +39,7 @@
 public abstract class AbstractSaslServer implements SaslServer 
 {
     /** The associated BindRequest */
-    private final BindRequest bindRequest;
+    private final InternalBindRequest bindRequest;
     
     /** The associated LdapSession instance */
     private final LdapSession ldapSession;
@@ -47,7 +48,7 @@
     private CoreSession adminSession;
     
     
-    public AbstractSaslServer( LdapSession ldapSession, CoreSession adminSession, BindRequest bindRequest )
+    public AbstractSaslServer( LdapSession ldapSession, CoreSession adminSession, InternalBindRequest bindRequest )
     {
         this.bindRequest = bindRequest;
         this.ldapSession = ldapSession;
@@ -80,7 +81,7 @@
     /**
      *  @return the associated BindRequest object
      */
-    public BindRequest getBindRequest()
+    public InternalBindRequest getBindRequest()
     {
         return bindRequest;
     }

Modified: directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/MechanismHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/MechanismHandler.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/MechanismHandler.java (original)
+++ directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/MechanismHandler.java Mon Apr 13 04:50:28 2009
@@ -23,7 +23,7 @@
 import javax.security.sasl.SaslServer;
 
 import org.apache.directory.server.ldap.LdapSession;
-import org.apache.directory.shared.ldap.message.BindRequest;
+import org.apache.directory.shared.ldap.message.InternalBindRequest;
 
 
 /**
@@ -44,13 +44,13 @@
      * @return The {@link SaslServer} to use for the duration of the bound session.
      * @throws Exception
      */
-    public SaslServer handleMechanism( LdapSession session, BindRequest bindRequest ) throws Exception;
+    public SaslServer handleMechanism( LdapSession session, InternalBindRequest bindRequest ) throws Exception;
     
     
     /**
      * Initialize the saslProperties with some mechanism's specific data
      *
-     * @param ldapSession the Ldapsession instance
+     * @param ldapSession the LdapSession instance
      */
     public void init( LdapSession ldapSession );
     
@@ -58,7 +58,7 @@
     /**
      * Clean the Sasl properties when the use has been authenticated
      *
-     * @param ldapSession the Ldapsession instance
+     * @param ldapSession the LdapSession instance
      */
     public void cleanup( LdapSession ldapSession );
 }

Modified: directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java (original)
+++ directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java Mon Apr 13 04:50:28 2009
@@ -26,9 +26,9 @@
 import org.apache.directory.server.ldap.LdapSession;
 import org.apache.directory.shared.ldap.exception.LdapAuthenticationException;
 import org.apache.directory.shared.ldap.exception.LdapException;
-import org.apache.directory.shared.ldap.message.BindRequest;
-import org.apache.directory.shared.ldap.message.BindResponse;
-import org.apache.directory.shared.ldap.message.LdapResult;
+import org.apache.directory.shared.ldap.message.InternalBindRequest;
+import org.apache.directory.shared.ldap.message.InternalBindResponse;
+import org.apache.directory.shared.ldap.message.InternalLdapResult;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.util.ExceptionUtils;
@@ -53,7 +53,7 @@
     private static final Logger LOG = LoggerFactory.getLogger( SimpleMechanismHandler.class );
 
     
-    public SaslServer handleMechanism( LdapSession ldapSession, BindRequest bindRequest ) throws Exception
+    public SaslServer handleMechanism( LdapSession ldapSession, InternalBindRequest bindRequest ) throws Exception
     {
         // create a new Bind context, with a null session, as we don't have 
         // any context yet.
@@ -77,7 +77,7 @@
             ldapSession.setCoreSession( opContext.getSession() );
             
             // Return the successful response
-            BindResponse response = ( BindResponse ) bindRequest.getResultResponse();
+            InternalBindResponse response = ( InternalBindResponse ) bindRequest.getResultResponse();
             response.getLdapResult().setResultCode( ResultCodeEnum.SUCCESS );
             LdapProtocolUtils.setResponseControls( opContext, response );
             
@@ -89,7 +89,7 @@
         {
             // Something went wrong. Write back an error message            
             ResultCodeEnum code = null;
-            LdapResult result = bindRequest.getResultResponse().getLdapResult();
+            InternalLdapResult result = bindRequest.getResultResponse().getLdapResult();
 
             if ( e instanceof LdapException )
             {

Modified: directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5CallbackHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5CallbackHandler.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5CallbackHandler.java (original)
+++ directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5CallbackHandler.java Mon Apr 13 04:50:28 2009
@@ -37,7 +37,7 @@
 import org.apache.directory.shared.ldap.filter.FilterParser;
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
-import org.apache.directory.shared.ldap.message.BindRequest;
+import org.apache.directory.shared.ldap.message.InternalBindRequest;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.AttributeTypeOptions;
@@ -68,7 +68,7 @@
      * @param bindRequest the bind message
      * @param directoryService the directory service core
      */
-    public CramMd5CallbackHandler( LdapSession ldapSession, CoreSession adminSession, BindRequest bindRequest )
+    public CramMd5CallbackHandler( LdapSession ldapSession, CoreSession adminSession, InternalBindRequest bindRequest )
     {
         super( adminSession.getDirectoryService(), bindRequest );
         this.ldapSession = ldapSession;

Modified: directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5MechanismHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5MechanismHandler.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5MechanismHandler.java (original)
+++ directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5MechanismHandler.java Mon Apr 13 04:50:28 2009
@@ -25,7 +25,7 @@
 import org.apache.directory.server.ldap.handlers.bind.AbstractMechanismHandler;
 import org.apache.directory.server.ldap.handlers.bind.SaslConstants;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
-import org.apache.directory.shared.ldap.message.BindRequest;
+import org.apache.directory.shared.ldap.message.InternalBindRequest;
 
 import javax.security.auth.callback.CallbackHandler;
 import javax.security.sasl.Sasl;
@@ -43,7 +43,7 @@
  */
 public class CramMd5MechanismHandler extends AbstractMechanismHandler
 {
-    public SaslServer handleMechanism( LdapSession ldapSession, BindRequest bindRequest ) throws Exception
+    public SaslServer handleMechanism( LdapSession ldapSession, InternalBindRequest bindRequest ) throws Exception
     {
         SaslServer ss = (SaslServer)ldapSession.getSaslProperty( SaslConstants.SASL_SERVER );
 

Modified: directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5CallbackHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5CallbackHandler.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5CallbackHandler.java (original)
+++ directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5CallbackHandler.java Mon Apr 13 04:50:28 2009
@@ -37,7 +37,7 @@
 import org.apache.directory.shared.ldap.filter.FilterParser;
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
-import org.apache.directory.shared.ldap.message.BindRequest;
+import org.apache.directory.shared.ldap.message.InternalBindRequest;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.AttributeTypeOptions;
@@ -67,7 +67,7 @@
      * @param bindRequest the bind message
      * @param directoryService the directory service core
      */
-    public DigestMd5CallbackHandler( LdapSession ldapSession, CoreSession adminSession, BindRequest bindRequest )
+    public DigestMd5CallbackHandler( LdapSession ldapSession, CoreSession adminSession, InternalBindRequest bindRequest )
     {
         super( adminSession.getDirectoryService(), bindRequest );
         this.ldapSession = ldapSession;

Modified: directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5MechanismHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5MechanismHandler.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5MechanismHandler.java (original)
+++ directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5MechanismHandler.java Mon Apr 13 04:50:28 2009
@@ -26,7 +26,7 @@
 import org.apache.directory.server.ldap.handlers.bind.AbstractMechanismHandler;
 import org.apache.directory.server.ldap.handlers.bind.SaslConstants;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
-import org.apache.directory.shared.ldap.message.BindRequest;
+import org.apache.directory.shared.ldap.message.InternalBindRequest;
 
 import javax.security.auth.callback.CallbackHandler;
 import javax.security.sasl.Sasl;
@@ -75,7 +75,7 @@
 
 
     
-    public SaslServer handleMechanism( LdapSession ldapSession, BindRequest bindRequest ) throws Exception
+    public SaslServer handleMechanism( LdapSession ldapSession, InternalBindRequest bindRequest ) throws Exception
     {
         SaslServer ss = (SaslServer)ldapSession.getSaslProperty( SaslConstants.SASL_SERVER );
 

Modified: directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiCallbackHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiCallbackHandler.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiCallbackHandler.java (original)
+++ directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiCallbackHandler.java Mon Apr 13 04:50:28 2009
@@ -26,7 +26,7 @@
 import org.apache.directory.server.ldap.LdapSession;
 import org.apache.directory.server.ldap.handlers.bind.AbstractSaslCallbackHandler;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.message.BindRequest;
+import org.apache.directory.shared.ldap.message.InternalBindRequest;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -56,7 +56,7 @@
      * @param bindRequest the bind message
      * @param directoryService the directory service core
      */
-    public GssapiCallbackHandler( DirectoryService directoryService, LdapSession ldapSession, BindRequest bindRequest )
+    public GssapiCallbackHandler( DirectoryService directoryService, LdapSession ldapSession, InternalBindRequest bindRequest )
     {
         super( directoryService, bindRequest );
         this.ldapSession = ldapSession;

Modified: directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiMechanismHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiMechanismHandler.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiMechanismHandler.java (original)
+++ directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiMechanismHandler.java Mon Apr 13 04:50:28 2009
@@ -24,7 +24,7 @@
 import org.apache.directory.server.ldap.handlers.bind.AbstractMechanismHandler;
 import org.apache.directory.server.ldap.handlers.bind.SaslConstants;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
-import org.apache.directory.shared.ldap.message.BindRequest;
+import org.apache.directory.shared.ldap.message.InternalBindRequest;
 
 import javax.security.auth.Subject;
 import javax.security.auth.callback.CallbackHandler;
@@ -43,7 +43,7 @@
  */
 public class GssapiMechanismHandler extends AbstractMechanismHandler
 {
-    public SaslServer handleMechanism( LdapSession ldapSession, BindRequest bindRequest ) throws Exception
+    public SaslServer handleMechanism( LdapSession ldapSession, InternalBindRequest bindRequest ) throws Exception
     {
         SaslServer ss = (SaslServer)ldapSession.getSaslProperty( SaslConstants.SASL_SERVER );
 

Modified: directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmMechanismHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmMechanismHandler.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmMechanismHandler.java (original)
+++ directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmMechanismHandler.java Mon Apr 13 04:50:28 2009
@@ -23,7 +23,7 @@
 import org.apache.directory.server.ldap.LdapSession;
 import org.apache.directory.server.ldap.handlers.bind.AbstractMechanismHandler;
 import org.apache.directory.server.ldap.handlers.bind.SaslConstants;
-import org.apache.directory.shared.ldap.message.BindRequest;
+import org.apache.directory.shared.ldap.message.InternalBindRequest;
 
 import javax.security.sasl.SaslServer;
 
@@ -55,7 +55,7 @@
     }
 
 
-    public SaslServer handleMechanism( LdapSession ldapSession, BindRequest bindRequest ) throws Exception
+    public SaslServer handleMechanism( LdapSession ldapSession, InternalBindRequest bindRequest ) throws Exception
     {
         SaslServer ss = ( SaslServer ) ldapSession.getSaslProperty( SaslConstants.SASL_SERVER );
 

Modified: directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmSaslServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmSaslServer.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmSaslServer.java (original)
+++ directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmSaslServer.java Mon Apr 13 04:50:28 2009
@@ -28,7 +28,7 @@
 import org.apache.directory.server.ldap.handlers.bind.SaslConstants;
 import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
-import org.apache.directory.shared.ldap.message.BindRequest;
+import org.apache.directory.shared.ldap.message.InternalBindRequest;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.util.StringTools;
 
@@ -55,7 +55,7 @@
     private final NtlmProvider provider;
 
     
-    public NtlmSaslServer( NtlmProvider provider, BindRequest bindRequest, LdapSession ldapSession )
+    public NtlmSaslServer( NtlmProvider provider, InternalBindRequest bindRequest, LdapSession ldapSession )
     {
         super( ldapSession, null, bindRequest );
         this.provider = provider;

Modified: directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainMechanismHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainMechanismHandler.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainMechanismHandler.java (original)
+++ directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainMechanismHandler.java Mon Apr 13 04:50:28 2009
@@ -24,7 +24,7 @@
 import org.apache.directory.server.ldap.LdapSession;
 import org.apache.directory.server.ldap.handlers.bind.AbstractMechanismHandler;
 import org.apache.directory.server.ldap.handlers.bind.SaslConstants;
-import org.apache.directory.shared.ldap.message.BindRequest;
+import org.apache.directory.shared.ldap.message.InternalBindRequest;
 
 import javax.security.sasl.SaslServer;
 
@@ -42,7 +42,7 @@
     /**
      * {@inheritDoc}
      */
-    public SaslServer handleMechanism( LdapSession ldapSession, BindRequest bindRequest ) throws Exception
+    public SaslServer handleMechanism( LdapSession ldapSession, InternalBindRequest bindRequest ) throws Exception
     {
         SaslServer ss = ( SaslServer ) ldapSession.getSaslProperty( SaslConstants.SASL_SERVER );
         

Modified: directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainSaslServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainSaslServer.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainSaslServer.java (original)
+++ directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainSaslServer.java Mon Apr 13 04:50:28 2009
@@ -27,7 +27,7 @@
 import org.apache.directory.server.ldap.LdapSession;
 import org.apache.directory.server.ldap.handlers.bind.AbstractSaslServer;
 import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
-import org.apache.directory.shared.ldap.message.BindRequest;
+import org.apache.directory.shared.ldap.message.InternalBindRequest;
 import org.apache.directory.shared.ldap.name.LdapDN;
 import org.apache.directory.shared.ldap.schema.PrepareString;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -88,7 +88,7 @@
      * @param bindRequest The associated BindRequest object
      * @param ldapSession The associated LdapSession instance 
      */
-    public PlainSaslServer( LdapSession ldapSession, CoreSession adminSession, BindRequest bindRequest )
+    public PlainSaslServer( LdapSession ldapSession, CoreSession adminSession, InternalBindRequest bindRequest )
     {
         super( ldapSession, adminSession, bindRequest );
         state = NegotiationState.INITIALIZED;

Modified: directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java?rev=764357&r1=764356&r2=764357&view=diff
==============================================================================
--- directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java (original)
+++ directory/apacheds/branches/ldif-partition/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java Mon Apr 13 04:50:28 2009
@@ -19,6 +19,7 @@
  */
 package org.apache.directory.server.ldap.handlers.controls;
 
+
 import java.util.HashSet;
 import java.util.Set;
 
@@ -29,10 +30,11 @@
 import org.apache.directory.server.schema.registries.AttributeTypeRegistry;
 import org.apache.directory.shared.asn1.ber.tlv.Value;
 import org.apache.directory.shared.ldap.constants.SchemaConstants;
-import org.apache.directory.shared.ldap.message.SearchRequest;
+import org.apache.directory.shared.ldap.message.InternalSearchRequest;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.util.StringTools;
 
+
 /**
  * The structure which stores the informations relative to the pagedSearch control.
  * They are associated to a cookie, stored into the session and associated to an 
@@ -44,7 +46,7 @@
 public class PagedSearchContext
 {
     /** The previous search request */
-    private SearchRequest previousSearchRequest;
+    private InternalSearchRequest previousSearchRequest;
     
     /** The current position in the cursor */
     private int currentPosition;
@@ -61,7 +63,7 @@
     /**
      * Creates a new instance of this class, storing the Searchrequest into it.
      */
-    public PagedSearchContext( SearchRequest searchRequest )
+    public PagedSearchContext( InternalSearchRequest searchRequest )
     {
         previousSearchRequest = searchRequest;
         currentPosition = 0;
@@ -112,7 +114,7 @@
     /**
      * Build a set of OIDs from the list of attributes we have in the search request
      */
-    private Set<String> buildAttributeSet( SearchRequest request, LdapSession session, 
+    private Set<String> buildAttributeSet( InternalSearchRequest request, LdapSession session, 
         AttributeTypeRegistry atRegistry )
     {
         Set<String> requestSet = new HashSet<String>();
@@ -149,7 +151,7 @@
      * @param request The new SearchRequest
      * @return true if both request are equal.
      */
-    public boolean hasSameRequest( SearchRequest request, LdapSession session )
+    public boolean hasSameRequest( InternalSearchRequest request, LdapSession session )
     {
         // Compares the scope
         if ( request.getScope() != previousSearchRequest.getScope() )
@@ -284,7 +286,7 @@
     /**
      * @return The previous search request
      */
-    public SearchRequest getPreviousSearchRequest()
+    public InternalSearchRequest getPreviousSearchRequest()
     {
         return previousSearchRequest;
     }



Mime
View raw message