svn commit: r987483 [2/2] - in /directory/shared/branches/shared-codec-merge: all/ asn1-codec/ asn1/ cursor/ dsml-parser/ dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/engine/...

[el...@apache.org]

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_empty_value.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_empty_value.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_empty_value.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_empty_value.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_attributes_elements.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_attributes_elements.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_attributes_elements.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_attributes_elements.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_controls.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_controls.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_controls.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_controls.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_filters.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_filters.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_filters.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_filters.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_3_controls_without_value.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_3_controls_without_value.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_3_controls_without_value.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_3_controls_without_value.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attribute_without_name_attribute.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attribute_without_name_attribute.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attribute_without_name_attribute.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attribute_without_name_attribute.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_1_attribute.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_1_attribute.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_1_attribute.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_1_attribute.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_2_attribute.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_2_attribute.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_2_attribute.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_2_attribute.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_but_no_attribute.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_but_no_attribute.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_but_no_attribute.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_but_no_attribute.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefAlways.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefAlways.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefAlways.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefAlways.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefFindingBaseObj.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefFindingBaseObj.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefFindingBaseObj.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefFindingBaseObj.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefInSearching.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefInSearching.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefInSearching.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefInSearching.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_error.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_error.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_error.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_error.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_neverDerefAliases.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_neverDerefAliases.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_neverDerefAliases.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_neverDerefAliases.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_dn_attribute.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_dn_attribute.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_dn_attribute.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_dn_attribute.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_empty_filter.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_empty_filter.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_empty_filter.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_empty_filter.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_needed_requestID.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_needed_requestID.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_needed_requestID.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_needed_requestID.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_attribute.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_attribute.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_attribute.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_attribute.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_equals_0.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_equals_0.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_equals_0.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_equals_0.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_baseObject.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_baseObject.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_baseObject.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_baseObject.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_error.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_error.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_error.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_error.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_singleLevel.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_singleLevel.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_singleLevel.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_singleLevel.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_wholeSubtree.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_wholeSubtree.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_wholeSubtree.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_wholeSubtree.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_attribute.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_attribute.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_attribute.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_attribute.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_error.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_error.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_error.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_error.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_attribute.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_attribute.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_attribute.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_attribute.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_error.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_error.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_error.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_error.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_0.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_0.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_0.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_0.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_1.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_1.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_1.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_1.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_error.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_error.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_error.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_error.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_false.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_false.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_false.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_false.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_true.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_true.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_true.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_true.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_derefAliases_attribute.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_derefAliases_attribute.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_derefAliases_attribute.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_derefAliases_attribute.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_dn_attribute.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_dn_attribute.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_dn_attribute.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_dn_attribute.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_filter.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_filter.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_filter.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_filter.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_scope_attribute.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_scope_attribute.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_scope_attribute.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_scope_attribute.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_0_SRD.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_0_SRD.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_0_SRD.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_0_SRD.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRD.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRD.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRD.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRD.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_0_SRD.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_0_SRD.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_0_SRD.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_0_SRD.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRD.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRD.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRD.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRD.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/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 Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRR_1_SRD.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRR_1_SRD.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRR_1_SRD.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_0_SRD.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_0_SRD.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_0_SRD.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_0_SRD.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_1_SRD.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_1_SRD.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_1_SRD.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_1_SRD.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_1_SRD.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_1_SRD.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_1_SRD.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_1_SRD.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/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 Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_2_SRR_1_SRD.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_2_SRR_1_SRD.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_2_SRR_1_SRD.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRR_1_SRD.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRR_1_SRD.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRR_1_SRD.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRR_1_SRD.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_attribute.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_attribute.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_attribute.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_attribute.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_equals_0.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_equals_0.xml:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_equals_0.xml:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_equals_0.xml:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:806622-896441
 /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/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:980025-980349,982369-982962
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/i18n/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -1,3 +1,3 @@
 /directory/shared/branches-dnfactory-experiment/i18n:980350-980351
 /directory/shared/branches/shared-dnfactory-experiment/i18n:980352-980933
-/directory/shared/trunk/i18n:980025-980349,982369-982962
+/directory/shared/trunk/i18n:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/ldap/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -1,3 +1,3 @@
 /directory/shared/branches-dnfactory-experiment/ldap:980350-980351
 /directory/shared/branches/shared-dnfactory-experiment/ldap:980352-980933
