directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1079048 [3/4] - in /directory/shared/branches/akarasulu: ./ all/ asn1/ asn1/src/ asn1/src/site/ dsml/ dsml/parser/ dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/ dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/r...
Date Tue, 08 Mar 2011 00:22:38 GMT
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 Tue Mar  8 00:22:33 2011
@@ -1,3 +1,4 @@
+/directory/shared/branches/milestones/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_error.xml:1078333-1079042
 /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
@@ -7,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_error.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_error.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_error.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_error.xml:1075835-1079037
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_sizeLimit_error.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/akarasulu/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_attribute.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:22:33 2011
@@ -1,3 +1,4 @@
+/directory/shared/branches/milestones/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_attribute.xml:1078333-1079042
 /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
@@ -7,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_attribute.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_attribute.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_attribute.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_attribute.xml:1075835-1079037
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_attribute.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/akarasulu/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_error.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:22:33 2011
@@ -1,3 +1,4 @@
+/directory/shared/branches/milestones/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_error.xml:1078333-1079042
 /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
@@ -7,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_error.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_error.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_error.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_error.xml:1075835-1079037
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_timeLimit_error.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/akarasulu/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_0.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:22:33 2011
@@ -1,3 +1,4 @@
+/directory/shared/branches/milestones/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_0.xml:1078333-1079042
 /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
@@ -7,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_0.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_0.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_0.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_0.xml:1075835-1079037
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_0.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/akarasulu/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_1.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:22:33 2011
@@ -1,3 +1,4 @@
+/directory/shared/branches/milestones/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_1.xml:1078333-1079042
 /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
@@ -7,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_1.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_1.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_1.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_1.xml:1075835-1079037
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_1.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/akarasulu/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_error.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:22:33 2011
@@ -1,3 +1,4 @@
+/directory/shared/branches/milestones/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_error.xml:1078333-1079042
 /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
@@ -7,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_error.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_error.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_error.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_error.xml:1075835-1079037
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_error.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/akarasulu/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_false.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:22:33 2011
@@ -1,3 +1,4 @@
+/directory/shared/branches/milestones/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_false.xml:1078333-1079042
 /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
@@ -7,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_false.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_false.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_false.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_false.xml:1075835-1079037
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_false.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/akarasulu/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_true.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:22:33 2011
@@ -1,3 +1,4 @@
+/directory/shared/branches/milestones/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_true.xml:1078333-1079042
 /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
@@ -7,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_true.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_true.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_true.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_true.xml:1075835-1079037
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_typesOnly_true.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/akarasulu/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_derefAliases_attribute.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:22:33 2011
@@ -1,3 +1,4 @@
+/directory/shared/branches/milestones/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_derefAliases_attribute.xml:1078333-1079042
 /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
@@ -7,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_derefAliases_attribute.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_derefAliases_attribute.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_derefAliases_attribute.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_derefAliases_attribute.xml:1075835-1079037
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_derefAliases_attribute.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/akarasulu/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_dn_attribute.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:22:33 2011
@@ -1,3 +1,4 @@
+/directory/shared/branches/milestones/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_dn_attribute.xml:1078333-1079042
 /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
@@ -7,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_dn_attribute.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_dn_attribute.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_dn_attribute.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_dn_attribute.xml:1075835-1079037
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_dn_attribute.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/akarasulu/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_filter.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:22:33 2011
@@ -1,3 +1,4 @@
+/directory/shared/branches/milestones/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_filter.xml:1078333-1079042
 /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
@@ -7,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_filter.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_filter.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_filter.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_filter.xml:1075835-1079037
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_filter.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/akarasulu/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_scope_attribute.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:22:33 2011
@@ -1,3 +1,4 @@
+/directory/shared/branches/milestones/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_scope_attribute.xml:1078333-1079042
 /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
@@ -7,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_scope_attribute.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_scope_attribute.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_scope_attribute.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_scope_attribute.xml:1075835-1079037
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_without_scope_attribute.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/akarasulu/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_0_SRD.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:22:33 2011
@@ -1,3 +1,4 @@
+/directory/shared/branches/milestones/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_0_SRD.xml:1078333-1079042
 /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
