directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kayyag...@apache.org
Subject svn commit: r987606 [1/25] - in /directory/shared/trunk: ./ all/ asn1-codec/ asn1-codec/src/main/java/org/apache/directory/shared/asn1/codec/ asn1/ asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/ asn1/src/main/java/org/apache/directory...
Date Fri, 20 Aug 2010 19:23:37 GMT
Author: kayyagari
Date: Fri Aug 20 19:23:27 2010
New Revision: 987606

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

Added:
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/AbstractResponseDsml.java
      - copied unchanged from r987558, directory/shared/branches/shared-codec-merge/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/AbstractResponseDsml.java
    directory/shared/trunk/ldap-schema-loader/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/SingleLdifSchemaLoader.java
      - copied unchanged from r987558, directory/shared/branches/shared-codec-merge/ldap-schema-loader/src/main/java/org/apache/directory/shared/ldap/schema/loader/ldif/SingleLdifSchemaLoader.java
    directory/shared/trunk/ldap-schema-loader/src/main/resources/
      - copied from r987558, directory/shared/branches/shared-codec-merge/ldap-schema-loader/src/main/resources/
    directory/shared/trunk/ldap-schema-loader/src/main/resources/schema-all.ldif
      - copied unchanged from r987558, directory/shared/branches/shared-codec-merge/ldap-schema-loader/src/main/resources/schema-all.ldif
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlEnum.java
      - copied unchanged from r987558, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/codec/controls/ControlEnum.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbandonRequest.java
      - copied unchanged from r987558, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbandonRequest.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbandonableRequest.java
      - copied unchanged from r987558, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbandonableRequest.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractMessage.java
      - copied unchanged from r987558, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractMessage.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractRequest.java
      - copied unchanged from r987558, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractRequest.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractResponse.java
      - copied unchanged from r987558, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractResponse.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractResultResponse.java
      - copied unchanged from r987558, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractResultResponse.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequest.java
      - copied unchanged from r987558, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequest.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddResponse.java
      - copied unchanged from r987558, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddResponse.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindRequest.java
      - copied unchanged from r987558, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindRequest.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindResponse.java
      - copied unchanged from r987558, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindResponse.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequest.java
      - copied unchanged from r987558, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequest.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareResponse.java
      - copied unchanged from r987558, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareResponse.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteRequest.java
      - copied unchanged from r987558, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteRequest.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteResponse.java
      - copied unchanged from r987558, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteResponse.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedRequest.java
      - copied unchanged from r987558, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedRequest.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedResponse.java
      - copied unchanged from r987558, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedResponse.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/IntermediateResponse.java
      - copied unchanged from r987558, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/IntermediateResponse.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapProtocolEncoder.java
      - copied unchanged from r987558, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapProtocolEncoder.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapResult.java
      - copied unchanged from r987558, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapResult.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/Message.java
      - copied unchanged from r987558, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/Message.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnRequest.java
      - copied unchanged from r987558, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnRequest.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnResponse.java
      - copied unchanged from r987558, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnResponse.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequest.java
      - copied unchanged from r987558, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequest.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyResponse.java
      - copied unchanged from r987558, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyResponse.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/Referral.java
      - copied unchanged from r987558, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/Referral.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/Request.java
      - copied unchanged from r987558, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/Request.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/Response.java
      - copied unchanged from r987558, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/Response.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ResultResponse.java
      - copied unchanged from r987558, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ResultResponse.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ResultResponseRequest.java
      - copied unchanged from r987558, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/ResultResponseRequest.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequest.java
      - copied unchanged from r987558, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequest.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResultDone.java
      - copied unchanged from r987558, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResultDone.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResultDoneImpl.java
      - copied unchanged from r987558, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResultDoneImpl.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResultEntry.java
      - copied unchanged from r987558, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResultEntry.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResultEntryImpl.java
      - copied unchanged from r987558, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResultEntryImpl.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResultReference.java
      - copied unchanged from r987558, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResultReference.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResultReferenceImpl.java
      - copied unchanged from r987558, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResultReferenceImpl.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/UnbindRequest.java
      - copied unchanged from r987558, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/message/UnbindRequest.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/JndiUtils.java
      - copied unchanged from r987558, directory/shared/branches/shared-codec-merge/ldap/src/main/java/org/apache/directory/shared/ldap/util/JndiUtils.java
