directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kayyag...@apache.org
Subject svn commit: r987606 [8/25] - in /directory/shared/trunk: ./ all/ asn1-codec/ asn1-codec/src/main/java/org/apache/directory/shared/asn1/codec/ asn1/ asn1/src/main/java/org/apache/directory/shared/asn1/ber/grammar/ asn1/src/main/java/org/apache/directory...
Date Fri, 20 Aug 2010 19:23:37 GMT
Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java?rev=987606&r1=987605&r2=987606&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java Fri Aug 20 19:23:27 2010
@@ -27,17 +27,17 @@ import static org.junit.Assert.assertNul
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import java.util.List;
+import java.util.Collection;
 
 import org.apache.directory.junit.tools.Concurrent;
 import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.shared.dsmlv2.AbstractResponseTest;
 import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
 import org.apache.directory.shared.dsmlv2.reponse.SearchResponse;
-import org.apache.directory.shared.ldap.codec.LdapResultCodec;
-import org.apache.directory.shared.ldap.codec.search.SearchResultDoneCodec;
 import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
+import org.apache.directory.shared.ldap.message.LdapResult;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.message.SearchResultDone;
 import org.apache.directory.shared.ldap.message.control.Control;
 import org.apache.directory.shared.ldap.util.LdapURL;
 import org.apache.directory.shared.ldap.util.StringTools;
@@ -75,7 +75,7 @@ public class SearchResultDoneTest extend
             fail( e.getMessage() );
         }
 
-        SearchResultDoneCodec searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
+        SearchResultDone searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
             .getSearchResultDone();
 
         assertEquals( 1, searchResultDone.getControls().size() );
@@ -111,7 +111,7 @@ public class SearchResultDoneTest extend
             fail( e.getMessage() );
         }
 
-        SearchResultDoneCodec searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
+        SearchResultDone searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
             .getSearchResultDone();
         Control control = searchResultDone.getCurrentControl();
 
@@ -143,7 +143,7 @@ public class SearchResultDoneTest extend
             fail( e.getMessage() );
         }
 
-        SearchResultDoneCodec searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
+        SearchResultDone searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
             .getSearchResultDone();
 
         assertEquals( 2, searchResultDone.getControls().size() );
@@ -179,7 +179,7 @@ public class SearchResultDoneTest extend
             fail( e.getMessage() );
         }
 
-        SearchResultDoneCodec searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
+        SearchResultDone searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
             .getSearchResultDone();
 
         assertEquals( 3, searchResultDone.getControls().size() );
@@ -215,7 +215,7 @@ public class SearchResultDoneTest extend
             fail( e.getMessage() );
         }
 
-        SearchResultDoneCodec searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
+        SearchResultDone searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
             .getSearchResultDone();
 
         assertEquals( 456, searchResultDone.getMessageId() );
@@ -273,10 +273,10 @@ public class SearchResultDoneTest extend
             fail( e.getMessage() );
         }
 
-        SearchResultDoneCodec searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
+        SearchResultDone searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
             .getSearchResultDone();
 
-        LdapResultCodec ldapResult = searchResultDone.getLdapResult();
+        LdapResult ldapResult = searchResultDone.getLdapResult();
 
         assertEquals( ResultCodeEnum.PROTOCOL_ERROR, ldapResult.getResultCode() );
     }
@@ -303,10 +303,10 @@ public class SearchResultDoneTest extend
             fail( e.getMessage() );
         }
 
-        SearchResultDoneCodec searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
+        SearchResultDone searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
             .getSearchResultDone();
 
-        LdapResultCodec ldapResult = searchResultDone.getLdapResult();
+        LdapResult ldapResult = searchResultDone.getLdapResult();
 
         assertEquals( "Unrecognized extended operation EXTENSION_OID: 1.2.6.1.4.1.18060.1.1.1.100.2", ldapResult
             .getErrorMessage() );
@@ -334,10 +334,10 @@ public class SearchResultDoneTest extend
             fail( e.getMessage() );
         }
 
-        SearchResultDoneCodec searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
+        SearchResultDone searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
             .getSearchResultDone();
 