@@ -7,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_0_SRD.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_0_SRD.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_0_SRD.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_0_SRD.xml:1075835-1079037
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_0_SRD.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/akarasulu/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRD.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:22:33 2011
@@ -1,3 +1,4 @@
+/directory/shared/branches/milestones/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRD.xml:1078333-1079042
 /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
@@ -7,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRD.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRD.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRD.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRD.xml:1075835-1079037
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRD.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/akarasulu/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_0_SRD.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:22:33 2011
@@ -1,3 +1,4 @@
+/directory/shared/branches/milestones/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_0_SRD.xml:1078333-1079042
 /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
@@ -7,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_0_SRD.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_0_SRD.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_0_SRD.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_0_SRD.xml:1075835-1079037
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_0_SRD.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/akarasulu/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRD.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:22:33 2011
@@ -1,3 +1,4 @@
+/directory/shared/branches/milestones/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRD.xml:1078333-1079042
 /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
@@ -7,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRD.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRD.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRD.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRD.xml:1075835-1079037
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRD.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/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 Tue Mar  8 00:22:33 2011
@@ -1,3 +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:1078333-1079042
 /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
@@ -7,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRR_1_SRD.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRR_1_SRD.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRR_1_SRD.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRR_1_SRD.xml:1075835-1079037
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRE_1_SRR_1_SRD.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/akarasulu/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_0_SRD.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:22:33 2011
@@ -1,3 +1,4 @@
+/directory/shared/branches/milestones/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_0_SRD.xml:1078333-1079042
 /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
@@ -7,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_0_SRD.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_0_SRD.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_0_SRD.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_0_SRD.xml:1075835-1079037
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_0_SRD.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/akarasulu/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_1_SRD.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:22:33 2011
@@ -1,3 +1,4 @@
+/directory/shared/branches/milestones/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_1_SRD.xml:1078333-1079042
 /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
@@ -7,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_1_SRD.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_1_SRD.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_1_SRD.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_1_SRD.xml:1075835-1079037
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_1_SRR_1_SRD.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/akarasulu/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_1_SRD.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:22:33 2011
@@ -1,3 +1,4 @@
+/directory/shared/branches/milestones/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_1_SRD.xml:1078333-1079042
 /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
@@ -7,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_1_SRD.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_1_SRD.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_1_SRD.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_1_SRD.xml:1075835-1079037
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_1_SRD.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/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 Tue Mar  8 00:22:33 2011
@@ -1,3 +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:1078333-1079042
 /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
@@ -7,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_2_SRR_1_SRD.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_2_SRR_1_SRD.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_2_SRR_1_SRD.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_2_SRR_1_SRD.xml:1075835-1079037
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRE_2_SRR_1_SRD.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/akarasulu/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRR_1_SRD.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:22:33 2011
@@ -1,3 +1,4 @@
+/directory/shared/branches/milestones/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRR_1_SRD.xml:1078333-1079042
 /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
@@ -7,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRR_1_SRD.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRR_1_SRD.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRR_1_SRD.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRR_1_SRD.xml:1075835-1079037
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_2_SRR_1_SRD.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/akarasulu/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_attribute.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:22:33 2011
@@ -1,3 +1,4 @@
+/directory/shared/branches/milestones/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_attribute.xml:1078333-1079042
 /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
@@ -7,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_attribute.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_attribute.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_attribute.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_attribute.xml:1075835-1079037
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_attribute.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/akarasulu/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_equals_0.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:22:33 2011
@@ -1,3 +1,4 @@
+/directory/shared/branches/milestones/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_equals_0.xml:1078333-1079042
 /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
@@ -7,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_equals_0.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_equals_0.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_equals_0.xml:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_equals_0.xml:1075835-1079037
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_equals_0.xml:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/akarasulu/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:22:33 2011
@@ -1,3 +1,4 @@
+/directory/shared/branches/milestones/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:1078333-1079042
 /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
@@ -7,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:1075835-1079037
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/akarasulu/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:22:33 2011
@@ -1,3 +1,4 @@
+/directory/shared/branches/milestones/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:1078333-1079042
 /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
@@ -7,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:1075835-1079037
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/akarasulu/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:22:33 2011
@@ -1,3 +1,4 @@
+/directory/shared/branches/milestones/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:1078333-1079042
 /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