-/directory/shared/trunk/ldap:982369-982962
+/directory/shared/trunk/ldap:982369-987474

Propchange: directory/shared/branches/shared-codec-merge/ldap-constants/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -1,3 +1,3 @@
 /directory/shared/branches-dnfactory-experiment/ldap-constants:980350-980351
 /directory/shared/branches/shared-dnfactory-experiment/ldap-constants:980352-980933
-/directory/shared/trunk/ldap-constants:982369-982962
+/directory/shared/trunk/ldap-constants:982369-987474

Propchange: directory/shared/branches/shared-codec-merge/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -3,4 +3,4 @@
 /directory/shared/branches/shared-dnfactory-experiment/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:980352-980933
 /directory/shared/branches/shared-subtree/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:965208-965686
 /directory/shared/branches/xdbm-refactoring/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:945830-946347
-/directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:982369-982962
+/directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:519076-580502,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/ldap-convert/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -1,3 +1,3 @@
 /directory/shared/branches-dnfactory-experiment/ldap-convert:980350-980351
 /directory/shared/branches/shared-dnfactory-experiment/ldap-convert:980352-980933
-/directory/shared/trunk/ldap-convert:980025-980349,982369-982962
+/directory/shared/trunk/ldap-convert:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/ldap-jndi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -1,3 +1,3 @@
 /directory/shared/branches-dnfactory-experiment/ldap-jndi:980350-980351
 /directory/shared/branches/shared-dnfactory-experiment/ldap-jndi:980352-980933
-/directory/shared/trunk/ldap-jndi:980025-980349,982369-982962
+/directory/shared/trunk/ldap-jndi:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/ldap-ldif/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -1,3 +1,3 @@
 /directory/shared/branches-dnfactory-experiment/ldap-ldif:980350-980351
 /directory/shared/branches/shared-dnfactory-experiment/ldap-ldif:980352-980933
-/directory/shared/trunk/ldap-ldif:982369-982962
+/directory/shared/trunk/ldap-ldif:982369-987474

Propchange: directory/shared/branches/shared-codec-merge/ldap-schema/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -5,4 +5,4 @@
 /directory/shared/branches/shared-schema/ldap-schema:806622-896441
 /directory/shared/branches/shared-subtree/ldap-schema:965208-965686
 /directory/shared/branches/xdbm-refactoring/ldap-schema:945830-946347
-/directory/shared/trunk/ldap-schema:980025-980349,982369-982962
+/directory/shared/trunk/ldap-schema:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/ldap-schema-loader/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -5,4 +5,4 @@
 /directory/shared/branches/shared-schema/ldap-schema-loader:806622-896441
 /directory/shared/branches/shared-subtree/ldap-schema-loader:965208-965686
 /directory/shared/branches/xdbm-refactoring/ldap-schema-loader:945830-946347
-/directory/shared/trunk/ldap-schema-loader:980025-980349,982369-982962
+/directory/shared/trunk/ldap-schema-loader:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/ldap-schema-manager/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -1,3 +1,3 @@
 /directory/shared/branches-dnfactory-experiment/ldap-schema-manager:980350-980351
 /directory/shared/branches/shared-dnfactory-experiment/ldap-schema-manager:980352-980933
-/directory/shared/trunk/ldap-schema-manager:980025-980349,982369-982962
+/directory/shared/trunk/ldap-schema-manager:980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/ldap-schema-manager-tests/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -1,3 +1,3 @@
 /directory/shared/branches-dnfactory-experiment/ldap-schema-manager-tests:980350-980351
 /directory/shared/branches/shared-dnfactory-experiment/ldap-schema-manager-tests:980352-980933
-/directory/shared/trunk/ldap-schema-manager-tests:980025-980349,982369-982962
+/directory/shared/trunk/ldap-schema-manager-tests:980025-980349,982369-987474

