You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2011/01/06 21:26:22 UTC
svn commit: r1056058 - in /directory/apacheds/branches/alex_refactoring:
core-api/src/main/java/org/apache/directory/server/core/
core-integ/src/test/java/org/apache/directory/server/core/authn/
core-integ/src/test/java/org/apache/directory/server/core...
Author: akarasulu
Date: Thu Jan 6 20:26:21 2011
New Revision: 1056058
URL: http://svn.apache.org/viewvc?rev=1056058&view=rev
Log:
hiding message implementations
Modified:
directory/apacheds/branches/alex_refactoring/core-api/src/main/java/org/apache/directory/server/core/EntryToResponseCursor.java
directory/apacheds/branches/alex_refactoring/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java
directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java
directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java
directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java
directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java
directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java
directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java
directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java
directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java
directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java
directory/apacheds/branches/alex_refactoring/http-directory-bridge/src/main/java/org/apache/directory/server/HttpDirectoryService.java
directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java
directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java
directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java
directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java
directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java
directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java
directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java
directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java
directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/ClientSearchRequestTest.java
directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java
directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java
directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java
directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StartTlsHandler.java
directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java
directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java
directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java
directory/apacheds/branches/alex_refactoring/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java
directory/apacheds/branches/alex_refactoring/server-integ/src/test/java/org/apache/directory/server/operations/modify/IllegalModificationIT.java
directory/apacheds/branches/alex_refactoring/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java
Modified: directory/apacheds/branches/alex_refactoring/core-api/src/main/java/org/apache/directory/server/core/EntryToResponseCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/core-api/src/main/java/org/apache/directory/server/core/EntryToResponseCursor.java?rev=1056058&r1=1056057&r2=1056058&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/core-api/src/main/java/org/apache/directory/server/core/EntryToResponseCursor.java (original)
+++ directory/apacheds/branches/alex_refactoring/core-api/src/main/java/org/apache/directory/server/core/EntryToResponseCursor.java Thu Jan 6 20:26:21 2011
@@ -31,9 +31,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.Response;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.message.SearchResultDone;
-import org.apache.directory.shared.ldap.message.SearchResultDoneImpl;
import org.apache.directory.shared.ldap.message.SearchResultEntry;
-import org.apache.directory.shared.ldap.message.SearchResultEntryImpl;
/**
@@ -119,7 +117,7 @@ public class EntryToResponseCursor imple
public Response get() throws Exception
{
ClonedServerEntry entry = ( ClonedServerEntry ) wrapped.get();
- SearchResultEntry se = new SearchResultEntryImpl( messageId );
+ SearchResultEntry se = new org.apache.directory.shared.ldap.codec.message.SearchResultEntryImpl( messageId );
se.setEntry( entry );
return se;
@@ -161,7 +159,7 @@ public class EntryToResponseCursor imple
if ( !done )
{
- searchDoneResp = new SearchResultDoneImpl( messageId );
+ searchDoneResp = new org.apache.directory.shared.ldap.codec.message.SearchResultDoneImpl( messageId );
searchDoneResp.getLdapResult().setResultCode( ResultCodeEnum.SUCCESS );
}
Modified: directory/apacheds/branches/alex_refactoring/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java?rev=1056058&r1=1056057&r2=1056058&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java (original)
+++ directory/apacheds/branches/alex_refactoring/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java Thu Jan 6 20:26:21 2011
@@ -47,38 +47,32 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.filter.SearchScope;
import org.apache.directory.shared.ldap.message.AbandonRequest;
import org.apache.directory.shared.ldap.message.AddRequest;
-import org.apache.directory.shared.ldap.message.AddRequestImpl;
+import org.apache.directory.shared.ldap.codec.message.AddRequestImpl;
import org.apache.directory.shared.ldap.message.AddResponse;
-import org.apache.directory.shared.ldap.message.AddResponseImpl;
+import org.apache.directory.shared.ldap.codec.message.AddResponseImpl;
import org.apache.directory.shared.ldap.message.AliasDerefMode;
import org.apache.directory.shared.ldap.message.BindRequest;
-import org.apache.directory.shared.ldap.message.BindRequestImpl;
import org.apache.directory.shared.ldap.message.BindResponse;
-import org.apache.directory.shared.ldap.message.BindResponseImpl;
import org.apache.directory.shared.ldap.message.CompareRequest;
-import org.apache.directory.shared.ldap.message.CompareRequestImpl;
import org.apache.directory.shared.ldap.message.CompareResponse;
-import org.apache.directory.shared.ldap.message.CompareResponseImpl;
+import org.apache.directory.shared.ldap.codec.message.CompareResponseImpl;
import org.apache.directory.shared.ldap.message.DeleteRequest;
-import org.apache.directory.shared.ldap.message.DeleteRequestImpl;
+import org.apache.directory.shared.ldap.codec.message.DeleteRequestImpl;
import org.apache.directory.shared.ldap.message.DeleteResponse;
-import org.apache.directory.shared.ldap.message.DeleteResponseImpl;
import org.apache.directory.shared.ldap.message.ExtendedRequest;
import org.apache.directory.shared.ldap.message.ExtendedResponse;
import org.apache.directory.shared.ldap.message.LdapResult;
import org.apache.directory.shared.ldap.message.Message;
import org.apache.directory.shared.ldap.message.ModifyDnRequest;
-import org.apache.directory.shared.ldap.message.ModifyDnRequestImpl;
import org.apache.directory.shared.ldap.message.ModifyDnResponse;
-import org.apache.directory.shared.ldap.message.ModifyDnResponseImpl;
+import org.apache.directory.shared.ldap.codec.message.ModifyDnResponseImpl;
import org.apache.directory.shared.ldap.message.ModifyRequest;
-import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
import org.apache.directory.shared.ldap.message.ModifyResponse;
-import org.apache.directory.shared.ldap.message.ModifyResponseImpl;
+import org.apache.directory.shared.ldap.codec.message.ModifyResponseImpl;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.message.ResultResponseRequest;
import org.apache.directory.shared.ldap.message.SearchRequest;
-import org.apache.directory.shared.ldap.message.SearchRequestImpl;
+import org.apache.directory.shared.ldap.codec.message.SearchRequestImpl;
import org.apache.directory.shared.ldap.message.control.Control;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.name.RDN;
@@ -257,7 +251,7 @@ public class LdapCoreSessionConnection i
*/
public CompareResponse compare( DN dn, String attributeName, byte[] value ) throws LdapException
{
- CompareRequest compareRequest = new CompareRequestImpl();
+ CompareRequest compareRequest = new org.apache.directory.shared.ldap.codec.message.CompareRequestImpl();
compareRequest.setName( dn );
compareRequest.setAttributeId( attributeName );
compareRequest.setAssertionValue( value );
@@ -271,7 +265,7 @@ public class LdapCoreSessionConnection i
*/
public CompareResponse compare( DN dn, String attributeName, String value ) throws LdapException
{
- CompareRequest compareRequest = new CompareRequestImpl();
+ CompareRequest compareRequest = new org.apache.directory.shared.ldap.codec.message.CompareRequestImpl();
compareRequest.setName( dn );
compareRequest.setAttributeId( attributeName );
compareRequest.setAssertionValue( value );
@@ -303,7 +297,7 @@ public class LdapCoreSessionConnection i
*/
public CompareResponse compare( DN dn, String attributeName, Value<?> value ) throws LdapException
{
- CompareRequest compareRequest = new CompareRequestImpl();
+ CompareRequest compareRequest = new org.apache.directory.shared.ldap.codec.message.CompareRequestImpl();
compareRequest.setName( dn );
compareRequest.setAttributeId( attributeName );
@@ -343,7 +337,7 @@ public class LdapCoreSessionConnection i
int newId = messageId.incrementAndGet();
- DeleteResponse resp = new DeleteResponseImpl( newId );
+ DeleteResponse resp = new org.apache.directory.shared.ldap.codec.message.DeleteResponseImpl( newId );
resp.getLdapResult().setResultCode( ResultCodeEnum.SUCCESS );
try
@@ -566,10 +560,10 @@ public class LdapCoreSessionConnection i
int newId = messageId.incrementAndGet();
- ModifyResponse resp = new ModifyResponseImpl( newId );
+ ModifyResponse resp = new org.apache.directory.shared.ldap.codec.message.ModifyResponseImpl( newId );
resp.getLdapResult().setResultCode( ResultCodeEnum.SUCCESS );
- ModifyRequest iModReq = new ModifyRequestImpl( newId );
+ ModifyRequest iModReq = new org.apache.directory.shared.ldap.codec.message.ModifyRequestImpl( newId );
try
{
@@ -616,10 +610,10 @@ public class LdapCoreSessionConnection i
}
int newId = messageId.incrementAndGet();
- ModifyResponse resp = new ModifyResponseImpl( newId );
+ ModifyResponse resp = new org.apache.directory.shared.ldap.codec.message.ModifyResponseImpl( newId );
resp.getLdapResult().setResultCode( ResultCodeEnum.SUCCESS );
- ModifyRequest iModReq = new ModifyRequestImpl( newId );
+ ModifyRequest iModReq = new org.apache.directory.shared.ldap.codec.message.ModifyRequestImpl( newId );
try
{
@@ -778,7 +772,7 @@ public class LdapCoreSessionConnection i
throw new IllegalArgumentException( msg );
}
- ModifyDnRequest iModDnReq = new ModifyDnRequestImpl();
+ ModifyDnRequest iModDnReq = new org.apache.directory.shared.ldap.codec.message.ModifyDnRequestImpl();
iModDnReq.setName( entryDn );
iModDnReq.setNewSuperior( newSuperiorDn );
@@ -828,7 +822,7 @@ public class LdapCoreSessionConnection i
throw new IllegalArgumentException( msg );
}
- ModifyDnRequest iModDnReq = new ModifyDnRequestImpl();
+ ModifyDnRequest iModDnReq = new org.apache.directory.shared.ldap.codec.message.ModifyDnRequestImpl();
iModDnReq.setName( entryDn );
iModDnReq.setNewRdn( newRdn );
iModDnReq.setDeleteOldRdn( deleteOldRdn );
@@ -933,7 +927,7 @@ public class LdapCoreSessionConnection i
ModifyDnResponse resp = new ModifyDnResponseImpl();
resp.getLdapResult().setResultCode( ResultCodeEnum.SUCCESS );
- ModifyDnRequest iModDnReq = new ModifyDnRequestImpl();
+ ModifyDnRequest iModDnReq = new org.apache.directory.shared.ldap.codec.message.ModifyDnRequestImpl();
iModDnReq.setName( entryDn );
iModDnReq.setNewRdn( newDn.getRdn() );
@@ -1126,7 +1120,7 @@ public class LdapCoreSessionConnection i
*/
public BindResponse bind() throws LdapException, IOException
{
- BindRequest bindReq = new BindRequestImpl();
+ BindRequest bindReq = new org.apache.directory.shared.ldap.codec.message.BindRequestImpl();
bindReq.setName( DN.EMPTY_DN );
bindReq.setCredentials( ( byte[] ) null );
@@ -1154,7 +1148,7 @@ public class LdapCoreSessionConnection i
OperationManager operationManager = directoryService.getOperationManager();
- BindResponse bindResp = new BindResponseImpl( newId );
+ BindResponse bindResp = new org.apache.directory.shared.ldap.codec.message.BindResponseImpl( newId );
bindResp.getLdapResult().setResultCode( ResultCodeEnum.SUCCESS );
try
@@ -1188,7 +1182,7 @@ public class LdapCoreSessionConnection i
{
byte[] credBytes = ( credentials == null ? CharConstants.EMPTY_BYTES : Strings.getBytesUtf8(credentials) );
- BindRequest bindReq = new BindRequestImpl();
+ BindRequest bindReq = new org.apache.directory.shared.ldap.codec.message.BindRequestImpl();
bindReq.setName( name );
bindReq.setCredentials( credBytes );
Modified: directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java?rev=1056058&r1=1056057&r2=1056058&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java (original)
+++ directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java Thu Jan 6 20:26:21 2011
@@ -37,7 +37,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.message.BindResponse;
import org.apache.directory.shared.ldap.message.ModifyRequest;
-import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
+import org.apache.directory.shared.ldap.codec.message.ModifyRequestImpl;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.util.Strings;
@@ -375,7 +375,7 @@ public class SimpleAuthenticationIT exte
assertTrue( entry.get( "uid" ).contains( "akarasulu" ) );
// now modify the password for akarasulu : 'secret', encrypted using MD5
- ModifyRequest modReq = new ModifyRequestImpl();
+ ModifyRequest modReq = new org.apache.directory.shared.ldap.codec.message.ModifyRequestImpl();
modReq.setName( new DN( userDn ) );
modReq.replace( "userPassword", "{MD5}Xr4ilOzQ4PCOq3aQ0qbuaQ==" );
connection.modify( modReq );
@@ -416,7 +416,7 @@ public class SimpleAuthenticationIT exte
assertTrue( entry.get( "uid" ).contains( "akarasulu" ) );
// now modify the password for akarasulu : 'secret', encrypted using SMD5
- ModifyRequest modReq = new ModifyRequestImpl();
+ ModifyRequest modReq = new org.apache.directory.shared.ldap.codec.message.ModifyRequestImpl();
modReq.setName( new DN( userDn ) );
modReq.replace( "userPassword", "{SMD5}tQ9wo/VBuKsqBtylMMCcORbnYOJFMyDJ" );
connection.modify( modReq );
@@ -456,7 +456,7 @@ public class SimpleAuthenticationIT exte
assertTrue( entry.get( "uid" ).contains( "akarasulu" ) );
// now modify the password for akarasulu : 'secret', encrypted using CRYPT
- ModifyRequest modReq = new ModifyRequestImpl();
+ ModifyRequest modReq = new org.apache.directory.shared.ldap.codec.message.ModifyRequestImpl();
modReq.setName( new DN( userDn ) );
modReq.replace( "userPassword", "{crypt}qFkH8Z1woBlXw" );
connection.modify( modReq );
Modified: directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java?rev=1056058&r1=1056057&r2=1056058&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java (original)
+++ directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java Thu Jan 6 20:26:21 2011
@@ -53,10 +53,9 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.exception.LdapException;
import org.apache.directory.shared.ldap.ldif.LdifUtils;
import org.apache.directory.shared.ldap.message.AddRequest;
-import org.apache.directory.shared.ldap.message.AddRequestImpl;
+import org.apache.directory.shared.ldap.codec.message.AddRequestImpl;
import org.apache.directory.shared.ldap.message.AddResponse;
import org.apache.directory.shared.ldap.message.ModifyRequest;
-import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
import org.apache.directory.shared.ldap.message.ModifyResponse;
import org.apache.directory.shared.ldap.message.Response;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
@@ -208,7 +207,7 @@ public class PasswordPolicyTest extends
Entry userEntry = LdifUtils.createEntry( userDn, "ObjectClass: top", "ObjectClass: person", "cn: userMinAge",
"sn: userMinAge_sn", "userPassword: 12345" );
- AddRequest addRequest = new AddRequestImpl();
+ AddRequest addRequest = new org.apache.directory.shared.ldap.codec.message.AddRequestImpl();
addRequest.setEntry( userEntry );
addRequest.addControl( PP_REQ_CTRL );
@@ -218,7 +217,7 @@ public class PasswordPolicyTest extends
PasswordPolicyResponseControl respCtrl = getPwdRespCtrl( addResp );
assertNull( respCtrl );
- ModifyRequest modReq = new ModifyRequestImpl();
+ ModifyRequest modReq = new org.apache.directory.shared.ldap.codec.message.ModifyRequestImpl();
modReq.setName( userDn );
modReq.addControl( PP_REQ_CTRL );
modReq.replace( SchemaConstants.USER_PASSWORD_AT, "123456" );
Modified: directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java?rev=1056058&r1=1056057&r2=1056058&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java (original)
+++ directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java Thu Jan 6 20:26:21 2011
@@ -40,7 +40,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.DeleteResponse;
import org.apache.directory.shared.ldap.message.ModifyDnResponse;
import org.apache.directory.shared.ldap.message.ModifyRequest;
-import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
+import org.apache.directory.shared.ldap.codec.message.ModifyRequestImpl;
import org.apache.directory.shared.ldap.message.Response;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.message.SearchResultEntry;
Modified: directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java?rev=1056058&r1=1056057&r2=1056058&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java (original)
+++ directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java Thu Jan 6 20:26:21 2011
@@ -30,7 +30,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.message.AddResponse;
import org.apache.directory.shared.ldap.message.ModifyRequest;
-import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
+import org.apache.directory.shared.ldap.codec.message.ModifyRequestImpl;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.DN;
Modified: directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java?rev=1056058&r1=1056057&r2=1056058&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java (original)
+++ directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java Thu Jan 6 20:26:21 2011
@@ -45,7 +45,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.ModifyRequest;
-import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
+import org.apache.directory.shared.ldap.codec.message.ModifyRequestImpl;
import org.apache.directory.shared.ldap.message.ModifyResponse;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.DN;
Modified: directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java?rev=1056058&r1=1056057&r2=1056058&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java (original)
+++ directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java Thu Jan 6 20:26:21 2011
@@ -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.ModifyRequest;
-import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
+import org.apache.directory.shared.ldap.codec.message.ModifyRequestImpl;
import org.apache.directory.shared.ldap.name.DN;
import org.junit.After;
import org.junit.Test;
@@ -289,7 +289,7 @@ public class DefaultChangeLogIT extends
assertPresent( sysRoot, "ou=test5,ou=system" );
// modify the test entry to add description and test new attr appears
- ModifyRequest modReq = new ModifyRequestImpl();
+ ModifyRequest modReq = new org.apache.directory.shared.ldap.codec.message.ModifyRequestImpl();
modReq.setName( entry.getDn() );
modReq.add( "description", "a desc value" );
sysRoot.modify( modReq );
@@ -311,7 +311,7 @@ public class DefaultChangeLogIT extends
// -------------------------------------------------------------------
// add the attribute again and make sure it is old value
- modReq = new ModifyRequestImpl();
+ modReq = new org.apache.directory.shared.ldap.codec.message.ModifyRequestImpl();
modReq.setName( resusitated.getDn() );
modReq.add( "description", "old value" );
sysRoot.modify( modReq );
@@ -323,7 +323,7 @@ public class DefaultChangeLogIT extends
// now tag then replace the value to "new value" and confirm
Tag t1 = service.getChangeLog().tag();
- modReq = new ModifyRequestImpl();
+ modReq = new org.apache.directory.shared.ldap.codec.message.ModifyRequestImpl();
modReq.setName( resusitated.getDn() );
modReq.replace( "description", "new value" );
sysRoot.modify( modReq );
@@ -370,14 +370,14 @@ public class DefaultChangeLogIT extends
// -------------------------------------------------------------------
// add a userPassword attribute so we can test replacing it
- modReq = new ModifyRequestImpl();
+ modReq = new org.apache.directory.shared.ldap.codec.message.ModifyRequestImpl();
modReq.setName( resusitated.getDn() );
modReq.add( "userPassword", "to be replaced" );
sysRoot.modify( modReq );
resusitated = sysRoot.lookup( "ou=test5,ou=system" );
assertPassword( resusitated, "to be replaced" );
- modReq = new ModifyRequestImpl();
+ modReq = new org.apache.directory.shared.ldap.codec.message.ModifyRequestImpl();
modReq.setName( resusitated.getDn() );
modReq.remove( "description", "old value" );
modReq.add( "seeAlso", "ou=added" );
Modified: directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java?rev=1056058&r1=1056057&r2=1056058&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java (original)
+++ directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java Thu Jan 6 20:26:21 2011
@@ -43,7 +43,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.DeleteResponse;
import org.apache.directory.shared.ldap.message.ModifyDnResponse;
import org.apache.directory.shared.ldap.message.ModifyRequest;
-import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
+import org.apache.directory.shared.ldap.codec.message.ModifyRequestImpl;
import org.apache.directory.shared.ldap.message.ModifyResponse;
import org.apache.directory.shared.ldap.message.Response;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
Modified: directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java?rev=1056058&r1=1056057&r2=1056058&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java (original)
+++ directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java Thu Jan 6 20:26:21 2011
@@ -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.ModifyRequest;
-import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
+import org.apache.directory.shared.ldap.codec.message.ModifyRequestImpl;
import org.apache.directory.shared.ldap.name.DN;
import org.junit.Test;
import org.junit.runner.RunWith;
Modified: directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java?rev=1056058&r1=1056057&r2=1056058&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java (original)
+++ directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java Thu Jan 6 20:26:21 2011
@@ -65,7 +65,6 @@ 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.ModifyRequest;
-import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
import org.apache.directory.shared.ldap.message.ModifyResponse;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.DN;
@@ -129,7 +128,7 @@ public class SubschemaSubentryIT extends
{
LdapConnection conn = getAdminConnection( service );
- ModifyRequest modRequest = new ModifyRequestImpl();
+ ModifyRequest modRequest = new org.apache.directory.shared.ldap.codec.message.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/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java?rev=1056058&r1=1056057&r2=1056058&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java (original)
+++ directory/apacheds/branches/alex_refactoring/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java Thu Jan 6 20:26:21 2011
@@ -57,7 +57,6 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.AddResponse;
import org.apache.directory.shared.ldap.message.DeleteResponse;
import org.apache.directory.shared.ldap.message.ModifyRequest;
-import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
import org.apache.directory.shared.ldap.message.Response;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.message.SearchResultEntry;
@@ -230,7 +229,7 @@ public class SubentryServiceIT extends A
private void addAdministrativeRole( LdapConnection connection, String dn, String role ) throws Exception
{
- ModifyRequest modifyRequest = new ModifyRequestImpl();
+ ModifyRequest modifyRequest = new org.apache.directory.shared.ldap.codec.message.ModifyRequestImpl();
modifyRequest.setName( new DN( dn ) );
modifyRequest.add( "administrativeRole", role );
connection.modify( modifyRequest );
Modified: directory/apacheds/branches/alex_refactoring/http-directory-bridge/src/main/java/org/apache/directory/server/HttpDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/http-directory-bridge/src/main/java/org/apache/directory/server/HttpDirectoryService.java?rev=1056058&r1=1056057&r2=1056058&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/http-directory-bridge/src/main/java/org/apache/directory/server/HttpDirectoryService.java (original)
+++ directory/apacheds/branches/alex_refactoring/http-directory-bridge/src/main/java/org/apache/directory/server/HttpDirectoryService.java Thu Jan 6 20:26:21 2011
@@ -25,7 +25,6 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.LdapCoreSessionConnection;
import org.apache.directory.shared.ldap.message.BindRequest;
import org.apache.directory.shared.ldap.message.BindResponse;
-import org.apache.directory.shared.ldap.message.BindResponseImpl;
import org.apache.directory.shared.ldap.message.LdapResult;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -84,7 +83,7 @@ public class HttpDirectoryService
}
catch ( Exception e )
{
- resp = new BindResponseImpl();
+ resp = new org.apache.directory.shared.ldap.codec.message.BindResponseImpl();
LdapResult result = resp.getLdapResult();
result.setErrorMessage( e.getMessage() );
Modified: directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java?rev=1056058&r1=1056057&r2=1056058&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java (original)
+++ directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java Thu Jan 6 20:26:21 2011
@@ -41,7 +41,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.AliasDerefMode;
import org.apache.directory.shared.ldap.message.Response;
import org.apache.directory.shared.ldap.message.SearchRequest;
-import org.apache.directory.shared.ldap.message.SearchRequestImpl;
+import org.apache.directory.shared.ldap.codec.message.SearchRequestImpl;
import org.apache.directory.shared.ldap.message.SearchResultDone;
import org.apache.directory.shared.ldap.name.DN;
import org.junit.After;
Modified: directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java?rev=1056058&r1=1056057&r2=1056058&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java (original)
+++ directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java Thu Jan 6 20:26:21 2011
@@ -44,7 +44,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.DefaultEntry;
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.message.AddRequest;
-import org.apache.directory.shared.ldap.message.AddRequestImpl;
+import org.apache.directory.shared.ldap.codec.message.AddRequestImpl;
import org.apache.directory.shared.ldap.message.AddResponse;
import org.apache.directory.shared.ldap.message.BindResponse;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
Modified: directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java?rev=1056058&r1=1056057&r2=1056058&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java (original)
+++ directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java Thu Jan 6 20:26:21 2011
@@ -38,7 +38,6 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.message.CompareRequest;
-import org.apache.directory.shared.ldap.message.CompareRequestImpl;
import org.apache.directory.shared.ldap.message.CompareResponse;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.DN;
@@ -114,7 +113,7 @@ public class ClientCompareRequestTest ex
{
DN dn = new DN( "uid=admin,ou=system" );
- CompareRequest compareRequest = new CompareRequestImpl();
+ CompareRequest compareRequest = new org.apache.directory.shared.ldap.codec.message.CompareRequestImpl();
compareRequest.setName( dn );
compareRequest.setAttributeId( SchemaConstants.UID_AT );
compareRequest.setAssertionValue( "admin" );
Modified: directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java?rev=1056058&r1=1056057&r2=1056058&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java (original)
+++ directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java Thu Jan 6 20:26:21 2011
@@ -33,7 +33,6 @@ import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.directory.ldap.client.api.LdapAsyncConnection;
import org.apache.directory.ldap.client.api.LdapNetworkConnection;
import org.apache.directory.ldap.client.api.future.DeleteFuture;
import org.apache.directory.server.annotations.CreateLdapServer;
@@ -44,7 +43,6 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.shared.ldap.exception.LdapException;
import org.apache.directory.shared.ldap.message.DeleteRequest;
-import org.apache.directory.shared.ldap.message.DeleteRequestImpl;
import org.apache.directory.shared.ldap.message.DeleteResponse;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.DN;
@@ -235,7 +233,7 @@ public class ClientDeleteRequestTest ext
assertTrue( session.exists( dn ) );
- DeleteRequest deleteRequest = new DeleteRequestImpl();
+ DeleteRequest deleteRequest = new org.apache.directory.shared.ldap.codec.message.DeleteRequestImpl();
deleteRequest.setName( dn );
DeleteFuture deleteFuture = connection.deleteAsync( deleteRequest );
Modified: directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java?rev=1056058&r1=1056057&r2=1056058&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java (original)
+++ directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java Thu Jan 6 20:26:21 2011
@@ -40,7 +40,6 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.server.ldap.handlers.extended.StartTlsHandler;
import org.apache.directory.shared.ldap.message.ExtendedRequest;
-import org.apache.directory.shared.ldap.message.ExtendedRequestImpl;
import org.apache.directory.shared.ldap.message.ExtendedResponse;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.DN;
@@ -108,7 +107,7 @@ public class ClientExtendedRequestTest e
@Test
public void testExtendedAsync() throws Exception
{
- ExtendedRequest extendedRequest = new ExtendedRequestImpl();
+ ExtendedRequest extendedRequest = new org.apache.directory.shared.ldap.codec.message.ExtendedRequestImpl();
extendedRequest.setRequestName( StartTlsRequest.OID );
ExtendedFuture extendedFuture = connection.extendedAsync( extendedRequest );
Modified: directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java?rev=1056058&r1=1056057&r2=1056058&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java (original)
+++ directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java Thu Jan 6 20:26:21 2011
@@ -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.ModifyDnRequest;
-import org.apache.directory.shared.ldap.message.ModifyDnRequestImpl;
+import org.apache.directory.shared.ldap.codec.message.ModifyDnRequestImpl;
import org.apache.directory.shared.ldap.message.ModifyDnResponse;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.name.RDN;
Modified: directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java?rev=1056058&r1=1056057&r2=1056058&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java (original)
+++ directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java Thu Jan 6 20:26:21 2011
@@ -46,7 +46,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.ModificationOperation;
import org.apache.directory.shared.ldap.message.ModifyRequest;
-import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
+import org.apache.directory.shared.ldap.codec.message.ModifyRequestImpl;
import org.apache.directory.shared.ldap.message.ModifyResponse;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.DN;
@@ -120,7 +120,7 @@ public class ClientModifyRequestTest ext
DN dn = new DN( "uid=admin,ou=system" );
String expected = String.valueOf( System.currentTimeMillis() );
- ModifyRequest modRequest = new ModifyRequestImpl();
+ ModifyRequest modRequest = new org.apache.directory.shared.ldap.codec.message.ModifyRequestImpl();
modRequest.setName( dn );
modRequest.replace( SchemaConstants.SN_AT, expected );
@@ -194,7 +194,7 @@ public class ClientModifyRequestTest ext
DN dn = new DN( "uid=admin,ou=system" );
String expected = String.valueOf( System.currentTimeMillis() );
- ModifyRequest modifyRequest = new ModifyRequestImpl();
+ ModifyRequest modifyRequest = new org.apache.directory.shared.ldap.codec.message.ModifyRequestImpl();
modifyRequest.setName( dn );
modifyRequest.replace( SchemaConstants.SN_AT, expected );
@@ -239,7 +239,7 @@ public class ClientModifyRequestTest ext
ModifyResponse modResp = connection.modify( modifyRequest );
assertEquals( ResultCodeEnum.INSUFFICIENT_ACCESS_RIGHTS, modResp.getLdapResult().getResultCode() );
- modifyRequest = new ModifyRequestImpl();
+ modifyRequest = new org.apache.directory.shared.ldap.codec.message.ModifyRequestImpl();
modifyRequest.setName( dn );
modifyRequest.replace( SchemaConstants.ENTRY_CSN_AT, new CsnFactory( 0 ).newInstance().toString() );
@@ -271,7 +271,7 @@ public class ClientModifyRequestTest ext
String modifierName = "uid=x,ou=system";
String modifiedTime = DateUtils.getGeneralizedTime();
- ModifyRequest modifyRequest = new ModifyRequestImpl();
+ ModifyRequest modifyRequest = new org.apache.directory.shared.ldap.codec.message.ModifyRequestImpl();
modifyRequest.setName( dn );
modifyRequest.replace( SchemaConstants.MODIFIERS_NAME_AT, modifierName );
modifyRequest.replace( SchemaConstants.MODIFY_TIMESTAMP_AT, modifiedTime );
Modified: directory/apacheds/branches/alex_refactoring/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/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java?rev=1056058&r1=1056057&r2=1056058&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java (original)
+++ directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java Thu Jan 6 20:26:21 2011
@@ -43,7 +43,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.interceptor.context.BindOperationContext;
import org.apache.directory.shared.ldap.exception.LdapException;
import org.apache.directory.shared.ldap.message.BindRequest;
-import org.apache.directory.shared.ldap.message.BindRequestImpl;
+import org.apache.directory.shared.ldap.codec.message.BindRequestImpl;
import org.apache.directory.shared.ldap.message.BindResponse;
import org.apache.directory.shared.ldap.message.LdapResult;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
@@ -357,7 +357,7 @@ public class SimpleBindRequestTest exten
} );
// Send another BindRequest
- BindRequest bindRequest = new BindRequestImpl();
+ BindRequest bindRequest = new org.apache.directory.shared.ldap.codec.message.BindRequestImpl();
bindRequest.setName( new DN( "uid=admin,ou=system" ) );
bindRequest.setCredentials( "secret" );
Modified: directory/apacheds/branches/alex_refactoring/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/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/ClientSearchRequestTest.java?rev=1056058&r1=1056057&r2=1056058&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/ClientSearchRequestTest.java (original)
+++ directory/apacheds/branches/alex_refactoring/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/ClientSearchRequestTest.java Thu Jan 6 20:26:21 2011
@@ -44,7 +44,6 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.Response;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.message.SearchRequest;
-import org.apache.directory.shared.ldap.message.SearchRequestImpl;
import org.apache.directory.shared.ldap.message.SearchResultDone;
import org.apache.directory.shared.ldap.message.SearchResultEntry;
import org.apache.directory.shared.ldap.name.DN;
@@ -210,7 +209,7 @@ public class ClientSearchRequestTest ext
@Test
public void testSearchWithDerefAlias() throws Exception
{
- SearchRequest searchRequest = new SearchRequestImpl();
+ SearchRequest searchRequest = new org.apache.directory.shared.ldap.codec.message.SearchRequestImpl();
searchRequest.setBase( new DN( "ou=users,ou=system" ) );
searchRequest.setFilter( "(objectClass=*)" );
searchRequest.setScope( SearchScope.ONELEVEL );
Modified: directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java?rev=1056058&r1=1056057&r2=1056058&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java (original)
+++ directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java Thu Jan 6 20:26:21 2011
@@ -22,7 +22,7 @@ package org.apache.directory.server.ldap
import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
import org.apache.directory.shared.ldap.message.ExtendedRequest;
-import org.apache.directory.shared.ldap.message.ExtendedRequestImpl;
+import org.apache.directory.shared.ldap.codec.message.ExtendedRequestImpl;
import org.apache.directory.shared.ldap.message.Request;
import org.apache.directory.shared.ldap.message.ResponseCarryingMessageException;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
@@ -202,7 +202,7 @@ class LdapProtocolHandler extends Demuxi
}
else if ( message == SslFilter.SESSION_UNSECURED )
{
- ExtendedRequest req = new ExtendedRequestImpl( 0 );
+ ExtendedRequest req = new org.apache.directory.shared.ldap.codec.message.ExtendedRequestImpl( 0 );
req.setRequestName( "1.3.6.1.4.1.1466.20037" );
req.setRequestValue( "UNSECURED".getBytes( "ISO-8859-1" ) );
message = req;
Modified: directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java?rev=1056058&r1=1056057&r2=1056058&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java (original)
+++ directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java Thu Jan 6 20:26:21 2011
@@ -30,13 +30,12 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.exception.LdapReferralException;
import org.apache.directory.shared.ldap.message.AbandonRequest;
import org.apache.directory.shared.ldap.message.BindRequest;
-import org.apache.directory.shared.ldap.message.BindRequestImpl;
+import org.apache.directory.shared.ldap.codec.message.BindRequestImpl;
import org.apache.directory.shared.ldap.message.BindResponse;
-import org.apache.directory.shared.ldap.message.BindResponseImpl;
import org.apache.directory.shared.ldap.message.ExtendedRequest;
import org.apache.directory.shared.ldap.message.LdapResult;
import org.apache.directory.shared.ldap.message.Referral;
-import org.apache.directory.shared.ldap.message.ReferralImpl;
+import org.apache.directory.shared.ldap.codec.message.ReferralImpl;
import org.apache.directory.shared.ldap.message.Request;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.message.ResultResponse;
@@ -145,7 +144,7 @@ public abstract class LdapRequestHandler
|| ldapSession.isSimpleAuthPending() )
{
LOG.error( I18n.err( I18n.ERR_732 ) );
- BindResponse bindResponse = new BindResponseImpl( message.getMessageId() );
+ BindResponse bindResponse = new org.apache.directory.shared.ldap.codec.message.BindResponseImpl( message.getMessageId() );
LdapResult bindResult = bindResponse.getLdapResult();
bindResult.setResultCode( ResultCodeEnum.UNWILLING_TO_PERFORM );
bindResult.setErrorMessage( I18n.err( I18n.ERR_732 ) );
Modified: directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java?rev=1056058&r1=1056057&r2=1056058&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java (original)
+++ directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java Thu Jan 6 20:26:21 2011
@@ -38,7 +38,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.AbandonableRequest;
import org.apache.directory.shared.ldap.message.SearchRequest;
import org.apache.directory.shared.ldap.message.SearchResultEntry;
-import org.apache.directory.shared.ldap.message.SearchResultEntryImpl;
+import org.apache.directory.shared.ldap.codec.message.SearchResultEntryImpl;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -134,7 +134,7 @@ public class PersistentSearchListener im
return;
}
- SearchResultEntry respEntry = new SearchResultEntryImpl( req.getMessageId() );
+ SearchResultEntry respEntry = new org.apache.directory.shared.ldap.codec.message.SearchResultEntryImpl( req.getMessageId() );
respEntry.setObjectName( addContext.getDn() );
respEntry.setEntry( addContext.getEntry() );
setECResponseControl( respEntry, addContext, ChangeType.ADD );
@@ -164,7 +164,7 @@ public class PersistentSearchListener im
return;
}
- SearchResultEntry respEntry = new SearchResultEntryImpl( req.getMessageId() );
+ SearchResultEntry respEntry = new org.apache.directory.shared.ldap.codec.message.SearchResultEntryImpl( req.getMessageId() );
respEntry.setObjectName( modifyContext.getDn() );
respEntry.setEntry( modifyContext.getAlteredEntry() );
setECResponseControl( respEntry, modifyContext, ChangeType.MODIFY );
@@ -179,7 +179,7 @@ public class PersistentSearchListener im
return;
}
- SearchResultEntry respEntry = new SearchResultEntryImpl( req.getMessageId() );
+ SearchResultEntry respEntry = new org.apache.directory.shared.ldap.codec.message.SearchResultEntryImpl( req.getMessageId() );
respEntry.setObjectName( moveContext.getDn() );
respEntry.setEntry( moveContext.getEntry() );
setECResponseControl( respEntry, moveContext, ChangeType.MODDN );
Modified: directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java?rev=1056058&r1=1056057&r2=1056058&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java (original)
+++ directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java Thu Jan 6 20:26:21 2011
@@ -59,16 +59,16 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.filter.SearchScope;
import org.apache.directory.shared.ldap.message.LdapResult;
import org.apache.directory.shared.ldap.message.Referral;
-import org.apache.directory.shared.ldap.message.ReferralImpl;
+import org.apache.directory.shared.ldap.codec.message.ReferralImpl;
import org.apache.directory.shared.ldap.message.Response;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.message.ResultResponseRequest;
import org.apache.directory.shared.ldap.message.SearchRequest;
import org.apache.directory.shared.ldap.message.SearchResultDone;
import org.apache.directory.shared.ldap.message.SearchResultEntry;
-import org.apache.directory.shared.ldap.message.SearchResultEntryImpl;
+import org.apache.directory.shared.ldap.codec.message.SearchResultEntryImpl;
import org.apache.directory.shared.ldap.message.SearchResultReference;
-import org.apache.directory.shared.ldap.message.SearchResultReferenceImpl;
+import org.apache.directory.shared.ldap.codec.message.SearchResultReferenceImpl;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.schema.AttributeType;
import org.apache.directory.shared.ldap.util.LdapURL;
@@ -836,7 +836,7 @@ public class SearchHandler extends LdapR
// The entry is a referral.
SearchResultReference respRef;
respRef = new SearchResultReferenceImpl( req.getMessageId() );
- respRef.setReferral( new ReferralImpl() );
+ respRef.setReferral( new org.apache.directory.shared.ldap.codec.message.ReferralImpl() );
for ( Value<?> val : ref )
{
@@ -1229,7 +1229,7 @@ public class SearchHandler extends LdapR
throws Exception
{
LdapResult result = req.getResultResponse().getLdapResult();
- ReferralImpl referral = new ReferralImpl();
+ org.apache.directory.shared.ldap.codec.message.ReferralImpl referral = new org.apache.directory.shared.ldap.codec.message.ReferralImpl();
result.setReferral( referral );
result.setResultCode( ResultCodeEnum.REFERRAL );
result.setErrorMessage( "Encountered referral attempting to handle request." );
@@ -1362,7 +1362,7 @@ public class SearchHandler extends LdapR
LOG.debug( "Inside getReferralOnAncestor()" );
EntryAttribute refAttr = referralAncestor.getOriginalEntry().get( SchemaConstants.REF_AT );
- Referral referral = new ReferralImpl();
+ Referral referral = new org.apache.directory.shared.ldap.codec.message.ReferralImpl();
for ( Value<?> value : refAttr )
{
Modified: directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StartTlsHandler.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StartTlsHandler.java?rev=1056058&r1=1056057&r2=1056058&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StartTlsHandler.java (original)
+++ directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StartTlsHandler.java Thu Jan 6 20:26:21 2011
@@ -42,7 +42,7 @@ import org.apache.directory.server.ldap.
import org.apache.directory.server.ldap.LdapSession;
import org.apache.directory.shared.ldap.message.ExtendedRequest;
import org.apache.directory.shared.ldap.message.ExtendedResponse;
-import org.apache.directory.shared.ldap.message.ExtendedResponseImpl;
+import org.apache.directory.shared.ldap.codec.message.ExtendedResponseImpl;
import org.apache.directory.shared.ldap.message.LdapResult;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.mina.core.filterchain.IoFilterChain;
Modified: directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java?rev=1056058&r1=1056057&r2=1056058&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java (original)
+++ directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java Thu Jan 6 20:26:21 2011
@@ -72,7 +72,6 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.Response;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.message.SearchRequest;
-import org.apache.directory.shared.ldap.message.SearchRequestImpl;
import org.apache.directory.shared.ldap.message.SearchResultDone;
import org.apache.directory.shared.ldap.message.SearchResultEntry;
import org.apache.directory.shared.ldap.message.SearchResultReference;
@@ -261,7 +260,7 @@ public class SyncReplConsumer implements
{
String baseDn = config.getBaseDn();
- searchRequest = new SearchRequestImpl();
+ searchRequest = new org.apache.directory.shared.ldap.codec.message.SearchRequestImpl();
searchRequest.setBase( new DN( baseDn ) );
searchRequest.setFilter( config.getFilter() );
Modified: directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java?rev=1056058&r1=1056057&r2=1056058&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java (original)
+++ directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java Thu Jan 6 20:26:21 2011
@@ -70,17 +70,14 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.filter.PresenceNode;
import org.apache.directory.shared.ldap.filter.SearchScope;
import org.apache.directory.shared.ldap.message.IntermediateResponse;
-import org.apache.directory.shared.ldap.message.IntermediateResponseImpl;
+import org.apache.directory.shared.ldap.codec.message.IntermediateResponseImpl;
import org.apache.directory.shared.ldap.message.LdapResult;
-import org.apache.directory.shared.ldap.message.ReferralImpl;
import org.apache.directory.shared.ldap.message.Response;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.message.SearchRequest;
import org.apache.directory.shared.ldap.message.SearchResultDone;
import org.apache.directory.shared.ldap.message.SearchResultEntry;
-import org.apache.directory.shared.ldap.message.SearchResultEntryImpl;
import org.apache.directory.shared.ldap.message.SearchResultReference;
-import org.apache.directory.shared.ldap.message.SearchResultReferenceImpl;
import org.apache.directory.shared.ldap.message.control.replication.SyncStateTypeEnum;
import org.apache.directory.shared.ldap.message.control.replication.SynchronizationInfoEnum;
import org.apache.directory.shared.ldap.message.control.replication.SynchronizationModeEnum;
@@ -325,7 +322,7 @@ public class SyncReplProvider implements
if ( refreshNPersist )
{
- IntermediateResponse intermResp = new IntermediateResponseImpl( req.getMessageId() );
+ IntermediateResponse intermResp = new org.apache.directory.shared.ldap.codec.message.IntermediateResponseImpl( req.getMessageId() );
intermResp.setResponseName( SyncInfoValueControl.CONTROL_OID );
SyncInfoValueControl syncInfo = new SyncInfoValueControl( SynchronizationInfoEnum.NEW_COOKIE );
@@ -607,8 +604,8 @@ public class SyncReplProvider implements
{
// The entry is a referral.
SearchResultReference respRef;
- respRef = new SearchResultReferenceImpl( req.getMessageId() );
- respRef.setReferral( new ReferralImpl() );
+ respRef = new org.apache.directory.shared.ldap.codec.message.SearchResultReferenceImpl( req.getMessageId() );
+ respRef.setReferral( new org.apache.directory.shared.ldap.codec.message.ReferralImpl() );
for ( Value<?> val : ref )
{
@@ -653,7 +650,7 @@ public class SyncReplProvider implements
{
// The entry is not a referral, or the ManageDsaIt control is set
SearchResultEntry respEntry;
- respEntry = new SearchResultEntryImpl( req.getMessageId() );
+ respEntry = new org.apache.directory.shared.ldap.codec.message.SearchResultEntryImpl( req.getMessageId() );
respEntry.setEntry( entry );
respEntry.setObjectName( entry.getDn() );
Modified: directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java?rev=1056058&r1=1056057&r2=1056058&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java (original)
+++ directory/apacheds/branches/alex_refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java Thu Jan 6 20:26:21 2011
@@ -39,7 +39,6 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.message.AbandonableRequest;
import org.apache.directory.shared.ldap.message.SearchRequest;
import org.apache.directory.shared.ldap.message.SearchResultEntry;
-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.util.StringTools;
@@ -142,7 +141,7 @@ public class SyncReplSearchListener impl
if ( pushInRealTime )
{
- SearchResultEntry respEntry = new SearchResultEntryImpl( req.getMessageId() );
+ SearchResultEntry respEntry = new org.apache.directory.shared.ldap.codec.message.SearchResultEntryImpl( req.getMessageId() );
respEntry.setObjectName( entry.getDn() );
respEntry.setEntry( entry );
@@ -183,7 +182,7 @@ public class SyncReplSearchListener impl
{
if ( pushInRealTime )
{
- SearchResultEntry respEntry = new SearchResultEntryImpl( req.getMessageId() );
+ SearchResultEntry respEntry = new org.apache.directory.shared.ldap.codec.message.SearchResultEntryImpl( req.getMessageId() );
respEntry.setObjectName( entry.getDn() );
respEntry.setEntry( entry );
@@ -222,7 +221,7 @@ public class SyncReplSearchListener impl
if ( pushInRealTime )
{
- SearchResultEntry respEntry = new SearchResultEntryImpl( req.getMessageId() );
+ SearchResultEntry respEntry = new org.apache.directory.shared.ldap.codec.message.SearchResultEntryImpl( req.getMessageId() );
respEntry.setObjectName( modifyContext.getDn() );
respEntry.setEntry( alteredEntry );
@@ -270,7 +269,7 @@ public class SyncReplSearchListener impl
if ( pushInRealTime )
{
- SearchResultEntry respEntry = new SearchResultEntryImpl( req.getMessageId() );
+ SearchResultEntry respEntry = new org.apache.directory.shared.ldap.codec.message.SearchResultEntryImpl( req.getMessageId() );
respEntry.setObjectName( moveContext.getDn() );
respEntry.setEntry( entry );
@@ -321,7 +320,7 @@ public class SyncReplSearchListener impl
{
Entry alteredEntry = moveAndRenameContext.getModifiedEntry();
- SearchResultEntry respEntry = new SearchResultEntryImpl( req.getMessageId() );
+ SearchResultEntry respEntry = new org.apache.directory.shared.ldap.codec.message.SearchResultEntryImpl( req.getMessageId() );
respEntry.setObjectName( moveAndRenameContext.getModifiedEntry().getDn() );
respEntry.setEntry( alteredEntry );
@@ -365,7 +364,7 @@ public class SyncReplSearchListener impl
if ( pushInRealTime )
{
- SearchResultEntry respEntry = new SearchResultEntryImpl( req.getMessageId() );
+ SearchResultEntry respEntry = new org.apache.directory.shared.ldap.codec.message.SearchResultEntryImpl( req.getMessageId() );
respEntry.setObjectName( entry.getDn() );
respEntry.setEntry( entry );
Modified: directory/apacheds/branches/alex_refactoring/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java?rev=1056058&r1=1056057&r2=1056058&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java (original)
+++ directory/apacheds/branches/alex_refactoring/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java Thu Jan 6 20:26:21 2011
@@ -67,11 +67,9 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.exception.LdapException;
import org.apache.directory.shared.ldap.message.BindRequest;
-import org.apache.directory.shared.ldap.message.BindRequestImpl;
import org.apache.directory.shared.ldap.message.BindResponse;
-import org.apache.directory.shared.ldap.message.LdapEncoder;
+import org.apache.directory.shared.ldap.codec.message.LdapEncoder;
import org.apache.directory.shared.ldap.message.ModifyRequest;
-import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.DN;
import org.junit.Ignore;
@@ -185,7 +183,7 @@ public class SaslBindIT extends Abstract
String servicePrincipal = "ldap/" + hostName + "@EXAMPLE.COM";
ldapServer.setSaslPrincipal( servicePrincipal );
- ModifyRequest modifyRequest = new ModifyRequestImpl();
+ ModifyRequest modifyRequest = new org.apache.directory.shared.ldap.codec.message.ModifyRequestImpl();
modifyRequest.setName( new DN( "uid=ldap,ou=users,dc=example,dc=com" ) );
modifyRequest.replace( "userPassword", "randall" );
modifyRequest.replace( "krb5PrincipalName", servicePrincipal );
@@ -230,7 +228,7 @@ public class SaslBindIT extends Abstract
{
DN userDn = new DN( "uid=hnelson,ou=users,dc=example,dc=com" );
LdapConnection connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
- BindRequest bindReq = new BindRequestImpl();
+ BindRequest bindReq = new org.apache.directory.shared.ldap.codec.message.BindRequestImpl();
bindReq.setCredentials( "secret".getBytes() );
bindReq.setName( userDn );
bindReq.setSaslMechanism( SupportedSaslMechanisms.PLAIN );
@@ -254,7 +252,7 @@ public class SaslBindIT extends Abstract
{
DN userDn = new DN( "uid=hnelson,ou=users,dc=example,dc=com" );
LdapConnection connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
- BindRequest bindReq = new BindRequestImpl();
+ BindRequest bindReq = new org.apache.directory.shared.ldap.codec.message.BindRequestImpl();
bindReq.setCredentials( "secret".getBytes() );
bindReq.setName( userDn );
bindReq.setSaslMechanism( "" ); // invalid mechanism
@@ -514,7 +512,7 @@ public class SaslBindIT extends Abstract
}
// Setup the bind request
- BindRequestImpl request = new BindRequestImpl( 1 );
+ org.apache.directory.shared.ldap.codec.message.BindRequestImpl request = new org.apache.directory.shared.ldap.codec.message.BindRequestImpl( 1 );
request.setName( new DN( "uid=admin,ou=system" ) );
request.setSimple( false );
request.setCredentials( type1response );
@@ -525,7 +523,7 @@ public class SaslBindIT extends Abstract
LdapDecoder decoder = new LdapDecoder();
// Send encoded request to server
- LdapEncoder encoder = new LdapEncoder();
+ org.apache.directory.shared.ldap.codec.message.LdapEncoder encoder = new LdapEncoder();
ByteBuffer bb = encoder.encodeMessage( request );
bb.flip();
@@ -553,7 +551,7 @@ public class SaslBindIT extends Abstract
}
// Setup the bind request
- BindRequestImpl request = new BindRequestImpl( 2 );
+ org.apache.directory.shared.ldap.codec.message.BindRequestImpl request = new org.apache.directory.shared.ldap.codec.message.BindRequestImpl( 2 );
request.setName( new DN( "uid=admin,ou=system" ) );
request.setSimple( false );
request.setCredentials( type3response );
@@ -564,7 +562,7 @@ public class SaslBindIT extends Abstract
LdapDecoder decoder = new LdapDecoder();
// Send encoded request to server
- LdapEncoder encoder = new LdapEncoder();
+ LdapEncoder encoder = new org.apache.directory.shared.ldap.codec.message.LdapEncoder();
ByteBuffer bb = encoder.encodeMessage( request );
bb.flip();
Modified: directory/apacheds/branches/alex_refactoring/server-integ/src/test/java/org/apache/directory/server/operations/modify/IllegalModificationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/server-integ/src/test/java/org/apache/directory/server/operations/modify/IllegalModificationIT.java?rev=1056058&r1=1056057&r2=1056058&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/server-integ/src/test/java/org/apache/directory/server/operations/modify/IllegalModificationIT.java (original)
+++ directory/apacheds/branches/alex_refactoring/server-integ/src/test/java/org/apache/directory/server/operations/modify/IllegalModificationIT.java Thu Jan 6 20:26:21 2011
@@ -38,7 +38,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.ModifyRequest;
-import org.apache.directory.shared.ldap.message.ModifyRequestImpl;
+import org.apache.directory.shared.ldap.codec.message.ModifyRequestImpl;
import org.apache.directory.shared.ldap.message.ModifyResponse;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.DN;
Modified: directory/apacheds/branches/alex_refactoring/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/alex_refactoring/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java?rev=1056058&r1=1056057&r2=1056058&view=diff
==============================================================================
--- directory/apacheds/branches/alex_refactoring/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java (original)
+++ directory/apacheds/branches/alex_refactoring/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java Thu Jan 6 20:26:21 2011
@@ -63,7 +63,7 @@ import org.apache.directory.shared.ldap.
import org.apache.directory.shared.ldap.filter.SearchScope;
import org.apache.directory.shared.ldap.message.Response;
import org.apache.directory.shared.ldap.message.SearchRequest;
-import org.apache.directory.shared.ldap.message.SearchRequestImpl;
+import org.apache.directory.shared.ldap.codec.message.SearchRequestImpl;
import org.apache.directory.shared.ldap.message.control.Control;
import org.apache.directory.shared.ldap.name.DN;
import org.apache.directory.shared.ldap.util.JndiUtils;