@@ -7,4 +8,5 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:980350-980351
+/directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:1075835-1079037
 /directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:1066124-1067995,1068025-1072732,1072797-1075328

Modified: directory/shared/branches/akarasulu/dsml/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/dsml/pom.xml?rev=1079048&r1=1079047&r2=1079048&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/dsml/pom.xml (original)
+++ directory/shared/branches/akarasulu/dsml/pom.xml Tue Mar  8 00:22:33 2011
@@ -36,22 +36,4 @@
     <module>parser</module>
   </modules>
 
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-deploy-plugin</artifactId>
-        <configuration>
-          <skip>true</skip>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
-
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/directory/shared/trunk/dsml</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/directory/shared/trunk/dsml</developerConnection>
-    <url>http://svn.apache.org/viewvc/directory/shared/trunk/dsml</url>
-  </scm>
-
 </project>

Propchange: directory/shared/branches/akarasulu/i18n/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:22:33 2011
@@ -1,6 +1,6 @@
-/directory/shared/branches/milestones/i18n:1072811-1074633,1074637-1075326
+/directory/shared/branches/milestones/i18n:1072811-1074633,1074637-1075326,1078333-1079042
 /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
 /directory/shared/branches-dnfactory-experiment/i18n:980350-980351
-/directory/shared/trunk/i18n:1066124-1067995,1068025-1072732,1072797-1075328
+/directory/shared/trunk/i18n:1066124-1067995,1068025-1072732,1072797-1075328,1075835-1079037

Modified: directory/shared/branches/akarasulu/integ/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/integ/pom.xml?rev=1079048&r1=1079047&r2=1079048&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/integ/pom.xml (original)
+++ directory/shared/branches/akarasulu/integ/pom.xml Tue Mar  8 00:22:33 2011
@@ -141,7 +141,7 @@
         <executions>
           <execution>
             <id>copy</id>
-            <phase>compile</phase>
+            <phase>process-test-resources</phase>
             <goals>
               <goal>copy</goal>
             </goals>

Propchange: directory/shared/branches/akarasulu/ldap/client/all/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:22:33 2011
@@ -1,8 +1,10 @@
 /directory/shared/branches/milestones/all:1072811-1074633
+/directory/shared/branches/milestones/ldap/client/all:1078333-1079042
 /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
 /directory/shared/branches-dnfactory-experiment/all:980350-980351
 /directory/shared/trunk/all:1066124-1067995,1068025-1072732,1072797-1074636
+/directory/shared/trunk/ldap/client/all:1075835-1079037
 /directory/shared/trunk/ldap-client-all:1074637-1075328

Modified: directory/shared/branches/akarasulu/ldap/client/all/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/client/all/pom.xml?rev=1079048&r1=1079047&r2=1079048&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/client/all/pom.xml (original)
+++ directory/shared/branches/akarasulu/ldap/client/all/pom.xml Tue Mar  8 00:22:33 2011
@@ -71,11 +71,6 @@
 
     <dependency>
       <groupId>${project.groupId}</groupId>
-      <artifactId>shared-ldap-client-api</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>${project.groupId}</groupId>
       <artifactId>shared-util</artifactId>
     </dependency>
   </dependencies>

Propchange: directory/shared/branches/akarasulu/ldap/client/api/src/main/java/org/apache/directory/ldap/client/api/Krb5LoginConfiguration.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:22:33 2011
@@ -1,5 +1,7 @@
 /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:1078333-1079042
 /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:1075835-1079037
 /directory/shared/trunk/ldap-client-api/src/main/java/org/apache/directory/ldap/client/api/Krb5LoginConfiguration.java:1066124-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/akarasulu/ldap/codec/core/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:22:33 2011
@@ -1,7 +1,9 @@
+/directory/shared/branches/milestones/ldap/codec/core:1078333-1079042
 /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
 /directory/shared/branches-dnfactory-experiment/ldap:980350-980351
 /directory/shared/trunk/ldap:1066124-1067784
+/directory/shared/trunk/ldap/codec/core:1075835-1079037
 /directory/shared/trunk/ldap-codec:1067785-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/akarasulu/ldap/codec/standalone/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:22:33 2011