Modified: directory/shared/branches/shared-codec-merge/ldap-schema-manager-tests/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerAddTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap-schema-manager-tests/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerAddTest.java?rev=987483&r1=987482&r2=987483&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap-schema-manager-tests/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerAddTest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap-schema-manager-tests/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerAddTest.java Fri Aug 20 12:53:13 2010
@@ -92,6 +92,9 @@ public class SchemaManagerAddTest
             workingDirectory = path.substring( 0, targetPos + 6 );
         }
 
+        // Make sure every test class has its own schema directory
+        workingDirectory = new File( workingDirectory, "SchemaManagerAddTest" ).getAbsolutePath();
+
         schemaRepository = new File( workingDirectory, "schema" );
 
         // Cleanup the target directory
@@ -106,7 +109,7 @@ public class SchemaManagerAddTest
     public static void cleanup() throws IOException
     {
         // Cleanup the target directory
-        FileUtils.deleteDirectory( schemaRepository );
+        FileUtils.deleteDirectory( schemaRepository.getParentFile() );
     }
 
 

Modified: directory/shared/branches/shared-codec-merge/ldap-schema-manager-tests/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerDelTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap-schema-manager-tests/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerDelTest.java?rev=987483&r1=987482&r2=987483&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap-schema-manager-tests/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerDelTest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap-schema-manager-tests/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerDelTest.java Fri Aug 20 12:53:13 2010
@@ -83,6 +83,9 @@ public class SchemaManagerDelTest
             workingDirectory = path.substring( 0, targetPos + 6 );
         }
 
+        // Make sure every test class has its own schema directory
+        workingDirectory = new File( workingDirectory, "SchemaManagerDelTest" ).getAbsolutePath();
+
         schemaRepository = new File( workingDirectory, "schema" );
 
         // Cleanup the target directory
@@ -97,7 +100,7 @@ public class SchemaManagerDelTest
     public static void cleanup() throws IOException
     {
         // Cleanup the target directory
-        FileUtils.deleteDirectory( schemaRepository );
+        FileUtils.deleteDirectory( schemaRepository.getParentFile() );
     }
 
 

Modified: directory/shared/branches/shared-codec-merge/ldap-schema-manager-tests/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerEnableDisableLoadTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap-schema-manager-tests/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerEnableDisableLoadTest.java?rev=987483&r1=987482&r2=987483&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap-schema-manager-tests/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerEnableDisableLoadTest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap-schema-manager-tests/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerEnableDisableLoadTest.java Fri Aug 20 12:53:13 2010
@@ -90,6 +90,9 @@ public class SchemaManagerEnableDisableL
             workingDirectory = path.substring( 0, targetPos + 6 );
         }
 
+        // Make sure every test class has its own schema directory
+        workingDirectory = new File( workingDirectory, "SchemaManagerEnableDisableLoadTest" ).getAbsolutePath();
+
         schemaRepository = new File( workingDirectory, "schema" );
 
         // Cleanup the target directory
@@ -112,7 +115,7 @@ public class SchemaManagerEnableDisableL
     public static void cleanup() throws IOException
     {
         // Cleanup the target directory
-        FileUtils.deleteDirectory( schemaRepository );
+        FileUtils.deleteDirectory( schemaRepository.getParentFile() );
     }
 
 

Modified: directory/shared/branches/shared-codec-merge/ldap-schema-manager-tests/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerLoadTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap-schema-manager-tests/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerLoadTest.java?rev=987483&r1=987482&r2=987483&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap-schema-manager-tests/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerLoadTest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap-schema-manager-tests/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerLoadTest.java Fri Aug 20 12:53:13 2010
@@ -31,9 +31,8 @@ import java.io.File;
 import java.io.IOException;
 
 import org.apache.commons.io.FileUtils;
-import org.apache.directory.junit.tools.Concurrent;
-import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.shared.ldap.exception.LdapUnwillingToPerformException;
+import org.apache.directory.shared.ldap.schema.AttributeType;
 import org.apache.directory.shared.ldap.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schema.ldif.extractor.SchemaLdifExtractor;
 import org.apache.directory.shared.ldap.schema.ldif.extractor.impl.DefaultSchemaLdifExtractor;
