directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1075327 [2/2] - in /directory/shared/branches/akarasulu: ./ all/ dsml-parser/ dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ dsml-parser/src/main/java/org...
Date Mon, 28 Feb 2011 13:54:07 GMT
Propchange: directory/shared/branches/akarasulu/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attribute_without_name_attribute.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attribute_without_name_attribute.xml:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attribute_without_name_attribute.xml:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attribute_without_name_attribute.xml:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attribute_without_name_attribute.xml:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attribute_without_name_attribute.xml:980352-980933

Propchange: directory/shared/branches/akarasulu/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_1_attribute.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_1_attribute.xml:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_1_attribute.xml:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_1_attribute.xml:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_1_attribute.xml:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_1_attribute.xml:980352-980933

Propchange: directory/shared/branches/akarasulu/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_2_attribute.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_2_attribute.xml:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_2_attribute.xml:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_2_attribute.xml:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_2_attribute.xml:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_2_attribute.xml:980352-980933

Propchange: directory/shared/branches/akarasulu/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_but_no_attribute.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_but_no_attribute.xml:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_but_no_attribute.xml:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_but_no_attribute.xml:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_but_no_attribute.xml:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_but_no_attribute.xml:980352-980933

Propchange: directory/shared/branches/akarasulu/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefAlways.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefAlways.xml:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefAlways.xml:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefAlways.xml:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefAlways.xml:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefAlways.xml:980352-980933

Propchange: directory/shared/branches/akarasulu/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefFindingBaseObj.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefFindingBaseObj.xml:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefFindingBaseObj.xml:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefFindingBaseObj.xml:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefFindingBaseObj.xml:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefFindingBaseObj.xml:980352-980933

Propchange: directory/shared/branches/akarasulu/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefInSearching.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefInSearching.xml:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefInSearching.xml:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefInSearching.xml:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefInSearching.xml:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefInSearching.xml:980352-980933

Propchange: directory/shared/branches/akarasulu/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_error.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_error.xml:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_error.xml:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_error.xml:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_error.xml:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_error.xml:980352-980933

Propchange: directory/shared/branches/akarasulu/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_neverDerefAliases.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_neverDerefAliases.xml:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_neverDerefAliases.xml:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_neverDerefAliases.xml:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_neverDerefAliases.xml:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_neverDerefAliases.xml:980352-980933

Propchange: directory/shared/branches/akarasulu/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_dn_attribute.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_dn_attribute.xml:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_dn_attribute.xml:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_dn_attribute.xml:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_dn_attribute.xml:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_dn_attribute.xml:980352-980933

Propchange: directory/shared/branches/akarasulu/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_empty_filter.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_empty_filter.xml:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_empty_filter.xml:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_empty_filter.xml:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_empty_filter.xml:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_empty_filter.xml:980352-980933

Propchange: directory/shared/branches/akarasulu/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_needed_requestID.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_needed_requestID.xml:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_needed_requestID.xml:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_needed_requestID.xml:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_needed_requestID.xml:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_needed_requestID.xml:980352-980933

Propchange: directory/shared/branches/akarasulu/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_attribute.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_attribute.xml:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_attribute.xml:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_attribute.xml:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_attribute.xml:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_attribute.xml:980352-980933

Propchange: directory/shared/branches/akarasulu/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_equals_0.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_equals_0.xml:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_equals_0.xml:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_equals_0.xml:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_equals_0.xml:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_equals_0.xml:980352-980933

Propchange: directory/shared/branches/akarasulu/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_baseObject.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_baseObject.xml:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_baseObject.xml:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_baseObject.xml:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_baseObject.xml:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_baseObject.xml:980352-980933

Propchange: directory/shared/branches/akarasulu/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_error.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_error.xml:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_error.xml:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_error.xml:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_error.xml:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_error.xml:980352-980933

Propchange: directory/shared/branches/akarasulu/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_singleLevel.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_singleLevel.xml:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_singleLevel.xml:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_singleLevel.xml:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_singleLevel.xml:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_singleLevel.xml:980352-980933