Removed:
    directory/shared/trunk/asn1-codec/src/main/java/org/apache/directory/shared/asn1/codec/Asn1CodecEncoder.java
    directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/stateful/AbstractStatefulEncoder.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageCodec.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResponseCodec.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapResultCodec.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/abandon/
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/add/
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/bind/
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/compare/
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/del/
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/ExtendedRequestCodec.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseCodec.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/intermediate/
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modify/
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/modifyDn/
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchRequestCodec.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneCodec.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryCodec.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceCodec.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/unbind/
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/MessageEncoder.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseDoneImpl.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImpl.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchResponseReferenceImpl.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalAbandonRequest.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalAbandonableRequest.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalAbstractMessage.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalAbstractRequest.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalAbstractResponse.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalAbstractResultResponse.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalAddRequest.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalAddResponse.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalBindRequest.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalBindResponse.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalCompareRequest.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalCompareResponse.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalDeleteRequest.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalDeleteResponse.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalExtendedRequest.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalExtendedResponse.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalIntermediateResponse.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalLdapResult.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalMessage.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalModifyDnRequest.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalModifyDnResponse.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalModifyRequest.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalModifyResponse.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalReferral.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalRequest.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalResponse.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalResultResponse.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalResultResponseRequest.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchRequest.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchResponseDone.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchResponseEntry.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalSearchResponseReference.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/internal/InternalUnbindRequest.java
Modified:
    directory/shared/trunk/   (props changed)
    directory/shared/trunk/all/   (props changed)
    directory/shared/trunk/all/pom.xml
    directory/shared/trunk/asn1/   (props changed)
    directory/shared/trunk/asn1-codec/   (props changed)
    directory/shared/trunk/asn1-codec/src/main/java/org/apache/directory/shared/asn1/codec/Asn1CodecDecoder.java
    directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/AbstractGrammar.java
    directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/stateful/AbstractStatefulDecoder.java
    directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/stateful/DecoderCallback.java
    directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/stateful/StatefulDecoder.java
    directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/stateful/StatefulEncoder.java
    directory/shared/trunk/cursor/   (props changed)
    directory/shared/trunk/dsml-parser/   (props changed)
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractGrammar.java   (contents, props changed)
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Container.java   (props changed)
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/DsmlDecorator.java   (props changed)
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Container.java   (props changed)
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Parser.java   (contents, props changed)
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java   (contents, props changed)
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2StatesEnum.java   (props changed)
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarAction.java   (props changed)
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarTransition.java   (props changed)
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/IAction.java   (props changed)
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/IGrammar.java   (props changed)
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/IStates.java   (props changed)
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/LdapMessageDecorator.java   (contents, props changed)
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java   (contents, props changed)
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Tag.java   (props changed)
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/engine/   (props changed)
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/   (props changed)
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/AddResponseDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/AuthResponseDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/BatchResponse.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/CompareResponseDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/DelResponseDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ErrorResponse.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ExtendedResponseDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/LdapResponseDecorator.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/LdapResultDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ModDNResponseDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ModifyResponseDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResponse.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResponseDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultDoneDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultEntryDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/SearchResultReferenceDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/   (props changed)
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AbandonRequestDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AbstractRequestDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AddRequestDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/AuthRequestDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/BatchRequest.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/CompareRequestDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/DelRequestDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ExtendedRequestDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/LdapRequestDecorator.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyDNRequestDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/ModifyRequestDsml.java
    directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/SearchRequestDsml.java
    directory/shared/trunk/dsml-parser/src/main/resources/org/apache/directory/shared/dsmlv2/engine/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractResponseTest.java   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractTest.java   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AllTests.java   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest/AbandonRequestTest.java
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/AddRequestTest.java
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/AddResponseTest.java
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest/AuthRequestTest.java
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest/BatchRequestTest.java
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse/BatchResponseTest.java
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest/CompareRequestTest.java
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/CompareResponseTest.java
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest/DelRequestTest.java
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/DelResponseTest.java
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/errorResponse/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/errorResponse/ErrorResponseTest.java
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest/ExtendedRequestTest.java
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest/ModifyDNRequestTest.java
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/ModifyDNResponseTest.java
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/ModifyRequestTest.java
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/ModifyResponseTest.java
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest/SearchRequestTest.java
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareResponse/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delRequest/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delResponse/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/errorResponse/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedRequest/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedResponse/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNRequest/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNResponse/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyRequest/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyResponse/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/filters/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_base64_value.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_empty_value.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_attributes_elements.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_controls.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_filters.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_3_controls_without_value.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attribute_without_name_attribute.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_1_attribute.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_2_attribute.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_but_no_attribute.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefAlways.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefFindingBaseObj.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefInSearching.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_error.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_neverDerefAliases.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_dn_attribute.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_empty_filter.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_needed_requestID.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_attribute.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_equals_0.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_baseObject.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_error.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_singleLevel.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_wholeSubtree.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_attribute.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_error.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_attribute.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_error.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_0.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_1.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_error.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_false.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_true.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_derefAliases_attribute.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_dn_attribute.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_filter.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_scope_attribute.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_0_SRD.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRD.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_0_SRD.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRD.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRR_1_SRD.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_0_SRD.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_1_SRD.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_1_SRD.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_2_SRR_1_SRD.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRR_1_SRD.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_attribute.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_equals_0.xml   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/   (props changed)
    directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/   (props changed)
    directory/shared/trunk/i18n/   (props changed)
    directory/shared/trunk/ldap/   (props changed)
    directory/shared/trunk/ldap-constants/   (props changed)
    directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java   (props changed)
    directory/shared/trunk/ldap-convert/   (props changed)
    directory/shared/trunk/ldap-jndi/   (props changed)
    directory/shared/trunk/ldap-jndi/src/main/java/org/apache/directory/shared/ldap/jndi/JndiUtils.java
    directory/shared/trunk/ldap-ldif/   (props changed)
    directory/shared/trunk/ldap-schema/   (props changed)
    directory/shared/trunk/ldap-schema-loader/   (props changed)
    directory/shared/trunk/ldap-schema-manager/   (props changed)
    directory/shared/trunk/ldap-schema-manager-tests/   (props changed)
    directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/   (props changed)
    directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/   (props changed)
    directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java   (props changed)
    directory/shared/trunk/ldap/pom.xml
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapDecoder.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapEncoder.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageContainer.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapProvider.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapTransformer.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ResponseCarryingException.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/AttributeDescAction.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ControlValueAction.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ControlsInitAction.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ErrorMessageAction.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAndFilterAction.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitApproxMatchFilterAction.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAssertionValueFilterAction.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitAttributeDescFilterAction.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitEqualityMatchFilterAction.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitExtensibleMatchFilterAction.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitGreaterOrEqualFilterAction.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitLessOrEqualFilterAction.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitNotFilterAction.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitOrFilterAction.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitPresentFilterAction.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitReferralsAction.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/InitSubstringsFilterAction.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/MatchedDNAction.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ModifyAttributeValueAction.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ReferralAction.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResponseAction.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResponseNameAction.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ResultCodeAction.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/SearchResultAttributeValueAction.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ServerSASLCredsAction.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreAnyAction.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreFinalAction.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreMatchValueAction.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreReferenceAction.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/StoreTypeMatchingRuleAction.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ValueAction.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/Filter.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/PresentFilter.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbandonListener.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbandonRequestImpl.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AbstractAbandonableRequest.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddRequestImpl.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/AddResponseImpl.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindRequestImpl.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/BindResponseImpl.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareRequestImpl.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/CompareResponseImpl.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteRequestImpl.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/DeleteResponseImpl.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedRequestImpl.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ExtendedResponseImpl.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/IntermediateResponseImpl.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/LdapResultImpl.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ManyReplyRequest.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/MessageDecoder.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImpl.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyDnResponseImpl.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyRequestImpl.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ModifyResponseImpl.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ReferralImpl.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/ResponseCarryingMessageException.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SearchRequestImpl.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/SingleReplyRequest.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/UnbindRequestImpl.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CancelRequest.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CancelResponse.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/CertGenerationRequest.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulDisconnect.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulShutdownRequest.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/LaunchDiagnosticUiRequest.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/StoredProcedureRequest.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/StoredProcedureResponse.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/spi/ProviderObject.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/sp/JavaStoredProcUtils.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/AttributeUtils.java
    directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/util/LdapURL.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapControlTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapDecoderTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapMessageTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequestTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddRequestTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareRequestTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareResponseTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelRequestTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedRequestTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/extended/ExtendedResponseTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/intermediate/IntermediateResponseTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequestTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractMessageTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AbstractResultResponseTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/AddRequestImplTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ArrayNamingEnumerationTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindRequestImplTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/BindResponseImplTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/CompareRequestImplTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/DeleteRequestImplTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedRequestImplTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ExtendedResponseImplTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/LdapResultImplTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImplTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ReferralImplTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseDoneImplTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImplTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseReferenceImplTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/name/DNTest.java
    directory/shared/trunk/pom.xml

