directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1068231 [4/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
Modified: directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java (original)
+++ directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java Tue Feb  8 00:06:34 2011
@@ -32,8 +32,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-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.asn1.DecoderException;
 import org.apache.directory.shared.asn1.EncoderException;
 import org.apache.directory.shared.asn1.ber.Asn1Decoder;
@@ -78,7 +78,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
 {
     /** The encoder instance */

Modified: directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java (original)
+++ directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java Tue Feb  8 00:06:34 2011
@@ -27,8 +27,8 @@ import static org.junit.Assert.fail;
 import java.nio.ByteBuffer;
 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.asn1.DecoderException;
 import org.apache.directory.shared.asn1.EncoderException;
 import org.apache.directory.shared.asn1.ber.Asn1Decoder;
@@ -52,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 SearchResultDoneTest
 {
     /** The encoder instance */

Modified: directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java (original)
+++ directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultEntryTest.java Tue Feb  8 00:06:34 2011
@@ -29,8 +29,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.asn1.DecoderException;
 import org.apache.directory.shared.asn1.EncoderException;
 import org.apache.directory.shared.asn1.ber.Asn1Decoder;
@@ -55,7 +55,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
 {
     /** The encoder instance */

Modified: directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java (original)
+++ directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultReferenceTest.java Tue Feb  8 00:06:34 2011
@@ -30,8 +30,8 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-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.asn1.DecoderException;
 import org.apache.directory.shared.asn1.EncoderException;
 import org.apache.directory.shared.asn1.ber.Asn1Decoder;
@@ -55,7 +55,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
 {
     /** The encoder instance */

Modified: directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlTest.java (original)
+++ directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlTest.java Tue Feb  8 00:06:34 2011
@@ -25,8 +25,8 @@ import static org.junit.Assert.assertNul
 
 import java.nio.ByteBuffer;
 
-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.asn1.DecoderException;
 import org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService;
 import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
@@ -45,7 +45,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 EntryChangeControlTest
 {
     private LdapCodecService codec = new DefaultLdapCodecService();

Modified: directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlTest.java (original)
+++ directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlTest.java Tue Feb  8 00:06:34 2011
@@ -25,8 +25,8 @@ import static org.junit.Assert.assertTru
 
 import java.nio.ByteBuffer;
 
-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.asn1.DecoderException;
 import org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService;
 import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
@@ -44,7 +44,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 PSearchControlTest
 {
     private LdapCodecService codec = new DefaultLdapCodecService();

Modified: directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PagedSearchControlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PagedSearchControlTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PagedSearchControlTest.java (original)
+++ directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PagedSearchControlTest.java Tue Feb  8 00:06:34 2011
@@ -27,8 +27,8 @@ import static org.junit.Assert.assertTru
 import java.nio.ByteBuffer;
 import java.util.Arrays;
 
-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.asn1.DecoderException;
 import org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService;
 import org.apache.directory.shared.ldap.codec.api.LdapCodecService;
@@ -45,7 +45,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 PagedSearchControlTest
 {
     private LdapCodecService codec = new DefaultLdapCodecService();

Modified: directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlTest.java (original)
+++ directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlTest.java Tue Feb  8 00:06:34 2011
@@ -27,8 +27,8 @@ import static org.junit.Assert.fail;
 
 import java.nio.ByteBuffer;
 
-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.asn1.DecoderException;
 import org.apache.directory.shared.asn1.EncoderException;
 import org.apache.directory.shared.ldap.codec.api.DefaultLdapCodecService;
@@ -46,7 +46,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 SubEntryControlTest
 {
     private LdapCodecService codec = new DefaultLdapCodecService();

Modified: directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequestTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequestTest.java (original)
+++ directory/shared/branches/m1/ldap-codec/src/test/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequestTest.java Tue Feb  8 00:06:34 2011
@@ -27,8 +27,8 @@ import static org.junit.Assert.fail;
 import java.nio.ByteBuffer;
 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.asn1.DecoderException;
 import org.apache.directory.shared.asn1.EncoderException;
 import org.apache.directory.shared.asn1.ber.Asn1Decoder;
@@ -50,7 +50,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 UnBindRequestTest
 {
     /** The encoder instance */

Propchange: directory/shared/branches/m1/ldap-extras/codec/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -4,3 +4,4 @@
 /directory/shared/branches-dnfactory-experiment/ldap:980350-980351
 /directory/shared/trunk/ldap:1066124-1067784
 /directory/shared/trunk/ldap-codec:1067785-1067995
+/directory/shared/trunk/ldap-extras/codec:1068025-1068227

Propchange: directory/shared/branches/m1/ldap-model/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -3,4 +3,4 @@
 /directory/shared/branches/shared-dnfactory-experiment/ldap:980352-980933
 /directory/shared/branches-dnfactory-experiment/ldap:980350-980351
 /directory/shared/trunk/ldap:1066124-1067491
-/directory/shared/trunk/ldap-model:1067492-1067995
+/directory/shared/trunk/ldap-model:1067492-1067995,1068025-1068227

Modified: directory/shared/branches/m1/ldap-model/pom.xml
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/pom.xml?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/pom.xml (original)
+++ directory/shared/branches/m1/ldap-model/pom.xml Tue Feb  8 00:06:34 2011
@@ -38,6 +38,12 @@
     </dependency>
     
     <dependency>
+      <groupId>com.mycila</groupId>
+      <artifactId>mycila-junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>shared-util</artifactId>
     </dependency> 

Propchange: directory/shared/branches/m1/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:06:34 2011
@@ -7,4 +7,4 @@
 /directory/shared/branches-dnfactory-experiment/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:980350-980351
 /directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java:1066124-1067491
 /directory/shared/trunk/ldap-constants/src/main/java/org/apache/directory/shared/ldap/constants/MetaSchemaConstants.java:519076-580502
-/directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java:1067492-1067995
+/directory/shared/trunk/ldap-model/src/main/java/org/apache/directory/shared/ldap/model/constants/MetaSchemaConstants.java:1067492-1067995,1068025-1068227

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/csn/CsnFactoryTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/csn/CsnFactoryTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/csn/CsnFactoryTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/csn/CsnFactoryTest.java Tue Feb  8 00:06:34 2011
@@ -21,8 +21,8 @@
 package org.apache.directory.shared.ldap.model.csn;
 
 
-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.ldap.model.csn.Csn;
 import org.apache.directory.shared.ldap.model.csn.CsnFactory;
 import org.junit.Test;
@@ -37,7 +37,7 @@ import static org.junit.Assert.assertFal
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class CsnFactoryTest
 {
     private static final int NUM_GENERATES = 10;

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/csn/CsnTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/csn/CsnTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/csn/CsnTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/csn/CsnTest.java Tue Feb  8 00:06:34 2011
@@ -24,8 +24,8 @@ import java.text.SimpleDateFormat;
 import java.util.Arrays;
 import java.util.Date;
 
-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.ldap.model.csn.Csn;
 import org.apache.directory.shared.ldap.model.csn.InvalidCSNException;
 import org.junit.Test;
@@ -43,7 +43,7 @@ import static org.junit.Assert.fail;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class CsnTest
 {
     private SimpleDateFormat sdf = new SimpleDateFormat( "yyyyMMddHHmmss.123456'Z'" );

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/cursor/ListCursorTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/cursor/ListCursorTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/cursor/ListCursorTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/cursor/ListCursorTest.java Tue Feb  8 00:06:34 2011
@@ -23,8 +23,8 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-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.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -41,7 +41,7 @@ import static org.junit.Assert.assertEqu
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class ListCursorTest
 {
     @Test

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/entry/AttributeUtilsTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/entry/AttributeUtilsTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/entry/AttributeUtilsTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/entry/AttributeUtilsTest.java Tue Feb  8 00:06:34 2011
@@ -29,8 +29,8 @@ import static org.junit.Assert.assertTru
 import java.util.HashSet;
 import java.util.Set;
 
-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.ldap.model.exception.LdapException;
 import org.junit.Before;
 import org.junit.Test;
@@ -43,7 +43,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 AttributeUtilsTest
 {
 

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueAttributeTypeTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueAttributeTypeTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueAttributeTypeTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueAttributeTypeTest.java Tue Feb  8 00:06:34 2011
@@ -34,8 +34,8 @@ import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.util.Arrays;
 
-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.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
 import org.apache.directory.shared.ldap.model.schema.LdapSyntax;
@@ -63,7 +63,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 BinaryValueAttributeTypeTest
 {
     private LdapSyntax s;

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/entry/BinaryValueTest.java Tue Feb  8 00:06:34 2011
@@ -33,8 +33,8 @@ import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.util.Arrays;
 
-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.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.schema.Normalizer;
 import org.apache.directory.shared.ldap.model.schema.SyntaxChecker;
@@ -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 BinaryValueTest
 {
     private static final byte[] BYTES1 = new byte[]{0x01, 0x02, 0x03, 0x04};

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/entry/DefaultEntryAttributeTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/entry/DefaultEntryAttributeTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/entry/DefaultEntryAttributeTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/entry/DefaultEntryAttributeTest.java Tue Feb  8 00:06:34 2011
@@ -35,8 +35,8 @@ import java.util.Iterator;
 
 import javax.naming.directory.InvalidAttributeValueException;
 
-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.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.exception.LdapInvalidAttributeValueException;
 import org.apache.directory.shared.ldap.model.schema.syntaxCheckers.Ia5StringSyntaxChecker;
@@ -52,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 DefaultEntryAttributeTest
 {
     private static final Value<String> NULL_STRING_VALUE = new StringValue( (String)null );

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/entry/EntryTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/entry/EntryTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/entry/EntryTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/entry/EntryTest.java Tue Feb  8 00:06:34 2011
@@ -39,8 +39,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-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.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.name.Dn;
@@ -57,7 +57,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 EntryTest
 {
     private static Dn EXAMPLE_DN;

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/entry/ModificationTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/entry/ModificationTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/entry/ModificationTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/entry/ModificationTest.java Tue Feb  8 00:06:34 2011
@@ -25,8 +25,8 @@ import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 
-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.ldap.model.entry.DefaultModification;
 import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
@@ -46,7 +46,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 ModificationTest
 {
     /**

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueAttributeTypeTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueAttributeTypeTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueAttributeTypeTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueAttributeTypeTest.java Tue Feb  8 00:06:34 2011
@@ -38,8 +38,8 @@ import java.util.Comparator;
 import java.util.HashSet;
 import java.util.List;
 
-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.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.schema.AttributeType;
 import org.apache.directory.shared.ldap.model.schema.LdapComparator;
@@ -66,7 +66,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 StringValueAttributeTypeTest
 {
     private EntryUtils.S s;

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/entry/StringValueTest.java Tue Feb  8 00:06:34 2011
@@ -31,8 +31,8 @@ import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 
-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.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.schema.normalizers.DeepTrimToLowerNormalizer;
 import org.apache.directory.shared.ldap.model.schema.syntaxCheckers.Ia5StringSyntaxChecker;
@@ -46,7 +46,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 StringValueTest
 {
     //----------------------------------------------------------------------------------

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/filter/BranchNormalizedVisitorTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/filter/BranchNormalizedVisitorTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/filter/BranchNormalizedVisitorTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/filter/BranchNormalizedVisitorTest.java Tue Feb  8 00:06:34 2011
@@ -24,8 +24,8 @@ import static org.junit.Assert.assertEqu
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-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.ldap.model.filter.BranchNormalizedVisitor;
 import org.apache.directory.shared.ldap.model.filter.ExprNode;
 import org.apache.directory.shared.ldap.model.filter.FilterParser;
@@ -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 BranchNormalizedVisitorTest
 {
     @Test

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/filter/FilterCloneTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/filter/FilterCloneTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/filter/FilterCloneTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/filter/FilterCloneTest.java Tue Feb  8 00:06:34 2011
@@ -27,8 +27,8 @@ import static org.junit.Assert.assertTru
 
 import java.text.ParseException;
 
-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.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -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 FilterCloneTest
 {
     @Test

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/filter/FilterNodeEqualityTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/filter/FilterNodeEqualityTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/filter/FilterNodeEqualityTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/filter/FilterNodeEqualityTest.java Tue Feb  8 00:06:34 2011
@@ -20,8 +20,8 @@
 package org.apache.directory.shared.ldap.model.filter;
 
 
-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.ldap.model.entry.StringValue;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -36,7 +36,7 @@ import static org.junit.Assert.assertFal
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class FilterNodeEqualityTest
 {
     @Test

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/filter/FilterParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/filter/FilterParserTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/filter/FilterParserTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/filter/FilterParserTest.java Tue Feb  8 00:06:34 2011
@@ -30,8 +30,8 @@ import java.io.UnsupportedEncodingExcept
 import java.text.ParseException;
 import java.util.List;
 
-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.ldap.model.entry.StringValue;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -43,7 +43,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 FilterParserTest
 {
     private boolean checkWrongFilter( String filter )

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/filter/FilterToStringTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/filter/FilterToStringTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/filter/FilterToStringTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/filter/FilterToStringTest.java Tue Feb  8 00:06:34 2011
@@ -24,8 +24,8 @@ import static org.junit.Assert.assertEqu
 
 import java.text.ParseException;
 
-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.ldap.model.filter.ExprNode;
 import org.apache.directory.shared.ldap.model.filter.FilterParser;
 import org.junit.Test;
@@ -38,7 +38,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 FilterToStringTest
 {
     @Test

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/filter/LdapUrlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/filter/LdapUrlTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/filter/LdapUrlTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/filter/LdapUrlTest.java Tue Feb  8 00:06:34 2011
@@ -30,8 +30,8 @@ import static org.junit.Assert.fail;
 import java.util.ArrayList;
 import java.util.List;
 
-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.ldap.model.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.model.exception.LdapURLEncodingException;
 import org.apache.directory.shared.ldap.model.filter.LdapURL.Extension;
@@ -46,7 +46,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 LdapUrlTest
 {
     // ~ Methods

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/filter/SubstringNodeTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/filter/SubstringNodeTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/filter/SubstringNodeTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/filter/SubstringNodeTest.java Tue Feb  8 00:06:34 2011
@@ -20,8 +20,8 @@
 package org.apache.directory.shared.ldap.model.filter;
 
 
-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.ldap.model.filter.SubstringNode;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -37,7 +37,7 @@ import static org.junit.Assert.*;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @RunWith( ConcurrentJunitRunner.class )
-@Concurrent()
+@Concurrency()
 public class SubstringNodeTest
 {
     @Test

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/filter/UndefinedNodeTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/filter/UndefinedNodeTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/filter/UndefinedNodeTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/filter/UndefinedNodeTest.java Tue Feb  8 00:06:34 2011
@@ -27,8 +27,8 @@ import static org.junit.Assert.assertNul
 
 import java.util.List;
 
-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.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -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 UndefinedNodeTest
 {
 

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifAttributesReaderTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifAttributesReaderTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifAttributesReaderTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifAttributesReaderTest.java Tue Feb  8 00:06:34 2011
@@ -36,8 +36,8 @@ import javax.naming.NamingException;
 import javax.naming.directory.Attribute;
 import javax.naming.directory.Attributes;
 
-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.i18n.I18n;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.entry.Entry;
@@ -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 LdifAttributesReaderTest
 {
     private byte[] data;

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifReaderTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifReaderTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifReaderTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifReaderTest.java Tue Feb  8 00:06:34 2011
@@ -34,8 +34,8 @@ import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.util.List;
 
-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.i18n.I18n;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
@@ -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 LdifReaderTest
 {
     private static byte[] data;

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifRevertorTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifRevertorTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifRevertorTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifRevertorTest.java Tue Feb  8 00:06:34 2011
@@ -32,8 +32,8 @@ import java.util.List;
 import javax.naming.directory.Attributes;
 import javax.naming.directory.BasicAttributes;
 
-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.ldap.model.entry.*;
 import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.model.entry.DefaultModification;
@@ -55,7 +55,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 LdifRevertorTest
 {
     /**

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifUtilsTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifUtilsTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifUtilsTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/ldif/LdifUtilsTest.java Tue Feb  8 00:06:34 2011
@@ -20,8 +20,8 @@
 package org.apache.directory.shared.ldap.model.ldif;
 
 
-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.ldap.model.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
@@ -54,7 +54,7 @@ import static org.junit.Assert.fail;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class LdifUtilsTest
 {
     private String testString = "this is a test";

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/AbstractMessageTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/AbstractMessageTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/AbstractMessageTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/AbstractMessageTest.java Tue Feb  8 00:06:34 2011
@@ -23,8 +23,8 @@ package org.apache.directory.shared.ldap
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-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.ldap.model.message.AbstractMessage;
 import org.apache.directory.shared.ldap.model.message.MessageTypeEnum;
 import org.junit.Test;
@@ -38,7 +38,7 @@ import org.junit.runner.RunWith;
  *         $Rev: 910150 $
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class AbstractMessageTest
 {
     /**

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/AbstractResultResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/AbstractResultResponseTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/AbstractResultResponseTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/AbstractResultResponseTest.java Tue Feb  8 00:06:34 2011
@@ -23,8 +23,8 @@ package org.apache.directory.shared.ldap
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-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.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.junit.Test;
@@ -37,7 +37,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 AbstractResultResponseTest
 {
     /**

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/AddRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/AddRequestImplTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/AddRequestImplTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/AddRequestImplTest.java Tue Feb  8 00:06:34 2011
@@ -26,8 +26,8 @@ import static org.junit.Assert.assertTru
 import java.util.HashMap;
 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.ldap.model.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.model.entry.Entry;
@@ -45,7 +45,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 AddRequestImplTest
 {
     private static final Map<String, Control> EMPTY_CONTROL_MAP = new HashMap<String, Control>();

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/BindRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/BindRequestImplTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/BindRequestImplTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/BindRequestImplTest.java Tue Feb  8 00:06:34 2011
@@ -26,8 +26,8 @@ import static org.junit.Assert.assertTru
 import java.util.HashMap;
 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.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.exception.MessageException;
 import org.apache.directory.shared.ldap.model.message.Control;
@@ -43,7 +43,7 @@ import org.junit.runner.RunWith;
  *         $Rev: 923524 $
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class BindRequestImplTest
 {
     private static final Map<String, Control> EMPTY_CONTROL_MAP = new HashMap<String, Control>();

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/BindResponseImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/BindResponseImplTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/BindResponseImplTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/BindResponseImplTest.java Tue Feb  8 00:06:34 2011
@@ -20,8 +20,8 @@
 package org.apache.directory.shared.ldap.model.message;
 
 
-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.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.junit.Test;
@@ -38,7 +38,7 @@ import static org.junit.Assert.assertTru
  *         $Rev: 946353 $
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class BindResponseImplTest
 
 {

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/CompareRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/CompareRequestImplTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/CompareRequestImplTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/CompareRequestImplTest.java Tue Feb  8 00:06:34 2011
@@ -26,8 +26,8 @@ import static org.junit.Assert.assertTru
 import java.util.HashMap;
 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.ldap.model.entry.Value;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.exception.MessageException;
@@ -43,7 +43,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 CompareRequestImplTest
 {
     private static final Map<String, Control> EMPTY_CONTROL_MAP = new HashMap<String, Control>();

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/DeleteRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/DeleteRequestImplTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/DeleteRequestImplTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/DeleteRequestImplTest.java Tue Feb  8 00:06:34 2011
@@ -26,8 +26,8 @@ import static org.junit.Assert.assertTru
 import java.util.HashMap;
 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.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.exception.MessageException;
 import org.apache.directory.shared.ldap.model.name.Dn;
@@ -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 DeleteRequestImplTest
 {
     private static final Map<String, Control> EMPTY_CONTROL_MAP = new HashMap<String, Control>();

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/ExtendedRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/ExtendedRequestImplTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/ExtendedRequestImplTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/ExtendedRequestImplTest.java Tue Feb  8 00:06:34 2011
@@ -26,8 +26,8 @@ import static org.junit.Assert.assertTru
 import java.util.HashMap;
 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.ldap.model.exception.MessageException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -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 ExtendedRequestImplTest
 {
     private static final Map<String, Control> EMPTY_CONTROL_MAP = new HashMap<String, Control>();

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/ExtendedResponseImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/ExtendedResponseImplTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/ExtendedResponseImplTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/ExtendedResponseImplTest.java Tue Feb  8 00:06:34 2011
@@ -26,8 +26,8 @@ import static org.junit.Assert.assertTru
 import java.util.HashMap;
 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.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.exception.MessageException;
 import org.apache.directory.shared.ldap.model.name.Dn;
@@ -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 ExtendedResponseImplTest
 {
     private static final Map<String, Control> EMPTY_CONTROL_MAP = new HashMap<String, Control>();

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/LdapResultImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/LdapResultImplTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/LdapResultImplTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/LdapResultImplTest.java Tue Feb  8 00:06:34 2011
@@ -23,8 +23,8 @@ package org.apache.directory.shared.ldap
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-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.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.junit.Test;
@@ -38,7 +38,7 @@ import org.junit.runner.RunWith;
  *         $Rev: 946251 $
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class LdapResultImplTest
 {
     /**

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/ModifyDnRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/ModifyDnRequestImplTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/ModifyDnRequestImplTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/ModifyDnRequestImplTest.java Tue Feb  8 00:06:34 2011
@@ -26,8 +26,8 @@ import static org.junit.Assert.assertTru
 import java.util.HashMap;
 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.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.exception.MessageException;
 import org.apache.directory.shared.ldap.model.message.Control;
@@ -43,7 +43,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 ModifyDnRequestImplTest
 {
     private static final Map<String, Control> EMPTY_CONTROL_MAP = new HashMap<String, Control>();

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImplTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImplTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/ModifyRequestImplTest.java Tue Feb  8 00:06:34 2011
@@ -29,8 +29,8 @@ import java.util.HashMap;
 import java.util.List;
 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.ldap.model.exception.MessageException;
 import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.model.entry.DefaultModification;
@@ -50,7 +50,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 ModifyRequestImplTest
 {
     private static final Map<String, Control> EMPTY_CONTROL_MAP = new HashMap<String, Control>();

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/ReferralImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/ReferralImplTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/ReferralImplTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/ReferralImplTest.java Tue Feb  8 00:06:34 2011
@@ -26,8 +26,8 @@ import static org.junit.Assert.assertTru
 import java.util.Collection;
 import java.util.Collections;
 
-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.ldap.model.message.Referral;
 import org.apache.directory.shared.ldap.model.message.ReferralImpl;
 import org.junit.Test;
@@ -41,7 +41,7 @@ import org.junit.runner.RunWith;
  *         $Rev: 946251 $
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class ReferralImplTest
 {
     /**

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/SearchResponseDoneImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/SearchResponseDoneImplTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/SearchResponseDoneImplTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/SearchResponseDoneImplTest.java Tue Feb  8 00:06:34 2011
@@ -26,8 +26,8 @@ import static org.junit.Assert.assertTru
 import java.util.HashMap;
 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.ldap.model.exception.MessageException;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.name.Dn;
@@ -42,7 +42,7 @@ import org.junit.runner.RunWith;
  *         $Rev: 946251 $
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class SearchResponseDoneImplTest
 {
     private static final Map<String, Control> EMPTY_CONTROL_MAP = new HashMap<String, Control>();

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/SearchResponseReferenceImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/SearchResponseReferenceImplTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/SearchResponseReferenceImplTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/SearchResponseReferenceImplTest.java Tue Feb  8 00:06:34 2011
@@ -26,8 +26,8 @@ import static org.junit.Assert.assertTru
 import java.util.HashMap;
 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.ldap.model.exception.MessageException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -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 SearchResponseReferenceImplTest
 {
     private static final Map<String, Control> EMPTY_CONTROL_MAP = new HashMap<String, Control>();

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/SearchResultEntryImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/SearchResultEntryImplTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/SearchResultEntryImplTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/message/SearchResultEntryImplTest.java Tue Feb  8 00:06:34 2011
@@ -23,8 +23,8 @@ package org.apache.directory.shared.ldap
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 
-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.ldap.model.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.model.entry.Entry;
@@ -43,7 +43,7 @@ import org.junit.runner.RunWith;
  *         $Rev: 946251 $
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class SearchResultEntryImplTest
 {
     /**

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/name/AvaTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/name/AvaTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/name/AvaTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/name/AvaTest.java Tue Feb  8 00:06:34 2011
@@ -26,8 +26,8 @@ import java.io.IOException;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 
-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.ldap.model.exception.LdapException;
 
 import static org.junit.Assert.assertEquals;
@@ -47,7 +47,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 AvaTest
 {
     // ~ Methods

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/name/DnParserDIRSERVER_584_Test.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/name/DnParserDIRSERVER_584_Test.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/name/DnParserDIRSERVER_584_Test.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/name/DnParserDIRSERVER_584_Test.java Tue Feb  8 00:06:34 2011
@@ -22,8 +22,8 @@ package org.apache.directory.shared.ldap
 
 import java.util.ArrayList;
 
-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.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.name.DnParser;
 import org.apache.directory.shared.ldap.model.name.Rdn;
@@ -40,7 +40,7 @@ import static org.junit.Assert.fail;
  * @see <a href="https://issues.apache.org/jira/browse/DIRSERVER-584">DIRSERVER-584</a>
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class DnParserDIRSERVER_584_Test
 {
    /**

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/name/DnParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/name/DnParserTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/name/DnParserTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/name/DnParserTest.java Tue Feb  8 00:06:34 2011
@@ -20,8 +20,8 @@
 package org.apache.directory.shared.ldap.model.name;
 
 
-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.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.model.name.Dn;
@@ -42,7 +42,7 @@ import static org.junit.Assert.assertNot
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class DnParserTest
 {
     // ~ Methods

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/name/DnTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/name/DnTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/name/DnTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/name/DnTest.java Tue Feb  8 00:06:34 2011
@@ -45,8 +45,8 @@ import java.util.Map;
 import javax.naming.InvalidNameException;
 import javax.naming.ldap.LdapName;
 
-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.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.schema.normalizers.DeepTrimToLowerNormalizer;
 import org.apache.directory.shared.ldap.model.schema.normalizers.OidNormalizer;
@@ -62,7 +62,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 DnTest
 {
     private static Map<String, OidNormalizer> oids;

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/name/DnUtilsTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/name/DnUtilsTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/name/DnUtilsTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/name/DnUtilsTest.java Tue Feb  8 00:06:34 2011
@@ -22,8 +22,8 @@ package org.apache.directory.shared.ldap
 
 import static org.junit.Assert.assertEquals;
 
-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.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.model.name.Dn;
@@ -40,7 +40,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 DnUtilsTest
 {
     // ~ Methods

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/name/FastDnParserTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/name/FastDnParserTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/name/FastDnParserTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/name/FastDnParserTest.java Tue Feb  8 00:06:34 2011
@@ -20,8 +20,8 @@
 package org.apache.directory.shared.ldap.model.name;
 
 
-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.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.name.Dn;
 import org.apache.directory.shared.ldap.model.name.FastDnParser;
@@ -44,7 +44,7 @@ import static org.junit.Assert.assertNot
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class FastDnParserTest
 {
 

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/name/MultiThreadedTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/name/MultiThreadedTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/name/MultiThreadedTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/name/MultiThreadedTest.java Tue Feb  8 00:06:34 2011
@@ -26,8 +26,8 @@ import static org.junit.Assert.assertTru
 import java.util.HashMap;
 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.junit.tools.MultiThreadedMultiInvoker;
 import org.apache.directory.shared.ldap.model.exception.LdapInvalidDnException;
 import org.apache.directory.shared.ldap.model.schema.normalizers.DeepTrimToLowerNormalizer;
@@ -44,7 +44,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 MultiThreadedTest
 {
     @Rule

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/name/RdnTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/name/RdnTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/name/RdnTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/name/RdnTest.java Tue Feb  8 00:06:34 2011
@@ -33,8 +33,8 @@ import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.util.Iterator;
 
-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.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.name.Ava;
 import org.apache.directory.shared.ldap.model.name.Rdn;
@@ -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 RdnTest
 {
     // ~ Methods

Modified: directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/schema/ObjectClassTest.java
URL: http://svn.apache.org/viewvc/directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/schema/ObjectClassTest.java?rev=1068231&r1=1068230&r2=1068231&view=diff
==============================================================================
--- directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/schema/ObjectClassTest.java (original)
+++ directory/shared/branches/m1/ldap-model/src/test/java/org/apache/directory/shared/ldap/model/schema/ObjectClassTest.java Tue Feb  8 00:06:34 2011
@@ -23,8 +23,8 @@ package org.apache.directory.shared.ldap
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
 
-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.ldap.model.schema.ObjectClass;
 import org.junit.Before;
 import org.junit.Test;
@@ -36,7 +36,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 ObjectClassTest
 {
     ObjectClass objectClassA;



Mime
View raw message