directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1187306 [2/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...
Date Fri, 21 Oct 2011 11:42:28 GMT
Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/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/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-1187279
 /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 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/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-1187279
 /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 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/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-1187279
 /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 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/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-1187279
 /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 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/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-1187279
 /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 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/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-1187279
 /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 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/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-1187279
 /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 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/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-1187279
 /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 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/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-1187279
 /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 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/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-1187279
 /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 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/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-1187279
 /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 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/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-1187279
 /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 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/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-1187279
 /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 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/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-1187279
 /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 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/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-1187279
 /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 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/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-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyResponse:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/filters/
------------------------------------------------------------------------------
--- 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/searchRequest/filters:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/filters:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/filters:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/filters:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/filters:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control.xml
------------------------------------------------------------------------------
--- 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/searchRequest/request_with_1_control.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_base64_value.xml
------------------------------------------------------------------------------
--- 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/searchRequest/request_with_1_control_base64_value.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_base64_value.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_base64_value.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_base64_value.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_base64_value.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_empty_value.xml
------------------------------------------------------------------------------
--- 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/searchRequest/request_with_1_control_empty_value.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_empty_value.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_empty_value.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_empty_value.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_empty_value.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_attributes_elements.xml
------------------------------------------------------------------------------
--- 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/searchRequest/request_with_2_attributes_elements.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_attributes_elements.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_attributes_elements.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_attributes_elements.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_attributes_elements.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_controls.xml
------------------------------------------------------------------------------
--- 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/searchRequest/request_with_2_controls.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_controls.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_controls.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_controls.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_controls.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_filters.xml
------------------------------------------------------------------------------
--- 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/searchRequest/request_with_2_filters.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_filters.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_filters.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_filters.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_filters.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_3_controls_without_value.xml
------------------------------------------------------------------------------
--- 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/searchRequest/request_with_3_controls_without_value.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_3_controls_without_value.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_3_controls_without_value.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_3_controls_without_value.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_3_controls_without_value.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attribute_without_name_attribute.xml
------------------------------------------------------------------------------
--- 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/searchRequest/request_with_attribute_without_name_attribute.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attribute_without_name_attribute.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attribute_without_name_attribute.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attribute_without_name_attribute.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attribute_without_name_attribute.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_1_attribute.xml
------------------------------------------------------------------------------
--- 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/searchRequest/request_with_attributes_1_attribute.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_1_attribute.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_1_attribute.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_1_attribute.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_1_attribute.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_2_attribute.xml
------------------------------------------------------------------------------
--- 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/searchRequest/request_with_attributes_2_attribute.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_2_attribute.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_2_attribute.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_2_attribute.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_2_attribute.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_but_no_attribute.xml
------------------------------------------------------------------------------
--- 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/searchRequest/request_with_attributes_but_no_attribute.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_but_no_attribute.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_but_no_attribute.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_but_no_attribute.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_but_no_attribute.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefAlways.xml
------------------------------------------------------------------------------
--- 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/searchRequest/request_with_derefAliases_derefAlways.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefAlways.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefAlways.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefAlways.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefAlways.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefFindingBaseObj.xml
------------------------------------------------------------------------------
--- 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/searchRequest/request_with_derefAliases_derefFindingBaseObj.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefFindingBaseObj.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefFindingBaseObj.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefFindingBaseObj.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefFindingBaseObj.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefInSearching.xml
------------------------------------------------------------------------------
--- 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/searchRequest/request_with_derefAliases_derefInSearching.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefInSearching.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefInSearching.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefInSearching.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefInSearching.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_error.xml
------------------------------------------------------------------------------
--- 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/searchRequest/request_with_derefAliases_error.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_error.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_error.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_error.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_error.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_neverDerefAliases.xml
------------------------------------------------------------------------------
--- 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/searchRequest/request_with_derefAliases_neverDerefAliases.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_neverDerefAliases.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_neverDerefAliases.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_neverDerefAliases.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_neverDerefAliases.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_dn_attribute.xml
------------------------------------------------------------------------------
--- 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/searchRequest/request_with_dn_attribute.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_dn_attribute.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_dn_attribute.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_dn_attribute.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_dn_attribute.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_empty_filter.xml
------------------------------------------------------------------------------
--- 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/searchRequest/request_with_empty_filter.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_empty_filter.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_empty_filter.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_empty_filter.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_empty_filter.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_needed_requestID.xml
------------------------------------------------------------------------------
--- 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/searchRequest/request_with_needed_requestID.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_needed_requestID.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_needed_requestID.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_needed_requestID.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_needed_requestID.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_attribute.xml
------------------------------------------------------------------------------
--- 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/searchRequest/request_with_requestID_attribute.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_attribute.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_attribute.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_attribute.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_attribute.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_equals_0.xml
------------------------------------------------------------------------------
--- 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/searchRequest/request_with_requestID_equals_0.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_equals_0.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_equals_0.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_equals_0.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_equals_0.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_baseObject.xml
------------------------------------------------------------------------------
--- 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/searchRequest/request_with_scope_baseObject.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_baseObject.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_baseObject.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_baseObject.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_baseObject.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_error.xml
------------------------------------------------------------------------------
--- 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/searchRequest/request_with_scope_error.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_error.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_error.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_error.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_error.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_singleLevel.xml
------------------------------------------------------------------------------
--- 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/searchRequest/request_with_scope_singleLevel.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_singleLevel.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_singleLevel.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_singleLevel.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_singleLevel.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_wholeSubtree.xml
------------------------------------------------------------------------------
--- 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/searchRequest/request_with_scope_wholeSubtree.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_wholeSubtree.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_wholeSubtree.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_wholeSubtree.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_wholeSubtree.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_attribute.xml
------------------------------------------------------------------------------
--- 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/searchRequest/request_with_sizeLimit_attribute.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_attribute.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_attribute.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_attribute.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_attribute.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_error.xml
------------------------------------------------------------------------------
--- 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/searchRequest/request_with_sizeLimit_error.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_error.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_error.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_error.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_error.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_attribute.xml
------------------------------------------------------------------------------
--- 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/searchRequest/request_with_timeLimit_attribute.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_attribute.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_attribute.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_attribute.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_attribute.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_error.xml
------------------------------------------------------------------------------
--- 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/searchRequest/request_with_timeLimit_error.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_error.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_error.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_error.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_error.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_0.xml
------------------------------------------------------------------------------
--- 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/searchRequest/request_with_typesOnly_0.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_0.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_0.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_0.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_0.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_1.xml
------------------------------------------------------------------------------
--- 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/searchRequest/request_with_typesOnly_1.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_1.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_1.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_1.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_1.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_error.xml
------------------------------------------------------------------------------
--- 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/searchRequest/request_with_typesOnly_error.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_error.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_error.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_error.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_error.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_false.xml
------------------------------------------------------------------------------
--- 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/searchRequest/request_with_typesOnly_false.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_false.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_false.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_false.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_false.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_true.xml
------------------------------------------------------------------------------
--- 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/searchRequest/request_with_typesOnly_true.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_true.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_true.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_true.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_true.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_derefAliases_attribute.xml
------------------------------------------------------------------------------
--- 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/searchRequest/request_without_derefAliases_attribute.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_derefAliases_attribute.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_derefAliases_attribute.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_derefAliases_attribute.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_derefAliases_attribute.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_dn_attribute.xml
------------------------------------------------------------------------------
--- 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/searchRequest/request_without_dn_attribute.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_dn_attribute.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_dn_attribute.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_dn_attribute.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_dn_attribute.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_filter.xml
------------------------------------------------------------------------------
--- 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/searchRequest/request_without_filter.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_filter.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_filter.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_filter.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_filter.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_scope_attribute.xml
------------------------------------------------------------------------------
--- 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/searchRequest/request_without_scope_attribute.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_scope_attribute.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_scope_attribute.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_scope_attribute.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_scope_attribute.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_0_SRD.xml
------------------------------------------------------------------------------
--- 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/searchResponse/response_with_0_SRD.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_0_SRD.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_0_SRD.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_0_SRD.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_0_SRD.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRD.xml
------------------------------------------------------------------------------
--- 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/searchResponse/response_with_1_SRD.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRD.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRD.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRD.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRD.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_0_SRD.xml
------------------------------------------------------------------------------
--- 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/searchResponse/response_with_1_SRE_0_SRD.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_0_SRD.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_0_SRD.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_0_SRD.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_0_SRD.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRD.xml
------------------------------------------------------------------------------
--- 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/searchResponse/response_with_1_SRE_1_SRD.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRD.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRD.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRD.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRD.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: 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
------------------------------------------------------------------------------
--- 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/searchResponse/response_with_1_SRE_1_SRR_1_SRD.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRR_1_SRD.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRR_1_SRD.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRR_1_SRD.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRR_1_SRD.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_0_SRD.xml
------------------------------------------------------------------------------
--- 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/searchResponse/response_with_1_SRR_0_SRD.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_0_SRD.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_0_SRD.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_0_SRD.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_0_SRD.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_1_SRD.xml
------------------------------------------------------------------------------
--- 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/searchResponse/response_with_1_SRR_1_SRD.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_1_SRD.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_1_SRD.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_1_SRD.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_1_SRD.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_1_SRD.xml
------------------------------------------------------------------------------
--- 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/searchResponse/response_with_2_SRE_1_SRD.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_1_SRD.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_1_SRD.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_1_SRD.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_1_SRD.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: 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
------------------------------------------------------------------------------
--- 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/searchResponse/response_with_2_SRE_2_SRR_1_SRD.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_2_SRR_1_SRD.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_2_SRR_1_SRD.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_2_SRR_1_SRD.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_2_SRR_1_SRD.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRR_1_SRD.xml
------------------------------------------------------------------------------
--- 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/searchResponse/response_with_2_SRR_1_SRD.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRR_1_SRD.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRR_1_SRD.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRR_1_SRD.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRR_1_SRD.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_attribute.xml
------------------------------------------------------------------------------
--- 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/searchResponse/response_with_requestID_attribute.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_attribute.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_attribute.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_attribute.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_attribute.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_equals_0.xml
------------------------------------------------------------------------------
--- 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/searchResponse/response_with_requestID_equals_0.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_equals_0.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_equals_0.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_equals_0.xml:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_equals_0.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/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/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/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/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/shared-txns/dsml/parser/src/test/resources/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/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:1177670-1187279
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:1066124-1067995,1068025-1072732,1072797-1075328

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

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

Modified: directory/shared/branches/shared-txns/i18n/src/main/java/org/apache/directory/shared/i18n/I18n.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/i18n/src/main/java/org/apache/directory/shared/i18n/I18n.java?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/i18n/src/main/java/org/apache/directory/shared/i18n/I18n.java (original)
+++ directory/shared/branches/shared-txns/i18n/src/main/java/org/apache/directory/shared/i18n/I18n.java Fri Oct 21 11:42:22 2011
@@ -134,6 +134,9 @@ public enum I18n
     ERR_03039( "ERR_03039" ),
     ERR_03040( "ERR_03040" ),
 
+    // dsml-engine
+    ERR_03101_MISSING_CONNECTION_TO( "ERR_03101_MISSING_CONNECTION_TO" ),
+
     // ldap
     ERR_04001_NULL_IDENTIFICATION_TAG( "ERR_04001_NULL_IDENTIFICATION_TAG" ),
     ERR_04002_BAD_PRECENDENCE( "ERR_04002_BAD_PRECENDENCE" ),

Modified: directory/shared/branches/shared-txns/i18n/src/main/resources/org/apache/directory/shared/i18n/errors.properties
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/i18n/src/main/resources/org/apache/directory/shared/i18n/errors.properties?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/i18n/src/main/resources/org/apache/directory/shared/i18n/errors.properties (original)
+++ directory/shared/branches/shared-txns/i18n/src/main/resources/org/apache/directory/shared/i18n/errors.properties Fri Oct 21 11:42:22 2011
@@ -122,6 +122,9 @@ ERR_03038=The attribute requestID can''t
 ERR_03039=the given requestID is not an integer
 ERR_03040=unable to find the batch request
 
+# dsml-parser
+ERR_03101_MISSING_CONNECTION_TO BIND=Missing connection, can not bind
+
 # ldap
 ERR_04001_NULL_IDENTIFICATION_TAG=identificationTag parameter is null
 ERR_04002_BAD_PRECENDENCE=precedence parameter not in [0-255] : {0}

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

Modified: directory/shared/branches/shared-txns/integ/src/test/java/org/apache/directory/shared/ldap/codec/api/StandaloneLdapCodecServiceTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/integ/src/test/java/org/apache/directory/shared/ldap/codec/api/StandaloneLdapCodecServiceTest.java?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/integ/src/test/java/org/apache/directory/shared/ldap/codec/api/StandaloneLdapCodecServiceTest.java (original)
+++ directory/shared/branches/shared-txns/integ/src/test/java/org/apache/directory/shared/ldap/codec/api/StandaloneLdapCodecServiceTest.java Fri Oct 21 11:42:22 2011
@@ -53,7 +53,7 @@ public class StandaloneLdapCodecServiceT
             "org.apache.directory.shared.ldap.codec.controls.search.subentries.SubentriesFactory" );
 
         System.setProperty( StandaloneLdapApiService.EXTRA_CONTROLS_LIST, 
-            "org.apache.directory.shared.ldap.extras.controls.ppolicy.PasswordPolicyFactory," +
+            "org.apache.directory.shared.ldap.extras.controls.ppolicy_impl.PasswordPolicyFactory," +
             "org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncDoneValueFactory," +
             "org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncInfoValueFactory," +
             "org.apache.directory.shared.ldap.extras.controls.syncrepl_impl.SyncRequestValueFactory," +

Modified: directory/shared/branches/shared-txns/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareEntryTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-txns/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareEntryTest.java?rev=1187306&r1=1187305&r2=1187306&view=diff
==============================================================================
--- directory/shared/branches/shared-txns/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareEntryTest.java (original)
+++ directory/shared/branches/shared-txns/integ/src/test/java/org/apache/directory/shared/ldap/entry/SchemaAwareEntryTest.java Fri Oct 21 11:42:22 2011
@@ -1240,4 +1240,28 @@ public class SchemaAwareEntryTest
     }
     
   
+    /**
+     * Test method for userCertificate;binary AT
+     */
+    @Test
+    public void testUserCertificateBinary() throws LdapException
+    {
+        Entry entry = new DefaultEntry( schemaManager );
+        entry.add( "objectClass", "top", "person", "inetorgPerson" );
+        entry.add( "cn", "test1", "test2" );
+        entry.add( "sn", "Test1", "Test2" );
+        entry.add( "userPassword", BYTES1, BYTES2 );
+        
+        entry.add( "userCertificate;binary", Strings.getBytesUtf8( "secret" ) );
+        assertTrue( entry.containsAttribute( "userCertificate;binary" ) );
+        assertTrue( entry.containsAttribute( "userCertificate" ) );
+        
+        entry.removeAttributes( "userCertificate;binary" );
+        assertFalse( entry.containsAttribute( "userCertificate;binary" ) );
+        assertFalse( entry.containsAttribute( "userCertificate" ) );
+        
+        entry.add( "userCertificate", Strings.getBytesUtf8( "secret" ) );
+        assertTrue( entry.containsAttribute( "userCertificate;binary" ) );
+        assertTrue( entry.containsAttribute( "userCertificate" ) );
+    }
 }

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

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



Mime
View raw message