directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r985495 [1/7] - in /directory: apacheds/branches/apacheds-codec-merge/core-api/src/main/java/org/apache/directory/server/core/ apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/admin/ apacheds/...
Date Sat, 14 Aug 2010 14:18:55 GMT
Author: elecharny
Date: Sat Aug 14 14:18:49 2010
New Revision: 985495

URL: http://svn.apache.org/viewvc?rev=985495&view=rev
Log:
Renamed all the InternalXXX message interfaces to XXX

Added:
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/AbstractResponse.java
      - copied, changed from r985491, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalAbstractResponse.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/AddResponse.java
      - copied, changed from r985491, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalAddResponse.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/BindResponse.java
      - copied, changed from r985491, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalBindResponse.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/CompareResponse.java
      - copied, changed from r985491, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalCompareResponse.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/DeleteResponse.java
      - copied, changed from r985491, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalDeleteResponse.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/ExtendedResponse.java
      - copied, changed from r985491, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalExtendedResponse.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/LdapResult.java
      - copied, changed from r985491, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalLdapResult.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/ModifyDnResponse.java
      - copied, changed from r985491, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalModifyDnResponse.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/ModifyResponse.java
      - copied, changed from r985491, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalModifyResponse.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/Response.java
      - copied, changed from r985491, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalResponse.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/ResultResponse.java
      - copied, changed from r985491, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalResultResponse.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/SearchResultDone.java
      - copied, changed from r985491, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchResultDone.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/SearchResultEntry.java
      - copied, changed from r985491, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchResultEntry.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/SearchResultReference.java
      - copied, changed from r985491, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchResultReference.java
Removed:
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalAbstractResponse.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalAddResponse.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalBindResponse.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalCompareResponse.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalDeleteResponse.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalExtendedResponse.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalLdapResult.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalModifyDnResponse.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalModifyResponse.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalResponse.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalResultResponse.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchResultDone.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchResultEntry.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchResultReference.java
Modified:
    directory/apacheds/branches/apacheds-codec-merge/core-api/src/main/java/org/apache/directory/server/core/EntryToResponseCursor.java
    directory/apacheds/branches/apacheds-codec-merge/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java
    directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/admin/AdministrativePointServiceIT.java
    directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java
    directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java
    directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java
    directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/AdministratorsGroupIT.java
    directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java
    directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java
    directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java
    directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationIT.java
    directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationIT.java
    directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java
    directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationIT.java
    directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java
    directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java
    directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java
    directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java
    directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java
    directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operations/bind/SimpleBindIT.java
    directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operations/compare/ComparePerfIT.java
    directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupIT.java
    directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operations/lookup/LookupPerfIT.java
    directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operations/moveAndRename/MoveAndRenamePerfIT.java
    directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchBinaryIT.java
    directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java
    directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchPerfIT.java
    directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
    directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java
    directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java
    directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java
    directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAbandonRequestTest.java
    directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java
    directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientCompareRequestTest.java
    directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java
    directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java
    directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java
    directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java
    directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java
    directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/ClientSearchRequestTest.java
    directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/SearchRequestReturningAttributesTest.java
    directory/apacheds/branches/apacheds-codec-merge/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/perf/TestClientApiPerf.java
    directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolHandler.java
    directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/LdapProtocolUtils.java
    directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/AddHandler.java
    directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/BindHandler.java
    directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/CompareHandler.java
    directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/DeleteHandler.java
    directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ExtendedHandler.java
    directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/LdapRequestHandler.java
    directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyDnHandler.java
    directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/ModifyHandler.java
    directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/PersistentSearchListener.java
    directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/SearchHandler.java
    directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/AbstractSaslCallbackHandler.java
    directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/bind/SimpleMechanismHandler.java
    directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StartTlsHandler.java
    directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/handlers/extended/StoredProcedureExtendedOperationHandler.java
    directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaDitStoreUtil.java
    directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java
    directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplProvider.java
    directory/apacheds/branches/apacheds-codec-merge/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplSearchListener.java
    directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/add/AddIT.java
    directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/add/AddingEntriesWithSpecialCharactersInRDNIT.java
    directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java
    directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/bind/SimpleBindIT.java
    directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/compare/CompareIT.java
    directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/delete/DeleteIT.java
    directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/lookup/LookupPerfIT.java
    directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/modify/IllegalModificationIT.java
    directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/MoveIT.java
    directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchIT.java
    directory/apacheds/branches/apacheds-codec-merge/server-integ/src/test/java/org/apache/directory/server/operations/search/SearchPerfIT.java
    directory/apacheds/branches/apacheds-codec-merge/server-tools/src/main/java/org/apache/directory/server/tools/ImportCommand.java
    directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java
    directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
    directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/SearchCursor.java
    directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/AddFuture.java
    directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/BindFuture.java
    directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/CompareFuture.java
    directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/DeleteFuture.java
    directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/ExtendedFuture.java
    directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/ModifyDnFuture.java
    directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/ModifyFuture.java
    directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/future/SearchFuture.java
    directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/AddListener.java
    directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/BindListener.java
    directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/CompareListener.java
    directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/DeleteListener.java
    directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/ExtendedListener.java
    directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/ModifyDnListener.java
    directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/ModifyListener.java
    directory/clients/ldap/branches/ldap-client-codec-merge/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/listener/SearchListener.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageContainer.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ResponseCarryingException.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ErrorMessageAction.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitReferralsAction.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/MatchedDNAction.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ReferralAction.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResponseAction.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResponseNameAction.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResultCodeAction.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/SearchResultAttributeValueAction.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ServerSASLCredsAction.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreReferenceAction.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequestImpl.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddResponseImpl.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindRequestImpl.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindResponseImpl.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequestImpl.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareResponseImpl.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteRequestImpl.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteResponseImpl.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedRequestImpl.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedResponseImpl.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapProtocolEncoder.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapResultImpl.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImpl.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnResponseImpl.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequestImpl.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyResponseImpl.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequestImpl.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResultDoneImpl.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResultEntryImpl.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResultReferenceImpl.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CancelRequest.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CertGenerationRequest.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulShutdownRequest.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/StoredProcedureRequest.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalAbstractResultResponse.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalAddRequest.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalBindRequest.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalCompareRequest.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalDeleteRequest.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalExtendedRequest.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalIntermediateResponse.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalModifyDnRequest.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalModifyRequest.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalResultResponseRequest.java
    directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchRequest.java
    directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java
    directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java
    directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java
    directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareResponseTest.java
    directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java
    directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java
    directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java
    directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java
    directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java
    directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java
    directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java
    directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractResultResponseTest.java
    directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java
    directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindRequestImplTest.java
    directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/CompareRequestImplTest.java
    directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/DeleteRequestImplTest.java
    directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedRequestImplTest.java
    directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedResponseImplTest.java
    directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/LdapResultImplTest.java
    directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImplTest.java
    directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java
    directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseDoneImplTest.java
    directory/shared/branches/shared-codec-merge/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseReferenceImplTest.java

