[405933] [Releng] Remove DB dependencies from cdo.tests drops/I20130418-0209

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

11 files changed, 50 insertions, 25 deletions

diff --git a/plugins/org.eclipse.emf.cdo.common.db/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.common.db/META-INF/MANIFEST.MF
index cea6b63893..45c30cb5c0 100644
--- a/plugins/org.eclipse.emf.cdo.common.db/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.common.db/META-INF/MANIFEST.MF
@@ -14,6 +14,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.5.0,4.0.0)";resoluti
  org.eclipse.net4j.db;bundle-version="[4.0.0,5.0.0)"
 Import-Package: org.osgi.framework;version="[1.3.0,2.0.0)";resolution:=optional
 Export-Package: org.eclipse.emf.cdo.common.db;version="3.0.300",
- org.eclipse.emf.cdo.common.internal.db;version="3.0.300";x-friends:="org.eclipse.emf.cdo.tests",
+ org.eclipse.emf.cdo.common.internal.db;version="3.0.300";x-friends:="org.eclipse.emf.cdo.tests.db",
  org.eclipse.emf.cdo.common.internal.db.bundle;version="3.0.300";x-internal:=true,
- org.eclipse.emf.cdo.common.internal.db.cache;version="3.0.300";x-friends:="org.eclipse.emf.cdo.tests"
+ org.eclipse.emf.cdo.common.internal.db.cache;version="3.0.300";x-friends:="org.eclipse.emf.cdo.tests.db"
diff --git a/plugins/org.eclipse.emf.cdo.tests.db/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.db/META-INF/MANIFEST.MF
index bbe9a15560..24ee731456 100644
--- a/plugins/org.eclipse.emf.cdo.tests.db/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.db/META-INF/MANIFEST.MF
@@ -15,7 +15,8 @@ Require-Bundle: org.eclipse.emf.cdo.tests;bundle-version="[4.0.0,5.0.0)";visibil
  org.eclipse.net4j.db.derby;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
  org.eclipse.net4j.db.mysql;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
  org.eclipse.net4j.db.h2;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
- org.eclipse.net4j.db.postgresql;bundle-version="[4.0.0,5.0.0)"
+ org.eclipse.net4j.db.postgresql;bundle-version="[4.0.0,5.0.0)",
+ org.eclipse.emf.cdo.common.db;bundle-version="[3.0.0,4.0.0)"
 Eclipse-BuddyPolicy: dependent
 Import-Package: com.mysql.jdbc.jdbc2.optional;version="[5.0.0,6.0.0)",
  org.apache.derby.jdbc;version="[10.0.0,11.0.0)",
@@ -28,4 +29,5 @@ Export-Package: org.eclipse.emf.cdo.tests.db;version="4.0.200";x-friends:="org.e
  org.eclipse.emf.cdo.tests.db.capabilities;version="4.0.200";x-friends:="org.eclipse.emf.cdo.tests.all",
  org.eclipse.emf.cdo.tests.db.offline;version="4.0.200";x-friends:="org.eclipse.emf.cdo.tests.all",
  org.eclipse.emf.cdo.tests.db.performance;version="4.0.200";x-friends:="org.eclipse.emf.cdo.tests.all",
+ org.eclipse.emf.cdo.tests.db.revisioncache;version="4.0.200";x-friends:="org.eclipse.emf.cdo.tests.all",
  org.eclipse.emf.cdo.tests.db.verifier;version="4.0.200";x-friends:="org.eclipse.emf.cdo.tests.all"
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/revisioncache/AbstractDBRevisionCacheTest.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/revisioncache/AbstractDBRevisionCacheTest.java
index 2e77573998..43b4fb0d7a 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/revisioncache/AbstractDBRevisionCacheTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/revisioncache/AbstractDBRevisionCacheTest.java
@@ -9,13 +9,14 @@
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
  */
-package org.eclipse.emf.cdo.tests.revisioncache;
+package org.eclipse.emf.cdo.tests.db.revisioncache;
 
 import org.eclipse.emf.cdo.common.db.CDOCommonDBUtil;
 import org.eclipse.emf.cdo.common.revision.CDOListFactory;
 import org.eclipse.emf.cdo.common.revision.CDORevisionCache;
 import org.eclipse.emf.cdo.session.CDOSession;
 import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionCache;
+import org.eclipse.emf.cdo.tests.revisioncache.AbstractRevisionCacheTest;
 
 import org.eclipse.net4j.db.DBUtil;
 import org.eclipse.net4j.db.IDBAdapter;
