directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kayyag...@apache.org
Subject svn commit: r987611 [1/13] - in /directory/apacheds/trunk: ./ all/ core-annotations/ core-api/ core-api/src/main/java/org/apache/directory/server/core/ core-api/src/main/java/org/apache/directory/server/core/event/ core-api/src/main/java/org/apache/dir...
Date Fri, 20 Aug 2010 19:32:02 GMT
Author: kayyagari
Date: Fri Aug 20 19:31:58 2010
New Revision: 987611

URL: http://svn.apache.org/viewvc?rev=987611&view=rev
Log:
o merging changes done by Emmanuel in codec message merge branch

Modified:
    directory/apacheds/trunk/   (props changed)
    directory/apacheds/trunk/all/   (props changed)
    directory/apacheds/trunk/core/   (props changed)
    directory/apacheds/trunk/core-annotations/   (props changed)
    directory/apacheds/trunk/core-api/   (props changed)
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/CoreSession.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/EntryToResponseCursor.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/event/NotificationCriteria.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/DeleteOperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveOperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java
    directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/UnbindOperationContext.java
    directory/apacheds/trunk/core-api/src/test/java/org/apache/directory/server/core/MockCoreSession.java
    directory/apacheds/trunk/core-avl/   (props changed)
    directory/apacheds/trunk/core-constants/   (props changed)
    directory/apacheds/trunk/core-integ/   (props changed)
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/admin/AdministrativePointServiceIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AdministratorsGroupIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java   (contents, props changed)
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/bind/SimpleBindIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/compare/ComparePerfIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupPerfIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/modify/ModifyPerfIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/moveAndRename/MoveAndRenamePerfIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchBinaryIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchPerfIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
    directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java
    directory/apacheds/trunk/core-jndi/   (props changed)
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/DefaultCoreSession.java
    directory/apacheds/trunk/core/src/main/java/org/apache/directory/server/core/authn/PasswordPolicyConfiguration.java   (props changed)
    directory/apacheds/trunk/http-integration/   (props changed)
    directory/apacheds/trunk/i18n/   (props changed)
    directory/apacheds/trunk/interceptor-kerberos/   (props changed)
    directory/apacheds/trunk/jdbm/   (props changed)
    directory/apacheds/trunk/jdbm-partition/   (props changed)
    directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/   (props changed)
    directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java   (props changed)
    directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/   (props changed)
    directory/apacheds/trunk/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java   (props changed)
    directory/apacheds/trunk/kerberos-shared/   (props changed)
    directory/apacheds/trunk/kerberos-test/   (props changed)
    directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java
    directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java
    directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java
    directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java
    directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java
    directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java
    directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java
    directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java
    directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java
    directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java
    directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/ClientSearchRequestTest.java
    directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/SearchRequestReturningAttributesTest.java
    directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/perf/TestClientApiPerf.java
    directory/apacheds/trunk/ldif-partition/   (props changed)
    directory/apacheds/trunk/protocol-changepw/   (props changed)
    directory/apacheds/trunk/protocol-dhcp/   (props changed)
    directory/apacheds/trunk/protocol-dns/   (props changed)
    directory/apacheds/trunk/protocol-kerberos/   (props changed)
    directory/apacheds/trunk/protocol-ldap/   (props changed)
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/ExtendedOperationHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolCodecFactory.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolUtils.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapServer.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapSession.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/AbandonHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/AddHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/CompareHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/DeleteHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ExtendedHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyDnHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchAbandonListener.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/UnbindHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslServer.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/MechanismHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5CallbackHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/cramMD5/CramMd5MechanismHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5CallbackHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/digestMD5/DigestMd5MechanismHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiCallbackHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/gssapi/GssapiMechanismHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmMechanismHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/ntlm/NtlmSaslServer.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainMechanismHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/plain/PlainSaslServer.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/controls/PagedSearchContext.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/CertGenerationRequestHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/GracefulShutdownHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StartTlsHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaDitStoreUtil.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicationProvider.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java   (contents, props changed)
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java
    directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java
    directory/apacheds/trunk/protocol-ldap/src/test/java/org/apache/directory/server/ldap/SettingAlternativeHandlersTest.java
    directory/apacheds/trunk/protocol-ntp/   (props changed)
    directory/apacheds/trunk/protocol-shared/   (props changed)
    directory/apacheds/trunk/server-annotations/   (props changed)
    directory/apacheds/trunk/server-config/   (props changed)
    directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java   (props changed)
    directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/LdifConfigExtractor.java
    directory/apacheds/trunk/server-config/src/main/resources/   (props changed)
    directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java   (props changed)
    directory/apacheds/trunk/server-integ/   (props changed)
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/bind/SimpleBindIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/compare/CompareIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/delete/DeleteIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/extended/StoredProcedureIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/lookup/LookupPerfIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modify/IllegalModificationIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/MoveIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java
    directory/apacheds/trunk/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchPerfIT.java
    directory/apacheds/trunk/server-jndi/   (props changed)
    directory/apacheds/trunk/server-replication/   (props changed)
    directory/apacheds/trunk/server-tools/   (props changed)
    directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsDialog.java
    directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/ldap/gui/OutstandingRequestsModel.java
    directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/ldap/handlers/extended/LaunchDiagnosticUiHandler.java
    directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/DiagnosticCommand.java
    directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/GracefulShutdownCommand.java
    directory/apacheds/trunk/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java
    directory/apacheds/trunk/test-framework/   (props changed)
    directory/apacheds/trunk/xdbm-partition/   (props changed)
    directory/apacheds/trunk/xdbm-tools/   (props changed)

Propchange: directory/apacheds/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:31:58 2010
@@ -1,3 +1,4 @@
+/directory/apacheds/branches/apacheds-codec-merge:982369-987590
 /directory/apacheds/branches/apacheds-replication:749790-764110
 /directory/apacheds/branches/apacheds-schema:806623-896441
 /directory/apacheds/branches/apacheds-subtree:965203-965686

