directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1068236 [3/3] - in /directory/apacheds/branches/m1: ./ all/ core-annotations/ core-annotations/src/test/java/org/apache/directory/server/core/factory/ core-api/ core-api/src/main/java/org/apache/directory/server/core/ core-api/src/test/jav...
Date Tue, 08 Feb 2011 00:28:54 GMT
Modified: directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KerberosMessageDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KerberosMessageDecoderTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KerberosMessageDecoderTest.java (original)
+++ directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KerberosMessageDecoderTest.java Tue Feb  8 00:28:49 2011
@@ -26,8 +26,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.asn1.ber.Asn1Decoder;
@@ -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 KerberosMessageDecoderTest
 {
     /**

Modified: directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/MethodDataDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/MethodDataDecoderTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/MethodDataDecoderTest.java (original)
+++ directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/MethodDataDecoderTest.java Tue Feb  8 00:28:49 2011
@@ -27,8 +27,8 @@ import static org.junit.Assert.fail;
 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.asn1.EncoderException;
 import org.apache.directory.shared.asn1.ber.Asn1Container;
@@ -48,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 MethodDataDecoderTest
 {
     /**

Modified: directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PaEncTimestampDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PaEncTimestampDecoderTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PaEncTimestampDecoderTest.java (original)
+++ directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PaEncTimestampDecoderTest.java Tue Feb  8 00:28:49 2011
@@ -27,8 +27,8 @@ import static org.junit.Assert.fail;
 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.asn1.EncoderException;
 import org.apache.directory.shared.asn1.ber.Asn1Container;
@@ -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 PaEncTimestampDecoderTest
 {
     /**

Modified: directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PrincipalNameDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PrincipalNameDecoderTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PrincipalNameDecoderTest.java (original)
+++ directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PrincipalNameDecoderTest.java Tue Feb  8 00:28:49 2011
@@ -26,8 +26,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.ber.Asn1Container;
 import org.apache.directory.shared.asn1.ber.Asn1Decoder;
@@ -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 PrincipalNameDecoderTest
 {
     /**

Modified: directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TgsRepDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TgsRepDecoderTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TgsRepDecoderTest.java (original)
+++ directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TgsRepDecoderTest.java Tue Feb  8 00:28:49 2011
@@ -25,8 +25,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.asn1.ber.Asn1Container;
@@ -42,7 +42,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 TgsRepDecoderTest
 {
     /**

Modified: directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TgsReqDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TgsReqDecoderTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TgsReqDecoderTest.java (original)
+++ directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TgsReqDecoderTest.java Tue Feb  8 00:28:49 2011
@@ -26,8 +26,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.ber.Asn1Container;
 import org.apache.directory.shared.asn1.ber.Asn1Decoder;
@@ -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 TgsReqDecoderTest
 {
     /**

Modified: directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TicketDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TicketDecoderTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TicketDecoderTest.java (original)
+++ directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TicketDecoderTest.java Tue Feb  8 00:28:49 2011
@@ -28,8 +28,8 @@ import static org.junit.Assert.fail;
 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.asn1.ber.Asn1Container;
 import org.apache.directory.shared.asn1.ber.Asn1Decoder;
@@ -49,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 TicketDecoderTest
 {
     /**

Modified: directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TransitedEncodingDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TransitedEncodingDecoderTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TransitedEncodingDecoderTest.java (original)
+++ directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TransitedEncodingDecoderTest.java Tue Feb  8 00:28:49 2011
@@ -27,8 +27,8 @@ import static org.junit.Assert.fail;
 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.asn1.ber.Asn1Container;
 import org.apache.directory.shared.asn1.ber.Asn1Decoder;
@@ -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 TransitedEncodingDecoderTest
 {
     /**

Propchange: directory/apacheds/branches/m1/kerberos-test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:28:49 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/kerberos-test:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/kerberos-test:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/kerberos-test:1040956-1043765
-/directory/apacheds/trunk/kerberos-test:1066126-1067785
+/directory/apacheds/trunk/kerberos-test:1066126-1067785,1068026-1068234
 /directory/studio/trunk/kerberos-test:1067786-1067997

Propchange: directory/apacheds/branches/m1/ldif-partition/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:28:49 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/ldif-partition:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/ldif-partition:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/ldif-partition:1040956-1043765
-/directory/apacheds/trunk/ldif-partition:1066126-1067785
+/directory/apacheds/trunk/ldif-partition:1066126-1067785,1068026-1068234
 /directory/studio/trunk/ldif-partition:1067786-1067997

Modified: directory/apacheds/branches/m1/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/pom.xml?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/pom.xml (original)
+++ directory/apacheds/branches/m1/pom.xml Tue Feb  8 00:28:49 2011
@@ -67,6 +67,7 @@
     <jetty.version>6.1.14</jetty.version>
     <jug.asl.version>2.0.0.RC1</jug.asl.version>
     <junit.version>4.8.2</junit.version>
+    <mycila-junit.version>1.0.ga</mycila-junit.version>
     <ldapsdk.version>4.1</ldapsdk.version>
     <log4j.version>1.2.16</log4j.version>
     <maven.archiver.version>2.2</maven.archiver.version>
@@ -823,6 +824,12 @@
         <version>${org.apache.directory.junit.junit-addons.version}</version>
       </dependency>
 
+      <dependency>
+        <groupId>com.mycila</groupId>
+        <artifactId>mycila-junit</artifactId>
+        <version>${mycila-junit.version}</version>
+      </dependency>
+
       <!-- Logging dependencies -->
 
       <dependency>

Propchange: directory/apacheds/branches/m1/protocol-changepw/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:28:49 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/protocol-changepw:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-changepw:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-changepw:1040956-1043765
-/directory/apacheds/trunk/protocol-changepw:1066126-1067785
+/directory/apacheds/trunk/protocol-changepw:1066126-1067785,1068026-1068234
 /directory/studio/trunk/protocol-changepw:1067786-1067997

Modified: directory/apacheds/branches/m1/protocol-changepw/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/protocol-changepw/pom.xml?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/protocol-changepw/pom.xml (original)
+++ directory/apacheds/branches/m1/protocol-changepw/pom.xml Tue Feb  8 00:28:49 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>apacheds-core-api</artifactId>
     </dependency>

Propchange: directory/apacheds/branches/m1/protocol-dhcp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:28:49 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/protocol-dhcp:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-dhcp:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-dhcp:1040956-1043765
-/directory/apacheds/trunk/protocol-dhcp:1066126-1067785
+/directory/apacheds/trunk/protocol-dhcp:1066126-1067785,1068026-1068234
 /directory/studio/trunk/protocol-dhcp:1067786-1067997

Modified: directory/apacheds/branches/m1/protocol-dhcp/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/protocol-dhcp/pom.xml?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/protocol-dhcp/pom.xml (original)
+++ directory/apacheds/branches/m1/protocol-dhcp/pom.xml Tue Feb  8 00:28:49 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>apacheds-i18n</artifactId>
     </dependency>

Modified: directory/apacheds/branches/m1/protocol-dhcp/src/test/java/org/apache/directory/server/dhcp/DhcpMessageDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/protocol-dhcp/src/test/java/org/apache/directory/server/dhcp/DhcpMessageDecoderTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/protocol-dhcp/src/test/java/org/apache/directory/server/dhcp/DhcpMessageDecoderTest.java (original)
+++ directory/apacheds/branches/m1/protocol-dhcp/src/test/java/org/apache/directory/server/dhcp/DhcpMessageDecoderTest.java Tue Feb  8 00:28:49 2011
@@ -23,8 +23,8 @@ package org.apache.directory.server.dhcp
 
 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.server.dhcp.io.DhcpMessageDecoder;
 import org.apache.directory.server.dhcp.messages.DhcpMessage;
 import org.junit.Test;
@@ -35,7 +35,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 DhcpMessageDecoderTest extends AbstractDhcpTestCase
 {
     private ByteBuffer requestByteBuffer;

Propchange: directory/apacheds/branches/m1/protocol-dns/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:28:49 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/protocol-dns:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-dns:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-dns:1040956-1043765
-/directory/apacheds/trunk/protocol-dns:1066126-1067785
+/directory/apacheds/trunk/protocol-dns:1066126-1067785,1068026-1068234
 /directory/studio/trunk/protocol-dns:1067786-1067997

Propchange: directory/apacheds/branches/m1/protocol-kerberos/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:28:49 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/protocol-kerberos:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-kerberos:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-kerberos:1040956-1043765
-/directory/apacheds/trunk/protocol-kerberos:1066126-1067785
+/directory/apacheds/trunk/protocol-kerberos:1066126-1067785,1068026-1068234
 /directory/studio/trunk/protocol-kerberos:1067786-1067997

Modified: directory/apacheds/branches/m1/protocol-kerberos/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/protocol-kerberos/pom.xml?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/protocol-kerberos/pom.xml (original)
+++ directory/apacheds/branches/m1/protocol-kerberos/pom.xml Tue Feb  8 00:28:49 2011
@@ -32,12 +32,6 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.directory.junit</groupId>
-      <artifactId>junit-addons</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>apacheds-core-api</artifactId>
     </dependency>

Propchange: directory/apacheds/branches/m1/protocol-ldap/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:28:49 2011
@@ -3,5 +3,5 @@
 /directory/apacheds/branches/apacheds-config/protocol-ldap:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-ldap:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-ldap:1040956-1043765
-/directory/apacheds/trunk/protocol-ldap:1066126-1067785
+/directory/apacheds/trunk/protocol-ldap:1066126-1067785,1068026-1068234
 /directory/studio/trunk/protocol-ldap:1067786-1067997

Modified: directory/apacheds/branches/m1/protocol-ldap/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/protocol-ldap/pom.xml?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/protocol-ldap/pom.xml (original)
+++ directory/apacheds/branches/m1/protocol-ldap/pom.xml Tue Feb  8 00:28:49 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>apacheds-core</artifactId>
     </dependency>

Propchange: directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:28:49 2011
@@ -7,5 +7,5 @@
 /directory/apacheds/branches/apacheds-schema/syncrepl/src/main/java/org/apache/directory/server/syncrepl/SyncReplConsumer.java:806623-896441
 /directory/apacheds/branches/apacheds-subtree/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:965203-965686
 /directory/apacheds/branches/xdbm-refactoring/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:945827-946347
-/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:498338-580500,1066126-1067785
+/directory/apacheds/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:498338-580500,1066126-1067785,1068026-1068234
 /directory/studio/trunk/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java:1067786-1067997

Modified: directory/apacheds/branches/m1/protocol-ldap/src/test/java/org/apache/directory/server/ldap/LdapServerSettingsTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/protocol-ldap/src/test/java/org/apache/directory/server/ldap/LdapServerSettingsTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/protocol-ldap/src/test/java/org/apache/directory/server/ldap/LdapServerSettingsTest.java (original)
+++ directory/apacheds/branches/m1/protocol-ldap/src/test/java/org/apache/directory/server/ldap/LdapServerSettingsTest.java Tue Feb  8 00:28:49 2011
@@ -28,8 +28,8 @@ import static org.junit.Assert.assertEqu
 import static org.junit.Assert.assertNull;
 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.server.ldap.handlers.bind.MechanismHandler;
 import org.apache.directory.server.ldap.handlers.bind.plain.PlainMechanismHandler;
 import org.apache.directory.server.ldap.handlers.extended.StartTlsHandler;
@@ -46,7 +46,7 @@ import java.util.HashMap;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class LdapServerSettingsTest
 {
     @Test

Modified: directory/apacheds/branches/m1/protocol-ldap/src/test/java/org/apache/directory/server/ldap/SettingAlternativeHandlersTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/protocol-ldap/src/test/java/org/apache/directory/server/ldap/SettingAlternativeHandlersTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/protocol-ldap/src/test/java/org/apache/directory/server/ldap/SettingAlternativeHandlersTest.java (original)
+++ directory/apacheds/branches/m1/protocol-ldap/src/test/java/org/apache/directory/server/ldap/SettingAlternativeHandlersTest.java Tue Feb  8 00:28:49 2011
@@ -22,8 +22,8 @@ package org.apache.directory.server.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.server.core.DirectoryService;
 import org.apache.directory.server.ldap.handlers.AbandonHandler;
 import org.apache.directory.server.ldap.handlers.AddHandler;
@@ -49,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 SettingAlternativeHandlersTest
 {
     /**

Propchange: directory/apacheds/branches/m1/protocol-ntp/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:28:49 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/protocol-ntp:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-ntp:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-ntp:1040956-1043765
-/directory/apacheds/trunk/protocol-ntp:1066126-1067785
+/directory/apacheds/trunk/protocol-ntp:1066126-1067785,1068026-1068234
 /directory/studio/trunk/protocol-ntp:1067786-1067997

Propchange: directory/apacheds/branches/m1/protocol-shared/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:28:49 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/protocol-shared:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/protocol-shared:980138-980936
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/protocol-shared:1040956-1043765
-/directory/apacheds/trunk/protocol-shared:1066126-1067785
+/directory/apacheds/trunk/protocol-shared:1066126-1067785,1068026-1068234
 /directory/studio/trunk/protocol-shared:1067786-1067997

Propchange: directory/apacheds/branches/m1/server-annotations/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:28:49 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/server-annotations:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/server-annotations:980138-980937
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-annotations:1040956-1043765
-/directory/apacheds/trunk/server-annotations:1066126-1067785
+/directory/apacheds/trunk/server-annotations:1066126-1067785,1068026-1068234
 /directory/studio/trunk/server-annotations:1067786-1067997

Propchange: directory/apacheds/branches/m1/server-config/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:28:49 2011
@@ -4,5 +4,5 @@
 /directory/apacheds/branches/apacheds-dnfactory-experiment/server-config:980138-980938
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-config:1040956-1043765
 /directory/apacheds/branches/server-config-annotations/server-config:1042727-1043868
-/directory/apacheds/trunk/server-config:1066126-1067785
+/directory/apacheds/trunk/server-config:1066126-1067785,1068026-1068234
 /directory/studio/trunk/server-config:1067786-1067997

Modified: directory/apacheds/branches/m1/server-config/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/server-config/pom.xml?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/server-config/pom.xml (original)
+++ directory/apacheds/branches/m1/server-config/pom.xml Tue Feb  8 00:28:49 2011
@@ -81,5 +81,10 @@
       <scope>test</scope>
     </dependency>
     
+    <dependency>
+      <groupId>com.mycila</groupId>
+      <artifactId>mycila-junit</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 </project>

Propchange: directory/apacheds/branches/m1/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:28:49 2011
@@ -8,5 +8,5 @@
 /directory/apacheds/branches/apacheds-subtree/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:965203-965686
 /directory/apacheds/branches/server-config-annotations/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1042727-1043868
 /directory/apacheds/branches/xdbm-refactoring/default-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:945827-946347
-/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1066126-1067785
+/directory/apacheds/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1066126-1067785,1068026-1068234
 /directory/studio/trunk/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java:1067786-1067997

Propchange: directory/apacheds/branches/m1/server-config/src/main/resources/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:28:49 2011
@@ -11,5 +11,5 @@
 /directory/apacheds/branches/apacheds-subtree/server-config/src/main/resources:965203-965686
 /directory/apacheds/branches/server-config-annotations/server-config/src/main/resources:1042727-1043868
 /directory/apacheds/branches/xdbm-refactoring/default-config/src/main/resources:945827-946347
-/directory/apacheds/trunk/server-config/src/main/resources:1066126-1067785
+/directory/apacheds/trunk/server-config/src/main/resources:1066126-1067785,1068026-1068234
 /directory/studio/trunk/server-config/src/main/resources:1067786-1067997

Modified: directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/ChangePasswordConfigReaderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/ChangePasswordConfigReaderTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/ChangePasswordConfigReaderTest.java (original)
+++ directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/ChangePasswordConfigReaderTest.java Tue Feb  8 00:28:49 2011
@@ -27,8 +27,8 @@ import java.io.File;
 import java.util.List;
 
 import org.apache.commons.io.FileUtils;
-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.server.config.beans.ChangePasswordServerBean;
 import org.apache.directory.server.config.beans.ConfigBean;
 import org.apache.directory.server.core.partition.ldif.SingleFileLdifPartition;
@@ -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 ChangePasswordConfigReaderTest
 {
     private static File workDir;

Modified: directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java (original)
+++ directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java Tue Feb  8 00:28:49 2011
@@ -27,8 +27,8 @@ import java.io.File;
 import java.util.List;
 
 import org.apache.commons.io.FileUtils;
-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.server.config.beans.ConfigBean;
 import org.apache.directory.server.config.beans.DirectoryServiceBean;
 import org.apache.directory.server.core.partition.ldif.SingleFileLdifPartition;
@@ -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 ConfigPartitionReaderTest
 {
     private static SchemaManager schemaManager;

Propchange: directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:28:49 2011
@@ -10,5 +10,5 @@
 /directory/apacheds/branches/cidit/default-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:900288-900681
 /directory/apacheds/branches/server-config-annotations/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1042727-1043868
 /directory/apacheds/branches/xdbm-refactoring/default-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:945827-946347
-/directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1066126-1067785
+/directory/apacheds/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1066126-1067785,1068026-1068234
 /directory/studio/trunk/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java:1067786-1067997

Modified: directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/ConfigWriterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/ConfigWriterTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/ConfigWriterTest.java (original)
+++ directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/ConfigWriterTest.java Tue Feb  8 00:28:49 2011
@@ -32,8 +32,8 @@ import java.util.Comparator;
 import java.util.List;
 
 import org.apache.commons.io.FileUtils;
-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.server.config.beans.ConfigBean;
 import org.apache.directory.server.core.partition.ldif.SingleFileLdifPartition;
 import org.apache.directory.shared.ldap.model.entry.Entry;
@@ -58,7 +58,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 ConfigWriterTest
 {
     private static SchemaManager schemaManager;

Modified: directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/DhcpServerConfigReaderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/DhcpServerConfigReaderTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/DhcpServerConfigReaderTest.java (original)
+++ directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/DhcpServerConfigReaderTest.java Tue Feb  8 00:28:49 2011
@@ -27,8 +27,8 @@ import java.io.File;
 import java.util.List;
 
 import org.apache.commons.io.FileUtils;
-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.server.config.beans.ConfigBean;
 import org.apache.directory.server.config.beans.DhcpServerBean;
 import org.apache.directory.server.core.partition.ldif.SingleFileLdifPartition;
@@ -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 DhcpServerConfigReaderTest
 {
 

Modified: directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/DnsServerConfigReaderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/DnsServerConfigReaderTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/DnsServerConfigReaderTest.java (original)
+++ directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/DnsServerConfigReaderTest.java Tue Feb  8 00:28:49 2011
@@ -27,8 +27,8 @@ import java.io.File;
 import java.util.List;
 
 import org.apache.commons.io.FileUtils;
-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.server.config.beans.ConfigBean;
 import org.apache.directory.server.config.beans.DnsServerBean;
 import org.apache.directory.server.core.partition.ldif.SingleFileLdifPartition;
@@ -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 DnsServerConfigReaderTest
 {
     private static SchemaManager schemaManager;

Modified: directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/HttpServerConfigReaderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/HttpServerConfigReaderTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/HttpServerConfigReaderTest.java (original)
+++ directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/HttpServerConfigReaderTest.java Tue Feb  8 00:28:49 2011
@@ -27,8 +27,8 @@ import java.io.File;
 import java.util.List;
 
 import org.apache.commons.io.FileUtils;
-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.server.config.beans.ConfigBean;
 import org.apache.directory.server.config.beans.HttpServerBean;
 import org.apache.directory.server.core.partition.ldif.SingleFileLdifPartition;
@@ -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 HttpServerConfigReaderTest
 {
     private static SchemaManager schemaManager;

Modified: directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/KerberosServerConfigReaderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/KerberosServerConfigReaderTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/KerberosServerConfigReaderTest.java (original)
+++ directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/KerberosServerConfigReaderTest.java Tue Feb  8 00:28:49 2011
@@ -27,8 +27,8 @@ import java.io.File;
 import java.util.List;
 
 import org.apache.commons.io.FileUtils;
-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.server.config.beans.ConfigBean;
 import org.apache.directory.server.config.beans.KdcServerBean;
 import org.apache.directory.server.core.partition.ldif.SingleFileLdifPartition;
@@ -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 KerberosServerConfigReaderTest
 {
     private static File workDir = new File( System.getProperty( "java.io.tmpdir" ) + "/server-work" );

Modified: directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/LdapServerConfigReaderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/LdapServerConfigReaderTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/LdapServerConfigReaderTest.java (original)
+++ directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/LdapServerConfigReaderTest.java Tue Feb  8 00:28:49 2011
@@ -27,8 +27,8 @@ import java.io.File;
 import java.util.List;
 
 import org.apache.commons.io.FileUtils;
-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.server.config.beans.ConfigBean;
 import org.apache.directory.server.config.beans.LdapServerBean;
 import org.apache.directory.server.core.partition.ldif.SingleFileLdifPartition;
@@ -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 LdapServerConfigReaderTest
 {
     private static File workDir = new File( System.getProperty( "java.io.tmpdir" ) + "/server-work" );

Modified: directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/NtpServerConfigReaderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/NtpServerConfigReaderTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/NtpServerConfigReaderTest.java (original)
+++ directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/NtpServerConfigReaderTest.java Tue Feb  8 00:28:49 2011
@@ -27,8 +27,8 @@ import java.io.File;
 import java.util.List;
 
 import org.apache.commons.io.FileUtils;
-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.server.config.beans.ConfigBean;
 import org.apache.directory.server.config.beans.NtpServerBean;
 import org.apache.directory.server.core.partition.ldif.SingleFileLdifPartition;
@@ -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 NtpServerConfigReaderTest
 {
     private static SchemaManager schemaManager;

Propchange: directory/apacheds/branches/m1/server-integ/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:28:49 2011
@@ -3,5 +3,5 @@
 /directory/apacheds/branches/apacheds-config/server-integ:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/server-integ:980138-980937
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-integ:1040956-1043765
-/directory/apacheds/trunk/server-integ:1066126-1067785
+/directory/apacheds/trunk/server-integ:1066126-1067785,1068026-1068234
 /directory/studio/trunk/server-integ:1067786-1067997

Propchange: directory/apacheds/branches/m1/server-jndi/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:28:49 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/server-jndi:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/server-jndi:980138-980937
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-jndi:1040956-1043765
-/directory/apacheds/trunk/server-jndi:1066126-1067785
+/directory/apacheds/trunk/server-jndi:1066126-1067785,1068026-1068234
 /directory/studio/trunk/server-jndi:1067786-1067997

Propchange: directory/apacheds/branches/m1/server-replication/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:28:49 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/server-replication:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/server-replication:980138-980937
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-replication:1040956-1043765
-/directory/apacheds/trunk/server-replication:1066126-1067785
+/directory/apacheds/trunk/server-replication:1066126-1067785,1068026-1068234
 /directory/studio/trunk/server-replication:1067786-1067997

Propchange: directory/apacheds/branches/m1/server-tools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:28:49 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/server-tools:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/server-tools:980138-980937
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/server-tools:1040956-1043765
-/directory/apacheds/trunk/server-tools:1066126-1067785
+/directory/apacheds/trunk/server-tools:1066126-1067785,1068026-1068234
 /directory/studio/trunk/server-tools:1067786-1067997

Propchange: directory/apacheds/branches/m1/service-builder/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:28:49 2011
@@ -1,3 +1,3 @@
 /directory/apacheds/branches/antoine/service-builder:1038305-1044163
-/directory/apacheds/trunk/service-builder:1066126-1067785
+/directory/apacheds/trunk/service-builder:1066126-1067785,1068026-1068234
 /directory/studio/trunk/service-builder:1067786-1067997

Modified: directory/apacheds/branches/m1/service-builder/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/service-builder/pom.xml?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/service-builder/pom.xml (original)
+++ directory/apacheds/branches/m1/service-builder/pom.xml Tue Feb  8 00:28:49 2011
@@ -30,12 +30,6 @@
 
   <dependencies>
     <dependency>
-      <groupId>org.apache.directory.junit</groupId>
-      <artifactId>junit-addons</artifactId>
-      <scope>test</scope>
-    </dependency>
-
-    <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>apacheds-core</artifactId>
     </dependency>

Propchange: directory/apacheds/branches/m1/test-framework/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:28:49 2011
@@ -8,5 +8,5 @@
 /directory/apacheds/branches/apacheds-schema/test-framework:806623-893782
 /directory/apacheds/branches/apacheds-subtree/test-framework:965203-965686
 /directory/apacheds/branches/xdbm-refactoring/test-framework:945827-946347
-/directory/apacheds/trunk/test-framework:1066126-1067785
+/directory/apacheds/trunk/test-framework:1066126-1067785,1068026-1068234
 /directory/studio/trunk/test-framework:1067786-1067997

Propchange: directory/apacheds/branches/m1/xdbm-partition/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:28:49 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/xdbm-partition:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/xdbm-partition:980138-980938
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/xdbm-partition:1040956-1043765
-/directory/apacheds/trunk/xdbm-partition:1066126-1067785
+/directory/apacheds/trunk/xdbm-partition:1066126-1067785,1068026-1068234
 /directory/studio/trunk/xdbm-partition:1067786-1067997

Modified: directory/apacheds/branches/m1/xdbm-partition/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/xdbm-partition/pom.xml?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/xdbm-partition/pom.xml (original)
+++ directory/apacheds/branches/m1/xdbm-partition/pom.xml Tue Feb  8 00:28:49 2011
@@ -37,6 +37,12 @@
     </dependency>
 
     <dependency>
+      <groupId>com.mycila</groupId>
+      <artifactId>mycila-junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>apacheds-core-avl</artifactId>
     </dependency>

Modified: directory/apacheds/branches/m1/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlTableTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlTableTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlTableTest.java (original)
+++ directory/apacheds/branches/m1/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlTableTest.java Tue Feb  8 00:28:49 2011
@@ -29,8 +29,8 @@ import static org.junit.Assert.assertTru
 
 import java.util.Comparator;
 
-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.cursor.Cursor;
 import org.apache.directory.shared.ldap.model.cursor.Tuple;
 import org.junit.Before;
@@ -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 AvlTableTest
 {
     private AvlTable<Integer,Integer> dups;

Propchange: directory/apacheds/branches/m1/xdbm-tools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:28:49 2011
@@ -2,5 +2,5 @@
 /directory/apacheds/branches/apacheds-config/xdbm-tools:1023442-1029077
 /directory/apacheds/branches/apacheds-dnfactory-experiment/xdbm-tools:980138-980938
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/xdbm-tools:1040956-1043765
-/directory/apacheds/trunk/xdbm-tools:1066126-1067785
+/directory/apacheds/trunk/xdbm-tools:1066126-1067785,1068026-1068234
 /directory/studio/trunk/xdbm-tools:1067786-1067997



Mime
View raw message