directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r760985 - in /directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap: ./ handlers/ handlers/bind/ handlers/extended/
Date Wed, 01 Apr 2009 17:53:11 GMT
Author: elecharny
Date: Wed Apr  1 17:53:10 2009
New Revision: 760985

URL: http://svn.apache.org/viewvc?rev=760985&view=rev
Log:
Renamed some more messages classes to InternalXXX

Modified:
    directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java
    directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolUtils.java
    directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/AddHandler.java
    directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java
    directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/CompareHandler.java
    directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/DeleteHandler.java
    directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ExtendedHandler.java
    directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java
    directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyDnHandler.java
    directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyHandler.java
    directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java
    directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
    directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java
    directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java
    directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StartTlsHandler.java

Modified: directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java?rev=760985&r1=760984&r2=760985&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java
(original)
+++ directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java
Wed Apr  1 17:53:10 2009
@@ -25,11 +25,11 @@
 import org.apache.directory.shared.ldap.message.InternalExtendedRequest;
 import org.apache.directory.shared.ldap.message.ExtendedRequestImpl;
 import org.apache.directory.shared.ldap.message.MutableControl;
-import org.apache.directory.shared.ldap.message.Request;
+import org.apache.directory.shared.ldap.message.InternalRequest;
 import org.apache.directory.shared.ldap.message.ResponseCarryingMessageException;
 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.message.extended.NoticeOfDisconnect;
 import org.apache.mina.core.session.IoSession;
 import org.apache.mina.filter.ssl.SslFilter;
@@ -42,7 +42,7 @@
  * The MINA IoHandler implementation extending {@link DemuxingIoHandler} for 
  * the LDAP protocol.  THe {@link LdapService} creates this multiplexing 
  * {@link IoHandler} handler and populates it with subordinate handlers for
- * the various kinds of LDAP {@link Request} messages.  This is done in the
+ * the various kinds of LDAP {@link InternalRequest} messages.  This is done in the
  * setXxxHandler() methods of the LdapService where Xxxx is Add, Modify, etc.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
@@ -174,15 +174,15 @@
             message = req;
         }
 
