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 [2/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/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java Wed Aug 18 00:27:16 2010
@@ -31,7 +31,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.message.internal.AddResponse;
-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.SearchResultEntry;
import org.apache.directory.shared.ldap.name.DN;
@@ -178,7 +178,7 @@ public class AutzIntegUtils
{
LdapConnection connection = getAdminConnection();
- InternalModifyRequest modReq = new ModifyRequestImpl();
+ ModifyRequest modReq = new ModifyRequestImpl();
modReq.setName( new DN( "cn=" + groupCn + ",ou=groups,ou=system" ) );
modReq.add( SchemaConstants.UNIQUE_MEMBER_AT, "uid=" + userUid + ",ou=users,ou=system" );
@@ -195,7 +195,7 @@ public class AutzIntegUtils
*/
public static void removeUserFromGroup( String userUid, String groupCn ) throws Exception
{
- InternalModifyRequest modReq = new ModifyRequestImpl();
+ ModifyRequest modReq = new ModifyRequestImpl();
modReq.setName( new DN( "cn=" + groupCn + ",ou=groups,ou=system" ) );
modReq.remove( SchemaConstants.UNIQUE_MEMBER_AT, "uid=" + userUid + ",ou=users,ou=system" );
getAdminConnection().modify( modReq );
@@ -244,7 +244,7 @@ public class AutzIntegUtils
if ( administrativeRole == null || !administrativeRole.contains( "accessControlSpecificArea" ) )
{
- InternalModifyRequest modReq = new ModifyRequestImpl();
+ ModifyRequest modReq = new ModifyRequestImpl();
modReq.setName( systemEntry.getDn() );
modReq.add( "administrativeRole", "accessControlSpecificArea" );
connection.modify( modReq );
@@ -274,7 +274,7 @@ public class AutzIntegUtils
public static void addEntryACI( DN dn, String aciItem ) throws Exception
{
// modify the entry relative to ou=system to include the aciItem
- InternalModifyRequest modReq = new ModifyRequestImpl();
+ ModifyRequest modReq = new ModifyRequestImpl();
modReq.setName( dn );
modReq.add( "entryACI", aciItem );
@@ -291,7 +291,7 @@ public class AutzIntegUtils
public static void addSubentryACI( String aciItem ) throws Exception
{
// modify the entry relative to ou=system to include the aciItem
- InternalModifyRequest modReq = new ModifyRequestImpl();
+ ModifyRequest modReq = new ModifyRequestImpl();
modReq.setName( new DN( "ou=system" ) );
modReq.add( "subentryACI", aciItem );
getAdminConnection().modify( modReq );
@@ -308,7 +308,7 @@ public class AutzIntegUtils
*/
public static void changePresciptiveACI( String cn, String aciItem ) throws Exception
{
- InternalModifyRequest modReq = new ModifyRequestImpl();
+ ModifyRequest modReq = new ModifyRequestImpl();
modReq.setName( new DN( "cn=" + cn + "," + ServerDNConstants.SYSTEM_DN ) );
modReq.replace( "prescriptiveACI", aciItem );
getAdminConnection().modify( modReq );
@@ -317,7 +317,7 @@ public class AutzIntegUtils
public static void addPrescriptiveACI( String cn, String aciItem ) throws Exception
{
- InternalModifyRequest modReq = new ModifyRequestImpl();
+ ModifyRequest modReq = new ModifyRequestImpl();
modReq.setName( new DN( "cn=" + cn + "," + ServerDNConstants.SYSTEM_DN ) );
modReq.add( "prescriptiveACI", aciItem );
getAdminConnection().modify( modReq );
Modified: directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java Wed Aug 18 00:27:16 2010
@@ -46,7 +46,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.ModificationOperation;
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.name.DN;
import org.junit.After;
@@ -119,7 +119,7 @@ public class ModifyAuthorizationIT exten
LdapConnection userConnection = getConnectionAs( userName, password );
// modify the entry as the user
- InternalModifyRequest modReq = new ModifyRequestImpl();
+ ModifyRequest modReq = new ModifyRequestImpl();
modReq.setName( entryDN );
for ( Modification modification : mods )
@@ -184,7 +184,7 @@ public class ModifyAuthorizationIT exten
DN userName = new DN( "uid=" + uid + ",ou=users,ou=system" );
// modify the entry as the user
LdapConnection userConnection = getConnectionAs( userName, password );
- InternalModifyRequest modReq = new ModifyRequestImpl();
+ ModifyRequest modReq = new ModifyRequestImpl();
modReq.setName( entryDN );
modReq.addModification( attr, modOp );
@@ -224,7 +224,7 @@ public class ModifyAuthorizationIT exten
DN userDN = new DN( "uid=" + uid + ",ou=users,ou=system" );
LdapConnection connection = getConnectionAs( userDN, password );
- InternalModifyRequest modReq = new ModifyRequestImpl();
+ ModifyRequest modReq = new ModifyRequestImpl();
modReq.setName( userDN );
for ( Modification modification : mods )
Modified: directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java Wed Aug 18 00:27:16 2010
@@ -39,7 +39,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.exception.LdapException;
import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
-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.SearchResultEntry;
import org.apache.directory.shared.ldap.name.DN;
import org.junit.After;
@@ -290,7 +290,7 @@ public class DefaultChangeLogIT extends
assertPresent( sysRoot, "ou=test5,ou=system" );
// modify the test entry to add description and test new attr appears
- InternalModifyRequest modReq = new ModifyRequestImpl();
+ ModifyRequest modReq = new ModifyRequestImpl();
modReq.setName( entry.getDn() );
modReq.add( "description", "a desc value" );
sysRoot.modify( modReq );
Modified: directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java Wed Aug 18 00:27:16 2010
@@ -43,7 +43,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.message.internal.AddResponse;
import org.apache.directory.shared.ldap.message.internal.DeleteResponse;
-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.ModifyDnResponse;
import org.apache.directory.shared.ldap.message.internal.ModifyResponse;
import org.apache.directory.shared.ldap.message.internal.Response;
@@ -265,7 +265,7 @@ public class ExceptionServiceIT extends
{
LdapConnection connection = getAdminConnection( service );
- InternalModifyRequest modReq = new ModifyRequestImpl();
+ ModifyRequest modReq = new ModifyRequestImpl();
modReq.setName( new DN( "ou=blah,ou=system" ) );
modReq.add( SchemaConstants.OU_AT, "another-value" );
@@ -285,7 +285,7 @@ public class ExceptionServiceIT extends
{
LdapConnection connection = getAdminConnection( service );
- InternalModifyRequest modReq = new ModifyRequestImpl();
+ ModifyRequest modReq = new ModifyRequestImpl();
modReq.setName( new DN( "ou=users,ou=system" ) );
modReq.add( SchemaConstants.OU_AT, "dummyValue" );
Modified: directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java Wed Aug 18 00:27:16 2010
@@ -36,7 +36,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.Modification;
import org.apache.directory.shared.ldap.entry.ModificationOperation;
import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyRequest;
+import org.apache.directory.shared.ldap.message.internal.ModifyRequest;
import org.apache.directory.shared.ldap.name.DN;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -95,7 +95,7 @@ public class ModifyPerfIT extends Abstra
t00 = System.currentTimeMillis();
}
- InternalModifyRequest modRequest = new ModifyRequestImpl();
+ ModifyRequest modRequest = new ModifyRequestImpl();
modRequest.setName( dn );
Modification modification = new DefaultModification();
EntryAttribute attribute = new DefaultEntryAttribute( "sn" );
Modified: directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java Wed Aug 18 00:27:16 2010
@@ -67,7 +67,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.jndi.JndiUtils;
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.name.DN;
import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -129,7 +129,7 @@ public class SubschemaSubentryIT extends
{
LdapConnection conn = getAdminConnection( service );
- InternalModifyRequest modRequest = new ModifyRequestImpl();
+ ModifyRequest modRequest = new ModifyRequestImpl();
modRequest.setName( new DN( GLOBAL_SUBSCHEMA_DN ) );
modRequest.add( "attributeTypes", "( 2.5.4.58 NAME 'attributeCertificateAttribute' "
+ " DESC 'attribute certificate use ;binary' SYNTAX 1.3.6.1.4.1.1466.115.121.1.8 )" );
Modified: directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java Wed Aug 18 00:27:16 2010
@@ -60,7 +60,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.control.Control;
import org.apache.directory.shared.ldap.message.internal.AddResponse;
import org.apache.directory.shared.ldap.message.internal.DeleteResponse;
-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.Response;
import org.apache.directory.shared.ldap.message.internal.SearchResultEntry;
import org.apache.directory.shared.ldap.name.DN;
@@ -205,7 +205,7 @@ public class SubentryServiceIT extends A
private void addAdministrativeRole( LdapConnection connection, String dn, String role ) throws Exception
{
- InternalModifyRequest modifyRequest = new ModifyRequestImpl();
+ ModifyRequest modifyRequest = new ModifyRequestImpl();
modifyRequest.setName( new DN( dn ) );
modifyRequest.add( "administrativeRole", role );
connection.modify( modifyRequest );
Modified: directory/apacheds/branches/apacheds-codec-merge/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java Wed Aug 18 00:27:16 2010
@@ -58,13 +58,13 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.filter.SearchScope;
import org.apache.directory.shared.ldap.message.AliasDerefMode;
import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.message.internal.InternalAddRequest;
-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.AddRequest;
+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.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.name.RDN;
import org.apache.directory.shared.ldap.schema.AttributeType;
@@ -163,7 +163,7 @@ public class DefaultCoreSession implemen
/**
* {@inheritDoc}
*/
- public void add( InternalAddRequest addRequest ) throws LdapException
+ public void add( AddRequest addRequest ) throws LdapException
{
add( addRequest, LogChange.TRUE );
}
@@ -172,7 +172,7 @@ public class DefaultCoreSession implemen
/**
* {@inheritDoc}
*/
- public void add( InternalAddRequest addRequest, LogChange log ) throws LdapException
+ public void add( AddRequest addRequest, LogChange log ) throws LdapException
{
AddOperationContext addContext = new AddOperationContext( this, addRequest );
@@ -793,7 +793,7 @@ public class DefaultCoreSession implemen
/**
* {@inheritDoc}
*/
- public boolean compare( InternalCompareRequest compareRequest ) throws LdapException
+ public boolean compare( CompareRequest compareRequest ) throws LdapException
{
CompareOperationContext compareContext = new CompareOperationContext( this, compareRequest );
OperationManager operationManager = directoryService.getOperationManager();
@@ -816,7 +816,7 @@ public class DefaultCoreSession implemen
/**
* {@inheritDoc}
*/
- public void delete( InternalDeleteRequest deleteRequest ) throws LdapException
+ public void delete( DeleteRequest deleteRequest ) throws LdapException
{
delete( deleteRequest, LogChange.TRUE );
}
@@ -825,7 +825,7 @@ public class DefaultCoreSession implemen
/**
* {@inheritDoc}
*/
- public void delete( InternalDeleteRequest deleteRequest, LogChange log ) throws LdapException
+ public void delete( DeleteRequest deleteRequest, LogChange log ) throws LdapException
{
DeleteOperationContext deleteContext = new DeleteOperationContext( this, deleteRequest );
@@ -857,7 +857,7 @@ public class DefaultCoreSession implemen
/**
* {@inheritDoc}
*/
- public void modify( InternalModifyRequest modifyRequest ) throws LdapException
+ public void modify( ModifyRequest modifyRequest ) throws LdapException
{
modify( modifyRequest, LogChange.TRUE );
}
@@ -866,7 +866,7 @@ public class DefaultCoreSession implemen
/**
* {@inheritDoc}
*/
- public void modify( InternalModifyRequest modifyRequest, LogChange log ) throws LdapException
+ public void modify( ModifyRequest modifyRequest, LogChange log ) throws LdapException
{
ModifyOperationContext modifyContext = new ModifyOperationContext( this, modifyRequest );
@@ -891,7 +891,7 @@ public class DefaultCoreSession implemen
/**
* {@inheritDoc}
*/
- public void move( InternalModifyDnRequest modifyDnRequest ) throws LdapException
+ public void move( ModifyDnRequest modifyDnRequest ) throws LdapException
{
move( modifyDnRequest, LogChange.TRUE );
}
@@ -900,7 +900,7 @@ public class DefaultCoreSession implemen
/**
* {@inheritDoc}
*/
- public void move( InternalModifyDnRequest modifyDnRequest, LogChange log ) throws LdapException
+ public void move( ModifyDnRequest modifyDnRequest, LogChange log ) throws LdapException
{
MoveOperationContext moveContext = new MoveOperationContext( this, modifyDnRequest );
@@ -925,7 +925,7 @@ public class DefaultCoreSession implemen
/**
* {@inheritDoc}
*/
- public void moveAndRename( InternalModifyDnRequest modifyDnRequest ) throws LdapException
+ public void moveAndRename( ModifyDnRequest modifyDnRequest ) throws LdapException
{
moveAndRename( modifyDnRequest, LogChange.TRUE );
}
@@ -934,7 +934,7 @@ public class DefaultCoreSession implemen
/**
* {@inheritDoc}
*/
- public void moveAndRename( InternalModifyDnRequest modifyDnRequest, LogChange log ) throws LdapException
+ public void moveAndRename( ModifyDnRequest modifyDnRequest, LogChange log ) throws LdapException
{
MoveAndRenameOperationContext moveAndRenameContext = new MoveAndRenameOperationContext( this, modifyDnRequest );
@@ -959,7 +959,7 @@ public class DefaultCoreSession implemen
/**
* {@inheritDoc}
*/
- public void rename( InternalModifyDnRequest modifyDnRequest ) throws LdapException
+ public void rename( ModifyDnRequest modifyDnRequest ) throws LdapException
{
rename( modifyDnRequest, LogChange.TRUE );
}
@@ -968,7 +968,7 @@ public class DefaultCoreSession implemen
/**
* {@inheritDoc}
*/
- public void rename( InternalModifyDnRequest modifyDnRequest, LogChange log ) throws LdapException
+ public void rename( ModifyDnRequest modifyDnRequest, LogChange log ) throws LdapException
{
RenameOperationContext renameContext = new RenameOperationContext( this, modifyDnRequest );
@@ -990,7 +990,7 @@ public class DefaultCoreSession implemen
}
- public EntryFilteringCursor search( InternalSearchRequest searchRequest ) throws LdapException
+ public EntryFilteringCursor search( SearchRequest searchRequest ) throws LdapException
{
SearchOperationContext searchContext = new SearchOperationContext( this, searchRequest );
OperationManager operationManager = directoryService.getOperationManager();
@@ -1020,7 +1020,7 @@ public class DefaultCoreSession implemen
}
- public void unbind( InternalUnbindRequest unbindRequest )
+ public void unbind( UnbindRequest unbindRequest )
{
// TODO Auto-generated method stub
}
Modified: directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.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.SearchScope;
import org.apache.directory.shared.ldap.message.AliasDerefMode;
import org.apache.directory.shared.ldap.message.SearchRequestImpl;
-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.message.internal.SearchResultDone;
import org.apache.directory.shared.ldap.name.DN;
@@ -114,7 +114,7 @@ public class ClientAbandonRequestTest ex
connection.add( entry );
}
- InternalSearchRequest sr = new SearchRequestImpl();
+ SearchRequest sr = new SearchRequestImpl();
sr.setFilter( "(cn=*)" );
sr.setBase( new DN( "ou=system" ) );
sr.setScope( SearchScope.ONELEVEL );
Modified: directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java Wed Aug 18 00:27:16 2010
@@ -47,7 +47,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.message.internal.AddResponse;
import org.apache.directory.shared.ldap.message.internal.BindResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalAddRequest;
+import org.apache.directory.shared.ldap.message.internal.AddRequest;
import org.apache.directory.shared.ldap.message.internal.SearchResultEntry;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.util.DateUtils;
@@ -131,7 +131,7 @@ public class ClientAddRequestTest extend
entry.add( SchemaConstants.SN_AT, "testAsyncAdd_sn" );
assertFalse( session.exists( dn ) );
- InternalAddRequest addRequest = new AddRequestImpl();
+ AddRequest addRequest = new AddRequestImpl();
addRequest.setEntry( entry );
AddFuture addFuture = connection.addAsync( addRequest );
Modified: directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java Wed Aug 18 00:27:16 2010
@@ -40,7 +40,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.CompareRequestImpl;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.message.internal.CompareResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalCompareRequest;
+import org.apache.directory.shared.ldap.message.internal.CompareRequest;
import org.apache.directory.shared.ldap.name.DN;
import org.junit.After;
import org.junit.Before;
@@ -114,7 +114,7 @@ public class ClientCompareRequestTest ex
{
DN dn = new DN( "uid=admin,ou=system" );
- InternalCompareRequest compareRequest = new CompareRequestImpl();
+ CompareRequest compareRequest = new CompareRequestImpl();
compareRequest.setName( dn );
compareRequest.setAttributeId( SchemaConstants.UID_AT );
compareRequest.setAssertionValue( "admin" );
Modified: directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java Wed Aug 18 00:27:16 2010
@@ -47,7 +47,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.DeleteRequestImpl;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.message.internal.DeleteResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalDeleteRequest;
+import org.apache.directory.shared.ldap.message.internal.DeleteRequest;
import org.apache.directory.shared.ldap.name.DN;
import org.junit.After;
import org.junit.Before;
@@ -248,7 +248,7 @@ public class ClientDeleteRequestTest ext
assertTrue( session.exists( dn ) );
- InternalDeleteRequest deleteRequest = new DeleteRequestImpl();
+ DeleteRequest deleteRequest = new DeleteRequestImpl();
deleteRequest.setName( dn );
DeleteFuture deleteFuture = connection.deleteAsync( deleteRequest );
Modified: directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java Wed Aug 18 00:27:16 2010
@@ -42,7 +42,7 @@ import org.apache.directory.server.ldap.
import org.apache.directory.shared.ldap.message.ExtendedRequestImpl;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
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.junit.After;
import org.junit.Before;
@@ -108,7 +108,7 @@ public class ClientExtendedRequestTest e
@Test
public void testExtendedAsync() throws Exception
{
- InternalExtendedRequest extendedRequest = new ExtendedRequestImpl();
+ ExtendedRequest extendedRequest = new ExtendedRequestImpl();
extendedRequest.setRequestName( StartTlsRequest.OID );
ExtendedFuture extendedFuture = connection.extendedAsync( extendedRequest );
Modified: directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java Wed Aug 18 00:27:16 2010
@@ -40,7 +40,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.message.ModifyDnRequestImpl;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyDnRequest;
+import org.apache.directory.shared.ldap.message.internal.ModifyDnRequest;
import org.apache.directory.shared.ldap.message.internal.ModifyDnResponse;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.name.RDN;
@@ -147,7 +147,7 @@ public class ClientModifyDnRequestTest e
DN oldDn = new DN( dn );
DN newDn = new DN( "cn=modifyDnWithString,ou=system" );
- InternalModifyDnRequest modDnReq = new ModifyDnRequestImpl();
+ ModifyDnRequest modDnReq = new ModifyDnRequestImpl();
modDnReq.setName( oldDn );
modDnReq.setNewRdn( new RDN( "cn=modifyDnWithString" ) );
modDnReq.setDeleteOldRdn( true );
Modified: directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java Wed Aug 18 00:27:16 2010
@@ -46,7 +46,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.ModificationOperation;
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;
@@ -110,7 +110,7 @@ public class ClientModifyRequestTest ext
DN dn = new DN( "uid=admin,ou=system" );
String expected = String.valueOf( System.currentTimeMillis() );
- InternalModifyRequest modRequest = new ModifyRequestImpl();
+ ModifyRequest modRequest = new ModifyRequestImpl();
modRequest.setName( dn );
modRequest.replace( SchemaConstants.SN_AT, expected );
@@ -167,7 +167,7 @@ public class ClientModifyRequestTest ext
assertEquals( "test", gn );
// Now, replace the givenName
- InternalModifyRequest modifyRequest = new ModifyRequestImpl();
+ ModifyRequest modifyRequest = new ModifyRequestImpl();
modifyRequest.setName( dn );
modifyRequest.replace( "givenName" );
connection.modify( modifyRequest );
@@ -184,7 +184,7 @@ public class ClientModifyRequestTest ext
DN dn = new DN( "uid=admin,ou=system" );
String expected = String.valueOf( System.currentTimeMillis() );
- InternalModifyRequest modifyRequest = new ModifyRequestImpl();
+ ModifyRequest modifyRequest = new ModifyRequestImpl();
modifyRequest.setName( dn );
modifyRequest.replace( SchemaConstants.SN_AT, expected );
@@ -222,7 +222,7 @@ public class ClientModifyRequestTest ext
{
DN dn = new DN( "uid=admin,ou=system" );
- InternalModifyRequest modifyRequest = new ModifyRequestImpl();
+ ModifyRequest modifyRequest = new ModifyRequestImpl();
modifyRequest.setName( dn );
modifyRequest.replace( SchemaConstants.ENTRY_UUID_AT, UUID.randomUUID().toString() );
@@ -249,7 +249,7 @@ public class ClientModifyRequestTest ext
String modifierName = "uid=x,ou=system";
String modifiedTime = DateUtils.getGeneralizedTime();
- InternalModifyRequest modifyRequest = new ModifyRequestImpl();
+ ModifyRequest modifyRequest = new ModifyRequestImpl();
modifyRequest.setName( dn );
modifyRequest.replace( SchemaConstants.MODIFIERS_NAME_AT, modifierName );
modifyRequest.replace( SchemaConstants.MODIFY_TIMESTAMP_AT, modifiedTime );
Modified: directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java Wed Aug 18 00:27:16 2010
@@ -45,7 +45,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.BindRequestImpl;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.message.internal.BindResponse;
-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.junit.After;
@@ -130,7 +130,7 @@ public class SimpleBindRequestTest exten
for ( ; i < nbLoop; i++ )
{
- InternalBindRequest bindRequest = new BindRequestImpl();
+ BindRequest bindRequest = new BindRequestImpl();
bindRequest.setName( new DN( "uid=admin,ou=system" ) );
bindRequest.setCredentials( "secret" );
@@ -353,7 +353,7 @@ public class SimpleBindRequestTest exten
} );
// Send another BindRequest
- InternalBindRequest bindRequest = new BindRequestImpl();
+ BindRequest bindRequest = new BindRequestImpl();
bindRequest.setName( new DN( "uid=admin,ou=system" ) );
bindRequest.setCredentials( "secret" );
Modified: directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/ClientSearchRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/ClientSearchRequestTest.java?rev=986534&r1=986533&r2=986534&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/ClientSearchRequestTest.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/ClientSearchRequestTest.java Wed Aug 18 00:27:16 2010
@@ -43,7 +43,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.AliasDerefMode;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.message.SearchRequestImpl;
-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.message.internal.SearchResultDone;
import org.apache.directory.shared.ldap.message.internal.SearchResultEntry;
@@ -200,7 +200,7 @@ public class ClientSearchRequestTest ext
@Test
public void testSearchWithDerefAlias() throws Exception
{
- InternalSearchRequest searchRequest = new SearchRequestImpl();
+ SearchRequest searchRequest = new SearchRequestImpl();
searchRequest.setBase( new DN( "ou=users,ou=system" ) );
searchRequest.setFilter( "(objectClass=*)" );
searchRequest.setScope( SearchScope.ONELEVEL );
Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/ExtendedOperationHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/ExtendedOperationHandler.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/ExtendedOperationHandler.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/ExtendedOperationHandler.java Wed Aug 18 00:27:16 2010
@@ -22,7 +22,7 @@ package org.apache.directory.server.ldap
import java.util.Set;
-import org.apache.directory.shared.ldap.message.internal.InternalExtendedRequest;
+import org.apache.directory.shared.ldap.message.internal.ExtendedRequest;
/**
@@ -58,7 +58,7 @@ public interface ExtendedOperationHandle
*
* @throws Exception if failed to handle the operation
*/
- void handleExtendedOperation( LdapSession session, InternalExtendedRequest req ) throws Exception;
+ void handleExtendedOperation( LdapSession session, ExtendedRequest req ) throws Exception;
/**
Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.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/LdapProtocolHandler.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java Wed Aug 18 00:27:16 2010
@@ -25,9 +25,9 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.message.control.Control;
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.InternalRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalResultResponseRequest;
+import org.apache.directory.shared.ldap.message.internal.ExtendedRequest;
+import org.apache.directory.shared.ldap.message.internal.Request;
+import org.apache.directory.shared.ldap.message.internal.ResultResponseRequest;
import org.apache.directory.shared.ldap.message.internal.ResultResponse;
import org.apache.mina.core.service.IoHandler;
import org.apache.mina.core.session.IoSession;
@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
* The MINA IoHandler implementation extending {@link DemuxingIoHandler} for
* the LDAP protocol. THe {@link LdapServer} creates this multiplexing
* {@link IoHandler} handler and populates it with subordinate handlers for
- * the various kinds of LDAP {@link InternalRequest} messages. This is done in the
+ * the various kinds of LDAP {@link Request} messages. This is done in the
* setXxxHandler() methods of the LdapServer where Xxxx is Add, Modify, etc.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
@@ -159,23 +159,23 @@ class LdapProtocolHandler extends Demuxi
if ( message == SslFilter.SESSION_SECURED )
{
- InternalExtendedRequest req = new ExtendedRequestImpl( 0 );
+ ExtendedRequest req = new ExtendedRequestImpl( 0 );
req.setRequestName( "1.3.6.1.4.1.1466.20037" );
req.setRequestValue( "SECURED".getBytes( "ISO-8859-1" ) );
message = req;
}
else if ( message == SslFilter.SESSION_UNSECURED )
{
- InternalExtendedRequest req = new ExtendedRequestImpl( 0 );
+ ExtendedRequest req = new ExtendedRequestImpl( 0 );
req.setRequestName( "1.3.6.1.4.1.1466.20037" );
req.setRequestValue( "UNSECURED".getBytes( "ISO-8859-1" ) );
message = req;
}
- if ( ( ( InternalRequest ) message ).getControls().size() > 0
- && message instanceof InternalResultResponseRequest )
+ if ( ( ( Request ) message ).getControls().size() > 0
+ && message instanceof ResultResponseRequest )
{
- InternalResultResponseRequest req = ( InternalResultResponseRequest ) message;
+ ResultResponseRequest req = ( ResultResponseRequest ) message;
for ( Control control : req.getControls().values() )
{
Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolUtils.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/LdapProtocolUtils.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolUtils.java Wed Aug 18 00:27:16 2010
@@ -21,7 +21,7 @@ package org.apache.directory.server.ldap
import org.apache.directory.server.core.interceptor.context.OperationContext;
-import org.apache.directory.shared.ldap.message.internal.InternalRequest;
+import org.apache.directory.shared.ldap.message.internal.Request;
import org.apache.directory.shared.ldap.message.internal.Response;
@@ -39,7 +39,7 @@ public class LdapProtocolUtils implement
* @param opContext the context to populate with request controls
* @param request the request to extract controls from
*/
- public static void setRequestControls( OperationContext opContext, InternalRequest request ) throws Exception
+ public static void setRequestControls( OperationContext opContext, Request request ) throws Exception
{
if ( request.getControls() != null )
{
Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.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/LdapServer.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java Wed Aug 18 00:27:16 2010
@@ -73,16 +73,16 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.constants.SaslQoP;
import org.apache.directory.shared.ldap.exception.LdapConfigurationException;
import org.apache.directory.shared.ldap.message.extended.NoticeOfDisconnect;
-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.InternalExtendedRequest;
-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.ExtendedRequest;
+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.directory.shared.ldap.util.StringTools;
import org.apache.mina.core.filterchain.DefaultIoFilterChainBuilder;
import org.apache.mina.core.filterchain.IoFilterChainBuilder;
@@ -182,16 +182,16 @@ public class LdapServer extends Director
private List<String> saslRealms;
/** The protocol handlers */
- private LdapRequestHandler<InternalAbandonRequest> abandonHandler;
- private LdapRequestHandler<InternalAddRequest> addHandler;
- private LdapRequestHandler<InternalBindRequest> bindHandler;
- private LdapRequestHandler<InternalCompareRequest> compareHandler;
- private LdapRequestHandler<InternalDeleteRequest> deleteHandler;
- private LdapRequestHandler<InternalExtendedRequest> extendedHandler;
- private LdapRequestHandler<InternalModifyRequest> modifyHandler;
- private LdapRequestHandler<InternalModifyDnRequest> modifyDnHandler;
- private LdapRequestHandler<InternalSearchRequest> searchHandler;
- private LdapRequestHandler<InternalUnbindRequest> unbindHandler;
+ private LdapRequestHandler<AbandonRequest> abandonHandler;
+ private LdapRequestHandler<AddRequest> addHandler;
+ private LdapRequestHandler<BindRequest> bindHandler;
+ private LdapRequestHandler<CompareRequest> compareHandler;
+ private LdapRequestHandler<DeleteRequest> deleteHandler;
+ private LdapRequestHandler<ExtendedRequest> extendedHandler;
+ private LdapRequestHandler<ModifyRequest> modifyHandler;
+ private LdapRequestHandler<ModifyDnRequest> modifyDnHandler;
+ private LdapRequestHandler<SearchRequest> searchHandler;
+ private LdapRequestHandler<UnbindRequest> unbindHandler;
/** the underlying provider codec factory */
private ProtocolCodecFactory codecFactory;
@@ -1041,7 +1041,7 @@ public class LdapServer extends Director
}
- public MessageHandler<InternalAbandonRequest> getAbandonHandler()
+ public MessageHandler<AbandonRequest> getAbandonHandler()
{
return abandonHandler;
}
@@ -1050,16 +1050,16 @@ public class LdapServer extends Director
/**
* @param abandonHandler The AbandonRequest handler
*/
- public void setAbandonHandler( LdapRequestHandler<InternalAbandonRequest> abandonHandler )
+ public void setAbandonHandler( LdapRequestHandler<AbandonRequest> abandonHandler )
{
- this.handler.removeReceivedMessageHandler( InternalAbandonRequest.class );
+ this.handler.removeReceivedMessageHandler( AbandonRequest.class );
this.abandonHandler = abandonHandler;
this.abandonHandler.setLdapServer( this );
- this.handler.addReceivedMessageHandler( InternalAbandonRequest.class, this.abandonHandler );
+ this.handler.addReceivedMessageHandler( AbandonRequest.class, this.abandonHandler );
}
- public LdapRequestHandler<InternalAddRequest> getAddHandler()
+ public LdapRequestHandler<AddRequest> getAddHandler()
{
return addHandler;
}
@@ -1068,16 +1068,16 @@ public class LdapServer extends Director
/**
* @param abandonHandler The AddRequest handler
*/
- public void setAddHandler( LdapRequestHandler<InternalAddRequest> addHandler )
+ public void setAddHandler( LdapRequestHandler<AddRequest> addHandler )
{
- this.handler.removeReceivedMessageHandler( InternalAddRequest.class );
+ this.handler.removeReceivedMessageHandler( AddRequest.class );
this.addHandler = addHandler;
this.addHandler.setLdapServer( this );
- this.handler.addReceivedMessageHandler( InternalAddRequest.class, this.addHandler );
+ this.handler.addReceivedMessageHandler( AddRequest.class, this.addHandler );
}
- public LdapRequestHandler<InternalBindRequest> getBindHandler()
+ public LdapRequestHandler<BindRequest> getBindHandler()
{
return bindHandler;
}
@@ -1086,17 +1086,17 @@ public class LdapServer extends Director
/**
* @param abandonHandler The BindRequest handler
*/
- public void setBindHandler( LdapRequestHandler<InternalBindRequest> bindHandler )
+ public void setBindHandler( LdapRequestHandler<BindRequest> bindHandler )
{
this.bindHandler = bindHandler;
this.bindHandler.setLdapServer( this );
- handler.removeReceivedMessageHandler( InternalBindRequest.class );
- handler.addReceivedMessageHandler( InternalBindRequest.class, this.bindHandler );
+ handler.removeReceivedMessageHandler( BindRequest.class );
+ handler.addReceivedMessageHandler( BindRequest.class, this.bindHandler );
}
- public LdapRequestHandler<InternalCompareRequest> getCompareHandler()
+ public LdapRequestHandler<CompareRequest> getCompareHandler()
{
return compareHandler;
}
@@ -1105,16 +1105,16 @@ public class LdapServer extends Director
/**
* @param abandonHandler The CompareRequest handler
*/
- public void setCompareHandler( LdapRequestHandler<InternalCompareRequest> compareHandler )
+ public void setCompareHandler( LdapRequestHandler<CompareRequest> compareHandler )
{
- this.handler.removeReceivedMessageHandler( InternalCompareRequest.class );
+ this.handler.removeReceivedMessageHandler( CompareRequest.class );
this.compareHandler = compareHandler;
this.compareHandler.setLdapServer( this );
- this.handler.addReceivedMessageHandler( InternalCompareRequest.class, this.compareHandler );
+ this.handler.addReceivedMessageHandler( CompareRequest.class, this.compareHandler );
}
- public LdapRequestHandler<InternalDeleteRequest> getDeleteHandler()
+ public LdapRequestHandler<DeleteRequest> getDeleteHandler()
{
return deleteHandler;
}
@@ -1123,16 +1123,16 @@ public class LdapServer extends Director
/**
* @param abandonHandler The DeleteRequest handler
*/
- public void setDeleteHandler( LdapRequestHandler<InternalDeleteRequest> deleteHandler )
+ public void setDeleteHandler( LdapRequestHandler<DeleteRequest> deleteHandler )
{
- this.handler.removeReceivedMessageHandler( InternalDeleteRequest.class );
+ this.handler.removeReceivedMessageHandler( DeleteRequest.class );
this.deleteHandler = deleteHandler;
this.deleteHandler.setLdapServer( this );
- this.handler.addReceivedMessageHandler( InternalDeleteRequest.class, this.deleteHandler );
+ this.handler.addReceivedMessageHandler( DeleteRequest.class, this.deleteHandler );
}
- public LdapRequestHandler<InternalExtendedRequest> getExtendedHandler()
+ public LdapRequestHandler<ExtendedRequest> getExtendedHandler()
{
return extendedHandler;
}
@@ -1141,16 +1141,16 @@ public class LdapServer extends Director
/**
* @param abandonHandler The ExtendedRequest handler
*/
- public void setExtendedHandler( LdapRequestHandler<InternalExtendedRequest> extendedHandler )
+ public void setExtendedHandler( LdapRequestHandler<ExtendedRequest> extendedHandler )
{
- this.handler.removeReceivedMessageHandler( InternalExtendedRequest.class );
+ this.handler.removeReceivedMessageHandler( ExtendedRequest.class );
this.extendedHandler = extendedHandler;
this.extendedHandler.setLdapServer( this );
- this.handler.addReceivedMessageHandler( InternalExtendedRequest.class, this.extendedHandler );
+ this.handler.addReceivedMessageHandler( ExtendedRequest.class, this.extendedHandler );
}
- public LdapRequestHandler<InternalModifyRequest> getModifyHandler()
+ public LdapRequestHandler<ModifyRequest> getModifyHandler()
{
return modifyHandler;
}
@@ -1159,16 +1159,16 @@ public class LdapServer extends Director
/**
* @param abandonHandler The ModifyRequest handler
*/
- public void setModifyHandler( LdapRequestHandler<InternalModifyRequest> modifyHandler )
+ public void setModifyHandler( LdapRequestHandler<ModifyRequest> modifyHandler )
{
- this.handler.removeReceivedMessageHandler( InternalModifyRequest.class );
+ this.handler.removeReceivedMessageHandler( ModifyRequest.class );
this.modifyHandler = modifyHandler;
this.modifyHandler.setLdapServer( this );
- this.handler.addReceivedMessageHandler( InternalModifyRequest.class, this.modifyHandler );
+ this.handler.addReceivedMessageHandler( ModifyRequest.class, this.modifyHandler );
}
- public LdapRequestHandler<InternalModifyDnRequest> getModifyDnHandler()
+ public LdapRequestHandler<ModifyDnRequest> getModifyDnHandler()
{
return modifyDnHandler;
}
@@ -1177,16 +1177,16 @@ public class LdapServer extends Director
/**
* @param abandonHandler The ModifyDNRequest handler
*/
- public void setModifyDnHandler( LdapRequestHandler<InternalModifyDnRequest> modifyDnHandler )
+ public void setModifyDnHandler( LdapRequestHandler<ModifyDnRequest> modifyDnHandler )
{
- this.handler.removeReceivedMessageHandler( InternalModifyDnRequest.class );
+ this.handler.removeReceivedMessageHandler( ModifyDnRequest.class );
this.modifyDnHandler = modifyDnHandler;
this.modifyDnHandler.setLdapServer( this );
- this.handler.addReceivedMessageHandler( InternalModifyDnRequest.class, this.modifyDnHandler );
+ this.handler.addReceivedMessageHandler( ModifyDnRequest.class, this.modifyDnHandler );
}
- public LdapRequestHandler<InternalSearchRequest> getSearchHandler()
+ public LdapRequestHandler<SearchRequest> getSearchHandler()
{
return searchHandler;
}
@@ -1195,16 +1195,16 @@ public class LdapServer extends Director
/**
* @param abandonHandler The SearchRequest handler
*/
- public void setSearchHandler( LdapRequestHandler<InternalSearchRequest> searchHandler )
+ public void setSearchHandler( LdapRequestHandler<SearchRequest> searchHandler )
{
- this.handler.removeReceivedMessageHandler( InternalSearchRequest.class );
+ this.handler.removeReceivedMessageHandler( SearchRequest.class );
this.searchHandler = searchHandler;
this.searchHandler.setLdapServer( this );
- this.handler.addReceivedMessageHandler( InternalSearchRequest.class, this.searchHandler );
+ this.handler.addReceivedMessageHandler( SearchRequest.class, this.searchHandler );
}
- public LdapRequestHandler<InternalUnbindRequest> getUnbindHandler()
+ public LdapRequestHandler<UnbindRequest> getUnbindHandler()
{
return unbindHandler;
}
@@ -1269,12 +1269,12 @@ public class LdapServer extends Director
/**
* @param abandonHandler The UnbindRequest handler
*/
- public void setUnbindHandler( LdapRequestHandler<InternalUnbindRequest> unbindHandler )
+ public void setUnbindHandler( LdapRequestHandler<UnbindRequest> unbindHandler )
{
- this.handler.removeReceivedMessageHandler( InternalUnbindRequest.class );
+ this.handler.removeReceivedMessageHandler( UnbindRequest.class );
this.unbindHandler = unbindHandler;
this.unbindHandler.setLdapServer( this );
- this.handler.addReceivedMessageHandler( InternalUnbindRequest.class, this.unbindHandler );
+ this.handler.addReceivedMessageHandler( UnbindRequest.class, this.unbindHandler );
}
Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapSession.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/LdapSession.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapSession.java Wed Aug 18 00:27:16 2010
@@ -32,7 +32,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.server.ldap.handlers.controls.PagedSearchContext;
import org.apache.directory.shared.ldap.message.BindStatus;
-import org.apache.directory.shared.ldap.message.internal.InternalAbandonableRequest;
+import org.apache.directory.shared.ldap.message.internal.AbandonableRequest;
import org.apache.mina.core.session.IoSession;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -53,7 +53,7 @@ public class LdapSession
private static final boolean IS_DEBUG = LOG.isDebugEnabled();
/** The list of requests we can abandon */
- private static final InternalAbandonableRequest[] EMPTY_ABANDONABLES = new InternalAbandonableRequest[0];
+ private static final AbandonableRequest[] EMPTY_ABANDONABLES = new AbandonableRequest[0];
/** A lock to protect the abandonableRequests against concurrent access */
private final String outstandingLock;
@@ -71,7 +71,7 @@ public class LdapSession
private LdapServer ldapServer;
/** A map of all the running requests */
- private Map<Integer, InternalAbandonableRequest> outstandingRequests;
+ private Map<Integer, AbandonableRequest> outstandingRequests;
/** The current Bind status */
private BindStatus bindStatus;
@@ -98,7 +98,7 @@ public class LdapSession
{
this.ioSession = ioSession;
outstandingLock = "OutstandingRequestLock: " + ioSession.toString();
- outstandingRequests = new ConcurrentHashMap<Integer, InternalAbandonableRequest>();
+ outstandingRequests = new ConcurrentHashMap<Integer, AbandonableRequest>();
bindStatus = BindStatus.ANONYMOUS;
saslProperties = new HashMap<String, Object>();
pagedSearchContexts = new ConcurrentHashMap<Integer, PagedSearchContext>();
@@ -209,9 +209,9 @@ public class LdapSession
{
synchronized ( outstandingLock )
{
- InternalAbandonableRequest[] abandonables = outstandingRequests.values().toArray( EMPTY_ABANDONABLES );
+ AbandonableRequest[] abandonables = outstandingRequests.values().toArray( EMPTY_ABANDONABLES );
- for ( InternalAbandonableRequest abandonable : abandonables )
+ for ( AbandonableRequest abandonable : abandonables )
{
abandonOutstandingRequest( abandonable.getMessageId() );
}
@@ -224,9 +224,9 @@ public class LdapSession
*
* @param messageId The request ID to abandon
*/
- public InternalAbandonableRequest abandonOutstandingRequest( int messageId )
+ public AbandonableRequest abandonOutstandingRequest( int messageId )
{
- InternalAbandonableRequest request = null;
+ AbandonableRequest request = null;
synchronized ( outstandingLock )
{
@@ -261,7 +261,7 @@ public class LdapSession
*
* @param request an outstanding request that can be abandoned
*/
- public void registerOutstandingRequest( InternalAbandonableRequest request )
+ public void registerOutstandingRequest( AbandonableRequest request )
{
synchronized( outstandingLock )
{
@@ -275,7 +275,7 @@ public class LdapSession
*
* @param request the request to unregister
*/
- public void unregisterOutstandingRequest( InternalAbandonableRequest request )
+ public void unregisterOutstandingRequest( AbandonableRequest request )
{
synchronized( outstandingLock )
{
@@ -287,7 +287,7 @@ public class LdapSession
/**
* @return A list of all the abandonable requests for this session.
*/
- public Map<Integer, InternalAbandonableRequest> getOutstandingRequests()
+ public Map<Integer, AbandonableRequest> getOutstandingRequests()
{
synchronized( outstandingLock )
{
Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/AbandonHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/AbandonHandler.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/AbandonHandler.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/AbandonHandler.java Wed Aug 18 00:27:16 2010
@@ -21,7 +21,7 @@ package org.apache.directory.server.ldap
import org.apache.directory.server.ldap.LdapSession;
-import org.apache.directory.shared.ldap.message.internal.InternalAbandonRequest;
+import org.apache.directory.shared.ldap.message.internal.AbandonRequest;
/**
@@ -29,13 +29,13 @@ import org.apache.directory.shared.ldap.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class AbandonHandler extends LdapRequestHandler<InternalAbandonRequest>
+public class AbandonHandler extends LdapRequestHandler<AbandonRequest>
{
/**
* @see org.apache.directory.server.ldap.handlers.LdapRequestHandler#
* handle(org.apache.directory.server.ldap.LdapSession, org.apache.directory.shared.ldap.message.Request)
*/
- public void handle( LdapSession session, InternalAbandonRequest request ) throws Exception
+ public void handle( LdapSession session, AbandonRequest request ) throws Exception
{
int abandonedId = request.getAbandoned();
Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/AddHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/AddHandler.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/AddHandler.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/AddHandler.java Wed Aug 18 00:27:16 2010
@@ -23,7 +23,7 @@ package org.apache.directory.server.ldap
import org.apache.directory.server.core.CoreSession;
import org.apache.directory.server.ldap.LdapSession;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.message.internal.InternalAddRequest;
+import org.apache.directory.shared.ldap.message.internal.AddRequest;
import org.apache.directory.shared.ldap.message.internal.LdapResult;
import org.slf4j.Logger;
@@ -31,11 +31,11 @@ import org.slf4j.LoggerFactory;
/**
- * An LDAP add operation {@link InternalAddRequest} handler.
+ * An LDAP add operation {@link AddRequest} handler.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class AddHandler extends LdapRequestHandler<InternalAddRequest>
+public class AddHandler extends LdapRequestHandler<AddRequest>
{
/** The logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( AddHandler.class );
@@ -44,7 +44,7 @@ public class AddHandler extends LdapRequ
/**
* {@inheritDoc}
*/
- public void handle( LdapSession session, InternalAddRequest req )
+ public void handle( LdapSession session, AddRequest 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/BindHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.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/BindHandler.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java Wed Aug 18 00:27:16 2010
@@ -44,7 +44,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.exception.LdapUnwillingToPerformException;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.message.internal.BindResponse;
-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;
@@ -53,13 +53,13 @@ import org.slf4j.LoggerFactory;
/**
- * A single reply handler for {@link InternalBindRequest}s.
+ * A single reply handler for {@link BindRequest}s.
*
* Implements server-side of RFC 2222, sections 4.2 and 4.3.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class BindHandler extends LdapRequestHandler<InternalBindRequest>
+public class BindHandler extends LdapRequestHandler<BindRequest>
{
private static final Logger LOG = LoggerFactory.getLogger( BindHandler.class );
@@ -87,7 +87,7 @@ public class BindHandler extends LdapReq
*/
// This will suppress PMD.EmptyCatchBlock warnings in this method
@SuppressWarnings("PMD.EmptyCatchBlock")
- public void handleSimpleAuth( LdapSession ldapSession, InternalBindRequest bindRequest ) throws Exception
+ public void handleSimpleAuth( LdapSession ldapSession, BindRequest bindRequest ) throws Exception
{
// if the user is already bound, we have to unbind him
if ( ldapSession.isAuthenticated() )
@@ -272,7 +272,7 @@ public class BindHandler extends LdapReq
* @param bindRequest
*/
private void generateSaslChallengeOrComplete( LdapSession ldapSession, SaslServer ss,
- InternalBindRequest bindRequest ) throws Exception
+ BindRequest bindRequest ) throws Exception
{
LdapResult result = bindRequest.getResultResponse().getLdapResult();
@@ -354,7 +354,7 @@ public class BindHandler extends LdapReq
/**
* Send back an AUTH-METH-NOT-SUPPORTED error message to the client
*/
- private void sendAuthMethNotSupported( LdapSession ldapSession, InternalBindRequest bindRequest )
+ private void sendAuthMethNotSupported( LdapSession ldapSession, BindRequest bindRequest )
{
// First, r-einit the state to Anonymous, and clear the
// saslProperty map
@@ -376,7 +376,7 @@ public class BindHandler extends LdapReq
* Send back an INVALID-CREDENTIAL error message to the user. If we have an exception
* as a third argument, then send back the associated message to the client.
*/
- private void sendInvalidCredentials( LdapSession ldapSession, InternalBindRequest bindRequest, Exception e )
+ private void sendInvalidCredentials( LdapSession ldapSession, BindRequest bindRequest, Exception e )
{
LdapResult result = bindRequest.getResultResponse().getLdapResult();
@@ -407,7 +407,7 @@ public class BindHandler extends LdapReq
/**
* Send a SUCCESS message back to the client.
*/
- private void sendBindSuccess( LdapSession ldapSession, InternalBindRequest bindRequest, byte[] tokenBytes )
+ private void sendBindSuccess( LdapSession ldapSession, BindRequest bindRequest, byte[] tokenBytes )
{
// Return the successful response
BindResponse response = ( BindResponse ) bindRequest.getResultResponse();
@@ -439,7 +439,7 @@ public class BindHandler extends LdapReq
}
- private void handleSaslAuthPending( LdapSession ldapSession, InternalBindRequest bindRequest ) throws Exception
+ private void handleSaslAuthPending( LdapSession ldapSession, BindRequest bindRequest ) throws Exception
{
// First, check that we have the same mechanism
String saslMechanism = bindRequest.getSaslMechanism();
@@ -501,7 +501,7 @@ public class BindHandler extends LdapReq
* @param message The BindRequest received
* @throws Exception If the authentication cannot be done
*/
- public void handleSaslAuth( LdapSession ldapSession, InternalBindRequest bindRequest ) throws Exception
+ public void handleSaslAuth( LdapSession ldapSession, BindRequest bindRequest ) throws Exception
{
String saslMechanism = bindRequest.getSaslMechanism();
@@ -581,7 +581,7 @@ public class BindHandler extends LdapReq
* @throws Exception If the authentication cannot be handled
*/
@Override
- public void handle( LdapSession ldapSession, InternalBindRequest bindRequest ) throws Exception
+ public void handle( LdapSession ldapSession, BindRequest bindRequest ) throws Exception
{
LOG.debug( "Received: {}", bindRequest );
Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/CompareHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/CompareHandler.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/CompareHandler.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/CompareHandler.java Wed Aug 18 00:27:16 2010
@@ -22,7 +22,7 @@ package org.apache.directory.server.ldap
import org.apache.directory.server.ldap.LdapSession;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.message.internal.InternalCompareRequest;
+import org.apache.directory.shared.ldap.message.internal.CompareRequest;
import org.apache.directory.shared.ldap.message.internal.LdapResult;
import org.slf4j.Logger;
@@ -30,11 +30,11 @@ import org.slf4j.LoggerFactory;
/**
- * A single reply handler for {@link InternalCompareRequest}s.
+ * A single reply handler for {@link CompareRequest}s.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class CompareHandler extends LdapRequestHandler<InternalCompareRequest>
+public class CompareHandler extends LdapRequestHandler<CompareRequest>
{
private static final Logger LOG = LoggerFactory.getLogger( CompareHandler.class );
@@ -45,7 +45,7 @@ public class CompareHandler extends Ldap
* org.apache.directory.shared.ldap.message.SingleReplyRequest)
*/
@Override
- public void handle( LdapSession session, InternalCompareRequest req )
+ public void handle( LdapSession session, CompareRequest req )
{
LOG.debug( "Handling compare request while ignoring referrals: {}", req );
LdapResult result = req.getResultResponse().getLdapResult();
Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/DeleteHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/DeleteHandler.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/DeleteHandler.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/DeleteHandler.java Wed Aug 18 00:27:16 2010
@@ -23,7 +23,7 @@ package org.apache.directory.server.ldap
import org.apache.directory.server.core.CoreSession;
import org.apache.directory.server.ldap.LdapSession;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.message.internal.InternalDeleteRequest;
+import org.apache.directory.shared.ldap.message.internal.DeleteRequest;
import org.apache.directory.shared.ldap.message.internal.LdapResult;
import org.slf4j.Logger;
@@ -31,11 +31,11 @@ import org.slf4j.LoggerFactory;
/**
- * A single reply handler for {@link InternalDeleteRequest}s.
+ * A single reply handler for {@link DeleteRequest}s.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class DeleteHandler extends LdapRequestHandler<InternalDeleteRequest>
+public class DeleteHandler extends LdapRequestHandler<DeleteRequest>
{
private static final Logger LOG = LoggerFactory.getLogger( DeleteHandler.class );
@@ -43,7 +43,7 @@ public class DeleteHandler extends LdapR
/**
* {@inheritDoc}
*/
- public void handle( LdapSession session, InternalDeleteRequest req )
+ public void handle( LdapSession session, DeleteRequest 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/ExtendedHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ExtendedHandler.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/ExtendedHandler.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ExtendedHandler.java Wed Aug 18 00:27:16 2010
@@ -25,18 +25,18 @@ import org.apache.directory.server.ldap.
import org.apache.directory.server.ldap.LdapSession;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
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.message.internal.LdapResult;
/**
-* A single reply handler for {@link InternalExtendedRequest}s.
+* A single reply handler for {@link ExtendedRequest}s.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public class ExtendedHandler extends LdapRequestHandler<InternalExtendedRequest>
+public class ExtendedHandler extends LdapRequestHandler<ExtendedRequest>
{
- public void handle( LdapSession session, InternalExtendedRequest req ) throws Exception
+ public void handle( LdapSession session, ExtendedRequest req ) throws Exception
{
ExtendedOperationHandler handler = getLdapServer().getExtendedOperationHandler( req.getRequestName() );
Modified: directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.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/LdapRequestHandler.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java Wed Aug 18 00:27:16 2010
@@ -33,12 +33,12 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.ReferralImpl;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.message.internal.BindResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalAbandonRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalBindRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalExtendedRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalReferral;
-import org.apache.directory.shared.ldap.message.internal.InternalRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalResultResponseRequest;
+import org.apache.directory.shared.ldap.message.internal.AbandonRequest;
+import org.apache.directory.shared.ldap.message.internal.BindRequest;
+import org.apache.directory.shared.ldap.message.internal.ExtendedRequest;
+import org.apache.directory.shared.ldap.message.internal.Referral;
+import org.apache.directory.shared.ldap.message.internal.Request;
+import org.apache.directory.shared.ldap.message.internal.ResultResponseRequest;
import org.apache.directory.shared.ldap.message.internal.LdapResult;
import org.apache.directory.shared.ldap.message.internal.ResultResponse;
import org.apache.directory.shared.ldap.name.DN;
@@ -54,7 +54,7 @@ import org.slf4j.LoggerFactory;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public abstract class LdapRequestHandler<T extends InternalRequest> implements MessageHandler<T>
+public abstract class LdapRequestHandler<T extends Request> implements MessageHandler<T>
{
/** The logger for this class */
private static final Logger LOG = LoggerFactory.getLogger( LdapRequestHandler.class );
@@ -162,10 +162,10 @@ public abstract class LdapRequestHandler
// protect against insecure conns when confidentiality is required
if ( !isConfidentialityRequirementSatisfied( session ) )
{
- if ( message instanceof InternalExtendedRequest )
+ if ( message instanceof ExtendedRequest )
{
// Reject all extended operations except StartTls
- InternalExtendedRequest req = ( InternalExtendedRequest ) message;
+ ExtendedRequest req = ( ExtendedRequest ) message;
if ( !req.getRequestName().equals( StartTlsHandler.EXTENSION_OID ) )
{
@@ -175,10 +175,10 @@ public abstract class LdapRequestHandler
// Allow StartTls extended operations to go through
}
- else if ( message instanceof InternalResultResponseRequest )
+ else if ( message instanceof ResultResponseRequest )
{
// Reject all other operations that have a result response
- rejectWithoutConfidentiality( session, ( ( InternalResultResponseRequest ) message )
+ rejectWithoutConfidentiality( session, ( ( ResultResponseRequest ) message )
.getResultResponse() );
return;
}
@@ -191,7 +191,7 @@ public abstract class LdapRequestHandler
// We should check that the server allows anonymous requests
// only if it's not a BindRequest
- if ( message instanceof InternalBindRequest )
+ if ( message instanceof BindRequest )
{
handle( ldapSession, message );
}
@@ -214,7 +214,7 @@ public abstract class LdapRequestHandler
coreSession = getLdapServer().getDirectoryService().getSession();
ldapSession.setCoreSession( coreSession );
- if ( message instanceof InternalAbandonRequest )
+ if ( message instanceof AbandonRequest )
{
return;
}
@@ -238,7 +238,7 @@ public abstract class LdapRequestHandler
/**
* 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();
@@ -289,7 +289,7 @@ public abstract class LdapRequestHandler
// Add the referrals if necessary
if ( e instanceof LdapReferralException )
{
- InternalReferral referrals = new ReferralImpl();
+ Referral referrals = new ReferralImpl();
do
{