Propchange: directory/shared/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,3 +1,4 @@
+/directory/shared/branches/shared-codec-merge:982370-987558
 /directory/shared/branches/shared-replication:749791-764113
 /directory/shared/branches/shared-schema:806622-896441
 /directory/shared/branches/shared-subtree:965208-965686

Propchange: directory/shared/trunk/all/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,3 +1,3 @@
-/directory/shared/branches-dnfactory-experiment/all:980350-980351
+/directory/shared/branches/shared-codec-merge/all:982370-987558
 /directory/shared/branches/shared-dnfactory-experiment/all:980352-980933
-/directory/shared/trunk/all:980025-980349
+/directory/shared/branches-dnfactory-experiment/all:980350-980351

Modified: directory/shared/trunk/all/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/trunk/all/pom.xml?rev=987606&r1=987605&r2=987606&view=diff
==============================================================================
--- directory/shared/trunk/all/pom.xml (original)
+++ directory/shared/trunk/all/pom.xml Fri Aug 20 19:23:27 2010
@@ -44,10 +44,10 @@
       <artifactId>shared-cursor</artifactId>
     </dependency>
 
-    <dependency>
+    <!-- dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>shared-dsml-parser</artifactId>
-    </dependency>
+    </dependency -->
 
     <dependency>
       <groupId>${project.groupId}</groupId>