-        if ( ( ( Request ) message ).getControls().size() > 0 && message instanceof
ResultResponseRequest )
+        if ( ( ( InternalRequest ) message ).getControls().size() > 0 && message
instanceof InternalResultResponseRequest )
         {
-            ResultResponseRequest req = ( ResultResponseRequest ) message;
+            InternalResultResponseRequest req = ( InternalResultResponseRequest ) message;
             for ( Control control1 : req.getControls().values() )
             {
                 MutableControl control = ( MutableControl ) control1;
                 if ( control.isCritical() && ! ldapService.getSupportedControls().contains(
control.getID() ) )
                 {
-                    ResultResponse resp = req.getResultResponse();
+                    InternalResultResponse resp = req.getResultResponse();
                     resp.getLdapResult().setErrorMessage( "Unsupport critical control: "
+ control.getID() );
                     resp.getLdapResult().setResultCode( ResultCodeEnum.UNAVAILABLE_CRITICAL_EXTENSION
);
                     session.write( resp );

Modified: directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolUtils.java?rev=760985&r1=760984&r2=760985&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolUtils.java
(original)
+++ directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolUtils.java
Wed Apr  1 17:53:10 2009
@@ -21,8 +21,8 @@
 
 
 import org.apache.directory.server.core.interceptor.context.OperationContext;
-import org.apache.directory.shared.ldap.message.Request;
-import org.apache.directory.shared.ldap.message.Response;
+import org.apache.directory.shared.ldap.message.InternalRequest;
+import org.apache.directory.shared.ldap.message.InternalResponse;
 
 
 /**
@@ -40,7 +40,7 @@
      * @param opContext the context to populate with request controls
      * @param request the request to extract controls from
      */
-    public static void setRequestControls( OperationContext opContext, Request request )
throws Exception
+    public static void setRequestControls( OperationContext opContext, InternalRequest request
) throws Exception
     {
         if ( request.getControls() != null )
         {
@@ -56,7 +56,7 @@
      * @param opContext the context to extract controls from
      * @param response the response to populate with response controls
      */
-    public static void setResponseControls( OperationContext opContext, Response response
) throws Exception
+    public static void setResponseControls( OperationContext opContext, InternalResponse
response ) throws Exception
     {
         opContext.addRequestControls( opContext.getResponseControls() );
     }

Modified: directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/AddHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/AddHandler.java?rev=760985&r1=760984&r2=760985&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/AddHandler.java
(original)
+++ directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/AddHandler.java
Wed Apr  1 17:53:10 2009
@@ -23,7 +23,7 @@
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.ldap.LdapSession;
 import org.apache.directory.shared.ldap.message.InternalAddRequest;
-import org.apache.directory.shared.ldap.message.LdapResult;
+import org.apache.directory.shared.ldap.message.InternalLdapResult;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 
 import org.slf4j.Logger;
@@ -48,7 +48,7 @@
     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/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java?rev=760985&r1=760984&r2=760985&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java
(original)
+++ directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java
Wed Apr  1 17:53:10 2009
@@ -50,7 +50,7 @@
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.message.InternalBindRequest;
 import org.apache.directory.shared.ldap.message.InternalBindResponse;
-import org.apache.directory.shared.ldap.message.LdapResult;
+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;
@@ -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 )
             {
@@ -267,7 +267,7 @@
      */
     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 )
@@ -344,7 +344,7 @@
         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." );
@@ -362,7 +362,7 @@
      */
     private void sendInvalidCredentials( LdapSession ldapSession, InternalBindRequest bindRequest,
Exception e )
     {
-        LdapResult result = bindRequest.getResultResponse().getLdapResult();
+        InternalLdapResult result = bindRequest.getResultResponse().getLdapResult();
         
         String message = "";
         
@@ -706,7 +706,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/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/CompareHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/CompareHandler.java?rev=760985&r1=760984&r2=760985&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/CompareHandler.java
(original)
+++ directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/CompareHandler.java
Wed Apr  1 17:53:10 2009
@@ -22,7 +22,7 @@
 
 import org.apache.directory.server.ldap.LdapSession;
 import org.apache.directory.shared.ldap.message.InternalCompareRequest;
-import org.apache.directory.shared.ldap.message.LdapResult;
+import org.apache.directory.shared.ldap.message.InternalLdapResult;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.LdapDN;
 
@@ -50,7 +50,7 @@
     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/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/DeleteHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/DeleteHandler.java?rev=760985&r1=760984&r2=760985&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/DeleteHandler.java
(original)
+++ directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/DeleteHandler.java
Wed Apr  1 17:53:10 2009
@@ -23,7 +23,7 @@
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.server.ldap.LdapSession;
 import org.apache.directory.shared.ldap.message.InternalDeleteRequest;
-import org.apache.directory.shared.ldap.message.LdapResult;
+import org.apache.directory.shared.ldap.message.InternalLdapResult;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 
 import org.slf4j.Logger;
@@ -47,7 +47,7 @@
     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/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ExtendedHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ExtendedHandler.java?rev=760985&r1=760984&r2=760985&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ExtendedHandler.java
(original)
+++ directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ExtendedHandler.java
Wed Apr  1 17:53:10 2009
@@ -24,7 +24,7 @@
 import org.apache.directory.server.ldap.LdapSession;
 import org.apache.directory.shared.ldap.message.InternalExtendedRequest;
 import org.apache.directory.shared.ldap.message.InternalExtendedResponse;
-import org.apache.directory.shared.ldap.message.LdapResult;
+import org.apache.directory.shared.ldap.message.InternalLdapResult;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.util.ExceptionUtils;
 
@@ -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,7 +59,7 @@
         }
         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()

Modified: directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java?rev=760985&r1=760984&r2=760985&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java
(original)
+++ directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java
Wed Apr  1 17:53:10 2009
@@ -31,13 +31,13 @@
 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.LdapResult;
+import org.apache.directory.shared.ldap.message.InternalLdapResult;
 import org.apache.directory.shared.ldap.message.Referral;
 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 );
@@ -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
@@ -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.

Modified: directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyDnHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyDnHandler.java?rev=760985&r1=760984&r2=760985&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyDnHandler.java
(original)
+++ directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyDnHandler.java
Wed Apr  1 17:53:10 2009
@@ -22,7 +22,7 @@
  
 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.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;
@@ -60,7 +60,7 @@
      */
     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/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyHandler.java?rev=760985&r1=760984&r2=760985&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyHandler.java
(original)
+++ directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyHandler.java
Wed Apr  1 17:53:10 2009
@@ -22,7 +22,7 @@
 
 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.InternalLdapResult;
 import org.apache.directory.shared.ldap.message.InternalModifyRequest;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 
@@ -47,7 +47,7 @@
     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/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java?rev=760985&r1=760984&r2=760985&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java
(original)
+++ directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ReferralAwareRequestHandler.java
Wed Apr  1 17:53:10 2009
@@ -31,11 +31,11 @@
 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.InternalLdapResult;
 import org.apache.directory.shared.ldap.message.Referral;
 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.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;
@@ -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
);
     
@@ -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/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java?rev=760985&r1=760984&r2=760985&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
(original)
+++ directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
Wed Apr  1 17:53:10 2009
@@ -40,9 +40,9 @@
 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;
@@ -310,7 +310,7 @@
     }
     
     
-    private void readResults( LdapSession session, InternalSearchRequest 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, InternalSearchRequest 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
     {
@@ -469,7 +469,7 @@
         
         // 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 ( InternalSearchResponseDone ) req.getResultResponse();
@@ -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 ) )
         {
@@ -681,7 +681,7 @@
     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 );
@@ -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, InternalSearchRequest 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
);
@@ -996,7 +996,7 @@
      */
     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;