@@ -1,8 +1,10 @@
+/directory/shared/branches/milestones/ldap/codec/standalone:1078333-1079042
 /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
 /directory/shared/branches-dnfactory-experiment/ldap:980350-980351
 /directory/shared/trunk/ldap:1066124-1067784
+/directory/shared/trunk/ldap/codec/standalone:1075835-1079037
 /directory/shared/trunk/ldap-codec:1067785-1067995,1068025-1068227
 /directory/shared/trunk/ldap-codec-standalone:1068228-1072732,1072797-1075328

Propchange: directory/shared/branches/akarasulu/ldap/extras/aci/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:22:33 2011
@@ -1,7 +1,9 @@
+/directory/shared/branches/milestones/ldap/extras/aci:1078333-1079042
 /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
 /directory/shared/branches-dnfactory-experiment/ldap:980350-980351
 /directory/shared/trunk/ldap:1066124-1067995,1068025-1068227
+/directory/shared/trunk/ldap/extras/aci:1075835-1079037
 /directory/shared/trunk/ldap-extras/aci:1068228-1072732,1072797-1075328

Modified: directory/shared/branches/akarasulu/ldap/extras/aci/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/extras/aci/pom.xml?rev=1079048&r1=1079047&r2=1079048&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/extras/aci/pom.xml (original)
+++ directory/shared/branches/akarasulu/ldap/extras/aci/pom.xml Tue Mar  8 00:22:33 2011
@@ -63,7 +63,6 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>antlr-maven-plugin</artifactId>
-        <version>2.1</version>
         <configuration>
           <grammars>*.g</grammars>
         </configuration>

Propchange: directory/shared/branches/akarasulu/ldap/extras/codec/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:22:33 2011
@@ -1,8 +1,10 @@
+/directory/shared/branches/milestones/ldap/extras/codec:1078333-1079042
 /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
 /directory/shared/branches-dnfactory-experiment/ldap:980350-980351
 /directory/shared/trunk/ldap:1066124-1067784
+/directory/shared/trunk/ldap/extras/codec:1075835-1079037
 /directory/shared/trunk/ldap-codec:1067785-1067995
 /directory/shared/trunk/ldap-extras/codec:1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/akarasulu/ldap/extras/codec-api/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:22:33 2011
@@ -1,3 +1,4 @@
+/directory/shared/branches/milestones/ldap/extras/codec-api:1078333-1079042
 /directory/shared/branches/milestones/ldap-extras/codec:1072811-1073540
 /directory/shared/branches/milestones/ldap-extras/codec-api:1073541-1074633,1074637-1075326
 /directory/shared/branches/shared-codec-merge/ldap:982370-987558
@@ -5,6 +6,7 @@
 /directory/shared/branches/shared-dnfactory-experiment/ldap:980352-980933
 /directory/shared/branches-dnfactory-experiment/ldap:980350-980351
 /directory/shared/trunk/ldap:1066124-1067784
+/directory/shared/trunk/ldap/extras/codec-api:1075835-1079037
 /directory/shared/trunk/ldap-codec:1067785-1067995
 /directory/shared/trunk/ldap-extras/codec:1068025-1072732,1072797-1073546
 /directory/shared/trunk/ldap-extras/codec-api:1073547-1075328

Modified: directory/shared/branches/akarasulu/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulShutdownResponse.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulShutdownResponse.java?rev=1079048&r1=1079047&r2=1079048&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulShutdownResponse.java (original)
+++ directory/shared/branches/akarasulu/ldap/extras/codec-api/src/main/java/org/apache/directory/shared/ldap/extras/extended/GracefulShutdownResponse.java Tue Mar  8 00:22:33 2011
@@ -1,3 +1,22 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *  
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *  
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License. 
+ *  
+ */
 package org.apache.directory.shared.ldap.extras.extended;
 
 

Propchange: directory/shared/branches/akarasulu/ldap/extras/sp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:22:33 2011
@@ -1,7 +1,9 @@
+/directory/shared/branches/milestones/ldap/extras/sp:1078333-1079042
 /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
 /directory/shared/branches-dnfactory-experiment/ldap:980350-980351
 /directory/shared/trunk/ldap:1066124-1067995,1068025-1068227
+/directory/shared/trunk/ldap/extras/sp:1075835-1079037
 /directory/shared/trunk/ldap-extras/sp:1068228-1072732,1072797-1075328