Propchange: directory/shared/branches/akarasulu/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_wholeSubtree.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_wholeSubtree.xml:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_wholeSubtree.xml:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_wholeSubtree.xml:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_wholeSubtree.xml:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_scope_wholeSubtree.xml:980352-980933

Propchange: directory/shared/branches/akarasulu/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_attribute.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_attribute.xml:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_attribute.xml:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_attribute.xml:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_attribute.xml:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_attribute.xml:980352-980933

Propchange: directory/shared/branches/akarasulu/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_error.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_error.xml:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_error.xml:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_error.xml:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_error.xml:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_error.xml:980352-980933

Propchange: directory/shared/branches/akarasulu/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_attribute.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_attribute.xml:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_attribute.xml:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_attribute.xml:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_attribute.xml:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_attribute.xml:980352-980933

Propchange: directory/shared/branches/akarasulu/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_error.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_error.xml:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_error.xml:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_error.xml:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_error.xml:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_error.xml:980352-980933

Propchange: directory/shared/branches/akarasulu/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_0.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_0.xml:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_0.xml:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_0.xml:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_0.xml:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_0.xml:980352-980933

Propchange: directory/shared/branches/akarasulu/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_1.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_1.xml:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_1.xml:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_1.xml:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_1.xml:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_1.xml:980352-980933

Propchange: directory/shared/branches/akarasulu/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_error.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_error.xml:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_error.xml:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_error.xml:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_error.xml:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_error.xml:980352-980933

Propchange: directory/shared/branches/akarasulu/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_false.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_false.xml:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_false.xml:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_false.xml:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_false.xml:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_false.xml:980352-980933

Propchange: directory/shared/branches/akarasulu/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_true.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_true.xml:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_true.xml:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_true.xml:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_true.xml:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_true.xml:980352-980933

Propchange: directory/shared/branches/akarasulu/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_derefAliases_attribute.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_derefAliases_attribute.xml:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_derefAliases_attribute.xml:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_derefAliases_attribute.xml:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_derefAliases_attribute.xml:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_derefAliases_attribute.xml:980352-980933

Propchange: directory/shared/branches/akarasulu/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_dn_attribute.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_dn_attribute.xml:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_dn_attribute.xml:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_dn_attribute.xml:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_dn_attribute.xml:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_dn_attribute.xml:980352-980933

Propchange: directory/shared/branches/akarasulu/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_filter.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_filter.xml:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_filter.xml:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_filter.xml:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_filter.xml:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_filter.xml:980352-980933

Propchange: directory/shared/branches/akarasulu/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_scope_attribute.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_scope_attribute.xml:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_scope_attribute.xml:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_scope_attribute.xml:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_scope_attribute.xml:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_scope_attribute.xml:980352-980933

Propchange: directory/shared/branches/akarasulu/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_0_SRD.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_0_SRD.xml:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_0_SRD.xml:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_0_SRD.xml:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_0_SRD.xml:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_0_SRD.xml:980352-980933

Propchange: directory/shared/branches/akarasulu/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRD.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRD.xml:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRD.xml:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRD.xml:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRD.xml:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRD.xml:980352-980933

Propchange: directory/shared/branches/akarasulu/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_0_SRD.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_0_SRD.xml:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_0_SRD.xml:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_0_SRD.xml:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_0_SRD.xml:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_0_SRD.xml:980352-980933

Propchange: directory/shared/branches/akarasulu/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRD.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRD.xml:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRD.xml:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRD.xml:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRD.xml:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRD.xml:980352-980933

Propchange: directory/shared/branches/akarasulu/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 Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRR_1_SRD.xml:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRR_1_SRD.xml:1072811-1074633,1074637-1075326
 /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:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRR_1_SRD.xml:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRR_1_SRD.xml:980352-980933

Propchange: directory/shared/branches/akarasulu/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_0_SRD.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_0_SRD.xml:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_0_SRD.xml:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_0_SRD.xml:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_0_SRD.xml:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_0_SRD.xml:980352-980933

Propchange: directory/shared/branches/akarasulu/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_1_SRD.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_1_SRD.xml:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_1_SRD.xml:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_1_SRD.xml:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_1_SRD.xml:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_1_SRD.xml:980352-980933