-        LdapResultCodec ldapResult = searchResultDone.getLdapResult();
+        LdapResult ldapResult = searchResultDone.getLdapResult();
 
         assertNull( ldapResult.getErrorMessage() );
     }
@@ -364,20 +364,18 @@ public class SearchResultDoneTest extend
             fail( e.getMessage() );
         }
 
-        SearchResultDoneCodec searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
+        SearchResultDone searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
             .getSearchResultDone();
 
-        LdapResultCodec ldapResult = searchResultDone.getLdapResult();
+        LdapResult ldapResult = searchResultDone.getLdapResult();
 
-        List<org.apache.directory.shared.ldap.util.LdapURL> referrals = ldapResult.getReferrals();
+        Collection<String> referrals = ldapResult.getReferral().getLdapUrls();
 
         assertEquals( 1, referrals.size() );
 
-        Object referral = referrals.get( 0 );
-
         try
         {
-            assertEquals( new LdapURL( "ldap://www.apache.org/" ).toString(), referral.toString() );
+            assertTrue( referrals.contains( new LdapURL( "ldap://www.apache.org/" ).toString() ) );
         }
         catch ( LdapURLEncodingException e )
         {
@@ -407,12 +405,12 @@ public class SearchResultDoneTest extend
             fail( e.getMessage() );
         }
 
-        SearchResultDoneCodec searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
+        SearchResultDone searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
             .getSearchResultDone();
 
-        LdapResultCodec ldapResult = searchResultDone.getLdapResult();
+        LdapResult ldapResult = searchResultDone.getLdapResult();
 
-        List<org.apache.directory.shared.ldap.util.LdapURL> referrals = ldapResult.getReferrals();
+        Collection<String> referrals = ldapResult.getReferral().getLdapUrls();
 
         assertEquals( 0, referrals.size() );
     }
@@ -439,31 +437,27 @@ public class SearchResultDoneTest extend
             fail( e.getMessage() );
         }
 
-        SearchResultDoneCodec searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
+        SearchResultDone searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
             .getSearchResultDone();
 
-        LdapResultCodec ldapResult = searchResultDone.getLdapResult();
+        LdapResult ldapResult = searchResultDone.getLdapResult();
 
-        List<org.apache.directory.shared.ldap.util.LdapURL> referrals = ldapResult.getReferrals();
+        Collection<String> referrals = ldapResult.getReferral().getLdapUrls();
 
         assertEquals( 2, referrals.size() );
 
-        Object referral = referrals.get( 0 );
-
         try
         {
-            assertEquals( new LdapURL( "ldap://www.apache.org/" ).toString(), referral.toString() );
+            assertTrue( referrals.contains( new LdapURL( "ldap://www.apache.org/" ).toString() ) );
         }
         catch ( LdapURLEncodingException e )
         {
             fail();
         }
 
-        Object referral2 = referrals.get( 1 );
-
         try
         {
-            assertEquals( new LdapURL( "ldap://www.apple.com/" ).toString(), referral2.toString() );
+            assertTrue( referrals.contains( new LdapURL( "ldap://www.apple.com/" ).toString() ) );
         }
         catch ( LdapURLEncodingException e )
         {
@@ -493,20 +487,18 @@ public class SearchResultDoneTest extend
             fail( e.getMessage() );
         }
 
-        SearchResultDoneCodec searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
+        SearchResultDone searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
             .getSearchResultDone();
 
-        LdapResultCodec ldapResult = searchResultDone.getLdapResult();
+        LdapResult ldapResult = searchResultDone.getLdapResult();
 
-        List<org.apache.directory.shared.ldap.util.LdapURL> referrals = ldapResult.getReferrals();
+        Collection<String> referrals = ldapResult.getReferral().getLdapUrls();
 
         assertEquals( 1, referrals.size() );
 
