You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2010/08/18 02:27:23 UTC
svn commit: r986534 [3/7] - in /directory:
apacheds/branches/apacheds-codec-merge/core-api/src/main/java/org/apache/directory/server/core/
apacheds/branches/apacheds-codec-merge/core-api/src/main/java/org/apache/directory/server/core/event/
apacheds/br...
Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyDnHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyDnHandler.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyDnHandler.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyDnHandler.java Wed Aug 18 00:27:16 2010
@@ -24,7 +24,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.ldap.LdapSession;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.message.internal.LdapResult;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyDnRequest;
+import org.apache.directory.shared.ldap.message.internal.ModifyDnRequest;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.slf4j.Logger;
@@ -32,11 +32,11 @@ import org.slf4j.LoggerFactory;
/**
- * A single reply handler for {@link InternalModifyDnRequest}s.
+ * A single reply handler for {@link ModifyDnRequest}s.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class ModifyDnHandler extends LdapRequestHandler<InternalModifyDnRequest>
+public class ModifyDnHandler extends LdapRequestHandler<ModifyDnRequest>
{
private static final Logger LOG = LoggerFactory.getLogger( ModifyDnHandler.class );
@@ -57,7 +57,7 @@ public class ModifyDnHandler extends Lda
* - 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, InternalModifyDnRequest req )
+ public void handle( LdapSession session, ModifyDnRequest req )
{
LdapResult result = req.getResultResponse().getLdapResult();
LOG.debug( "Handling modify dn request while ignoring referrals: {}", req );
Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyHandler.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyHandler.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyHandler.java Wed Aug 18 00:27:16 2010
@@ -24,18 +24,18 @@ import org.apache.directory.server.core.
import org.apache.directory.server.ldap.LdapSession;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.message.internal.LdapResult;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyRequest;
+import org.apache.directory.shared.ldap.message.internal.ModifyRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * A single reply handler for {@link InternalModifyRequest}s.
+ * A single reply handler for {@link ModifyRequest}s.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class ModifyHandler extends LdapRequestHandler<InternalModifyRequest>
+public class ModifyHandler extends LdapRequestHandler<ModifyRequest>
{
private static final Logger LOG = LoggerFactory.getLogger( ModifyHandler.class );
@@ -43,7 +43,7 @@ public class ModifyHandler extends LdapR
/**
* {@inheritDoc}
*/
- public void handle( LdapSession session, InternalModifyRequest req )
+ public void handle( LdapSession session, ModifyRequest req )
{
LOG.debug( "Handling request : {}", req );
LdapResult result = req.getResultResponse().getLdapResult();
Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java Wed Aug 18 00:27:16 2010
@@ -36,8 +36,8 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.exception.LdapException;
import org.apache.directory.shared.ldap.message.AbandonListener;
import org.apache.directory.shared.ldap.message.SearchResultEntryImpl;
-import org.apache.directory.shared.ldap.message.internal.InternalAbandonableRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest;
+import org.apache.directory.shared.ldap.message.internal.AbandonableRequest;
+import org.apache.directory.shared.ldap.message.internal.SearchRequest;
import org.apache.directory.shared.ldap.message.internal.SearchResultEntry;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -59,11 +59,11 @@ public class PersistentSearchListener im
{
private static final Logger LOG = LoggerFactory.getLogger( PersistentSearchListener.class );
final LdapSession session;
- final InternalSearchRequest req;
+ final SearchRequest req;
final PersistentSearchControl control;
- PersistentSearchListener( LdapSession session, InternalSearchRequest req )
+ PersistentSearchListener( LdapSession session, SearchRequest req )
{
this.session = session;
this.req = req;
@@ -92,7 +92,7 @@ public class PersistentSearchListener im
}
- public void requestAbandoned( InternalAbandonableRequest req )
+ public void requestAbandoned( AbandonableRequest req )
{
try
{
Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchAbandonListener.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchAbandonListener.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchAbandonListener.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchAbandonListener.java Wed Aug 18 00:27:16 2010
@@ -26,7 +26,7 @@ import org.apache.directory.server.i18n.
import org.apache.directory.server.ldap.LdapServer;
import org.apache.directory.shared.ldap.exception.OperationAbandonedException;
import org.apache.directory.shared.ldap.message.AbandonListener;
-import org.apache.directory.shared.ldap.message.internal.InternalAbandonableRequest;
+import org.apache.directory.shared.ldap.message.internal.AbandonableRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -70,7 +70,7 @@ public class SearchAbandonListener imple
}
- public void requestAbandoned( InternalAbandonableRequest req )
+ public void requestAbandoned( AbandonableRequest req )
{
if ( listener != null )
{
Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java Wed Aug 18 00:27:16 2010
@@ -61,9 +61,9 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.message.SearchResultEntryImpl;
import org.apache.directory.shared.ldap.message.SearchResultReferenceImpl;
-import org.apache.directory.shared.ldap.message.internal.InternalReferral;
-import org.apache.directory.shared.ldap.message.internal.InternalResultResponseRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest;
+import org.apache.directory.shared.ldap.message.internal.Referral;
+import org.apache.directory.shared.ldap.message.internal.ResultResponseRequest;
+import org.apache.directory.shared.ldap.message.internal.SearchRequest;
import org.apache.directory.shared.ldap.message.internal.LdapResult;
import org.apache.directory.shared.ldap.message.internal.Response;
import org.apache.directory.shared.ldap.message.internal.SearchResultDone;
@@ -82,7 +82,7 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class SearchHandler extends LdapRequestHandler<InternalSearchRequest>
+public class SearchHandler extends LdapRequestHandler<SearchRequest>
{
private static final Logger LOG = LoggerFactory.getLogger( SearchHandler.class );
@@ -128,7 +128,7 @@ public class SearchHandler extends LdapR
* @param psearchControl the persistent search control extracted
* @throws Exception if failures are encountered while searching
*/
- private void handlePersistentSearch( LdapSession session, InternalSearchRequest req,
+ private void handlePersistentSearch( LdapSession session, SearchRequest req,
PersistentSearchControl psearchControl ) throws Exception
{
/*
@@ -172,7 +172,7 @@ public class SearchHandler extends LdapR
/**
* {@inheritDoc}
*/
- public final void handle( LdapSession session, InternalSearchRequest req ) throws Exception
+ public final void handle( LdapSession session, SearchRequest req ) throws Exception
{
LOG.debug( "Handling single reply request: {}", req );
@@ -220,7 +220,7 @@ public class SearchHandler extends LdapR
* @param req the search request on the RootDSE
* @throws Exception if failures are encountered while searching
*/
- private void handleRootDseSearch( LdapSession session, InternalSearchRequest req ) throws Exception
+ private void handleRootDseSearch( LdapSession session, SearchRequest req ) throws Exception
{
EntryFilteringCursor cursor = null;
@@ -275,11 +275,11 @@ public class SearchHandler extends LdapR
* the Cursor when either server mandated or request mandated time limits
* are reached.
*
- * @param req the {@link InternalSearchRequest} issued
+ * @param req the {@link SearchRequest} issued
* @param session the {@link LdapSession} on which search was requested
* @param cursor the {@link EntryFilteringCursor} over the search results
*/
- private void setTimeLimitsOnCursor( InternalSearchRequest req, LdapSession session,
+ private void setTimeLimitsOnCursor( SearchRequest req, LdapSession session,
final EntryFilteringCursor cursor )
{
// Don't bother setting time limits for administrators
@@ -332,7 +332,7 @@ public class SearchHandler extends LdapR
/**
* Return the server size limit
*/
- private long getServerSizeLimit( LdapSession session, InternalSearchRequest request )
+ private long getServerSizeLimit( LdapSession session, SearchRequest request )
{
if ( session.getCoreSession().isAnAdministrator() )
{
@@ -359,7 +359,7 @@ public class SearchHandler extends LdapR
}
- private void readResults( LdapSession session, InternalSearchRequest req, LdapResult ldapResult,
+ private void readResults( LdapSession session, SearchRequest req, LdapResult ldapResult,
EntryFilteringCursor cursor, long sizeLimit ) throws Exception
{
long count = 0;
@@ -402,7 +402,7 @@ public class SearchHandler extends LdapR
}
- private void readPagedResults( LdapSession session, InternalSearchRequest req, LdapResult ldapResult,
+ private void readPagedResults( LdapSession session, SearchRequest req, LdapResult ldapResult,
EntryFilteringCursor cursor, long sizeLimit, int pagedLimit, PagedSearchContext pagedContext,
PagedResultsControl pagedResultsControl ) throws Exception
{
@@ -500,7 +500,7 @@ public class SearchHandler extends LdapR
* Manage the abandoned Paged Search (when paged size = 0). We have to
* remove the cookie and its associated cursor from the session.
*/
- private SearchResultDone abandonPagedSearch( LdapSession session, InternalSearchRequest req ) throws Exception
+ private SearchResultDone abandonPagedSearch( LdapSession session, SearchRequest req ) throws Exception
{
PagedResultsControl pagedResultsControl = null;
PagedResultsControl pagedSearchControl = ( PagedResultsControl ) req.getControls().get(
@@ -561,7 +561,7 @@ public class SearchHandler extends LdapR
/**
* Handle a Paged Search request.
*/
- private SearchResultDone doPagedSearch( LdapSession session, InternalSearchRequest req, PagedResultsControl control )
+ private SearchResultDone doPagedSearch( LdapSession session, SearchRequest req, PagedResultsControl control )
throws Exception
{
PagedResultsControl pagedSearchControl = control;
@@ -755,7 +755,7 @@ public class SearchHandler extends LdapR
* @return the result done
* @throws Exception if there are failures while processing the request
*/
- private SearchResultDone doSimpleSearch( LdapSession session, InternalSearchRequest req ) throws Exception
+ private SearchResultDone doSimpleSearch( LdapSession session, SearchRequest req ) throws Exception
{
LdapResult ldapResult = req.getResultResponse().getLdapResult();
@@ -826,7 +826,7 @@ public class SearchHandler extends LdapR
* @return the response for the entry
* @throws Exception if there are problems in generating the response
*/
- private Response generateResponse( LdapSession session, InternalSearchRequest req, Entry entry ) throws Exception
+ private Response generateResponse( LdapSession session, SearchRequest req, Entry entry ) throws Exception
{
EntryAttribute ref = ( ( ClonedServerEntry ) entry ).getOriginalEntry().get( SchemaConstants.REF_AT );
boolean hasManageDsaItControl = req.getControls().containsKey( ManageDsaITControl.CONTROL_OID );
@@ -916,7 +916,7 @@ public class SearchHandler extends LdapR
* @param req the request to get the original filter from
* @throws Exception if there are schema access problems
*/
- private void modifyFilter( LdapSession session, InternalSearchRequest req ) throws Exception
+ private void modifyFilter( LdapSession session, SearchRequest req ) throws Exception
{
if ( req.hasControl( ManageDsaITControl.CONTROL_OID ) )
{
@@ -981,7 +981,7 @@ public class SearchHandler extends LdapR
* @param session the associated session
* @param req the received SearchRequest
*/
- private void handleIgnoringReferrals( LdapSession session, InternalSearchRequest req )
+ private void handleIgnoringReferrals( LdapSession session, SearchRequest req )
{
if ( IS_DEBUG )
{
@@ -1085,7 +1085,7 @@ public class SearchHandler extends LdapR
/**
* Handles processing with referrals without ManageDsaIT control.
*/
- private void handleWithReferrals( LdapSession session, InternalSearchRequest req ) throws LdapException
+ private void handleWithReferrals( LdapSession session, SearchRequest req ) throws LdapException
{
LdapResult result = req.getResultResponse().getLdapResult();
Entry entry = null;
@@ -1199,7 +1199,7 @@ public class SearchHandler extends LdapR
// if we get here then we have a valid referral ancestor
try
{
- InternalReferral referral = getReferralOnAncestorForSearch( session, req,
+ Referral referral = getReferralOnAncestorForSearch( session, req,
( ( ClonedServerEntry ) referralAncestor ) );
result.setResultCode( ResultCodeEnum.REFERRAL );
@@ -1225,7 +1225,7 @@ public class SearchHandler extends LdapR
* @param req the request
* @param entry the entry associated with the request
*/
- private void handleReferralEntryForSearch( LdapSession session, InternalSearchRequest req, ClonedServerEntry entry )
+ private void handleReferralEntryForSearch( LdapSession session, SearchRequest req, ClonedServerEntry entry )
throws Exception
{
LdapResult result = req.getResultResponse().getLdapResult();
@@ -1283,7 +1283,7 @@ public class SearchHandler extends LdapR
* @param req the request issued
* @return true if the search is on the RootDSE false otherwise
*/
- private boolean isRootDSESearch( InternalSearchRequest req )
+ private boolean isRootDSESearch( SearchRequest req )
{
boolean isBaseIsRoot = req.getBase().isEmpty();
boolean isBaseScope = req.getScope() == SearchScope.OBJECT;
@@ -1333,7 +1333,7 @@ public class SearchHandler extends LdapR
*
* @throws Exception the exception
*/
- private boolean isSubSchemaSubEntrySearch( LdapSession session, InternalSearchRequest req ) throws Exception
+ private boolean isSubSchemaSubEntrySearch( LdapSession session, SearchRequest req ) throws Exception
{
DN base = req.getBase();
String baseNormForm = ( base.isNormalized() ? base.getNormName() : base.getNormName() );
@@ -1356,13 +1356,13 @@ public class SearchHandler extends LdapR
* @param referralAncestor the farthest referral ancestor of the missing
* entry
*/
- public InternalReferral getReferralOnAncestorForSearch( LdapSession session, InternalSearchRequest req,
+ public Referral getReferralOnAncestorForSearch( LdapSession session, SearchRequest req,
ClonedServerEntry referralAncestor ) throws Exception
{
LOG.debug( "Inside getReferralOnAncestor()" );
EntryAttribute refAttr = referralAncestor.getOriginalEntry().get( SchemaConstants.REF_AT );
- InternalReferral referral = new ReferralImpl();
+ Referral referral = new ReferralImpl();
for ( Value<?> value : refAttr )
{
@@ -1437,13 +1437,13 @@ public class SearchHandler extends LdapR
* @param referralAncestor the farthest referral ancestor of the missing
* entry
*/
- public InternalReferral getReferralOnAncestor( LdapSession session, DN reqTargetDn, InternalSearchRequest req,
+ public Referral getReferralOnAncestor( LdapSession session, DN reqTargetDn, SearchRequest req,
ClonedServerEntry referralAncestor ) throws Exception
{
LOG.debug( "Inside getReferralOnAncestor()" );
EntryAttribute refAttr = referralAncestor.getOriginalEntry().get( SchemaConstants.REF_AT );
- InternalReferral referral = new ReferralImpl();
+ Referral referral = new ReferralImpl();
for ( Value<?> value : refAttr )
{
@@ -1529,7 +1529,7 @@ public class SearchHandler extends LdapR
/**
* Handles processing with referrals without ManageDsaIT control.
*/
- public void handleException( LdapSession session, InternalResultResponseRequest req, Exception e )
+ public void handleException( LdapSession session, ResultResponseRequest req, Exception e )
{
LdapResult result = req.getResultResponse().getLdapResult();
@@ -1662,7 +1662,7 @@ public class SearchHandler extends LdapR
* @param req the request to be handled
* @throws LdapException
*/
- public void handleSyncreplSearch( LdapSession session, InternalSearchRequest req ) throws LdapException
+ public void handleSyncreplSearch( LdapSession session, SearchRequest req ) throws LdapException
{
replicationProvider.handleSyncRequest( session, req );
}
Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/UnbindHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/UnbindHandler.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/UnbindHandler.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/UnbindHandler.java Wed Aug 18 00:27:16 2010
@@ -22,7 +22,7 @@ package org.apache.directory.server.ldap
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.server.ldap.LdapSession;
-import org.apache.directory.shared.ldap.message.internal.InternalUnbindRequest;
+import org.apache.directory.shared.ldap.message.internal.UnbindRequest;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -30,16 +30,16 @@ import org.slf4j.LoggerFactory;
/**
* A no reply protocol handler implementation for LDAP {@link
- * org.apache.directory.shared.ldap.message.internal.InternalUnbindRequest}s.
+ * org.apache.directory.shared.ldap.message.internal.UnbindRequest}s.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class UnbindHandler extends LdapRequestHandler<InternalUnbindRequest>
+public class UnbindHandler extends LdapRequestHandler<UnbindRequest>
{
private static final Logger LOG = LoggerFactory.getLogger( UnbindHandler.class );
- public void handle( LdapSession session, InternalUnbindRequest unbindRequest ) throws Exception
+ public void handle( LdapSession session, UnbindRequest unbindRequest ) throws Exception
{
LOG.debug( "Received: {}", unbindRequest );
Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java Wed Aug 18 00:27:16 2010
@@ -44,7 +44,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.jndi.JndiUtils;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.message.internal.InternalBindRequest;
+import org.apache.directory.shared.ldap.message.internal.BindRequest;
import org.apache.directory.shared.ldap.message.internal.LdapResult;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.util.StringTools;
@@ -81,7 +81,7 @@ public abstract class AbstractSaslCallba
protected final DirectoryService directoryService;
/** The associated BindRequest */
- protected final InternalBindRequest bindRequest;
+ protected final BindRequest bindRequest;
/**
@@ -89,7 +89,7 @@ public abstract class AbstractSaslCallba
*
* @param directoryService
*/
- protected AbstractSaslCallbackHandler( DirectoryService directoryService, InternalBindRequest bindRequest )
+ protected AbstractSaslCallbackHandler( DirectoryService directoryService, BindRequest bindRequest )
{
this.directoryService = directoryService;
this.bindRequest = bindRequest;
@@ -230,7 +230,7 @@ public abstract class AbstractSaslCallba
* @param env An environment to be used to acquire an {@link LdapContext}.
* @return An {@link LdapContext} for the client.
*/
- protected LdapContext getContext( IoSession session, InternalBindRequest bindRequest, Hashtable<String, Object> env )
+ protected LdapContext getContext( IoSession session, BindRequest bindRequest, Hashtable<String, Object> env )
{
LdapResult result = bindRequest.getResultResponse().getLdapResult();
Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslServer.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslServer.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslServer.java Wed Aug 18 00:27:16 2010
@@ -24,7 +24,7 @@ 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.internal.InternalBindRequest;
+import org.apache.directory.shared.ldap.message.internal.BindRequest;
import org.apache.directory.shared.ldap.util.StringTools;
@@ -37,7 +37,7 @@ import org.apache.directory.shared.ldap.
public abstract class AbstractSaslServer implements SaslServer
{
/** The associated BindRequest */
- private final InternalBindRequest bindRequest;
+ private final BindRequest bindRequest;
/** The associated LdapSession instance */
private final LdapSession ldapSession;
@@ -46,7 +46,7 @@ public abstract class AbstractSaslServer
private CoreSession adminSession;
- public AbstractSaslServer( LdapSession ldapSession, CoreSession adminSession, InternalBindRequest bindRequest )
+ public AbstractSaslServer( LdapSession ldapSession, CoreSession adminSession, BindRequest bindRequest )
{
this.bindRequest = bindRequest;
this.ldapSession = ldapSession;
@@ -79,7 +79,7 @@ public abstract class AbstractSaslServer
/**
* @return the associated BindRequest object
*/
- public InternalBindRequest getBindRequest()
+ public BindRequest getBindRequest()
{
return bindRequest;
}
Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/MechanismHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/MechanismHandler.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/MechanismHandler.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/MechanismHandler.java Wed Aug 18 00:27:16 2010
@@ -23,7 +23,7 @@ package org.apache.directory.server.ldap
import javax.security.sasl.SaslServer;
import org.apache.directory.server.ldap.LdapSession;
-import org.apache.directory.shared.ldap.message.internal.InternalBindRequest;
+import org.apache.directory.shared.ldap.message.internal.BindRequest;
/**
@@ -43,7 +43,7 @@ public interface MechanismHandler
* @return The {@link SaslServer} to use for the duration of the bound session.
* @throws Exception
*/
- public SaslServer handleMechanism( LdapSession session, InternalBindRequest bindRequest ) throws Exception;
+ public SaslServer handleMechanism( LdapSession session, BindRequest bindRequest ) throws Exception;
/**
Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java Wed Aug 18 00:27:16 2010
@@ -31,7 +31,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.exception.LdapException;
import org.apache.directory.shared.ldap.exception.LdapOperationException;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.message.internal.InternalBindRequest;
+import org.apache.directory.shared.ldap.message.internal.BindRequest;
import org.apache.directory.shared.ldap.message.internal.BindResponse;
import org.apache.directory.shared.ldap.message.internal.LdapResult;
import org.apache.directory.shared.ldap.name.DN;
@@ -51,7 +51,7 @@ public class SimpleMechanismHandler impl
private static final Logger LOG = LoggerFactory.getLogger( SimpleMechanismHandler.class );
- public SaslServer handleMechanism( LdapSession ldapSession, InternalBindRequest bindRequest ) throws Exception
+ public SaslServer handleMechanism( LdapSession ldapSession, BindRequest bindRequest ) throws Exception
{
// create a new Bind context, with a null session, as we don't have
// any context yet.
Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5CallbackHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5CallbackHandler.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5CallbackHandler.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5CallbackHandler.java Wed Aug 18 00:27:16 2010
@@ -40,7 +40,7 @@ import org.apache.directory.shared.ldap.
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.internal.InternalBindRequest;
+import org.apache.directory.shared.ldap.message.internal.BindRequest;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.AttributeTypeOptions;
@@ -69,7 +69,7 @@ public class CramMd5CallbackHandler exte
* @param bindRequest the bind message
* @param directoryService the directory service core
*/
- public CramMd5CallbackHandler( LdapSession ldapSession, CoreSession adminSession, InternalBindRequest bindRequest )
+ public CramMd5CallbackHandler( LdapSession ldapSession, CoreSession adminSession, BindRequest bindRequest )
{
super( adminSession.getDirectoryService(), bindRequest );
this.ldapSession = ldapSession;
Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5MechanismHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5MechanismHandler.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5MechanismHandler.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5MechanismHandler.java Wed Aug 18 00:27:16 2010
@@ -32,7 +32,7 @@ import org.apache.directory.server.ldap.
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.internal.InternalBindRequest;
+import org.apache.directory.shared.ldap.message.internal.BindRequest;
/**
@@ -42,7 +42,7 @@ import org.apache.directory.shared.ldap.
*/
public class CramMd5MechanismHandler extends AbstractMechanismHandler
{
- public SaslServer handleMechanism( LdapSession ldapSession, InternalBindRequest bindRequest ) throws Exception
+ public SaslServer handleMechanism( LdapSession ldapSession, BindRequest bindRequest ) throws Exception
{
SaslServer ss = (SaslServer)ldapSession.getSaslProperty( SaslConstants.SASL_SERVER );
Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5CallbackHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5CallbackHandler.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5CallbackHandler.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5CallbackHandler.java Wed Aug 18 00:27:16 2010
@@ -40,7 +40,7 @@ import org.apache.directory.shared.ldap.
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.internal.InternalBindRequest;
+import org.apache.directory.shared.ldap.message.internal.BindRequest;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.AttributeTypeOptions;
@@ -70,7 +70,7 @@ public class DigestMd5CallbackHandler ex
* @param bindRequest the bind message
* @param directoryService the directory service core
*/
- public DigestMd5CallbackHandler( LdapSession ldapSession, CoreSession adminSession, InternalBindRequest bindRequest )
+ public DigestMd5CallbackHandler( LdapSession ldapSession, CoreSession adminSession, BindRequest bindRequest )
{
super( adminSession.getDirectoryService(), bindRequest );
this.ldapSession = ldapSession;
Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5MechanismHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5MechanismHandler.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5MechanismHandler.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5MechanismHandler.java Wed Aug 18 00:27:16 2010
@@ -33,7 +33,7 @@ import org.apache.directory.server.ldap.
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.internal.InternalBindRequest;
+import org.apache.directory.shared.ldap.message.internal.BindRequest;
/**
@@ -73,7 +73,7 @@ public class DigestMd5MechanismHandler e
- public SaslServer handleMechanism( LdapSession ldapSession, InternalBindRequest bindRequest ) throws Exception
+ public SaslServer handleMechanism( LdapSession ldapSession, BindRequest bindRequest ) throws Exception
{
SaslServer ss = (SaslServer)ldapSession.getSaslProperty( SaslConstants.SASL_SERVER );
Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiCallbackHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiCallbackHandler.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiCallbackHandler.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiCallbackHandler.java Wed Aug 18 00:27:16 2010
@@ -33,7 +33,7 @@ import org.apache.directory.server.ldap.
import org.apache.directory.server.ldap.handlers.bind.SaslConstants;
import org.apache.directory.shared.ldap.constants.AuthenticationLevel;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
-import org.apache.directory.shared.ldap.message.internal.InternalBindRequest;
+import org.apache.directory.shared.ldap.message.internal.BindRequest;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.util.StringTools;
import org.slf4j.Logger;
@@ -55,7 +55,7 @@ public class GssapiCallbackHandler exten
* @param bindRequest the bind message
* @param directoryService the directory service core
*/
- public GssapiCallbackHandler( LdapSession ldapSession, CoreSession adminSession, InternalBindRequest bindRequest )
+ public GssapiCallbackHandler( LdapSession ldapSession, CoreSession adminSession, BindRequest bindRequest )
{
super( adminSession.getDirectoryService(), bindRequest );
this.ldapSession = ldapSession;
Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiMechanismHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiMechanismHandler.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiMechanismHandler.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiMechanismHandler.java Wed Aug 18 00:27:16 2010
@@ -43,7 +43,7 @@ import org.apache.directory.server.ldap.
import org.apache.directory.server.ldap.handlers.bind.SaslConstants;
import org.apache.directory.server.protocol.shared.ServiceConfigurationException;
import org.apache.directory.shared.ldap.constants.SupportedSaslMechanisms;
-import org.apache.directory.shared.ldap.message.internal.InternalBindRequest;
+import org.apache.directory.shared.ldap.message.internal.BindRequest;
import org.apache.directory.shared.ldap.name.DN;
@@ -54,7 +54,7 @@ import org.apache.directory.shared.ldap.
*/
public class GssapiMechanismHandler extends AbstractMechanismHandler
{
- public SaslServer handleMechanism( LdapSession ldapSession, InternalBindRequest bindRequest ) throws Exception
+ public SaslServer handleMechanism( LdapSession ldapSession, BindRequest bindRequest ) throws Exception
{
SaslServer ss = ( SaslServer ) ldapSession.getSaslProperty( SaslConstants.SASL_SERVER );
Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmMechanismHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmMechanismHandler.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmMechanismHandler.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmMechanismHandler.java Wed Aug 18 00:27:16 2010
@@ -25,7 +25,7 @@ import javax.security.sasl.SaslServer;
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.internal.InternalBindRequest;
+import org.apache.directory.shared.ldap.message.internal.BindRequest;
/**
@@ -53,7 +53,7 @@ public class NtlmMechanismHandler extend
}
- public SaslServer handleMechanism( LdapSession ldapSession, InternalBindRequest bindRequest ) throws Exception
+ public SaslServer handleMechanism( LdapSession ldapSession, BindRequest bindRequest ) throws Exception
{
SaslServer ss = ( SaslServer ) ldapSession.getSaslProperty( SaslConstants.SASL_SERVER );
Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmSaslServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmSaslServer.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmSaslServer.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmSaslServer.java Wed Aug 18 00:27:16 2010
@@ -33,7 +33,7 @@ import org.apache.directory.server.ldap.
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.internal.InternalBindRequest;
+import org.apache.directory.shared.ldap.message.internal.BindRequest;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.util.StringTools;
@@ -55,7 +55,7 @@ public class NtlmSaslServer extends Abst
private final NtlmProvider provider;
- public NtlmSaslServer( NtlmProvider provider, InternalBindRequest bindRequest, LdapSession ldapSession )
+ public NtlmSaslServer( NtlmProvider provider, BindRequest bindRequest, LdapSession ldapSession )
{
super( ldapSession, null, bindRequest );
this.provider = provider;
Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainMechanismHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainMechanismHandler.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainMechanismHandler.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainMechanismHandler.java Wed Aug 18 00:27:16 2010
@@ -26,7 +26,7 @@ import org.apache.directory.server.core.
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.internal.InternalBindRequest;
+import org.apache.directory.shared.ldap.message.internal.BindRequest;
/**
@@ -40,7 +40,7 @@ public class PlainMechanismHandler exten
/**
* {@inheritDoc}
*/
- public SaslServer handleMechanism( LdapSession ldapSession, InternalBindRequest bindRequest ) throws Exception
+ public SaslServer handleMechanism( LdapSession ldapSession, BindRequest bindRequest ) throws Exception
{
SaslServer ss = ( SaslServer ) ldapSession.getSaslProperty( SaslConstants.SASL_SERVER );
Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainSaslServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainSaslServer.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainSaslServer.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainSaslServer.java Wed Aug 18 00:27:16 2010
@@ -28,7 +28,7 @@ import org.apache.directory.server.i18n.
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.internal.InternalBindRequest;
+import org.apache.directory.shared.ldap.message.internal.BindRequest;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.PrepareString;
import org.apache.directory.shared.ldap.util.StringTools;
@@ -88,7 +88,7 @@ public class PlainSaslServer extends Abs
* @param bindRequest The associated BindRequest object
* @param ldapSession The associated LdapSession instance
*/
- public PlainSaslServer( LdapSession ldapSession, CoreSession adminSession, InternalBindRequest bindRequest )
+ public PlainSaslServer( LdapSession ldapSession, CoreSession adminSession, BindRequest bindRequest )
{
super( ldapSession, adminSession, bindRequest );
state = NegotiationState.INITIALIZED;
Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java Wed Aug 18 00:27:16 2010
@@ -28,7 +28,7 @@ import org.apache.directory.server.ldap.
import org.apache.directory.shared.asn1.ber.tlv.Value;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.exception.LdapException;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest;
+import org.apache.directory.shared.ldap.message.internal.SearchRequest;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.schema.SchemaManager;
import org.apache.directory.shared.ldap.util.StringTools;
@@ -43,7 +43,7 @@ import org.apache.directory.shared.ldap.
public class PagedSearchContext
{
/** The previous search request */
- private InternalSearchRequest previousSearchRequest;
+ private SearchRequest previousSearchRequest;
/** The current position in the cursor */
private int currentPosition;
@@ -60,7 +60,7 @@ public class PagedSearchContext
/**
* Creates a new instance of this class, storing the SearchRequest into it.
*/
- public PagedSearchContext( InternalSearchRequest searchRequest )
+ public PagedSearchContext( SearchRequest searchRequest )
{
previousSearchRequest = searchRequest;
currentPosition = 0;
@@ -110,7 +110,7 @@ public class PagedSearchContext
/**
* Build a set of OIDs from the list of attributes we have in the search request
*/
- private Set<String> buildAttributeSet( InternalSearchRequest request,
+ private Set<String> buildAttributeSet( SearchRequest request,
SchemaManager schemaManager )
{
Set<String> requestSet = new HashSet<String>();
@@ -147,7 +147,7 @@ public class PagedSearchContext
* @param request The new SearchRequest
* @return true if both request are equal.
*/
- public boolean hasSameRequest( InternalSearchRequest request, LdapSession session )
+ public boolean hasSameRequest( SearchRequest request, LdapSession session )
{
// Compares the scope
if ( request.getScope() != previousSearchRequest.getScope() )
@@ -282,7 +282,7 @@ public class PagedSearchContext
/**
* @return The previous search request
*/
- public InternalSearchRequest getPreviousSearchRequest()
+ public SearchRequest getPreviousSearchRequest()
{
return previousSearchRequest;
}
Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/CertGenerationRequestHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/CertGenerationRequestHandler.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/CertGenerationRequestHandler.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/CertGenerationRequestHandler.java Wed Aug 18 00:27:16 2010
@@ -38,7 +38,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.message.extended.CertGenerationRequest;
import org.apache.directory.shared.ldap.message.extended.CertGenerationResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalExtendedRequest;
+import org.apache.directory.shared.ldap.message.internal.ExtendedRequest;
import org.apache.directory.shared.ldap.name.DN;
@@ -73,7 +73,7 @@ public class CertGenerationRequestHandle
}
- public void handleExtendedOperation( LdapSession session, InternalExtendedRequest req ) throws Exception
+ public void handleExtendedOperation( LdapSession session, ExtendedRequest req ) throws Exception
{
ByteBuffer bb = ByteBuffer.wrap( req.getRequestValue() );
Asn1Decoder decoder = new CertGenerationDecoder();
Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/GracefulShutdownHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/GracefulShutdownHandler.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/GracefulShutdownHandler.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/GracefulShutdownHandler.java Wed Aug 18 00:27:16 2010
@@ -36,7 +36,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.extended.GracefulShutdownRequest;
import org.apache.directory.shared.ldap.message.extended.GracefulShutdownResponse;
import org.apache.directory.shared.ldap.message.extended.NoticeOfDisconnect;
-import org.apache.directory.shared.ldap.message.internal.InternalExtendedRequest;
+import org.apache.directory.shared.ldap.message.internal.ExtendedRequest;
import org.apache.mina.core.future.WriteFuture;
import org.apache.mina.core.service.IoAcceptor;
import org.apache.mina.core.session.IoSession;
@@ -69,7 +69,7 @@ public class GracefulShutdownHandler imp
}
- public void handleExtendedOperation( LdapSession requestor, InternalExtendedRequest req ) throws Exception
+ public void handleExtendedOperation( LdapSession requestor, ExtendedRequest req ) throws Exception
{
// make sue only the administrator can issue this shutdown request if
// not we respond to the requestor with with insufficientAccessRights(50)
Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StartTlsHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StartTlsHandler.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StartTlsHandler.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StartTlsHandler.java Wed Aug 18 00:27:16 2010
@@ -42,7 +42,7 @@ import org.apache.directory.server.ldap.
import org.apache.directory.server.ldap.LdapSession;
import org.apache.directory.shared.ldap.message.ExtendedResponseImpl;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.message.internal.InternalExtendedRequest;
+import org.apache.directory.shared.ldap.message.internal.ExtendedRequest;
import org.apache.directory.shared.ldap.message.internal.ExtendedResponse;
import org.apache.directory.shared.ldap.message.internal.LdapResult;
import org.apache.mina.core.filterchain.IoFilterChain;
@@ -74,7 +74,7 @@ public class StartTlsHandler implements
}
- public void handleExtendedOperation( LdapSession session, InternalExtendedRequest req ) throws Exception
+ public void handleExtendedOperation( LdapSession session, ExtendedRequest req ) throws Exception
{
LOG.info( "Handling StartTLS request." );
Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java Wed Aug 18 00:27:16 2010
@@ -46,7 +46,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.extended.StoredProcedureRequest;
import org.apache.directory.shared.ldap.message.extended.StoredProcedureResponse;
import org.apache.directory.shared.ldap.message.internal.ExtendedResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalExtendedRequest;
+import org.apache.directory.shared.ldap.message.internal.ExtendedRequest;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.sp.LdapContextParameter;
import org.apache.directory.shared.ldap.util.StringTools;
@@ -75,7 +75,7 @@ public class StoredProcedureExtendedOper
}
- public void handleExtendedOperation( LdapSession session, InternalExtendedRequest req ) throws Exception
+ public void handleExtendedOperation( LdapSession session, ExtendedRequest req ) throws Exception
{
StoredProcedure spBean = decodeBean( req.getRequestValue() );
Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicationProvider.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicationProvider.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicationProvider.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicationProvider.java Wed Aug 18 00:27:16 2010
@@ -23,7 +23,7 @@ package org.apache.directory.server.ldap
import org.apache.directory.server.ldap.LdapServer;
import org.apache.directory.server.ldap.LdapSession;
import org.apache.directory.shared.ldap.exception.LdapException;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest;
+import org.apache.directory.shared.ldap.message.internal.SearchRequest;
/**
* Interface for a replication provider.
@@ -53,5 +53,5 @@ public interface ReplicationProvider
* @param req the SearchRequest with the SyncRequest control
* @throws LdapException
*/
- void handleSyncRequest( LdapSession session, InternalSearchRequest req ) throws LdapException;
+ void handleSyncRequest( LdapSession session, SearchRequest req ) throws LdapException;
}
Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java Wed Aug 18 00:27:16 2010
@@ -74,7 +74,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.control.replication.SynchronizationModeEnum;
import org.apache.directory.shared.ldap.message.internal.BindResponse;
import org.apache.directory.shared.ldap.message.internal.IntermediateResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest;
+import org.apache.directory.shared.ldap.message.internal.SearchRequest;
import org.apache.directory.shared.ldap.message.internal.LdapResult;
import org.apache.directory.shared.ldap.message.internal.Response;
import org.apache.directory.shared.ldap.message.internal.SearchResultDone;
@@ -114,7 +114,7 @@ public class SyncReplConsumer implements
private LdapNetworkConnection connection;
/** the search request with control */
- private InternalSearchRequest searchRequest;
+ private SearchRequest searchRequest;
/** a reference to the directoryService */
private DirectoryService directoryService;
Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java Wed Aug 18 00:27:16 2010
@@ -78,7 +78,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.control.replication.SynchronizationInfoEnum;
import org.apache.directory.shared.ldap.message.control.replication.SynchronizationModeEnum;
import org.apache.directory.shared.ldap.message.internal.IntermediateResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest;
+import org.apache.directory.shared.ldap.message.internal.SearchRequest;
import org.apache.directory.shared.ldap.message.internal.LdapResult;
import org.apache.directory.shared.ldap.message.internal.Response;
import org.apache.directory.shared.ldap.message.internal.SearchResultDone;
@@ -209,7 +209,7 @@ public class SyncReplProvider implements
}
- public void handleSyncRequest( LdapSession session, InternalSearchRequest req ) throws LdapException
+ public void handleSyncRequest( LdapSession session, SearchRequest req ) throws LdapException
{
try
{
@@ -260,7 +260,7 @@ public class SyncReplProvider implements
}
- private String sendContentFromLog( LdapSession session, InternalSearchRequest req, ReplicaEventLog clientMsgLog )
+ private String sendContentFromLog( LdapSession session, SearchRequest req, ReplicaEventLog clientMsgLog )
throws Exception
{
// do the search from the log
@@ -303,7 +303,7 @@ public class SyncReplProvider implements
}
- private void doContentUpdate( LdapSession session, InternalSearchRequest req, ReplicaEventLog replicaLog )
+ private void doContentUpdate( LdapSession session, SearchRequest req, ReplicaEventLog replicaLog )
throws Exception
{
boolean refreshNPersist = isRefreshNPersist( req );
@@ -350,7 +350,7 @@ public class SyncReplProvider implements
}
- private void doInitialRefresh( LdapSession session, InternalSearchRequest req ) throws Exception
+ private void doInitialRefresh( LdapSession session, SearchRequest req ) throws Exception
{
String originalFilter = req.getFilter().toString();
@@ -460,7 +460,7 @@ public class SyncReplProvider implements
}
- private SearchResultDone doSimpleSearch( LdapSession session, InternalSearchRequest req ) throws Exception
+ private SearchResultDone doSimpleSearch( LdapSession session, SearchRequest req ) throws Exception
{
SearchResultDone searchDoneResp = ( SearchResultDone ) req.getResultResponse();
LdapResult ldapResult = searchDoneResp.getLdapResult();
@@ -511,7 +511,7 @@ public class SyncReplProvider implements
}
- private void readResults( LdapSession session, InternalSearchRequest req, LdapResult ldapResult,
+ private void readResults( LdapSession session, SearchRequest req, LdapResult ldapResult,
EntryFilteringCursor cursor, long sizeLimit ) throws Exception
{
long count = 0;
@@ -555,7 +555,7 @@ public class SyncReplProvider implements
}
- private void sendSearchResultEntry( LdapSession session, InternalSearchRequest req, Entry entry,
+ private void sendSearchResultEntry( LdapSession session, SearchRequest req, Entry entry,
SyncStateTypeEnum syncStateType ) throws Exception
{
@@ -579,7 +579,7 @@ public class SyncReplProvider implements
}
- private void sendSearchResultEntry( LdapSession session, InternalSearchRequest req, Entry entry,
+ private void sendSearchResultEntry( LdapSession session, SearchRequest req, Entry entry,
SyncModifyDnControl modDnControl ) throws Exception
{
@@ -597,7 +597,7 @@ public class SyncReplProvider implements
}
- private Response generateResponse( LdapSession session, InternalSearchRequest req, Entry entry ) throws Exception
+ private Response generateResponse( LdapSession session, SearchRequest req, Entry entry ) throws Exception
{
EntryAttribute ref = entry.get( SchemaConstants.REF_AT );
boolean hasManageDsaItControl = req.getControls().containsKey( ManageDsaITControl.CONTROL_OID );
@@ -671,7 +671,7 @@ public class SyncReplProvider implements
/**
* Return the server size limit
*/
- private long getServerSizeLimit( LdapSession session, InternalSearchRequest request )
+ private long getServerSizeLimit( LdapSession session, SearchRequest request )
{
if ( session.getCoreSession().isAnAdministrator() )
{
@@ -698,7 +698,7 @@ public class SyncReplProvider implements
}
- private void setTimeLimitsOnCursor( InternalSearchRequest req, LdapSession session,
+ private void setTimeLimitsOnCursor( SearchRequest req, LdapSession session,
final EntryFilteringCursor cursor )
{
// Don't bother setting time limits for administrators
@@ -748,7 +748,7 @@ public class SyncReplProvider implements
}
- public ExprNode modifyFilter( LdapSession session, InternalSearchRequest req ) throws Exception
+ public ExprNode modifyFilter( LdapSession session, SearchRequest req ) throws Exception
{
/*
* Do not add the OR'd (objectClass=referral) expression if the user
@@ -981,7 +981,7 @@ public class SyncReplProvider implements
}
- private void sendESyncRefreshRequired( LdapSession session, InternalSearchRequest req ) throws Exception
+ private void sendESyncRefreshRequired( LdapSession session, SearchRequest req ) throws Exception
{
SearchResultDone searchDoneResp = ( SearchResultDone ) req.getResultResponse();
searchDoneResp.getLdapResult().setResultCode( ResultCodeEnum.E_SYNC_REFRESH_REQUIRED );
@@ -992,7 +992,7 @@ public class SyncReplProvider implements
}
- private boolean isRefreshNPersist( InternalSearchRequest req )
+ private boolean isRefreshNPersist( SearchRequest req )
{
SyncRequestValueControl control = ( SyncRequestValueControl ) req.getControls().get(
SyncRequestValueControl.CONTROL_OID );
Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java Wed Aug 18 00:27:16 2010
@@ -39,8 +39,8 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.SearchResultEntryImpl;
import org.apache.directory.shared.ldap.message.control.replication.SyncModifyDnType;
import org.apache.directory.shared.ldap.message.control.replication.SyncStateTypeEnum;
-import org.apache.directory.shared.ldap.message.internal.InternalAbandonableRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest;
+import org.apache.directory.shared.ldap.message.internal.AbandonableRequest;
+import org.apache.directory.shared.ldap.message.internal.SearchRequest;
import org.apache.directory.shared.ldap.message.internal.SearchResultEntry;
import org.apache.directory.shared.ldap.util.StringTools;
import org.apache.mina.core.future.WriteFuture;
@@ -60,14 +60,14 @@ public class SyncReplSearchListener impl
private static final Logger LOG = LoggerFactory.getLogger( SyncReplSearchListener.class );
private LdapSession session;
- private InternalSearchRequest req;
+ private SearchRequest req;
private volatile boolean pushInRealTime;
private final ReplicaEventLog clientMsgLog;
- SyncReplSearchListener( LdapSession session, InternalSearchRequest req, ReplicaEventLog clientMsgLog,
+ SyncReplSearchListener( LdapSession session, SearchRequest req, ReplicaEventLog clientMsgLog,
boolean pushInRealTime )
{
this.pushInRealTime = pushInRealTime;
@@ -84,7 +84,7 @@ public class SyncReplSearchListener impl
}
- public void setReq( InternalSearchRequest req )
+ public void setReq( SearchRequest req )
{
this.req = req;
if ( req != null )
@@ -117,7 +117,7 @@ public class SyncReplSearchListener impl
}
- public void requestAbandoned( InternalAbandonableRequest req )
+ public void requestAbandoned( AbandonableRequest req )
{
try
{
Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/test/java/org/apache/directory/server/ldap/SettingAlternativeHandlersTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/test/java/org/apache/directory/server/ldap/SettingAlternativeHandlersTest.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/test/java/org/apache/directory/server/ldap/SettingAlternativeHandlersTest.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/test/java/org/apache/directory/server/ldap/SettingAlternativeHandlersTest.java Wed Aug 18 00:27:16 2010
@@ -35,15 +35,15 @@ import org.apache.directory.server.ldap.
import org.apache.directory.server.ldap.handlers.SearchHandler;
import org.apache.directory.server.ldap.handlers.UnbindHandler;
import org.apache.directory.shared.ldap.NotImplementedException;
-import org.apache.directory.shared.ldap.message.internal.InternalAbandonRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalAddRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalBindRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalCompareRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalDeleteRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyDnRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalUnbindRequest;
+import org.apache.directory.shared.ldap.message.internal.AbandonRequest;
+import org.apache.directory.shared.ldap.message.internal.AddRequest;
+import org.apache.directory.shared.ldap.message.internal.BindRequest;
+import org.apache.directory.shared.ldap.message.internal.CompareRequest;
+import org.apache.directory.shared.ldap.message.internal.DeleteRequest;
+import org.apache.directory.shared.ldap.message.internal.ModifyDnRequest;
+import org.apache.directory.shared.ldap.message.internal.ModifyRequest;
+import org.apache.directory.shared.ldap.message.internal.SearchRequest;
+import org.apache.directory.shared.ldap.message.internal.UnbindRequest;
import org.apache.mina.core.session.IoSession;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -108,7 +108,7 @@ public class SettingAlternativeHandlersT
public static class BogusAbandonHandler extends AbandonHandler
{
- public void abandonMessageReceived( IoSession session, InternalAbandonRequest request )
+ public void abandonMessageReceived( IoSession session, AbandonRequest request )
{
throw new NotImplementedException( "handler not implemented!" );
}
@@ -117,7 +117,7 @@ public class SettingAlternativeHandlersT
public static class BogusUnbindHandler extends UnbindHandler
{
- public void unbindMessageReceived( IoSession session, InternalUnbindRequest request )
+ public void unbindMessageReceived( IoSession session, UnbindRequest request )
{
throw new NotImplementedException( "handler not implemented!" );
}
@@ -125,7 +125,7 @@ public class SettingAlternativeHandlersT
public static class BogusAddHandler extends AddHandler
{
- public void addMessageReceived( IoSession session, InternalAddRequest request )
+ public void addMessageReceived( IoSession session, AddRequest request )
{
throw new NotImplementedException( "handler not implemented!" );
}
@@ -138,7 +138,7 @@ public class SettingAlternativeHandlersT
}
- public void bindMessageReceived( IoSession session, InternalBindRequest request )
+ public void bindMessageReceived( IoSession session, BindRequest request )
{
throw new NotImplementedException( "handler not implemented!" );
}
@@ -146,7 +146,7 @@ public class SettingAlternativeHandlersT
public static class BogusCompareHandler extends CompareHandler
{
- public void compareMessageReceived( IoSession session, InternalCompareRequest request )
+ public void compareMessageReceived( IoSession session, CompareRequest request )
{
throw new NotImplementedException( "handler not implemented!" );
}
@@ -154,7 +154,7 @@ public class SettingAlternativeHandlersT
public static class BogusDeleteHandler extends DeleteHandler
{
- public void deleteMessageReceived( IoSession session, InternalDeleteRequest request )
+ public void deleteMessageReceived( IoSession session, DeleteRequest request )
{
throw new NotImplementedException( "handler not implemented!" );
}
@@ -162,7 +162,7 @@ public class SettingAlternativeHandlersT
public static class BogusModifyDnHandler extends ModifyDnHandler
{
- public void modifyDnMessageReceived( IoSession session, InternalModifyDnRequest request )
+ public void modifyDnMessageReceived( IoSession session, ModifyDnRequest request )
{
throw new NotImplementedException( "handler not implemented!" );
}
@@ -170,7 +170,7 @@ public class SettingAlternativeHandlersT
public static class BogusModifyHandler extends ModifyHandler
{
- public void modifyMessageReceived( IoSession session, InternalModifyRequest request )
+ public void modifyMessageReceived( IoSession session, ModifyRequest request )
{
throw new NotImplementedException( "handler not implemented!" );
}
@@ -178,7 +178,7 @@ public class SettingAlternativeHandlersT
public static class BogusSearchHandler extends SearchHandler
{
- public void searchMessageReceived( IoSession session, InternalSearchRequest request )
+ public void searchMessageReceived( IoSession session, SearchRequest request )
{
throw new NotImplementedException( "handler not implemented!" );
}
Modified: directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/modify/IllegalModificationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/modify/IllegalModificationIT.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/modify/IllegalModificationIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/modify/IllegalModificationIT.java Wed Aug 18 00:27:16 2010
@@ -39,7 +39,7 @@ import org.apache.directory.server.core.
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyRequest;
+import org.apache.directory.shared.ldap.message.internal.ModifyRequest;
import org.apache.directory.shared.ldap.message.internal.ModifyResponse;
import org.apache.directory.shared.ldap.message.internal.SearchResultEntry;
import org.apache.directory.shared.ldap.name.DN;
@@ -85,7 +85,7 @@ public class IllegalModificationIT exten
{
LdapConnection con = getClientApiConnection( ldapServer );
- InternalModifyRequest modReq = new ModifyRequestImpl();
+ ModifyRequest modReq = new ModifyRequestImpl();
modReq.setName( new DN( DN ) );
modReq.add( "description", "" );
Modified: directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java Wed Aug 18 00:27:16 2010
@@ -64,7 +64,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.jndi.JndiUtils;
import org.apache.directory.shared.ldap.message.SearchRequestImpl;
import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest;
+import org.apache.directory.shared.ldap.message.internal.SearchRequest;
import org.apache.directory.shared.ldap.message.internal.Response;
import org.apache.directory.shared.ldap.name.DN;
import org.junit.Ignore;
@@ -1654,7 +1654,7 @@ public class SearchIT extends AbstractLd
{
long sizeLimit = 7;
LdapConnection connection = getClientApiConnection( ldapServer );
- InternalSearchRequest req = new SearchRequestImpl();
+ SearchRequest req = new SearchRequestImpl();
req.setBase( new DN( "ou=system" ) );
req.setFilter( "(ou=*)" );
req.setScope( SearchScope.SUBTREE );
@@ -1677,7 +1677,7 @@ public class SearchIT extends AbstractLd
public void testSearchTimeLimit() throws Exception, InterruptedException
{
LdapConnection connection = getClientApiConnection( ldapServer );
- InternalSearchRequest req = new SearchRequestImpl();
+ SearchRequest req = new SearchRequestImpl();
req.setBase( new DN( "ou=schema" ) );
req.setFilter( "(objectClass=*)" );
req.setScope( SearchScope.SUBTREE );
Modified: directory/apacheds/branches/apacheds-codec-merge/server-tools/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsDialog.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-tools/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsDialog.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-tools/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsDialog.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-tools/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsDialog.java Wed Aug 18 00:27:16 2010
@@ -33,7 +33,7 @@ import javax.swing.JButton;
import org.apache.directory.server.ldap.LdapServer;
import org.apache.directory.server.ldap.LdapSession;
-import org.apache.directory.shared.ldap.message.internal.InternalAbandonableRequest;
+import org.apache.directory.shared.ldap.message.internal.AbandonableRequest;
import javax.swing.JTextArea;
import javax.swing.event.ListSelectionEvent;
@@ -43,7 +43,7 @@ import javax.swing.event.ListSelectionLi
public class OutstandingRequestsDialog extends JDialog
{
private static final long serialVersionUID = -3777123348215825711L;
- private static final InternalAbandonableRequest[] EMPTY_REQUEST_ARRAY = new InternalAbandonableRequest[0];
+ private static final AbandonableRequest[] EMPTY_REQUEST_ARRAY = new AbandonableRequest[0];
private JPanel jContentPane;
private JPanel jPanel;
private JScrollPane jScrollPane;
@@ -165,7 +165,7 @@ public class OutstandingRequestsDialog e
if ( row > -1 )
{
jButton2.setEnabled( true );
- InternalAbandonableRequest req = ( ( OutstandingRequestsModel ) jTable.getModel() )
+ AbandonableRequest req = ( ( OutstandingRequestsModel ) jTable.getModel() )
.getAbandonableRequest( row );
jTextArea.setText( req.toString() );
jTextArea.setEnabled( true );
@@ -184,14 +184,14 @@ public class OutstandingRequestsDialog e
private void setRequestsModel()
{
- InternalAbandonableRequest[] requests;
- Map<Integer, InternalAbandonableRequest> reqsMap = session.getOutstandingRequests();
+ AbandonableRequest[] requests;
+ Map<Integer, AbandonableRequest> reqsMap = session.getOutstandingRequests();
if ( reqsMap != null )
{
- requests = new InternalAbandonableRequest[reqsMap.size()];
+ requests = new AbandonableRequest[reqsMap.size()];
//noinspection unchecked
- requests = (org.apache.directory.shared.ldap.message.internal.InternalAbandonableRequest[] ) reqsMap.values().toArray( requests );
+ requests = (org.apache.directory.shared.ldap.message.internal.AbandonableRequest[] ) reqsMap.values().toArray( requests );
}
else
{
@@ -325,7 +325,7 @@ public class OutstandingRequestsDialog e
public void actionPerformed( java.awt.event.ActionEvent e )
{
int row = jTable.getSelectedRow();
- InternalAbandonableRequest req = ( ( OutstandingRequestsModel ) jTable.getModel() )
+ AbandonableRequest req = ( ( OutstandingRequestsModel ) jTable.getModel() )
.getAbandonableRequest( row );
req.abandon();
session.abandonOutstandingRequest( req.getMessageId() );
Modified: directory/apacheds/branches/apacheds-codec-merge/server-tools/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsModel.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/server-tools/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsModel.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/server-tools/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsModel.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/server-tools/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsModel.java Wed Aug 18 00:27:16 2010
@@ -24,7 +24,7 @@ import javax.swing.event.TableModelListe
import javax.swing.table.TableModel;
import org.apache.directory.server.i18n.I18n;
-import org.apache.directory.shared.ldap.message.internal.InternalAbandonableRequest;
+import org.apache.directory.shared.ldap.message.internal.AbandonableRequest;
public class OutstandingRequestsModel implements TableModel
@@ -33,16 +33,16 @@ public class OutstandingRequestsModel im
{ "messageId", "type" };
final Class<?>[] columnClasses = new Class[]
{ Integer.class, String.class };
- final InternalAbandonableRequest[] requests;
+ final AbandonableRequest[] requests;
- OutstandingRequestsModel(InternalAbandonableRequest[] requests)
+ OutstandingRequestsModel(AbandonableRequest[] requests)
{
this.requests = requests;
}
- InternalAbandonableRequest getAbandonableRequest( int row )
+ AbandonableRequest getAbandonableRequest( int row )
{
return requests[row];
}
@@ -80,7 +80,7 @@ public class OutstandingRequestsModel im
public Object getValueAt( int rowIndex, int columnIndex )
{
- InternalAbandonableRequest req = requests[rowIndex];
+ AbandonableRequest req = requests[rowIndex];
switch ( columnIndex )
{