18 files changed, 182 insertions, 20 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/MongoDBStore.java b/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/MongoDBStore.java
index 029a39dbcf..5c6b9c1a91 100644
--- a/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/MongoDBStore.java
+++ b/plugins/org.eclipse.emf.cdo.server.mongodb/src/org/eclipse/emf/cdo/server/internal/mongodb/MongoDBStore.java
@@ -21,6 +21,12 @@ import org.eclipse.emf.cdo.server.internal.mongodb.bundle.OM;
 import org.eclipse.emf.cdo.server.mongodb.IMongoDBStore;
 import org.eclipse.emf.cdo.server.mongodb.IMongoDBStoreAccessor;
 import org.eclipse.emf.cdo.spi.server.InternalRepository;
+import org.eclipse.emf.cdo.spi.server.InternalStore.NoExternalReferences;
+import org.eclipse.emf.cdo.spi.server.InternalStore.NoFeatureMaps;
+import org.eclipse.emf.cdo.spi.server.InternalStore.NoHandleRevisions;
+import org.eclipse.emf.cdo.spi.server.InternalStore.NoLobs;
+import org.eclipse.emf.cdo.spi.server.InternalStore.NoQueryXRefs;
+import org.eclipse.emf.cdo.spi.server.InternalStore.NoRaw;
 import org.eclipse.emf.cdo.spi.server.Store;
 import org.eclipse.emf.cdo.spi.server.StoreAccessorPool;
 
@@ -50,7 +56,8 @@ import java.util.Set;
  * 
  * @author Eike Stepper
  */