Propchange: directory/apacheds/trunk/all/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:31:58 2010
@@ -1,2 +1,2 @@
+/directory/apacheds/branches/apacheds-codec-merge/all:982369-987590
 /directory/apacheds/branches/apacheds-dnfactory-experiment/all:980138-980938
-/directory/apacheds/trunk/all:980025-980137

Propchange: directory/apacheds/trunk/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:31:58 2010
@@ -1 +1,2 @@
+/directory/apacheds/branches/apacheds-codec-merge/core:982369-987590
 /directory/apacheds/branches/apacheds-dnfactory-experiment/core:980138-980934

Propchange: directory/apacheds/trunk/core-annotations/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:31:58 2010
@@ -1,2 +1,2 @@
+/directory/apacheds/branches/apacheds-codec-merge/core-annotations:982369-987590
 /directory/apacheds/branches/apacheds-dnfactory-experiment/core-annotations:980138-980934
-/directory/apacheds/trunk/core-annotations:980025-980137

Propchange: directory/apacheds/trunk/core-api/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:31:58 2010
@@ -1 +1,2 @@
+/directory/apacheds/branches/apacheds-codec-merge/core-api:982369-987590
 /directory/apacheds/branches/apacheds-dnfactory-experiment/core-api:980138-980934

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/CoreSession.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/CoreSession.java?rev=987611&r1=987610&r2=987611&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/CoreSession.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/CoreSession.java Fri Aug 20 19:31:58 2010
@@ -34,15 +34,15 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.SearchScope;
+import org.apache.directory.shared.ldap.message.AddRequest;
 import org.apache.directory.shared.ldap.message.AliasDerefMode;
+import org.apache.directory.shared.ldap.message.CompareRequest;
+import org.apache.directory.shared.ldap.message.DeleteRequest;
+import org.apache.directory.shared.ldap.message.ModifyDnRequest;
+import org.apache.directory.shared.ldap.message.ModifyRequest;
+import org.apache.directory.shared.ldap.message.SearchRequest;
+import org.apache.directory.shared.ldap.message.UnbindRequest;
 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.name.DN;
 import org.apache.directory.shared.ldap.name.RDN;
 import org.apache.directory.shared.ldap.schema.AttributeTypeOptions;
@@ -247,21 +247,21 @@ public interface CoreSession
      * Adds an entry into the DirectoryService associated with this CoreSession.
      * The entry is built using the received AddRequest.
      * 
-     * @param InternalAddRequest the request to execute
+     * @param AddRequest the request to execute
      * @exception Exception on failures to add the entry
      */
-    void add( InternalAddRequest addRequest ) throws LdapException;
+    void add( AddRequest addRequest ) throws LdapException;
     
     
     /**
      * Adds an entry into the DirectoryService associated with this CoreSession.
      * The entry is built using the received AddRequest.
      * 
-     * @param InternalAddRequest the request to execute
+     * @param AddRequest the request to execute
      * @param log a flag set if the added entry should be stored in the changeLog
      * @exception Exception on failures to add the entry
      */
-    void add( InternalAddRequest addRequest, LogChange log ) throws LdapException;
+    void add( AddRequest addRequest, LogChange log ) throws LdapException;
     
     
     /**
@@ -295,7 +295,7 @@ public interface CoreSession
      * @param compareRequest the received request
      * @throws Exception if there are failures while comparing
      */
-    boolean compare( InternalCompareRequest compareRequest ) throws LdapException;
+    boolean compare( CompareRequest compareRequest ) throws LdapException;
 
     
     /**
@@ -317,10 +317,10 @@ public interface CoreSession
     void delete( DN dn, LogChange log ) throws LdapException;
     
     
-    void delete( InternalDeleteRequest deleteRequest ) throws LdapException;
+    void delete( DeleteRequest deleteRequest ) throws LdapException;
     
     
-    void delete( InternalDeleteRequest deleteRequest, LogChange log ) throws LdapException;
+    void delete( DeleteRequest deleteRequest, LogChange log ) throws LdapException;
 
     
     /**
@@ -426,10 +426,10 @@ public interface CoreSession
     void modify( DN dn, List<Modification> mods, boolean ignoreReferral, LogChange log ) throws LdapException;
     
     
-    void modify( InternalModifyRequest modifyRequest ) throws LdapException;
+    void modify( ModifyRequest modifyRequest ) throws LdapException;
     
     
-    void modify( InternalModifyRequest modifyRequest, LogChange log ) throws LdapException;
+    void modify( ModifyRequest modifyRequest, LogChange log ) throws LdapException;
 
     
     /**
@@ -486,7 +486,7 @@ public interface CoreSession
      * @param modifyDnRequest The ModifyDN request
      * @throws Exception if there are failures while moving the entry/branch
      */
-    void move( InternalModifyDnRequest modifyDnRequest ) throws LdapException;
+    void move( ModifyDnRequest modifyDnRequest ) throws LdapException;
     
     
     /**
@@ -496,7 +496,7 @@ public interface CoreSession
      * @param log a flag set if the added entry should be stored in the changeLog
      * @throws Exception if there are failures while moving the entry/branch
      */
-    void move( InternalModifyDnRequest modifyDnRequest, LogChange log ) throws LdapException;
+    void move( ModifyDnRequest modifyDnRequest, LogChange log ) throws LdapException;
     
     
     /**
@@ -570,7 +570,7 @@ public interface CoreSession
      * @throws Exception if there are failures while moving and renaming the entry
      * or branch
      */
-    void moveAndRename( InternalModifyDnRequest modifyDnRequest ) throws LdapException;
+    void moveAndRename( ModifyDnRequest modifyDnRequest ) throws LdapException;
     
     
     /**
@@ -581,7 +581,7 @@ public interface CoreSession
      * @throws Exception if there are failures while moving and renaming the entry
      * or branch
      */
-    void moveAndRename( InternalModifyDnRequest modifyDnRequest, LogChange log ) throws LdapException;
+    void moveAndRename( ModifyDnRequest modifyDnRequest, LogChange log ) throws LdapException;
     
     
     /**
@@ -654,7 +654,7 @@ public interface CoreSession
      * @param modifyDnRequest The requested modification
      * @throws Exception if there are failures while renaming the entry
      */