@@ -42,8 +41,8 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.schema.registries.Schema;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
+import org.junit.Ignore;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 
 
 /**
@@ -167,8 +166,8 @@ import org.junit.runner.RunWith;
  * 
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
-@RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+//@RunWith(ConcurrentJunitRunner.class)
+//@Concurrent()
 public class SchemaManagerLoadTest
 {
     // A directory in which the ldif files will be stored
@@ -176,7 +175,7 @@ public class SchemaManagerLoadTest
 
     // The schema repository
     private static File schemaRepository;
-
+    
 
     @BeforeClass
     public static void setup() throws Exception
@@ -190,6 +189,9 @@ public class SchemaManagerLoadTest
             workingDirectory = path.substring( 0, targetPos + 6 );
         }
 
+        // Make sure every test class has its own schema directory
+        workingDirectory = new File( workingDirectory, "SchemaManagerLoadTest" ).getAbsolutePath();
+
         schemaRepository = new File( workingDirectory, "schema" );
 
         // Cleanup the target directory
@@ -204,7 +206,7 @@ public class SchemaManagerLoadTest
     public static void cleanup() throws IOException
     {
         // Cleanup the target directory
-        FileUtils.deleteDirectory( schemaRepository );
+        FileUtils.deleteDirectory( schemaRepository.getParentFile() );
     }
 
 
@@ -524,7 +526,11 @@ public class SchemaManagerLoadTest
         assertTrue( schemaManager.load( "system" ) );
         assertTrue( schemaManager.load( "core" ) );
         assertTrue( schemaManager.load( "cosine" ) );
-        assertTrue( schemaManager.load( "nis" ) );
+        assertFalse( schemaManager.load( "nis" ) );
+        
+        AttributeType at = schemaManager.getAttributeType( "uidNumber" );
+        // if nis schema was loaded then the at will not be null
+        assertNull( at );
 
         assertTrue( schemaManager.getErrors().isEmpty() );
         assertEquals( 133, schemaManager.getAttributeTypeRegistry().size() );
@@ -676,6 +682,7 @@ public class SchemaManagerLoadTest
 
         assertEquals( 1, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNotNull( schemaManager.getRegistries().getLoadedSchema( "system" ) );
+        assertNull( schemaManager.getRegistries().getLoadedSchema( "nis" ) );
         assertNull( schemaManager.getRegistries().getLoadedSchema( "core" ) );
         assertNull( schemaManager.getRegistries().getLoadedSchema( "cosine" ) );
         assertNull( schemaManager.getRegistries().getLoadedSchema( "InetOrgPerson" ) );
@@ -777,4 +784,21 @@ public class SchemaManagerLoadTest
         assertEquals( 0, schemaManager.getRegistries().getLoadedSchemas().size() );
         assertNull( schemaManager.getRegistries().getLoadedSchema( "dummy" ) );
     }
+    
+
+    @Ignore( "loadDisabled() method need to be fixed" )
+    @Test
+    public void testLoadDisabled() throws Exception
+    {
+        LdifSchemaLoader loader = new LdifSchemaLoader( schemaRepository );
+        SchemaManager schemaManager = new DefaultSchemaManager( loader );
+
+        assertTrue( schemaManager.loadDisabled( "nis" ) );
+
+        assertFalse( schemaManager.getErrors().isEmpty() );
+        
+        AttributeType at = schemaManager.getAttributeType( "uidNumber" );
+        // if nis schema was loaded then the at will not be null
+        assertNotNull( at );
+    }
 }

Modified: directory/shared/branches/shared-codec-merge/ldap-schema-manager-tests/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerLoadWithDepsTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap-schema-manager-tests/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerLoadWithDepsTest.java?rev=987483&r1=987482&r2=987483&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap-schema-manager-tests/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerLoadWithDepsTest.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap-schema-manager-tests/src/test/java/org/apache/directory/shared/ldap/schema/loader/ldif/SchemaManagerLoadWithDepsTest.java Fri Aug 20 12:53:13 2010
@@ -81,6 +81,9 @@ public class SchemaManagerLoadWithDepsTe
             workingDirectory = path.substring( 0, targetPos + 6 );
         }
 
+        // Make sure every test class has its own schema directory
+        workingDirectory = new File( workingDirectory, "SchemaManagerLoadWithDepsTest" ).getAbsolutePath();
+
         schemaRepository = new File( workingDirectory, "schema" );
 
         // Cleanup the target directory
@@ -95,7 +98,7 @@ public class SchemaManagerLoadWithDepsTe
     public static void cleanup() throws IOException
     {
         // Cleanup the target directory
-        FileUtils.deleteDirectory( schemaRepository );
+        FileUtils.deleteDirectory( schemaRepository.getParentFile() );
     }
 
 

Propchange: directory/shared/branches/shared-codec-merge/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager:806622-893998
 /directory/shared/branches/shared-subtree/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager:965208-965686
 /directory/shared/branches/xdbm-refactoring/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager:945830-946347
-/directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager:806622-894844*,980025-980349,982369-982962
+/directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager:806622-894844*,980025-980349,982369-987474

Propchange: directory/shared/branches/shared-codec-merge/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:806622-893998
 /directory/shared/branches/shared-subtree/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:965208-965686
 /directory/shared/branches/xdbm-refactoring/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:945830-946347
-/directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:806622-894844*,980025-980349,982369-982962
+/directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:806622-894844*,980025-980349,982369-987474

Modified: directory/shared/branches/shared-codec-merge/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java?rev=987483&r1=987482&r2=987483&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java (original)
+++ directory/shared/branches/shared-codec-merge/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java Fri Aug 20 12:53:13 2010
@@ -543,7 +543,10 @@ public class DefaultSchemaManager implem
         // Load the schemas
         for ( Schema schema : schemas )
         {
-            if ( !load( clonedRegistries, schema ) && ( !errors.isEmpty() ) )
+            boolean singleSchemaLoaded = load( clonedRegistries, schema );
+
+            // return false if the schema was not loaded in the first place
+            if ( !singleSchemaLoaded )
             {
                 return false;
             }
@@ -1043,24 +1046,16 @@ public class DefaultSchemaManager implem
             if ( errors.isEmpty() )
             {
                 // We are golden : let's apply the schema in the real registries
-                registries.setRelaxed();
-
-                // Load the schemas
-                for ( Schema schema : schemas )
-                {
-                    loadDepsFirst( registries, schema );
-                }
-
-                // Build the cross references
-                errors = registries.buildReferences();
+                registries = clonedRegistries;
                 registries.setStrict();
-
                 loaded = true;
             }
         }
-
-        // clear the cloned registries
-        clonedRegistries.clear();
+        else
+        {
+            // clear the cloned registries
+            clonedRegistries.clear();
+        }
 
         return loaded;
     }

Propchange: directory/shared/branches/shared-codec-merge/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 12:53:13 2010
@@ -4,4 +4,4 @@
 /directory/shared/branches/shared-schema/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:806622-893998
 /directory/shared/branches/shared-subtree/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:965208-965686
 /directory/shared/branches/xdbm-refactoring/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:945830-946347
-/directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:806622-894844,980025-980349,982369-982962
+/directory/shared/trunk/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:806622-894844,980025-980349,982369-987474

Modified: directory/shared/branches/shared-codec-merge/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.260.ldif
URL: http://svn.apache.org/viewvc/directory/shared/branches/shared-codec-merge/ldap-schema/src/main/resources/schema/ou%3Dschema/cn%3Dadsconfig/ou%3Dobjectclasses/m-oid%3D1.3.6.1.4.1.18060.0.4.1.3.260.ldif?rev=987483&r1=987482&r2=987483&view=diff
==============================================================================
--- directory/shared/branches/shared-codec-merge/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.260.ldif (original)
+++ directory/shared/branches/shared-codec-merge/ldap-schema/src/main/resources/schema/ou=schema/cn=adsconfig/ou=objectclasses/m-oid=1.3.6.1.4.1.18060.0.4.1.3.260.ldif Fri Aug 20 12:53:13 2010
@@ -2,7 +2,7 @@ version: 1
 dn: m-oid=1.3.6.1.4.1.18060.0.4.1.3.260, ou=objectClasses, cn=adsconfig, ou=sche
  ma
 createtimestamp: 20100111145218Z
-m-must: ads-serverDS
+m-may: ads-serverDS
 m-oid: 1.3.6.1.4.1.18060.0.4.1.3.260
 entrycsn: 20100111202218.087000Z#000000#000#000000
 m-supobjectclass: ads-server