-public class MongoDBStore extends Store implements IMongoDBStore
+public class MongoDBStore extends Store implements IMongoDBStore, //
+    NoExternalReferences, NoQueryXRefs, NoLobs, NoFeatureMaps, NoHandleRevisions, NoRaw
 {
   public static final String TYPE = "mongodb"; //$NON-NLS-1$
 
diff --git a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalStore.java b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalStore.java
index 67ad502645..979d6b1934 100644
--- a/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalStore.java
+++ b/plugins/org.eclipse.emf.cdo.server/src/org/eclipse/emf/cdo/spi/server/InternalStore.java
@@ -61,4 +61,52 @@ public interface InternalStore extends IStore, ILifecycle
    * @since 4.0
    */
   public void setCreationTime(long creationTime);
+
+  /**
+   * @author Eike Stepper
+   * @since 4.0
+   */
+  public interface NoExternalReferences
+  {
+  }
+
+  /**
+   * @author Eike Stepper
+   * @since 4.0
+   */
+  public interface NoQueryXRefs
+  {
+  }
+
+  /**
+   * @author Eike Stepper
+   * @since 4.0
+   */
+  public interface NoLobs
+  {
+  }
+
+  /**
+   * @author Eike Stepper
+   * @since 4.0
+   */
+  public interface NoFeatureMaps
+  {
+  }
+
+  /**
+   * @author Eike Stepper
+   * @since 4.0
+   */
+  public interface NoHandleRevisions
+  {
+  }
+
+  /**
+   * @author Eike Stepper
+   * @since 4.0
+   */
+  public interface NoRaw
+  {
+  }
 }
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 5e5e493d97..3cc34b9db5 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
@@ -51,6 +51,7 @@ public class BackupTest extends AbstractCDOTest
   {
     disableConsole();
     super.doSetUp();
+    skipRaw();
   }
 
   @Override
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ContainmentTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ContainmentTest.java
index cb2d5c071a..5bfad936c0 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ContainmentTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/ContainmentTest.java
@@ -348,6 +348,8 @@ public class ContainmentTest extends AbstractCDOTest
 
   public void testObjectNotSameResourceThanItsContainerCDOANDXMI() throws Exception
   {
+    skipExternalReferences();
+
     byte[] data = null;
     {
       CDOSession session = openSession();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CrossReferenceTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CrossReferenceTest.java
index ccdc98d646..08242a24d5 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CrossReferenceTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/CrossReferenceTest.java
@@ -324,7 +324,9 @@ public class CrossReferenceTest extends AbstractCDOTest
 
   public void testDetachXRefExternal() throws Exception
   {
+    skipExternalReferences();
     skipConfig("Hibernate");
+
     Customer customer = getModel1Factory().createCustomer();
     customer.setName("customer");
 
@@ -389,6 +391,7 @@ public class CrossReferenceTest extends AbstractCDOTest
 
   public void testNewMakeExternal() throws Exception
   {
+    skipExternalReferences();
     skipConfig("Hibernate");
     Customer customer = getModel1Factory().createCustomer();
     customer.setName("customer");
@@ -450,6 +453,7 @@ public class CrossReferenceTest extends AbstractCDOTest
 
   public void testExternalMakeDangling() throws Exception
   {
+    skipExternalReferences();
     skipConfig("Hibernate");
 
     Customer customer = getModel1Factory().createCustomer();
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 ad28699b7c..0ae4b9908e 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
@@ -61,35 +61,38 @@ public class ExternalReferenceTest extends AbstractCDOTest
 
   public void testExternalWithDynamicEObject() throws Exception
   {
-    {
-      ResourceSet resourceSet = new ResourceSetImpl();
-      resourceSet.getResourceFactoryRegistry().getProtocolToFactoryMap().put("test", new XMIResourceFactoryImpl());
+    skipExternalReferences();
 
-      CDOSession sessionA = openSession();
-      sessionA.getPackageRegistry().putEPackage(getModel4InterfacesPackage());
-      sessionA.getPackageRegistry().putEPackage(getModel4Package());
-      CDOTransaction transactionA1 = sessionA.openTransaction(resourceSet);
+    ResourceSet resourceSet = new ResourceSetImpl();
+    resourceSet.getResourceFactoryRegistry().getProtocolToFactoryMap().put("test", new XMIResourceFactoryImpl());
 
-      CDOResource resA = transactionA1.createResource("/resA");
-      Resource resD = resourceSet.createResource(URI.createURI("test://1"));
+    CDOSession sessionA = openSession();
+    sessionA.getPackageRegistry().putEPackage(getModel4InterfacesPackage());
+    sessionA.getPackageRegistry().putEPackage(getModel4Package());
+    CDOTransaction transactionA1 = sessionA.openTransaction(resourceSet);
 
-      EPackage schoolPackage = createDynamicEPackage();
-      resourceSet.getPackageRegistry().put(schoolPackage.getNsURI(), schoolPackage);
+    CDOResource resA = transactionA1.createResource("/resA");
+    Resource resD = resourceSet.createResource(URI.createURI("test://1"));
 
-      EClass eClass = (EClass)schoolPackage.getEClassifier("SchoolBook");
-      EObject schoolbook = EcoreUtil.create(eClass);
+    EPackage schoolPackage = createDynamicEPackage();
+    resourceSet.getPackageRegistry().put(schoolPackage.getNsURI(), schoolPackage);
 
-      GenRefSingleNonContained objectFromResA = getModel4Factory().createGenRefSingleNonContained();
-      objectFromResA.setElement(schoolbook);
-      resD.getContents().add(schoolbook);
+    EClass eClass = (EClass)schoolPackage.getEClassifier("SchoolBook");
+    EObject schoolbook = EcoreUtil.create(eClass);
+
+    GenRefSingleNonContained objectFromResA = getModel4Factory().createGenRefSingleNonContained();
+    objectFromResA.setElement(schoolbook);
+    resD.getContents().add(schoolbook);
+
+    resA.getContents().add(objectFromResA);
+    transactionA1.commit();
 
-      resA.getContents().add(objectFromResA);
-      transactionA1.commit();
-    }
   }
 
   public void testExternalWithEClass() throws Exception
   {
+    skipExternalReferences();
+
     {
       ResourceSet resourceSet = new ResourceSetImpl();
 
@@ -123,6 +126,8 @@ public class ExternalReferenceTest extends AbstractCDOTest
 
   public void testExternalWithEPackage() throws Exception
   {
+    skipExternalReferences();
+
     {
       CDOSession sessionA = openSession();
 
@@ -157,6 +162,8 @@ public class ExternalReferenceTest extends AbstractCDOTest
 
   public void testOneXMIResourceManyViewsOnOneResourceSet() throws Exception
   {
+    skipExternalReferences();
+
     byte[] dataOfresD = null;
     getRepository(REPOSITORY_B_NAME);
 
@@ -265,6 +272,7 @@ public class ExternalReferenceTest extends AbstractCDOTest
   {
     // Skip this test until the problems with XATransactions are solved.
     skipConfig(LEGACY);
+    skipExternalReferences();
 
     getRepository(REPOSITORY_B_NAME);
 
@@ -375,6 +383,8 @@ public class ExternalReferenceTest extends AbstractCDOTest
 
   public void testWithXML() throws Exception
   {
+    skipExternalReferences();
+
     ResourceSet resourceSet = new ResourceSetImpl();
     Map<String, Object> map = resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap();
     map.put("xml", new XMLResourceFactoryImpl());
@@ -400,6 +410,8 @@ public class ExternalReferenceTest extends AbstractCDOTest
 
   public void testWithXMLAndPrefetching() throws Exception
   {
+    skipExternalReferences();
+
     {
       ResourceSet resourceSet = new ResourceSetImpl();
       Map<String, Object> map = resourceSet.getResourceFactoryRegistry().getExtensionToFactoryMap();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/FeatureMapTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/FeatureMapTest.java
index aee77179dd..60827d9203 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/FeatureMapTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/FeatureMapTest.java
@@ -183,6 +183,8 @@ public class FeatureMapTest extends AbstractCDOTest
 
   public void testFeatureMaps() throws Exception
   {
+    skipFeatureMaps();
+
     EReference feature = getModel5Package().getTestFeatureMap_Doctors();
 
     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 5473e2dc27..792708cb08 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
@@ -33,6 +33,13 @@ import java.io.Reader;
  */
 public class LobTest extends AbstractCDOTest
 {
+  @Override
+  protected void doSetUp() throws Exception
+  {
+    super.doSetUp();
+    skipLobs();
+  }
+
   public void testCommitBlob() throws Exception
   {
     InputStream inputStream = null;
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MetaTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MetaTest.java
index a7b5362384..dace155947 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MetaTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/MetaTest.java
@@ -24,6 +24,8 @@ public class MetaTest extends AbstractCDOTest
 {
   public void testMetaReference() throws Exception
   {
+    skipExternalReferences();
+
     {
       CDOSession session = openSession();
       CDOTransaction transaction = session.openTransaction();
@@ -46,6 +48,8 @@ public class MetaTest extends AbstractCDOTest
 
   public void testMetaReferenceAttachFirst() throws Exception
   {
+    skipExternalReferences();
+
     {
       CDOSession session = openSession();
       CDOTransaction transaction = session.openTransaction();
@@ -68,6 +72,8 @@ public class MetaTest extends AbstractCDOTest
 
   public void testMetaReference2() throws Exception
   {
+    skipExternalReferences();
+
     EReference targetRef = getModel3SubpackagePackage().getClass2_Class1();
 
     {
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 8f40dd76aa..088d599c51 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
@@ -55,6 +55,7 @@ public class OCLQueryTest extends AbstractCDOTest
   protected void doSetUp() throws Exception
   {
     super.doSetUp();
+    skipHandleRevisions();
 
     CDOSession session = openSession();
     transaction = session.openTransaction();
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 08ba84d532..f09df2b284 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
@@ -246,6 +246,8 @@ public class PartialCommitTest extends AbstractCDOTest
 
   public void testPartialCleanUp_detachedObjects() throws CommitException
   {
+    skipQueryXRefs();
+
     simpleModel1Setup();
     Category cat = Model1Factory.eINSTANCE.createCategory();
     resource1.getContents().add(cat);
@@ -363,6 +365,8 @@ public class PartialCommitTest extends AbstractCDOTest
 
   public void testDetach() throws CommitException
   {
+    skipQueryXRefs();
+
     simpleModel1Setup();
     EcoreUtil.delete(purchaseOrder);
 
@@ -531,6 +535,8 @@ public class PartialCommitTest extends AbstractCDOTest
 
   public void testDetachSingleRef() throws CommitException
   {
+    skipQueryXRefs();
+
     simpleModel4ContainmentSetup();
     refSingleContained1.setElement(null);
 
@@ -824,6 +830,8 @@ public class PartialCommitTest extends AbstractCDOTest
 
   public void testSingleBidiOnRemovedObject() throws CommitException
   {
+    skipQueryXRefs();
+
     simpleModel4SingleBidiSetup();
     EcoreUtil.delete(singleNonContainedElement1);
 
@@ -930,6 +938,8 @@ public class PartialCommitTest extends AbstractCDOTest
 
   public void testMultiBidiOnRemovedObject() throws CommitException
   {
+    skipQueryXRefs();
+
     simpleModel4MultiBidiSetup();
     EcoreUtil.delete(multiNonContainedElement1);
 
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 3f3169ac45..fe17a04df1 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
@@ -82,6 +82,7 @@ public class XATransactionTest extends AbstractCDOTest
 
   public void testRollback_AfterSetpoint() throws Exception
   {
+    skipExternalReferences();
     getRepository(REPOSITORY2_NAME);
 
     CDOSession sessionA = openSession();
@@ -142,6 +143,7 @@ public class XATransactionTest extends AbstractCDOTest
 
   public void testCommitFromTransactionDisabled() throws Exception
   {
+    skipExternalReferences();
     getRepository(REPOSITORY2_NAME);
 
     {
@@ -189,6 +191,7 @@ public class XATransactionTest extends AbstractCDOTest
   {
     // Skip this test until the problems with XATransactions are solved.
     skipConfig(LEGACY);
+    skipExternalReferences();
     getRepository(REPOSITORY2_NAME);
 
     {
@@ -231,6 +234,7 @@ public class XATransactionTest extends AbstractCDOTest
 
   public void test_ExceptionInReadingStream() throws Exception
   {
+    skipExternalReferences();
     getRepository(REPOSITORY2_NAME);
 
     CDOSession sessionA = openSession();
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 4309b65499..71b80ceadf 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
@@ -46,6 +46,13 @@ import java.util.List;
  */
 public class XRefTest extends AbstractCDOTest
 {
+  @Override
+  protected void doSetUp() throws Exception
+  {
+    super.doSetUp();
+    skipQueryXRefs();
+  }
+
   public void testCrossReferenceMultivalueEReferenceQuery() throws Exception
   {
     PurchaseOrder purchaseOrder1 = getModel1Factory().createPurchaseOrder();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316434_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316434_Test.java
index 987bb5f854..3750e170f3 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316434_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_316434_Test.java
@@ -39,6 +39,8 @@ public class Bugzilla_316434_Test extends AbstractCDOTest
 
   public void testInitial() throws Exception
   {
+    skipQueryXRefs();
+
     {
       ContainedElementNoOpposite target = getModel4Factory().createContainedElementNoOpposite();
       RefSingleNonContainedNPL source = getModel4Factory().createRefSingleNonContainedNPL();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_320690_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_320690_Test.java
index e6394fbaae..f0d0ec82b4 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_320690_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_320690_Test.java
@@ -38,6 +38,8 @@ public class Bugzilla_320690_Test extends AbstractCDOTest
 
   public void testLockRefTargets() throws Exception
   {
+    skipQueryXRefs();
+
     CDOSession session1 = openSession();
     session1.options().setPassiveUpdateEnabled(false);
     CDOTransaction transaction1 = session1.openTransaction();
@@ -115,6 +117,8 @@ public class Bugzilla_320690_Test extends AbstractCDOTest
 
   public void testDeleteTargetAndReferenceAtOnce() throws Exception
   {
+    skipQueryXRefs();
+
     NodeA a = getModel3Factory().createNodeA();
     NodeA b = getModel3Factory().createNodeA();
     NodeA c = getModel3Factory().createNodeA();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_323930_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_323930_Test.java
index de47b21c18..e829f187bf 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_323930_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_323930_Test.java
@@ -32,6 +32,13 @@ public class Bugzilla_323930_Test extends AbstractCDOTest
     return map;
   }
 
+  @Override
+  protected void doSetUp() throws Exception
+  {
+    super.doSetUp();
+    skipQueryXRefs();
+  }
+
   public void testChangeIndexesInTargetList() throws Exception
   {
     NodeA a = getModel3Factory().createNodeA();
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_331619_Test.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_331619_Test.java
index 6f9af5ec4c..2a1593b167 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_331619_Test.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/bugzilla/Bugzilla_331619_Test.java
@@ -40,6 +40,8 @@ public class Bugzilla_331619_Test extends AbstractCDOTest
   @SuppressWarnings("unchecked")
   public void testAbstractXRef() throws CommitException
   {
+    skipQueryXRefs();
+
     // set up model
     EPackage pkg = EMFUtil.createEPackage("test", "test", "http://www.eclipse.org/CDO/Tests/331619.ecore");
     EClass ref = EMFUtil.createEClass(pkg, "referencee", false, false);
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 60fdd573ca..600057c533 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
@@ -15,6 +15,12 @@ import org.eclipse.emf.cdo.server.IRepository;
 import org.eclipse.emf.cdo.session.CDOSession;
 import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionManager;
 import org.eclipse.emf.cdo.spi.server.InternalRepository;
+import org.eclipse.emf.cdo.spi.server.InternalStore.NoExternalReferences;
+import org.eclipse.emf.cdo.spi.server.InternalStore.NoFeatureMaps;
+import org.eclipse.emf.cdo.spi.server.InternalStore.NoHandleRevisions;
+import org.eclipse.emf.cdo.spi.server.InternalStore.NoLobs;
+import org.eclipse.emf.cdo.spi.server.InternalStore.NoQueryXRefs;
+import org.eclipse.emf.cdo.spi.server.InternalStore.NoRaw;
 import org.eclipse.emf.cdo.tests.config.IConstants;
 import org.eclipse.emf.cdo.tests.config.IContainerConfig;
 import org.eclipse.emf.cdo.tests.config.IModelConfig;
@@ -529,6 +535,36 @@ public abstract class ConfigTest extends AbstractOMTest implements IConstants
     skipConfig("MongoDBStore");
   }
 
+  protected void skipExternalReferences()
+  {
+    skipTest(getRepository().getStore() instanceof NoExternalReferences);
+  }
+
+  protected void skipQueryXRefs()
+  {
+    skipTest(getRepository().getStore() instanceof NoQueryXRefs);
+  }
+
+  protected void skipLobs()
+  {
+    skipTest(getRepository().getStore() instanceof NoLobs);
+  }
+
+  protected void skipFeatureMaps()
+  {
+    skipTest(getRepository().getStore() instanceof NoFeatureMaps);
+  }
+
+  protected void skipHandleRevisions()
+  {
+    skipTest(getRepository().getStore() instanceof NoHandleRevisions);
+  }
+
+  protected void skipRaw()
+  {
+    skipTest(getRepository().getStore() instanceof NoRaw);
+  }
+
   protected void clearCache(CDORevisionManager revisionManager)
   {
     ((InternalCDORevisionManager)revisionManager).getCache().clear();