-    void rename( InternalModifyDnRequest modifyDnRequest ) throws LdapException;
+    void rename( ModifyDnRequest modifyDnRequest ) throws LdapException;
     
     
     /**
@@ -664,7 +664,7 @@ public interface CoreSession
      * @param log a flag set if the added entry should be stored in the changeLog
      * @throws Exception if there are failures while renaming the entry
      */
-    void rename( InternalModifyDnRequest modifyDnRequest, LogChange log ) throws LdapException;
+    void rename( ModifyDnRequest modifyDnRequest, LogChange log ) throws LdapException;
     
     
     /**
@@ -755,11 +755,11 @@ public interface CoreSession
         Set<AttributeTypeOptions> returningAttributes, long sizeLimit, int timeLimit ) throws LdapException;
 
 
-    EntryFilteringCursor search( InternalSearchRequest searchRequest ) throws LdapException;
+    EntryFilteringCursor search( SearchRequest searchRequest ) throws LdapException;
 
 
     void unbind() throws LdapException;
     
     
-    void unbind( InternalUnbindRequest unbindRequest ) throws LdapException;
+    void unbind( UnbindRequest unbindRequest ) throws LdapException;
 }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/EntryToResponseCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/EntryToResponseCursor.java?rev=987611&r1=987610&r2=987611&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/EntryToResponseCursor.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/EntryToResponseCursor.java Fri Aug 20 19:31:58 2010
@@ -23,14 +23,15 @@ package org.apache.directory.server.core
 
 import java.util.Iterator;
 
-import org.apache.directory.ldap.client.api.message.LdapResult;
-import org.apache.directory.ldap.client.api.message.SearchResultDone;
-import org.apache.directory.ldap.client.api.message.SearchResultEntry;
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.cursor.ClosureMonitor;
 import org.apache.directory.shared.ldap.cursor.Cursor;
 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;
 
 
 /**
@@ -39,29 +40,33 @@ import org.apache.directory.shared.ldap.
  *
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-public class EntryToResponseCursor<SearchResponse> implements Cursor<SearchResponse>
+public class EntryToResponseCursor<InternalResponse> implements Cursor<InternalResponse>
 {
     /** the underlying cursor */
-    private Cursor wrapped;
+    private Cursor<InternalResponse> wrapped;
 
     /** a reference to hold the SearchResultDone response */
     private SearchResultDone searchDoneResp;
 
     private boolean done;
 
-    public EntryToResponseCursor( Cursor wrapped )
+    private int messageId;
+
+
+    public EntryToResponseCursor( int messageId, Cursor<InternalResponse> wrapped )
     {
         this.wrapped = wrapped;
+        this.messageId = messageId;
     }
 
 
-    public Iterator<SearchResponse> iterator()
+    public Iterator<InternalResponse> iterator()
     {
         throw new UnsupportedOperationException();
     }
 
 
-    public void after( SearchResponse resp ) throws Exception
+    public void after( InternalResponse resp ) throws Exception
     {
         throw new UnsupportedOperationException();
     }
@@ -79,7 +84,7 @@ public class EntryToResponseCursor<Searc
     }
 
 
-    public void before( SearchResponse resp ) throws Exception
+    public void before( InternalResponse resp ) throws Exception
     {
         throw new UnsupportedOperationException();
     }
@@ -109,13 +114,13 @@ public class EntryToResponseCursor<Searc
     }
 
 
-    public SearchResponse get() throws Exception
+    public InternalResponse get() throws Exception
     {
         ClonedServerEntry entry = ( ClonedServerEntry ) wrapped.get();
-        SearchResultEntry se = new SearchResultEntry();
+        SearchResultEntry se = new SearchResultEntryImpl( messageId );
         se.setEntry( entry );
 
-        return ( SearchResponse ) se;
+        return ( InternalResponse ) se;
     }
 
 
@@ -151,12 +156,11 @@ public class EntryToResponseCursor<Searc
     public boolean next() throws Exception
     {
         done = wrapped.next();
-        if( !done )
+
+        if ( !done )
         {
-            searchDoneResp = new SearchResultDone();
-            LdapResult ldapResult = new LdapResult();
-            ldapResult.setResultCode( ResultCodeEnum.SUCCESS );
-            searchDoneResp.setLdapResult( ldapResult );
+            searchDoneResp = new SearchResultDoneImpl( messageId );
+            searchDoneResp.getLdapResult().setResultCode( ResultCodeEnum.SUCCESS );
         }
 
         return done;
@@ -174,6 +178,7 @@ public class EntryToResponseCursor<Searc
         wrapped.setClosureMonitor( monitor );
     }
 
+
     /**
      * {@inheritDoc}
      */

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java?rev=987611&r1=987610&r2=987611&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java Fri Aug 20 19:31:58 2010
@@ -28,26 +28,6 @@ import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
 import org.apache.directory.ldap.client.api.LdapConnection;
-import org.apache.directory.ldap.client.api.message.AbandonRequest;
-import org.apache.directory.ldap.client.api.message.AbstractMessage;
-import org.apache.directory.ldap.client.api.message.AddRequest;
-import org.apache.directory.ldap.client.api.message.AddResponse;
-import org.apache.directory.ldap.client.api.message.BindRequest;
-import org.apache.directory.ldap.client.api.message.BindResponse;
-import org.apache.directory.ldap.client.api.message.CompareRequest;
-import org.apache.directory.ldap.client.api.message.CompareResponse;
-import org.apache.directory.ldap.client.api.message.DeleteRequest;
-import org.apache.directory.ldap.client.api.message.DeleteResponse;
-import org.apache.directory.ldap.client.api.message.ExtendedRequest;
-import org.apache.directory.ldap.client.api.message.ExtendedResponse;
-import org.apache.directory.ldap.client.api.message.LdapResult;
-import org.apache.directory.ldap.client.api.message.ModifyDnRequest;
-import org.apache.directory.ldap.client.api.message.ModifyDnResponse;
-import org.apache.directory.ldap.client.api.message.ModifyRequest;
-import org.apache.directory.ldap.client.api.message.ModifyResponse;
-import org.apache.directory.ldap.client.api.message.SearchRequest;
-import org.apache.directory.ldap.client.api.message.SearchResponse;
-import org.apache.directory.ldap.client.api.message.SearchResultEntry;
 import org.apache.directory.server.core.filtering.EntryFilteringCursor;
 import org.apache.directory.server.core.interceptor.context.BindOperationContext;
 import org.apache.directory.shared.asn1.primitives.OID;
