summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2007-09-24 08:51:18 (EDT)
committerEike Stepper2007-09-24 08:51:18 (EDT)
commitc0bdf94f3e5f29509399b2eec1352d38e5d81ae5 (patch)
tree2867cd505e7f26cea37d0eb6da5036622a2027d7
parent93ffcf7857c72df94b07f5c60b6ee5acefce9187 (diff)
downloadcdo-c0bdf94f3e5f29509399b2eec1352d38e5d81ae5.zip
cdo-c0bdf94f3e5f29509399b2eec1352d38e5d81ae5.tar.gz
cdo-c0bdf94f3e5f29509399b2eec1352d38e5d81ae5.tar.bz2
[204410] CDO test needs Net4j test dependency
https://bugs.eclipse.org/bugs/show_bug.cgi?id=204410
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/.classpath1
-rw-r--r--plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AbstractCDOTest.java42
2 files changed, 16 insertions, 27 deletions
diff --git a/plugins/org.eclipse.emf.cdo.tests/.classpath b/plugins/org.eclipse.emf.cdo.tests/.classpath
index 9e7e4b0..2087376 100644
--- a/plugins/org.eclipse.emf.cdo.tests/.classpath
+++ b/plugins/org.eclipse.emf.cdo.tests/.classpath
@@ -4,6 +4,5 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.eclipse.net4j.db.derby"/>
- <classpathentry kind="lib" path="/org.eclipse.net4j.db.derby/lib/derby.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
diff --git a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AbstractCDOTest.java b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AbstractCDOTest.java
index a5f6d6c..ed0394e 100644
--- a/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AbstractCDOTest.java
+++ b/plugins/org.eclipse.emf.cdo.tests/src/org/eclipse/emf/cdo/tests/AbstractCDOTest.java
@@ -19,24 +19,14 @@ import org.eclipse.emf.cdo.internal.server.Repository;
import org.eclipse.emf.cdo.internal.server.StoreUtil;
import org.eclipse.emf.cdo.server.CDOServerUtil;
import org.eclipse.emf.cdo.server.IStore;
-import org.eclipse.emf.cdo.server.db.IMappingStrategy;
-import org.eclipse.emf.cdo.server.internal.db.DBStore;
-import org.eclipse.emf.cdo.server.internal.db.HorizontalMappingStrategy;
import org.eclipse.emf.cdo.tests.model1.Model1Package;
import org.eclipse.emf.cdo.util.CDOUtil;
import org.eclipse.emf.internal.cdo.util.FSMUtil;
-import org.eclipse.net4j.db.ConnectionProvider;
-import org.eclipse.net4j.db.DBUtil;
-import org.eclipse.net4j.db.IDBAdapter;
-import org.eclipse.net4j.db.internal.derby.DerbyAdapter;
import org.eclipse.net4j.tests.AbstractTransportTest;
import org.eclipse.net4j.util.container.IManagedContainer;
-import javax.sql.DataSource;
-
-import java.util.Properties;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Condition;
import java.util.concurrent.locks.Lock;
@@ -74,22 +64,22 @@ public abstract class AbstractCDOTest extends AbstractTransportTest
return StoreUtil.createNOOPStore();
}
- protected DBStore createDBStore()
- {
- IMappingStrategy mappingStrategy = new HorizontalMappingStrategy();
- IDBAdapter dbAdapter = new DerbyAdapter();
-
- Properties properties = new Properties();
- properties.put("driverClass", "org.apache.derby.jdbc.EmbeddedDataSource");
- properties.put("databaseName", "C:/temp/cdo-repo1");
- properties.put("createDatabase", "create");
- DataSource dataSource = DBUtil.createDataSource(properties);
- ConnectionProvider connectionProvider = DBUtil.createConnectionProvider(dataSource);
-
- DBStore store = new DBStore(mappingStrategy, dbAdapter, connectionProvider);
- mappingStrategy.setStore(store);
- return store;
- }
+ // protected DBStore createDBStore()
+ // {
+ // IMappingStrategy mappingStrategy = new HorizontalMappingStrategy();
+ // IDBAdapter dbAdapter = new DerbyAdapter();
+ //
+ // Properties properties = new Properties();
+ // properties.put("driverClass", "org.apache.derby.jdbc.EmbeddedDataSource");
+ // properties.put("databaseName", "C:/temp/cdo-repo1");
+ // properties.put("createDatabase", "create");
+ // DataSource dataSource = DBUtil.createDataSource(properties);
+ // ConnectionProvider connectionProvider = DBUtil.createConnectionProvider(dataSource);
+ //
+ // DBStore store = new DBStore(mappingStrategy, dbAdapter, connectionProvider);
+ // mappingStrategy.setStore(store);
+ // return store;
+ // }
@Override
protected void doSetUp() throws Exception