diff options
Diffstat (limited to 'plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/CDODBUtil.java')
-rw-r--r-- | plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/CDODBUtil.java | 41 |
1 files changed, 17 insertions, 24 deletions
diff --git a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/CDODBUtil.java b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/CDODBUtil.java index 439d10f8c1..ac31a72212 100644 --- a/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/CDODBUtil.java +++ b/plugins/org.eclipse.emf.cdo.server.db/src/org/eclipse/emf/cdo/server/db/CDODBUtil.java @@ -10,15 +10,6 @@ **************************************************************************/ package org.eclipse.emf.cdo.server.db; -import org.eclipse.emf.cdo.internal.server.bundle.OM; -import org.eclipse.emf.cdo.server.internal.db.CDODBStoreManager; - -import org.eclipse.net4j.db.DBUtil; -import org.eclipse.net4j.db.IDBAdapter; - -import javax.sql.DataSource; - -import java.util.Properties; /** * @author Eike Stepper @@ -29,19 +20,21 @@ public final class CDODBUtil { } - public static CDODBStoreManager getStoreManager(IDBAdapter dbAdapter, DataSource dataSource) - { - CDODBStoreManager storeManager = new CDODBStoreManager(dbAdapter, dataSource); - storeManager.initDatabase(); - return storeManager; - } - - public static CDODBStoreManager getStoreManager() - { - Properties properties = OM.BUNDLE.getConfigProperties(); - String adapterName = properties.getProperty("store.adapterName", "derby"); - IDBAdapter dbAdapter = DBUtil.getDBAdapter(adapterName); - DataSource dataSource = DBUtil.createDataSource(properties, "datasource"); - return getStoreManager(dbAdapter, dataSource); - } + // public static CDODBStoreManager getStoreManager(IDBAdapter dbAdapter, + // DataSource dataSource) + // { + // CDODBStoreManager storeManager = new CDODBStoreManager(dbAdapter, + // dataSource); + // storeManager.initDatabase(); + // return storeManager; + // } + // + // public static CDODBStoreManager getStoreManager() + // { + // Properties properties = OM.BUNDLE.getConfigProperties(); + // String adapterName = properties.getProperty("store.adapterName", "derby"); + // IDBAdapter dbAdapter = DBUtil.getDBAdapter(adapterName); + // DataSource dataSource = DBUtil.createDataSource(properties, "datasource"); + // return getStoreManager(dbAdapter, dataSource); + // } } |