Propchange: directory/shared/branches/akarasulu/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_1_SRD.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_1_SRD.xml:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_1_SRD.xml:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_1_SRD.xml:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_1_SRD.xml:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_1_SRD.xml:980352-980933

Propchange: directory/shared/branches/akarasulu/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 Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_2_SRR_1_SRD.xml:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_2_SRR_1_SRD.xml:1072811-1074633,1074637-1075326
 /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:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_2_SRR_1_SRD.xml:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_2_SRR_1_SRD.xml:980352-980933

Propchange: directory/shared/branches/akarasulu/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRR_1_SRD.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRR_1_SRD.xml:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRR_1_SRD.xml:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRR_1_SRD.xml:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRR_1_SRD.xml:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRR_1_SRD.xml:980352-980933

Propchange: directory/shared/branches/akarasulu/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_attribute.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_attribute.xml:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_attribute.xml:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_attribute.xml:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_attribute.xml:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_attribute.xml:980352-980933

Propchange: directory/shared/branches/akarasulu/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_equals_0.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_equals_0.xml:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_equals_0.xml:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_equals_0.xml:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_equals_0.xml:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_equals_0.xml:980352-980933

Propchange: directory/shared/branches/akarasulu/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:980352-980933

Propchange: directory/shared/branches/akarasulu/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:980352-980933

Propchange: directory/shared/branches/akarasulu/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:1072811-1074633
+/directory/shared/branches/milestones/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:982370-987558
 /directory/shared/branches/shared-config/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:980352-980933

Propchange: directory/shared/branches/akarasulu/i18n/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/i18n:1072811-1074633
+/directory/shared/branches/milestones/i18n:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/i18n:982370-987558
 /directory/shared/branches/shared-config/i18n:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/i18n:980352-980933

Propchange: directory/shared/branches/akarasulu/ldap-client-all/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,5 @@
 /directory/shared/branches/milestones/all:1072811-1074633
+/directory/shared/branches/milestones/ldap-client-all:1074637-1075326
 /directory/shared/branches/shared-codec-merge/all:982370-987558
 /directory/shared/branches/shared-config/all:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/all:980352-980933

Propchange: directory/shared/branches/akarasulu/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/Krb5LoginConfiguration.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,5 +1,5 @@
 /directory/apacheds/branches/apacheds-codec-merge/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/jaas/Krb5LoginConfiguration.java:982369-987590
 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-shared/src/main/java/org/apache/directory/server/kerberos/shared/jaas/Krb5LoginConfiguration.java:980138-980936
-/directory/shared/branches/milestones/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/Krb5LoginConfiguration.java:1072811-1074633
+/directory/shared/branches/milestones/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/Krb5LoginConfiguration.java:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-config/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/Krb5LoginConfiguration.java:1023444-1029061
 /directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/Krb5LoginConfiguration.java:1066124-1067995,1068025-1072732,1072797-1074636

Propchange: directory/shared/branches/akarasulu/ldap-codec/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/ldap-codec:1072811-1074633
+/directory/shared/branches/milestones/ldap-codec:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/ldap:982370-987558
 /directory/shared/branches/shared-config/ldap:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/ldap:980352-980933

Propchange: directory/shared/branches/akarasulu/ldap-codec-standalone/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/ldap-codec-standalone:1072811-1074633
+/directory/shared/branches/milestones/ldap-codec-standalone:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/ldap:982370-987558
 /directory/shared/branches/shared-config/ldap:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/ldap:980352-980933

Propchange: directory/shared/branches/akarasulu/ldap-extras/aci/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/ldap-extras/aci:1072811-1074633
+/directory/shared/branches/milestones/ldap-extras/aci:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/ldap:982370-987558
 /directory/shared/branches/shared-config/ldap:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/ldap:980352-980933

Propchange: directory/shared/branches/akarasulu/ldap-extras/codec/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/ldap-extras/codec:1072811-1074633
+/directory/shared/branches/milestones/ldap-extras/codec:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/ldap:982370-987558
 /directory/shared/branches/shared-config/ldap:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/ldap:980352-980933

