svn commit: r1187306 [1/4] - in /directory/shared/branches/shared-txns: ./ all/ asn1/api/ asn1/ber/ dsml/engine/ dsml/engine/src/main/java/org/apache/directory/shared/dsmlv2/engine/ dsml/parser/ dsml/parser/src/main/java/org/apache/directory/shared/dsm...

[el...@apache.org]

Author: elecharny
Date: Fri Oct 21 11:42:22 2011
New Revision: 1187306

URL: http://svn.apache.org/viewvc?rev=1187306&view=rev
Log:
Merged trunk into the shared branch

Added:
    directory/shared/branches/shared-txns/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/standalone/
      - copied from r1187280, directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/standalone/
    directory/shared/branches/shared-txns/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/standalone/AbstractCodecServiceTest.java
      - copied unchanged from r1187280, directory/shared/trunk/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/standalone/AbstractCodecServiceTest.java
    directory/shared/branches/shared-txns/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/
      - copied from r1187280, directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/
    directory/shared/branches/shared-txns/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PPolicyInit.java
      - copied unchanged from r1187280, directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PPolicyInit.java
    directory/shared/branches/shared-txns/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyContainer.java
      - copied unchanged from r1187280, directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyContainer.java
    directory/shared/branches/shared-txns/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyDecorator.java
      - copied unchanged from r1187280, directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyDecorator.java
    directory/shared/branches/shared-txns/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyFactory.java
      - copied unchanged from r1187280, directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyFactory.java
    directory/shared/branches/shared-txns/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyGrammar.java
      - copied unchanged from r1187280, directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyGrammar.java
    directory/shared/branches/shared-txns/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyStates.java
      - copied unchanged from r1187280, directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyStates.java
    directory/shared/branches/shared-txns/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyTags.java
      - copied unchanged from r1187280, directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/PasswordPolicyTags.java
    directory/shared/branches/shared-txns/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/StoreError.java
      - copied unchanged from r1187280, directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/StoreError.java
    directory/shared/branches/shared-txns/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/StoreGraceAuthsRemaining.java
      - copied unchanged from r1187280, directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/StoreGraceAuthsRemaining.java
    directory/shared/branches/shared-txns/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/StoreTimeBeforeExpiration.java
      - copied unchanged from r1187280, directory/shared/trunk/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy_impl/StoreTimeBeforeExpiration.java
    directory/shared/branches/shared-txns/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/AbstractCodecServiceTest.java
      - copied unchanged from r1187280, directory/shared/trunk/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/AbstractCodecServiceTest.java
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/oid.txt
      - copied unchanged from r1187277, directory/shared/trunk/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/oid.txt
Removed:
    directory/shared/branches/shared-txns/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/controls/
    directory/shared/branches/shared-txns/ldap/codec/standalone/src/test/java/org/apache/directory/shared/ldap/codec/osgi/
    directory/shared/branches/shared-txns/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/
    directory/shared/branches/shared-txns/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/codec/osgi/
