You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2011/02/06 20:39:40 UTC
svn commit: r1067736 [1/4] - in /directory:
apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/
apacheds/branches/m1/core-api/src/test/java/org/apache/directory/server/core/
apacheds/branches/m1/core-integ/src/test/java/org/ap...
Author: akarasulu
Date: Sun Feb 6 19:39:34 2011
New Revision: 1067736
URL: http://svn.apache.org/viewvc?rev=1067736&view=rev
Log:
DIRSHARED-80, DIRSHARED-81, DIRSHARERD-82, DIRSHARED-83
o formatting, spelling and documentation cleanup
o renaming some interfaces to follow convensions
o moved API related public classes in codec to codec.api pkg
o copied AttributeValueAssertion class to dsml-parser which will most
likely be deleted once the noraml filter mechanism is used in the model
o the DSML parser now only depends on the codec API minus the default
implementation class now
Added:
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Action.java
- copied, changed from r1067704, directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/IAction.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Grammar.java
- copied, changed from r1067704, directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/IGrammar.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AttributeValueAssertion.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/api/CodecControl.java
- copied, changed from r1067704, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/CodecControl.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/api/ControlFactory.java
- copied, changed from r1067704, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ControlFactory.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/api/Decorator.java
- copied, changed from r1067704, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/Decorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/api/ExtendedOpFactory.java
- copied, changed from r1067704, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ExtendedOpFactory.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapCodecService.java
- copied, changed from r1067704, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapCodecService.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapConstants.java
- copied, changed from r1067704, directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapConstants.java
Removed:
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/IAction.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/IGrammar.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/CodecControl.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ControlFactory.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/Decorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ExtendedOpFactory.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapCodecService.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapConstants.java
Modified:
directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java
directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java
directory/apacheds/branches/m1/core-api/src/test/java/org/apache/directory/server/core/MockDirectoryService.java
directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java
directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java
directory/apacheds/branches/m1/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventMessage.java
directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java
directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java
directory/shared/branches/m1/dsml-engine/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractDsmlMessageDecorator.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractGrammar.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Container.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/DsmlControl.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/DsmlDecorator.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Container.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Parser.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2StatesEnum.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarAction.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarTransition.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Tag.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/AbstractResponseDsml.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/AbstractResultResponseDsml.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/AddResponseDsml.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/BindResponseDsml.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/CompareResponseDsml.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/DelResponseDsml.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ErrorResponse.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ExtendedResponseDsml.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/LdapResultDsml.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ModDNResponseDsml.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ModifyResponseDsml.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResponse.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResponseDsml.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultDoneDsml.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultReferenceDsml.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AbandonRequestDsml.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AbstractRequestDsml.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AbstractResultResponseRequestDsml.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AttributeValueAssertionFilter.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/BindRequestDsml.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/CompareRequestDsml.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/DelRequestDsml.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ExtendedRequestDsml.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyDNRequestDsml.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java
directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/SearchRequestDsml.java
directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractTest.java
directory/shared/branches/m1/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapConnection.java
directory/shared/branches/m1/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/LdapNetworkConnection.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/AttributeValueAssertion.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/BasicControlDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/DefaultLdapCodecService.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapEncoder.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageContainer.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ControlValueAction.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitApproxMatchFilterAction.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitEqualityMatchFilterAction.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitGreaterOrEqualFilterAction.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitLessOrEqualFilterAction.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/cascade/CascadeDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/cascade/CascadeFactory.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/manageDsaIT/ManageDsaITDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/manageDsaIT/ManageDsaITFactory.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeContainer.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/entryChange/EntryChangeFactory.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsContainer.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/pagedSearch/PagedResultsFactory.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchContainer.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/persistentSearch/PersistentSearchFactory.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/search/subentries/SubentriesFactory.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonRequestDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonableRequestDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AbandonableResultResponseRequestDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddRequestDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/AddResponseDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/BindRequestDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/BindResponseDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/CompareRequestDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/CompareResponseDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/DeleteRequestDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/DeleteResponseDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ExtendedRequestDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ExtendedResponseDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/IntermediateResponseDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/LdapResultDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/MessageDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyDnRequestDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyDnResponseDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyRequestDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ModifyResponseDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/RequestDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ResponseDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/ResultResponseRequestDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchRequestDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultDoneDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultEntryDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SearchResultReferenceDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/SingleReplyRequestDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/decorators/UnbindRequestDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/AndFilter.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/AttributeValueAssertionFilter.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/ExtensibleMatchFilter.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/NotFilter.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/OrFilter.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/PresentFilter.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SubstringFilter.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyContainer.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyFactory.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueContainer.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueFactory.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueContainer.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueFactory.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncModifyDnContainer.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncModifyDnDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncModifyDnFactory.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueFactory.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueDecorator.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueFactory.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/model/message/controls/OpaqueControl.java
directory/shared/branches/m1/ldap/src/main/java/org/apache/directory/shared/ldap/util/JndiUtils.java
directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/ITestCodecControl.java
directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapControlTest.java
directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapDecoderTest.java
directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapMessageTest.java
directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java
directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequestTest.java
directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java
directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java
directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java
directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java
directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java
directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareRequestTest.java
directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareResponseTest.java
directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java
directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java
directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedRequestTest.java
directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java
directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/intermediate/IntermediateResponseTest.java
directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java
directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java
directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java
directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java
directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java
directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java
directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java
directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java
directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java
directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java
directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlTest.java
directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlTest.java
directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PagedSearchControlTest.java
directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlTest.java
directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequestTest.java
directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyTest.java
directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueControlTest.java
directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueControlTest.java
directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncModifyDnControlTest.java
directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueControlTest.java
directory/shared/branches/m1/ldap/src/test/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueControlTest.java
directory/studio/branches/m1/plugins/connection.core/src/main/java/org/apache/directory/studio/connection/core/io/api/CursorStudioNamingEnumeration.java
directory/studio/branches/m1/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ExportDsmlRunnable.java
directory/studio/branches/m1/plugins/ldapbrowser.core/src/main/java/org/apache/directory/studio/ldapbrowser/core/jobs/ImportDsmlRunnable.java
Modified: directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java?rev=1067736&r1=1067735&r2=1067736&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java (original)
+++ directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/DirectoryService.java Sun Feb 6 19:39:34 2011
@@ -37,7 +37,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.server.core.replication.ReplicationConfiguration;
import org.apache.directory.server.core.schema.SchemaService;
-import org.apache.directory.shared.ldap.codec.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
import org.apache.directory.shared.ldap.model.csn.Csn;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.exception.LdapException;
Modified: directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java?rev=1067736&r1=1067735&r2=1067736&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java (original)
+++ directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/LdapCoreSessionConnection.java Sun Feb 6 19:39:34 2011
@@ -32,8 +32,8 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.filtering.EntryFilteringCursor;
import org.apache.directory.server.core.interceptor.context.BindOperationContext;
import org.apache.directory.shared.asn1.util.OID;
-import org.apache.directory.shared.ldap.codec.LdapCodecService;
import org.apache.directory.shared.ldap.codec.DefaultLdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.cursor.EmptyCursor;
import org.apache.directory.shared.ldap.model.cursor.SearchCursor;
Modified: directory/apacheds/branches/m1/core-api/src/test/java/org/apache/directory/server/core/MockDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-api/src/test/java/org/apache/directory/server/core/MockDirectoryService.java?rev=1067736&r1=1067735&r2=1067736&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-api/src/test/java/org/apache/directory/server/core/MockDirectoryService.java (original)
+++ directory/apacheds/branches/m1/core-api/src/test/java/org/apache/directory/server/core/MockDirectoryService.java Sun Feb 6 19:39:34 2011
@@ -40,7 +40,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.partition.PartitionNexus;
import org.apache.directory.server.core.replication.ReplicationConfiguration;
import org.apache.directory.server.core.schema.SchemaService;
-import org.apache.directory.shared.ldap.codec.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
import org.apache.directory.shared.ldap.model.csn.Csn;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.exception.LdapException;
Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java?rev=1067736&r1=1067735&r2=1067736&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/PasswordPolicyTest.java Sun Feb 6 19:39:34 2011
@@ -43,8 +43,8 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.integ.FrameworkRunner;
import org.apache.directory.server.core.integ.IntegrationUtils;
import org.apache.directory.shared.ldap.codec.DefaultLdapCodecService;
-import org.apache.directory.shared.ldap.codec.CodecControl;
-import org.apache.directory.shared.ldap.codec.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.CodecControl;
+import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
import org.apache.directory.shared.ldap.extras.controls.PasswordPolicy;
import org.apache.directory.shared.ldap.extras.controls.PasswordPolicyImpl;
import org.apache.directory.shared.ldap.extras.controls.ppolicy_impl.PasswordPolicyDecorator;
Modified: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java?rev=1067736&r1=1067735&r2=1067736&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java (original)
+++ directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java Sun Feb 6 19:39:34 2011
@@ -49,7 +49,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.integ.IntegrationUtils;
import org.apache.directory.shared.ldap.model.message.controls.Subentries;
import org.apache.directory.shared.ldap.codec.DefaultLdapCodecService;
-import org.apache.directory.shared.ldap.codec.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
import org.apache.directory.shared.ldap.codec.controls.search.subentries.SubentriesDecorator;
import org.apache.directory.shared.ldap.model.cursor.Cursor;
import org.apache.directory.shared.ldap.model.entry.Entry;
Modified: directory/apacheds/branches/m1/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java?rev=1067736&r1=1067735&r2=1067736&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java (original)
+++ directory/apacheds/branches/m1/core-jndi/src/main/java/org/apache/directory/server/core/jndi/ServerContext.java Sun Feb 6 19:39:34 2011
@@ -72,7 +72,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.interceptor.context.SearchOperationContext;
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.asn1.DecoderException;
-import org.apache.directory.shared.ldap.codec.CodecControl;
+import org.apache.directory.shared.ldap.codec.api.CodecControl;
import org.apache.directory.shared.ldap.codec.controls.cascade.CascadeDecorator;
import org.apache.directory.shared.ldap.codec.controls.manageDsaIT.ManageDsaITDecorator;
Modified: directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java?rev=1067736&r1=1067735&r2=1067736&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java (original)
+++ directory/apacheds/branches/m1/core/src/main/java/org/apache/directory/server/core/DefaultDirectoryService.java Sun Feb 6 19:39:34 2011
@@ -81,7 +81,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.trigger.TriggerInterceptor;
import org.apache.directory.server.i18n.I18n;
import org.apache.directory.shared.ldap.codec.DefaultLdapCodecService;
-import org.apache.directory.shared.ldap.codec.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
import org.apache.directory.shared.ldap.model.csn.Csn;
import org.apache.directory.shared.ldap.model.csn.CsnFactory;
Modified: directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventMessage.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventMessage.java?rev=1067736&r1=1067735&r2=1067736&view=diff
==============================================================================
--- directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventMessage.java (original)
+++ directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/ReplicaEventMessage.java Sun Feb 6 19:39:34 2011
@@ -30,7 +30,7 @@ import java.util.Iterator;
import org.apache.directory.server.core.event.EventType;
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.ldap.codec.DefaultLdapCodecService;
-import org.apache.directory.shared.ldap.codec.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
import org.apache.directory.shared.ldap.extras.controls.SyncModifyDnType;
import org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncModifyDnDecorator;
import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
Modified: directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java?rev=1067736&r1=1067735&r2=1067736&view=diff
==============================================================================
--- directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java (original)
+++ directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/search/PagedSearchIT.java Sun Feb 6 19:39:34 2011
@@ -46,7 +46,7 @@ import org.apache.directory.server.core.
import org.apache.directory.server.ldap.LdapServer;
import org.apache.directory.shared.asn1.EncoderException;
import org.apache.directory.shared.ldap.codec.DefaultLdapCodecService;
-import org.apache.directory.shared.ldap.codec.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
import org.apache.directory.shared.ldap.codec.controls.search.pagedSearch.PagedResultsDecorator;
import org.apache.directory.shared.ldap.model.message.Control;
import org.apache.directory.shared.ldap.util.JndiUtils;
Modified: directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java?rev=1067736&r1=1067735&r2=1067736&view=diff
==============================================================================
--- directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java (original)
+++ directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/search/PersistentSearchIT.java Sun Feb 6 19:39:34 2011
@@ -50,8 +50,8 @@ import org.apache.directory.server.core.
import org.apache.directory.server.core.event.RegistrationEntry;
import org.apache.directory.server.core.integ.AbstractLdapTestUnit;
import org.apache.directory.server.core.integ.FrameworkRunner;
-import org.apache.directory.shared.ldap.codec.CodecControl;
-import org.apache.directory.shared.ldap.codec.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.CodecControl;
+import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
import org.apache.directory.shared.ldap.codec.controls.search.entryChange.EntryChangeDecorator;
import org.apache.directory.shared.ldap.codec.controls.search.persistentSearch.PersistentSearchDecorator;
import org.apache.directory.shared.ldap.model.exception.LdapException;
Modified: directory/shared/branches/m1/dsml-engine/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-engine/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java?rev=1067736&r1=1067735&r2=1067736&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-engine/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java (original)
+++ directory/shared/branches/m1/dsml-engine/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java Sun Feb 6 19:39:34 2011
@@ -51,7 +51,7 @@ import org.apache.directory.shared.dsmlv
import org.apache.directory.shared.dsmlv2.request.BatchRequestDsml.ResponseOrder;
import org.apache.directory.shared.i18n.I18n;
import org.apache.directory.shared.ldap.codec.DefaultLdapCodecService;
-import org.apache.directory.shared.ldap.codec.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
import org.apache.directory.shared.ldap.model.cursor.Cursor;
import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractDsmlMessageDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractDsmlMessageDecorator.java?rev=1067736&r1=1067735&r2=1067736&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractDsmlMessageDecorator.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractDsmlMessageDecorator.java Sun Feb 6 19:39:34 2011
@@ -23,7 +23,7 @@ package org.apache.directory.shared.dsml
import java.util.HashMap;
import java.util.Map;
-import org.apache.directory.shared.ldap.codec.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
import org.apache.directory.shared.ldap.model.exception.MessageException;
import org.apache.directory.shared.ldap.model.message.Control;
import org.apache.directory.shared.ldap.model.message.Message;
Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractGrammar.java?rev=1067736&r1=1067735&r2=1067736&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractGrammar.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractGrammar.java Sun Feb 6 19:39:34 2011
@@ -17,7 +17,6 @@
* under the License.
*
*/
-
package org.apache.directory.shared.dsmlv2;
@@ -35,12 +34,12 @@ import org.xmlpull.v1.XmlPullParserExcep
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public abstract class AbstractGrammar implements IGrammar
+public abstract class AbstractGrammar implements Grammar
{
/**
* Table of transitions. It's a two dimension array, the first dimension
- * indice the states, the second dimension indices the Tag value, so it is
+ * indexes the states, the second dimension indexes the Tag value, so it is
* 256 wide.
*/
protected HashMap<Tag, GrammarTransition>[] transitions;
Copied: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Action.java (from r1067704, directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/IAction.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Action.java?p2=directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Action.java&p1=directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/IAction.java&r1=1067704&r2=1067736&rev=1067736&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/IAction.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Action.java Sun Feb 6 19:39:34 2011
@@ -17,7 +17,6 @@
* under the License.
*
*/
-
package org.apache.directory.shared.dsmlv2;
@@ -26,15 +25,12 @@ import org.xmlpull.v1.XmlPullParserExcep
/**
* IAction interface just contains the method 'action' which must be implemented
- * in all the implementong classes.
+ * in all the implementation classes.
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public interface IAction
+public interface Action
{
- // ~ Methods
- // ------------------------------------------------------------------------------------
-
/**
* The action to be executed.
*
Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Container.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Container.java?rev=1067736&r1=1067735&r2=1067736&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Container.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Container.java Sun Feb 6 19:39:34 2011
@@ -17,7 +17,6 @@
* under the License.
*
*/
-
package org.apache.directory.shared.dsmlv2;
Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/DsmlControl.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/DsmlControl.java?rev=1067736&r1=1067735&r2=1067736&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/DsmlControl.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/DsmlControl.java Sun Feb 6 19:39:34 2011
@@ -20,7 +20,7 @@
package org.apache.directory.shared.dsmlv2;
-import org.apache.directory.shared.ldap.codec.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
import org.apache.directory.shared.ldap.model.message.Control;
import org.dom4j.Element;
Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/DsmlDecorator.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/DsmlDecorator.java?rev=1067736&r1=1067735&r2=1067736&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/DsmlDecorator.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/DsmlDecorator.java Sun Feb 6 19:39:34 2011
@@ -17,7 +17,6 @@
* under the License.
*
*/
-
package org.apache.directory.shared.dsmlv2;
Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Container.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Container.java?rev=1067736&r1=1067735&r2=1067736&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Container.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Container.java Sun Feb 6 19:39:34 2011
@@ -17,14 +17,13 @@
* under the License.
*
*/
-
package org.apache.directory.shared.dsmlv2;
import org.apache.directory.shared.asn1.ber.Asn1Container;
import org.apache.directory.shared.dsmlv2.reponse.BatchResponseDsml;
import org.apache.directory.shared.dsmlv2.request.BatchRequestDsml;
-import org.apache.directory.shared.ldap.codec.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
import org.xmlpull.v1.XmlPullParser;
Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Parser.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Parser.java?rev=1067736&r1=1067735&r2=1067736&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Parser.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Parser.java Sun Feb 6 19:39:34 2011
@@ -17,7 +17,6 @@
* under the License.
*
*/
-
package org.apache.directory.shared.dsmlv2;
Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java?rev=1067736&r1=1067735&r2=1067736&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java Sun Feb 6 19:39:34 2011
@@ -17,7 +17,6 @@
* under the License.
*
*/
-
package org.apache.directory.shared.dsmlv2;
@@ -31,7 +30,7 @@ import java.io.StringReader;
import org.apache.directory.shared.dsmlv2.reponse.BatchResponseDsml;
import org.apache.directory.shared.dsmlv2.reponse.Dsmlv2ResponseGrammar;
import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.codec.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
import org.apache.directory.shared.ldap.model.message.Response;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2StatesEnum.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2StatesEnum.java?rev=1067736&r1=1067735&r2=1067736&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2StatesEnum.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2StatesEnum.java Sun Feb 6 19:39:34 2011
@@ -17,7 +17,6 @@
* under the License.
*
*/
-
package org.apache.directory.shared.dsmlv2;
Copied: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Grammar.java (from r1067704, directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/IGrammar.java)
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Grammar.java?p2=directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Grammar.java&p1=directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/IGrammar.java&r1=1067704&r2=1067736&rev=1067736&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/IGrammar.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Grammar.java Sun Feb 6 19:39:34 2011
@@ -17,7 +17,6 @@
* under the License.
*
*/
-
package org.apache.directory.shared.dsmlv2;
@@ -29,11 +28,8 @@ import org.xmlpull.v1.XmlPullParserExcep
/**
* The interface which expose common behavior of a Grammar implementer.
*/
-public interface IGrammar
+public interface Grammar
{
- // ~ Methods
- // ------------------------------------------------------------------------------------
-
/**
* This method, when called, executes an action on the current data stored in
* the container.
Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarAction.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarAction.java?rev=1067736&r1=1067735&r2=1067736&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarAction.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarAction.java Sun Feb 6 19:39:34 2011
@@ -17,7 +17,6 @@
* under the License.
*
*/
-
package org.apache.directory.shared.dsmlv2;
@@ -27,7 +26,7 @@ package org.apache.directory.shared.dsml
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public abstract class GrammarAction implements IAction
+public abstract class GrammarAction implements Action
{
/** The action's name */
private String name;
Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarTransition.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarTransition.java?rev=1067736&r1=1067735&r2=1067736&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarTransition.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarTransition.java Sun Feb 6 19:39:34 2011
@@ -17,7 +17,6 @@
* under the License.
*
*/
-
package org.apache.directory.shared.dsmlv2;
Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java?rev=1067736&r1=1067735&r2=1067736&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java Sun Feb 6 19:39:34 2011
@@ -17,7 +17,6 @@
* under the License.
*
*/
-
package org.apache.directory.shared.dsmlv2;
@@ -34,8 +33,8 @@ import org.apache.directory.shared.dsmlv
import org.apache.directory.shared.dsmlv2.request.BatchRequestDsml.Processing;
import org.apache.directory.shared.dsmlv2.request.BatchRequestDsml.ResponseOrder;
import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.codec.CodecControl;
-import org.apache.directory.shared.ldap.codec.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.CodecControl;
+import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
import org.apache.directory.shared.ldap.model.ldif.LdifUtils;
import org.apache.directory.shared.ldap.model.message.Control;
import org.apache.directory.shared.util.Base64;
@@ -235,7 +234,7 @@ public final class ParserUtils
byte[] value;
if ( control instanceof CodecControl<?> )
{
- value = ( ( CodecControl<?> ) control ).getValue();
+ value = ( (org.apache.directory.shared.ldap.codec.api.CodecControl<?> ) control ).getValue();
}
else
{
Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Tag.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Tag.java?rev=1067736&r1=1067735&r2=1067736&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Tag.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Tag.java Sun Feb 6 19:39:34 2011
@@ -17,7 +17,6 @@
* under the License.
*
*/
-
package org.apache.directory.shared.dsmlv2;
Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/AbstractResponseDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/AbstractResponseDsml.java?rev=1067736&r1=1067735&r2=1067736&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/AbstractResponseDsml.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/AbstractResponseDsml.java Sun Feb 6 19:39:34 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.dsml
import org.apache.directory.shared.dsmlv2.AbstractDsmlMessageDecorator;
-import org.apache.directory.shared.ldap.codec.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
import org.apache.directory.shared.ldap.model.message.Response;
Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/AbstractResultResponseDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/AbstractResultResponseDsml.java?rev=1067736&r1=1067735&r2=1067736&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/AbstractResultResponseDsml.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/AbstractResultResponseDsml.java Sun Feb 6 19:39:34 2011
@@ -20,7 +20,7 @@
package org.apache.directory.shared.dsmlv2.reponse;
-import org.apache.directory.shared.ldap.codec.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
import org.apache.directory.shared.ldap.model.message.LdapResult;
import org.apache.directory.shared.ldap.model.message.ResultResponse;
import org.dom4j.Element;
Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/AddResponseDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/AddResponseDsml.java?rev=1067736&r1=1067735&r2=1067736&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/AddResponseDsml.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/AddResponseDsml.java Sun Feb 6 19:39:34 2011
@@ -17,11 +17,10 @@
* under the License.
*
*/
-
package org.apache.directory.shared.dsmlv2.reponse;
-import org.apache.directory.shared.ldap.codec.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
import org.apache.directory.shared.ldap.model.message.AddResponse;
import org.apache.directory.shared.ldap.model.message.AddResponseImpl;
import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/BindResponseDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/BindResponseDsml.java?rev=1067736&r1=1067735&r2=1067736&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/BindResponseDsml.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/BindResponseDsml.java Sun Feb 6 19:39:34 2011
@@ -20,7 +20,7 @@
package org.apache.directory.shared.dsmlv2.reponse;
-import org.apache.directory.shared.ldap.codec.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
import org.apache.directory.shared.ldap.model.message.BindResponse;
import org.apache.directory.shared.ldap.model.message.BindResponseImpl;
import org.dom4j.Element;
Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/CompareResponseDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/CompareResponseDsml.java?rev=1067736&r1=1067735&r2=1067736&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/CompareResponseDsml.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/CompareResponseDsml.java Sun Feb 6 19:39:34 2011
@@ -21,7 +21,7 @@
package org.apache.directory.shared.dsmlv2.reponse;
-import org.apache.directory.shared.ldap.codec.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
import org.apache.directory.shared.ldap.model.message.CompareResponse;
import org.apache.directory.shared.ldap.model.message.CompareResponseImpl;
import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/DelResponseDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/DelResponseDsml.java?rev=1067736&r1=1067735&r2=1067736&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/DelResponseDsml.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/DelResponseDsml.java Sun Feb 6 19:39:34 2011
@@ -21,7 +21,7 @@
package org.apache.directory.shared.dsmlv2.reponse;
-import org.apache.directory.shared.ldap.codec.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
import org.apache.directory.shared.ldap.model.message.DeleteResponse;
import org.apache.directory.shared.ldap.model.message.DeleteResponseImpl;
import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java?rev=1067736&r1=1067735&r2=1067736&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java Sun Feb 6 19:39:34 2011
@@ -17,7 +17,6 @@
* under the License.
*
*/
-
package org.apache.directory.shared.dsmlv2.reponse;
@@ -37,12 +36,12 @@ import org.apache.directory.shared.dsmlv
import org.apache.directory.shared.dsmlv2.Dsmlv2StatesEnum;
import org.apache.directory.shared.dsmlv2.GrammarAction;
import org.apache.directory.shared.dsmlv2.GrammarTransition;
-import org.apache.directory.shared.dsmlv2.IGrammar;
+import org.apache.directory.shared.dsmlv2.Grammar;
import org.apache.directory.shared.dsmlv2.ParserUtils;
import org.apache.directory.shared.dsmlv2.Tag;
import org.apache.directory.shared.dsmlv2.reponse.ErrorResponse.ErrorResponseType;
import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.codec.CodecControl;
+import org.apache.directory.shared.ldap.codec.api.CodecControl;
import org.apache.directory.shared.ldap.model.exception.LdapException;
import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
import org.apache.directory.shared.ldap.model.exception.LdapURLEncodingException;
@@ -79,7 +78,7 @@ import org.xmlpull.v1.XmlPullParserExcep
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-public final class Dsmlv2ResponseGrammar extends AbstractGrammar implements IGrammar
+public final class Dsmlv2ResponseGrammar extends AbstractGrammar implements Grammar
{
/** The instance of grammar. Dsmlv2ResponseGrammar is a singleton */
private static Dsmlv2ResponseGrammar instance = new Dsmlv2ResponseGrammar();
Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ErrorResponse.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ErrorResponse.java?rev=1067736&r1=1067735&r2=1067736&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ErrorResponse.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ErrorResponse.java Sun Feb 6 19:39:34 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.dsml
import org.apache.directory.shared.dsmlv2.DsmlDecorator;
-import org.apache.directory.shared.ldap.codec.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
import org.apache.directory.shared.ldap.model.message.AbstractResponse;
import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
import org.apache.directory.shared.ldap.model.message.Response;
Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ExtendedResponseDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ExtendedResponseDsml.java?rev=1067736&r1=1067735&r2=1067736&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ExtendedResponseDsml.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ExtendedResponseDsml.java Sun Feb 6 19:39:34 2011
@@ -22,7 +22,7 @@ package org.apache.directory.shared.dsml
import org.apache.directory.shared.asn1.util.OID;
import org.apache.directory.shared.dsmlv2.ParserUtils;
-import org.apache.directory.shared.ldap.codec.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
import org.apache.directory.shared.ldap.model.message.ExtendedResponse;
import org.apache.directory.shared.ldap.model.message.ExtendedResponseImpl;
import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/LdapResultDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/LdapResultDsml.java?rev=1067736&r1=1067735&r2=1067736&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/LdapResultDsml.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/LdapResultDsml.java Sun Feb 6 19:39:34 2011
@@ -17,7 +17,6 @@
* under the License.
*
*/
-
package org.apache.directory.shared.dsmlv2.reponse;
@@ -26,7 +25,7 @@ import java.util.List;
import org.apache.directory.shared.dsmlv2.DsmlDecorator;
import org.apache.directory.shared.dsmlv2.ParserUtils;
-import org.apache.directory.shared.ldap.codec.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
import org.apache.directory.shared.ldap.model.filter.LdapURL;
import org.apache.directory.shared.ldap.model.message.LdapResult;
import org.apache.directory.shared.ldap.model.message.Message;
Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ModDNResponseDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ModDNResponseDsml.java?rev=1067736&r1=1067735&r2=1067736&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ModDNResponseDsml.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ModDNResponseDsml.java Sun Feb 6 19:39:34 2011
@@ -20,7 +20,7 @@
package org.apache.directory.shared.dsmlv2.reponse;
-import org.apache.directory.shared.ldap.codec.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
import org.apache.directory.shared.ldap.model.message.ModifyDnResponse;
import org.apache.directory.shared.ldap.model.message.ModifyDnResponseImpl;
Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ModifyResponseDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ModifyResponseDsml.java?rev=1067736&r1=1067735&r2=1067736&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ModifyResponseDsml.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ModifyResponseDsml.java Sun Feb 6 19:39:34 2011
@@ -20,7 +20,7 @@
package org.apache.directory.shared.dsmlv2.reponse;
-import org.apache.directory.shared.ldap.codec.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
import org.apache.directory.shared.ldap.model.message.ModifyResponse;
import org.apache.directory.shared.ldap.model.message.ModifyResponseImpl;
Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResponse.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResponse.java?rev=1067736&r1=1067735&r2=1067736&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResponse.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResponse.java Sun Feb 6 19:39:34 2011
@@ -17,7 +17,6 @@
* under the License.
*
*/
-
package org.apache.directory.shared.dsmlv2.reponse;
Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResponseDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResponseDsml.java?rev=1067736&r1=1067735&r2=1067736&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResponseDsml.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResponseDsml.java Sun Feb 6 19:39:34 2011
@@ -24,7 +24,7 @@ import java.util.ArrayList;
import java.util.List;
import org.apache.directory.shared.dsmlv2.DsmlDecorator;
-import org.apache.directory.shared.ldap.codec.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
import org.apache.directory.shared.ldap.model.message.Message;
import org.apache.directory.shared.ldap.model.message.Response;
import org.apache.directory.shared.ldap.model.message.SearchResultDone;
Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultDoneDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultDoneDsml.java?rev=1067736&r1=1067735&r2=1067736&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultDoneDsml.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultDoneDsml.java Sun Feb 6 19:39:34 2011
@@ -20,7 +20,7 @@
package org.apache.directory.shared.dsmlv2.reponse;
-import org.apache.directory.shared.ldap.codec.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
import org.apache.directory.shared.ldap.model.message.SearchResultDone;
import org.apache.directory.shared.ldap.model.message.SearchResultDoneImpl;
Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java?rev=1067736&r1=1067735&r2=1067736&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java Sun Feb 6 19:39:34 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.dsml
import org.apache.directory.shared.dsmlv2.ParserUtils;
-import org.apache.directory.shared.ldap.codec.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultReferenceDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultReferenceDsml.java?rev=1067736&r1=1067735&r2=1067736&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultReferenceDsml.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultReferenceDsml.java Sun Feb 6 19:39:34 2011
@@ -22,7 +22,7 @@ package org.apache.directory.shared.dsml
import java.util.Collection;
-import org.apache.directory.shared.ldap.codec.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
import org.apache.directory.shared.ldap.model.filter.LdapURL;
import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
import org.apache.directory.shared.ldap.model.message.Referral;
Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AbandonRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AbandonRequestDsml.java?rev=1067736&r1=1067735&r2=1067736&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AbandonRequestDsml.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AbandonRequestDsml.java Sun Feb 6 19:39:34 2011
@@ -20,7 +20,7 @@
package org.apache.directory.shared.dsmlv2.request;
-import org.apache.directory.shared.ldap.codec.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
import org.apache.directory.shared.ldap.model.message.AbandonRequest;
import org.apache.directory.shared.ldap.model.message.AbandonRequestImpl;
import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AbstractRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AbstractRequestDsml.java?rev=1067736&r1=1067735&r2=1067736&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AbstractRequestDsml.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AbstractRequestDsml.java Sun Feb 6 19:39:34 2011
@@ -25,7 +25,7 @@ import java.nio.ByteBuffer;
import org.apache.directory.shared.asn1.EncoderException;
import org.apache.directory.shared.dsmlv2.AbstractDsmlMessageDecorator;
import org.apache.directory.shared.dsmlv2.ParserUtils;
-import org.apache.directory.shared.ldap.codec.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
import org.apache.directory.shared.ldap.model.message.Request;
import org.dom4j.Element;
Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AbstractResultResponseRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AbstractResultResponseRequestDsml.java?rev=1067736&r1=1067735&r2=1067736&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AbstractResultResponseRequestDsml.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AbstractResultResponseRequestDsml.java Sun Feb 6 19:39:34 2011
@@ -24,7 +24,7 @@ import java.nio.ByteBuffer;
import org.apache.directory.shared.asn1.EncoderException;
import org.apache.directory.shared.dsmlv2.ParserUtils;
-import org.apache.directory.shared.ldap.codec.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
import org.apache.directory.shared.ldap.model.message.AbandonListener;
import org.apache.directory.shared.ldap.model.message.AbandonableRequest;
import org.apache.directory.shared.ldap.model.message.ResultResponse;
Modified: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java?rev=1067736&r1=1067735&r2=1067736&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java Sun Feb 6 19:39:34 2011
@@ -21,7 +21,7 @@ package org.apache.directory.shared.dsml
import org.apache.directory.shared.dsmlv2.ParserUtils;
-import org.apache.directory.shared.ldap.codec.LdapCodecService;
+import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
import org.apache.directory.shared.ldap.model.entry.Entry;
import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
Added: directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AttributeValueAssertion.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AttributeValueAssertion.java?rev=1067736&view=auto
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AttributeValueAssertion.java (added)
+++ directory/shared/branches/m1/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AttributeValueAssertion.java Sun Feb 6 19:39:34 2011
@@ -0,0 +1,205 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+package org.apache.directory.shared.dsmlv2.request;
+
+
+import org.apache.directory.shared.ldap.codec.api.LdapConstants;
+import org.apache.directory.shared.ldap.model.entry.*;
+import org.apache.directory.shared.util.Strings;
+
+
+/**
+ * A class to store an attribute value assertion.
+ * The grammar is :
+ *
+ * AttributeValueAssertion ::= SEQUENCE {
+ * attributeDesc AttributeDescription,
+ * assertionValue AssertionValue }
+ *
+ * AttributeDescription ::= LDAPString
+ *
+ * AssertionValue ::= OCTET STRING
+ *
+ * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
+ */
+public class AttributeValueAssertion
+{
+ // ~ Instance fields
+ // ----------------------------------------------------------------------------
+
+ /** The attribute description */
+ private String attributeDesc;
+
+ /** The assertion value */
+ private Value<?> assertionValue;
+
+ /**
+ *
+ * Helper method to render an object which can be a String or a byte[]
+ *
+ * @return A string representing the object
+ */
+ public static String dumpObject( Object object )
+ {
+ if ( object != null )
+ {
+ if ( object instanceof String )
+ {
+ return (String) object;
+ }
+ else if ( object instanceof byte[] )
+ {
+ return Strings.dumpBytes((byte[]) object);
+ }
+ else if ( object instanceof StringValue)
+ {
+ return ( (StringValue) object ).get();
+ }
+ else if ( object instanceof BinaryValue )
+ {
+ return Strings.dumpBytes(((BinaryValue) object).get());
+ }
+ else
+ {
+ return "<unknown type>";
+ }
+ }
+ else
+ {
+ return "";
+ }
+ }
+
+
+ // ~ Methods
+ // ------------------------------------------------------------------------------------
+
+ /**
+ * Get the assertion value
+ *
+ * @return Returns the assertionValue.
+ */
+ public Value<?> getAssertionValue()
+ {
+ return assertionValue;
+ }
+
+
+ /**
+ * Set the assertion value
+ *
+ * @param assertionValue The assertionValue to set.
+ */
+ public void setAssertionValue( Value<?> assertionValue )
+ {
+ this.assertionValue = assertionValue;
+ }
+
+
+ /**
+ * Get the attribute description
+ *
+ * @return Returns the attributeDesc.
+ */
+ public String getAttributeDesc()
+ {
+ return attributeDesc;
+ }
+
+
+ /**
+ * Set the attribute description
+ *
+ * @param attributeDesc The attributeDesc to set.
+ */
+ public void setAttributeDesc( String attributeDesc )
+ {
+ this.attributeDesc = attributeDesc;
+ }
+
+
+ /**
+ * Get a String representation of an AttributeValueAssertion
+ *
+ * @param tabs The spacing to be put before the string
+ * @return An AttributeValueAssertion String
+ */
+ public String toString( String tabs )
+ {
+ StringBuffer sb = new StringBuffer();
+
+ sb.append( tabs ).append( "AttributeValueAssertion\n" );
+ sb.append( tabs ).append( " Assertion description : '" );
+ sb.append( attributeDesc != null ? attributeDesc : "null" );
+ sb.append( "'\n" );
+ sb.append( tabs ).append( " Assertion value : '" ).append( dumpObject(assertionValue) ).append( "'\n" );
+
+ return sb.toString();
+ }
+
+
+ /**
+ * Get a String representation of an AttributeValueAssertion, as of RFC
+ * 2254.
+ *
+ * @param filterType The filter type
+ * @return An AttributeValueAssertion String
+ */
+ public String toStringRFC2254( int filterType )
+ {
+ StringBuffer sb = new StringBuffer();
+
+ sb.append( attributeDesc );
+
+ switch ( filterType )
+ {
+ case LdapConstants.EQUALITY_MATCH_FILTER:
+ sb.append( '=' );
+ break;
+
+ case LdapConstants.LESS_OR_EQUAL_FILTER:
+ sb.append( "<=" );
+ break;
+
+ case LdapConstants.GREATER_OR_EQUAL_FILTER:
+ sb.append( ">=" );
+ break;
+
+ case LdapConstants.APPROX_MATCH_FILTER:
+ sb.append( "~=" );
+ break;
+ }
+
+ sb.append( dumpObject(assertionValue) );
+
+ return sb.toString();
+ }
+
+
+ /**
+ * Get a String representation of an AttributeValueAssertion
+ *
+ * @return An AttributeValueAssertion String
+ */
+ public String toString()
+ {
+ return toString( "" );
+ }
+}