Modified: directory/apacheds/branches/apacheds-codec-merge/core-api/src/main/java/org/apache/directory/server/core/EntryToResponseCursor.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/core-api/src/main/java/org/apache/directory/server/core/EntryToResponseCursor.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/core-api/src/main/java/org/apache/directory/server/core/EntryToResponseCursor.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/core-api/src/main/java/org/apache/directory/server/core/EntryToResponseCursor.java Sat Aug 14 14:18:49 2010
@@ -30,8 +30,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.message.SearchResultDoneImpl;
 import org.apache.directory.shared.ldap.message.SearchResultEntryImpl;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResultDone;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResultEntry;
+import org.apache.directory.shared.ldap.message.internal.SearchResultDone;
+import org.apache.directory.shared.ldap.message.internal.SearchResultEntry;
 
 
 /**
@@ -46,7 +46,7 @@ public class EntryToResponseCursor<Inter
     private Cursor<InternalResponse> wrapped;
 
     /** a reference to hold the SearchResultDone response */
-    private InternalSearchResultDone searchDoneResp;
+    private SearchResultDone searchDoneResp;
 
     private boolean done;
 
@@ -117,7 +117,7 @@ public class EntryToResponseCursor<Inter
     public InternalResponse get() throws Exception
     {
         ClonedServerEntry entry = ( ClonedServerEntry ) wrapped.get();
-        InternalSearchResultEntry se = new SearchResultEntryImpl( messageId );
+        SearchResultEntry se = new SearchResultEntryImpl( messageId );
         se.setEntry( entry );
 
         return ( InternalResponse ) se;
@@ -129,7 +129,7 @@ public class EntryToResponseCursor<Inter
      *
      * @return the SearchResultDone message, null if the search operation fails for any reason
      */
-    public InternalSearchResultDone getSearchDone()
+    public SearchResultDone getSearchDone()
     {
         return searchDoneResp;
     }

Modified: directory/apacheds/branches/apacheds-codec-merge/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java Sat Aug 14 14:18:49 2010
@@ -70,23 +70,23 @@ import org.apache.directory.shared.ldap.
 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.InternalAddResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalBindResponse;
+import org.apache.directory.shared.ldap.message.internal.AddResponse;
+import org.apache.directory.shared.ldap.message.internal.BindResponse;
 import org.apache.directory.shared.ldap.message.internal.InternalCompareRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalCompareResponse;
+import org.apache.directory.shared.ldap.message.internal.CompareResponse;
 import org.apache.directory.shared.ldap.message.internal.InternalDeleteRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalDeleteResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalExtendedResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalLdapResult;
+import org.apache.directory.shared.ldap.message.internal.DeleteResponse;
+import org.apache.directory.shared.ldap.message.internal.ExtendedResponse;
+import org.apache.directory.shared.ldap.message.internal.LdapResult;
 import org.apache.directory.shared.ldap.message.internal.InternalMessage;
 import org.apache.directory.shared.ldap.message.internal.InternalModifyDnRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyDnResponse;
+import org.apache.directory.shared.ldap.message.internal.ModifyDnResponse;
 import org.apache.directory.shared.ldap.message.internal.InternalModifyRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalResponse;
+import org.apache.directory.shared.ldap.message.internal.ModifyResponse;
+import org.apache.directory.shared.ldap.message.internal.Response;
 import org.apache.directory.shared.ldap.message.internal.InternalResultResponseRequest;
 import org.apache.directory.shared.ldap.message.internal.InternalSearchRequest;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResultEntry;
+import org.apache.directory.shared.ldap.message.internal.SearchResultEntry;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.name.RDN;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
@@ -165,17 +165,17 @@ public class LdapCoreSessionConnection i
     }
 
 
-    private InternalLdapResult getDefaultResult()
+    private LdapResult getDefaultResult()
     {
-        InternalLdapResult result = new LdapResultImpl();
+        LdapResult result = new LdapResultImpl();
         result.setResultCode( ResultCodeEnum.SUCCESS );
         return result;
     }
 
 
-    private InternalLdapResult getDefaultCompareResult()
+    private LdapResult getDefaultCompareResult()
     {
-        InternalLdapResult result = new LdapResultImpl();
+        LdapResult result = new LdapResultImpl();
         result.setResultCode( ResultCodeEnum.COMPARE_TRUE );
         return result;
     }