-        Object referral = referrals.get( 0 );
-
         try
         {
-            assertEquals( new LdapURL( "ldap://www.apache.org/" ).toString(), referral.toString() );
+            assertTrue( referrals.contains( new LdapURL( "ldap://www.apache.org/" ).toString() ) );
         }
         catch ( LdapURLEncodingException e )
         {
@@ -536,12 +528,12 @@ public class SearchResultDoneTest extend
             fail( e.getMessage() );
         }
 
-        SearchResultDoneCodec searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
+        SearchResultDone searchResultDone = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
             .getSearchResultDone();
 
-        LdapResultCodec ldapResult = searchResultDone.getLdapResult();
+        LdapResult ldapResult = searchResultDone.getLdapResult();
 
-        assertEquals( "cn=Bob Rush,ou=Dev,dc=Example,dc=COM", ldapResult.getMatchedDN() );
+        assertEquals( "cn=Bob Rush,ou=Dev,dc=Example,dc=COM", ldapResult.getMatchedDn().getNormName() );
     }
 
 

Propchange: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,7 +1,7 @@
-/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:980350-980351
+/directory/shared/branches/shared-codec-merge/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:982370-987558
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:980352-980933
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/searchResponse/searchResultEntry:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:945830-946347
-/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:980025-980349
+/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:980350-980351

Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java?rev=987606&r1=987605&r2=987606&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java Fri Aug 20 19:23:27 2010
@@ -34,15 +34,16 @@ import org.apache.directory.junit.tools.
 import org.apache.directory.shared.dsmlv2.AbstractResponseTest;
 import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
 import org.apache.directory.shared.dsmlv2.reponse.SearchResponse;
-import org.apache.directory.shared.ldap.codec.search.SearchResultEntryCodec;
 import org.apache.directory.shared.ldap.entry.Entry;
 import org.apache.directory.shared.ldap.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.entry.Value;