Propchange: directory/shared/trunk/asn1/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,3 +1,3 @@
-/directory/shared/branches-dnfactory-experiment/asn1:980350-980351
+/directory/shared/branches/shared-codec-merge/asn1:982370-987558
 /directory/shared/branches/shared-dnfactory-experiment/asn1:980352-980933
-/directory/shared/trunk/asn1:980025-980349
+/directory/shared/branches-dnfactory-experiment/asn1:980350-980351

Propchange: directory/shared/trunk/asn1-codec/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,3 +1,3 @@
-/directory/shared/branches-dnfactory-experiment/asn1-codec:980350-980351
+/directory/shared/branches/shared-codec-merge/asn1-codec:982370-987558
 /directory/shared/branches/shared-dnfactory-experiment/asn1-codec:980352-980933
-/directory/shared/trunk/asn1-codec:980025-980349
+/directory/shared/branches-dnfactory-experiment/asn1-codec:980350-980351

Modified: directory/shared/trunk/asn1-codec/src/main/java/org/apache/directory/shared/asn1/codec/Asn1CodecDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1-codec/src/main/java/org/apache/directory/shared/asn1/codec/Asn1CodecDecoder.java?rev=987606&r1=987605&r2=987606&view=diff
==============================================================================
--- directory/shared/trunk/asn1-codec/src/main/java/org/apache/directory/shared/asn1/codec/Asn1CodecDecoder.java (original)
+++ directory/shared/trunk/asn1-codec/src/main/java/org/apache/directory/shared/asn1/codec/Asn1CodecDecoder.java Fri Aug 20 19:23:27 2010
@@ -37,9 +37,9 @@ public class Asn1CodecDecoder extends Pr
 {
     /** The stateful decoder */
     private final StatefulDecoder decoder;
-    
-    /** The associated callback */
-    private final DecoderCallbackImpl callback = new DecoderCallbackImpl();
+
+    /** The Output queue */
+    private ProtocolDecoderOutput decOut;
 
 
     /**
@@ -50,7 +50,13 @@ public class Asn1CodecDecoder extends Pr
     public Asn1CodecDecoder( StatefulDecoder decoder )
     {
         this.decoder = decoder;
-        this.decoder.setCallback( callback );
+        this.decoder.setCallback( new DecoderCallback()
+        {
+            public void decodeOccurred( StatefulDecoder decoder, Object decoded )
+            {
+                decOut.write( decoded );
+            }
+        } );
     }
 
 
@@ -59,18 +65,7 @@ public class Asn1CodecDecoder extends Pr
      */
     public void decode( IoSession session, IoBuffer in, ProtocolDecoderOutput out ) throws DecoderException
     {
-        callback.decOut = out;
+        decOut = out;
         decoder.decode( in.buf() );
     }
-
-
-    private class DecoderCallbackImpl implements DecoderCallback
-    {
-        private ProtocolDecoderOutput decOut;
-
-        public void decodeOccurred( StatefulDecoder decoder, Object decoded )
-        {
-            decOut.write( decoded );
-        }
-    }
 }