@@ -184,14 +184,14 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      */
-    public InternalAddResponse add( AddRequest addRequest ) throws LdapException
+    public AddResponse add( AddRequest addRequest ) throws LdapException
     {
         int newId = messageId.incrementAndGet();
 
         InternalAddRequest iadd = new AddRequestImpl( newId );
         iadd.setEntry( addRequest.getEntry() );
 
-        InternalAddResponse resp = new AddResponseImpl( newId );
+        AddResponse resp = new AddResponseImpl( newId );
         resp.getLdapResult().setResultCode( ResultCodeEnum.SUCCESS );
 
         try
@@ -214,7 +214,7 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      */
-    public InternalAddResponse add( Entry entry ) throws LdapException
+    public AddResponse add( Entry entry ) throws LdapException
     {
         return add( new AddRequest( entry ) );
     }
@@ -223,11 +223,11 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      */
-    public InternalCompareResponse compare( CompareRequest compareRequest ) throws LdapException
+    public CompareResponse compare( CompareRequest compareRequest ) throws LdapException
     {
         int newId = messageId.incrementAndGet();
 
-        InternalCompareResponse resp = new CompareResponseImpl( newId );
+        CompareResponse resp = new CompareResponseImpl( newId );
         resp.getLdapResult().setResultCode( ResultCodeEnum.COMPARE_TRUE );
 
         InternalCompareRequest icompare = new CompareRequestImpl( newId );
@@ -265,7 +265,7 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      */
-    public InternalCompareResponse compare( DN dn, String attributeName, byte[] value ) throws LdapException
+    public CompareResponse compare( DN dn, String attributeName, byte[] value ) throws LdapException
     {
         CompareRequest compareRequest = new CompareRequest();
         compareRequest.setEntryDn( dn );
@@ -279,7 +279,7 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      */
-    public InternalCompareResponse compare( DN dn, String attributeName, String value ) throws LdapException
+    public CompareResponse compare( DN dn, String attributeName, String value ) throws LdapException
     {
         CompareRequest compareRequest = new CompareRequest();
         compareRequest.setEntryDn( dn );
@@ -293,7 +293,7 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      */
-    public InternalCompareResponse compare( String dn, String attributeName, byte[] value ) throws LdapException
+    public CompareResponse compare( String dn, String attributeName, byte[] value ) throws LdapException
     {
         return compare( new DN( dn ), attributeName, value );
     }
@@ -302,7 +302,7 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      */
-    public InternalCompareResponse compare( String dn, String attributeName, String value ) throws LdapException
+    public CompareResponse compare( String dn, String attributeName, String value ) throws LdapException
     {
         return compare( new DN( dn ), attributeName, value );
     }
@@ -311,7 +311,7 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      */
-    public InternalCompareResponse compare( DN dn, String attributeName, Value<?> value ) throws LdapException
+    public CompareResponse compare( DN dn, String attributeName, Value<?> value ) throws LdapException
     {
         CompareRequest compareRequest = new CompareRequest();
         compareRequest.setEntryDn( dn );
@@ -325,7 +325,7 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      */
-    public InternalCompareResponse compare( String dn, String attributeName, Value<?> value ) throws LdapException
+    public CompareResponse compare( String dn, String attributeName, Value<?> value ) throws LdapException
     {
         return compare( new DN( dn ), attributeName, value );
     }
@@ -334,11 +334,11 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      */
-    public InternalDeleteResponse delete( DeleteRequest deleteRequest ) throws LdapException
+    public DeleteResponse delete( DeleteRequest deleteRequest ) throws LdapException
     {
         int newId = messageId.incrementAndGet();
 
-        InternalDeleteResponse resp = new DeleteResponseImpl( newId );
+        DeleteResponse resp = new DeleteResponseImpl( newId );
         resp.getLdapResult().setResultCode( ResultCodeEnum.SUCCESS );
 
         InternalDeleteRequest idelete = new DeleteRequestImpl( newId );
@@ -364,7 +364,7 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      */
-    public InternalDeleteResponse delete( DN dn ) throws LdapException
+    public DeleteResponse delete( DN dn ) throws LdapException
     {
         DeleteRequest delReq = new DeleteRequest( dn );
         return delete( delReq );
@@ -374,7 +374,7 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      */
-    public InternalDeleteResponse delete( String dn ) throws LdapException
+    public DeleteResponse delete( String dn ) throws LdapException
     {
         return delete( new DN( dn ) );
     }
@@ -446,7 +446,7 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      */
-    public InternalResponse lookup( DN dn, String... attributes ) throws LdapException
+    public Response lookup( DN dn, String... attributes ) throws LdapException
     {
         return _lookup( dn, attributes );
     }
@@ -456,11 +456,11 @@ public class LdapCoreSessionConnection i
      * this method exists solely for the purpose of calling from
      * lookup(DN dn) avoiding the varargs,
      */
-    private InternalResponse _lookup( DN dn, String... attributes )
+    private Response _lookup( DN dn, String... attributes )
     {
         int newId = messageId.incrementAndGet();
 
-        InternalSearchResultEntry resp = null;
+        SearchResultEntry resp = null;
 
         try
         {
@@ -490,7 +490,7 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      */
-    public InternalResponse lookup( String dn, String... attributes ) throws LdapException
+    public Response lookup( String dn, String... attributes ) throws LdapException
     {
         return _lookup( new DN( dn ), attributes );
     }
@@ -499,7 +499,7 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      */
-    public InternalResponse lookup( DN dn ) throws LdapException
+    public Response lookup( DN dn ) throws LdapException
     {
         return _lookup( dn );
     }
@@ -508,7 +508,7 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      */
-    public InternalResponse lookup( String dn ) throws LdapException
+    public Response lookup( String dn ) throws LdapException
     {
         return _lookup( new DN( dn ) );
     }
@@ -517,11 +517,11 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      */
-    public InternalModifyResponse modify( DN dn, Modification... modifications ) throws LdapException
+    public ModifyResponse modify( DN dn, Modification... modifications ) throws LdapException
     {
         int newId = messageId.incrementAndGet();
 
-        InternalModifyResponse resp = new ModifyResponseImpl( newId );
+        ModifyResponse resp = new ModifyResponseImpl( newId );
         resp.getLdapResult().setResultCode( ResultCodeEnum.SUCCESS );
 
         InternalModifyRequest iModReq = new ModifyRequestImpl( newId );
@@ -553,7 +553,7 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      */
-    public InternalModifyResponse modify( String dn, Modification... modifications ) throws LdapException
+    public ModifyResponse modify( String dn, Modification... modifications ) throws LdapException
     {
         return modify( new DN( dn ), modifications );
     }
@@ -562,10 +562,10 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      */
-    public InternalModifyResponse modify( Entry entry, ModificationOperation modOp ) throws LdapException
+    public ModifyResponse modify( Entry entry, ModificationOperation modOp ) throws LdapException
     {
         int newId = messageId.incrementAndGet();
-        InternalModifyResponse resp = new ModifyResponseImpl( newId );
+        ModifyResponse resp = new ModifyResponseImpl( newId );
         resp.getLdapResult().setResultCode( ResultCodeEnum.SUCCESS );
 
         InternalModifyRequest iModReq = new ModifyRequestImpl( newId );
@@ -598,11 +598,11 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      */
-    public InternalModifyResponse modify( ModifyRequest modRequest ) throws LdapException
+    public ModifyResponse modify( ModifyRequest modRequest ) throws LdapException
     {
         int newId = messageId.incrementAndGet();
 
-        InternalModifyResponse resp = new ModifyResponseImpl( newId );
+        ModifyResponse resp = new ModifyResponseImpl( newId );
         resp.getLdapResult().setResultCode( ResultCodeEnum.SUCCESS );
 
         InternalModifyRequest iModReq = new ModifyRequestImpl( newId );
@@ -638,11 +638,11 @@ public class LdapCoreSessionConnection i
      *          cause this we call {@link CoreSession#move(InternalModifyDnRequest)} always from this method.
      *          Instead use other specific modifyDn operations like {@link #move(DN, DN)}, {@link #rename(DN, RDN)} etc..
      */
-    public InternalModifyDnResponse modifyDn( ModifyDnRequest modDnRequest ) throws LdapException
+    public ModifyDnResponse modifyDn( ModifyDnRequest modDnRequest ) throws LdapException
     {
         int newId = messageId.incrementAndGet();
 
-        InternalModifyDnResponse resp = new ModifyDnResponseImpl( newId );
+        ModifyDnResponse resp = new ModifyDnResponseImpl( newId );
         resp.getLdapResult().setResultCode( ResultCodeEnum.SUCCESS );
 
         InternalModifyDnRequest iModDnReq = new ModifyDnRequestImpl( newId );
@@ -672,10 +672,10 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      */
-    public InternalModifyDnResponse move( DN entryDn, DN newSuperiorDn ) throws LdapException
+    public ModifyDnResponse move( DN entryDn, DN newSuperiorDn ) throws LdapException
     {
         int newId = messageId.incrementAndGet();
-        InternalModifyDnResponse resp = new ModifyDnResponseImpl( newId );
+        ModifyDnResponse resp = new ModifyDnResponseImpl( newId );
         resp.getLdapResult().setResultCode( ResultCodeEnum.SUCCESS );
 
         InternalModifyDnRequest iModDnReq = new ModifyDnRequestImpl( newId );
@@ -703,7 +703,7 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      */
-    public InternalModifyDnResponse move( String entryDn, String newSuperiorDn ) throws LdapException
+    public ModifyDnResponse move( String entryDn, String newSuperiorDn ) throws LdapException
     {
         return move( new DN( entryDn ), new DN( newSuperiorDn ) );
     }
@@ -712,11 +712,11 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      */
-    public InternalModifyDnResponse rename( DN entryDn, RDN newRdn, boolean deleteOldRdn ) throws LdapException
+    public ModifyDnResponse rename( DN entryDn, RDN newRdn, boolean deleteOldRdn ) throws LdapException
     {
         int newId = messageId.incrementAndGet();
 
-        InternalModifyDnResponse resp = new ModifyDnResponseImpl( newId );
+        ModifyDnResponse resp = new ModifyDnResponseImpl( newId );
         resp.getLdapResult().setResultCode( ResultCodeEnum.SUCCESS );
 
         InternalModifyDnRequest iModDnReq = new ModifyDnRequestImpl( newId );
@@ -745,7 +745,7 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      */
-    public InternalModifyDnResponse rename( DN entryDn, RDN newRdn ) throws LdapException
+    public ModifyDnResponse rename( DN entryDn, RDN newRdn ) throws LdapException
     {
         return rename( entryDn, newRdn, false );
     }
@@ -754,7 +754,7 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      */
-    public InternalModifyDnResponse rename( String entryDn, String newRdn, boolean deleteOldRdn ) throws LdapException
+    public ModifyDnResponse rename( String entryDn, String newRdn, boolean deleteOldRdn ) throws LdapException
     {
         return rename( new DN( entryDn ), new RDN( newRdn ), deleteOldRdn );
     }
@@ -763,7 +763,7 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      */
-    public InternalModifyDnResponse rename( String entryDn, String newRdn ) throws LdapException
+    public ModifyDnResponse rename( String entryDn, String newRdn ) throws LdapException
     {
         return rename( new DN( entryDn ), new RDN( newRdn ) );
     }
@@ -774,7 +774,7 @@ public class LdapCoreSessionConnection i
      *
      * @see #moveAndRename(DN, DN, boolean)
      */
-    public InternalModifyDnResponse moveAndRename( DN entryDn, DN newDn ) throws LdapException
+    public ModifyDnResponse moveAndRename( DN entryDn, DN newDn ) throws LdapException
     {
         return moveAndRename( entryDn, newDn, true );
     }
@@ -785,7 +785,7 @@ public class LdapCoreSessionConnection i
      *
      * @see #moveAndRename(DN, DN, boolean)
      */
-    public InternalModifyDnResponse moveAndRename( String entryDn, String newDn ) throws LdapException
+    public ModifyDnResponse moveAndRename( String entryDn, String newDn ) throws LdapException
     {
         return moveAndRename( new DN( entryDn ), new DN( newDn ), true );
     }
@@ -798,7 +798,7 @@ public class LdapCoreSessionConnection i
      * @param newDn The new Entry DN
      * @param deleteOldRdn Tells if the old RDN must be removed
      */
-    public InternalModifyDnResponse moveAndRename( DN entryDn, DN newDn, boolean deleteOldRdn ) throws LdapException
+    public ModifyDnResponse moveAndRename( DN entryDn, DN newDn, boolean deleteOldRdn ) throws LdapException
     {
         // Check the parameters first
         if ( entryDn == null )
@@ -823,7 +823,7 @@ public class LdapCoreSessionConnection i
 
         int newId = messageId.incrementAndGet();
 
-        InternalModifyDnResponse resp = new ModifyDnResponseImpl( newId );
+        ModifyDnResponse resp = new ModifyDnResponseImpl( newId );
         resp.getLdapResult().setResultCode( ResultCodeEnum.SUCCESS );
 
         InternalModifyDnRequest iModDnReq = new ModifyDnRequestImpl( newId );
@@ -856,7 +856,7 @@ public class LdapCoreSessionConnection i
      * @param newDn The new Entry DN
      * @param deleteOldRdn Tells if the old RDN must be removed
      */
-    public InternalModifyDnResponse moveAndRename( String entryDn, String newDn, boolean deleteOldRdn )
+    public ModifyDnResponse moveAndRename( String entryDn, String newDn, boolean deleteOldRdn )
         throws LdapException
     {
         return moveAndRename( new DN( entryDn ), new DN( newDn ), deleteOldRdn );
@@ -866,7 +866,7 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      */
-    public Cursor<InternalResponse> search( SearchRequest searchRequest ) throws LdapException
+    public Cursor<Response> search( SearchRequest searchRequest ) throws LdapException
     {
         try
         {
@@ -900,14 +900,14 @@ public class LdapCoreSessionConnection i
             LOG.warn( e.getMessage(), e );
         }
 
-        return new EntryToResponseCursor<InternalResponse>( -1, new EmptyCursor<InternalResponse>() );
+        return new EntryToResponseCursor<Response>( -1, new EmptyCursor<Response>() );
     }
 
 
     /**
      * {@inheritDoc}
      */
-    public Cursor<InternalResponse> 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
@@ -926,7 +926,7 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      */
-    public Cursor<InternalResponse> 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 );
@@ -950,7 +950,7 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      */
-    public InternalExtendedResponse extended( String oid ) throws LdapException
+    public ExtendedResponse extended( String oid ) throws LdapException
     {
         throw new UnsupportedOperationException(
             "extended operations are not supported on CoreSession based connection" );
@@ -960,7 +960,7 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      */
-    public InternalExtendedResponse extended( ExtendedRequest extendedRequest ) throws LdapException
+    public ExtendedResponse extended( ExtendedRequest extendedRequest ) throws LdapException
     {
         return extended( ( String ) null );
 
@@ -970,7 +970,7 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      */
-    public InternalExtendedResponse extended( OID oid, byte[] value ) throws LdapException
+    public ExtendedResponse extended( OID oid, byte[] value ) throws LdapException
     {
         return extended( ( String ) null );
     }
@@ -979,7 +979,7 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      */
-    public InternalExtendedResponse extended( OID oid ) throws LdapException
+    public ExtendedResponse extended( OID oid ) throws LdapException
     {
         return extended( ( String ) null );
     }
@@ -988,7 +988,7 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      */
-    public InternalExtendedResponse extended( String oid, byte[] value ) throws LdapException
+    public ExtendedResponse extended( String oid, byte[] value ) throws LdapException
     {
         return extended( ( String ) null );
     }
@@ -1024,7 +1024,7 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      */
-    public InternalBindResponse bind() throws LdapException, IOException
+    public BindResponse bind() throws LdapException, IOException
     {
         BindRequest bindReq = new BindRequest();
         bindReq.setName( "" );
@@ -1037,7 +1037,7 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      */
-    public InternalBindResponse bind( BindRequest bindRequest ) throws LdapException, IOException
+    public BindResponse bind( BindRequest bindRequest ) throws LdapException, IOException
     {
         int newId = messageId.incrementAndGet();
 
@@ -1047,7 +1047,7 @@ public class LdapCoreSessionConnection i
 
         OperationManager operationManager = directoryService.getOperationManager();
 
-        InternalBindResponse bindResp = new BindResponseImpl( newId );
+        BindResponse bindResp = new BindResponseImpl( newId );
         bindResp.getLdapResult().setResultCode( ResultCodeEnum.SUCCESS );
 
         try
@@ -1065,7 +1065,7 @@ public class LdapCoreSessionConnection i
         catch ( LdapOperationException e )
         {
             LOG.warn( e.getMessage(), e );
-            InternalLdapResult res = bindResp.getLdapResult();
+            LdapResult res = bindResp.getLdapResult();
             res.setErrorMessage( e.getMessage() );
             res.setResultCode( e.getResultCode() );
         }
@@ -1077,7 +1077,7 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      */
-    public InternalBindResponse bind( DN name, String credentials ) throws LdapException, IOException
+    public BindResponse bind( DN name, String credentials ) throws LdapException, IOException
     {
         byte[] credBytes = ( credentials == null ? StringTools.EMPTY_BYTES : StringTools.getBytesUtf8( credentials ) );
 
@@ -1092,7 +1092,7 @@ public class LdapCoreSessionConnection i
     /**
      * {@inheritDoc}
      */
-    public InternalBindResponse bind( String name, String credentials ) throws LdapException, IOException
+    public BindResponse bind( String name, String credentials ) throws LdapException, IOException
     {
         return bind( new DN( name ), credentials );
     }

Modified: directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/admin/AdministrativePointServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/admin/AdministrativePointServiceIT.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/admin/AdministrativePointServiceIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/admin/AdministrativePointServiceIT.java Sat Aug 14 14:18:49 2010
@@ -35,11 +35,11 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.entry.ModificationOperation;
 import org.apache.directory.shared.ldap.ldif.LdifUtils;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.message.internal.InternalAddResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyDnResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResultEntry;
+import org.apache.directory.shared.ldap.message.internal.AddResponse;
+import org.apache.directory.shared.ldap.message.internal.ModifyDnResponse;
+import org.apache.directory.shared.ldap.message.internal.ModifyResponse;
+import org.apache.directory.shared.ldap.message.internal.Response;
+import org.apache.directory.shared.ldap.message.internal.SearchResultEntry;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -74,11 +74,11 @@ public class AdministrativePointServiceI
 
     private Entry getAdminRole( String dn ) throws Exception
     {
-        InternalResponse lookup = connection.lookup( dn, "administrativeRole" );
+        Response lookup = connection.lookup( dn, "administrativeRole" );
 
-        assertTrue( lookup instanceof InternalSearchResultEntry );
+        assertTrue( lookup instanceof SearchResultEntry );
 
-        Entry entry = ( ( InternalSearchResultEntry ) lookup ).getEntry();
+        Entry entry = ( ( SearchResultEntry ) lookup ).getEntry();
 
         return entry;
     }
@@ -98,7 +98,7 @@ public class AdministrativePointServiceI
             "ObjectClass: organizationalUnit", "ou: autonomousArea", "administrativeRole: autonomousArea" );
 
         // It should succeed
-        InternalAddResponse response = connection.add( autonomousArea );
+        AddResponse response = connection.add( autonomousArea );
 
         assertEquals( ResultCodeEnum.SUCCESS, response.getLdapResult().getResultCode() );
 
@@ -135,7 +135,7 @@ public class AdministrativePointServiceI
             "ObjectClass: organizationalUnit", "ou: autonomousArea", "administrativeRole: accessControlSpecificArea",
             "administrativeRole: TRIGGEREXECUTIONSPECIFICAREA" );
 
-        InternalAddResponse response = connection.add( autonomousArea );
+        AddResponse response = connection.add( autonomousArea );
 
         assertEquals( ResultCodeEnum.SUCCESS, response.getLdapResult().getResultCode() );
 
@@ -161,7 +161,7 @@ public class AdministrativePointServiceI
             "ObjectClass: organizationalUnit", "ou: autonomousArea", "administrativeRole: accessControlINNERArea",
             "administrativeRole: TRIGGEREXECUTIONINNERAREA" );
 
-        InternalAddResponse response = connection.add( autonomousArea );
+        AddResponse response = connection.add( autonomousArea );
 
         assertEquals( ResultCodeEnum.SUCCESS, response.getLdapResult().getResultCode() );
 
@@ -185,7 +185,7 @@ public class AdministrativePointServiceI
             "ObjectClass: organizationalUnit", "ou: autonomousArea", "administrativeRole: accessControlBadArea",
             "administrativeRole: TRIGGEREXECUTIONINNERAREA" );
 
-        InternalAddResponse response = connection.add( autonomousArea );
+        AddResponse response = connection.add( autonomousArea );
 
         assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, response.getLdapResult().getResultCode() );
     }
@@ -202,7 +202,7 @@ public class AdministrativePointServiceI
             "ObjectClass: organizationalUnit", "ou: autonomousArea", "administrativeRole: accessControlSpecificArea",
             "administrativeRole: accessControlInnerArea" );
 
-        InternalAddResponse response = connection.add( autonomousArea );
+        AddResponse response = connection.add( autonomousArea );
 
         assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, response.getLdapResult().getResultCode() );
     }
@@ -227,7 +227,7 @@ public class AdministrativePointServiceI
         // Add another specific area
         Modification modification = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE,
             new DefaultEntryAttribute( "administrativeRole", "accessControlSpecificArea" ) );
-        InternalModifyResponse response = connection.modify( "ou=caArea, ou=system", modification );
+        ModifyResponse response = connection.modify( "ou=caArea, ou=system", modification );
 
         assertEquals( ResultCodeEnum.SUCCESS, response.getLdapResult().getResultCode() );
         Entry entry = getAdminRole( "ou=caArea, ou=system" );
@@ -253,7 +253,7 @@ public class AdministrativePointServiceI
         // Add another specific area
         Modification modification = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE,
             new DefaultEntryAttribute( "administrativeRole", "accessControlInnerArea" ) );
-        InternalModifyResponse response = connection.modify( "ou=caArea, ou=system", modification );
+        ModifyResponse response = connection.modify( "ou=caArea, ou=system", modification );
 
         assertEquals( ResultCodeEnum.SUCCESS, response.getLdapResult().getResultCode() );
         Entry entry = getAdminRole( "ou=caArea, ou=system" );
@@ -279,7 +279,7 @@ public class AdministrativePointServiceI
         // Add another specific area
         Modification modification = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE,
             new DefaultEntryAttribute( "administrativeRole", "collectiveAttributeInnerArea" ) );
-        InternalModifyResponse response = connection.modify( "ou=caArea, ou=system", modification );
+        ModifyResponse response = connection.modify( "ou=caArea, ou=system", modification );
 
         assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, response.getLdapResult().getResultCode() );
     }
@@ -301,7 +301,7 @@ public class AdministrativePointServiceI
         // Add another specific area
         Modification modification = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE,
             new DefaultEntryAttribute( "administrativeRole", "collectiveAttributeSpecificArea" ) );
-        InternalModifyResponse response = connection.modify( "ou=caArea, ou=system", modification );
+        ModifyResponse response = connection.modify( "ou=caArea, ou=system", modification );
 
         assertEquals( ResultCodeEnum.ATTRIBUTE_OR_VALUE_EXISTS, response.getLdapResult().getResultCode() );
     }
@@ -324,7 +324,7 @@ public class AdministrativePointServiceI
         // Add another specific area
         Modification modification = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE,
             new DefaultEntryAttribute( "administrativeRole" ) );
-        InternalModifyResponse response = connection.modify( "ou=caArea, ou=system", modification );
+        ModifyResponse response = connection.modify( "ou=caArea, ou=system", modification );
 
         assertEquals( ResultCodeEnum.SUCCESS, response.getLdapResult().getResultCode() );
         Entry entry = getAdminRole( "ou=caArea, ou=system" );
@@ -351,7 +351,7 @@ public class AdministrativePointServiceI
         Modification modification = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE,
             new DefaultEntryAttribute( "administrativeRole", "collectiveAttributeSpecificArea",
                 "accessControlSpecificArea" ) );
-        InternalModifyResponse response = connection.modify( "ou=caArea, ou=system", modification );
+        ModifyResponse response = connection.modify( "ou=caArea, ou=system", modification );
 
         assertEquals( ResultCodeEnum.SUCCESS, response.getLdapResult().getResultCode() );
         Entry entry = getAdminRole( "ou=caArea, ou=system" );
@@ -377,7 +377,7 @@ public class AdministrativePointServiceI
         // Add another specific area
         Modification modification = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE,
             new DefaultEntryAttribute( "administrativeRole", "accessControlSpecificArea" ) );
-        InternalModifyResponse response = connection.modify( "ou=caArea, ou=system", modification );
+        ModifyResponse response = connection.modify( "ou=caArea, ou=system", modification );
 
         assertEquals( ResultCodeEnum.SUCCESS, response.getLdapResult().getResultCode() );
         Entry entry = getAdminRole( "ou=caArea, ou=system" );
@@ -405,7 +405,7 @@ public class AdministrativePointServiceI
         // Add another specific area
         Modification modification = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE,
             new DefaultEntryAttribute( "administrativeRole", "triggerExecutionSpecificArea" ) );
-        InternalModifyResponse response = connection.modify( "ou=caArea, ou=system", modification );
+        ModifyResponse response = connection.modify( "ou=caArea, ou=system", modification );
 
         assertEquals( ResultCodeEnum.NO_SUCH_ATTRIBUTE, response.getLdapResult().getResultCode() );
     }
@@ -431,7 +431,7 @@ public class AdministrativePointServiceI
         Modification modification2 = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE,
             new DefaultEntryAttribute( "administrativeRole", "triggerExecutionSpecificArea" ) );
 
-        InternalModifyResponse response = connection.modify( "ou=caArea, ou=system", modification1, modification2,
+        ModifyResponse response = connection.modify( "ou=caArea, ou=system", modification1, modification2,
             modification1 );
 
         assertEquals( ResultCodeEnum.SUCCESS, response.getLdapResult().getResultCode() );
@@ -460,7 +460,7 @@ public class AdministrativePointServiceI
         // Try to modify it to an InnerArea
         Modification modification = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE,
             new DefaultEntryAttribute( "administrativeRole", "collectiveAttributeSpecificArea" ) );
-        InternalModifyResponse response = connection.modify( "ou=caArea, ou=system", modification );
+        ModifyResponse response = connection.modify( "ou=caArea, ou=system", modification );
 
         // Should fail
         assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, response.getLdapResult().getResultCode() );