Propchange: directory/shared/branches/akarasulu/ldap/extras/trigger/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:22:33 2011
@@ -1,7 +1,9 @@
+/directory/shared/branches/milestones/ldap/extras/trigger:1078333-1079042
 /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
 /directory/shared/branches-dnfactory-experiment/ldap:980350-980351
 /directory/shared/trunk/ldap:1066124-1067995,1068025-1068227
+/directory/shared/trunk/ldap/extras/trigger:1075835-1079037
 /directory/shared/trunk/ldap-extras/trigger:1068228-1072732,1072797-1075328

Modified: directory/shared/branches/akarasulu/ldap/extras/trigger/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/extras/trigger/pom.xml?rev=1079048&r1=1079047&r2=1079048&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/extras/trigger/pom.xml (original)
+++ directory/shared/branches/akarasulu/ldap/extras/trigger/pom.xml Tue Mar  8 00:22:33 2011
@@ -63,7 +63,6 @@
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>antlr-maven-plugin</artifactId>
-        <version>2.1</version>
         <configuration>
           <grammars>*.g</grammars>
         </configuration>

Propchange: directory/shared/branches/akarasulu/ldap/extras/util/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:22:33 2011
@@ -1,7 +1,9 @@
+/directory/shared/branches/milestones/ldap/extras/util:1078333-1079042
 /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
 /directory/shared/branches-dnfactory-experiment/ldap:980350-980351
 /directory/shared/trunk/ldap:1066124-1067995,1068025-1068227
+/directory/shared/trunk/ldap/extras/util:1075835-1079037
 /directory/shared/trunk/ldap-extras/util:1068228-1072732,1072797-1075328

Propchange: directory/shared/branches/akarasulu/ldap/model/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:22:33 2011
@@ -1,7 +1,9 @@
+/directory/shared/branches/milestones/ldap/model:1078333-1079042
 /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
 /directory/shared/branches-dnfactory-experiment/ldap:980350-980351
 /directory/shared/trunk/ldap:1066124-1067491
+/directory/shared/trunk/ldap/model:1075835-1079037
 /directory/shared/trunk/ldap-model:1067492-1067995,1068025-1072732,1072797-1075328

Propchange: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  8 00:22:33 2011
@@ -1,4 +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:1078333-1079042
 /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
@@ -6,6 +7,7 @@
 /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/branches-dnfactory-experiment/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:980350-980351
+/directory/shared/trunk/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java:1075835-1079037
 /directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java:1066124-1067491
 /directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:519076-580502
 /directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java:1067492-1067995,1068025-1072732,1072797-1075328

Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AbstractValue.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AbstractValue.java?rev=1079048&r1=1079047&r2=1079048&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AbstractValue.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/AbstractValue.java Tue Mar  8 00:22:33 2011
@@ -19,13 +19,19 @@
  */
 package org.apache.directory.shared.ldap.model.entry;
 
+import java.io.IOException;
+import java.io.ObjectInput;
+import java.io.ObjectOutput;
+
 import org.apache.directory.shared.i18n.I18n;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
 import org.apache.directory.shared.ldap.model.schema.LdapComparator;
 import org.apache.directory.shared.ldap.model.schema.MatchingRule;
 import org.apache.directory.shared.ldap.model.schema.Normalizer;
+import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.model.schema.SyntaxChecker;
+import org.apache.directory.shared.util.StringConstants;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -41,7 +47,7 @@ public abstract class AbstractValue<T> i
     private static final Logger LOG = LoggerFactory.getLogger( AbstractValue.class );
 
     /** reference to the attributeType zssociated with the value */
-    protected AttributeType attributeType;
+    protected transient AttributeType attributeType;
 
     /** the wrapped binary value */
     protected T wrappedValue;
@@ -370,4 +376,216 @@ public abstract class AbstractValue<T> i
     {
         this.normalized = normalized;
     }