Modified: directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/AbstractGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/AbstractGrammar.java?rev=987606&r1=987605&r2=987606&view=diff
==============================================================================
--- directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/AbstractGrammar.java (original)
+++ directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/AbstractGrammar.java Fri Aug 20 19:23:27 2010
@@ -151,7 +151,8 @@ public abstract class AbstractGrammar im
 
         if ( transition.hasAction() )
         {
-            transition.getAction().action( container );
+            IAction action = transition.getAction();
+            action.action( container );
         }
 
         container.setTransition( transition.getCurrentState() );

Modified: directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/stateful/AbstractStatefulDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/stateful/AbstractStatefulDecoder.java?rev=987606&r1=987605&r2=987606&view=diff
==============================================================================
--- directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/stateful/AbstractStatefulDecoder.java (original)
+++ directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/stateful/AbstractStatefulDecoder.java Fri Aug 20 19:23:27 2010
@@ -50,10 +50,9 @@ public abstract class AbstractStatefulDe
     /**
      * Creates a stateful decoder with a callback.
      * 
-     * @param cb
-     *            the callback to use for this decoder
+     * @param cb the callback to use for this decoder
      */
-    public AbstractStatefulDecoder(DecoderCallback cb)
+    public AbstractStatefulDecoder( DecoderCallback cb )
     {
         setCallback( cb );
     }
@@ -62,10 +61,9 @@ public abstract class AbstractStatefulDe
     /**
      * Creates a stateful decoder with a monitor but no callback.
      * 
-     * @param monitor
-     *            the monitor to use for this decoder
+     * @param monitor the monitor to use for this decoder
      */
-    public AbstractStatefulDecoder(DecoderMonitor monitor)
+    public AbstractStatefulDecoder( DecoderMonitor monitor )
     {
         this.monitor = monitor;
     }
@@ -74,12 +72,10 @@ public abstract class AbstractStatefulDe
     /**
      * Creates a stateful decoder.
      * 
-     * @param cb
-     *            the callback to use for this decoder
-     * @param monitor
-     *            the monitor to use for this decoder
+     * @param cb the callback to use for this decoder
+     * @param monitor the monitor to use for this decoder
      */
-    public AbstractStatefulDecoder(DecoderCallback cb, DecoderMonitor monitor)
+    public AbstractStatefulDecoder( DecoderCallback cb, DecoderMonitor monitor )
     {
         this.monitor = monitor;
         setCallback( cb );
@@ -89,12 +85,8 @@ public abstract class AbstractStatefulDe
     // ------------------------------------------------------------------------
     // StatefulDecoder methods
     // ------------------------------------------------------------------------
-
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.asn1.codec.stateful.StatefulDecoder#setCallback(
-     *      org.apache.asn1.codec.stateful.DecoderCallback)
+    /**
+     * {@inheritDoc}
      */
     public void setCallback( DecoderCallback cb )
     {
@@ -108,11 +100,17 @@ public abstract class AbstractStatefulDe
     }
 
 
-    /*
-     * (non-Javadoc)
-     * 
-     * @see org.apache.asn1.codec.stateful.StatefulDecoder#setDecoderMonitor(
-     *      org.apache.asn1.codec.stateful.DecoderMonitor)
+    /**
+     * {@inheritDoc}
+     */
+    public DecoderCallback getCallback()
+    {
+        return cb;
+    }
+
+
+    /**
+     * {@inheritDoc}
      */
     public void setDecoderMonitor( DecoderMonitor monitor )
     {

Modified: directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/stateful/DecoderCallback.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/stateful/DecoderCallback.java?rev=987606&r1=987605&r2=987606&view=diff
==============================================================================
--- directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/stateful/DecoderCallback.java (original)
+++ directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/stateful/DecoderCallback.java Fri Aug 20 19:23:27 2010
@@ -30,10 +30,8 @@ public interface DecoderCallback
     /**
      * Callback to deliver a fully decoded object.
      * 
-     * @param decoder
-     *            the stateful decoder driving the callback
-     * @param decoded
-     *            the object that was decoded
+     * @param decoder the stateful decoder driving the callback
+     * @param decoded the object that was decoded
      */
     void decodeOccurred( StatefulDecoder decoder, Object decoded );
 }