@@ -484,7 +484,7 @@ public class AdministrativePointServiceI
         connection.add( autonomousArea );
 
         // It should fail, as we haven't injected all the roles
-        InternalModifyDnResponse response = connection.move( "ou=autonomousArea, ou=system", "uid=admin, ou=system" );
+        ModifyDnResponse response = connection.move( "ou=autonomousArea, ou=system", "uid=admin, ou=system" );
 
         assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, response.getLdapResult().getResultCode() );
     }
@@ -507,7 +507,7 @@ public class AdministrativePointServiceI
         connection.add( autonomousArea );
 
         // It should fail, as we haven't injected all the roles
-        InternalModifyDnResponse response = connection.moveAndRename( "ou=autonomousArea, ou=system",
+        ModifyDnResponse response = connection.moveAndRename( "ou=autonomousArea, ou=system",
             "ou=new autonomousArea, uid=admin, ou=system" );
 
         assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, response.getLdapResult().getResultCode() );
@@ -531,7 +531,7 @@ public class AdministrativePointServiceI
         connection.add( autonomousArea );
 
         // It should fail, as we haven't injected all the roles
-        InternalModifyDnResponse response = connection.rename( "ou=autonomousArea, ou=system", "ou=new autonomousArea" );
+        ModifyDnResponse response = connection.rename( "ou=autonomousArea, ou=system", "ou=new autonomousArea" );
 
         assertEquals( ResultCodeEnum.UNWILLING_TO_PERFORM, response.getLdapResult().getResultCode() );
     }