+
+
+    /**
+     * Serializes a Value instance.
+     * 
+     * @param value The Value instance to serialize
+     * @param out The stream into which we will write the serialized instance
+     * @throws IOException If the stream can't be written
+     */
+    @SuppressWarnings("unchecked")
+    public static void serialize( Value<?> value, ObjectOutput out ) throws IOException
+    {
+        // The Value type
+        out.writeBoolean( value.isBinary() );
+
+        // The AttributeType's OID if we have one
+        if ( value.getAttributeType() != null )
+        {
+            out.writeBoolean( true );
+            out.writeUTF( value.getAttributeType().getOid() );
+        }
+        else
+        {
+            out.writeBoolean( false );
+        }
+        
+        // The UP value and norm value
+        if ( value.isBinary() )
+        {
+            byte[] upValue = (byte[])value.getReference();
+            
+            if ( upValue == null )
+            {
+                out.writeInt( -1 );
+            }
+            else
+            {
+                out.writeInt( upValue.length );
+                
+                if ( upValue.length > 0 )
+                {
+                    out.write( upValue );
+                }
+            }
+
+            byte[] normValue = (byte[])value.getNormalizedValueReference();
+            
+            if ( normValue == null )
+            {
+                out.writeInt( -1 );
+            }
+            else
+            {
+                out.writeInt( normValue.length );
+                
+                if ( normValue.length > 0 )
+                {
+                    out.write( normValue );
+                }
+            }
+        }
+        else
+        {
+            if ( ((AbstractValue<String>)value).wrappedValue != null )
+            {
+                out.writeBoolean( true );
+                out.writeUTF( ((AbstractValue<String>)value).wrappedValue );
+            }
+            else
+            {
+                out.writeBoolean( false );
+            }
+            
+            if ( ((AbstractValue<String>)value).normalizedValue != null )
+            {
+                out.writeBoolean( true );
+                out.writeUTF( ((AbstractValue<String>)value).normalizedValue );
+            }
+            else
+            {
+                out.writeBoolean( false );
+            }
+        }
+        
+        // The normalized flag
+        out.writeBoolean( value.isNormalized() );
+        
+        // The valid flag
+        out.writeBoolean( value.isValid() );
+        
+        // The same flag
+        if ( value.isBinary() )
+        {   
+            out.writeBoolean( ((BinaryValue)value).isSame() );
+        }
+        else
+        {
+            out.writeBoolean( ((StringValue)value).isSame() );
+        }
+
+        // The computed hashCode
+        out.writeInt( value.hashCode() );
+        
+        out.flush();
+    }
+
+
+    /**
+     * Deserializes a Value instance.
+     * 
+     * @param schemaManager The schemaManager instance
+     * @param in The input stream from which the Value is read
+     * @return a deserialized Value
+     * @throws IOException If the stream can't be read
+     */
+    @SuppressWarnings("unchecked")
+    public static Value<?> deserialize( SchemaManager schemaManager, ObjectInput in ) throws IOException
+    {
+        // The value type
+        boolean isBinary = in.readBoolean();
+        
+        Value<?> value = null;
+
+        if ( isBinary )
+        {
+            value = new BinaryValue();
+        }
+        else
+        {
+            value = new StringValue();
+        }
+
+        // The attributeType presence's flag
+        boolean hasAttributeType = in.readBoolean();
+        
+        if ( hasAttributeType )
+        {
+            String oid = in.readUTF();
+            
+            if ( schemaManager != null )
+            {
+                ((AbstractValue<?>)value).attributeType = schemaManager.getAttributeType( oid );
+            }
+        }
+        
+        if ( isBinary )
+        {
+            int upValueSize = in.readInt();
+            
+            switch ( upValueSize )
+            {
+                case -1 :
+                    break;
+                    
+                case 0 :
+                    ((AbstractValue<byte[]>)value).wrappedValue = StringConstants.EMPTY_BYTES;
+                    break;
+                    
+                default :
+                    ((AbstractValue<byte[]>)value).wrappedValue = new byte[upValueSize];
+                    in.read( ((AbstractValue<byte[]>)value).wrappedValue );
+                    break;
+            }
+
+            int normValueSize = in.readInt();
+            
+            switch ( normValueSize )
+            {
+                case -1 :
+                    break;
+                    
+                case 0 :
+                    ((AbstractValue<byte[]>)value).normalizedValue = StringConstants.EMPTY_BYTES;
+                    break;
+                   
+                default :
+                    ((AbstractValue<byte[]>)value).normalizedValue = new byte[normValueSize];
+                    in.read( ((AbstractValue<byte[]>)value).normalizedValue );
+                    break;
+            }
+        }
+        else
+        {
+            boolean notNull = in.readBoolean();
+            
+            if ( notNull )
+            {
+                ((AbstractValue<String>)value).wrappedValue = in.readUTF();
+            }
+
+            notNull = in.readBoolean();
+            
+            if ( notNull )
+            {
+                ((AbstractValue<String>)value).normalizedValue = in.readUTF();
+            }
+        }
+
+        // The normalized flag
+        ((AbstractValue<?>)value).normalized = in.readBoolean();
+        
+        // The valid flag
+        ((AbstractValue<?>)value).valid = in.readBoolean();
+        
+        // The same flag
+        ((AbstractValue<?>)value).same = in.readBoolean();
+
+        // The computed hashCode
+        ((AbstractValue<?>)value).h = in.readInt();
+        
+        return value;
+    }
 }