Modified: directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/stateful/StatefulDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/stateful/StatefulDecoder.java?rev=987606&r1=987605&r2=987606&view=diff
==============================================================================
--- directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/stateful/StatefulDecoder.java (original)
+++ directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/stateful/StatefulDecoder.java Fri Aug 20 19:23:27 2010
@@ -24,7 +24,7 @@ import org.apache.directory.shared.asn1.
 
 
 /**
- * A decoder which decodes encoded data as it arrives in peices while
+ * A decoder which decodes encoded data as it arrives in pieces while
  * maintaining the state of the decode operation between the arrival of encoded
  * chunks. As chunks of encoded data arrive the decoder processes each chunk of
  * encoded data and maintains decoding state in between arrivals: it is hence
@@ -39,7 +39,7 @@ public interface StatefulDecoder
 {
     /**
      * Decodes a piece of encoded data. The nature of this call, synchronous
-     * verses asynchonous, with respect to driving the actual decoding of the
+     * verses asyncrhonous, with respect to driving the actual decoding of the
      * encoded data argument is determined by an implementation. A return from
      * this method does not guarantee any callbacks: zero or more callbacks may
      * occur during this call.
@@ -53,17 +53,13 @@ public interface StatefulDecoder
     /**
      * Sets the callback for this StatefulDecoder.
      * 
-     * @param cb
-     *            the callback to inform of a complete decode operation
+     * @param cb the callback to inform of a complete decode operation
      */
     void setCallback( DecoderCallback cb );
 
 
     /**
-     * Monitors all kinds of events that occur during processing.
-     * 
-     * @param monitor
-     *            to set for this StatefulDecoder
+     * @return The decoder callback
      */
-    void setDecoderMonitor( DecoderMonitor monitor );
+    DecoderCallback getCallback();
 }

Modified: directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/stateful/StatefulEncoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/stateful/StatefulEncoder.java?rev=987606&r1=987605&r2=987606&view=diff
==============================================================================
--- directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/stateful/StatefulEncoder.java (original)
+++ directory/shared/trunk/asn1/src/main/java/org/apache/directory/shared/asn1/codec/stateful/StatefulEncoder.java Fri Aug 20 19:23:27 2010
@@ -48,13 +48,4 @@ public interface StatefulEncoder
      * @param cb the callback to set on the underlying provider specific encoder
      */
     void setCallback( EncoderCallback cb );
-
-
-    /**
-     * Sets the monitor of the underlying implementation.
-     * 
-     * @param monitor the monitor to set on the underlying implementation
-     */
-    void setEncoderMonitor( EncoderMonitor monitor );
-
 }

Propchange: directory/shared/trunk/cursor/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,2 +1,3 @@
-/directory/shared/branches-dnfactory-experiment/cursor:980350-980351
+/directory/shared/branches/shared-codec-merge/cursor:982370-987558
 /directory/shared/branches/shared-dnfactory-experiment/cursor:980352-980933
+/directory/shared/branches-dnfactory-experiment/cursor:980350-980351

Propchange: directory/shared/trunk/dsml-parser/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,3 +1,3 @@
-/directory/shared/branches-dnfactory-experiment/dsml-parser:980350-980351
+/directory/shared/branches/shared-codec-merge/dsml-parser:982370-987558
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser:980352-980933
-/directory/shared/trunk/dsml-parser:980025-980349
+/directory/shared/branches-dnfactory-experiment/dsml-parser:980350-980351

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractGrammar.java?rev=987606&r1=987605&r2=987606&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractGrammar.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractGrammar.java Fri Aug 20 19:23:27 2010
@@ -122,6 +122,7 @@ public abstract class AbstractGrammar im
         XmlPullParser xpp = container.getParser();
 
         int eventType = xpp.getEventType();