Modified: directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java Sat Aug 14 14:18:49 2010
@@ -37,8 +37,8 @@ import org.apache.directory.server.core.
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
-import org.apache.directory.shared.ldap.message.internal.InternalBindResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalSearchResultEntry;
+import org.apache.directory.shared.ldap.message.internal.BindResponse;
+import org.apache.directory.shared.ldap.message.internal.SearchResultEntry;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.junit.After;
@@ -90,7 +90,7 @@ public class SimpleAuthenticationIT exte
         String userDn = "uid=admin,ou=system";
         LdapConnection connection = getConnectionAs( service, userDn, "secret" );
 
-        Entry entry = ( ( InternalSearchResultEntry ) connection.lookup( userDn ) ).getEntry();
+        Entry entry = ( ( SearchResultEntry ) connection.lookup( userDn ) ).getEntry();
         performAdminAccountChecks( entry );
         assertTrue( ArrayUtils.isEquals( entry.get( "userPassword" ).get().getBytes(), StringTools
             .getBytesUtf8( "secret" ) ) );
@@ -100,7 +100,7 @@ public class SimpleAuthenticationIT exte
         service.startup();
 
         connection = getConnectionAs( service, userDn, "secret" );
-        entry = ( ( InternalSearchResultEntry ) connection.lookup( userDn ) ).getEntry();
+        entry = ( ( SearchResultEntry ) connection.lookup( userDn ) ).getEntry();
         performAdminAccountChecks( entry );
         assertTrue( ArrayUtils.isEquals( entry.get( "userPassword" ).get().getBytes(), StringTools
             .getBytesUtf8( "secret" ) ) );