\ No newline at end of file

Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/BinaryValue.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/BinaryValue.java?rev=1079048&r1=1079047&r2=1079048&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/BinaryValue.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/BinaryValue.java Tue Mar  8 00:22:33 2011
@@ -30,6 +30,7 @@ import org.apache.directory.shared.ldap.
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
 import org.apache.directory.shared.ldap.model.schema.LdapComparator;
 import org.apache.directory.shared.ldap.model.schema.Normalizer;
+import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.model.schema.SyntaxChecker;
 import org.apache.directory.shared.ldap.model.schema.comparators.ByteArrayComparator;
 import org.apache.directory.shared.util.StringConstants;
@@ -54,9 +55,6 @@ public class BinaryValue extends Abstrac
     /** logger for reporting errors that might not be handled properly upstream */
     private static final Logger LOG = LoggerFactory.getLogger( BinaryValue.class );
 
-    /** The computed hashcode. We don't want to compute it each time the hashcode() method is called */
-    private volatile int h;
-
 
     /**
      * Creates a BinaryValue without an initial wrapped value.
@@ -637,160 +635,13 @@ public class BinaryValue extends Abstrac
         }
     }
 
-
+    
     /**
-     * We will write the value and the normalized value, only
-     * if the normalized value is different.
-     * 
-     * If the value is empty, a flag is written at the beginning with 
-     * the value true, otherwise, a false is written.
-     * 
-     * The data will be stored following this structure :
-     *  [length] the wrapped length. Can be -1, if wrapped is null
-     *  [value length]
-     *  [UP value] if not empty
-     *  [normalized] (will be false if the value can't be normalized)
-     *  [same] (a flag set to true if the normalized value equals the UP value)
-     *  [Norm value] (the normalized value if different from the UP value, and not empty)
-     *  
-     *  @param out the buffer in which we will stored the serialized form of the value
-     *  @throws IOException if we can't write into the buffer
-     */
-    public void serialize( ObjectOutput out ) throws IOException
-    {
-        if ( wrappedValue != null )
-        {
-            // write a the wrapped length
-            out.writeInt( wrappedValue.length );
-
-            // Write the data if not empty
-            if ( wrappedValue.length > 0 )
-            {
-                // The data
-                out.write( wrappedValue );
-
-                // Normalize the data
-                try
-                {
-                    normalize();
-
-                    if ( !normalized )
-                    {
-                        // We may not have a normalizer. Just get out
-                        // after having writen the flag
-                        out.writeBoolean( false );
-                    }
-                    else
-                    {
-                        // Write a flag indicating that the data has been normalized
-                        out.writeBoolean( true );
-
-                        if ( Arrays.equals( getReference(), normalizedValue ) )
-                        {
-                            // Write the 'same = true' flag
-                            out.writeBoolean( true );
-                        }
-                        else
-                        {
-                            // Write the 'same = false' flag
-                            out.writeBoolean( false );
-
-                            // Write the normalized value length
-                            out.writeInt( normalizedValue.length );
-
-                            if ( normalizedValue.length > 0 )
-                            {
-                                // Write the normalized value if not empty
-                                out.write( normalizedValue );
-                            }
-                        }
-                    }
-                }
-                catch ( LdapException ne )
-                {
-                    // The value can't be normalized, we don't write the 
-                    // normalized value.
-                    normalizedValue = null;
-                    out.writeBoolean( false );
-                }
-            }
-        }
-        else
-        {
-            // Write -1 indicating that the value is null
-            out.writeInt( -1 );
-        }
-    }
-
-
-    /**
-     * 
-     * Deserialize a BinaryValue. 
-     *
-     * @param in the buffer containing the bytes with the serialized value
-     * @throws IOException 
-     * @throws ClassNotFoundException
+     * {@inheritDoc}
      */
