[340961] Enable ReadAccessHandlers to replace revisions

https://bugs.eclipse.org/bugs/show_bug.cgi?id=340961

53 files changed, 142 insertions, 142 deletions

diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/bugzillas/Bugzilla_321024_Test.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/bugzillas/Bugzilla_321024_Test.java
index 27a9047830..949b6d0536 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/bugzillas/Bugzilla_321024_Test.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/bugzillas/Bugzilla_321024_Test.java
@@ -11,7 +11,7 @@
 package org.eclipse.emf.cdo.dawn.tests.bugzillas;
 
 import org.eclipse.emf.cdo.dawn.tests.AbstractDawnGEFTest;
-import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.NeedsCleanRepo;
+import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.CleanRepositoriesBefore;
 
 import org.eclipse.swtbot.eclipse.gef.finder.widgets.SWTBotGefEditor;
 import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner;
@@ -23,7 +23,7 @@ import org.junit.runner.RunWith;
 /**
  * @author Martin Fluegge
  */
-@NeedsCleanRepo
+@CleanRepositoriesBefore
 @RunWith(SWTBotJunit4ClassRunner.class)
 public class Bugzilla_321024_Test extends AbstractDawnGEFTest
 {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/bugzillas/Bugzilla_333291_Test.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/bugzillas/Bugzilla_333291_Test.java
index 2f14350eda..2f2c6f638c 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/bugzillas/Bugzilla_333291_Test.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/bugzillas/Bugzilla_333291_Test.java
@@ -19,7 +19,7 @@ import org.eclipse.emf.cdo.dawn.tests.ui.util.DawnSWTBotUtil;
 import org.eclipse.emf.cdo.dawn.util.connection.CDOConnectionUtil;
 import org.eclipse.emf.cdo.eresource.CDOResource;
 import org.eclipse.emf.cdo.session.CDOSession;
-import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.NeedsCleanRepo;
+import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.CleanRepositoriesBefore;
 import org.eclipse.emf.cdo.transaction.CDOTransaction;
 import org.eclipse.emf.cdo.view.CDOView;
 
@@ -39,7 +39,7 @@ import org.junit.runner.RunWith;
 /**
  * @author Martin Fluegge
  */
-@NeedsCleanRepo
+@CleanRepositoriesBefore
 @RunWith(SWTBotJunit4ClassRunner.class)
 public class Bugzilla_333291_Test extends AbstractDawnEMFTest
 {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/DawnPreferencesTest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/DawnPreferencesTest.java
index 420d4ba8ac..c029dd615c 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/DawnPreferencesTest.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/DawnPreferencesTest.java
@@ -11,7 +11,7 @@
 package org.eclipse.emf.cdo.dawn.tests.ui;
 
 import org.eclipse.emf.cdo.dawn.tests.AbstractDawnUITest;
-import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.NeedsCleanRepo;
+import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.CleanRepositoriesBefore;
 
 import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
 import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner;
@@ -24,7 +24,7 @@ import org.junit.runner.RunWith;
 /**
  * @author Martin Fluegge
  */
-@NeedsCleanRepo
+@CleanRepositoriesBefore
 @RunWith(SWTBotJunit4ClassRunner.class)
 public class DawnPreferencesTest extends AbstractDawnUITest<SWTWorkbenchBot>
 {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/DawnProjectExplorerTest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/DawnProjectExplorerTest.java
index d47e730fe8..b7e136ac25 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/DawnProjectExplorerTest.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/DawnProjectExplorerTest.java
@@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.dawn.tests.ui;
 
 import org.eclipse.emf.cdo.dawn.tests.AbstractDawnUITest;
 import org.eclipse.emf.cdo.dawn.ui.views.DawnExplorer;
-import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.NeedsCleanRepo;
+import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.CleanRepositoriesBefore;
 
 import org.eclipse.swtbot.eclipse.finder.SWTWorkbenchBot;
 import org.eclipse.swtbot.eclipse.finder.widgets.SWTBotView;
@@ -26,7 +26,7 @@ import org.junit.runner.RunWith;
 /**
  * @author Martin Fluegge
  */
-@NeedsCleanRepo
+@CleanRepositoriesBefore
 @RunWith(SWTBotJunit4ClassRunner.class)
 public class DawnProjectExplorerTest extends AbstractDawnUITest<SWTWorkbenchBot>
 {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/emf/DawnEMFCreationWizardTest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/emf/DawnEMFCreationWizardTest.java
index 4eff3e9ed9..cd1d232037 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/emf/DawnEMFCreationWizardTest.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/emf/DawnEMFCreationWizardTest.java
@@ -13,7 +13,7 @@ package org.eclipse.emf.cdo.dawn.tests.ui.emf;
 import org.eclipse.emf.cdo.dawn.tests.AbstractDawnEMFTest;
 import org.eclipse.emf.cdo.dawn.tests.ui.util.DawnAcoreTestUtil;
 import org.eclipse.emf.cdo.session.CDOSession;
-import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.NeedsCleanRepo;
+import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.CleanRepositoriesBefore;
 import org.eclipse.emf.cdo.transaction.CDOTransaction;
 
 import org.eclipse.emf.common.util.URI;
@@ -37,7 +37,7 @@ import org.junit.runner.RunWith;
 /**
  * @author Martin Fluegge
  */
-@NeedsCleanRepo
+@CleanRepositoriesBefore
 @RunWith(SWTBotJunit4ClassRunner.class)
 public class DawnEMFCreationWizardTest extends AbstractDawnEMFTest
 {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/emf/DawnEMFHandleEditorTest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/emf/DawnEMFHandleEditorTest.java
index 8eabdbf178..21a226e083 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/emf/DawnEMFHandleEditorTest.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/emf/DawnEMFHandleEditorTest.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.cdo.dawn.tests.ui.util.DawnSWTBotUtil;
 import org.eclipse.emf.cdo.dawn.util.connection.CDOConnectionUtil;
 import org.eclipse.emf.cdo.eresource.CDOResource;
 import org.eclipse.emf.cdo.session.CDOSession;
-import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.NeedsCleanRepo;
+import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.CleanRepositoriesBefore;
 import org.eclipse.emf.cdo.transaction.CDOTransaction;
 import org.eclipse.emf.cdo.view.CDOView;
 
@@ -40,7 +40,7 @@ import org.junit.runner.RunWith;
 /**
  * @author Martin Fluegge
  */
-@NeedsCleanRepo
+@CleanRepositoriesBefore
 @RunWith(SWTBotJunit4ClassRunner.class)
 public class DawnEMFHandleEditorTest extends AbstractDawnEMFTest
 {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/emf/EMFEditorRollbackTest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/emf/EMFEditorRollbackTest.java
index 27a265f595..9407923d17 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/emf/EMFEditorRollbackTest.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/emf/EMFEditorRollbackTest.java
@@ -11,7 +11,7 @@
 package org.eclipse.emf.cdo.dawn.tests.ui.emf;
 
 import org.eclipse.emf.cdo.dawn.tests.AbstractDawnEMFTest;
-import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.NeedsCleanRepo;
+import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.CleanRepositoriesBefore;
 
 import org.eclipse.swtbot.swt.finder.junit.SWTBotJunit4ClassRunner;
 
@@ -21,7 +21,7 @@ import org.junit.runner.RunWith;
 /**
  * @author Martin Fluegge
  */
-@NeedsCleanRepo
+@CleanRepositoriesBefore
 @RunWith(SWTBotJunit4ClassRunner.class)
 public class EMFEditorRollbackTest extends AbstractDawnEMFTest
 {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/gmf/ConflictTest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/gmf/ConflictTest.java
index fb3970eacc..da775ed9a4 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/gmf/ConflictTest.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/gmf/ConflictTest.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.cdo.dawn.tests.ui.util.DawnAcoreTestUtil;
 import org.eclipse.emf.cdo.dawn.tests.ui.util.DawnSWTBotUtil;
 import org.eclipse.emf.cdo.eresource.CDOResource;
 import org.eclipse.emf.cdo.session.CDOSession;
-import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.NeedsCleanRepo;
+import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.CleanRepositoriesBefore;
 import org.eclipse.emf.cdo.transaction.CDOTransaction;
 
 import org.eclipse.emf.edit.domain.EditingDomain;
@@ -39,7 +39,7 @@ import java.util.List;
 /**
  * @author Martin Fluegge
  */
-@NeedsCleanRepo
+@CleanRepositoriesBefore
 @RunWith(SWTBotJunit4ClassRunner.class)
 public class ConflictTest extends AbstractDawnGEFTest
 {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/gmf/DawnBasicGMFUITest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/gmf/DawnBasicGMFUITest.java
index 899a670330..9915d5491b 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/gmf/DawnBasicGMFUITest.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/gmf/DawnBasicGMFUITest.java
@@ -17,7 +17,7 @@ import org.eclipse.emf.cdo.dawn.ui.helper.EditorDescriptionHelper;
 import org.eclipse.emf.cdo.eresource.CDOResource;
 import org.eclipse.emf.cdo.session.CDOSession;
 import org.eclipse.emf.cdo.tests.AbstractCDOTest;
-import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.NeedsCleanRepo;
+import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.CleanRepositoriesBefore;
 import org.eclipse.emf.cdo.transaction.CDOTransaction;
 
 import org.eclipse.emf.common.util.URI;
@@ -30,7 +30,7 @@ import org.eclipse.ui.PlatformUI;
 /**
  * @author Martin Fluegge
  */
-@NeedsCleanRepo
+@CleanRepositoriesBefore
 public class DawnBasicGMFUITest extends AbstractCDOTest
 {
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/gmf/DawnCreationWizardSWTBotTest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/gmf/DawnCreationWizardSWTBotTest.java
index e7d9002274..251f0f7c96 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/gmf/DawnCreationWizardSWTBotTest.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/gmf/DawnCreationWizardSWTBotTest.java
@@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.dawn.tests.ui.gmf;
 
 import org.eclipse.emf.cdo.dawn.tests.AbstractDawnGEFTest;
 import org.eclipse.emf.cdo.session.CDOSession;
-import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.NeedsCleanRepo;
+import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.CleanRepositoriesBefore;
 import org.eclipse.emf.cdo.transaction.CDOTransaction;
 
 import org.eclipse.emf.common.util.URI;
@@ -35,7 +35,7 @@ import org.junit.runner.RunWith;
 /**
  * @author Martin Fluegge
  */
-@NeedsCleanRepo
+@CleanRepositoriesBefore
 @RunWith(SWTBotJunit4ClassRunner.class)
 public class DawnCreationWizardSWTBotTest extends AbstractDawnGEFTest
 {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/gmf/MultipleResourcesTest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/gmf/MultipleResourcesTest.java
index ad89806f5d..6347f18d01 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/gmf/MultipleResourcesTest.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/gmf/MultipleResourcesTest.java
@@ -23,7 +23,7 @@ import org.eclipse.emf.cdo.dawn.tests.ui.util.DawnAcoreTestUtil;
 import org.eclipse.emf.cdo.dawn.tests.ui.util.DawnSWTBotUtil;
 import org.eclipse.emf.cdo.eresource.CDOResource;
 import org.eclipse.emf.cdo.session.CDOSession;
-import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.NeedsCleanRepo;
+import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.CleanRepositoriesBefore;
 import org.eclipse.emf.cdo.transaction.CDOTransaction;
 
 import org.eclipse.emf.ecore.util.EcoreUtil;
@@ -50,7 +50,7 @@ import java.util.List;
 /**
  * @author Martin Fluegge
  */
-@NeedsCleanRepo
+@CleanRepositoriesBefore
 @RunWith(SWTBotJunit4ClassRunner.class)
 public class MultipleResourcesTest extends AbstractDawnGEFTest
 {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/gmf/RollbackTest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/gmf/RollbackTest.java
index a693ef6abb..90dffc4699 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/gmf/RollbackTest.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/gmf/RollbackTest.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.cdo.dawn.tests.ui.util.DawnAcoreTestUtil;
 import org.eclipse.emf.cdo.dawn.tests.ui.util.DawnSWTBotUtil;
 import org.eclipse.emf.cdo.eresource.CDOResource;
 import org.eclipse.emf.cdo.session.CDOSession;
-import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.NeedsCleanRepo;
+import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.CleanRepositoriesBefore;
 import org.eclipse.emf.cdo.transaction.CDOTransaction;
 
 import org.eclipse.gef.EditPart;
@@ -34,7 +34,7 @@ import java.util.List;
 /**
  * @author Martin Fluegge
  */
-@NeedsCleanRepo
+@CleanRepositoriesBefore
 @RunWith(SWTBotJunit4ClassRunner.class)
 public class RollbackTest extends AbstractDawnGEFTest
 {
diff --git a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/gmf/SimpleDiagramTest.java b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/gmf/SimpleDiagramTest.java
index 8197561dad..225dc8562c 100644
--- a/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/gmf/SimpleDiagramTest.java
+++ b/plugins/org.eclipse.emf.cdo.dawn.tests/src/org/eclipse/emf/cdo/dawn/tests/ui/gmf/SimpleDiagramTest.java
@@ -20,7 +20,7 @@ import org.eclipse.emf.cdo.dawn.tests.AbstractDawnGEFTest;
 import org.eclipse.emf.cdo.dawn.tests.ui.util.DawnAcoreTestUtil;
 import org.eclipse.emf.cdo.eresource.CDOResource;
 import org.eclipse.emf.cdo.session.CDOSession;
-import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.NeedsCleanRepo;
+import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.CleanRepositoriesBefore;
 import org.eclipse.emf.cdo.view.CDOView;
 
 import org.eclipse.emf.common.util.EList;
@@ -41,7 +41,7 @@ import java.util.List;
 /**
  * @author Martin Fluegge
  */
-@NeedsCleanRepo
+@CleanRepositoriesBefore
 @RunWith(SWTBotJunit4ClassRunner.class)
 public class SimpleDiagramTest extends AbstractDawnGEFTest
 {
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DISABLE_XATransactionTest.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DISABLE_XATransactionTest.java
index fe297f244a..95dd571d61 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DISABLE_XATransactionTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/DISABLE_XATransactionTest.java
@@ -31,7 +31,7 @@ public class DISABLE_XATransactionTest extends XATransactionTest
     super.testCommitFromTransactionDisabled();
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   @Override
   public void test_ExceptionInReadingStream() throws Exception
   {
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/SQLQueryTest.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/SQLQueryTest.java
index 3d6fd81b5f..30646c87fe 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/SQLQueryTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/SQLQueryTest.java
@@ -98,7 +98,7 @@ public class SQLQueryTest extends AbstractCDOTest
     enableConsole();
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testFunctions() throws Exception
   {
     msg("Opening session");
@@ -138,7 +138,7 @@ public class SQLQueryTest extends AbstractCDOTest
     enableConsole();
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testComplexQuerySalesOrderJoinCustomerProduct() throws Exception
   {
     msg("Opening session");
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AttributeTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AttributeTest.java
index a7ebab4bff..721bb72213 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AttributeTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AttributeTest.java
@@ -209,7 +209,7 @@ public class AttributeTest extends AbstractCDOTest
     }
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testBigDecimalAndBigInteger() throws Exception
   {
     BigDecimal bigDecimal = new BigDecimal(10);
@@ -257,7 +257,7 @@ public class AttributeTest extends AbstractCDOTest
     }
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testBigDecimalAndBigIntegerNull() throws Exception
   {
     BigDecimal bigDecimal = null;
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/BackupTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/BackupTest.java
index e73e02ac3d..9a9e059354 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/BackupTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/BackupTest.java
@@ -18,7 +18,7 @@ import org.eclipse.emf.cdo.server.CDOServerImporter;
 import org.eclipse.emf.cdo.session.CDOSession;
 import org.eclipse.emf.cdo.spi.server.InternalRepository;
 import org.eclipse.emf.cdo.tests.bundle.OM;
-import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.NeedsCleanRepo;
+import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.CleanRepositoriesBefore;
 import org.eclipse.emf.cdo.tests.model1.Customer;
 import org.eclipse.emf.cdo.tests.model1.PurchaseOrder;
 import org.eclipse.emf.cdo.tests.model1.SalesOrder;
@@ -50,7 +50,7 @@ import java.util.Date;
 /**
  * @author Eike Stepper
  */
-@NeedsCleanRepo
+@CleanRepositoriesBefore
 public class BackupTest extends AbstractCDOTest
 {
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/BranchingTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/BranchingTest.java
index c945c30ddf..83ed2c697b 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/BranchingTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/BranchingTest.java
@@ -25,7 +25,7 @@ import org.eclipse.emf.cdo.internal.server.mem.MEMStore;
 import org.eclipse.emf.cdo.server.IStore;
 import org.eclipse.emf.cdo.session.CDOSession;
 import org.eclipse.emf.cdo.spi.common.branch.CDOBranchUtil;
-import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.NeedsCleanRepo;
+import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.CleanRepositoriesBefore;
 import org.eclipse.emf.cdo.tests.model1.OrderDetail;
 import org.eclipse.emf.cdo.tests.model1.Product1;
 import org.eclipse.emf.cdo.transaction.CDOTransaction;
@@ -47,7 +47,7 @@ import java.util.Map;
 /**
  * @author Eike Stepper
  */
-@NeedsCleanRepo
+@CleanRepositoriesBefore
 public class BranchingTest extends AbstractCDOTest
 {
   protected CDOSession session1;
@@ -87,7 +87,7 @@ public class BranchingTest extends AbstractCDOTest
     return openSession();
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testMainBranch() throws Exception
   {
     CDOSession session = openSession1();
@@ -107,7 +107,7 @@ public class BranchingTest extends AbstractCDOTest
     session.close();
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testCreateBranch() throws Exception
   {
     CDOSession session = openSession1();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/BranchingWithCacheClearTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/BranchingWithCacheClearTest.java
index 97d40fafa5..0e76b9f593 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/BranchingWithCacheClearTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/BranchingWithCacheClearTest.java
@@ -10,12 +10,12 @@
  */
 package org.eclipse.emf.cdo.tests;
 
-import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.NeedsCleanRepo;
+import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.CleanRepositoriesBefore;
 
 /**
  * @author Eike Stepper
  */
-@NeedsCleanRepo
+@CleanRepositoriesBefore
 public class BranchingWithCacheClearTest extends BranchingTest
 {
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CommitInfoTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CommitInfoTest.java
index a8212cae8b..5fd41eb974 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CommitInfoTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CommitInfoTest.java
@@ -122,7 +122,7 @@ public class CommitInfoTest extends AbstractCDOTest
     assertEquals(comment, commitInfo.getComment());
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testServerTimestamp() throws Exception
   {
     skipMongo();
@@ -146,7 +146,7 @@ public class CommitInfoTest extends AbstractCDOTest
     assertEquals(commitInfo.getTimeStamp(), infos.get(1).getTimeStamp());
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testServerBranch() throws Exception
   {
     skipMongo();
@@ -170,7 +170,7 @@ public class CommitInfoTest extends AbstractCDOTest
     assertEquals(commitInfo.getBranch(), infos.get(1).getBranch());
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testServerSubBranch() throws Exception
   {
     skipUnlessBranching();
@@ -194,7 +194,7 @@ public class CommitInfoTest extends AbstractCDOTest
     assertEquals(commitInfo.getBranch(), infos.get(1).getBranch());
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testServerUser() throws Exception
   {
     skipMongo();
@@ -227,7 +227,7 @@ public class CommitInfoTest extends AbstractCDOTest
     assertEquals(commitInfo.getUserID(), infos.get(1).getUserID());
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testServerComment() throws Exception
   {
     skipMongo();
@@ -253,7 +253,7 @@ public class CommitInfoTest extends AbstractCDOTest
     assertEquals(commitInfo.getComment(), infos.get(1).getComment());
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testServerTimestampWithBranch() throws Exception
   {
     skipMongo();
@@ -277,7 +277,7 @@ public class CommitInfoTest extends AbstractCDOTest
     assertEquals(commitInfo.getTimeStamp(), infos.get(1).getTimeStamp());
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testServerBranchWithBranch() throws Exception
   {
     skipMongo();
@@ -325,7 +325,7 @@ public class CommitInfoTest extends AbstractCDOTest
     assertEquals(commitInfo.getBranch(), infos.get(0).getBranch());
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testServerUserWithBranch() throws Exception
   {
     skipMongo();
@@ -359,7 +359,7 @@ public class CommitInfoTest extends AbstractCDOTest
     assertEquals(commitInfo.getUserID(), infos.get(1).getUserID());
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testServerCommentWithBranch() throws Exception
   {
     skipMongo();
@@ -510,7 +510,7 @@ public class CommitInfoTest extends AbstractCDOTest
     assertEquals(0, infos.size());
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testClientTimestamp() throws Exception
   {
     CDOSession session = openSession();
@@ -529,7 +529,7 @@ public class CommitInfoTest extends AbstractCDOTest
     assertEquals(commitInfo.getTimeStamp(), infos.get(1).getTimeStamp());
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testClientBranch() throws Exception
   {
     CDOSession session = openSession();
@@ -548,7 +548,7 @@ public class CommitInfoTest extends AbstractCDOTest
     assertEquals(commitInfo.getBranch(), infos.get(1).getBranch());
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testClientSubBranch() throws Exception
   {
     skipUnlessBranching();
@@ -570,7 +570,7 @@ public class CommitInfoTest extends AbstractCDOTest
     assertEquals(commitInfo.getBranch(), infos.get(1).getBranch());
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testClientUser() throws Exception
   {
     UserManager userManager = new UserManager();
@@ -599,7 +599,7 @@ public class CommitInfoTest extends AbstractCDOTest
     assertEquals(commitInfo.getUserID(), infos.get(1).getUserID());
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testClientComment() throws Exception
   {
     CDOSession session = openSession();
@@ -621,7 +621,7 @@ public class CommitInfoTest extends AbstractCDOTest
     assertEquals(commitInfo.getComment(), infos.get(1).getComment());
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testClientTimestampWithBranch() throws Exception
   {
     CDOSession session = openSession();
@@ -640,7 +640,7 @@ public class CommitInfoTest extends AbstractCDOTest
     assertEquals(commitInfo.getTimeStamp(), infos.get(1).getTimeStamp());
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testClientBranchWithBranch() throws Exception
   {
     CDOSession session = openSession();
@@ -680,7 +680,7 @@ public class CommitInfoTest extends AbstractCDOTest
     assertEquals(commitInfo.getBranch(), infos.get(0).getBranch());
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testClientUserWithBranch() throws Exception
   {
     UserManager userManager = new UserManager();
@@ -709,7 +709,7 @@ public class CommitInfoTest extends AbstractCDOTest
     assertEquals(commitInfo.getUserID(), infos.get(1).getUserID());
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testClientCommentWithBranch() throws Exception
   {
     CDOSession session = openSession();
@@ -845,7 +845,7 @@ public class CommitInfoTest extends AbstractCDOTest
     assertEquals(0, infos.size());
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testMultipleEntries() throws Exception
   {
     CDOSession session = openSession();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ConflictResolverTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ConflictResolverTest.java
index 3c6e1d701a..45ad26e667 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ConflictResolverTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ConflictResolverTest.java
@@ -12,7 +12,7 @@
 package org.eclipse.emf.cdo.tests;
 
 import org.eclipse.emf.cdo.session.CDOSession;
-import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.NeedsCleanRepo;
+import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.CleanRepositoriesBefore;
 import org.eclipse.emf.cdo.tests.model1.Address;
 import org.eclipse.emf.cdo.transaction.CDOConflictResolver;
 import org.eclipse.emf.cdo.transaction.CDOTransaction;
@@ -21,7 +21,7 @@ import org.eclipse.emf.cdo.util.CDOUtil;
 /**
  * @author Simon McDuff
  */
-@NeedsCleanRepo
+@CleanRepositoriesBefore
 public class ConflictResolverTest extends AbstractCDOTest
 {
   public void testMergeLocalChangesPerFeature_Basic() throws Exception
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ExternalReferenceTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ExternalReferenceTest.java
index 461123745e..f8ba119b02 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ExternalReferenceTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ExternalReferenceTest.java
@@ -59,7 +59,7 @@ public class ExternalReferenceTest extends AbstractCDOTest
 {
   final static public String REPOSITORY_B_NAME = "repo2";
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testExternalWithDynamicEObject() throws Exception
   {
     skipExternalReferences();
@@ -362,7 +362,7 @@ public class ExternalReferenceTest extends AbstractCDOTest
     }
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testUsingObjectsBetweenSameTransaction() throws Exception
   {
     CDOSession session = openSession();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/LobTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/LobTest.java
index bf56b75527..6bbd17dec7 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/LobTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/LobTest.java
@@ -67,7 +67,7 @@ public class LobTest extends AbstractCDOTest
     }
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testReadBlob() throws Exception
   {
     testCommitBlob();
@@ -120,7 +120,7 @@ public class LobTest extends AbstractCDOTest
     }
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testReadClob() throws Exception
   {
     testCommitClob();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/OCLQueryTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/OCLQueryTest.java
index 2cceade0a1..23fe47a0ce 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/OCLQueryTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/OCLQueryTest.java
@@ -12,7 +12,7 @@ package org.eclipse.emf.cdo.tests;
 
 import org.eclipse.emf.cdo.eresource.CDOResource;
 import org.eclipse.emf.cdo.session.CDOSession;
-import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.NeedsCleanRepo;
+import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.CleanRepositoriesBefore;
 import org.eclipse.emf.cdo.tests.model1.Customer;
 import org.eclipse.emf.cdo.tests.model1.OrderDetail;
 import org.eclipse.emf.cdo.tests.model1.Product1;
@@ -30,7 +30,7 @@ import java.util.List;
 /**
  * @author Eike Stepper
  */
-@NeedsCleanRepo
+@CleanRepositoriesBefore
 public class OCLQueryTest extends AbstractCDOTest
 {
   private static final int NUM_OF_PRODUCTS = 20;
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PackageRegistryTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PackageRegistryTest.java
index b03257619d..b20bc5e43d 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PackageRegistryTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PackageRegistryTest.java
@@ -130,7 +130,7 @@ public class PackageRegistryTest extends AbstractCDOTest
     session.close();
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testCommitNestedPackages() throws Exception
   {
     CDOSession session = openSession();
@@ -142,7 +142,7 @@ public class PackageRegistryTest extends AbstractCDOTest
     session.close();
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testCommitTopLevelPackages() throws Exception
   {
     CDOSession session = openSession();
@@ -378,7 +378,7 @@ public class PackageRegistryTest extends AbstractCDOTest
     }
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testDynamicPackageFactory() throws Exception
   {
     // -Dorg.eclipse.emf.ecore.EPackage.Registry.INSTANCE=org.eclipse.emf.ecore.impl.CDOPackageRegistryImpl
@@ -418,7 +418,7 @@ public class PackageRegistryTest extends AbstractCDOTest
     session.close();
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testDynamicPackageNewInstance() throws Exception
   {
     {
@@ -452,7 +452,7 @@ public class PackageRegistryTest extends AbstractCDOTest
     session.close();
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testDuplicatePackageRegistration() throws Exception
   {
     CDOSession session1 = openSession();
@@ -495,7 +495,7 @@ public class PackageRegistryTest extends AbstractCDOTest
     }
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testReuseCommittedPackage() throws Exception
   {
     final long timeStamp;
@@ -540,7 +540,7 @@ public class PackageRegistryTest extends AbstractCDOTest
     }
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testConcurrentPackageRegistration() throws Exception
   {
     CDOSession session1 = openSession();
@@ -585,7 +585,7 @@ public class PackageRegistryTest extends AbstractCDOTest
     }
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testPopulator() throws Exception
   {
     String nsURI = "http://dynamic";
@@ -624,7 +624,7 @@ public class PackageRegistryTest extends AbstractCDOTest
     assertEquals("Eike", company.getName());
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testPopulatorGlobal() throws Exception
   {
     String nsURI = "http://dynamic";
@@ -670,7 +670,7 @@ public class PackageRegistryTest extends AbstractCDOTest
     }
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testLaziness() throws Exception
   {
     {
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PartialCommitTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PartialCommitTest.java
index f2605e6152..860b269e6f 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PartialCommitTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PartialCommitTest.java
@@ -110,7 +110,7 @@ public class PartialCommitTest extends AbstractCDOTest
     super.doTearDown();
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testNewTopLevelResource() throws CommitException
   {
     CDOResource topResource1 = tx.createResource("/top1");
@@ -122,7 +122,7 @@ public class PartialCommitTest extends AbstractCDOTest
     goodAll();
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testNewTopLevelResource_rootResourceNotIncluded() throws CommitException
   {
     CDOResource topResource1 = tx.createResource("/top1");
@@ -134,7 +134,7 @@ public class PartialCommitTest extends AbstractCDOTest
     badAll(createSet(tx.getRootResource()));
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testNewNestedResource() throws CommitException
   {
     CDOResource topResource1 = tx.createResource("/top1");
@@ -146,7 +146,7 @@ public class PartialCommitTest extends AbstractCDOTest
     goodAll();
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testNewNestedResource_rootResourceNotIncluded() throws CommitException
   {
     CDOResource topResource1 = tx.createResource("/top1");
@@ -158,7 +158,7 @@ public class PartialCommitTest extends AbstractCDOTest
     badAll(createSet(tx.getRootResource()));
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testNewNestedResource_resourceFolderNotIncluded() throws CommitException
   {
     CDOResource topResource1 = tx.createResource("/top1");
@@ -369,7 +369,7 @@ public class PartialCommitTest extends AbstractCDOTest
     badAll(createSet(po));
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testDetach() throws CommitException
   {
     skipQueryXRefs();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PushTransactionTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PushTransactionTest.java
index c1aba5cb97..1249992827 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PushTransactionTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/PushTransactionTest.java
@@ -215,7 +215,7 @@ public class PushTransactionTest extends AbstractCDOTest
     assertEquals(2, resource.getContents().size());
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testAddNewResource() throws Exception
   {
     String resourcePath2 = "res2";
@@ -318,7 +318,7 @@ public class PushTransactionTest extends AbstractCDOTest
     assertEquals(orderDetailPrice, detail.getPrice());
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testMoveObject() throws Exception
   {
     {
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RepositoryTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RepositoryTest.java
index 0b030c9964..fe61b83cc5 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RepositoryTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/RepositoryTest.java
@@ -316,7 +316,7 @@ public class RepositoryTest extends AbstractCDOTest
     session.close();
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testReadAccessHandlers() throws Exception
   {
     {
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java
index ea6cf0a1ff..7b2040fd8f 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ResourceTest.java
@@ -190,43 +190,43 @@ public class ResourceTest extends AbstractCDOTest
     // TODO assertEquals(xmiString, cdoString);
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testAttachDetachResourceDepth1_Delete() throws Exception
   {
     attachDetachResourceDepth1(1, true, 0);
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testAttachDetachResourceDepth1_Remove() throws Exception
   {
     attachDetachResourceDepth1(1, false, 0);
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testAttachDetachResourceDepth2_Delete() throws Exception
   {
     attachDetachResourceDepth1(2, true, 1);
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testAttachDetachResourceDepth2_Remove() throws Exception
   {
     attachDetachResourceDepth1(2, false, 1);
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testAttachDetachResourceDepth3_Delete() throws Exception
   {
     attachDetachResourceDepth1(3, true, 2);
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testAttachDetachResourceDepth3_Remove() throws Exception
   {
     attachDetachResourceDepth1(3, false, 2);
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testAttachDetachResourceDepth3_Remove_Tree() throws Exception
   {
     attachDetachResourceDepth1(3, false, 1);
@@ -265,7 +265,7 @@ public class ResourceTest extends AbstractCDOTest
     session.close();
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testCreateResource_FromResourceSet() throws Exception
   {
     CDOSession session = openSession();
@@ -545,49 +545,49 @@ public class ResourceTest extends AbstractCDOTest
     session.close();
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testChangePathFromDepth0ToDepth0() throws Exception
   {
     changePath(0, 0);
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testChangePathFromDepth0ToDepth1() throws Exception
   {
     changePath(0, 1);
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testChangePathFromDepth0ToDepth2() throws Exception
   {
     changePath(0, 2);
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testChangePathFromDepth0ToDepth3() throws Exception
   {
     changePath(0, 3);
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testChangePathFromDepth3ToDepth3() throws Exception
   {
     changePath(3, 3);
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testChangePathFromDepth3ToDepth2() throws Exception
   {
     changePath(3, 2);
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testChangePathFromDepth3ToDepth1() throws Exception
   {
     changePath(3, 1);
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testChangePathFromDepth3ToDepth0() throws Exception
   {
     changePath(3, 0);
@@ -618,7 +618,7 @@ public class ResourceTest extends AbstractCDOTest
     assertEquals(true, transaction.hasResource("/renamed"));
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testChangeResourceFolderURI() throws Exception
   {
     {
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SessionTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SessionTest.java
index 67e3bc1789..47a4368b76 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SessionTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/SessionTest.java
@@ -257,7 +257,7 @@ public class SessionTest extends AbstractCDOTest
     session.close();
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testWithAuthentication() throws Exception
   {
     UserManager userManager = new UserManager();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ViewTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ViewTest.java
index 6d1d855236..1589afd1cf 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ViewTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ViewTest.java
@@ -210,7 +210,7 @@ public class ViewTest extends AbstractCDOTest
     session.close();
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testContextifyDifferentRepository() throws Exception
   {
     CDOSession session = openSession();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/WorkspaceTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/WorkspaceTest.java
index 06ca8ff847..50a11fa309 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/WorkspaceTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/WorkspaceTest.java
@@ -144,7 +144,7 @@ public class WorkspaceTest extends AbstractCDOTest
     return map;
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testCheckout() throws Exception
   {
     checkout("MAIN", CDOBranchPoint.UNSPECIFIED_DATE);
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/XATransactionTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/XATransactionTest.java
index 55cec91631..a72dfff7a9 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/XATransactionTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/XATransactionTest.java
@@ -80,7 +80,7 @@ public class XATransactionTest extends AbstractCDOTest
     xaTransaction.commit();
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testRollback_AfterSetpoint() throws Exception
   {
     skipExternalReferences();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/XRefTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/XRefTest.java
index 8fa5289a94..3844089407 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/XRefTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/XRefTest.java
@@ -255,7 +255,7 @@ public class XRefTest extends AbstractCDOTest
     session2.close();
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testXRefsToOne() throws Exception
   {
     // create model
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_258933_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_258933_Test.java
index ae65be1bd3..b1ff310db4 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_258933_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_258933_Test.java
@@ -15,7 +15,7 @@ import org.eclipse.emf.cdo.CDOObject;
 import org.eclipse.emf.cdo.eresource.CDOResource;
 import org.eclipse.emf.cdo.session.CDOSession;
 import org.eclipse.emf.cdo.tests.AbstractCDOTest;
-import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.NeedsCleanRepo;
+import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.CleanRepositoriesBefore;
 import org.eclipse.emf.cdo.tests.model1.Order;
 import org.eclipse.emf.cdo.transaction.CDOTransaction;
 import org.eclipse.emf.cdo.util.CDOUtil;
@@ -36,7 +36,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
  * 
  * @author Simon McDuff
  */
-@NeedsCleanRepo
+@CleanRepositoriesBefore
 public class Bugzilla_258933_Test extends AbstractCDOTest
 {
   private static final String TOP_PACKAGE_URI = "http:///www.elver.org/toppackage";
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_267050_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_267050_Test.java
index 1ef9ab7065..9523a1887e 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_267050_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_267050_Test.java
@@ -32,7 +32,7 @@ import java.util.Collection;
  */
 public class Bugzilla_267050_Test extends AbstractCDOTest
 {
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   @SuppressWarnings("unchecked")
   public void testBugzilla_267050() throws Exception
   {
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_303466_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_303466_Test.java
index 42afb7e424..efddd03b8f 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_303466_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_303466_Test.java
@@ -37,7 +37,7 @@ import java.util.Map;
  */
 public class Bugzilla_303466_Test extends AbstractCDOTest
 {
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void test_missingDependency() throws Exception
   {
     CDOSession session = openSession();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_306998_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_306998_Test.java
index ef303d4741..b403af6d5d 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_306998_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_306998_Test.java
@@ -32,7 +32,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
  */
 public class Bugzilla_306998_Test extends AbstractCDOTest
 {
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testValidEENumLiteral() throws CommitException
   {
     EPackage pkg = EMFUtil.createEPackage("pkg", "pkg", "http://cdo.eclipse.org/Bugzilla_306998_Test_1.ecore");
@@ -70,7 +70,7 @@ public class Bugzilla_306998_Test extends AbstractCDOTest
     }
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testInalidEENumLiteral() throws CommitException
   {
     // does not affect MemStore!
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_310574_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_310574_Test.java
index 73ae4e4ba6..15283eaecf 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_310574_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_310574_Test.java
@@ -22,7 +22,7 @@ import org.eclipse.emf.cdo.server.ITransaction;
 import org.eclipse.emf.cdo.session.CDOSession;
 import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionDelta;
 import org.eclipse.emf.cdo.tests.AbstractCDOTest;
-import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.NeedsCleanRepo;
+import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.CleanRepositoriesBefore;
 import org.eclipse.emf.cdo.tests.model1.Category;
 import org.eclipse.emf.cdo.tests.model1.Company;
 import org.eclipse.emf.cdo.tests.model1.Customer;
@@ -45,7 +45,7 @@ import java.util.Random;
  * 
  * @author Eike Stepper
  */
-@NeedsCleanRepo
+@CleanRepositoriesBefore
 public class Bugzilla_310574_Test extends AbstractCDOTest
 {
   @SuppressWarnings("unused")
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_313326_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_313326_Test.java
index 610c7a33c7..84467c6c31 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_313326_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_313326_Test.java
@@ -28,7 +28,7 @@ import org.eclipse.emf.spi.cdo.DefaultCDOMerger;
  */
 public class Bugzilla_313326_Test extends AbstractCDOTest
 {
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testNotificationBuilderBranch() throws Exception
   {
     skipUnlessBranching();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_314264_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_314264_Test.java
index ce236857d1..a4bc33a1e0 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_314264_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_314264_Test.java
@@ -14,7 +14,7 @@ import org.eclipse.emf.cdo.common.branch.CDOBranch;
 import org.eclipse.emf.cdo.eresource.CDOResource;
 import org.eclipse.emf.cdo.session.CDOSession;
 import org.eclipse.emf.cdo.tests.AbstractCDOTest;
-import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.NeedsCleanRepo;
+import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.CleanRepositoriesBefore;
 import org.eclipse.emf.cdo.tests.model2.TaskContainer;
 import org.eclipse.emf.cdo.tests.util.TestAdapter;
 import org.eclipse.emf.cdo.transaction.CDOTransaction;
@@ -29,10 +29,10 @@ import org.eclipse.emf.spi.cdo.DefaultCDOMerger;
  * <p>
  * See bug 314264
  */
-@NeedsCleanRepo
+@CleanRepositoriesBefore
 public class Bugzilla_314264_Test extends AbstractCDOTest
 {
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testMergeTest() throws Exception
   {
     skipUnlessBranching();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_315043_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_315043_Test.java
index 8e60390980..0833e760a6 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_315043_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_315043_Test.java
@@ -40,7 +40,7 @@ import java.util.Set;
  */
 public class Bugzilla_315043_Test extends AbstractCDOTest
 {
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testReloadingRevisions() throws Exception
   {
     skipUnlessAuditing();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316444_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316444_Test.java
index 756683f2dd..fd0e37c96a 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316444_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316444_Test.java
@@ -161,7 +161,7 @@ public class Bugzilla_316444_Test extends AbstractCDOTest
     map.put(RepositoryConfig.PROP_TEST_REPOSITORY, repository);
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testMovingSubtree() throws Exception
   {
     exceptions.clear();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324084_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324084_Test.java
index 9f9e5e0046..4a60f8723e 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324084_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_324084_Test.java
@@ -16,7 +16,7 @@ import org.eclipse.emf.cdo.eresource.CDOResource;
 import org.eclipse.emf.cdo.server.IRepository;
 import org.eclipse.emf.cdo.session.CDOSession;
 import org.eclipse.emf.cdo.tests.AbstractCDOTest;
-import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.NeedsCleanRepo;
+import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.CleanRepositoriesBefore;
 import org.eclipse.emf.cdo.tests.model4.RefMultiContained;
 import org.eclipse.emf.cdo.tests.model4.RefSingleContained;
 import org.eclipse.emf.cdo.transaction.CDOTransaction;
@@ -33,7 +33,7 @@ import java.util.Map;
  * 
  * @author Pascal Lehmann
  */
-@NeedsCleanRepo
+@CleanRepositoriesBefore
 public class Bugzilla_324084_Test extends AbstractCDOTest
 {
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_325866_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_325866_Test.java
index 499d491e8e..8998887df1 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_325866_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_325866_Test.java
@@ -42,7 +42,7 @@ public class Bugzilla_325866_Test extends AbstractCDOTest
     return map;
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testXRefReattachBranch() throws Exception
   {
     skipUnlessBranching();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_326518_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_326518_Test.java
index ac6446837d..1ce1567614 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_326518_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_326518_Test.java
@@ -46,7 +46,7 @@ public class Bugzilla_326518_Test extends AbstractCDOTest
     return map;
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testIndexBranchMerge() throws Exception
   {
     skipUnlessBranching();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_327604_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_327604_Test.java
index df6b217c09..1bf35d3f53 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_327604_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_327604_Test.java
@@ -134,7 +134,7 @@ public class Bugzilla_327604_Test extends AbstractCDOTest
     super.doTearDown();
   }
 
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testReadObjects() throws Exception
   {
     skipHandleRevisions();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_329254_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_329254_Test.java
index 3422349167..9e0697bbc4 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_329254_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_329254_Test.java
@@ -201,7 +201,7 @@ public class Bugzilla_329254_Test extends AbstractCDOTest
 

   }

 

-  @NeedsCleanRepo

+  @CleanRepositoriesBefore

   public void testCommitTimeStampUpdateLongRunningCommitSameType() throws Exception

   {

     disableConsole();

@@ -300,7 +300,7 @@ public class Bugzilla_329254_Test extends AbstractCDOTest
     assertEquals(company4a.getName(), company1a.getName());

   }

 

-  @NeedsCleanRepo

+  @CleanRepositoriesBefore

   public void testCommitTimeStampUpdateLongRunningCommitDifferentType() throws Exception

   {

     disableConsole();

diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_334608_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_334608_Test.java
index fe65889659..58beab179c 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_334608_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_334608_Test.java
@@ -37,7 +37,7 @@ import junit.framework.Assert;
  */
 public class Bugzilla_334608_Test extends AbstractCDOTest
 {
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void testOpposites() throws Exception
   {
     EPackage pkg1 = null;
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_335675_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_335675_Test.java
index 0af7452829..2971e28970 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_335675_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_335675_Test.java
@@ -39,7 +39,7 @@ import org.eclipse.emf.ecore.util.EcoreUtil;
  */
 public class Bugzilla_335675_Test extends AbstractCDOTest
 {
-  @NeedsCleanRepo
+  @CleanRepositoriesBefore
   public void test0() throws Exception
   {
     EPackage pkg = null;
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_340961_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_340961_Test.java
index 37fd0a8a4a..5fa8af408e 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_340961_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_340961_Test.java
@@ -25,8 +25,8 @@ import org.eclipse.emf.cdo.session.CDOSession;
 import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevision;
 import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionManager;
 import org.eclipse.emf.cdo.tests.AbstractCDOTest;
-import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.LeavesCleanRepo;
-import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.NeedsCleanRepo;
+import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.CleanRepositoriesAfter;
+import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.CleanRepositoriesBefore;
 import org.eclipse.emf.cdo.tests.config.impl.RepositoryConfig;
 import org.eclipse.emf.cdo.tests.model1.Category;
 import org.eclipse.emf.cdo.tests.util.TestRevisionManager;
@@ -48,8 +48,8 @@ import junit.framework.Assert;
 /**
  * @author Egidijus Vaisnora
  */
-@NeedsCleanRepo
-@LeavesCleanRepo
+@CleanRepositoriesBefore
+@CleanRepositoriesAfter
 public class Bugzilla_340961_Test extends AbstractCDOTest
 {
   private PartialReadAccessHandler handler = new PartialReadAccessHandler();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTest.java
index b4464fe377..c613080afc 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/ConfigTest.java
@@ -71,12 +71,12 @@ import junit.framework.TestResult;
 public abstract class ConfigTest extends AbstractOMTest implements IConstants
 {
   @Retention(RetentionPolicy.RUNTIME)
-  public @interface NeedsCleanRepo
+  public @interface CleanRepositoriesBefore
   {
   }
 
   @Retention(RetentionPolicy.RUNTIME)
-  public @interface LeavesCleanRepo
+  public @interface CleanRepositoriesAfter
   {
   }
 
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java
index c3d0287d39..e1ca2660f2 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/config/impl/RepositoryConfig.java
@@ -43,8 +43,8 @@ import org.eclipse.emf.cdo.spi.server.InternalRepositorySynchronizer;
 import org.eclipse.emf.cdo.spi.server.InternalSessionManager;
 import org.eclipse.emf.cdo.spi.server.InternalStore;
 import org.eclipse.emf.cdo.tests.config.IRepositoryConfig;
-import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.LeavesCleanRepo;
-import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.NeedsCleanRepo;
+import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.CleanRepositoriesAfter;
+import org.eclipse.emf.cdo.tests.config.impl.ConfigTest.CleanRepositoriesBefore;
 import org.eclipse.emf.cdo.tests.util.TestRevisionManager;
 
 import org.eclipse.net4j.Net4jUtil;
@@ -337,11 +337,11 @@ public abstract class RepositoryConfig extends Config implements IRepositoryConf
               String path = CDORevisionUtil.getResourceNodePath(revision, commitContext);
               ConfigTest test = getCurrentTest();
               String prefix = test.getResourcePath("");
-              if (!path.startsWith(prefix) && !hasAnnotation(NeedsCleanRepo.class))
+              if (!path.startsWith(prefix) && !hasAnnotation(CleanRepositoriesBefore.class))
               {
                 throw new RuntimeException("Test case " + test.getClass().getName() + '.' + test.getName()
                     + " does not use getResourcePath() for resource " + path + ", nor does it declare @"
-                    + NeedsCleanRepo.class.getSimpleName());
+                    + CleanRepositoriesBefore.class.getSimpleName());
               }
             }
           }
@@ -446,12 +446,12 @@ public abstract class RepositoryConfig extends Config implements IRepositoryConf
       return true;
     }
 
-    return hasAnnotation(NeedsCleanRepo.class);
+    return hasAnnotation(CleanRepositoriesBefore.class);
   }
 
   protected boolean leavesCleanRepos()
   {
-    return hasAnnotation(LeavesCleanRepo.class);
+    return hasAnnotation(CleanRepositoriesAfter.class);
   }
 
   private <T extends Annotation> boolean hasAnnotation(Class<T> annotationClass)