@@ -31,7 +32,7 @@ import java.sql.SQLException;
 /**
  * @author Andre Dietisheim
  */
-public abstract class AbstractDBRevisionCacheTest extends AbstractCDORevisionCacheTest
+public abstract class AbstractDBRevisionCacheTest extends AbstractRevisionCacheTest
 {
   private DataSource dataSource;
 
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/revisioncache/AllTestsCDORevisionCache.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/revisioncache/AllTestsDBRevisionCache.java
index d32452177b..b0b1b344d5 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/revisioncache/AllTestsCDORevisionCache.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/revisioncache/AllTestsDBRevisionCache.java
@@ -9,7 +9,7 @@
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
  */
-package org.eclipse.emf.cdo.tests.revisioncache;
+package org.eclipse.emf.cdo.tests.db.revisioncache;
 
 import junit.framework.Test;
 import junit.framework.TestSuite;
@@ -17,7 +17,7 @@ import junit.framework.TestSuite;
 /**
  * @author Andre Dietisheim
  */
-public class AllTestsCDORevisionCache
+public class AllTestsDBRevisionCache
 {
   public static Test suite()
   {
@@ -26,7 +26,6 @@ public class AllTestsCDORevisionCache
     // $JUnit-BEGIN$
     suite.addTestSuite(DerbyDBRevisionCacheTest.class);
     suite.addTestSuite(H2DBRevisionCacheTest.class);
-    suite.addTestSuite(DefaultRevisionCacheTest.class);
     // $JUnit-END$
 
     return suite;
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/revisioncache/DerbyDBRevisionCacheTest.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/revisioncache/DerbyDBRevisionCacheTest.java
index 65d41dd773..9161009acb 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/revisioncache/DerbyDBRevisionCacheTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/revisioncache/DerbyDBRevisionCacheTest.java
@@ -4,12 +4,12 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
  */
-package org.eclipse.emf.cdo.tests.revisioncache;
+package org.eclipse.emf.cdo.tests.db.revisioncache;
 
 import org.eclipse.net4j.db.DBUtil;
 import org.eclipse.net4j.db.IDBAdapter;
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/revisioncache/H2DBRevisionCacheTest.java b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/revisioncache/H2DBRevisionCacheTest.java
index dee1d3550a..d7283e6e7b 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/revisioncache/H2DBRevisionCacheTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests.db/src/org/eclipse/emf/cdo/tests/db/revisioncache/H2DBRevisionCacheTest.java
@@ -4,12 +4,12 @@
  * 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:
  *    Andre Dietisheim - initial API and implementation
  *    Eike Stepper - maintenance
  */
-package org.eclipse.emf.cdo.tests.revisioncache;
+package org.eclipse.emf.cdo.tests.db.revisioncache;
 
 import org.eclipse.net4j.db.DBUtil;
 import org.eclipse.net4j.db.IDBAdapter;
diff --git a/plugins/org.eclipse.emf.cdo.tests.lissome/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests.lissome/META-INF/MANIFEST.MF
index 82798d2520..75afcc6165 100644
--- a/plugins/org.eclipse.emf.cdo.tests.lissome/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests.lissome/META-INF/MANIFEST.MF
@@ -10,7 +10,8 @@ Bundle-Activator: org.eclipse.emf.cdo.tests.lissome.bundle.OM$Activator
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: .
 Require-Bundle: org.eclipse.emf.cdo.tests;bundle-version="[4.0.0,5.0.0)",
- org.eclipse.emf.cdo.server.lissome;bundle-version="[4.2.0,5.0.0)"
+ org.eclipse.emf.cdo.server.lissome;bundle-version="[4.2.0,5.0.0)",
+ org.eclipse.net4j.db.h2;bundle-version="[4.0.0,5.0.0)"
 Export-Package: org.eclipse.emf.cdo.tests.lissome;version="4.2.0",
  org.eclipse.emf.cdo.tests.lissome.bundle;version="4.2.0";x-internal:=true
 Import-Package: org.h2.jdbcx;version="[1.0.0,2.0.0)"
diff --git a/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF
index f36cc40e31..6bf445139b 100644
--- a/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.emf.cdo.tests/META-INF/MANIFEST.MF
@@ -10,14 +10,10 @@ Bundle-Activator: org.eclipse.emf.cdo.tests.bundle.OM$Activator
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: .
 Require-Bundle: org.eclipse.net4j.tests;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
- org.eclipse.net4j.db;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
- org.eclipse.net4j.db.derby;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
- org.eclipse.net4j.db.h2;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
  org.eclipse.emf.ecore.xmi;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.edit;bundle-version="[2.5.0,3.0.0)";visibility:=reexport,
  org.eclipse.emf.transaction;bundle-version="[1.4.0,1.5.0)";visibility:=reexport,
  org.eclipse.emf.cdo.common;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
- org.eclipse.emf.cdo.common.db;bundle-version="[3.0.0,4.0.0)";visibility:=reexport,
  org.eclipse.emf.cdo.compare;bundle-version="[4.2.0,5.0.0)";visibility:=reexport,
  org.eclipse.emf.cdo;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
  org.eclipse.emf.cdo.net4j;bundle-version="[4.0.0,5.0.0)";visibility:=reexport,
@@ -40,8 +36,6 @@ Require-Bundle: org.eclipse.net4j.tests;bundle-version="[4.0.0,5.0.0)";visibilit
  org.eclipse.emf.cdo.server.admin;bundle-version="[4.1.0,5.0.0)";visibility:=reexport,
  org.eclipse.gmf.runtime.notation;bundle-version="[1.5.0,2.0.0)";visibility:=reexport,
  org.eclipse.ocl.ecore;bundle-version="[3.0.0,4.0.0)"
-Import-Package: org.apache.derby.jdbc;version="[10.0.0,11.0.0)",
- org.h2.jdbcx;version="[1.0.0,2.0.0)"
 Export-Package: base;version="4.0.200",
  base.impl;version="4.0.200",
  base.util;version="4.0.200",
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/revisioncache/AbstractCDORevisionCacheTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/revisioncache/AbstractRevisionCacheTest.java
index 95d1b0cfa6..4cafc2cf19 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/revisioncache/AbstractCDORevisionCacheTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/revisioncache/AbstractRevisionCacheTest.java
@@ -16,7 +16,6 @@ import org.eclipse.emf.cdo.common.branch.CDOBranch;
 import org.eclipse.emf.cdo.common.branch.CDOBranchPoint;
 import org.eclipse.emf.cdo.common.id.CDOID;
 import org.eclipse.emf.cdo.common.id.CDOIDUtil;
-import org.eclipse.emf.cdo.common.internal.db.cache.DBRevisionCache;
 import org.eclipse.emf.cdo.common.revision.CDORevision;
 import org.eclipse.emf.cdo.common.revision.CDORevisionCache;
 import org.eclipse.emf.cdo.eresource.CDOResource;
@@ -44,12 +43,9 @@ import java.util.List;
  *
  * @author Andre Dietisheim
  * @see CDORevisionCache
- * @see DBRevisionCache
- * @see DerbyDBRevisionCacheTest
- * @see H2DBRevisionCacheTest
  * @see DefaultRevisionCacheTest
  */
-public abstract class AbstractCDORevisionCacheTest extends AbstractOMTest
+public abstract class AbstractRevisionCacheTest extends AbstractOMTest
 {
   private static final String RESOURCE_PATH = "/res1";
 
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/revisioncache/AllTestsRevisionCache.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/revisioncache/AllTestsRevisionCache.java
new file mode 100644
index 0000000000..01d9f5af79
--- /dev/null
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/revisioncache/AllTestsRevisionCache.java
@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2004 - 2012 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:
+ *    Andre Dietisheim - initial API and implementation
+ *    Eike Stepper - maintenance
+ */
+package org.eclipse.emf.cdo.tests.revisioncache;
+
+import junit.framework.Test;
+import junit.framework.TestSuite;
+
+/**
+ * @author Andre Dietisheim
+ */
+public class AllTestsRevisionCache
+{
+  public static Test suite()
+  {
+    TestSuite suite = new TestSuite("Tests for CDORevisionCache"); //$NON-NLS-1$
+
+    // $JUnit-BEGIN$
+    suite.addTestSuite(DefaultRevisionCacheTest.class);
+    // $JUnit-END$
+
+    return suite;
+  }
+}
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/revisioncache/DefaultRevisionCacheTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/revisioncache/DefaultRevisionCacheTest.java
index 20e9744ab7..f132c80387 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/revisioncache/DefaultRevisionCacheTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/revisioncache/DefaultRevisionCacheTest.java
@@ -19,7 +19,7 @@ import org.eclipse.emf.cdo.spi.common.revision.InternalCDORevisionCache;
 /**
  * @author Andre Dietisheim
  */
-public class DefaultRevisionCacheTest extends AbstractCDORevisionCacheTest
+public class DefaultRevisionCacheTest extends AbstractRevisionCacheTest
 {
   @Override
   protected InternalCDORevisionCache createRevisionCache(CDOSession session) throws Exception