@@ -115,7 +115,7 @@ public class SimpleAuthenticationIT exte
         String userDn = "uid=akarasulu,ou=users,ou=system";
         LdapConnection connection = getConnectionAs( service, userDn, "test" );
 
-        Entry entry = ( ( InternalSearchResultEntry ) connection.lookup( userDn ) ).getEntry();
+        Entry entry = ( ( SearchResultEntry ) connection.lookup( userDn ) ).getEntry();
         EntryAttribute ou = entry.get( "ou" );
         assertTrue( ou.contains( "Engineering" ) );
         assertTrue( ou.contains( "People" ) );
@@ -180,7 +180,7 @@ public class SimpleAuthenticationIT exte
 
         LdapConnection connection = getConnectionAs( service, userDn, "test" );
 
-        Entry entry = ( ( InternalSearchResultEntry ) connection.lookup( userDn ) ).getEntry();
+        Entry entry = ( ( SearchResultEntry ) connection.lookup( userDn ) ).getEntry();
         EntryAttribute ou = entry.get( "ou" );
         assertTrue( ou.contains( "Engineering" ) );
         assertTrue( ou.contains( "People" ) );
@@ -209,13 +209,13 @@ public class SimpleAuthenticationIT exte
         // close and try with old password (should fail)
         connection.close();
 
-        InternalBindResponse bindResp = connection.bind( userDn, "test" );
+        BindResponse bindResp = connection.bind( userDn, "test" );
         assertEquals( ResultCodeEnum.INVALID_CREDENTIALS, bindResp.getLdapResult().getResultCode() );
 
         // close and try again now with new password (should succeed)
         connection.bind( userDn, "newpwd" );
 
-        entry = ( ( InternalSearchResultEntry ) connection.lookup( userDn ) ).getEntry();
+        entry = ( ( SearchResultEntry ) connection.lookup( userDn ) ).getEntry();
         ou = entry.get( "ou" );
         assertTrue( ou.contains( "Engineering" ) );
         assertTrue( ou.contains( "People" ) );
