directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r760730 - in /directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers: ./ bind/ extended/
Date Tue, 31 Mar 2009 23:28:23 GMT
Author: elecharny
Date: Tue Mar 31 23:28:23 2009
New Revision: 760730

URL: http://svn.apache.org/viewvc?rev=760730&view=rev
Log:
Modified the classes to reflect the renaming of codec and standard messages

Modified:
    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/ExtendedHandler.java
    directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.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/SimpleMechanismHandler.java
    directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StartTlsHandler.java
    directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java

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=760730&r1=760729&r2=760730&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
Tue Mar 31 23:28:23 2009
@@ -49,7 +49,7 @@
 import org.apache.directory.shared.ldap.exception.LdapAuthenticationException;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.message.InternalBindRequest;
-import org.apache.directory.shared.ldap.message.BindResponse;
+import org.apache.directory.shared.ldap.message.InternalBindResponse;
 import org.apache.directory.shared.ldap.message.LdapResult;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.LdapDN;
@@ -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 );
@@ -394,7 +394,7 @@
     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 );
         

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=760730&r1=760729&r2=760730&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
Tue Mar 31 23:28:23 2009
@@ -23,7 +23,7 @@
 import org.apache.directory.server.ldap.ExtendedOperationHandler;
 import org.apache.directory.server.ldap.LdapSession;
 import org.apache.directory.shared.ldap.message.InternalExtendedRequest;
-import org.apache.directory.shared.ldap.message.ExtendedResponse;
+import org.apache.directory.shared.ldap.message.InternalExtendedResponse;
 import org.apache.directory.shared.ldap.message.LdapResult;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.util.ExceptionUtils;
@@ -64,7 +64,7 @@
             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/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java?rev=760730&r1=760729&r2=760730&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java
(original)
+++ directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java
Tue Mar 31 23:28:23 2009
@@ -35,7 +35,7 @@
 import org.apache.directory.shared.ldap.message.AbandonListener;
 import org.apache.directory.shared.ldap.message.AbandonableRequest;
 import org.apache.directory.shared.ldap.message.InternalSearchRequest;
-import org.apache.directory.shared.ldap.message.SearchResponseEntry;
+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;
@@ -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/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=760730&r1=760729&r2=760730&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
Tue Mar 31 23:28:23 2009
@@ -47,10 +47,10 @@
 import org.apache.directory.shared.ldap.filter.SearchScope;
 import org.apache.directory.shared.ldap.message.Referral;
 import org.apache.directory.shared.ldap.message.InternalSearchRequest;
-import org.apache.directory.shared.ldap.message.SearchResponseDone;
-import org.apache.directory.shared.ldap.message.SearchResponseEntry;
+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;
@@ -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 )
@@ -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, InternalSearchRequest
req ) 
+    private InternalSearchResponseDone abandonPagedSearch( LdapSession session, InternalSearchRequest
req ) 
         throws Exception
     {
         PagedResultsControl pagedResultsControl = null;
@@ -472,7 +472,7 @@
         LdapResult 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, InternalSearchRequest
req, PagedSearchControl control )
+    private InternalSearchResponseDone doPagedSearch( LdapSession session, InternalSearchRequest
req, PagedSearchControl control )
         throws Exception
     {
         PagedSearchControl pagedSearchControl = ( PagedSearchControl )control;
@@ -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,7 +678,7 @@
      * @return the result done 
      * @throws Exception if there are failures while processing the request
      */
-    private SearchResponseDone doSimpleSearch( LdapSession session, InternalSearchRequest
req ) 
+    private InternalSearchResponseDone doSimpleSearch( LdapSession session, InternalSearchRequest
req ) 
         throws Exception
     {
         LdapResult ldapResult = req.getResultResponse().getLdapResult();
@@ -735,7 +735,7 @@
             }
         }
         
-        return ( SearchResponseDone ) req.getResultResponse();
+        return ( InternalSearchResponseDone ) req.getResultResponse();
     }
     
 
@@ -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() );
@@ -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 )

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=760730&r1=760729&r2=760730&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
Tue Mar 31 23:28:23 2009
@@ -27,7 +27,7 @@
 import org.apache.directory.shared.ldap.exception.LdapAuthenticationException;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.message.InternalBindRequest;
-import org.apache.directory.shared.ldap.message.BindResponse;
+import org.apache.directory.shared.ldap.message.InternalBindResponse;
 import org.apache.directory.shared.ldap.message.LdapResult;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.name.LdapDN;
@@ -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 );
             

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=760730&r1=760729&r2=760730&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
Tue Mar 31 23:28:23 2009
@@ -40,7 +40,7 @@
 import org.apache.directory.server.ldap.LdapService;
 import org.apache.directory.server.ldap.LdapSession;
 import org.apache.directory.shared.ldap.message.InternalExtendedRequest;
-import org.apache.directory.shared.ldap.message.ExtendedResponse;
+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.ResultCodeEnum;
@@ -93,7 +93,7 @@
             sslFilter.startSsl( session.getIoSession() );
         }
         
-        ExtendedResponse res = new ExtendedResponseImpl( req.getMessageId() );
+        InternalExtendedResponse res = new ExtendedResponseImpl( req.getMessageId() );
         LdapResult result = res.getLdapResult();
         result.setResultCode( ResultCodeEnum.SUCCESS );
         res.setResponseName( EXTENSION_OID );

Modified: directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java?rev=760730&r1=760729&r2=760730&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java
(original)
+++ directory/apacheds/branches/apacheds-replication/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java
Tue Mar 31 23:28:23 2009
@@ -44,7 +44,7 @@
 import org.apache.directory.shared.ldap.codec.extended.operations.storedProcedure.StoredProcedureDecoder;
 import org.apache.directory.shared.ldap.codec.extended.operations.storedProcedure.StoredProcedure.StoredProcedureParameter;
 import org.apache.directory.shared.ldap.message.InternalExtendedRequest;
-import org.apache.directory.shared.ldap.message.ExtendedResponse;
+import org.apache.directory.shared.ldap.message.InternalExtendedResponse;
 import org.apache.directory.shared.ldap.message.extended.StoredProcedureRequest;
 import org.apache.directory.shared.ldap.message.extended.StoredProcedureResponse;
 import org.apache.directory.shared.ldap.name.LdapDN;
@@ -106,7 +106,7 @@
         Object response = engine.invokeProcedure( session.getCoreSession(), procedure, values
);
         
         byte[] serializedResponse = SerializationUtils.serialize( ( Serializable ) response
);
-        ( ( ExtendedResponse )( req.getResultResponse() ) ).setResponse( serializedResponse
);
+        ( ( InternalExtendedResponse )( req.getResultResponse() ) ).setResponse( serializedResponse
);
         session.getIoSession().write( req.getResultResponse() );
         
     }



Mime
View raw message