+
         do
         {
             if ( eventType == XmlPullParser.START_DOCUMENT )
@@ -140,6 +141,7 @@ public abstract class AbstractGrammar im
             {
                 processTag( container, Tag.END );
             }
+
             eventType = xpp.next();
         }
         while ( eventType != XmlPullParser.END_DOCUMENT );
@@ -170,7 +172,8 @@ public abstract class AbstractGrammar im
 
             if ( transition.hasAction() )
             {
-                transition.getAction().action( container );
+                GrammarAction action = transition.getAction();
+                action.action( container );
             }
         }
         else

Propchange: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractGrammar.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,7 +1,7 @@
-/directory/shared/branches-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractGrammar.java:980350-980351
+/directory/shared/branches/shared-codec-merge/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractGrammar.java:982370-987558
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractGrammar.java:980352-980933
 /directory/shared/branches/shared-replication/dsml-parser/src/main/java/org/apache/directory/studio/dsmlv2/AbstractGrammar.java:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractGrammar.java:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractGrammar.java:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractGrammar.java:945830-946347
-/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractGrammar.java:980025-980349
+/directory/shared/branches-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractGrammar.java:980350-980351

Propchange: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Container.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,7 +1,7 @@
-/directory/shared/branches-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Container.java:980350-980351
+/directory/shared/branches/shared-codec-merge/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Container.java:982370-987558
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Container.java:980352-980933
 /directory/shared/branches/shared-replication/dsml-parser/src/main/java/org/apache/directory/studio/dsmlv2/Container.java:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Container.java:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Container.java:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Container.java:945830-946347
-/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Container.java:980025-980349
+/directory/shared/branches-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Container.java:980350-980351

Propchange: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/DsmlDecorator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,7 +1,7 @@
-/directory/shared/branches-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/DsmlDecorator.java:980350-980351
+/directory/shared/branches/shared-codec-merge/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/DsmlDecorator.java:982370-987558
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/DsmlDecorator.java:980352-980933
 /directory/shared/branches/shared-replication/dsml-parser/src/main/java/org/apache/directory/studio/dsmlv2/DsmlDecorator.java:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/DsmlDecorator.java:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/DsmlDecorator.java:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/DsmlDecorator.java:945830-946347
-/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/DsmlDecorator.java:980025-980349
+/directory/shared/branches-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/DsmlDecorator.java:980350-980351

Propchange: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Container.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,7 +1,7 @@
-/directory/shared/branches-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Container.java:980350-980351
+/directory/shared/branches/shared-codec-merge/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Container.java:982370-987558
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Container.java:980352-980933
 /directory/shared/branches/shared-replication/dsml-parser/src/main/java/org/apache/directory/studio/dsmlv2/Dsmlv2Container.java:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Container.java:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Container.java:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Container.java:945830-946347
-/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Container.java:980025-980349
+/directory/shared/branches-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Container.java:980350-980351

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Parser.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Parser.java?rev=987606&r1=987605&r2=987606&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Parser.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Parser.java Fri Aug 20 19:23:27 2010
@@ -31,7 +31,7 @@ import java.io.StringReader;
 import org.apache.directory.shared.dsmlv2.request.BatchRequest;
 import org.apache.directory.shared.dsmlv2.request.Dsmlv2Grammar;
 import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.codec.LdapMessageCodec;
+import org.apache.directory.shared.ldap.message.Message;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 import org.xmlpull.v1.XmlPullParserFactory;
@@ -166,8 +166,7 @@ public class Dsmlv2Parser
             }
             catch ( IOException e )
             {
-                throw new XmlPullParserException( I18n.err( I18n.ERR_03037, e.getLocalizedMessage() ), xpp,
-                    null );
+                throw new XmlPullParserException( I18n.err( I18n.ERR_03037, e.getLocalizedMessage() ), xpp, null );
             }
         }
         while ( container.getState() != Dsmlv2StatesEnum.BATCHREQUEST_START_TAG );
@@ -227,7 +226,7 @@ public class Dsmlv2Parser
      * @throws XmlPullParserException      
      *      when an error occurs during the parsing
      */
-    public LdapMessageCodec getNextRequest() throws XmlPullParserException
+    public Message getNextRequest() throws XmlPullParserException
     {
         if ( container.getBatchRequest() == null )
         {
@@ -247,8 +246,7 @@ public class Dsmlv2Parser
                 }
                 catch ( IOException e )
                 {
-                    throw new XmlPullParserException( I18n.err( I18n.ERR_03037, e.getLocalizedMessage() ), xpp,
-                        null );
+                    throw new XmlPullParserException( I18n.err( I18n.ERR_03037, e.getLocalizedMessage() ), xpp, null );
                 }
                 eventType = xpp.getEventType();
             }
