You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by ak...@apache.org on 2007/12/09 06:54:56 UTC
svn commit: r602639 - in /directory/apacheds/branches/bigbang/core-integ/src:
main/java/org/apache/directory/server/core/integ/
main/java/org/apache/directory/server/core/integ/annotations/
test/java/org/apache/directory/server/core/ test/java/org/apac...
Author: akarasulu
Date: Sat Dec 8 21:54:54 2007
New Revision: 602639
URL: http://svn.apache.org/viewvc?rev=602639&view=rev
Log:
Fix for DIRSERVER-1110
Added:
directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/ServiceCleanupLevel.java
- copied, changed from r602637, directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/ServiceScope.java
directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/annotations/CleanupLevel.java
- copied, changed from r602637, directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/annotations/Scope.java
Removed:
directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/ServiceScope.java
directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/annotations/Scope.java
Modified:
directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/CiRunner.java
directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/CiSuite.java
directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/InheritableSettings.java
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/StockCoreISuite.java
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzISuite.java
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/event/EventServiceIT.java
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchWithIndicesITest.java
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaISuite.java
directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java
Modified: directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/CiRunner.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/CiRunner.java?rev=602639&r1=602638&r2=602639&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/CiRunner.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/CiRunner.java Sat Dec 8 21:54:54 2007
@@ -70,8 +70,8 @@
public void run( final RunNotifier notifier )
{
super.run( notifier );
- ServiceScope scope = getSettings().getScope();
- if ( scope == ServiceScope.TESTCLASS )
+ ServiceCleanupLevel cleanupLevel = getSettings().getCleanupLevel();
+ if ( cleanupLevel == ServiceCleanupLevel.TESTCLASS )
{
try
{
@@ -95,6 +95,23 @@
LOG.debug( "About to invoke test method {}", method.getName() );
Description description = methodDescription( method );
test( getTestClass(), wrapMethod( method ), notifier, new InheritableSettings( description, getSettings() ) );
+
+ ServiceCleanupLevel cleanupLevel = getSettings().getCleanupLevel();
+ if ( cleanupLevel == ServiceCleanupLevel.TESTMETHOD )
+ {
+ try
+ {
+ shutdown();
+ cleanup();
+ destroy();
+ }
+ catch ( Exception e )
+ {
+ LOG.error( "Encountered exception while trying to cleanup after test class: "
+ + this.getDescription().getDisplayName(), e );
+ notifier.fireTestFailure( new Failure( getDescription(), e ) );
+ }
+ }
}
Modified: directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/CiSuite.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/CiSuite.java?rev=602639&r1=602638&r2=602639&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/CiSuite.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/CiSuite.java Sat Dec 8 21:54:54 2007
@@ -112,7 +112,7 @@
* running tests.
*/
- if ( settings.getScope() != ServiceScope.TESTSYSTEM )
+ if ( settings.getCleanupLevel() != ServiceCleanupLevel.TESTSYSTEM )
{
try
{
Modified: directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/InheritableSettings.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/InheritableSettings.java?rev=602639&r1=602638&r2=602639&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/InheritableSettings.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/InheritableSettings.java Sat Dec 8 21:54:54 2007
@@ -45,7 +45,7 @@
/** junit test description containing all annotations queried */
private final Description description;
/** default scope of a service */
- private static final ServiceScope DEFAULT_SCOPE = ServiceScope.TESTSUITE;
+ private static final ServiceCleanupLevel DEFAULT_CLEANUP_LEVEL = ServiceCleanupLevel.TESTSUITE;
/**
@@ -200,18 +200,18 @@
}
- public ServiceScope getScope()
+ public ServiceCleanupLevel getCleanupLevel()
{
- ServiceScope parentScope = DEFAULT_SCOPE;
+ ServiceCleanupLevel parentCleanupLevel = DEFAULT_CLEANUP_LEVEL;
if ( parent != null )
{
- parentScope = parent.getScope();
+ parentCleanupLevel = parent.getCleanupLevel();
}
- Scope annotation = description.getAnnotation( Scope.class );
+ CleanupLevel annotation = description.getAnnotation( CleanupLevel.class );
if ( annotation == null )
{
- return parentScope;
+ return parentCleanupLevel;
}
else
{
Copied: directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/ServiceCleanupLevel.java (from r602637, directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/ServiceScope.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/ServiceCleanupLevel.java?p2=directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/ServiceCleanupLevel.java&p1=directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/ServiceScope.java&r1=602637&r2=602639&rev=602639&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/ServiceScope.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/ServiceCleanupLevel.java Sat Dec 8 21:54:54 2007
@@ -25,11 +25,12 @@
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
* @version $Rev$, $Date$
*/
-public enum ServiceScope
+public enum ServiceCleanupLevel
{
TESTSUITE( 0, "service has test suite level scope" ),
TESTCLASS( 1, "service has test class level scope" ),
- TESTSYSTEM( 2, "service has test system level scope" );
+ TESTSYSTEM( 2, "service has test system level scope" ),
+ TESTMETHOD( 3, "service has test method level scope" );
public final int ordinal;
public final String description;
@@ -37,9 +38,10 @@
public static final int TESTSUITE_ORDINAL = 0;
public static final int TESTCLASS_ORDINAL = 1;
public static final int TESTSYSTEM_ORDINAL = 2;
+ public static final int TESTMETHOD_ORDINAL = 2;
- ServiceScope( int ordinal, String description )
+ ServiceCleanupLevel( int ordinal, String description )
{
this.ordinal = ordinal;
this.description = description;
Copied: directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/annotations/CleanupLevel.java (from r602637, directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/annotations/Scope.java)
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/annotations/CleanupLevel.java?p2=directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/annotations/CleanupLevel.java&p1=directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/annotations/Scope.java&r1=602637&r2=602639&rev=602639&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/annotations/Scope.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/main/java/org/apache/directory/server/core/integ/annotations/CleanupLevel.java Sat Dec 8 21:54:54 2007
@@ -19,7 +19,7 @@
*/
package org.apache.directory.server.core.integ.annotations;
-import org.apache.directory.server.core.integ.ServiceScope;
+import org.apache.directory.server.core.integ.ServiceCleanupLevel;
import java.lang.annotation.*;
@@ -34,7 +34,7 @@
@Inherited
@Retention ( RetentionPolicy.RUNTIME )
@Target ( { ElementType.METHOD, ElementType.TYPE } )
-public @interface Scope
+public @interface CleanupLevel
{
- ServiceScope value();
+ ServiceCleanupLevel value();
}
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/StockCoreISuite.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/StockCoreISuite.java?rev=602639&r1=602638&r2=602639&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/StockCoreISuite.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/StockCoreISuite.java Sat Dec 8 21:54:54 2007
@@ -25,10 +25,10 @@
import org.apache.directory.server.core.event.EventServiceIT;
import org.apache.directory.server.core.exception.ExceptionServiceIT;
import org.apache.directory.server.core.integ.CiSuite;
-import org.apache.directory.server.core.integ.ServiceScope;
+import org.apache.directory.server.core.integ.ServiceCleanupLevel;
import org.apache.directory.server.core.integ.SetupMode;
import org.apache.directory.server.core.integ.annotations.Mode;
-import org.apache.directory.server.core.integ.annotations.Scope;
+import org.apache.directory.server.core.integ.annotations.CleanupLevel;
import org.apache.directory.server.core.jndi.*;
import org.apache.directory.server.core.normalization.NormalizationServiceIT;
import org.apache.directory.server.core.operational.OperationalAttributeServiceIT;
@@ -85,7 +85,7 @@
ReferralIT.class,
PartitionConfigurationIT.class // Leaves the server in a bad state (partition removal is incomplete)
} )
-@Scope ( ServiceScope.TESTSUITE )
+@CleanupLevel ( ServiceCleanupLevel.TESTSUITE )
@Mode ( SetupMode.ROLLBACK )
public class StockCoreISuite
{
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzISuite.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzISuite.java?rev=602639&r1=602638&r2=602639&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzISuite.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzISuite.java Sat Dec 8 21:54:54 2007
@@ -19,13 +19,9 @@
package org.apache.directory.server.core.authz;
import org.apache.directory.server.core.integ.CiSuite;
-import org.apache.directory.server.core.integ.ServiceScope;
-import org.apache.directory.server.core.integ.SetupMode;
-import org.apache.directory.server.core.integ.annotations.Mode;
-import org.apache.directory.server.core.integ.annotations.Scope;
-import org.apache.directory.server.core.schema.*;
+import org.apache.directory.server.core.integ.ServiceCleanupLevel;
+import org.apache.directory.server.core.integ.annotations.CleanupLevel;
import org.junit.runner.RunWith;
-import org.junit.Ignore;
import org.junit.runners.Suite;
@@ -51,7 +47,7 @@
// the default factory service running instead of
// one with
} )
-@Scope ( ServiceScope.TESTSUITE )
+@CleanupLevel ( ServiceCleanupLevel.TESTSUITE )
public class AuthzISuite
{
}
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java?rev=602639&r1=602638&r2=602639&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java Sat Dec 8 21:54:54 2007
@@ -22,9 +22,9 @@
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.integ.CiRunner;
-import org.apache.directory.server.core.integ.ServiceScope;
+import org.apache.directory.server.core.integ.ServiceCleanupLevel;
import org.apache.directory.server.core.integ.SetupMode;
-import org.apache.directory.server.core.integ.annotations.Scope;
+import org.apache.directory.server.core.integ.annotations.CleanupLevel;
import org.apache.directory.server.core.integ.annotations.Mode;
import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
import org.apache.directory.shared.ldap.message.AttributeImpl;
@@ -48,7 +48,7 @@
* @version $Rev$
*/
@RunWith ( CiRunner.class )
-@Scope ( ServiceScope.TESTSUITE )
+@CleanupLevel ( ServiceCleanupLevel.TESTSUITE )
@Mode ( SetupMode.ROLLBACK )
public class CollectiveAttributeServiceIT
{
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java?rev=602639&r1=602638&r2=602639&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java Sat Dec 8 21:54:54 2007
@@ -23,8 +23,6 @@
import junit.framework.Assert;
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.integ.CiRunner;
-import org.apache.directory.server.core.integ.ServiceScope;
-import org.apache.directory.server.core.integ.annotations.Scope;
import org.apache.directory.server.core.jndi.CoreContextFactory;
import org.apache.directory.server.core.partition.Partition;
import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/event/EventServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/event/EventServiceIT.java?rev=602639&r1=602638&r2=602639&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/event/EventServiceIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/event/EventServiceIT.java Sat Dec 8 21:54:54 2007
@@ -23,8 +23,8 @@
import org.apache.directory.server.core.DirectoryService;
import org.apache.directory.server.core.integ.CiRunner;
import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
-import org.apache.directory.server.core.integ.SetupMode;
-import org.apache.directory.server.core.integ.annotations.Mode;
+import org.apache.directory.server.core.integ.ServiceCleanupLevel;
+import org.apache.directory.server.core.integ.annotations.CleanupLevel;
import org.apache.directory.shared.ldap.message.AttributeImpl;
import org.apache.directory.shared.ldap.message.AttributesImpl;
import static org.junit.Assert.assertEquals;
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java?rev=602639&r1=602638&r2=602639&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseITest.java Sat Dec 8 21:54:54 2007
@@ -25,9 +25,9 @@
import org.apache.directory.server.core.integ.CiRunner;
import org.apache.directory.server.core.integ.DirectoryServiceFactory;
import static org.apache.directory.server.core.integ.IntegrationUtils.getContext;
-import org.apache.directory.server.core.integ.ServiceScope;
+import org.apache.directory.server.core.integ.ServiceCleanupLevel;
import org.apache.directory.server.core.integ.annotations.Factory;
-import org.apache.directory.server.core.integ.annotations.Scope;
+import org.apache.directory.server.core.integ.annotations.CleanupLevel;
import org.apache.directory.server.core.partition.Partition;
import org.apache.directory.server.core.partition.impl.btree.Index;
import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
@@ -55,7 +55,7 @@
* @version $Rev$
*/
@RunWith ( CiRunner.class )
-@Scope ( ServiceScope.TESTCLASS )
+@CleanupLevel ( ServiceCleanupLevel.TESTCLASS )
@Factory ( MixedCaseITest.MyFactory.class )
public class MixedCaseITest
{
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchWithIndicesITest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchWithIndicesITest.java?rev=602639&r1=602638&r2=602639&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchWithIndicesITest.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/jndi/SearchWithIndicesITest.java Sat Dec 8 21:54:54 2007
@@ -26,9 +26,9 @@
import org.apache.directory.server.core.integ.DirectoryServiceFactory;
import static org.apache.directory.server.core.integ.IntegrationUtils.getSchemaContext;
import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
-import org.apache.directory.server.core.integ.ServiceScope;
+import org.apache.directory.server.core.integ.ServiceCleanupLevel;
import org.apache.directory.server.core.integ.annotations.Factory;
-import org.apache.directory.server.core.integ.annotations.Scope;
+import org.apache.directory.server.core.integ.annotations.CleanupLevel;
import org.apache.directory.server.core.partition.impl.btree.Index;
import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmIndex;
import org.apache.directory.server.core.partition.impl.btree.jdbm.JdbmPartition;
@@ -55,7 +55,7 @@
* @version $Rev$
*/
@RunWith ( CiRunner.class )
-@Scope ( ServiceScope.TESTCLASS )
+@CleanupLevel ( ServiceCleanupLevel.TESTCLASS )
@Factory ( SearchWithIndicesITest.MyFactory.class )
public class SearchWithIndicesITest
{
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaISuite.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaISuite.java?rev=602639&r1=602638&r2=602639&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaISuite.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaISuite.java Sat Dec 8 21:54:54 2007
@@ -19,12 +19,9 @@
package org.apache.directory.server.core.schema;
import org.apache.directory.server.core.integ.CiSuite;
-import org.apache.directory.server.core.integ.ServiceScope;
-import org.apache.directory.server.core.integ.SetupMode;
-import org.apache.directory.server.core.integ.annotations.Mode;
-import org.apache.directory.server.core.integ.annotations.Scope;
+import org.apache.directory.server.core.integ.ServiceCleanupLevel;
+import org.apache.directory.server.core.integ.annotations.CleanupLevel;
import org.junit.runner.RunWith;
-import org.junit.Ignore;
import org.junit.runners.Suite;
@@ -49,7 +46,7 @@
SubschemaSubentryIT.class,
SchemaServiceIT.class
} )
-@Scope ( ServiceScope.TESTSUITE )
+@CleanupLevel ( ServiceCleanupLevel.TESTSUITE )
public class SchemaISuite
{
}
Modified: directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java?rev=602639&r1=602638&r2=602639&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java (original)
+++ directory/apacheds/branches/bigbang/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java Sat Dec 8 21:54:54 2007
@@ -24,10 +24,6 @@
import org.apache.directory.server.core.integ.CiRunner;
import static org.apache.directory.server.core.integ.IntegrationUtils.getRootContext;
import static org.apache.directory.server.core.integ.IntegrationUtils.getSystemContext;
-import org.apache.directory.server.core.integ.ServiceScope;
-import org.apache.directory.server.core.integ.SetupMode;
-import org.apache.directory.server.core.integ.annotations.Mode;
-import org.apache.directory.server.core.integ.annotations.Scope;
import org.apache.directory.shared.ldap.constants.SchemaConstants;
import org.apache.directory.shared.ldap.exception.LdapSchemaViolationException;
import org.apache.directory.shared.ldap.ldif.Entry;