@@ -1134,7 +1134,7 @@
     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 );

Modified: directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java?rev=760985&r1=760984&r2=760985&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java
(original)
+++ directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java
Wed Apr  1 17:53:10 2009
@@ -28,7 +28,7 @@
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.message.InternalBindRequest;
-import org.apache.directory.shared.ldap.message.LdapResult;
+import org.apache.directory.shared.ldap.message.InternalLdapResult;
 import org.apache.directory.shared.ldap.message.MutableControl;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.LdapDN;
@@ -231,7 +231,7 @@
      */
     protected LdapContext getContext( IoSession session, InternalBindRequest bindRequest,
Hashtable<String, Object> env )
     {
-        LdapResult result = bindRequest.getResultResponse().getLdapResult();
+        InternalLdapResult result = bindRequest.getResultResponse().getLdapResult();
 
         LdapContext ctx = null;
 

Modified: directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java?rev=760985&r1=760984&r2=760985&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java
(original)
+++ directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java
Wed Apr  1 17:53:10 2009
@@ -28,7 +28,7 @@
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.message.InternalBindRequest;
 import org.apache.directory.shared.ldap.message.InternalBindResponse;
-import org.apache.directory.shared.ldap.message.LdapResult;
+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;
@@ -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/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StartTlsHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StartTlsHandler.java?rev=760985&r1=760984&r2=760985&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StartTlsHandler.java
(original)
+++ directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StartTlsHandler.java
Wed Apr  1 17:53:10 2009
@@ -42,7 +42,7 @@
 import org.apache.directory.shared.ldap.message.InternalExtendedRequest;
 import org.apache.directory.shared.ldap.message.InternalExtendedResponse;
 import org.apache.directory.shared.ldap.message.ExtendedResponseImpl;
-import org.apache.directory.shared.ldap.message.LdapResult;
+import org.apache.directory.shared.ldap.message.InternalLdapResult;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.mina.core.filterchain.IoFilterChain;
 import org.apache.mina.filter.ssl.SslFilter;
@@ -94,7 +94,7 @@
         }
         
         InternalExtendedResponse res = new ExtendedResponseImpl( req.getMessageId() );
-        LdapResult result = res.getLdapResult();
+        InternalLdapResult result = res.getLdapResult();
         result.setResultCode( ResultCodeEnum.SUCCESS );
         res.setResponseName( EXTENSION_OID );
         res.setResponse( new byte[ 0 ] );



Mime
View raw message