@@ -276,8 +274,7 @@ public class Dsmlv2Parser
             }
             catch ( IOException e )
             {
-                throw new XmlPullParserException( I18n.err( I18n.ERR_03037, e.getLocalizedMessage() ), xpp,
-                    null );
+                throw new XmlPullParserException( I18n.err( I18n.ERR_03037, e.getLocalizedMessage() ), xpp, null );
             }
         }
         while ( container.getState() != Dsmlv2StatesEnum.BATCHREQUEST_LOOP );

Propchange: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Parser.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,7 +1,7 @@
-/directory/shared/branches-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Parser.java:980350-980351
+/directory/shared/branches/shared-codec-merge/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Parser.java:982370-987558
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Parser.java:980352-980933
 /directory/shared/branches/shared-replication/dsml-parser/src/main/java/org/apache/directory/studio/dsmlv2/Dsmlv2Parser.java:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Parser.java:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Parser.java:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Parser.java:945830-946347
-/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Parser.java:980025-980349
+/directory/shared/branches-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Parser.java:980350-980351

Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java?rev=987606&r1=987605&r2=987606&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java Fri Aug 20 19:23:27 2010
@@ -31,7 +31,7 @@ import java.io.StringReader;
 import org.apache.directory.shared.dsmlv2.reponse.BatchResponse;
 import org.apache.directory.shared.dsmlv2.reponse.Dsmlv2ResponseGrammar;
 import org.apache.directory.shared.i18n.I18n;
-import org.apache.directory.shared.ldap.codec.LdapResponseCodec;
+import org.apache.directory.shared.ldap.message.Response;
 import org.xmlpull.v1.XmlPullParser;
 import org.xmlpull.v1.XmlPullParserException;
 import org.xmlpull.v1.XmlPullParserFactory;
@@ -166,8 +166,7 @@ public class Dsmlv2ResponseParser
             }
             catch ( IOException e )
             {
-                throw new XmlPullParserException( I18n.err( I18n.ERR_03037, e.getLocalizedMessage() ), xpp,
-                    null );
+                throw new XmlPullParserException( I18n.err( I18n.ERR_03037, e.getLocalizedMessage() ), xpp, null );
             }
         }
         while ( container.getState() != Dsmlv2StatesEnum.BATCH_RESPONSE_LOOP );
@@ -227,7 +226,7 @@ public class Dsmlv2ResponseParser
      * @throws XmlPullParserException 
      *      when an error occurs during the parsing
      */
-    public LdapResponseCodec getNextResponse() throws XmlPullParserException
+    public Response getNextResponse() throws XmlPullParserException
     {
         if ( container.getBatchResponse() == null )
         {
@@ -247,8 +246,7 @@ public class Dsmlv2ResponseParser
                 }
                 catch ( IOException e )
                 {
-                    throw new XmlPullParserException( I18n.err( I18n.ERR_03037, e.getLocalizedMessage() ), xpp,
-                        null );
+                    throw new XmlPullParserException( I18n.err( I18n.ERR_03037, e.getLocalizedMessage() ), xpp, null );
                 }
                 eventType = xpp.getEventType();
             }
@@ -276,8 +274,7 @@ public class Dsmlv2ResponseParser
             }
             catch ( IOException e )
             {
-                throw new XmlPullParserException( I18n.err( I18n.ERR_03037, e.getLocalizedMessage() ), xpp,
-                    null );
+                throw new XmlPullParserException( I18n.err( I18n.ERR_03037, e.getLocalizedMessage() ), xpp, null );
             }
         }
         while ( container.getState() != Dsmlv2StatesEnum.BATCH_RESPONSE_LOOP );

Propchange: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,7 +1,7 @@
-/directory/shared/branches-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java:980350-980351
+/directory/shared/branches/shared-codec-merge/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java:982370-987558
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java:980352-980933
 /directory/shared/branches/shared-replication/dsml-parser/src/main/java/org/apache/directory/studio/dsmlv2/Dsmlv2ResponseParser.java:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java:945830-946347
-/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java:980025-980349
+/directory/shared/branches-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java:980350-980351



Mime
View raw message