@@ -61,24 +41,45 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.Value;
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.exception.LdapOperationException;
-import org.apache.directory.shared.ldap.filter.FilterParser;
 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.message.AddResponse;
+import org.apache.directory.shared.ldap.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.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.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.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.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.SearchRequestImpl;
+import org.apache.directory.shared.ldap.message.SearchResultEntry;
+import org.apache.directory.shared.ldap.message.SearchResultEntryImpl;
 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.InternalResultResponseRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.name.RDN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -157,22 +158,6 @@ public class LdapCoreSessionConnection i
     }
 
 
-    private LdapResult getDefaultResult()
-    {
-        LdapResult result = new LdapResult();
-        result.setResultCode( ResultCodeEnum.SUCCESS );
-        return result;
-    }
-
-
-    private LdapResult getDefaultCompareResult()
-    {
-        LdapResult result = new LdapResult();
-        result.setResultCode( ResultCodeEnum.COMPARE_TRUE );
-        return result;
-    }
-
-
     /**
      * {@inheritDoc}
      */
@@ -180,16 +165,14 @@ public class LdapCoreSessionConnection i
     {
         int newId = messageId.incrementAndGet();
 
-        InternalAddRequest iadd = new AddRequestImpl( newId );
-        iadd.setEntry( addRequest.getEntry() );
+        addRequest.setMessageId( newId );
 
-        AddResponse resp = new AddResponse();
-        resp.setMessageId( newId );
-        resp.setLdapResult( getDefaultResult() );
+        AddResponse resp = new AddResponseImpl( newId );
+        resp.getLdapResult().setResultCode( ResultCodeEnum.SUCCESS );
 
         try
         {
-            session.add( iadd );
+            session.add( addRequest );
         }
         catch ( LdapException e )
         {
@@ -199,7 +182,7 @@ public class LdapCoreSessionConnection i
             resp.getLdapResult().setErrorMessage( e.getMessage() );
         }
 
-        addResponseControls( iadd, resp );
+        addResponseControls( addRequest, resp );
         return resp;
     }
 
@@ -209,7 +192,10 @@ public class LdapCoreSessionConnection i
      */
     public AddResponse add( Entry entry ) throws LdapException
     {
-        return add ( new AddRequest( entry ) );
+        AddRequest addRequest = new AddRequestImpl();
+        addRequest.setEntry( entry );
+
+        return add( addRequest );
     }
 
 
@@ -220,38 +206,18 @@ public class LdapCoreSessionConnection i
     {
         int newId = messageId.incrementAndGet();
 
-        CompareResponse resp = new CompareResponse();
-        resp.setLdapResult( getDefaultCompareResult() );
-        resp.setMessageId( newId );
-
-        InternalCompareRequest icompare = new CompareRequestImpl( newId );
+        CompareResponse resp = new CompareResponseImpl( newId );
+        resp.getLdapResult().setResultCode( ResultCodeEnum.COMPARE_TRUE );
 
         try
         {
-            Object obj = compareRequest.getValue();
-            if ( obj instanceof byte[] )
-            {
-                icompare.setAssertionValue( ( byte[] ) obj );
-            }
-            else
-            {
-                icompare.setAssertionValue( ( String ) obj );
-            }
-
-            icompare.setAttributeId( compareRequest.getAttrName() );
-            icompare.setName( compareRequest.getEntryDn() );
-
-            session.compare( icompare );
+            session.compare( compareRequest );
         }
-        catch ( LdapException e )
+        catch ( Exception e )
         {
-            LOG.warn( e.getMessage(), e );
-
             resp.getLdapResult().setResultCode( ResultCodeEnum.getResultCode( e ) );
-            resp.getLdapResult().setErrorMessage( e.getMessage() );
         }
 
-        addResponseControls( icompare, resp );
         return resp;
     }
 
@@ -261,10 +227,10 @@ public class LdapCoreSessionConnection i
      */
     public CompareResponse compare( DN dn, String attributeName, byte[] value ) throws LdapException
     {
-        CompareRequest compareRequest = new CompareRequest();
-        compareRequest.setEntryDn( dn );
-        compareRequest.setAttrName( attributeName );
-        compareRequest.setValue( value );
+        CompareRequest compareRequest = new CompareRequestImpl();
+        compareRequest.setName( dn );
+        compareRequest.setAttributeId( attributeName );
+        compareRequest.setAssertionValue( value );
 
         return compare( compareRequest );
     }
@@ -275,10 +241,10 @@ public class LdapCoreSessionConnection i
      */
     public CompareResponse compare( DN dn, String attributeName, String value ) throws LdapException
     {
-        CompareRequest compareRequest = new CompareRequest();
-        compareRequest.setEntryDn( dn );
-        compareRequest.setAttrName( attributeName );
-        compareRequest.setValue( value );
+        CompareRequest compareRequest = new CompareRequestImpl();
+        compareRequest.setName( dn );
+        compareRequest.setAttributeId( attributeName );
+        compareRequest.setAssertionValue( value );
 
         return compare( compareRequest );
     }
