directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1068236 [1/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
Author: akarasulu
Date: Tue Feb  8 00:28:49 2011
New Revision: 1068236

URL: http://svn.apache.org/viewvc?rev=1068236&view=rev
Log:
merging iin changes from trunk

Modified:
    directory/apacheds/branches/m1/   (props changed)
    directory/apacheds/branches/m1/all/   (props changed)
    directory/apacheds/branches/m1/core/   (props changed)
    directory/apacheds/branches/m1/core-annotations/   (props changed)
    directory/apacheds/branches/m1/core-annotations/pom.xml
    directory/apacheds/branches/m1/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceFactoryTest.java
    directory/apacheds/branches/m1/core-api/   (props changed)
    directory/apacheds/branches/m1/core-api/pom.xml
    directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/PasswordPolicyConfiguration.java   (props changed)
    directory/apacheds/branches/m1/core-api/src/test/java/org/apache/directory/server/core/changelog/TagTest.java
    directory/apacheds/branches/m1/core-api/src/test/java/org/apache/directory/server/core/entry/ClonedServerEntryTest.java
    directory/apacheds/branches/m1/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryAttributeTest.java
    directory/apacheds/branches/m1/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.java
    directory/apacheds/branches/m1/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareModificationTest.java
    directory/apacheds/branches/m1/core-avl/   (props changed)
    directory/apacheds/branches/m1/core-avl/pom.xml
    directory/apacheds/branches/m1/core-avl/src/test/java/org/apache/directory/server/core/avltree/ArrayTreeCursorTest.java
    directory/apacheds/branches/m1/core-avl/src/test/java/org/apache/directory/server/core/avltree/ArrayTreeTest.java
    directory/apacheds/branches/m1/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeCursorTest.java
    directory/apacheds/branches/m1/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMapTest.java
    directory/apacheds/branches/m1/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMarshallerTest.java
    directory/apacheds/branches/m1/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeTest.java
    directory/apacheds/branches/m1/core-avl/src/test/java/org/apache/directory/server/core/avltree/DefaultMarshallerTest.java
    directory/apacheds/branches/m1/core-constants/   (props changed)
    directory/apacheds/branches/m1/core-integ/   (props changed)
    directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java   (props changed)
    directory/apacheds/branches/m1/core-jndi/   (props changed)
    directory/apacheds/branches/m1/core-jndi/pom.xml
    directory/apacheds/branches/m1/core-jndi/src/test/java/org/apache/directory/server/core/jndi/LdapJndiPropertiesTest.java
    directory/apacheds/branches/m1/core/pom.xml
    directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authn/LdapPrincipalTest.java
    directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticatorOneWayEncryptedTest.java
    directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilterTest.java
    directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
    directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java
    directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/MicroOperationFilterTest.java
    directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java
    directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilterTest.java
    directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/OperationScopeTest.java
    directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java
    directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java
    directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java
    directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java
    directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/normalization/NormalizationVisitorTest.java
    directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/prefs/PreferencesUtilsTest.java
    directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java
    directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java
    directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/sp/StoredProcUtilsTest.java
    directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java
    directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java
    directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java
    directory/apacheds/branches/m1/http-integration/   (props changed)
    directory/apacheds/branches/m1/i18n/   (props changed)
    directory/apacheds/branches/m1/i18n/pom.xml
    directory/apacheds/branches/m1/installers/   (props changed)
    directory/apacheds/branches/m1/installers-maven-plugin/   (props changed)
    directory/apacheds/branches/m1/interceptor-kerberos/   (props changed)
    directory/apacheds/branches/m1/jdbm/   (props changed)
    directory/apacheds/branches/m1/jdbm-partition/   (props changed)
    directory/apacheds/branches/m1/jdbm-partition/pom.xml
    directory/apacheds/branches/m1/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/BTreeRedirectMarshallerTest.java
    directory/apacheds/branches/m1/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/KeyTupleArrayCursorTest.java
    directory/apacheds/branches/m1/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/ServerEntrySerializerTest.java
    directory/apacheds/branches/m1/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/StringSerializerTest.java
    directory/apacheds/branches/m1/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/   (props changed)
    directory/apacheds/branches/m1/jdbm-partition/src/test/java/org/apache/directory/server/core/partition/tree/PartitionTreeTest.java   (props changed)
    directory/apacheds/branches/m1/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/   (props changed)
    directory/apacheds/branches/m1/jdbm-partition/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java   (props changed)
    directory/apacheds/branches/m1/jdbm/pom.xml
    directory/apacheds/branches/m1/jdbm/src/test/java/jdbm/btree/TestBTree.java
    directory/apacheds/branches/m1/jdbm/src/test/java/jdbm/recman/LocationTest.java
    directory/apacheds/branches/m1/kerberos-codec/pom.xml
    directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/server/   (props changed)
    directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/server/kerberos/protocol/KerberosProtocolCodecFactory.java   (props changed)
    directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/PaDataType.java   (props changed)
    directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/codec/types/SamType.java   (props changed)
    directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/Checksum.java   (props changed)
    directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/EncryptionKey.java   (props changed)
    directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/components/PaData.java   (props changed)
    directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/crypto/checksum/ChecksumType.java   (props changed)
    directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/flags/   (props changed)
    directory/apacheds/branches/m1/kerberos-codec/src/main/java/org/apache/directory/shared/kerberos/messages/KrbError.java   (props changed)
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/server/   (props changed)
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/KerberosUtilsTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/AesEncryptionTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/CipherTextHandlerTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/Des3CbcSha1KdEncryptionTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/DesCbcCrcEncryptionTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/DesCbcMd5EncryptionTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/DesStringToKeyTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/KerberosKeyFactoryTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/KeyTypeTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/NFoldTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/crypto/encryption/RandomKeyFactoryTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/keytab/KeytabTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/components/TicketTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/value/AuthorizationDataTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/value/ChecksumTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptedDataTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/value/EncryptionKeyTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/value/KdcOptionsTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/value/PaDataTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/value/PrincipalNameTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/value/flags/AbstractKerberosFlagsTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/messages/value/flags/TicketFlagsTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/server/kerberos/shared/replay/ReplayCacheImplTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AdKdcIssuedDecoderTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ApRepDecoderTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ApReqDecoderTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AsRepDecoderTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AsReqDecoderTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/AuthenticatorDecoderTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ETypeInfo2DecoderTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/ETypeInfoDecoderTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncApRepPartDecoderTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncAsRepPartDecoderTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncTgsRepPartDecoderTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/EncryptedDataDecoderTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/HostAddressDecoderTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/HostAddressesDecoderTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KdcRepDecoderTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KdcReqBodyDecoderTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KdcReqDecoderTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/KerberosMessageDecoderTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/MethodDataDecoderTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PaEncTimestampDecoderTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/PrincipalNameDecoderTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TgsRepDecoderTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TgsReqDecoderTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TicketDecoderTest.java
    directory/apacheds/branches/m1/kerberos-codec/src/test/java/org/apache/directory/shared/kerberos/codec/TransitedEncodingDecoderTest.java
    directory/apacheds/branches/m1/kerberos-test/   (props changed)
    directory/apacheds/branches/m1/ldif-partition/   (props changed)
    directory/apacheds/branches/m1/pom.xml
    directory/apacheds/branches/m1/protocol-changepw/   (props changed)
    directory/apacheds/branches/m1/protocol-changepw/pom.xml
    directory/apacheds/branches/m1/protocol-dhcp/   (props changed)
    directory/apacheds/branches/m1/protocol-dhcp/pom.xml
    directory/apacheds/branches/m1/protocol-dhcp/src/test/java/org/apache/directory/server/dhcp/DhcpMessageDecoderTest.java
    directory/apacheds/branches/m1/protocol-dns/   (props changed)
    directory/apacheds/branches/m1/protocol-kerberos/   (props changed)
    directory/apacheds/branches/m1/protocol-kerberos/pom.xml
    directory/apacheds/branches/m1/protocol-ldap/   (props changed)
    directory/apacheds/branches/m1/protocol-ldap/pom.xml
    directory/apacheds/branches/m1/protocol-ldap/src/main/java/org/apache/directory/server/ldap/replication/SyncReplConsumer.java   (props changed)
    directory/apacheds/branches/m1/protocol-ldap/src/test/java/org/apache/directory/server/ldap/LdapServerSettingsTest.java
    directory/apacheds/branches/m1/protocol-ldap/src/test/java/org/apache/directory/server/ldap/SettingAlternativeHandlersTest.java
    directory/apacheds/branches/m1/protocol-ntp/   (props changed)
    directory/apacheds/branches/m1/protocol-shared/   (props changed)
    directory/apacheds/branches/m1/server-annotations/   (props changed)
    directory/apacheds/branches/m1/server-config/   (props changed)
    directory/apacheds/branches/m1/server-config/pom.xml
    directory/apacheds/branches/m1/server-config/src/main/java/org/apache/directory/server/config/ConfigPartitionReader.java   (props changed)
    directory/apacheds/branches/m1/server-config/src/main/resources/   (props changed)
    directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/ChangePasswordConfigReaderTest.java
    directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/ConfigPartitionReaderTest.java   (contents, props changed)
    directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/ConfigWriterTest.java
    directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/DhcpServerConfigReaderTest.java
    directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/DnsServerConfigReaderTest.java
    directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/HttpServerConfigReaderTest.java
    directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/KerberosServerConfigReaderTest.java
    directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/LdapServerConfigReaderTest.java
    directory/apacheds/branches/m1/server-config/src/test/java/org/apache/directory/server/config/NtpServerConfigReaderTest.java
    directory/apacheds/branches/m1/server-integ/   (props changed)
    directory/apacheds/branches/m1/server-jndi/   (props changed)
    directory/apacheds/branches/m1/server-replication/   (props changed)
    directory/apacheds/branches/m1/server-tools/   (props changed)
    directory/apacheds/branches/m1/service-builder/   (props changed)
    directory/apacheds/branches/m1/service-builder/pom.xml
    directory/apacheds/branches/m1/test-framework/   (props changed)
    directory/apacheds/branches/m1/xdbm-partition/   (props changed)
    directory/apacheds/branches/m1/xdbm-partition/pom.xml
    directory/apacheds/branches/m1/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlTableTest.java
    directory/apacheds/branches/m1/xdbm-tools/   (props changed)

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

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

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

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

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

Modified: directory/apacheds/branches/m1/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceFactoryTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceFactoryTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceFactoryTest.java (original)
+++ directory/apacheds/branches/m1/core-annotations/src/test/java/org/apache/directory/server/core/factory/DirectoryServiceFactoryTest.java Tue Feb  8 00:28:49 2011
@@ -23,8 +23,8 @@ package org.apache.directory.server.core
 import static org.junit.Assert.assertTrue;
 
 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.core.DirectoryService;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -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 DirectoryServiceFactoryTest
 {
     @Test

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

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

Propchange: directory/apacheds/branches/m1/core-api/src/main/java/org/apache/directory/server/core/PasswordPolicyConfiguration.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:28:49 2011
@@ -6,5 +6,5 @@
 /directory/apacheds/branches/apacheds-schema/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyConfiguration.java:806623-896441
 /directory/apacheds/branches/apacheds-subtree/core/src/main/java/org/apache/directory/server/core/authn/PasswordPolicyConfiguration.java:965203-965686
 /directory/apacheds/branches/xdbm-refactoring/interceptor-kerberos/src/main/java/org/apache/directory/server/core/kerberos/PasswordPolicyConfiguration.java:945827-946347
-/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/PasswordPolicyConfiguration.java:1066126-1067785
+/directory/apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/PasswordPolicyConfiguration.java:1066126-1067785,1068026-1068234
 /directory/studio/trunk/core-api/src/main/java/org/apache/directory/server/core/PasswordPolicyConfiguration.java:1067786-1067997

Modified: directory/apacheds/branches/m1/core-api/src/test/java/org/apache/directory/server/core/changelog/TagTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-api/src/test/java/org/apache/directory/server/core/changelog/TagTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-api/src/test/java/org/apache/directory/server/core/changelog/TagTest.java (original)
+++ directory/apacheds/branches/m1/core-api/src/test/java/org/apache/directory/server/core/changelog/TagTest.java Tue Feb  8 00:28:49 2011
@@ -23,8 +23,8 @@ package org.apache.directory.server.core
 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.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -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 TagTest
 {
     private static Tag tagA;

Modified: directory/apacheds/branches/m1/core-api/src/test/java/org/apache/directory/server/core/entry/ClonedServerEntryTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-api/src/test/java/org/apache/directory/server/core/entry/ClonedServerEntryTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-api/src/test/java/org/apache/directory/server/core/entry/ClonedServerEntryTest.java (original)
+++ directory/apacheds/branches/m1/core-api/src/test/java/org/apache/directory/server/core/entry/ClonedServerEntryTest.java Tue Feb  8 00:28:49 2011
@@ -23,8 +23,8 @@ package org.apache.directory.server.core
 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.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.model.entry.Entry;
 import org.apache.directory.shared.ldap.model.name.Dn;
@@ -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 ClonedServerEntryTest
 {
     private static ClonedServerEntry clonedServerEntryA;

Modified: directory/apacheds/branches/m1/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryAttributeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryAttributeTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryAttributeTest.java (original)
+++ directory/apacheds/branches/m1/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryAttributeTest.java Tue Feb  8 00:28:49 2011
@@ -42,8 +42,8 @@ import java.util.Set;
 import javax.naming.directory.InvalidAttributeValueException;
 
 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.shared.ldap.model.entry.BinaryValue;
 import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
@@ -71,7 +71,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 SchemaAwareEntryAttributeTest
 {
     private static LdifSchemaLoader loader;

Modified: directory/apacheds/branches/m1/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.java (original)
+++ directory/apacheds/branches/m1/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareEntryTest.java Tue Feb  8 00:28:49 2011
@@ -40,8 +40,8 @@ import javax.naming.NamingEnumeration;
 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.constants.SchemaConstants;
 import org.apache.directory.shared.ldap.model.entry.BinaryValue;
 import org.apache.directory.shared.ldap.model.entry.DefaultEntry;
@@ -73,7 +73,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 SchemaAwareEntryTest
 {
     private static final byte[] BYTES1 = new byte[]

Modified: directory/apacheds/branches/m1/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareModificationTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareModificationTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareModificationTest.java (original)
+++ directory/apacheds/branches/m1/core-api/src/test/java/org/apache/directory/server/core/entry/SchemaAwareModificationTest.java Tue Feb  8 00:28:49 2011
@@ -34,8 +34,8 @@ import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 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.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.model.entry.Modification;
@@ -60,7 +60,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 SchemaAwareModificationTest
 {
     private static LdifSchemaLoader loader;

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

Modified: directory/apacheds/branches/m1/core-avl/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-avl/pom.xml?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-avl/pom.xml (original)
+++ directory/apacheds/branches/m1/core-avl/pom.xml Tue Feb  8 00:28:49 2011
@@ -36,6 +36,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/core-avl/src/test/java/org/apache/directory/server/core/avltree/ArrayTreeCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-avl/src/test/java/org/apache/directory/server/core/avltree/ArrayTreeCursorTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-avl/src/test/java/org/apache/directory/server/core/avltree/ArrayTreeCursorTest.java (original)
+++ directory/apacheds/branches/m1/core-avl/src/test/java/org/apache/directory/server/core/avltree/ArrayTreeCursorTest.java Tue Feb  8 00:28:49 2011
@@ -22,8 +22,8 @@ package org.apache.directory.server.core
 
 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.InvalidCursorPositionException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -41,7 +41,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 ArrayTreeCursorTest
 {
     @Test

Modified: directory/apacheds/branches/m1/core-avl/src/test/java/org/apache/directory/server/core/avltree/ArrayTreeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-avl/src/test/java/org/apache/directory/server/core/avltree/ArrayTreeTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-avl/src/test/java/org/apache/directory/server/core/avltree/ArrayTreeTest.java (original)
+++ directory/apacheds/branches/m1/core-avl/src/test/java/org/apache/directory/server/core/avltree/ArrayTreeTest.java Tue Feb  8 00:28:49 2011
@@ -30,8 +30,8 @@ import static org.junit.Assert.fail;
 
 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.junit.Test;
 import org.junit.runner.RunWith;
 import org.slf4j.Logger;
@@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class ArrayTreeTest
 {
     private static final Integer MINUS_ONE      = Integer.valueOf( -1 );

Modified: directory/apacheds/branches/m1/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeCursorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeCursorTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeCursorTest.java (original)
+++ directory/apacheds/branches/m1/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeCursorTest.java Tue Feb  8 00:28:49 2011
@@ -22,8 +22,8 @@ package org.apache.directory.server.core
 
 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.InvalidCursorPositionException;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -41,7 +41,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 AvlTreeCursorTest
 {
     @Test

Modified: directory/apacheds/branches/m1/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMapTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMapTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMapTest.java (original)
+++ directory/apacheds/branches/m1/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMapTest.java Tue Feb  8 00:28:49 2011
@@ -30,8 +30,8 @@ import java.util.ArrayList;
 import java.util.Comparator;
 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;
 import org.slf4j.Logger;
@@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class AvlTreeMapTest
 {
 

Modified: directory/apacheds/branches/m1/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMarshallerTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMarshallerTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMarshallerTest.java (original)
+++ directory/apacheds/branches/m1/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeMarshallerTest.java Tue Feb  8 00:28:49 2011
@@ -33,8 +33,8 @@ import java.io.IOException;
 import java.io.Serializable;
 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.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
@@ -49,7 +49,7 @@ import org.slf4j.LoggerFactory;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class AvlTreeMarshallerTest
 {
     private static final long[] AVLTREE_KEYS_PRE_REMOVE =

Modified: directory/apacheds/branches/m1/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeTest.java (original)
+++ directory/apacheds/branches/m1/core-avl/src/test/java/org/apache/directory/server/core/avltree/AvlTreeTest.java Tue Feb  8 00:28:49 2011
@@ -29,8 +29,8 @@ import java.util.ArrayList;
 import java.util.Comparator;
 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;
 import org.slf4j.Logger;
@@ -42,7 +42,7 @@ import org.slf4j.LoggerFactory;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class AvlTreeTest
 {
 

Modified: directory/apacheds/branches/m1/core-avl/src/test/java/org/apache/directory/server/core/avltree/DefaultMarshallerTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-avl/src/test/java/org/apache/directory/server/core/avltree/DefaultMarshallerTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-avl/src/test/java/org/apache/directory/server/core/avltree/DefaultMarshallerTest.java (original)
+++ directory/apacheds/branches/m1/core-avl/src/test/java/org/apache/directory/server/core/avltree/DefaultMarshallerTest.java Tue Feb  8 00:28:49 2011
@@ -21,8 +21,8 @@ package org.apache.directory.server.core
 
 
 import org.apache.commons.lang.ArrayUtils;
-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 java.io.Serializable;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class DefaultMarshallerTest
 {
     DefaultMarshaller marshaller = DefaultMarshaller.INSTANCE;

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

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

Propchange: directory/apacheds/branches/m1/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:28:49 2011
@@ -7,5 +7,5 @@
 /directory/apacheds/branches/apacheds-subtree/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:965202-966561
 /directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:599654-600228
 /directory/apacheds/branches/xdbm-refactoring/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:945827-946347
-/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1066126-1067785
+/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1066126-1067785,1068026-1068234
 /directory/studio/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java:1067786-1067997

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

Modified: directory/apacheds/branches/m1/core-jndi/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-jndi/pom.xml?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-jndi/pom.xml (original)
+++ directory/apacheds/branches/m1/core-jndi/pom.xml Tue Feb  8 00:28:49 2011
@@ -44,6 +44,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/core-jndi/src/test/java/org/apache/directory/server/core/jndi/LdapJndiPropertiesTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core-jndi/src/test/java/org/apache/directory/server/core/jndi/LdapJndiPropertiesTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core-jndi/src/test/java/org/apache/directory/server/core/jndi/LdapJndiPropertiesTest.java (original)
+++ directory/apacheds/branches/m1/core-jndi/src/test/java/org/apache/directory/server/core/jndi/LdapJndiPropertiesTest.java Tue Feb  8 00:28:49 2011
@@ -26,8 +26,8 @@ import javax.naming.ConfigurationExcepti
 import javax.naming.Context;
 
 import org.apache.commons.lang.ArrayUtils;
-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.AuthenticationLevel;
 import org.apache.directory.shared.util.Strings;
 import org.junit.Test;
@@ -43,7 +43,7 @@ import static org.junit.Assert.assertTru
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class LdapJndiPropertiesTest
 {
     @Test

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

Modified: directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authn/LdapPrincipalTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authn/LdapPrincipalTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authn/LdapPrincipalTest.java (original)
+++ directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authn/LdapPrincipalTest.java Tue Feb  8 00:28:49 2011
@@ -26,8 +26,8 @@ import java.io.ByteArrayOutputStream;
 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.server.core.LdapPrincipal;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -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 LdapPrincipalTest
 {
     /**

Modified: directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticatorOneWayEncryptedTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticatorOneWayEncryptedTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticatorOneWayEncryptedTest.java (original)
+++ directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticatorOneWayEncryptedTest.java Tue Feb  8 00:28:49 2011
@@ -23,8 +23,8 @@ package org.apache.directory.server.core
 
 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.util.Strings;
 import org.junit.BeforeClass;
 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 SimpleAuthenticatorOneWayEncryptedTest
 {
     private static SimpleAuthenticator auth = null;

Modified: directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilterTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilterTest.java (original)
+++ directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/HighestPrecedenceFilterTest.java Tue Feb  8 00:28:49 2011
@@ -29,8 +29,8 @@ import java.util.Collections;
 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.aci.ACITuple;
 import org.apache.directory.shared.ldap.aci.MicroOperation;
 import org.apache.directory.shared.ldap.aci.ProtectedItem;
@@ -47,7 +47,7 @@ import org.junit.runner.RunWith;
  *
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class HighestPrecedenceFilterTest
 {
     private static final Collection<ProtectedItem> PI_EMPTY_COLLECTION = Collections.unmodifiableCollection( new ArrayList<ProtectedItem>() );

Modified: directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java (original)
+++ directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/MaxImmSubFilterTest.java Tue Feb  8 00:28:49 2011
@@ -29,8 +29,8 @@ import java.util.Collections;
 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.server.core.MockOperation;
 import org.apache.directory.shared.ldap.aci.ACITuple;
 import org.apache.directory.shared.ldap.aci.MicroOperation;
@@ -56,7 +56,7 @@ import org.junit.runner.RunWith;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class MaxImmSubFilterTest
 {
     private static final Collection<ACITuple> EMPTY_ACI_TUPLE_COLLECTION = Collections

Modified: directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java (original)
+++ directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/MaxValueCountFilterTest.java Tue Feb  8 00:28:49 2011
@@ -29,8 +29,8 @@ import java.util.Collections;
 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.aci.ACITuple;
 import org.apache.directory.shared.ldap.aci.MicroOperation;
 import org.apache.directory.shared.ldap.aci.ProtectedItem;
@@ -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 MaxValueCountFilterTest
 {
     private static final Collection<ACITuple> EMPTY_ACI_TUPLE_COLLECTION = Collections.unmodifiableCollection( new ArrayList<ACITuple>() );

Modified: directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/MicroOperationFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/MicroOperationFilterTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/MicroOperationFilterTest.java (original)
+++ directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/MicroOperationFilterTest.java Tue Feb  8 00:28:49 2011
@@ -28,8 +28,8 @@ import java.util.Collections;
 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.aci.ACITuple;
 import org.apache.directory.shared.ldap.aci.MicroOperation;
 import org.apache.directory.shared.ldap.aci.ProtectedItem;
@@ -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 MicroOperationFilterTest
 {
     private static final Collection<ACITuple> EMPTY_ACI_TUPLE_COLLECTION = Collections.unmodifiableCollection( new ArrayList<ACITuple>() );

Modified: directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java (original)
+++ directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificProtectedItemFilterTest.java Tue Feb  8 00:28:49 2011
@@ -30,8 +30,8 @@ import java.util.HashSet;
 import java.util.List;
 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.aci.ACITuple;
 import org.apache.directory.shared.ldap.aci.MicroOperation;
 import org.apache.directory.shared.ldap.aci.ProtectedItem;
@@ -56,7 +56,7 @@ import org.junit.runner.RunWith;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class MostSpecificProtectedItemFilterTest
 {
     private static final Set<AttributeType> EMPTY_STRING_COLLECTION = Collections.unmodifiableSet( new HashSet<AttributeType>() );

Modified: directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilterTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilterTest.java (original)
+++ directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/MostSpecificUserClassFilterTest.java Tue Feb  8 00:28:49 2011
@@ -30,8 +30,8 @@ import java.util.HashSet;
 import java.util.List;
 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.aci.ACITuple;
 import org.apache.directory.shared.ldap.aci.MicroOperation;
 import org.apache.directory.shared.ldap.aci.ProtectedItem;
@@ -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 MostSpecificUserClassFilterTest
 {
     private static final Set<Dn> EMPTY_NAME_SET = Collections.unmodifiableSet( new HashSet<Dn>() );

Modified: directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/OperationScopeTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/OperationScopeTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/OperationScopeTest.java (original)
+++ directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/OperationScopeTest.java Tue Feb  8 00:28:49 2011
@@ -22,8 +22,8 @@ package org.apache.directory.server.core
 
 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.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -35,7 +35,7 @@ import org.junit.runner.RunWith;
  *
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class OperationScopeTest
 {
     @Test

Modified: directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java (original)
+++ directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedProtectedItemFilterTest.java Tue Feb  8 00:28:49 2011
@@ -29,8 +29,8 @@ import java.util.Collections;
 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.server.core.event.ExpressionEvaluator;
 import org.apache.directory.server.core.subtree.RefinementEvaluator;
 import org.apache.directory.server.core.subtree.RefinementLeafEvaluator;
@@ -70,7 +70,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 RelatedProtectedItemFilterTest
 {
     private static final Collection<UserClass> EMPTY_USER_CLASS_COLLECTION = Collections.unmodifiableCollection( new ArrayList<UserClass>() );

Modified: directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java (original)
+++ directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/RelatedUserClassFilterTest.java Tue Feb  8 00:28:49 2011
@@ -28,8 +28,8 @@ import java.util.Collections;
 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.server.core.subtree.SubtreeEvaluator;
 import org.apache.directory.shared.ldap.aci.ACITuple;
 import org.apache.directory.shared.ldap.aci.MicroOperation;
@@ -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 RelatedUserClassFilterTest
 {
     private static final Collection<ACITuple> EMPTY_ACI_TUPLE_COLLECTION = Collections.unmodifiableCollection( new ArrayList<ACITuple>() );

Modified: directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java (original)
+++ directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/authz/support/RestrictedByFilterTest.java Tue Feb  8 00:28:49 2011
@@ -29,8 +29,8 @@ import java.util.Collections;
 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.aci.ACITuple;
 import org.apache.directory.shared.ldap.aci.MicroOperation;
 import org.apache.directory.shared.ldap.aci.ProtectedItem;
@@ -59,7 +59,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 RestrictedByFilterTest
 {
     private static final Collection<UserClass> UC_EMPTY_COLLECTION = Collections.unmodifiableCollection( new ArrayList<UserClass>() );

Modified: directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java (original)
+++ directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/changelog/MemoryChangeLogStoreTest.java Tue Feb  8 00:28:49 2011
@@ -32,8 +32,8 @@ import java.io.ObjectOutputStream;
 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.server.core.LdapPrincipal;
 import org.apache.directory.shared.ldap.model.constants.AuthenticationLevel;
 import org.apache.directory.shared.ldap.model.constants.SchemaConstants;
@@ -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 MemoryChangeLogStoreTest
 {
     private static MemoryChangeLogStore store;

Modified: directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/normalization/NormalizationVisitorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/normalization/NormalizationVisitorTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/normalization/NormalizationVisitorTest.java (original)
+++ directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/normalization/NormalizationVisitorTest.java Tue Feb  8 00:28:49 2011
@@ -27,8 +27,8 @@ import static org.junit.Assert.fail;
 
 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.EqualityNode;
 import org.apache.directory.shared.ldap.model.filter.ExprNode;
 import org.apache.directory.shared.ldap.model.filter.*;
@@ -51,7 +51,7 @@ import org.junit.runner.RunWith;
  *
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class NormalizationVisitorTest
 {
     /** a filter node value normalizer and undefined node remover */

Modified: directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/prefs/PreferencesUtilsTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/prefs/PreferencesUtilsTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/prefs/PreferencesUtilsTest.java (original)
+++ directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/prefs/PreferencesUtilsTest.java Tue Feb  8 00:28:49 2011
@@ -22,8 +22,8 @@ package org.apache.directory.server.core
 
 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.constants.ServerDNConstants;
 import org.apache.directory.shared.ldap.model.exception.LdapException;
 import org.apache.directory.shared.ldap.model.name.Dn;
@@ -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 PreferencesUtilsTest
 {
     /**

Modified: directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java (original)
+++ directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/schema/SchemaServiceTest.java Tue Feb  8 00:28:49 2011
@@ -28,8 +28,8 @@ import java.util.HashSet;
 import java.util.Iterator;
 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.schema.AttributeType;
 import org.apache.directory.shared.ldap.model.schema.SchemaManager;
 import org.apache.directory.shared.ldap.schemaextractor.SchemaLdifExtractor;
@@ -46,7 +46,7 @@ import org.junit.runner.RunWith;
  * Tests methods in SchemaInterceptor.
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class SchemaServiceTest
 {
     private static SchemaManager schemaManager;

Modified: directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java (original)
+++ directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/security/TlsKeyGeneratorTest.java Tue Feb  8 00:28:49 2011
@@ -28,8 +28,8 @@ import java.io.File;
 import java.security.KeyPair;
 import java.security.cert.X509Certificate;
 
-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.entry.DefaultEntry;
 import org.apache.directory.shared.ldap.model.entry.Entry;
@@ -53,7 +53,7 @@ import org.slf4j.LoggerFactory;
  * @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
  */
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class TlsKeyGeneratorTest
 {
     private static final Logger LOG = LoggerFactory.getLogger( TlsKeyGeneratorTest.class );

Modified: directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/sp/StoredProcUtilsTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/sp/StoredProcUtilsTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/sp/StoredProcUtilsTest.java (original)
+++ directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/sp/StoredProcUtilsTest.java Tue Feb  8 00:28:49 2011
@@ -21,15 +21,15 @@
 
 package org.apache.directory.server.core.sp;
 
-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;
 
 import static org.junit.Assert.assertEquals;
 
 @RunWith(ConcurrentJunitRunner.class)
-@Concurrent()
+@Concurrency()
 public class StoredProcUtilsTest
 {
     @Test

Modified: directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java (original)
+++ directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/subtree/RefinementEvaluatorTest.java Tue Feb  8 00:28:49 2011
@@ -23,8 +23,8 @@ import static org.junit.Assert.assertFal
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import org.apache.directory.junit.tools.Concurrent;
-import org.apache.directory.junit.tools.ConcurrentJunitRunner;
+import com.mycila.junit.concurrent.Concurrency;
+import com.mycila.junit.concurrent.ConcurrentJunitRunner;
 import org.apache.directory.shared.ldap.model.entry.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
 import org.apache.directory.shared.ldap.model.entry.StringValue;
@@ -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 RefinementEvaluatorTest
 {
     /** the SchemaManager instance */

Modified: directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java (original)
+++ directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/subtree/RefinementLeafEvaluatorTest.java Tue Feb  8 00:28:49 2011
@@ -24,8 +24,8 @@ import static org.junit.Assert.assertFal
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
-import org.apache.directory.junit.tools.Concurrent;
-import org.apache.directory.junit.tools.ConcurrentJunitRunner;
+import 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.entry.DefaultEntryAttribute;
 import org.apache.directory.shared.ldap.model.entry.EntryAttribute;
@@ -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 RefinementLeafEvaluatorTest
 {
     /** the SchemaManager instance */

Modified: directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java (original)
+++ directory/apacheds/branches/m1/core/src/test/java/org/apache/directory/server/core/subtree/SubtreeEvaluatorTest.java Tue Feb  8 00:28:49 2011
@@ -31,8 +31,8 @@ import java.util.Set;
 import net.sf.ehcache.Cache;
 import net.sf.ehcache.CacheManager;
 
-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.DefaultDnFactory;
 import org.apache.directory.server.core.DnFactory;
 import org.apache.directory.server.core.normalization.FilterNormalizingVisitor;
@@ -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 SubtreeEvaluatorTest
 {
     private static DnFactory dnFactory;

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

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

Modified: directory/apacheds/branches/m1/i18n/pom.xml
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/i18n/pom.xml?rev=1068236&r1=1068235&r2=1068236&view=diff
==============================================================================
--- directory/apacheds/branches/m1/i18n/pom.xml (original)
+++ directory/apacheds/branches/m1/i18n/pom.xml Tue Feb  8 00:28:49 2011
@@ -30,23 +30,4 @@
   
   <description>Internationalization of errors and other messages</description>
 
-  <dependencies>
-    <dependency>
-      <groupId>org.apache.directory.junit</groupId>
-      <artifactId>junit-addons</artifactId>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-  <build>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <configuration> 
-          <forkMode>always</forkMode>
-        </configuration>
-      </plugin>
-    </plugins>
-  </build>
 </project>

Propchange: directory/apacheds/branches/m1/installers/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:28:49 2011
@@ -1,5 +1,5 @@
 /directory/apacheds/branches/apacheds-config/installers:1023442-1029077
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/installers:1040956-1043765
-/directory/apacheds/trunk/installers:1066126-1067785
+/directory/apacheds/trunk/installers:1066126-1067785,1068026-1068234
 /directory/installers/branches/installers-schema/apacheds:806631-896441
 /directory/studio/trunk/installers:1067786-1067997

Propchange: directory/apacheds/branches/m1/installers-maven-plugin/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Feb  8 00:28:49 2011
@@ -1,5 +1,5 @@
 /directory/apacheds/branches/apacheds-config/installers-maven-plugin:1023442-1029077
 /directory/apacheds/branches/apacheds-kerberos-codec-2.0/installers-maven-plugin:1040956-1043765
-/directory/apacheds/trunk/installers-maven-plugin:1066126-1067785
+/directory/apacheds/trunk/installers-maven-plugin:1066126-1067785,1068026-1068234
 /directory/daemon/branches/daemon-schema/plugin:806630-896441
 /directory/studio/trunk/installers-maven-plugin:1067786-1067997

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

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

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



Mime
View raw message