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

[el...@apache.org]

Author: elecharny
Date: Wed Dec 14 14:24:04 2011
New Revision: 1214252

URL: http://svn.apache.org/viewvc?rev=1214252&view=rev
Log:
o Merge back trunk into the Txns branch

Modified:
    directory/shared/branches/shared-txns/all/   (props changed)
    directory/shared/branches/shared-txns/asn1/api/   (props changed)
    directory/shared/branches/shared-txns/asn1/ber/   (props changed)
    directory/shared/branches/shared-txns/dsml/engine/   (props changed)
    directory/shared/branches/shared-txns/dsml/parser/   (props changed)
    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   (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/integ/   (props changed)
    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/src/main/java/org/apache/directory/ldap/client/api/Krb5LoginConfiguration.java   (props changed)
    directory/shared/branches/shared-txns/ldap/codec/core/   (props changed)
    directory/shared/branches/shared-txns/ldap/codec/standalone/   (props changed)
    directory/shared/branches/shared-txns/ldap/extras/aci/   (props changed)
    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/sp/   (props changed)
    directory/shared/branches/shared-txns/ldap/extras/trigger/   (props changed)
    directory/shared/branches/shared-txns/ldap/extras/util/   (props changed)
    directory/shared/branches/shared-txns/ldap/model/   (props changed)
    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/net/mina/   (props changed)
    directory/shared/branches/shared-txns/ldap/schema/converter/   (props changed)
    directory/shared/branches/shared-txns/ldap/schema/data/   (props changed)
    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   (props changed)
    directory/shared/branches/shared-txns/util/   (props changed)

Propchange: directory/shared/branches/shared-txns/all/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:24:04 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,1177670-1201283
+/directory/shared/trunk/all:1066124-1067995,1068025-1072732,1072797-1075328,1177670-1201283,1209073-1214195

Propchange: directory/shared/branches/shared-txns/asn1/api/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:24:04 2011
@@ -6,4 +6,4 @@
 /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-1201283
+/directory/shared/trunk/asn1/api:1066124-1067995,1068025-1072732,1072797-1075328,1177670-1201283,1209073-1214195

Propchange: directory/shared/branches/shared-txns/asn1/ber/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:24:04 2011
@@ -6,4 +6,4 @@
 /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-1201283
+/directory/shared/trunk/asn1/ber:1066124-1067995,1068025-1072732,1072797-1075328,1177670-1201283,1209073-1214195

Propchange: directory/shared/branches/shared-txns/dsml/engine/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:24:04 2011
@@ -6,4 +6,4 @@
 /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-1201283
+/directory/shared/trunk/dsml/engine:1066124-1067995,1068025-1072732,1072797-1075328,1177670-1201283,1209073-1214195

Propchange: directory/shared/branches/shared-txns/dsml/parser/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:24:04 2011
@@ -4,5 +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-1201283
+/directory/shared/trunk/dsml/parser:1177670-1201283,1209073-1214195
 /directory/shared/trunk/dsml-parser:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractGrammar.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:24:04 2011
@@ -8,5 +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-1201283
+/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/AbstractGrammar.java:1177670-1201283,1209073-1214195
 /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 Wed Dec 14 14:24:04 2011
@@ -8,6 +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-1201283
+/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Action.java:1177670-1201283,1209073-1214195
 /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 Wed Dec 14 14:24:04 2011
@@ -8,5 +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-1201283
+/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Container.java:1177670-1201283,1209073-1214195
 /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 Wed Dec 14 14:24:04 2011
@@ -8,5 +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-1201283
+/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/DsmlDecorator.java:1177670-1201283,1209073-1214195
 /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 Wed Dec 14 14:24:04 2011
@@ -8,5 +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-1201283
+/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Container.java:1177670-1201283,1209073-1214195
 /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 Wed Dec 14 14:24:04 2011
@@ -8,5 +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-1201283
+/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2Parser.java:1177670-1201283,1209073-1214195
 /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 Wed Dec 14 14:24:04 2011
@@ -8,5 +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-1201283
+/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2ResponseParser.java:1177670-1201283,1209073-1214195
 /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 Wed Dec 14 14:24:04 2011
@@ -8,5 +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-1201283
+/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Dsmlv2StatesEnum.java:1177670-1201283,1209073-1214195
 /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 Wed Dec 14 14:24:04 2011
@@ -8,6 +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-1201283
+/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Grammar.java:1177670-1201283,1209073-1214195
 /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 Wed Dec 14 14:24:04 2011
@@ -8,5 +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-1201283
+/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarAction.java:1177670-1201283,1209073-1214195
 /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 Wed Dec 14 14:24:04 2011
@@ -8,5 +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-1201283
+/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/GrammarTransition.java:1177670-1201283,1209073-1214195
 /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 Wed Dec 14 14:24:04 2011
@@ -8,5 +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-1201283
+/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java:1177670-1201283,1209073-1214195
 /directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Tag.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:24:04 2011
@@ -8,5 +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-1201283
+/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/Tag.java:1177670-1201283,1209073-1214195
 /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 Wed Dec 14 14:24:04 2011
@@ -8,5 +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-1201283
+/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse:1177670-1201283,1209073-1214195
 /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 Wed Dec 14 14:24:04 2011
@@ -8,5 +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-1201283
+/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/request:1177670-1201283,1209073-1214195
 /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 Wed Dec 14 14:24:04 2011
@@ -8,5 +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-1201283
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractResponseTest.java:1177670-1201283,1209073-1214195
 /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 Wed Dec 14 14:24:04 2011
@@ -8,5 +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-1201283
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AbstractTest.java:1177670-1201283,1209073-1214195
 /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 Wed Dec 14 14:24:04 2011
@@ -8,5 +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-1201283
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/AllTests.java:1177670-1201283,1209073-1214195
 /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 Wed Dec 14 14:24:04 2011
@@ -8,5 +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-1201283
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest:1177670-1201283,1209073-1214195
 /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 Wed Dec 14 14:24:04 2011
@@ -8,5 +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-1201283
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest:1177670-1201283,1209073-1214195
 /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 Wed Dec 14 14:24:04 2011
@@ -8,5 +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-1201283
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse:1177670-1201283,1209073-1214195
 /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 Wed Dec 14 14:24:04 2011
@@ -8,5 +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-1201283
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest:1177670-1201283,1209073-1214195
 /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 Wed Dec 14 14:24:04 2011
@@ -8,5 +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-1201283
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse:1177670-1201283,1209073-1214195
 /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 Wed Dec 14 14:24:04 2011
@@ -8,5 +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-1201283
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest:1177670-1201283,1209073-1214195
 /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 Wed Dec 14 14:24:04 2011
@@ -8,5 +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-1201283
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse:1177670-1201283,1209073-1214195
 /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 Wed Dec 14 14:24:04 2011
@@ -8,5 +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-1201283
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest:1177670-1201283,1209073-1214195
 /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 Wed Dec 14 14:24:04 2011
@@ -8,5 +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-1201283
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse:1177670-1201283,1209073-1214195
 /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 Wed Dec 14 14:24:04 2011
@@ -8,5 +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-1201283
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest:1177670-1201283,1209073-1214195
 /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 Wed Dec 14 14:24:04 2011
@@ -8,5 +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-1201283
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse:1177670-1201283,1209073-1214195
 /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 Wed Dec 14 14:24:04 2011
@@ -8,5 +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-1201283
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/errorResponse:1177670-1201283,1209073-1214195
 /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 Wed Dec 14 14:24:04 2011
@@ -8,5 +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-1201283
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest:1177670-1201283,1209073-1214195
 /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 Wed Dec 14 14:24:04 2011
@@ -8,5 +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-1201283
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse:1177670-1201283,1209073-1214195
 /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 Wed Dec 14 14:24:04 2011
@@ -8,5 +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-1201283
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest:1177670-1201283,1209073-1214195
 /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 Wed Dec 14 14:24:04 2011
@@ -8,5 +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-1201283
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse:1177670-1201283,1209073-1214195
 /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 Wed Dec 14 14:24:04 2011
@@ -8,5 +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-1201283
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest:1177670-1201283,1209073-1214195
 /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 Wed Dec 14 14:24:04 2011
@@ -8,5 +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-1201283
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse:1177670-1201283,1209073-1214195
 /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 Wed Dec 14 14:24:04 2011
@@ -8,5 +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-1201283
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest:1177670-1201283,1209073-1214195
 /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 Wed Dec 14 14:24:04 2011
@@ -8,5 +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-1201283
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java:1177670-1201283,1209073-1214195
 /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 Wed Dec 14 14:24:04 2011
@@ -8,5 +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-1201283
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:1177670-1201283,1209073-1214195
 /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 Wed Dec 14 14:24:04 2011
@@ -8,5 +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-1201283
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:1177670-1201283,1209073-1214195
 /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 Wed Dec 14 14:24:04 2011
@@ -8,5 +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-1201283
+/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:1177670-1201283,1209073-1214195
 /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 Wed Dec 14 14:24:04 2011
@@ -8,5 +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-1201283
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest:1177670-1201283,1209073-1214195
 /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 Wed Dec 14 14:24:04 2011
@@ -8,5 +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-1201283
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest:1177670-1201283,1209073-1214195
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:24:04 2011
@@ -8,5 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse:980350-980351
-/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse:1177670-1201283
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse:1177670-1201283,1209073-1214195
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:24:04 2011
@@ -8,5 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest:980350-980351
-/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest:1177670-1201283
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest:1177670-1201283,1209073-1214195
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:24:04 2011
@@ -8,5 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse:980350-980351
-/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse:1177670-1201283
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse:1177670-1201283,1209073-1214195
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:24:04 2011
@@ -8,5 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest:980350-980351
-/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest:1177670-1201283
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest:1177670-1201283,1209073-1214195
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:24:04 2011
@@ -8,5 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse:980350-980351
-/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse:1177670-1201283
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse:1177670-1201283,1209073-1214195
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:24:04 2011
@@ -8,5 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest:980350-980351
-/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest:1177670-1201283
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest:1177670-1201283,1209073-1214195
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:24:04 2011
@@ -8,5 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareResponse:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareResponse:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareResponse:980350-980351
-/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareResponse:1177670-1201283
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareResponse:1177670-1201283,1209073-1214195
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareResponse:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/delRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:24:04 2011
@@ -8,5 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delRequest:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delRequest:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delRequest:980350-980351
-/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/delRequest:1177670-1201283
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/delRequest:1177670-1201283,1209073-1214195
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delRequest:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/delResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:24:04 2011
@@ -8,5 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delResponse:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delResponse:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delResponse:980350-980351
-/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/delResponse:1177670-1201283
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/delResponse:1177670-1201283,1209073-1214195
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delResponse:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/errorResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:24:04 2011
@@ -8,5 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/errorResponse:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/errorResponse:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/errorResponse:980350-980351
-/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/errorResponse:1177670-1201283
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/errorResponse:1177670-1201283,1209073-1214195
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/errorResponse:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:24:04 2011
@@ -8,5 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedRequest:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedRequest:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedRequest:980350-980351
-/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedRequest:1177670-1201283
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedRequest:1177670-1201283,1209073-1214195
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedRequest:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:24:04 2011
@@ -8,5 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedResponse:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedResponse:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedResponse:980350-980351
-/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedResponse:1177670-1201283
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedResponse:1177670-1201283,1209073-1214195
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedResponse:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:24:04 2011
@@ -8,5 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNRequest:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNRequest:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNRequest:980350-980351
-/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNRequest:1177670-1201283
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNRequest:1177670-1201283,1209073-1214195
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNRequest:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:24:04 2011
@@ -8,5 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNResponse:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNResponse:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNResponse:980350-980351
-/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNResponse:1177670-1201283
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNResponse:1177670-1201283,1209073-1214195
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNResponse:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:24:04 2011
@@ -8,5 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyRequest:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyRequest:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyRequest:980350-980351
-/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyRequest:1177670-1201283
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyRequest:1177670-1201283,1209073-1214195
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyRequest:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Dec 14 14:24:04 2011
@@ -8,5 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyResponse:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyResponse:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyResponse:980350-980351
-/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyResponse:1177670-1201283
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyResponse:1177670-1201283,1209073-1214195
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyResponse:1066124-1067995,1068025-1072732,1072797-1075328