@@ -247,7 +247,7 @@ public class SimpleAuthenticationIT exte
 
         // Check that we can get the attributes
 
-        Entry entry = ( ( InternalSearchResultEntry ) connection.lookup( userDn ) ).getEntry();
+        Entry entry = ( ( SearchResultEntry ) connection.lookup( userDn ) ).getEntry();
         assertNotNull( entry );
         assertTrue( entry.get( "uid" ).contains( "akarasulu" ) );
 
@@ -259,13 +259,13 @@ public class SimpleAuthenticationIT exte
         // close and try with old password (should fail)
         connection.close();
 
-        InternalBindResponse bindResp = connection.bind( userDn, "test" );
+        BindResponse bindResp = connection.bind( userDn, "test" );
         assertEquals( ResultCodeEnum.INVALID_CREDENTIALS, bindResp.getLdapResult().getResultCode() );
 
         // try again now with new password (should be successful)
         connection.bind( userDn, "secret" );
         assertTrue( connection.isAuthenticated() );
-        entry = ( ( InternalSearchResultEntry ) connection.lookup( userDn ) ).getEntry();
+        entry = ( ( SearchResultEntry ) connection.lookup( userDn ) ).getEntry();
         assertNotNull( entry );
         assertTrue( entry.get( "uid" ).contains( "akarasulu" ) );
 
@@ -274,7 +274,7 @@ public class SimpleAuthenticationIT exte
         connection.close();
         connection.bind( userDn, "secret" );
         assertTrue( connection.isAuthenticated() );
-        entry = ( ( InternalSearchResultEntry ) connection.lookup( userDn ) ).getEntry();
+        entry = ( ( SearchResultEntry ) connection.lookup( userDn ) ).getEntry();
         assertNotNull( entry );
         assertTrue( entry.get( "uid" ).contains( "akarasulu" ) );
     }
@@ -288,7 +288,7 @@ public class SimpleAuthenticationIT exte
         LdapConnection connection = getConnectionAs( service, userDn, "test" );
 
         // Check that we can get the attributes
-        Entry entry = ( ( InternalSearchResultEntry ) connection.lookup( userDn ) ).getEntry();
+        Entry entry = ( ( SearchResultEntry ) connection.lookup( userDn ) ).getEntry();
         assertNotNull( entry );
         assertTrue( entry.get( "uid" ).contains( "akarasulu" ) );
 
@@ -300,12 +300,12 @@ public class SimpleAuthenticationIT exte
         // close and try with old password (should fail)
         connection.close();
 
-        InternalBindResponse bindResp = connection.bind( userDn, "test" );
+        BindResponse bindResp = connection.bind( userDn, "test" );
         assertEquals( ResultCodeEnum.INVALID_CREDENTIALS, bindResp.getLdapResult().getResultCode() );
 
         // try again now with new password (should be successful)
         connection.bind( userDn, "secret" );
-        entry = ( ( InternalSearchResultEntry ) connection.lookup( userDn ) ).getEntry();
+        entry = ( ( SearchResultEntry ) connection.lookup( userDn ) ).getEntry();
         assertNotNull( entry );
         assertTrue( entry.get( "uid" ).contains( "akarasulu" ) );
 
@@ -313,7 +313,7 @@ public class SimpleAuthenticationIT exte
         // cache is updated (should be successfull)
         connection.close();
         connection.bind( userDn, "secret" );
-        entry = ( ( InternalSearchResultEntry ) connection.lookup( userDn ) ).getEntry();
+        entry = ( ( SearchResultEntry ) connection.lookup( userDn ) ).getEntry();
         assertNotNull( entry );
         assertTrue( entry.get( "uid" ).contains( "akarasulu" ) );
     }
@@ -327,7 +327,7 @@ public class SimpleAuthenticationIT exte
         LdapConnection connection = getConnectionAs( service, userDn, "test" );
 
         // Check that we can get the attributes
-        Entry entry = ( ( InternalSearchResultEntry ) connection.lookup( userDn ) ).getEntry();
+        Entry entry = ( ( SearchResultEntry ) connection.lookup( userDn ) ).getEntry();
         assertNotNull( entry );
         assertTrue( entry.get( "uid" ).contains( "akarasulu" ) );
 
@@ -339,12 +339,12 @@ public class SimpleAuthenticationIT exte
         // close and try with old password (should fail)
         connection.close();
 
-        InternalBindResponse bindResp = connection.bind( userDn, "test" );
+        BindResponse bindResp = connection.bind( userDn, "test" );
         assertEquals( ResultCodeEnum.INVALID_CREDENTIALS, bindResp.getLdapResult().getResultCode() );
 
         // try again now with new password (should be successful)
         connection.bind( userDn, "test123" );
-        entry = ( ( InternalSearchResultEntry ) connection.lookup( userDn ) ).getEntry();
+        entry = ( ( SearchResultEntry ) connection.lookup( userDn ) ).getEntry();
         assertNotNull( entry );
         assertTrue( entry.get( "uid" ).contains( "akarasulu" ) );
 
@@ -352,7 +352,7 @@ public class SimpleAuthenticationIT exte
         // cache is updated (should be successfull)
         connection.close();
         connection.bind( userDn, "test123" );
-        entry = ( ( InternalSearchResultEntry ) connection.lookup( userDn ) ).getEntry();
+        entry = ( ( SearchResultEntry ) connection.lookup( userDn ) ).getEntry();
         assertNotNull( entry );
         assertTrue( entry.get( "uid" ).contains( "akarasulu" ) );
     }
@@ -366,7 +366,7 @@ public class SimpleAuthenticationIT exte
         LdapConnection connection = getConnectionAs( service, userDn, "test" );
 
         // Check that we can get the attributes
-        Entry entry = ( ( InternalSearchResultEntry ) connection.lookup( userDn ) ).getEntry();
+        Entry entry = ( ( SearchResultEntry ) connection.lookup( userDn ) ).getEntry();
         assertNotNull( entry );
         assertTrue( entry.get( "uid" ).contains( "akarasulu" ) );
 
@@ -378,12 +378,12 @@ public class SimpleAuthenticationIT exte
         // close and try with old password (should fail)
         connection.close();
 
-        InternalBindResponse bindResp = connection.bind( userDn, "test" );
+        BindResponse bindResp = connection.bind( userDn, "test" );
         assertEquals( ResultCodeEnum.INVALID_CREDENTIALS, bindResp.getLdapResult().getResultCode() );
 
         // try again now with new password (should be successful)
         connection.bind( userDn, "secret" );
-        entry = ( ( InternalSearchResultEntry ) connection.lookup( userDn ) ).getEntry();
+        entry = ( ( SearchResultEntry ) connection.lookup( userDn ) ).getEntry();
         assertNotNull( entry );
         assertTrue( entry.get( "uid" ).contains( "akarasulu" ) );
 
@@ -392,7 +392,7 @@ public class SimpleAuthenticationIT exte
 
         connection.close();
         connection.bind( userDn, "secret" );
-        entry = ( ( InternalSearchResultEntry ) connection.lookup( userDn ) ).getEntry();
+        entry = ( ( SearchResultEntry ) connection.lookup( userDn ) ).getEntry();
         assertNotNull( entry );
         assertTrue( entry.get( "uid" ).contains( "akarasulu" ) );
     }