@@ -307,10 +273,18 @@ public class LdapCoreSessionConnection i
      */
     public CompareResponse compare( DN dn, String attributeName, Value<?> value ) throws LdapException
     {
-        CompareRequest compareRequest = new CompareRequest();
-        compareRequest.setEntryDn( dn );
-        compareRequest.setAttrName( attributeName );
-        compareRequest.setValue( value.get() );
+        CompareRequest compareRequest = new CompareRequestImpl();
+        compareRequest.setName( dn );
+        compareRequest.setAttributeId( attributeName );
+
+        if ( value.isBinary() )
+        {
+            compareRequest.setAssertionValue( value.getBytes() );
+        }
+        else
+        {
+            compareRequest.setAssertionValue( value.getString() );
+        }
 
         return compare( compareRequest );
     }
@@ -332,16 +306,12 @@ public class LdapCoreSessionConnection i
     {
         int newId = messageId.incrementAndGet();
 
-        DeleteResponse resp = new DeleteResponse();
-        resp.setLdapResult( getDefaultResult() );
-        resp.setMessageId( newId );
-
-        InternalDeleteRequest idelete = new DeleteRequestImpl( newId );
+        DeleteResponse resp = new DeleteResponseImpl( newId );
+        resp.getLdapResult().setResultCode( ResultCodeEnum.SUCCESS );
 
         try
         {
-            idelete.setName( deleteRequest.getTargetDn() );
-            session.delete( idelete );
+            session.delete( deleteRequest );
         }
         catch ( LdapException e )
         {
@@ -351,7 +321,8 @@ public class LdapCoreSessionConnection i
             resp.getLdapResult().setErrorMessage( e.getMessage() );
         }
 
-        addResponseControls( idelete, resp );
+        addResponseControls( deleteRequest, resp );
+
         return resp;
     }
 
@@ -361,8 +332,10 @@ public class LdapCoreSessionConnection i
      */
     public DeleteResponse delete( DN dn ) throws LdapException
     {
-        DeleteRequest delReq = new DeleteRequest( dn );
-        return delete( delReq );
+        DeleteRequest deleteRequest = new DeleteRequestImpl();
+        deleteRequest.setName( dn );
+
+        return delete( deleteRequest );
     }
 
 
@@ -441,7 +414,7 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      */
-    public SearchResponse lookup( DN dn, String... attributes ) throws LdapException
+    public Response lookup( DN dn, String... attributes ) throws LdapException
     {
         return _lookup( dn, attributes );
     }
@@ -451,7 +424,7 @@ public class LdapCoreSessionConnection i
      * this method exists solely for the purpose of calling from
      * lookup(DN dn) avoiding the varargs,
      */