-    public void deserialize( ObjectInput in ) throws IOException, ClassNotFoundException
+    public static BinaryValue deserialize( SchemaManager schemaManager, ObjectInput in ) throws IOException
     {
-        // The UP value length
-        int wrappedLength = in.readInt();
-
-        if ( wrappedLength == -1 )
-        {
-            // If the value is null, the length will be set to -1
-            same = true;
-            wrappedValue = null;
-        }
-        else if ( wrappedLength == 0 )
-        {
-            wrappedValue = StringConstants.EMPTY_BYTES;
-            same = true;
-            normalized = true;
-            normalizedValue = wrappedValue;
-        }
-        else
-        {
-            wrappedValue = new byte[wrappedLength];
-
-            // Read the data
-            in.readFully( wrappedValue );
-
-            // Check if we have a normalized value
-            normalized = in.readBoolean();
-
-            if ( normalized )
-            {
-                // Read the 'same' flag
-                same = in.readBoolean();
-
-                if ( !same )
-                {
-                    // Read the normalizedvalue length
-                    int normalizedLength = in.readInt();
-
-                    if ( normalizedLength > 0 )
-                    {
-                        normalizedValue = new byte[normalizedLength];
-
-                        // Read the normalized value
-                        if ( in.read( normalizedValue, 0, normalizedLength ) == -1 )
-                        {
-                            throw new IOException( I18n.err( I18n.ERR_04480_END_OF_STREAM ) );
-                        }
-                    }
-                    else
-                    {
-                        normalizedValue = StringConstants.EMPTY_BYTES;
-                    }
-                }
-                else
-                {
-                    normalizedValue = new byte[wrappedLength];
-                    System.arraycopy( wrappedValue, 0, normalizedValue, 0, wrappedLength );
-                }
-            }
-        }
+        return (BinaryValue)AbstractValue.deserialize( schemaManager, in );
     }
 
 

Modified: directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntry.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntry.java?rev=1079048&r1=1079047&r2=1079048&view=diff
==============================================================================
--- directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntry.java (original)
+++ directory/shared/branches/akarasulu/ldap/model/src/main/java/org/apache/directory/shared/ldap/model/entry/DefaultEntry.java Tue Mar  8 00:22:33 2011
@@ -315,7 +315,7 @@ public class DefaultEntry implements Ent
     public DefaultEntry( SchemaManager schemaManager, Dn dn, EntryAttribute... attributes )
     {
         this.schemaManager = schemaManager;
-
+        
         if ( dn == null )
         {
             this.dn = Dn.EMPTY_DN;
@@ -326,18 +326,40 @@ public class DefaultEntry implements Ent
             normalizeDN( this.dn );
         }
 
-        initObjectClassAT();
-
-        for ( EntryAttribute attribute : attributes )
+        if ( schemaManager == null )
         {
-            // Store a new ServerAttribute
-            try
+            if ( attributes != null )
             {
-                put( attribute );
+                for ( EntryAttribute attribute : attributes )
+                {
+                    if ( attribute == null )
+                    {
+                        continue;
+                    }
+    
+                    // Store a new ClientAttribute
+                    this.attributes.put( attribute.getId(), attribute );
+                }
             }
-            catch ( LdapException ne )
+        }
+        else
+        {
+            initObjectClassAT();
+    
+            if ( attributes != null )
             {
-                LOG.warn( "The ServerAttribute '{}' does not exist. It has been discarded", attribute );
+                for ( EntryAttribute attribute : attributes )
+                {
+                    // Store a new ServerAttribute
+                    try
+                    {
+                        put( attribute );
+                    }
+                    catch ( LdapException ne )
+                    {
+                        LOG.warn( "The ServerAttribute '{}' does not exist. It has been discarded", attribute );
+                    }
+                }
             }
         }
     }



Mime
View raw message