+import org.apache.directory.shared.ldap.message.SearchResultEntry;
 import org.apache.directory.shared.ldap.message.control.Control;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+
 /**
  * Tests for the Search Result Entry Response parsing
  *
@@ -73,7 +74,7 @@ public class SearchResultEntryTest exten
             fail( e.getMessage() );
         }
 
-        SearchResultEntryCodec searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
+        SearchResultEntry searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
             .getCurrentSearchResultEntry();
 
         assertEquals( 1, searchResultEntry.getControls().size() );
@@ -109,7 +110,7 @@ public class SearchResultEntryTest exten
             fail( e.getMessage() );
         }
 
-        SearchResultEntryCodec searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
+        SearchResultEntry searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
             .getCurrentSearchResultEntry();
         Control control = searchResultEntry.getCurrentControl();
 
@@ -141,7 +142,7 @@ public class SearchResultEntryTest exten
             fail( e.getMessage() );
         }
 
-        SearchResultEntryCodec searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
+        SearchResultEntry searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
             .getCurrentSearchResultEntry();
 
         assertEquals( 2, searchResultEntry.getControls().size() );
@@ -177,7 +178,7 @@ public class SearchResultEntryTest exten
             fail( e.getMessage() );
         }
 
-        SearchResultEntryCodec searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
+        SearchResultEntry searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
             .getCurrentSearchResultEntry();
 
         assertEquals( 3, searchResultEntry.getControls().size() );
@@ -233,7 +234,7 @@ public class SearchResultEntryTest exten
             fail( e.getMessage() );
         }
 
-        SearchResultEntryCodec searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
+        SearchResultEntry searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
             .getCurrentSearchResultEntry();
 
         assertEquals( "dc=example,dc=com", searchResultEntry.getObjectName().toString() );
@@ -261,7 +262,7 @@ public class SearchResultEntryTest exten
             fail( e.getMessage() );
         }
 
-        SearchResultEntryCodec searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
+        SearchResultEntry searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
             .getCurrentSearchResultEntry();
 
         assertEquals( 456, searchResultEntry.getMessageId() );
@@ -324,7 +325,7 @@ public class SearchResultEntryTest exten
             fail( e.getMessage() );
         }
 
-        SearchResultEntryCodec searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
+        SearchResultEntry searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
             .getCurrentSearchResultEntry();
 
         Entry entry = searchResultEntry.getEntry();
@@ -357,7 +358,7 @@ public class SearchResultEntryTest exten
             fail( e.getMessage() );
         }
 
-        SearchResultEntryCodec searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
+        SearchResultEntry searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
             .getCurrentSearchResultEntry();
 
         Entry entry = searchResultEntry.getEntry();
@@ -396,7 +397,7 @@ public class SearchResultEntryTest exten
             fail( e.getMessage() );
         }
 
-        SearchResultEntryCodec searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
+        SearchResultEntry searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
             .getCurrentSearchResultEntry();
 
         Entry entry = searchResultEntry.getEntry();
@@ -439,7 +440,7 @@ public class SearchResultEntryTest exten
             fail( e.getMessage() );
         }
 
-        SearchResultEntryCodec searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
+        SearchResultEntry searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
             .getCurrentSearchResultEntry();
 
         Entry entry = searchResultEntry.getEntry();
@@ -478,7 +479,7 @@ public class SearchResultEntryTest exten
             fail( e.getMessage() );
         }
 
-        SearchResultEntryCodec searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
+        SearchResultEntry searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
             .getCurrentSearchResultEntry();
 
         Entry entry = searchResultEntry.getEntry();
@@ -521,7 +522,7 @@ public class SearchResultEntryTest exten
             fail( e.getMessage() );
         }
 
-        SearchResultEntryCodec searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
+        SearchResultEntry searchResultEntry = ( ( SearchResponse ) parser.getBatchResponse().getCurrentResponse() )
             .getCurrentSearchResultEntry();
 
         Entry entry = searchResultEntry.getEntry();

Propchange: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,7 +1,7 @@
-/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:980350-980351
+/directory/shared/branches/shared-codec-merge/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:982370-987558
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:980352-980933
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/searchResponse/searchResultReference:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:945830-946347
-/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:980025-980349
+/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:980350-980351

Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java?rev=987606&r1=987605&r2=987606&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java Fri Aug 20 19:23:27 2010
@@ -26,21 +26,22 @@ import static org.junit.Assert.assertFal
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import java.util.List;
+import java.util.Collection;
 
 import org.apache.directory.junit.tools.Concurrent;
 import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.shared.dsmlv2.AbstractResponseTest;
 import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
 import org.apache.directory.shared.dsmlv2.reponse.SearchResponse;
-import org.apache.directory.shared.ldap.codec.search.SearchResultReferenceCodec;
 import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
+import org.apache.directory.shared.ldap.message.SearchResultReference;
 import org.apache.directory.shared.ldap.message.control.Control;
 import org.apache.directory.shared.ldap.util.LdapURL;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+
 /**
  * Tests for the Search Result Reference Response parsing
  *
@@ -71,7 +72,7 @@ public class SearchResultReferenceTest e
             fail( e.getMessage() );
         }
 
-        SearchResultReferenceCodec searchResultReference = ( ( SearchResponse ) parser.getBatchResponse()
+        SearchResultReference searchResultReference = ( ( SearchResponse ) parser.getBatchResponse()
             .getCurrentResponse() ).getCurrentSearchResultReference();
 
         assertEquals( 1, searchResultReference.getControls().size() );
@@ -107,7 +108,7 @@ public class SearchResultReferenceTest e
             fail( e.getMessage() );
         }
 
-        SearchResultReferenceCodec searchResultReference = ( ( SearchResponse ) parser.getBatchResponse()
+        SearchResultReference searchResultReference = ( ( SearchResponse ) parser.getBatchResponse()
             .getCurrentResponse() ).getCurrentSearchResultReference();
 
         assertEquals( 1, searchResultReference.getControls().size() );
@@ -143,7 +144,7 @@ public class SearchResultReferenceTest e
             fail( e.getMessage() );
         }
 
-        SearchResultReferenceCodec searchResultReference = ( ( SearchResponse ) parser.getBatchResponse()
+        SearchResultReference searchResultReference = ( ( SearchResponse ) parser.getBatchResponse()
             .getCurrentResponse() ).getCurrentSearchResultReference();
 
         assertEquals( 2, searchResultReference.getControls().size() );
@@ -179,7 +180,7 @@ public class SearchResultReferenceTest e
             fail( e.getMessage() );
         }
 
-        SearchResultReferenceCodec searchResultReference = ( ( SearchResponse ) parser.getBatchResponse()
+        SearchResultReference searchResultReference = ( ( SearchResponse ) parser.getBatchResponse()
             .getCurrentResponse() ).getCurrentSearchResultReference();
 
         assertEquals( 3, searchResultReference.getControls().size() );
@@ -215,7 +216,7 @@ public class SearchResultReferenceTest e
             fail( e.getMessage() );
         }
 
-        SearchResultReferenceCodec searchResultReference = ( ( SearchResponse ) parser.getBatchResponse()
+        SearchResultReference searchResultReference = ( ( SearchResponse ) parser.getBatchResponse()
             .getCurrentResponse() ).getCurrentSearchResultReference();
 
         assertEquals( 456, searchResultReference.getMessageId() );
@@ -263,16 +264,16 @@ public class SearchResultReferenceTest e
             fail( e.getMessage() );
         }
 
-        SearchResultReferenceCodec searchResultReference = ( ( SearchResponse ) parser.getBatchResponse()
+        SearchResultReference searchResultReference = ( ( SearchResponse ) parser.getBatchResponse()
             .getCurrentResponse() ).getCurrentSearchResultReference();
 
-        List<org.apache.directory.shared.ldap.util.LdapURL> references = searchResultReference.getSearchResultReferences();
+        Collection<String> references = searchResultReference.getReferral().getLdapUrls();
 
         assertEquals( 1, references.size() );
 
         try
         {
-            assertEquals( new LdapURL( "ldap://localhost" ).toString(), references.get( 0 ).toString() );
+            assertTrue( references.contains( new LdapURL( "ldap://localhost" ).toString() ) );
         }
         catch ( LdapURLEncodingException e )
         {
@@ -302,10 +303,10 @@ public class SearchResultReferenceTest e
             fail( e.getMessage() );
         }
 
-        SearchResultReferenceCodec searchResultReference = ( ( SearchResponse ) parser.getBatchResponse()
+        SearchResultReference searchResultReference = ( ( SearchResponse ) parser.getBatchResponse()
             .getCurrentResponse() ).getCurrentSearchResultReference();
 
-        List<org.apache.directory.shared.ldap.util.LdapURL> references = searchResultReference.getSearchResultReferences();
+        Collection<String> references = searchResultReference.getReferral().getLdapUrls();
 
         assertEquals( 0, references.size() );
     }
@@ -332,16 +333,16 @@ public class SearchResultReferenceTest e
             fail( e.getMessage() );
         }
 
-        SearchResultReferenceCodec searchResultReference = ( ( SearchResponse ) parser.getBatchResponse()
+        SearchResultReference searchResultReference = ( ( SearchResponse ) parser.getBatchResponse()
             .getCurrentResponse() ).getCurrentSearchResultReference();
 
-        List<org.apache.directory.shared.ldap.util.LdapURL> references = searchResultReference.getSearchResultReferences();
+        Collection<String> references = searchResultReference.getReferral().getLdapUrls();
 
         assertEquals( 2, references.size() );
 
         try
         {
-            assertEquals( new LdapURL( "ldap://localhost" ).toString(), references.get( 0 ).toString() );
+            assertTrue( references.contains( new LdapURL( "ldap://localhost" ).toString() ) );
         }
         catch ( LdapURLEncodingException e )
         {
@@ -350,7 +351,7 @@ public class SearchResultReferenceTest e
 
         try
         {
-            assertEquals( new LdapURL( "ldap://www.apache.org" ).toString(), references.get( 1 ).toString() );
+            assertTrue( references.contains( new LdapURL( "ldap://www.apache.org" ).toString() ) );
         }
         catch ( LdapURLEncodingException e )
         {

Propchange: directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,7 +1,7 @@
-/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest:980350-980351
+/directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest:982370-987558
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest:980352-980933
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/abandonRequest:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest:945830-946347
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest:980025-980349
+/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest:980350-980351

Propchange: directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,7 +1,7 @@
-/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest:980350-980351
+/directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest:982370-987558
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest:980352-980933
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/addRequest:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest:945830-946347
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest:980025-980349
+/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest:980350-980351

Propchange: directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,7 +1,7 @@
-/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse:980350-980351
+/directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse:982370-987558
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse:980352-980933
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/addResponse:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse:945830-946347
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse:980025-980349
+/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse:980350-980351

Propchange: directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,7 +1,7 @@
-/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest:980350-980351
+/directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest:982370-987558
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest:980352-980933
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/authRequest:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest:945830-946347
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest:980025-980349
+/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest:980350-980351

Propchange: directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,7 +1,7 @@
-/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse:980350-980351
+/directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse:982370-987558
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse:980352-980933
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/authResponse:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse:945830-946347
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse:980025-980349
+/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse:980350-980351

Propchange: directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,7 +1,7 @@
-/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest:980350-980351
+/directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest:982370-987558
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest:980352-980933
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/batchRequest:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest:945830-946347
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest:980025-980349
+/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest:980350-980351

Propchange: directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,7 +1,7 @@
-/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse:980350-980351
+/directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse:982370-987558
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse:980352-980933
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/batchResponse:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse:945830-946347
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse:980025-980349
+/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse:980350-980351

Propchange: directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,7 +1,7 @@
-/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest:980350-980351
+/directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest:982370-987558
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest:980352-980933
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/compareRequest:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest:945830-946347
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest:980025-980349
+/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest:980350-980351

Propchange: directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,7 +1,7 @@
-/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareResponse:980350-980351
+/directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareResponse:982370-987558
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareResponse:980352-980933
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/compareResponse:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareResponse:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareResponse:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareResponse:945830-946347
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareResponse:980025-980349
+/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareResponse:980350-980351

Propchange: directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,7 +1,7 @@
-/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delRequest:980350-980351
+/directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delRequest:982370-987558
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delRequest:980352-980933
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/delRequest:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delRequest:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delRequest:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delRequest:945830-946347
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delRequest:980025-980349
+/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delRequest:980350-980351

Propchange: directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,7 +1,7 @@
-/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delResponse:980350-980351
+/directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delResponse:982370-987558
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delResponse:980352-980933
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/delResponse:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delResponse:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delResponse:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delResponse:945830-946347
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delResponse:980025-980349
+/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delResponse:980350-980351

Propchange: directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/errorResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,7 +1,7 @@
-/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/errorResponse:980350-980351
+/directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/errorResponse:982370-987558
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/errorResponse:980352-980933
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/errorResponse:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/errorResponse:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/errorResponse:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/errorResponse:945830-946347
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/errorResponse:980025-980349
+/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/errorResponse:980350-980351

Propchange: directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,7 +1,7 @@
-/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedRequest:980350-980351
+/directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedRequest:982370-987558
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedRequest:980352-980933
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/extendedRequest:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedRequest:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedRequest:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedRequest:945830-946347
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedRequest:980025-980349
+/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedRequest:980350-980351

Propchange: directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,7 +1,7 @@
-/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedResponse:980350-980351
+/directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedResponse:982370-987558
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedResponse:980352-980933
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/extendedResponse:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedResponse:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedResponse:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedResponse:945830-946347
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedResponse:980025-980349
+/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedResponse:980350-980351

Propchange: directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,7 +1,7 @@
-/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNRequest:980350-980351
+/directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNRequest:982370-987558
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNRequest:980352-980933
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/modDNRequest:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNRequest:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNRequest:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNRequest:945830-946347
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNRequest:980025-980349
+/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNRequest:980350-980351

Propchange: directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,7 +1,7 @@
-/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNResponse:980350-980351
+/directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNResponse:982370-987558
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNResponse:980352-980933
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/modDNResponse:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNResponse:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNResponse:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNResponse:945830-946347
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNResponse:980025-980349
+/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNResponse:980350-980351

Propchange: directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,7 +1,7 @@
-/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyRequest:980350-980351
+/directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyRequest:982370-987558
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyRequest:980352-980933
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/modifyRequest:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyRequest:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyRequest:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyRequest:945830-946347
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyRequest:980025-980349
+/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyRequest:980350-980351

Propchange: directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,7 +1,7 @@
-/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyResponse:980350-980351
+/directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyResponse:982370-987558
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyResponse:980352-980933
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/modifyResponse:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyResponse:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyResponse:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyResponse:945830-946347
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyResponse:980025-980349
+/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyResponse:980350-980351

Propchange: directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/filters/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,7 +1,7 @@
-/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/filters:980350-980351
+/directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/filters:982370-987558
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/filters:980352-980933
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/searchRequest/filters:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/filters:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/filters:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/filters:945830-946347
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/filters:980025-980349
+/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/filters:980350-980351

Propchange: directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,7 +1,7 @@
-/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control.xml:980350-980351
+/directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control.xml:982370-987558
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control.xml:980352-980933
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/searchRequest/request_with_1_control.xml:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control.xml:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control.xml:945830-946347
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control.xml:980025-980349
+/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control.xml:980350-980351

Propchange: directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_base64_value.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,7 +1,7 @@
-/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_base64_value.xml:980350-980351
+/directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_base64_value.xml:982370-987558
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_base64_value.xml:980352-980933
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/searchRequest/request_with_1_control_base64_value.xml:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_base64_value.xml:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_base64_value.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_base64_value.xml:945830-946347
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_base64_value.xml:980025-980349
+/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_base64_value.xml:980350-980351

Propchange: directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_empty_value.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,7 +1,7 @@
-/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_empty_value.xml:980350-980351
+/directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_empty_value.xml:982370-987558
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_empty_value.xml:980352-980933
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/searchRequest/request_with_1_control_empty_value.xml:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_empty_value.xml:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_empty_value.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_empty_value.xml:945830-946347
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_empty_value.xml:980025-980349
+/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_empty_value.xml:980350-980351

Propchange: directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_attributes_elements.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,7 +1,7 @@
-/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_attributes_elements.xml:980350-980351
+/directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_attributes_elements.xml:982370-987558
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_attributes_elements.xml:980352-980933
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/searchRequest/request_with_2_attributes_elements.xml:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_attributes_elements.xml:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_attributes_elements.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_attributes_elements.xml:945830-946347
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_attributes_elements.xml:980025-980349
+/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_attributes_elements.xml:980350-980351

Propchange: directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_controls.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,7 +1,7 @@
-/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_controls.xml:980350-980351
+/directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_controls.xml:982370-987558
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_controls.xml:980352-980933
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/searchRequest/request_with_2_controls.xml:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_controls.xml:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_controls.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_controls.xml:945830-946347
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_controls.xml:980025-980349
+/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_controls.xml:980350-980351

Propchange: directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_filters.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,7 +1,7 @@
-/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_filters.xml:980350-980351
+/directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_filters.xml:982370-987558
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_filters.xml:980352-980933
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/searchRequest/request_with_2_filters.xml:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_filters.xml:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_filters.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_filters.xml:945830-946347
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_filters.xml:980025-980349
+/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_filters.xml:980350-980351

Propchange: directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_3_controls_without_value.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,7 +1,7 @@
-/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_3_controls_without_value.xml:980350-980351
+/directory/shared/branches/shared-codec-merge/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_3_controls_without_value.xml:982370-987558
 /directory/shared/branches/shared-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_3_controls_without_value.xml:980352-980933
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/searchRequest/request_with_3_controls_without_value.xml:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_3_controls_without_value.xml:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_3_controls_without_value.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_3_controls_without_value.xml:945830-946347
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_3_controls_without_value.xml:980025-980349
+/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_3_controls_without_value.xml:980350-980351

Propchange: directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attribute_without_name_attribute.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,7 +1,7 @@
-/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attribute_without_name_attribute.xml:980350-980351
+/directory/shared/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-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attribute_without_name_attribute.xml:980352-980933
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/searchRequest/request_with_attribute_without_name_attribute.xml:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attribute_without_name_attribute.xml:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attribute_without_name_attribute.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attribute_without_name_attribute.xml:945830-946347
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attribute_without_name_attribute.xml:980025-980349
+/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attribute_without_name_attribute.xml:980350-980351

Propchange: directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_1_attribute.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,7 +1,7 @@
-/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_1_attribute.xml:980350-980351
+/directory/shared/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-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_1_attribute.xml:980352-980933
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/searchRequest/request_with_attributes_1_attribute.xml:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_1_attribute.xml:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_1_attribute.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_1_attribute.xml:945830-946347
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_1_attribute.xml:980025-980349
+/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_1_attribute.xml:980350-980351

Propchange: directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_2_attribute.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,7 +1,7 @@
-/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_2_attribute.xml:980350-980351
+/directory/shared/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-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_2_attribute.xml:980352-980933
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/searchRequest/request_with_attributes_2_attribute.xml:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_2_attribute.xml:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_2_attribute.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_2_attribute.xml:945830-946347
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_2_attribute.xml:980025-980349
+/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_2_attribute.xml:980350-980351

Propchange: directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_but_no_attribute.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,7 +1,7 @@
-/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_but_no_attribute.xml:980350-980351
+/directory/shared/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-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_but_no_attribute.xml:980352-980933
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/searchRequest/request_with_attributes_but_no_attribute.xml:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_but_no_attribute.xml:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_but_no_attribute.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_but_no_attribute.xml:945830-946347
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_but_no_attribute.xml:980025-980349
+/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_but_no_attribute.xml:980350-980351

Propchange: directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefAlways.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,7 +1,7 @@
-/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefAlways.xml:980350-980351
+/directory/shared/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-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefAlways.xml:980352-980933
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/searchRequest/request_with_derefAliases_derefAlways.xml:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefAlways.xml:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefAlways.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefAlways.xml:945830-946347
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefAlways.xml:980025-980349
+/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefAlways.xml:980350-980351

Propchange: directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefFindingBaseObj.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,7 +1,7 @@
-/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefFindingBaseObj.xml:980350-980351
+/directory/shared/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-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefFindingBaseObj.xml:980352-980933
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/searchRequest/request_with_derefAliases_derefFindingBaseObj.xml:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefFindingBaseObj.xml:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefFindingBaseObj.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefFindingBaseObj.xml:945830-946347
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefFindingBaseObj.xml:980025-980349
+/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefFindingBaseObj.xml:980350-980351

Propchange: directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefInSearching.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,7 +1,7 @@
-/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefInSearching.xml:980350-980351
+/directory/shared/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-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefInSearching.xml:980352-980933
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/searchRequest/request_with_derefAliases_derefInSearching.xml:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefInSearching.xml:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefInSearching.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefInSearching.xml:945830-946347
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefInSearching.xml:980025-980349
+/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefInSearching.xml:980350-980351

Propchange: directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_error.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,7 +1,7 @@
-/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_error.xml:980350-980351
+/directory/shared/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-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_error.xml:980352-980933
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/searchRequest/request_with_derefAliases_error.xml:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_error.xml:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_error.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_error.xml:945830-946347
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_error.xml:980025-980349
+/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_error.xml:980350-980351

Propchange: directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_neverDerefAliases.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Aug 20 19:23:27 2010
@@ -1,7 +1,7 @@
-/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_neverDerefAliases.xml:980350-980351
+/directory/shared/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-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_neverDerefAliases.xml:980352-980933
 /directory/shared/branches/shared-replication/dsml-parser/src/test/resources/org/apache/directory/studio/dsmlv2/searchRequest/request_with_derefAliases_neverDerefAliases.xml:749791-764113
 /directory/shared/branches/shared-schema/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_neverDerefAliases.xml:806622-896441
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_neverDerefAliases.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_neverDerefAliases.xml:945830-946347
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_neverDerefAliases.xml:980025-980349
+/directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_neverDerefAliases.xml:980350-980351



Mime
View raw message