directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1068231 [2/7] - in /directory/shared/branches/m1: ./ all/ asn1-api/ asn1-api/src/test/java/org/apache/directory/shared/asn1/util/ asn1-ber/ asn1-ber/src/test/java/org/apache/directory/shared/asn1/ber/tlv/ dsml-parser/ dsml-parser/src/main/...
Date Tue, 08 Feb 2011 00:06:44 GMT
Propchange: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest:1066124-1067995,1068025-1068227

Modified: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest/AuthRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest/AuthRequestTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest/AuthRequestTest.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest/AuthRequestTest.java Tue Feb  8 00:06:34 2011
@@ -29,8 +29,6 @@ import static org.junit.Assert.fail;
 
 import java.util.Map;
 
-import org.apache.directory.junit.tools.Concurrent;
-import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.shared.dsmlv2.AbstractTest;
 import org.apache.directory.shared.dsmlv2.DsmlControl;
 import org.apache.directory.shared.dsmlv2.Dsmlv2Parser;
@@ -40,6 +38,9 @@ import org.apache.directory.shared.util.
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
 
 /**
  * Tests for the Auth Request parsing
@@ -47,7 +48,7 @@ import org.junit.runner.RunWith;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class AuthRequestTest extends AbstractTest
 {
     /**

Propchange: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse:1066124-1067995,1068025-1068227

Modified: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java Tue Feb  8 00:06:34 2011
@@ -31,8 +31,6 @@ import static org.junit.Assert.fail;
 import java.util.Collection;
 import java.util.Map;
 
-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.DsmlControl;
 import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
@@ -46,6 +44,9 @@ import org.apache.directory.shared.util.
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
 
 /**
  * Tests for the Auth Response parsing
@@ -53,7 +54,7 @@ import org.junit.runner.RunWith;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class AuthResponseTest extends AbstractResponseTest
 {
 

Propchange: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest:1066124-1067995,1068025-1068227

Modified: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest/BatchRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest/BatchRequestTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest/BatchRequestTest.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest/BatchRequestTest.java Tue Feb  8 00:06:34 2011
@@ -27,8 +27,6 @@ import static org.junit.Assert.fail;
 
 import java.util.List;
 
-import org.apache.directory.junit.tools.Concurrent;
-import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.shared.dsmlv2.AbstractTest;
 import org.apache.directory.shared.dsmlv2.DsmlDecorator;
 import org.apache.directory.shared.dsmlv2.Dsmlv2Parser;
@@ -46,6 +44,9 @@ import org.apache.directory.shared.ldap.
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
 
 /**
  * Tests for the Compare Response parsing
@@ -53,7 +54,7 @@ import org.junit.runner.RunWith;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class BatchRequestTest extends AbstractTest
 {
     /**

Propchange: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse:1066124-1067995,1068025-1068227

Modified: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse/BatchResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse/BatchResponseTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse/BatchResponseTest.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse/BatchResponseTest.java Tue Feb  8 00:06:34 2011
@@ -25,8 +25,6 @@ import static org.junit.Assert.assertEqu
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-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.DsmlDecorator;
 import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
@@ -44,6 +42,9 @@ import org.apache.directory.shared.ldap.
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
 
 /**
  * Tests for the Compare Response parsing
@@ -51,7 +52,7 @@ import org.junit.runner.RunWith;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class BatchResponseTest extends AbstractResponseTest
 {
     /**

Propchange: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest:1066124-1067995,1068025-1068227

Modified: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest/CompareRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest/CompareRequestTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest/CompareRequestTest.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest/CompareRequestTest.java Tue Feb  8 00:06:34 2011
@@ -30,8 +30,6 @@ import static org.junit.Assert.fail;
 
 import java.util.Map;
 
-import org.apache.directory.junit.tools.Concurrent;
-import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.shared.dsmlv2.AbstractTest;
 import org.apache.directory.shared.dsmlv2.DsmlControl;
 import org.apache.directory.shared.dsmlv2.Dsmlv2Parser;
@@ -41,6 +39,9 @@ import org.apache.directory.shared.util.
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
 
 /**
  * Tests for the Compare Request parsing
@@ -48,7 +49,7 @@ import org.junit.runner.RunWith;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class CompareRequestTest extends AbstractTest
 {
     /**

Propchange: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse:1066124-1067995,1068025-1068227

Modified: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/CompareResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/CompareResponseTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/CompareResponseTest.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/CompareResponseTest.java Tue Feb  8 00:06:34 2011
@@ -31,8 +31,6 @@ import static org.junit.Assert.fail;
 import java.util.Collection;
 import java.util.Map;
 
-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.DsmlControl;
 import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
@@ -46,6 +44,9 @@ import org.apache.directory.shared.util.
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
 
 /**
  * Tests for the Compare Response parsing
@@ -53,7 +54,7 @@ import org.junit.runner.RunWith;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class CompareResponseTest extends AbstractResponseTest
 {
 

Propchange: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest:1066124-1067995,1068025-1068227

Modified: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest/DelRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest/DelRequestTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest/DelRequestTest.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest/DelRequestTest.java Tue Feb  8 00:06:34 2011
@@ -21,7 +21,7 @@
 package org.apache.directory.shared.dsmlv2.delRequest;
 
 
-import static org.junit.Assert.assertEquals; 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
@@ -29,8 +29,6 @@ import static org.junit.Assert.fail;
 
 import java.util.Map;
 
-import org.apache.directory.junit.tools.Concurrent;
-import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.shared.dsmlv2.AbstractTest;
 import org.apache.directory.shared.dsmlv2.DsmlControl;
 import org.apache.directory.shared.dsmlv2.Dsmlv2Parser;
@@ -40,6 +38,9 @@ import org.apache.directory.shared.util.
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
 
 /**
  * Tests for the Del Request parsing
@@ -47,7 +48,7 @@ import org.junit.runner.RunWith;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class DelRequestTest extends AbstractTest
 {
     /**

Propchange: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse:1066124-1067995,1068025-1068227

Modified: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/DelResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/DelResponseTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/DelResponseTest.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/DelResponseTest.java Tue Feb  8 00:06:34 2011
@@ -31,8 +31,6 @@ import static org.junit.Assert.fail;
 import java.util.Collection;
 import java.util.Map;
 
-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.DsmlControl;
 import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
@@ -46,6 +44,9 @@ import org.apache.directory.shared.util.
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
 
 /**
  * Tests for the Del Response parsing
@@ -53,7 +54,7 @@ import org.junit.runner.RunWith;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class DelResponseTest extends AbstractResponseTest
 {
 

Propchange: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/errorResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/errorResponse:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/errorResponse:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/errorResponse:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/errorResponse:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/errorResponse:1066124-1067995,1068025-1068227

Modified: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/errorResponse/ErrorResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/errorResponse/ErrorResponseTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/errorResponse/ErrorResponseTest.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/errorResponse/ErrorResponseTest.java Tue Feb  8 00:06:34 2011
@@ -25,8 +25,8 @@ import static org.junit.Assert.assertEqu
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.fail;
 
-import org.apache.directory.junit.tools.Concurrent;
-import org.apache.directory.junit.tools.ConcurrentJunitRunner;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
 import org.apache.directory.shared.dsmlv2.AbstractResponseTest;
 import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
 import org.apache.directory.shared.dsmlv2.reponse.ErrorResponse;
@@ -41,7 +41,7 @@ import org.junit.runner.RunWith;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class ErrorResponseTest extends AbstractResponseTest
 {
 

Propchange: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest:1066124-1067995,1068025-1068227

Modified: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest/ExtendedRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest/ExtendedRequestTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest/ExtendedRequestTest.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest/ExtendedRequestTest.java Tue Feb  8 00:06:34 2011
@@ -30,8 +30,6 @@ import static org.junit.Assert.fail;
 
 import java.util.Map;
 
-import org.apache.directory.junit.tools.Concurrent;
-import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.shared.dsmlv2.AbstractTest;
 import org.apache.directory.shared.dsmlv2.DsmlControl;
 import org.apache.directory.shared.dsmlv2.Dsmlv2Parser;
@@ -41,6 +39,9 @@ import org.apache.directory.shared.util.
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
 
 /**
  * Tests for the Extended Request parsing
@@ -48,7 +49,7 @@ import org.junit.runner.RunWith;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class ExtendedRequestTest extends AbstractTest
 {
     /**

Propchange: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse:1066124-1067995,1068025-1068227

Modified: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java Tue Feb  8 00:06:34 2011
@@ -31,8 +31,6 @@ import static org.junit.Assert.fail;
 import java.util.Collection;
 import java.util.Map;
 
-import org.apache.directory.junit.tools.Concurrent;
-import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.shared.asn1.DecoderException;
 import org.apache.directory.shared.asn1.util.OID;
 import org.apache.directory.shared.dsmlv2.AbstractResponseTest;
@@ -48,6 +46,9 @@ import org.apache.directory.shared.util.
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
 
 /**
  * Tests for the Extended Response parsing
@@ -55,7 +56,7 @@ import org.junit.runner.RunWith;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class ExtendedResponseTest extends AbstractResponseTest
 {
 

Propchange: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest:1066124-1067995,1068025-1068227

Modified: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest/ModifyDNRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest/ModifyDNRequestTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest/ModifyDNRequestTest.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest/ModifyDNRequestTest.java Tue Feb  8 00:06:34 2011
@@ -29,8 +29,6 @@ import static org.junit.Assert.fail;
 
 import java.util.Map;
 
-import org.apache.directory.junit.tools.Concurrent;
-import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.shared.dsmlv2.AbstractTest;
 import org.apache.directory.shared.dsmlv2.DsmlControl;
 import org.apache.directory.shared.dsmlv2.Dsmlv2Parser;
@@ -40,6 +38,9 @@ import org.apache.directory.shared.util.
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
 
 /**
  * Tests for the Modify Dn Request parsing
@@ -47,7 +48,7 @@ import org.junit.runner.RunWith;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class ModifyDNRequestTest extends AbstractTest
 {
     /**

Propchange: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse:1066124-1067995,1068025-1068227

Modified: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/ModifyDNResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/ModifyDNResponseTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/ModifyDNResponseTest.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/ModifyDNResponseTest.java Tue Feb  8 00:06:34 2011
@@ -31,8 +31,8 @@ import static org.junit.Assert.fail;
 import java.util.Collection;
 import java.util.Map;
 
-import org.apache.directory.junit.tools.Concurrent;
-import org.apache.directory.junit.tools.ConcurrentJunitRunner;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
 import org.apache.directory.shared.dsmlv2.AbstractResponseTest;
 import org.apache.directory.shared.dsmlv2.DsmlControl;
 import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
@@ -53,7 +53,7 @@ import org.junit.runner.RunWith;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class ModifyDNResponseTest extends AbstractResponseTest
 {
 

Propchange: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest:1066124-1067995,1068025-1068227

Modified: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/ModifyRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/ModifyRequestTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/ModifyRequestTest.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/ModifyRequestTest.java Tue Feb  8 00:06:34 2011
@@ -34,8 +34,6 @@ import java.util.Map;
 
 import javax.naming.NamingException;
 
-import org.apache.directory.junit.tools.Concurrent;
-import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.shared.dsmlv2.AbstractTest;
 import org.apache.directory.shared.dsmlv2.DsmlControl;
 import org.apache.directory.shared.dsmlv2.Dsmlv2Parser;
@@ -48,6 +46,9 @@ import org.apache.directory.shared.util.
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
+
 
 /**
  * Tests for the Modify Request parsing
@@ -55,7 +56,7 @@ import org.junit.runner.RunWith;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class ModifyRequestTest extends AbstractTest
 {
     /**

Propchange: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse:1066124-1067995,1068025-1068227

Modified: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/ModifyResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/ModifyResponseTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/ModifyResponseTest.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/ModifyResponseTest.java Tue Feb  8 00:06:34 2011
@@ -31,8 +31,8 @@ import static org.junit.Assert.fail;
 import java.util.Collection;
 import java.util.Map;
 
-import org.apache.directory.junit.tools.Concurrent;
-import org.apache.directory.junit.tools.ConcurrentJunitRunner;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
 import org.apache.directory.shared.dsmlv2.AbstractResponseTest;
 import org.apache.directory.shared.dsmlv2.DsmlControl;
 import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
@@ -53,7 +53,7 @@ import org.junit.runner.RunWith;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class ModifyResponseTest extends AbstractResponseTest
 {
 

Propchange: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest:1066124-1067995,1068025-1068227

Modified: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest/SearchRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest/SearchRequestTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest/SearchRequestTest.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest/SearchRequestTest.java Tue Feb  8 00:06:34 2011
@@ -33,8 +33,8 @@ import java.util.Map;
 
 import javax.naming.NamingException;
 
-import org.apache.directory.junit.tools.Concurrent;
-import org.apache.directory.junit.tools.ConcurrentJunitRunner;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
 import org.apache.directory.shared.dsmlv2.AbstractTest;
 import org.apache.directory.shared.dsmlv2.DsmlControl;
 import org.apache.directory.shared.dsmlv2.Dsmlv2Parser;
@@ -64,7 +64,7 @@ import org.junit.runner.RunWith;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class SearchRequestTest extends AbstractTest
 {
     /**

Modified: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java Tue Feb  8 00:06:34 2011
@@ -25,8 +25,8 @@ import static org.junit.Assert.assertEqu
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.fail;
 
-import org.apache.directory.junit.tools.Concurrent;
-import org.apache.directory.junit.tools.ConcurrentJunitRunner;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
 import org.apache.directory.shared.dsmlv2.AbstractResponseTest;
 import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
 import org.apache.directory.shared.dsmlv2.reponse.SearchResponse;
@@ -39,7 +39,7 @@ import org.junit.runner.RunWith;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class SearchResponseTest extends AbstractResponseTest
 {
     /**

Propchange: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java:1066124-1067995,1068025-1068227

Propchange: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone:1066124-1067995,1068025-1068227

Modified: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java Tue Feb  8 00:06:34 2011
@@ -31,8 +31,8 @@ import static org.junit.Assert.fail;
 import java.util.Collection;
 import java.util.Map;
 
-import org.apache.directory.junit.tools.Concurrent;
-import org.apache.directory.junit.tools.ConcurrentJunitRunner;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
 import org.apache.directory.shared.dsmlv2.AbstractResponseTest;
 import org.apache.directory.shared.dsmlv2.DsmlControl;
 import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
@@ -54,7 +54,7 @@ import org.junit.runner.RunWith;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class SearchResultDoneTest extends AbstractResponseTest
 {
     /**

Propchange: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /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/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry:1066124-1067995,1068025-1068227

Modified: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java Tue Feb  8 00:06:34 2011
@@ -30,8 +30,8 @@ import java.io.UnsupportedEncodingExcept
 import java.util.Iterator;
 import java.util.Map;
 
-import org.apache.directory.junit.tools.Concurrent;
-import org.apache.directory.junit.tools.ConcurrentJunitRunner;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
 import org.apache.directory.shared.dsmlv2.AbstractResponseTest;
 import org.apache.directory.shared.dsmlv2.DsmlControl;
 import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
@@ -53,7 +53,7 @@ import org.junit.runner.RunWith;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class SearchResultEntryTest extends AbstractResponseTest
 {
     /**

Propchange: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /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/branches-dnfactory-experiment/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference:1066124-1067995,1068025-1068227

Modified: directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java (original)
+++ directory/shared/branches/m1/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java Tue Feb  8 00:06:34 2011
@@ -30,8 +30,8 @@ import static org.junit.Assert.fail;
 import java.util.Collection;
 import java.util.Map;
 
-import org.apache.directory.junit.tools.Concurrent;
-import org.apache.directory.junit.tools.ConcurrentJunitRunner;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
 import org.apache.directory.shared.dsmlv2.AbstractResponseTest;
 import org.apache.directory.shared.dsmlv2.DsmlControl;
 import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
@@ -51,7 +51,7 @@ import org.junit.runner.RunWith;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class SearchResultReferenceTest extends AbstractResponseTest
 {
     /**

Propchange: directory/shared/branches/m1/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /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/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest:1066124-1067995,1068025-1068227

Propchange: directory/shared/branches/m1/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /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/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest:1066124-1067995,1068025-1068227

Propchange: directory/shared/branches/m1/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse:1066124-1067995,1068025-1068227

Propchange: directory/shared/branches/m1/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest:1066124-1067995,1068025-1068227

Propchange: directory/shared/branches/m1/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse:1066124-1067995,1068025-1068227

Propchange: directory/shared/branches/m1/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest:1066124-1067995,1068025-1068227

Propchange: directory/shared/branches/m1/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse:1066124-1067995,1068025-1068227

Propchange: directory/shared/branches/m1/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest:1066124-1067995,1068025-1068227

Propchange: directory/shared/branches/m1/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareResponse:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareResponse:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareResponse:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareResponse:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareResponse:1066124-1067995,1068025-1068227

Propchange: directory/shared/branches/m1/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delRequest:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delRequest:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delRequest:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delRequest:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delRequest:1066124-1067995,1068025-1068227

Propchange: directory/shared/branches/m1/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delResponse:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delResponse:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delResponse:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delResponse:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/delResponse:1066124-1067995,1068025-1068227

Propchange: directory/shared/branches/m1/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/errorResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/errorResponse:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/errorResponse:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/errorResponse:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/errorResponse:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/errorResponse:1066124-1067995,1068025-1068227

Propchange: directory/shared/branches/m1/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedRequest:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedRequest:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedRequest:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedRequest:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedRequest:1066124-1067995,1068025-1068227

Propchange: directory/shared/branches/m1/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedResponse:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedResponse:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedResponse:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedResponse:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedResponse:1066124-1067995,1068025-1068227

Propchange: directory/shared/branches/m1/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNRequest:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNRequest:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNRequest:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNRequest:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNRequest:1066124-1067995,1068025-1068227

Propchange: directory/shared/branches/m1/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNResponse:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNResponse:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNResponse:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNResponse:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNResponse:1066124-1067995,1068025-1068227

Propchange: directory/shared/branches/m1/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyRequest:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyRequest:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyRequest:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyRequest:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyRequest:1066124-1067995,1068025-1068227

Propchange: directory/shared/branches/m1/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyResponse:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyResponse:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyResponse:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyResponse:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyResponse:1066124-1067995,1068025-1068227

Propchange: directory/shared/branches/m1/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/filters/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/filters:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/filters:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/filters:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/filters:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/filters:1066124-1067995,1068025-1068227

Propchange: directory/shared/branches/m1/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control.xml:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control.xml:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control.xml:1066124-1067995,1068025-1068227

Propchange: directory/shared/branches/m1/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_base64_value.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_base64_value.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_base64_value.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_base64_value.xml:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_base64_value.xml:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_base64_value.xml:1066124-1067995,1068025-1068227

Propchange: directory/shared/branches/m1/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_empty_value.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_empty_value.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_empty_value.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_empty_value.xml:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_empty_value.xml:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_1_control_empty_value.xml:1066124-1067995,1068025-1068227

Propchange: directory/shared/branches/m1/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_attributes_elements.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_attributes_elements.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_attributes_elements.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_attributes_elements.xml:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_attributes_elements.xml:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_attributes_elements.xml:1066124-1067995,1068025-1068227

Propchange: directory/shared/branches/m1/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_controls.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_controls.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_controls.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_controls.xml:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_controls.xml:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_controls.xml:1066124-1067995,1068025-1068227

Propchange: directory/shared/branches/m1/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_filters.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_filters.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_filters.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_filters.xml:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_filters.xml:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_2_filters.xml:1066124-1067995,1068025-1068227

Propchange: directory/shared/branches/m1/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_3_controls_without_value.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_3_controls_without_value.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_3_controls_without_value.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_3_controls_without_value.xml:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_3_controls_without_value.xml:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_3_controls_without_value.xml:1066124-1067995,1068025-1068227

Propchange: directory/shared/branches/m1/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attribute_without_name_attribute.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attribute_without_name_attribute.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attribute_without_name_attribute.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attribute_without_name_attribute.xml:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attribute_without_name_attribute.xml:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attribute_without_name_attribute.xml:1066124-1067995,1068025-1068227

Propchange: directory/shared/branches/m1/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_1_attribute.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_1_attribute.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_1_attribute.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_1_attribute.xml:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_1_attribute.xml:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_1_attribute.xml:1066124-1067995,1068025-1068227

Propchange: directory/shared/branches/m1/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_2_attribute.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_2_attribute.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_2_attribute.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_2_attribute.xml:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_2_attribute.xml:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_2_attribute.xml:1066124-1067995,1068025-1068227

Propchange: directory/shared/branches/m1/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_but_no_attribute.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_but_no_attribute.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_but_no_attribute.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_but_no_attribute.xml:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_but_no_attribute.xml:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_attributes_but_no_attribute.xml:1066124-1067995,1068025-1068227

Propchange: directory/shared/branches/m1/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefAlways.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefAlways.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefAlways.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefAlways.xml:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefAlways.xml:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefAlways.xml:1066124-1067995,1068025-1068227

Propchange: directory/shared/branches/m1/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefFindingBaseObj.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefFindingBaseObj.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefFindingBaseObj.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefFindingBaseObj.xml:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefFindingBaseObj.xml:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefFindingBaseObj.xml:1066124-1067995,1068025-1068227

Propchange: directory/shared/branches/m1/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefInSearching.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefInSearching.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefInSearching.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefInSearching.xml:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefInSearching.xml:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_derefInSearching.xml:1066124-1067995,1068025-1068227

Propchange: directory/shared/branches/m1/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_error.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_error.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_error.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_error.xml:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_error.xml:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_error.xml:1066124-1067995,1068025-1068227

Propchange: directory/shared/branches/m1/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_neverDerefAliases.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -6,4 +6,4 @@
 /directory/shared/branches/shared-subtree/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_neverDerefAliases.xml:965208-965686
 /directory/shared/branches/xdbm-refactoring/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_neverDerefAliases.xml:945830-946347
 /directory/shared/branches-dnfactory-experiment/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_neverDerefAliases.xml:980350-980351
-/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_neverDerefAliases.xml:1066124-1067995
+/directory/shared/trunk/dsml-parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_derefAliases_neverDerefAliases.xml:1066124-1067995,1068025-1068227



Mime
View raw message