-    private SearchResponse _lookup( DN dn, String... attributes )
+    private Response _lookup( DN dn, String... attributes )
     {
         int newId = messageId.incrementAndGet();
 
@@ -460,7 +433,8 @@ public class LdapCoreSessionConnection i
         try
         {
             Entry entry = null;
-            if( attributes == null )
+
+            if ( attributes == null )
             {
                 entry = session.lookup( dn );
             }
@@ -469,9 +443,8 @@ public class LdapCoreSessionConnection i
                 entry = session.lookup( dn, attributes );
             }
 
-            resp = new SearchResultEntry();
+            resp = new SearchResultEntryImpl( newId );
             resp.setEntry( entry );
-            resp.setMessageId( newId );
         }
         catch ( LdapException e )
         {
@@ -485,7 +458,7 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      */
-    public SearchResponse lookup( String dn, String... attributes ) throws LdapException
+    public Response lookup( String dn, String... attributes ) throws LdapException
     {
         return _lookup( new DN( dn ), attributes );
     }
@@ -494,7 +467,7 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      */
-    public SearchResponse lookup( DN dn ) throws LdapException
+    public Response lookup( DN dn ) throws LdapException
     {
         return _lookup( dn );
     }
@@ -503,7 +476,7 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      */
-    public SearchResponse lookup( String dn ) throws LdapException
+    public Response lookup( String dn ) throws LdapException
     {
         return _lookup( new DN( dn ) );
     }
@@ -516,11 +489,10 @@ public class LdapCoreSessionConnection i
     {
         int newId = messageId.incrementAndGet();
 
-        ModifyResponse resp = new ModifyResponse();
-        resp.setLdapResult( getDefaultResult() );
-        resp.setMessageId( newId );
+        ModifyResponse resp = new ModifyResponseImpl( newId );
+        resp.getLdapResult().setResultCode( ResultCodeEnum.SUCCESS );
 
-        InternalModifyRequest iModReq = new ModifyRequestImpl( newId );
+        ModifyRequest iModReq = new ModifyRequestImpl( newId );
 
         try
         {
@@ -561,11 +533,10 @@ public class LdapCoreSessionConnection i
     public ModifyResponse modify( Entry entry, ModificationOperation modOp ) throws LdapException
     {
         int newId = messageId.incrementAndGet();
-        ModifyResponse resp = new ModifyResponse();
-        resp.setLdapResult( getDefaultResult() );
-        resp.setMessageId( newId );
+        ModifyResponse resp = new ModifyResponseImpl( newId );
+        resp.getLdapResult().setResultCode( ResultCodeEnum.SUCCESS );
 
-        InternalModifyRequest iModReq = new ModifyRequestImpl( newId );
+        ModifyRequest iModReq = new ModifyRequestImpl( newId );
 
         try
         {
@@ -599,23 +570,13 @@ public class LdapCoreSessionConnection i
     {
         int newId = messageId.incrementAndGet();
 
-        ModifyResponse resp = new ModifyResponse();
-        resp.setLdapResult( getDefaultResult() );
-        resp.setMessageId( newId );
-
-        InternalModifyRequest iModReq = new ModifyRequestImpl( newId );
+        modRequest.setMessageId( newId );
+        ModifyResponse resp = new ModifyResponseImpl( newId );
+        resp.getLdapResult().setResultCode( ResultCodeEnum.SUCCESS );
 
         try
         {
-            iModReq.setName( modRequest.getDn() );
-
-            Iterator<Modification> itr = modRequest.getMods().iterator();
-            while ( itr.hasNext() )
-            {
-                iModReq.addModification( itr.next() );
-            }
-
-            session.modify( iModReq );
+            session.modify( modRequest );
         }
         catch ( LdapException e )
         {
@@ -625,7 +586,7 @@ public class LdapCoreSessionConnection i
             resp.getLdapResult().setErrorMessage( e.getMessage() );
         }
 
-        addResponseControls( iModReq, resp );
+        addResponseControls( modRequest, resp );
         return resp;
     }
 
@@ -633,27 +594,19 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      * WARNING: this method is not in compatible with CoreSession API in some cases
-     *          cause this we call {@link CoreSession#move(InternalModifyDnRequest)} always from this method.
+     *          cause this we call {@link CoreSession#move(ModifyDnRequest)} always from this method.
      *          Instead use other specific modifyDn operations like {@link #move(DN, DN)}, {@link #rename(DN, RDN)} etc..
      */
     public ModifyDnResponse modifyDn( ModifyDnRequest modDnRequest ) throws LdapException
     {
         int newId = messageId.incrementAndGet();
 
-        ModifyDnResponse resp = new ModifyDnResponse();
-        resp.setLdapResult( getDefaultResult() );
-        resp.setMessageId( newId );
-
-        InternalModifyDnRequest iModDnReq = new ModifyDnRequestImpl( newId );
+        ModifyDnResponse resp = new ModifyDnResponseImpl( newId );
+        resp.getLdapResult().setResultCode( ResultCodeEnum.SUCCESS );
 
         try
         {
-            iModDnReq.setDeleteOldRdn( modDnRequest.isDeleteOldRdn() );
-            iModDnReq.setName( modDnRequest.getEntryDn() );
-            iModDnReq.setNewRdn( modDnRequest.getNewRdn() );
-            iModDnReq.setNewSuperior( modDnRequest.getNewSuperior() );
-
-            session.move( iModDnReq );
+            session.move( modDnRequest );
         }
         catch ( LdapException e )
         {
@@ -663,7 +616,7 @@ public class LdapCoreSessionConnection i
             resp.getLdapResult().setErrorMessage( e.getMessage() );
         }
 
-        addResponseControls( iModDnReq, resp );
+        addResponseControls( modDnRequest, resp );
         return resp;
     }
 
@@ -674,11 +627,10 @@ public class LdapCoreSessionConnection i
     public ModifyDnResponse move( DN entryDn, DN newSuperiorDn ) throws LdapException
     {
         int newId = messageId.incrementAndGet();
-        ModifyDnResponse resp = new ModifyDnResponse();
-        resp.setLdapResult( getDefaultResult() );
-        resp.setMessageId( newId );
+        ModifyDnResponse resp = new ModifyDnResponseImpl( newId );
+        resp.getLdapResult().setResultCode( ResultCodeEnum.SUCCESS );
 
-        InternalModifyDnRequest iModDnReq = new ModifyDnRequestImpl( newId );
+        ModifyDnRequest iModDnReq = new ModifyDnRequestImpl( newId );
 
         try
         {
@@ -716,11 +668,10 @@ public class LdapCoreSessionConnection i
     {
         int newId = messageId.incrementAndGet();
 
-        ModifyDnResponse resp = new ModifyDnResponse();
-        resp.setLdapResult( getDefaultResult() );
-        resp.setMessageId( newId );
+        ModifyDnResponse resp = new ModifyDnResponseImpl( newId );
+        resp.getLdapResult().setResultCode( ResultCodeEnum.SUCCESS );
 
-        InternalModifyDnRequest iModDnReq = new ModifyDnRequestImpl( newId );
+        ModifyDnRequest iModDnReq = new ModifyDnRequestImpl( newId );
 
         try
         {
@@ -824,11 +775,10 @@ public class LdapCoreSessionConnection i
 
         int newId = messageId.incrementAndGet();
 
-        ModifyDnResponse resp = new ModifyDnResponse();
-        resp.setLdapResult( getDefaultResult() );
-        resp.setMessageId( newId );
+        ModifyDnResponse resp = new ModifyDnResponseImpl( newId );
+        resp.getLdapResult().setResultCode( ResultCodeEnum.SUCCESS );
 
-        InternalModifyDnRequest iModDnReq = new ModifyDnRequestImpl( newId );
+        ModifyDnRequest iModDnReq = new ModifyDnRequestImpl( newId );
 
         try
         {
@@ -867,54 +817,39 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      */
-    public Cursor<SearchResponse> search( SearchRequest searchRequest ) throws LdapException
+    public Cursor<Response> search( SearchRequest searchRequest ) throws LdapException
     {
         try
         {
             int newId = messageId.incrementAndGet();
 
-            InternalSearchRequest iSearchReq = new SearchRequestImpl( newId );
-            iSearchReq.setBase( new DN( searchRequest.getBaseDn() ) );
-            iSearchReq.setDerefAliases( searchRequest.getDerefAliases() );
-            iSearchReq.setFilter( FilterParser.parse( schemaManager, searchRequest.getFilter() ) );
-            iSearchReq.setScope( searchRequest.getScope() );
-            iSearchReq.setSizeLimit( searchRequest.getSizeLimit() );
-            iSearchReq.setTimeLimit( searchRequest.getTimeLimit() );
-            iSearchReq.setTypesOnly( searchRequest.getTypesOnly() );
-
-            if ( searchRequest.getAttributes() != null )
-            {
-                for ( String at : searchRequest.getAttributes() )
-                {
-                    iSearchReq.addAttribute( at );
-                }
-            }
+            searchRequest.setMessageId( newId );
 
-            EntryFilteringCursor entryCursor = session.search( iSearchReq );
+            EntryFilteringCursor entryCursor = session.search( searchRequest );
             entryCursor.beforeFirst();
 
             //TODO enforce the size and time limits, similar in the way SearchHandler does
-            return new EntryToResponseCursor<SearchResponse>( entryCursor );
+            return new EntryToResponseCursor( newId, entryCursor );
         }
         catch ( Exception e )
         {
             LOG.warn( e.getMessage(), e );
         }
 
-        return new EntryToResponseCursor<SearchResponse>( new EmptyCursor<SearchResponse>() );
+        return new EntryToResponseCursor<Response>( -1, new EmptyCursor<Response>() );
     }
 
 
     /**
      * {@inheritDoc}
      */
-    public Cursor<SearchResponse> search( DN baseDn, String filter, SearchScope scope, String... attributes )
+    public Cursor<Response> search( DN baseDn, String filter, SearchScope scope, String... attributes )
         throws LdapException
     {
         // generate some random operation number
-        SearchRequest searchRequest = new SearchRequest();
-        searchRequest.setMessageId( ( int ) System.currentTimeMillis() );
-        searchRequest.setBaseDn( baseDn );
+        SearchRequest searchRequest = new SearchRequestImpl();
+
+        searchRequest.setBase( baseDn );
         searchRequest.setFilter( filter );
         searchRequest.setScope( scope );
         searchRequest.addAttributes( attributes );
@@ -927,7 +862,7 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      */
-    public Cursor<SearchResponse> search( String baseDn, String filter, SearchScope scope, String... attributes )
+    public Cursor<Response> search( String baseDn, String filter, SearchScope scope, String... attributes )
         throws LdapException
     {
         return search( new DN( baseDn ), filter, scope, attributes );
@@ -1027,8 +962,8 @@ public class LdapCoreSessionConnection i
      */
     public BindResponse bind() throws LdapException, IOException
     {
-        BindRequest bindReq = new BindRequest();
-        bindReq.setName( "" );
+        BindRequest bindReq = new BindRequestImpl();
+        bindReq.setName( DN.EMPTY_DN );
         bindReq.setCredentials( ( byte[] ) null );
 
         return bind( bindReq );
@@ -1048,9 +983,8 @@ public class LdapCoreSessionConnection i
 
         OperationManager operationManager = directoryService.getOperationManager();
 
-        BindResponse bindResp = new BindResponse();
-        bindResp.setMessageId( newId );
-        bindResp.setLdapResult( getDefaultResult() );
+        BindResponse bindResp = new BindResponseImpl( newId );
+        bindResp.getLdapResult().setResultCode( ResultCodeEnum.SUCCESS );
 
         try
         {
@@ -1062,7 +996,7 @@ public class LdapCoreSessionConnection i
             operationManager.bind( bindContext );
             session = bindContext.getSession();
 
-            bindResp.add( bindContext.getResponseControls() );
+            bindResp.addAllControls( bindContext.getResponseControls() );
         }
         catch ( LdapOperationException e )
         {
@@ -1083,8 +1017,8 @@ public class LdapCoreSessionConnection i
     {
         byte[] credBytes = ( credentials == null ? StringTools.EMPTY_BYTES : StringTools.getBytesUtf8( credentials ) );
 
-        BindRequest bindReq = new BindRequest();
-        bindReq.setName( name.getName() );
+        BindRequest bindReq = new BindRequestImpl();
+        bindReq.setName( name );
         bindReq.setCredentials( credBytes );
 
         return bind( bindReq );
@@ -1100,13 +1034,13 @@ public class LdapCoreSessionConnection i
     }
 
 
-    private void addResponseControls( InternalResultResponseRequest iReq, AbstractMessage clientResp )
+    private void addResponseControls( ResultResponseRequest iReq, Message clientResp )
     {
         Collection<Control> ctrlSet = iReq.getResultResponse().getControls().values();
 
-        for( Control c : ctrlSet )
+        for ( Control c : ctrlSet )
         {
-            clientResp.add( c );
+            clientResp.addControl( c );
         }
     }
 
@@ -1123,5 +1057,4 @@ public class LdapCoreSessionConnection i
         this.schemaManager = directoryService.getSchemaManager();
     }
 
-
 }

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/event/NotificationCriteria.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/event/NotificationCriteria.java?rev=987611&r1=987610&r2=987611&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/event/NotificationCriteria.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/event/NotificationCriteria.java Fri Aug 20 19:31:58 2010
@@ -26,7 +26,7 @@ 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.AliasDerefMode;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest;
+import org.apache.directory.shared.ldap.message.SearchRequest;
 import org.apache.directory.shared.ldap.name.DN;
 
 
@@ -55,7 +55,7 @@ public class NotificationCriteria
     }
     
     
-    public NotificationCriteria( InternalSearchRequest req )
+    public NotificationCriteria( SearchRequest req )
     {
         this.scope = req.getScope();
         this.aliasDerefMode = req.getDerefAliases();

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java?rev=987611&r1=987610&r2=987611&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/AddOperationContext.java Fri Aug 20 19:31:58 2010
@@ -27,7 +27,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.exception.LdapException;
-import org.apache.directory.shared.ldap.message.internal.InternalAddRequest;
+import org.apache.directory.shared.ldap.message.AddRequest;
 import org.apache.directory.shared.ldap.name.DN;
 
 
@@ -89,7 +89,7 @@ public class AddOperationContext extends
     }
 
 
-    public AddOperationContext( CoreSession session, InternalAddRequest addRequest ) throws LdapException
+    public AddOperationContext( CoreSession session, AddRequest addRequest ) throws LdapException
     {
         super( session );
         entry = new ClonedServerEntry( 

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java?rev=987611&r1=987610&r2=987611&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/CompareOperationContext.java Fri Aug 20 19:31:58 2010
@@ -25,7 +25,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControl;
 import org.apache.directory.shared.ldap.entry.BinaryValue;
 import org.apache.directory.shared.ldap.entry.Value;
-import org.apache.directory.shared.ldap.message.internal.InternalCompareRequest;
+import org.apache.directory.shared.ldap.message.CompareRequest;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -108,7 +108,7 @@ public class CompareOperationContext ext
     }
 
     
-    public CompareOperationContext( CoreSession session, InternalCompareRequest compareRequest )
+    public CompareOperationContext( CoreSession session, CompareRequest compareRequest )
     {
         super( session, compareRequest.getName() );
         this.oid = compareRequest.getAttributeId();

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/DeleteOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/DeleteOperationContext.java?rev=987611&r1=987610&r2=987611&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/DeleteOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/DeleteOperationContext.java Fri Aug 20 19:31:58 2010
@@ -24,7 +24,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.core.entry.ClonedServerEntry;
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
 import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControl;
-import org.apache.directory.shared.ldap.message.internal.InternalDeleteRequest;
+import org.apache.directory.shared.ldap.message.DeleteRequest;
 import org.apache.directory.shared.ldap.name.DN;
 
 
@@ -63,7 +63,7 @@ public class DeleteOperationContext exte
     }
 
 
-    public DeleteOperationContext( CoreSession session, InternalDeleteRequest deleteRequest )
+    public DeleteOperationContext( CoreSession session, DeleteRequest deleteRequest )
     {
         super( session, deleteRequest.getName() );
         requestControls = deleteRequest.getControls();

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java?rev=987611&r1=987610&r2=987611&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/ModifyOperationContext.java Fri Aug 20 19:31:58 2010
@@ -33,7 +33,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.exception.LdapException;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyRequest;
+import org.apache.directory.shared.ldap.message.ModifyRequest;
 import org.apache.directory.shared.ldap.name.DN;
 
 
@@ -77,11 +77,11 @@ public class ModifyOperationContext exte
     }
 
 
-    public ModifyOperationContext( CoreSession session, InternalModifyRequest modifyRequest ) throws LdapException
+    public ModifyOperationContext( CoreSession session, ModifyRequest modifyRequest ) throws LdapException
     {
         super( session, modifyRequest.getName() );
 
-        modItems = ServerEntryUtils.toServerModification( modifyRequest.getModificationItems().toArray(
+        modItems = ServerEntryUtils.toServerModification( modifyRequest.getModifications().toArray(
             new DefaultModification[0] ), session.getDirectoryService().getSchemaManager() );
 
         requestControls = modifyRequest.getControls();

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java?rev=987611&r1=987610&r2=987611&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveAndRenameOperationContext.java Fri Aug 20 19:31:58 2010
@@ -24,7 +24,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControl;
 import org.apache.directory.shared.ldap.exception.LdapInvalidDnException;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyDnRequest;
+import org.apache.directory.shared.ldap.message.ModifyDnRequest;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.name.RDN;
 
@@ -65,7 +65,7 @@ public class MoveAndRenameOperationConte
     }
 
 
-    public MoveAndRenameOperationContext( CoreSession session, InternalModifyDnRequest modifyDnRequest )
+    public MoveAndRenameOperationContext( CoreSession session, ModifyDnRequest modifyDnRequest )
     {
         // super sets the newRdn and the delOldRdn members and tests
         super( session, modifyDnRequest );

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveOperationContext.java?rev=987611&r1=987610&r2=987611&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/MoveOperationContext.java Fri Aug 20 19:31:58 2010
@@ -24,7 +24,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
 import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControl;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyDnRequest;
+import org.apache.directory.shared.ldap.message.ModifyDnRequest;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.name.RDN;
 
@@ -72,7 +72,7 @@ public class MoveOperationContext extend
     }
 
     
-    public MoveOperationContext( CoreSession session, InternalModifyDnRequest modifyDnRequest )
+    public MoveOperationContext( CoreSession session, ModifyDnRequest modifyDnRequest )
     {
         super( session, modifyDnRequest.getName() );
         this.newSuperior = modifyDnRequest.getNewSuperior();

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java?rev=987611&r1=987610&r2=987611&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/RenameOperationContext.java Fri Aug 20 19:31:58 2010
@@ -24,7 +24,7 @@ import org.apache.directory.server.core.
 import org.apache.directory.server.i18n.I18n;
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
 import org.apache.directory.shared.ldap.codec.controls.ManageDsaITControl;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyDnRequest;
+import org.apache.directory.shared.ldap.message.ModifyDnRequest;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.name.RDN;
 
@@ -72,7 +72,7 @@ public class RenameOperationContext exte
     }
 
 
-    public RenameOperationContext( CoreSession session, InternalModifyDnRequest modifyDnRequest )
+    public RenameOperationContext( CoreSession session, ModifyDnRequest modifyDnRequest )
     {
         super( session, modifyDnRequest.getName() );
         this.newRdn = modifyDnRequest.getNewRdn();

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java?rev=987611&r1=987610&r2=987611&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/SearchOperationContext.java Fri Aug 20 19:31:58 2010
@@ -31,7 +31,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.exception.LdapException;
 import org.apache.directory.shared.ldap.filter.ExprNode;
 import org.apache.directory.shared.ldap.filter.SearchScope;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest;
+import org.apache.directory.shared.ldap.message.SearchRequest;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.schema.AttributeTypeOptions;
 
@@ -61,7 +61,7 @@ public class SearchOperationContext exte
      * Creates a new instance of SearchOperationContext.
      * @throws Exception 
      */
-    public SearchOperationContext( CoreSession session, InternalSearchRequest searchRequest ) throws LdapException
+    public SearchOperationContext( CoreSession session, SearchRequest searchRequest ) throws LdapException
     {
         super( session );
         

Modified: directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/UnbindOperationContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/UnbindOperationContext.java?rev=987611&r1=987610&r2=987611&view=diff
==============================================================================
--- directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/UnbindOperationContext.java (original)
+++ directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/UnbindOperationContext.java Fri Aug 20 19:31:58 2010
@@ -22,7 +22,7 @@ package org.apache.directory.server.core
 
 import org.apache.directory.server.core.CoreSession;
 import org.apache.directory.shared.ldap.codec.MessageTypeEnum;
-import org.apache.directory.shared.ldap.message.internal.InternalUnbindRequest;
+import org.apache.directory.shared.ldap.message.UnbindRequest;
 
 
 /**
@@ -42,7 +42,7 @@ public class UnbindOperationContext exte
     }
     
 
-    public UnbindOperationContext( CoreSession session, InternalUnbindRequest unbindRequest )
+    public UnbindOperationContext( CoreSession session, UnbindRequest unbindRequest )
     {
         super( session, session.getEffectivePrincipal().getDN() );
         this.setRequestControls( unbindRequest.getControls() );



Mime
View raw message