Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 75523 invoked from network); 29 Dec 2009 16:37:05 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 29 Dec 2009 16:37:05 -0000 Received: (qmail 94326 invoked by uid 500); 29 Dec 2009 16:37:05 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 94264 invoked by uid 500); 29 Dec 2009 16:37:05 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 94255 invoked by uid 99); 29 Dec 2009 16:37:04 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Dec 2009 16:37:04 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 29 Dec 2009 16:36:59 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8E3A023889E9; Tue, 29 Dec 2009 16:36:18 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r894433 - in /directory/apacheds/branches/apacheds-schema: core-annotations/src/main/java/org/apache/directory/server/core/annotations/ core-integ/src/test/java/org/apache/directory/server/core/authn/ core-integ/src/test/java/org/apache/dir... Date: Tue, 29 Dec 2009 16:36:16 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20091229163618.8E3A023889E9@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Tue Dec 29 16:36:11 2009 New Revision: 894433 URL: http://svn.apache.org/viewvc?rev=894433&view=rev Log: o Added the ContextEntry and CreatePartition annotations o Renamed the AbstractTestUnit class o Added some @ to the LdapServerSuite class Added: directory/apacheds/branches/apacheds-schema/core-annotations/src/main/java/org/apache/directory/server/core/annotations/ContextEntry.java directory/apacheds/branches/apacheds-schema/core-annotations/src/main/java/org/apache/directory/server/core/annotations/CreatePartition.java directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/AbstractLdapTestUnit.java - copied, changed from r894422, directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/AbstractTestUnit.java Removed: directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/AbstractTestUnit.java Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AdministratorsGroupIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/GeneralAuthorizationIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/event/EventServiceIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/AddIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/CreateContextIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER169IT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER783IT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER791IT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/DestroyContextIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/ExtensibleObjectIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/ListIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/ModifyContextIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/RFC2713IT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/RootDSEIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/normalization/NormalizationServiceIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/operations/search/DIRSERVER759IT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/prefs/PreferencesIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/AbstractMetaSchemaObjectHandlerIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/ObjectClassCreateIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/sp/LdapClassLoaderIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/subtree/BadSubentryServiceIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceEntryModificationHandlingIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceObjectClassChangeHandlingIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/trigger/SubentryServiceForTriggersIT.java directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/trigger/TriggerInterceptorIT.java Added: directory/apacheds/branches/apacheds-schema/core-annotations/src/main/java/org/apache/directory/server/core/annotations/ContextEntry.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-annotations/src/main/java/org/apache/directory/server/core/annotations/ContextEntry.java?rev=894433&view=auto ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-annotations/src/main/java/org/apache/directory/server/core/annotations/ContextEntry.java (added) +++ directory/apacheds/branches/apacheds-schema/core-annotations/src/main/java/org/apache/directory/server/core/annotations/ContextEntry.java Tue Dec 29 16:36:11 2009 @@ -0,0 +1,38 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.directory.server.core.annotations; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * An annotation for the Partition context entry + * + * @author Apache Directory Project + * @version $Rev$, $Date$ + */ +@Retention(RetentionPolicy.RUNTIME) +@Target( {ElementType.METHOD, ElementType.TYPE } ) +public @interface ContextEntry +{ + /** the context entry in LDIF to be added */ + String entryLdif(); +} Added: directory/apacheds/branches/apacheds-schema/core-annotations/src/main/java/org/apache/directory/server/core/annotations/CreatePartition.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-annotations/src/main/java/org/apache/directory/server/core/annotations/CreatePartition.java?rev=894433&view=auto ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-annotations/src/main/java/org/apache/directory/server/core/annotations/CreatePartition.java (added) +++ directory/apacheds/branches/apacheds-schema/core-annotations/src/main/java/org/apache/directory/server/core/annotations/CreatePartition.java Tue Dec 29 16:36:11 2009 @@ -0,0 +1,68 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.directory.server.core.annotations; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +/** + * An annotation for the Partition creation. A partition is defined by + * a name and a suffix, plus some other characteristics. Here is an example : + * 
+ * @CreatePartition(
+ *     name = "example",
+ *     suffix = "dc=example, dc=com",
+ *     @ContextEntry( 
+ *         {
+ *             "dn: dc=example, dc=com",
+ *             "objectclass: top",
+ *             "objectclass: domain",
+ *             "dc: example", 
+ *         }),
+ *     @Indexes( {
+ *         @CreateIndex( attribute = "cn" ),
+ *         @CreateIndex( attribute = "sn', cacheSize = "100" )
+ *     })
+ * )
+ *
+ * + * @author Apache Directory Project + * @version $Rev$, $Date$ + */ +@Retention(RetentionPolicy.RUNTIME) +@Target( {ElementType.METHOD, ElementType.TYPE } ) +public @interface CreatePartition +{ + /** The partition name */ + String name(); + + /** The partition suffix */ + String suffix(); + + /** The context entry */ + ContextEntry contextEntry(); + + /** The associated indexes */ + CreateIndex[] indexes() default {}; + + /** The cache size */ + int cacheSize() default 1000; +} Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java Tue Dec 29 16:36:11 2009 @@ -34,7 +34,7 @@ import javax.naming.directory.ModificationItem; import javax.naming.ldap.LdapContext; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.server.core.jndi.ServerLdapContext; import org.apache.directory.shared.ldap.name.LdapDN; @@ -52,7 +52,7 @@ * @version $Rev$ */ @RunWith( FrameworkRunner.class ) -public class SimpleAuthenticationIT extends AbstractTestUnit +public class SimpleAuthenticationIT extends AbstractLdapTestUnit { /** * Checks all attributes of the admin account entry minus the userPassword Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java Tue Dec 29 16:36:11 2009 @@ -35,7 +35,7 @@ import javax.naming.directory.BasicAttributes; import javax.naming.directory.DirContext; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.exception.LdapNoPermissionException; import org.apache.directory.shared.ldap.name.LdapDN; @@ -51,7 +51,7 @@ * @version $Rev$ */ @RunWith ( FrameworkRunner.class ) -public class AddAuthorizationIT extends AbstractTestUnit +public class AddAuthorizationIT extends AbstractLdapTestUnit { @Before Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AdministratorsGroupIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AdministratorsGroupIT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AdministratorsGroupIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AdministratorsGroupIT.java Tue Dec 29 16:36:11 2009 @@ -33,7 +33,7 @@ import javax.naming.directory.DirContext; import org.apache.directory.server.core.annotations.CreateDS; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.junit.Before; import org.junit.Test; @@ -48,7 +48,7 @@ * @version $Rev$ */ @RunWith ( FrameworkRunner.class ) -public class AdministratorsGroupIT extends AbstractTestUnit +public class AdministratorsGroupIT extends AbstractLdapTestUnit { @Before Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java Tue Dec 29 16:36:11 2009 @@ -38,7 +38,7 @@ import javax.naming.ldap.LdapContext; import org.apache.directory.server.core.annotations.CreateDS; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.exception.LdapNoPermissionException; import org.apache.directory.shared.ldap.util.ArrayUtils; @@ -55,7 +55,7 @@ * @version $Rev$ */ @RunWith ( FrameworkRunner.class ) -public class AuthorizationServiceAsAdminIT extends AbstractTestUnit +public class AuthorizationServiceAsAdminIT extends AbstractLdapTestUnit { /** Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsNonAdminIT.java Tue Dec 29 16:36:11 2009 @@ -34,7 +34,7 @@ import org.apache.directory.server.core.CoreSession; import org.apache.directory.server.core.LdapPrincipal; import org.apache.directory.server.core.entry.DefaultServerEntry; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.constants.AuthenticationLevel; import org.apache.directory.shared.ldap.entry.Entry; @@ -63,7 +63,7 @@ * @version $Rev$ */ @RunWith ( FrameworkRunner.class ) -public class AuthorizationServiceAsNonAdminIT extends AbstractTestUnit +public class AuthorizationServiceAsNonAdminIT extends AbstractLdapTestUnit { /** Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java Tue Dec 29 16:36:11 2009 @@ -26,7 +26,7 @@ import static org.junit.Assert.fail; import junit.framework.Assert; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.exception.LdapNoPermissionException; import org.apache.directory.shared.ldap.name.LdapDN; @@ -42,7 +42,7 @@ * @version $Rev$ */ @RunWith ( FrameworkRunner.class ) -public class AuthzAuthnIT extends AbstractTestUnit +public class AuthzAuthnIT extends AbstractLdapTestUnit { @Before Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationIT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationIT.java Tue Dec 29 16:36:11 2009 @@ -35,7 +35,7 @@ import javax.naming.directory.DirContext; import org.apache.directory.server.core.annotations.CreateDS; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.server.core.jndi.ServerLdapContext; import org.apache.directory.shared.ldap.exception.LdapNoPermissionException; @@ -52,7 +52,7 @@ * @version $Rev$ */ @RunWith ( FrameworkRunner.class ) -public class CompareAuthorizationIT extends AbstractTestUnit +public class CompareAuthorizationIT extends AbstractLdapTestUnit { @Before Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationIT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationIT.java Tue Dec 29 16:36:11 2009 @@ -34,7 +34,7 @@ import javax.naming.directory.DirContext; import org.apache.directory.server.core.DirectoryService; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.exception.LdapNoPermissionException; import org.apache.directory.shared.ldap.name.LdapDN; @@ -50,7 +50,7 @@ * @version $Rev$ */ @RunWith ( FrameworkRunner.class ) -public class DeleteAuthorizationIT extends AbstractTestUnit +public class DeleteAuthorizationIT extends AbstractLdapTestUnit { @Before Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/GeneralAuthorizationIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/GeneralAuthorizationIT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/GeneralAuthorizationIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/GeneralAuthorizationIT.java Tue Dec 29 16:36:11 2009 @@ -26,7 +26,7 @@ import javax.naming.NamingException; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeValueException; import org.apache.directory.shared.ldap.message.ResultCodeEnum; @@ -42,7 +42,7 @@ * @version $Rev: 494176 $ */ @RunWith ( FrameworkRunner.class ) -public class GeneralAuthorizationIT extends AbstractTestUnit +public class GeneralAuthorizationIT extends AbstractLdapTestUnit { @Before Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java Tue Dec 29 16:36:11 2009 @@ -44,7 +44,7 @@ import javax.naming.directory.DirContext; import javax.naming.directory.ModificationItem; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.exception.LdapNoPermissionException; import org.apache.directory.shared.ldap.name.LdapDN; @@ -60,7 +60,7 @@ * @version $Rev$ */ @RunWith ( FrameworkRunner.class ) -public class ModifyAuthorizationIT extends AbstractTestUnit +public class ModifyAuthorizationIT extends AbstractLdapTestUnit { @Before Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationIT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationIT.java Tue Dec 29 16:36:11 2009 @@ -37,7 +37,7 @@ import javax.naming.directory.DirContext; import org.apache.directory.server.core.DirectoryService; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.exception.LdapNoPermissionException; import org.apache.directory.shared.ldap.name.LdapDN; @@ -53,7 +53,7 @@ * @version $Rev$ */ @RunWith ( FrameworkRunner.class ) -public class MoveRenameAuthorizationIT extends AbstractTestUnit +public class MoveRenameAuthorizationIT extends AbstractLdapTestUnit { @Before Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java Tue Dec 29 16:36:11 2009 @@ -51,7 +51,7 @@ import javax.naming.directory.SearchResult; import javax.naming.ldap.LdapContext; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException; import org.apache.directory.shared.ldap.exception.LdapNoPermissionException; @@ -69,7 +69,7 @@ * @version $Rev$ */ @RunWith ( FrameworkRunner.class ) -public class SearchAuthorizationIT extends AbstractTestUnit +public class SearchAuthorizationIT extends AbstractLdapTestUnit { @Before Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java Tue Dec 29 16:36:11 2009 @@ -39,7 +39,7 @@ import org.apache.directory.server.core.annotations.CreateDS; import org.apache.directory.server.core.factory.DefaultDirectoryServiceFactory; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException; import org.junit.Test; @@ -58,7 +58,7 @@ */ @RunWith ( FrameworkRunner.class ) @CreateDS( factory=DefaultDirectoryServiceFactory.class, name="DefaultChangeLogIT-class" ) -public class DefaultChangeLogIT extends AbstractTestUnit +public class DefaultChangeLogIT extends AbstractLdapTestUnit { public static final Logger LOG = LoggerFactory.getLogger( DefaultChangeLogIT.class ); Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java Tue Dec 29 16:36:11 2009 @@ -41,7 +41,7 @@ import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.util.AttributeUtils; import org.junit.Test; @@ -55,7 +55,7 @@ * @version $Rev$ */ @RunWith ( FrameworkRunner.class ) -public class CollectiveAttributeServiceIT extends AbstractTestUnit +public class CollectiveAttributeServiceIT extends AbstractLdapTestUnit { private Attributes getTestEntry( String cn ) throws NamingException { Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java Tue Dec 29 16:36:11 2009 @@ -32,7 +32,7 @@ import org.apache.directory.server.core.DirectoryService; import org.apache.directory.server.core.entry.DefaultServerEntry; import org.apache.directory.server.core.entry.ServerEntry; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.server.core.interceptor.context.AddOperationContext; import org.apache.directory.server.core.jndi.CoreContextFactory; @@ -51,7 +51,7 @@ * @version $Rev$ */ @RunWith ( FrameworkRunner.class ) -public class PartitionConfigurationIT extends AbstractTestUnit +public class PartitionConfigurationIT extends AbstractLdapTestUnit { @Test Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/event/EventServiceIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/event/EventServiceIT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/event/EventServiceIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/event/EventServiceIT.java Tue Dec 29 16:36:11 2009 @@ -36,7 +36,7 @@ import javax.naming.event.NamingExceptionEvent; import javax.naming.event.ObjectChangeListener; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.util.AttributeUtils; import org.junit.Test; @@ -50,7 +50,7 @@ * @version $Rev$ */ @RunWith ( FrameworkRunner.class ) -public class EventServiceIT extends AbstractTestUnit +public class EventServiceIT extends AbstractLdapTestUnit { /** * Test to make sure NamingListener's are no longer registered Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java Tue Dec 29 16:36:11 2009 @@ -39,7 +39,7 @@ import javax.naming.directory.SearchResult; import javax.naming.ldap.LdapContext; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.exception.LdapContextNotEmptyException; @@ -59,7 +59,7 @@ * @version $Rev$ */ @RunWith ( FrameworkRunner.class ) -public class ExceptionServiceIT extends AbstractTestUnit +public class ExceptionServiceIT extends AbstractLdapTestUnit { private DirContext createSubContext( String type, String value ) throws Exception { Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/AddIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/AddIT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/AddIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/AddIT.java Tue Dec 29 16:36:11 2009 @@ -31,7 +31,7 @@ import javax.naming.directory.DirContext; import javax.naming.ldap.LdapContext; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.exception.LdapInvalidAttributeValueException; import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException; @@ -47,7 +47,7 @@ * @version $Rev$ */ @RunWith(FrameworkRunner.class) -public class AddIT extends AbstractTestUnit +public class AddIT extends AbstractLdapTestUnit { // /** // * Test that attribute name case is preserved after adding an entry Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/CreateContextIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/CreateContextIT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/CreateContextIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/CreateContextIT.java Tue Dec 29 16:36:11 2009 @@ -40,7 +40,7 @@ import javax.naming.directory.SearchResult; import javax.naming.ldap.LdapContext; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException; import org.apache.directory.shared.ldap.util.AttributeUtils; @@ -55,7 +55,7 @@ * @version $Rev$ */ @RunWith ( FrameworkRunner.class ) -public class CreateContextIT extends AbstractTestUnit +public class CreateContextIT extends AbstractLdapTestUnit { protected Attributes getPersonAttributes( String sn, String cn ) throws Exception { Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER169IT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER169IT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER169IT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER169IT.java Tue Dec 29 16:36:11 2009 @@ -40,7 +40,7 @@ import javax.naming.ldap.LdapContext; import org.apache.directory.server.core.DirectoryService; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.junit.Test; import org.junit.runner.RunWith; @@ -53,7 +53,7 @@ * @version $Rev$ */ @RunWith ( FrameworkRunner.class ) -public class DIRSERVER169IT extends AbstractTestUnit +public class DIRSERVER169IT extends AbstractLdapTestUnit { /** Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER783IT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER783IT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER783IT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER783IT.java Tue Dec 29 16:36:11 2009 @@ -40,7 +40,7 @@ import javax.naming.directory.SearchResult; import org.apache.directory.server.core.DirectoryService; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.junit.Test; import org.junit.runner.RunWith; @@ -52,7 +52,7 @@ * @author Apache Directory Project */ @RunWith ( FrameworkRunner.class ) -public class DIRSERVER783IT extends AbstractTestUnit +public class DIRSERVER783IT extends AbstractLdapTestUnit { /** Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER791IT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER791IT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER791IT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER791IT.java Tue Dec 29 16:36:11 2009 @@ -42,7 +42,7 @@ import javax.naming.directory.SchemaViolationException; import org.apache.directory.server.core.DirectoryService; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.junit.Test; import org.junit.runner.RunWith; @@ -54,7 +54,7 @@ * @author Apache Directory Project */ @RunWith(FrameworkRunner.class) -public class DIRSERVER791IT extends AbstractTestUnit +public class DIRSERVER791IT extends AbstractLdapTestUnit { /** Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/DestroyContextIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/DestroyContextIT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/DestroyContextIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/DestroyContextIT.java Tue Dec 29 16:36:11 2009 @@ -28,7 +28,7 @@ import javax.naming.ldap.LdapContext; import org.apache.directory.server.core.annotations.ApplyLdifs; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.exception.LdapNameNotFoundException; import org.junit.Test; @@ -63,7 +63,7 @@ "objectclass: organizationalUnit\n" + "ou: subtest\n" }) -public class DestroyContextIT extends AbstractTestUnit +public class DestroyContextIT extends AbstractLdapTestUnit { /** * Tests the creation and subsequent read of a new JNDI context under the Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/ExtensibleObjectIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/ExtensibleObjectIT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/ExtensibleObjectIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/ExtensibleObjectIT.java Tue Dec 29 16:36:11 2009 @@ -34,7 +34,7 @@ import org.apache.directory.server.core.annotations.CreateDS; import org.apache.directory.server.core.factory.DefaultDirectoryServiceFactory; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.junit.Test; import org.junit.runner.RunWith; @@ -48,7 +48,7 @@ */ @RunWith ( FrameworkRunner.class ) @CreateDS( factory=DefaultDirectoryServiceFactory.class, name="ExtensibleObjectIT-class" ) -public class ExtensibleObjectIT extends AbstractTestUnit +public class ExtensibleObjectIT extends AbstractLdapTestUnit { @Test Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/ListIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/ListIT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/ListIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/ListIT.java Tue Dec 29 16:36:11 2009 @@ -33,7 +33,7 @@ import javax.naming.ldap.LdapContext; import org.apache.directory.server.core.entry.DefaultServerEntry; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.ldif.LdifEntry; import org.junit.Test; @@ -49,7 +49,7 @@ * @version $Rev$ */ @RunWith ( FrameworkRunner.class ) -public class ListIT extends AbstractTestUnit +public class ListIT extends AbstractLdapTestUnit { @Test Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/ModifyContextIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/ModifyContextIT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/ModifyContextIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/ModifyContextIT.java Tue Dec 29 16:36:11 2009 @@ -40,7 +40,7 @@ import org.apache.directory.server.core.annotations.CreateDS; import org.apache.directory.server.core.entry.DefaultServerEntry; import org.apache.directory.server.core.factory.DefaultDirectoryServiceFactory; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.CiRunner; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.server.core.integ.Level; @@ -61,7 +61,7 @@ */ @RunWith ( FrameworkRunner.class ) @CreateDS( factory=DefaultDirectoryServiceFactory.class, name="ModifyContextIT-class" ) -public class ModifyContextIT extends AbstractTestUnit +public class ModifyContextIT extends AbstractLdapTestUnit { /** Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryIT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryIT.java Tue Dec 29 16:36:11 2009 @@ -41,7 +41,7 @@ import javax.naming.spi.DirStateFactory; import org.apache.directory.server.core.entry.DefaultServerEntry; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.ldif.LdifEntry; import org.apache.directory.shared.ldap.util.ArrayUtils; @@ -57,7 +57,7 @@ * @version $Rev$ */ @RunWith ( FrameworkRunner.class ) -public class ObjStateFactoryIT extends AbstractTestUnit +public class ObjStateFactoryIT extends AbstractLdapTestUnit { @Test Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/RFC2713IT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/RFC2713IT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/RFC2713IT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/RFC2713IT.java Tue Dec 29 16:36:11 2009 @@ -32,7 +32,7 @@ import javax.naming.ldap.LdapContext; import org.apache.directory.server.core.DirectoryService; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.junit.Test; import org.junit.runner.RunWith; @@ -46,7 +46,7 @@ * @version $Rev$ */ @RunWith ( FrameworkRunner.class ) -public class RFC2713IT extends AbstractTestUnit +public class RFC2713IT extends AbstractLdapTestUnit { @Test Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/RootDSEIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/RootDSEIT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/RootDSEIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/RootDSEIT.java Tue Dec 29 16:36:11 2009 @@ -35,7 +35,7 @@ import javax.naming.directory.ModificationItem; import org.apache.directory.server.core.DirectoryService; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.exception.LdapNoPermissionException; import org.junit.Test; @@ -49,7 +49,7 @@ * @version $Rev$ */ @RunWith ( FrameworkRunner.class ) -public class RootDSEIT extends AbstractTestUnit +public class RootDSEIT extends AbstractLdapTestUnit { /** Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberIT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberIT.java Tue Dec 29 16:36:11 2009 @@ -41,7 +41,7 @@ import javax.naming.directory.SearchResult; import javax.naming.ldap.LdapContext; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.constants.JndiPropertyConstants; import org.apache.directory.shared.ldap.message.AliasDerefMode; @@ -57,7 +57,7 @@ * @version $Rev$ */ @RunWith ( FrameworkRunner.class ) -public class UniqueMemberIT extends AbstractTestUnit +public class UniqueMemberIT extends AbstractLdapTestUnit { /** Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/normalization/NormalizationServiceIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/normalization/NormalizationServiceIT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/normalization/NormalizationServiceIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/normalization/NormalizationServiceIT.java Tue Dec 29 16:36:11 2009 @@ -30,7 +30,7 @@ import javax.naming.directory.BasicAttributes; import javax.naming.ldap.LdapContext; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.junit.Test; import org.junit.runner.RunWith; @@ -44,7 +44,7 @@ * @version $Rev$ */ @RunWith ( FrameworkRunner.class ) -public final class NormalizationServiceIT extends AbstractTestUnit +public final class NormalizationServiceIT extends AbstractLdapTestUnit { @Test Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java Tue Dec 29 16:36:11 2009 @@ -44,7 +44,7 @@ import javax.naming.ldap.LdapContext; import org.apache.directory.server.core.entry.DefaultServerEntry; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.constants.JndiPropertyConstants; import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException; @@ -63,7 +63,7 @@ * @version $Rev$ */ @RunWith ( FrameworkRunner.class ) -public class OperationalAttributeServiceIT extends AbstractTestUnit +public class OperationalAttributeServiceIT extends AbstractLdapTestUnit { private static final String BINARY_KEY = "java.naming.ldap.attributes.binary"; private static final String RDN_KATE_BUSH = "cn=Kate Bush"; Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/operations/search/DIRSERVER759IT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/operations/search/DIRSERVER759IT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/operations/search/DIRSERVER759IT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/operations/search/DIRSERVER759IT.java Tue Dec 29 16:36:11 2009 @@ -36,7 +36,7 @@ import javax.naming.ldap.LdapContext; import org.apache.directory.server.core.DirectoryService; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.constants.JndiPropertyConstants; import org.apache.directory.shared.ldap.message.AliasDerefMode; @@ -51,7 +51,7 @@ * @version $Rev: 493916 $ */ @RunWith ( FrameworkRunner.class ) -public class DIRSERVER759IT extends AbstractTestUnit +public class DIRSERVER759IT extends AbstractLdapTestUnit { /** Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/operations/search/SearchIT.java Tue Dec 29 16:36:11 2009 @@ -47,7 +47,7 @@ import org.apache.directory.server.core.annotations.ApplyLdifs; import org.apache.directory.server.core.annotations.CreateDS; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.constants.JndiPropertyConstants; import org.apache.directory.shared.ldap.exception.LdapSizeLimitExceededException; @@ -147,7 +147,7 @@ "manager: cn=Heather Nova, ou=system\n" } ) -public class SearchIT extends AbstractTestUnit +public class SearchIT extends AbstractLdapTestUnit { private static final String RDN = "cn=Heather Nova"; private static final String FILTER = "(objectclass=*)"; Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/prefs/PreferencesIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/prefs/PreferencesIT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/prefs/PreferencesIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/prefs/PreferencesIT.java Tue Dec 29 16:36:11 2009 @@ -27,7 +27,7 @@ import java.util.prefs.BackingStoreException; import java.util.prefs.Preferences; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.junit.Test; import org.junit.runner.RunWith; @@ -40,7 +40,7 @@ * @version $Rev$ */ @RunWith ( FrameworkRunner.class ) -public class PreferencesIT extends AbstractTestUnit +public class PreferencesIT extends AbstractLdapTestUnit { @Test Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/AbstractMetaSchemaObjectHandlerIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/AbstractMetaSchemaObjectHandlerIT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/AbstractMetaSchemaObjectHandlerIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/AbstractMetaSchemaObjectHandlerIT.java Tue Dec 29 16:36:11 2009 @@ -22,7 +22,7 @@ import java.io.File; import java.util.Enumeration; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.shared.ldap.name.LdapDN; import org.apache.directory.shared.ldap.name.Rdn; import org.apache.directory.shared.ldap.util.StringTools; @@ -34,7 +34,7 @@ * @author Apache Directory Project * @version $Rev$, $Date$ */ -public abstract class AbstractMetaSchemaObjectHandlerIT extends AbstractTestUnit +public abstract class AbstractMetaSchemaObjectHandlerIT extends AbstractLdapTestUnit { protected static String workingDir; Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/ObjectClassCreateIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/ObjectClassCreateIT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/ObjectClassCreateIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/ObjectClassCreateIT.java Tue Dec 29 16:36:11 2009 @@ -37,7 +37,7 @@ import javax.naming.directory.SearchControls; import javax.naming.directory.SearchResult; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.constants.MetaSchemaConstants; import org.apache.directory.shared.ldap.name.LdapDN; @@ -46,7 +46,7 @@ @RunWith(FrameworkRunner.class) -public class ObjectClassCreateIT extends AbstractTestUnit +public class ObjectClassCreateIT extends AbstractLdapTestUnit { private String testOID = "1.3.6.1.4.1.18060.0.4.0.3.1.555555.5555.5555555"; Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java Tue Dec 29 16:36:11 2009 @@ -44,7 +44,7 @@ import javax.naming.directory.SearchResult; import org.apache.directory.server.core.annotations.CreateDS; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.name.LdapDN; import org.apache.directory.shared.ldap.schema.AttributeType; @@ -62,7 +62,7 @@ */ @RunWith(FrameworkRunner.class) @CreateDS( name="SchemaPersistenceIT-class" ) -public class SchemaPersistenceIT extends AbstractTestUnit +public class SchemaPersistenceIT extends AbstractLdapTestUnit { private static final String SUBSCHEMA_SUBENTRY = "subschemaSubentry"; private static final AttributeTypeDescriptionSchemaParser ATTRIBUTE_TYPE_DESCRIPTION_SCHEMA_PARSER = new AttributeTypeDescriptionSchemaParser(); Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java Tue Dec 29 16:36:11 2009 @@ -45,7 +45,7 @@ import org.apache.directory.server.core.annotations.ApplyLdifs; import org.apache.directory.server.core.annotations.CreateDS; import org.apache.directory.server.core.entry.DefaultServerEntry; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException; import org.apache.directory.shared.ldap.ldif.LdifEntry; @@ -83,7 +83,7 @@ "sn: sn_person2\n" } ) @RunWith(FrameworkRunner.class) -public class SchemaServiceIT extends AbstractTestUnit +public class SchemaServiceIT extends AbstractLdapTestUnit { /** Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java Tue Dec 29 16:36:11 2009 @@ -57,7 +57,7 @@ import org.apache.directory.server.core.DirectoryService; import org.apache.directory.server.core.entry.ServerEntry; import org.apache.directory.server.core.entry.ServerEntryUtils; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.exception.LdapNameAlreadyBoundException; import org.apache.directory.shared.ldap.exception.LdapOperationNotSupportedException; @@ -98,7 +98,7 @@ * @version $Rev$ */ @RunWith ( FrameworkRunner.class ) -public class SubschemaSubentryIT extends AbstractTestUnit +public class SubschemaSubentryIT extends AbstractLdapTestUnit { private static final String GLOBAL_SUBSCHEMA_DN = "cn=schema"; private static final String SUBSCHEMA_SUBENTRY = "subschemaSubentry"; Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/sp/LdapClassLoaderIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/sp/LdapClassLoaderIT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/sp/LdapClassLoaderIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/sp/LdapClassLoaderIT.java Tue Dec 29 16:36:11 2009 @@ -33,7 +33,7 @@ import org.apache.directory.server.core.annotations.CreateDS; import org.apache.directory.server.core.factory.DefaultDirectoryServiceFactory; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.server.core.jndi.ServerLdapContext; import org.apache.directory.shared.ldap.util.Base64; @@ -49,7 +49,7 @@ */ @RunWith ( FrameworkRunner.class ) @CreateDS( factory=DefaultDirectoryServiceFactory.class, name="LdapClassLoaderIT-class" ) -public class LdapClassLoaderIT extends AbstractTestUnit +public class LdapClassLoaderIT extends AbstractLdapTestUnit { private static final String HELLOWORLD_CLASS_BASE64 = "yv66vgAAADEAHQoABgAPCQAQABEIABIKABMAFAcAFQcAFgEABjxpbml0PgEAAygpV" + "gEABENvZGUBAA9MaW5lTnVtYmVyVGFibGUBAARtYWluAQAWKFtMamF2YS9sYW5nL1N0cmluZzsp" Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/subtree/BadSubentryServiceIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/subtree/BadSubentryServiceIT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/subtree/BadSubentryServiceIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/subtree/BadSubentryServiceIT.java Tue Dec 29 16:36:11 2009 @@ -41,7 +41,7 @@ import javax.naming.ldap.LdapContext; import org.apache.directory.server.core.annotations.CreateDS; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.junit.Test; @@ -56,7 +56,7 @@ */ @RunWith ( FrameworkRunner.class ) @CreateDS( name="BadSubentryServiceIT-class" ) -public class BadSubentryServiceIT extends AbstractTestUnit +public class BadSubentryServiceIT extends AbstractLdapTestUnit { public Attributes getTestEntry( String cn ) Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceEntryModificationHandlingIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceEntryModificationHandlingIT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceEntryModificationHandlingIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceEntryModificationHandlingIT.java Tue Dec 29 16:36:11 2009 @@ -41,7 +41,7 @@ import org.apache.directory.server.core.annotations.CreateDS; import org.apache.directory.server.core.factory.DefaultDirectoryServiceFactory; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.junit.Test; @@ -59,7 +59,7 @@ */ @RunWith ( FrameworkRunner.class ) @CreateDS( factory=DefaultDirectoryServiceFactory.class, name="SubentryServiceEntryModificationHandlingIT-class" ) -public class SubentryServiceEntryModificationHandlingIT extends AbstractTestUnit +public class SubentryServiceEntryModificationHandlingIT extends AbstractLdapTestUnit { public Attributes getTestEntry( String cn ) Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java Tue Dec 29 16:36:11 2009 @@ -42,7 +42,7 @@ import javax.naming.ldap.Control; import javax.naming.ldap.LdapContext; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.exception.LdapNoSuchAttributeException; @@ -60,7 +60,7 @@ */ @RunWith ( FrameworkRunner.class ) @Ignore -public class SubentryServiceIT extends AbstractTestUnit +public class SubentryServiceIT extends AbstractLdapTestUnit { public Attributes getTestEntry( String cn ) Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceObjectClassChangeHandlingIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceObjectClassChangeHandlingIT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceObjectClassChangeHandlingIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceObjectClassChangeHandlingIT.java Tue Dec 29 16:36:11 2009 @@ -41,7 +41,7 @@ import org.apache.directory.server.core.annotations.CreateDS; import org.apache.directory.server.core.factory.DefaultDirectoryServiceFactory; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.junit.Test; @@ -57,7 +57,7 @@ */ @RunWith ( FrameworkRunner.class ) @CreateDS( factory=DefaultDirectoryServiceFactory.class, name="SubentryServiceObjectClassChangeHandlingIT-class" ) -public class SubentryServiceObjectClassChangeHandlingIT extends AbstractTestUnit +public class SubentryServiceObjectClassChangeHandlingIT extends AbstractLdapTestUnit { public Attributes getTestEntry( String cn ) Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/trigger/SubentryServiceForTriggersIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/trigger/SubentryServiceForTriggersIT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/trigger/SubentryServiceForTriggersIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/trigger/SubentryServiceForTriggersIT.java Tue Dec 29 16:36:11 2009 @@ -41,7 +41,7 @@ import javax.naming.directory.SearchResult; import javax.naming.ldap.LdapContext; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.constants.SchemaConstants; import org.apache.directory.shared.ldap.exception.LdapNoSuchAttributeException; @@ -59,7 +59,7 @@ @RunWith ( FrameworkRunner.class ) @Ignore ( "Reverts are failing to delete marked entries. Fixing this " + "problem in testEntryAdd() will fix it all over." ) -public class SubentryServiceForTriggersIT extends AbstractTestUnit +public class SubentryServiceForTriggersIT extends AbstractLdapTestUnit { public Attributes getTestEntry( String cn ) Modified: directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/trigger/TriggerInterceptorIT.java URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/trigger/TriggerInterceptorIT.java?rev=894433&r1=894432&r2=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/trigger/TriggerInterceptorIT.java (original) +++ directory/apacheds/branches/apacheds-schema/core-integ/src/test/java/org/apache/directory/server/core/trigger/TriggerInterceptorIT.java Tue Dec 29 16:36:11 2009 @@ -31,7 +31,7 @@ import javax.naming.directory.BasicAttributes; import javax.naming.ldap.LdapContext; -import org.apache.directory.server.core.integ.AbstractTestUnit; +import org.apache.directory.server.core.integ.AbstractLdapTestUnit; import org.apache.directory.server.core.integ.FrameworkRunner; import org.apache.directory.shared.ldap.sp.JavaStoredProcUtils; import org.apache.directory.shared.ldap.trigger.TriggerUtils; @@ -49,7 +49,7 @@ */ @RunWith ( FrameworkRunner.class ) @Ignore -public class TriggerInterceptorIT extends AbstractTestUnit +public class TriggerInterceptorIT extends AbstractLdapTestUnit { LdapContext spCtx; Copied: directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/AbstractLdapTestUnit.java (from r894422, directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/AbstractTestUnit.java) URL: http://svn.apache.org/viewvc/directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/AbstractLdapTestUnit.java?p2=directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/AbstractLdapTestUnit.java&p1=directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/AbstractTestUnit.java&r1=894422&r2=894433&rev=894433&view=diff ============================================================================== --- directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/AbstractTestUnit.java (original) +++ directory/apacheds/branches/apacheds-schema/test-framework/src/main/java/org/apache/directory/server/core/integ/AbstractLdapTestUnit.java Tue Dec 29 16:36:11 2009 @@ -28,7 +28,7 @@ * @author Apache Directory Project * @version $Rev$, $Date$ */ -public abstract class AbstractTestUnit +public abstract class AbstractLdapTestUnit { /** The used DirectoryService instance */ public static DirectoryService service;