@@ -406,7 +406,7 @@ public class SimpleAuthenticationIT exte
         LdapConnection connection = getConnectionAs( service, userDn, "test" );
 
         // Check that we can get the attributes
-        Entry entry = ( ( InternalSearchResultEntry ) connection.lookup( userDn ) ).getEntry();
+        Entry entry = ( ( SearchResultEntry ) connection.lookup( userDn ) ).getEntry();
         assertNotNull( entry );
         assertTrue( entry.get( "uid" ).contains( "akarasulu" ) );
 
@@ -418,12 +418,12 @@ public class SimpleAuthenticationIT exte
         // close and try with old password (should fail)
         connection.close();
 
-        InternalBindResponse bindResp = connection.bind( userDn, "test" );
+        BindResponse bindResp = connection.bind( userDn, "test" );
         assertEquals( ResultCodeEnum.INVALID_CREDENTIALS, bindResp.getLdapResult().getResultCode() );
 
         // try again now with new password (should be successful)
         connection.bind( userDn, "secret" );
-        entry = ( ( InternalSearchResultEntry ) connection.lookup( userDn ) ).getEntry();
+        entry = ( ( SearchResultEntry ) connection.lookup( userDn ) ).getEntry();
         assertNotNull( entry );
         assertTrue( entry.get( "uid" ).contains( "akarasulu" ) );
 
@@ -431,7 +431,7 @@ public class SimpleAuthenticationIT exte
         // cache is updated (should be successfull)
         connection.close();
         connection.bind( userDn, "secret" );
-        entry = ( ( InternalSearchResultEntry ) connection.lookup( userDn ) ).getEntry();
+        entry = ( ( SearchResultEntry ) connection.lookup( userDn ) ).getEntry();
         assertNotNull( entry );
         assertTrue( entry.get( "uid" ).contains( "akarasulu" ) );
     }
@@ -445,7 +445,7 @@ public class SimpleAuthenticationIT exte
         LdapConnection connection = getConnectionAs( service, userDn, "test" );
 
         // Check that we can get the attributes
-        Entry entry = ( ( InternalSearchResultEntry ) connection.lookup( userDn ) ).getEntry();
+        Entry entry = ( ( SearchResultEntry ) connection.lookup( userDn ) ).getEntry();
         assertNotNull( entry );
         assertTrue( entry.get( "uid" ).contains( "akarasulu" ) );
 
@@ -457,19 +457,19 @@ public class SimpleAuthenticationIT exte
         // close and try with old password (should fail)
         connection.close();
 
-        InternalBindResponse bindResp = connection.bind( userDn, "test" );
+        BindResponse bindResp = connection.bind( userDn, "test" );
         assertEquals( ResultCodeEnum.INVALID_CREDENTIALS, bindResp.getLdapResult().getResultCode() );
 
         // try again now with new password (should be successful)
         connection.bind( userDn, "secret" );
-        entry = ( ( InternalSearchResultEntry ) connection.lookup( userDn ) ).getEntry();
+        entry = ( ( SearchResultEntry ) connection.lookup( userDn ) ).getEntry();
         assertNotNull( entry );
         assertTrue( entry.get( "uid" ).contains( "akarasulu" ) );
 
         // try again now with new password, to check that the
         // cache is updated (should be successfull)
         connection.bind( userDn, "secret" );
-        entry = ( ( InternalSearchResultEntry ) connection.lookup( userDn ) ).getEntry();
+        entry = ( ( SearchResultEntry ) connection.lookup( userDn ) ).getEntry();
         assertNotNull( entry );
         assertTrue( entry.get( "uid" ).contains( "akarasulu" ) );
     }
@@ -495,7 +495,7 @@ public class SimpleAuthenticationIT exte
         connection.modify( modReq );
         connection.close();
 
-        InternalBindResponse bindResp = connection.bind( userDn, "test" );
+        BindResponse bindResp = connection.bind( userDn, "test" );
         assertEquals( ResultCodeEnum.INVALID_CREDENTIALS, bindResp.getLdapResult().getResultCode() );
     }
 }

Modified: directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java?rev=985495&r1=985494&r2=985495&view=diff
==============================================================================
--- directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java (original)
+++ directory/apacheds/branches/apacheds-codec-merge/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java Sat Aug 14 14:18:49 2010
@@ -55,9 +55,9 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.ldif.LdifUtils;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.message.control.Control;
-import org.apache.directory.shared.ldap.message.internal.InternalAddResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalModifyResponse;
-import org.apache.directory.shared.ldap.message.internal.InternalResponse;
+import org.apache.directory.shared.ldap.message.internal.AddResponse;
+import org.apache.directory.shared.ldap.message.internal.ModifyResponse;
+import org.apache.directory.shared.ldap.message.internal.Response;
 import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.junit.After;
@@ -128,7 +128,7 @@ public class PasswordPolicyTest extends 
         AddRequest addReq = new AddRequest( userEntry );
         addReq.add( PP_REQ_CTRL );
 
-        InternalAddResponse addResp = connection.add( addReq );
+        AddResponse addResp = connection.add( addReq );
         assertEquals( ResultCodeEnum.CONSTRAINT_VIOLATION, addResp.getLdapResult().getResultCode() );
 
         PasswordPolicyResponseControl respCtrl = getPwdRespCtrl( addResp );
@@ -170,7 +170,7 @@ public class PasswordPolicyTest extends 
         AddRequest addReq = new AddRequest( userEntry );
         addReq.add( PP_REQ_CTRL );
 
-        InternalAddResponse addResp = connection.add( addReq );
+        AddResponse addResp = connection.add( addReq );
         assertEquals( ResultCodeEnum.CONSTRAINT_VIOLATION, addResp.getLdapResult().getResultCode() );
 
         PasswordPolicyResponseControl respCtrl = getPwdRespCtrl( addResp );
@@ -208,7 +208,7 @@ public class PasswordPolicyTest extends 
         AddRequest addReq = new AddRequest( userEntry );
         addReq.add( PP_REQ_CTRL );
 
-        InternalAddResponse addResp = connection.add( addReq );
+        AddResponse addResp = connection.add( addReq );
         assertEquals( ResultCodeEnum.SUCCESS, addResp.getLdapResult().getResultCode() );
 
         PasswordPolicyResponseControl respCtrl = getPwdRespCtrl( addResp );
@@ -218,7 +218,7 @@ public class PasswordPolicyTest extends 
         modReq.add( PP_REQ_CTRL );
         modReq.replace( SchemaConstants.USER_PASSWORD_AT, "123456" );
 
-        InternalModifyResponse modResp = connection.modify( modReq );
+        ModifyResponse modResp = connection.modify( modReq );
         assertEquals( ResultCodeEnum.CONSTRAINT_VIOLATION, modResp.getLdapResult().getResultCode() );
 
         respCtrl = getPwdRespCtrl( modResp );
@@ -235,7 +235,7 @@ public class PasswordPolicyTest extends 
     }
 
 
-    private PasswordPolicyResponseControl getPwdRespCtrl( InternalResponse resp ) throws Exception
+    private PasswordPolicyResponseControl getPwdRespCtrl( Response resp ) throws Exception
     {
         Control ctrl = resp.getControls().get( PP_REQ_CTRL.getOid() );
 



Mime
View raw message