Modified:
    directory/shared/branches/shared-txns/all/   (props changed)
    directory/shared/branches/shared-txns/asn1/api/   (props changed)
    directory/shared/branches/shared-txns/asn1/api/pom.xml
    directory/shared/branches/shared-txns/asn1/ber/   (props changed)
    directory/shared/branches/shared-txns/asn1/ber/pom.xml
    directory/shared/branches/shared-txns/dsml/engine/   (props changed)
    directory/shared/branches/shared-txns/dsml/engine/pom.xml
    directory/shared/branches/shared-txns/dsml/engine/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java
    directory/shared/branches/shared-txns/dsml/parser/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/pom.xml
    directory/shared/branches/shared-txns/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractGrammar.java   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Action.java   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Container.java   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/DsmlDecorator.java   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Container.java   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Parser.java   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2StatesEnum.java   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Grammar.java   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarAction.java   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarTransition.java   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Tag.java   (contents, props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractResponseTest.java   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractTest.java   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AllTests.java   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/errorResponse/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareResponse/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/delRequest/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/delResponse/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/errorResponse/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedRequest/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedResponse/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNRequest/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNResponse/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyRequest/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyResponse/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/filters/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_base64_value.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_empty_value.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_attributes_elements.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_controls.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_filters.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_3_controls_without_value.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attribute_without_name_attribute.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_1_attribute.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_2_attribute.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_but_no_attribute.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefAlways.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefFindingBaseObj.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefInSearching.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_error.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_neverDerefAliases.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_dn_attribute.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_empty_filter.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_needed_requestID.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_attribute.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_equals_0.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_baseObject.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_error.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_singleLevel.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_wholeSubtree.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_attribute.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_error.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_attribute.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_error.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_0.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_1.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_error.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_false.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_true.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_derefAliases_attribute.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_dn_attribute.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_filter.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_scope_attribute.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_0_SRD.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRD.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_0_SRD.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRD.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRR_1_SRD.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_0_SRD.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_1_SRD.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_1_SRD.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_2_SRR_1_SRD.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRR_1_SRD.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_attribute.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_equals_0.xml   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/   (props changed)
    directory/shared/branches/shared-txns/i18n/   (props changed)
    directory/shared/branches/shared-txns/i18n/pom.xml
    directory/shared/branches/shared-txns/i18n/src/main/java/org/apache/directory/shared/i18n/I18n.java
    directory/shared/branches/shared-txns/i18n/src/main/resources/org/apache/directory/shared/i18n/errors.properties
    directory/shared/branches/shared-txns/integ/   (props changed)
    directory/shared/branches/shared-txns/integ/src/test/java/org/apache/directory/shared/ldap/codec/api/StandaloneLdapCodecServiceTest.java
    directory/shared/branches/shared-txns/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareEntryTest.java
    directory/shared/branches/shared-txns/ldap/client/all/   (props changed)
    directory/shared/branches/shared-txns/ldap/client/api/   (props changed)
    directory/shared/branches/shared-txns/ldap/client/api/pom.xml
    directory/shared/branches/shared-txns/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/Krb5LoginConfiguration.java   (props changed)
    directory/shared/branches/shared-txns/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/LdapConnectionFactory.java
    directory/shared/branches/shared-txns/ldap/codec/core/   (props changed)
    directory/shared/branches/shared-txns/ldap/codec/core/pom.xml
    directory/shared/branches/shared-txns/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/api/LdapDecoder.java
    directory/shared/branches/shared-txns/ldap/codec/core/src/main/java/org/apache/directory/shared/ldap/codec/osgi/DefaultLdapCodecService.java
    directory/shared/branches/shared-txns/ldap/codec/core/src/test/java/org/apache/directory/shared/ldap/codec/LdapDecoderTest.java
    directory/shared/branches/shared-txns/ldap/codec/standalone/   (props changed)
    directory/shared/branches/shared-txns/ldap/codec/standalone/pom.xml
    directory/shared/branches/shared-txns/ldap/codec/standalone/src/main/java/org/apache/directory/shared/ldap/codec/standalone/StandaloneLdapApiService.java
    directory/shared/branches/shared-txns/ldap/extras/aci/   (props changed)
    directory/shared/branches/shared-txns/ldap/extras/aci/pom.xml
    directory/shared/branches/shared-txns/ldap/extras/codec/   (props changed)
    directory/shared/branches/shared-txns/ldap/extras/codec-api/   (props changed)
    directory/shared/branches/shared-txns/ldap/extras/codec-api/pom.xml
    directory/shared/branches/shared-txns/ldap/extras/codec/pom.xml
    directory/shared/branches/shared-txns/ldap/extras/codec/src/main/java/org/apache/directory/shared/ldap/extras/ExtrasBundleActivator.java
    directory/shared/branches/shared-txns/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/ppolicy/PasswordPolicyTest.java
    directory/shared/branches/shared-txns/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncDoneValueControlTest.java
    directory/shared/branches/shared-txns/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncInfoValueControlTest.java
    directory/shared/branches/shared-txns/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncRequestValueControlTest.java
    directory/shared/branches/shared-txns/ldap/extras/codec/src/test/java/org/apache/directory/shared/ldap/extras/controls/syncrepl_impl/SyncStateValueControlTest.java
    directory/shared/branches/shared-txns/ldap/extras/sp/   (props changed)
    directory/shared/branches/shared-txns/ldap/extras/sp/pom.xml
    directory/shared/branches/shared-txns/ldap/extras/sp/src/main/java/org/apache/directory/shared/ldap/sp/JavaStoredProcUtils.java
    directory/shared/branches/shared-txns/ldap/extras/trigger/   (props changed)
    directory/shared/branches/shared-txns/ldap/extras/trigger/pom.xml
    directory/shared/branches/shared-txns/ldap/extras/util/   (props changed)
    directory/shared/branches/shared-txns/ldap/extras/util/pom.xml
    directory/shared/branches/shared-txns/ldap/model/   (props changed)
    directory/shared/branches/shared-txns/ldap/model/pom.xml
    directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java   (props changed)
    directory/shared/branches/shared-txns/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/constants/SchemaConstants.java
    directory/shared/branches/shared-txns/ldap/net/mina/   (props changed)
    directory/shared/branches/shared-txns/ldap/net/mina/pom.xml
    directory/shared/branches/shared-txns/ldap/net/mina/src/main/java/org/apache/directory/shared/ldap/codec/protocol/mina/LdapProtocolDecoder.java
    directory/shared/branches/shared-txns/ldap/schema/converter/   (props changed)
    directory/shared/branches/shared-txns/ldap/schema/converter/pom.xml
    directory/shared/branches/shared-txns/ldap/schema/converter/src/main/java/org/apache/directory/shared/converter/schema/SchemaToLdif.java
    directory/shared/branches/shared-txns/ldap/schema/data/   (props changed)
    directory/shared/branches/shared-txns/ldap/schema/data/pom.xml
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/   (props changed)
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java   (contents, props changed)
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.0.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.100.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.101.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.102.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.103.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.104.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.105.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.108.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.110.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.111.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.112.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.113.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.115.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.116.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.117.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.120.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.121.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.130.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.131.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.141.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.142.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.143.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.144.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.150.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.151.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.152.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.153.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.154.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.313.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.804.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=attributetypes/m-oid=1.3.6.1.4.1.18060.0.4.1.2.933.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.100.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.130.ldif
    directory/shared/branches/shared-txns/ldap/schema/data/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.131.ldif
    directory/shared/branches/shared-txns/pom.xml
    directory/shared/branches/shared-txns/util/   (props changed)
    directory/shared/branches/shared-txns/util/pom.xml

Propchange: directory/shared/branches/shared-txns/all/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-dnfactory-experiment/all:980352-980933
 /directory/shared/branches/shared-osgi/all:1103720-1124653
 /directory/shared/branches-dnfactory-experiment/all:980350-980351
-/directory/shared/trunk/all:1066124-1067995,1068025-1072732,1072797-1075328
+/directory/shared/trunk/all:1066124-1067995,1068025-1072732,1072797-1075328,1177670-1187278

Propchange: directory/shared/branches/shared-txns/asn1/api/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -0,0 +1,9 @@
+/directory/shared/branches/milestones/asn1/api:1072811-1074633,1074637-1075326
+/directory/shared/branches/shared-codec-merge/asn1/api:982370-987558
+/directory/shared/branches/shared-config/asn1/api:1023444-1029061
+/directory/shared/branches/shared-osgi/asn1/api:1103720-1124653
+/directory/shared/branches/shared-replication/asn1/api:749791-764113
+/directory/shared/branches/shared-schema/asn1/api:806622-896441
+/directory/shared/branches/shared-subtree/asn1/api:965208-965686
+/directory/shared/branches/xdbm-refactoring/asn1/api:945830-946347
+/directory/shared/trunk/asn1/api:1066124-1067995,1068025-1072732,1072797-1075328,1177670-1187278

Modified: directory/shared/branches/shared-txns/asn1/api/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/asn1/api/pom.xml?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/asn1/api/pom.xml (original)
+++ directory/shared/branches/shared-txns/asn1/api/pom.xml Fri Oct 21 11:42:22 2011
@@ -47,6 +47,17 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+            <addMavenDescriptor>false</addMavenDescriptor>
+          </archive>
+        </configuration>
+      </plugin>
+      
+      <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <inherited>true</inherited>
@@ -55,13 +66,8 @@
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.asn1.api</Bundle-SymbolicName>
-            <Import-Package>
-              org.apache.directory.shared.i18n,
-              org.apache.directory.shared.util
-            </Import-Package>
             <Export-Package>
-              org.apache.directory.shared.asn1,
-              org.apache.directory.shared.asn1.util
+                {local-packages};version=${project.version};-noimport:=true
             </Export-Package>
           </instructions>
         </configuration>

Propchange: directory/shared/branches/shared-txns/asn1/ber/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -0,0 +1,9 @@
+/directory/shared/branches/milestones/asn1/ber:1072811-1074633,1074637-1075326
+/directory/shared/branches/shared-codec-merge/asn1/ber:982370-987558
+/directory/shared/branches/shared-config/asn1/ber:1023444-1029061
+/directory/shared/branches/shared-osgi/asn1/ber:1103720-1124653
+/directory/shared/branches/shared-replication/asn1/ber:749791-764113
+/directory/shared/branches/shared-schema/asn1/ber:806622-896441
+/directory/shared/branches/shared-subtree/asn1/ber:965208-965686
+/directory/shared/branches/xdbm-refactoring/asn1/ber:945830-946347
+/directory/shared/trunk/asn1/ber:1066124-1067995,1068025-1072732,1072797-1075328,1177670-1187278

Modified: directory/shared/branches/shared-txns/asn1/ber/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/asn1/ber/pom.xml?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/asn1/ber/pom.xml (original)
+++ directory/shared/branches/shared-txns/asn1/ber/pom.xml Fri Oct 21 11:42:22 2011
@@ -57,6 +57,17 @@
   <build>
     <plugins>
       <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-jar-plugin</artifactId>
+        <configuration>
+          <archive>
+            <manifestFile>META-INF/MANIFEST.MF</manifestFile>
+            <addMavenDescriptor>false</addMavenDescriptor>
+          </archive>
+        </configuration>
+      </plugin>
+      
+      <plugin>
         <groupId>org.apache.felix</groupId>
         <artifactId>maven-bundle-plugin</artifactId>
         <inherited>true</inherited>
@@ -66,8 +77,7 @@
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.asn1.ber</Bundle-SymbolicName>
             <Export-Package>
-              org.apache.directory.shared.asn1.actions,
-              org.apache.directory.shared.asn1.ber.*
+                {local-packages};version=${project.version};-noimport:=true
             </Export-Package>
           </instructions>
         </configuration>

Propchange: directory/shared/branches/shared-txns/dsml/engine/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -0,0 +1,9 @@
+/directory/shared/branches/milestones/dsml/engine:1072811-1074633,1074637-1075326
+/directory/shared/branches/shared-codec-merge/dsml/engine:982370-987558
+/directory/shared/branches/shared-config/dsml/engine:1023444-1029061
+/directory/shared/branches/shared-osgi/dsml/engine:1103720-1124653
+/directory/shared/branches/shared-replication/dsml/engine:749791-764113
+/directory/shared/branches/shared-schema/dsml/engine:806622-896441
+/directory/shared/branches/shared-subtree/dsml/engine:965208-965686
+/directory/shared/branches/xdbm-refactoring/dsml/engine:945830-946347
+/directory/shared/trunk/dsml/engine:1066124-1067995,1068025-1072732,1072797-1075328,1177670-1187278

Modified: directory/shared/branches/shared-txns/dsml/engine/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/dsml/engine/pom.xml?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/dsml/engine/pom.xml (original)
+++ directory/shared/branches/shared-txns/dsml/engine/pom.xml Fri Oct 21 11:42:22 2011
@@ -73,7 +73,9 @@
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.dsmlv2.engine</Bundle-SymbolicName>
-            <Export-Package>org.apache.directory.shared.dsmlv2.engine</Export-Package>
+            <Export-Package>
+                {local-packages};version=${project.version};-noimport:=true
+            </Export-Package>
           </instructions>
         </configuration>
       </plugin>

Modified: directory/shared/branches/shared-txns/dsml/engine/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/dsml/engine/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/dsml/engine/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java (original)
+++ directory/shared/branches/shared-txns/dsml/engine/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java Fri Oct 21 11:42:22 2011
@@ -381,10 +381,6 @@ public class Dsmlv2Engine
             LOG.warn( "Failed while getting next request", e );
             
             int reqId = 0;
-            if ( request != null )
-            {
-                reqId = request.getDecorated().getMessageId();
-            }
             
             // We create a new ErrorResponse and return the XML response.
             ErrorResponse errorResponse = new ErrorResponse( reqId, ErrorResponseType.MALFORMED_REQUEST, I18n.err(
@@ -769,6 +765,11 @@ public class Dsmlv2Engine
             return;
         }
         
+        if ( connection == null )
+        {
+        	throw new IOException( I18n.err( I18n.ERR_03101_MISSING_CONNECTION_TO ) );
+        }
+        
         BindRequest bindRequest = new BindRequestImpl();
         bindRequest.setSimple( true );
         bindRequest.setCredentials( Strings.getBytesUtf8(password) );

Propchange: directory/shared/branches/shared-txns/dsml/parser/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -4,4 +4,5 @@
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser:980352-980933
 /directory/shared/branches/shared-osgi/dsml/parser:1103720-1124653
 /directory/shared/branches-dnfactory-experiment/dsml-parser:980350-980351
+/directory/shared/trunk/dsml/parser:1177670-1187279
 /directory/shared/trunk/dsml-parser:1066124-1067995,1068025-1072732,1072797-1075328

Modified: directory/shared/branches/shared-txns/dsml/parser/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/dsml/parser/pom.xml?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/dsml/parser/pom.xml (original)
+++ directory/shared/branches/shared-txns/dsml/parser/pom.xml Fri Oct 21 11:42:22 2011
@@ -114,7 +114,9 @@
           <manifestLocation>META-INF</manifestLocation>
           <instructions>
             <Bundle-SymbolicName>${project.groupId}.dsmlv2.parser</Bundle-SymbolicName>
-            <Export-Package>org.apache.directory.shared.dsmlv2.*</Export-Package>
+            <Export-Package>
+                {local-packages};version=${project.version};-noimport:=true
+            </Export-Package>
           </instructions>
         </configuration>
       </plugin>

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractGrammar.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -8,4 +8,5 @@
 /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/branches-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractGrammar.java:980350-980351
+/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractGrammar.java:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractGrammar.java:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Action.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -8,5 +8,6 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/IAction.java:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/IAction.java:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/IAction.java:980350-980351
+/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Action.java:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Action.java:1067492-1067995,1068025-1072732,1072797-1075328
 /directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/IAction.java:1066124-1067491

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Container.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -8,4 +8,5 @@
 /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/branches-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Container.java:980350-980351
+/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Container.java:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Container.java:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/DsmlDecorator.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -8,4 +8,5 @@
 /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/branches-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/DsmlDecorator.java:980350-980351
+/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/DsmlDecorator.java:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/DsmlDecorator.java:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Container.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -8,4 +8,5 @@
 /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/branches-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Container.java:980350-980351
+/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Container.java:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Container.java:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Parser.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -8,4 +8,5 @@
 /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/branches-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Parser.java:980350-980351
+/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Parser.java:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Parser.java:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -8,4 +8,5 @@
 /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/branches-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java:980350-980351
+/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2StatesEnum.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -8,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2StatesEnum.java:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2StatesEnum.java:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2StatesEnum.java:980350-980351
+/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2StatesEnum.java:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2StatesEnum.java:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Grammar.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -8,5 +8,6 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/IGrammar.java:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/IGrammar.java:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/IGrammar.java:980350-980351
+/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Grammar.java:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Grammar.java:1067492-1067995,1068025-1072732,1072797-1075328
 /directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/IGrammar.java:1066124-1067491

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarAction.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -8,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarAction.java:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarAction.java:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarAction.java:980350-980351
+/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarAction.java:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarAction.java:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarTransition.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -8,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarTransition.java:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarTransition.java:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarTransition.java:980350-980351
+/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarTransition.java:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarTransition.java:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -8,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java:980350-980351
+/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java:1066124-1067995,1068025-1072732,1072797-1075328

Modified: directory/shared/branches/shared-txns/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Tag.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Tag.java?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Tag.java (original)
+++ directory/shared/branches/shared-txns/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Tag.java Fri Oct 21 11:42:22 2011
@@ -111,10 +111,9 @@ public class Tag
     }
 
 
-    /* (non-Javadoc)
-     * @see java.lang.Object#equals(java.lang.Object)
+    /**
+     * {@inheritDoc}
      */
-    @Override
     public boolean equals( Object obj )
     {
         if ( obj instanceof Tag )
@@ -130,20 +129,18 @@ public class Tag
     }
 
 
-    /* (non-Javadoc)
-     * @see java.lang.Object#hashCode()
+    /**
+     * {@inheritDoc}
      */
-    @Override
     public int hashCode()
     {
         return name.hashCode() + type << 24;
     }
 
 
-    /* (non-Javadoc)
-     * @see java.lang.Object#toString()
+    /**
+     * {@inheritDoc}
      */
-    @Override
     public String toString()
     {
         if ( name != null )

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Tag.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -8,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Tag.java:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Tag.java:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Tag.java:980350-980351
+/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Tag.java:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/Tag.java:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -8,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse:980350-980351
+/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -8,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request:980350-980351
+/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractResponseTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -8,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractResponseTest.java:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractResponseTest.java:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractResponseTest.java:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractResponseTest.java:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractResponseTest.java:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -8,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractTest.java:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractTest.java:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractTest.java:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractTest.java:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractTest.java:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AllTests.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -8,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AllTests.java:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AllTests.java:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AllTests.java:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AllTests.java:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/AllTests.java:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -8,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -8,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -8,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -8,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -8,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -8,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -8,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -8,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -8,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -8,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -8,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/errorResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -8,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/errorResponse:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/errorResponse:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/errorResponse:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/errorResponse:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/errorResponse:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -8,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -8,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -8,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -8,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -8,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -8,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -8,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -8,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -8,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -8,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -8,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -8,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Oct 21 11:42:22 2011
@@ -8,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest:1066124-1067995,1068025-1072732,1072797-1075328