Propchange: directory/shared/branches/akarasulu/ldap-extras/codec-api/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,5 +1,5 @@
 /directory/shared/branches/milestones/ldap-extras/codec:1072811-1073540
-/directory/shared/branches/milestones/ldap-extras/codec-api:1073541-1074633
+/directory/shared/branches/milestones/ldap-extras/codec-api:1073541-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/ldap:982370-987558
 /directory/shared/branches/shared-config/ldap:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/ldap:980352-980933

Propchange: directory/shared/branches/akarasulu/ldap-extras/sp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/ldap-extras/sp:1072811-1074633
+/directory/shared/branches/milestones/ldap-extras/sp:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/ldap:982370-987558
 /directory/shared/branches/shared-config/ldap:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/ldap:980352-980933

Propchange: directory/shared/branches/akarasulu/ldap-extras/trigger/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/ldap-extras/trigger:1072811-1074633
+/directory/shared/branches/milestones/ldap-extras/trigger:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/ldap:982370-987558
 /directory/shared/branches/shared-config/ldap:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/ldap:980352-980933

Propchange: directory/shared/branches/akarasulu/ldap-extras/util/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/ldap-extras/util:1072811-1074633
+/directory/shared/branches/milestones/ldap-extras/util:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/ldap:982370-987558
 /directory/shared/branches/shared-config/ldap:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/ldap:980352-980933

Propchange: directory/shared/branches/akarasulu/ldap-model/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,4 @@
-/directory/shared/branches/milestones/ldap-model:1072811-1074633
+/directory/shared/branches/milestones/ldap-model:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/ldap:982370-987558
 /directory/shared/branches/shared-config/ldap:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/ldap:980352-980933

Propchange: directory/shared/branches/akarasulu/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,5 +1,5 @@
 /directory/apacheds/branches/apacheds-replication/core-constants/src/main/java/org/apache/directory/server/constants/MetaSchemaConstants.java:749790-764110
-/directory/shared/branches/milestones/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java:1072811-1074633
+/directory/shared/branches/milestones/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:982370-987558
 /directory/shared/branches/shared-config/ldap/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:980352-980933

Propchange: directory/shared/branches/akarasulu/ldap-protocol-codec/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,4 +1,5 @@
 /directory/shared/branches/milestones/ldap-codec:1072811-1074633
+/directory/shared/branches/milestones/ldap-protocol-codec:1074637-1075326
 /directory/shared/branches/shared-codec-merge/ldap:982370-987558
 /directory/shared/branches/shared-config/ldap:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/ldap:980352-980933

Propchange: directory/shared/branches/akarasulu/ldap-schema/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,6 +1,6 @@
 /directory/apacheds/branches/apacheds-replication/schema-data:749790-764110
 /directory/shared/branches/antoine/ldap-schema:1038306-1044343
-/directory/shared/branches/milestones/ldap-schema:1072811-1074633
+/directory/shared/branches/milestones/ldap-schema:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/ldap-schema:982370-987558
 /directory/shared/branches/shared-config/ldap-schema:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/ldap-schema:980352-980933

Propchange: directory/shared/branches/akarasulu/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,5 +1,5 @@
 /directory/shared/branches/antoine/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:1038306-1044343
-/directory/shared/branches/milestones/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl:1072811-1074633
+/directory/shared/branches/milestones/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:982370-987558
 /directory/shared/branches/shared-config/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl:980352-980933

Propchange: directory/shared/branches/akarasulu/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Feb 28 13:54:04 2011
@@ -1,5 +1,5 @@
 /directory/shared/branches/antoine/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:1038306-1044343
-/directory/shared/branches/milestones/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java:1072811-1074633
+/directory/shared/branches/milestones/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schemamanager/impl/DefaultSchemaManager.java:1072811-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:982370-987558
 /directory/shared/branches/shared-config/ldap-schema/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:1023444-1029061
 /directory/shared/branches/shared-dnfactory-experiment/ldap-schema-manager/src/main/java/org/apache/directory/shared/ldap/schema/manager/impl/DefaultSchemaManager.java:980352-980933



Mime
View raw message