5 files changed, 50 insertions, 5 deletions

diff --git a/plugins/org.eclipse.emf.cdo.tests/CDO AllTests (MEM branching, UUIDs).launch b/plugins/org.eclipse.emf.cdo.tests/CDO AllTests (MEM branching, UUIDs).launch
new file mode 100644
index 0000000000..0687cca54e
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests/CDO AllTests (MEM branching, UUIDs).launch
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>

+<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">

+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">

+<listEntry value="/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranchesUUIDs.java"/>

+</listAttribute>

+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">

+<listEntry value="1"/>

+</listAttribute>

+<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value=""/>

+<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>

+<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>

+<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit3"/>

+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.eclipse.emf.cdo.tests.AllTestsMEMBranchesUUIDs"/>

+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.eclipse.emf.cdo.tests"/>

+<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-Xms40m&#13;&#10;-Xmx1024m&#13;&#10;-Dorg.eclipse.net4j.util.om.trace.disable=true"/>

+</launchConfiguration>

diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranches.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranches.java
index 0739f23c85..814408efe7 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranches.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranches.java
@@ -26,8 +26,6 @@ public class AllTestsMEMBranches extends AllConfigs
   @Override
   protected void initConfigSuites(TestSuite parent)
   {
-    // addScenario(parent, COMBINED, MEM, JVM, NATIVE);
-    // addScenario(parent, COMBINED, MEM_AUDITS, JVM, NATIVE);
     addScenario(parent, COMBINED, MEM_BRANCHES, JVM, NATIVE);
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranchesSSL.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranchesSSL.java
index 39380f1cf9..f78ff5774a 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranchesSSL.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranchesSSL.java
@@ -26,8 +26,6 @@ public class AllTestsMEMBranchesSSL extends AllConfigs
   @Override
   protected void initConfigSuites(TestSuite parent)
   {
-    // addScenario(parent, COMBINED, MEM, JVM, NATIVE);
-    // addScenario(parent, COMBINED, MEM_AUDITS, JVM, NATIVE);
     addScenario(parent, SEPARATED, MEM_BRANCHES, SSL, NATIVE);
   }
 }
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranchesUUIDs.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranchesUUIDs.java
new file mode 100644
index 0000000000..bbc25e8387
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AllTestsMEMBranchesUUIDs.java
@@ -0,0 +1,31 @@
+/**
+ * Copyright (c) 2004 - 2011 Eike Stepper (Berlin, Germany) and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *    Eike Stepper - initial API and implementation
+ */
+package org.eclipse.emf.cdo.tests;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * @author Eike Stepper
+ */
+public class AllTestsMEMBranchesUUIDs extends AllConfigs
+{
+  public static Test suite()
+  {
+    return new AllTestsMEMBranchesUUIDs().getTestSuite(AllConfigs.class.getName());
+  }
+
+  @Override
+  protected void initConfigSuites(TestSuite parent)
+  {
+    addScenario(parent, COMBINED, MEM_BRANCHES_UUIDS, JVM, NATIVE);
+  }
+}
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 a72dfff7a9..295254d6ae 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
@@ -11,6 +11,7 @@
  */
 package org.eclipse.emf.cdo.tests;
 
+import org.eclipse.emf.cdo.common.CDOCommonRepository.IDGenerationLocation;
 import org.eclipse.emf.cdo.eresource.CDOResource;
 import org.eclipse.emf.cdo.session.CDOSession;
 import org.eclipse.emf.cdo.tests.model1.PurchaseOrder;
@@ -193,6 +194,7 @@ public class XATransactionTest extends AbstractCDOTest
     // Skip this test until the problems with XATransactions are solved.
     skipConfig(LEGACY);
     skipExternalReferences();
+    skipTest(getRepositoryConfig().getIDGenerationLocation() == IDGenerationLocation.CLIENT);
     getRepository(REPOSITORY2_NAME);
 
     {
@@ -219,7 +221,7 @@ public class XATransactionTest extends AbstractCDOTest
 
       try
       {
-        transactionA.commit();
+        transactionA.commit(); // Would not fail with IDGenerationLocation.CLIENT!
         fail("CommitException expected");
       }
       catch (CommitException expected)