Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEike Stepper2013-01-15 10:33:34 +0000
committerEike Stepper2013-01-15 10:33:34 +0000
commitd3697c431c736e1a4357b9ec160910704cf04655 (patch)
tree4a3a8089564d6c9ee060cc37de863badf617f8cb /plugins/org.eclipse.net4j.db.mysql
parent5e646b8541682882ee15ab0ace34fba692b80697 (diff)
downloadcdo-d3697c431c736e1a4357b9ec160910704cf04655.tar.gz
cdo-d3697c431c736e1a4357b9ec160910704cf04655.tar.xz
cdo-d3697c431c736e1a4357b9ec160910704cf04655.zip
[398167] [DB] Remove JDBC driver dependencies from DBAdapter bundles
https://bugs.eclipse.org/bugs/show_bug.cgi?id=398167
Diffstat (limited to 'plugins/org.eclipse.net4j.db.mysql')
-rw-r--r--plugins/org.eclipse.net4j.db.mysql/META-INF/MANIFEST.MF12
-rw-r--r--plugins/org.eclipse.net4j.db.mysql/src/org/eclipse/net4j/db/mysql/MYSQLAdapter.java23
2 files changed, 5 insertions, 30 deletions
diff --git a/plugins/org.eclipse.net4j.db.mysql/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.db.mysql/META-INF/MANIFEST.MF
index 4008361af1..6a311add55 100644
--- a/plugins/org.eclipse.net4j.db.mysql/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.db.mysql/META-INF/MANIFEST.MF
@@ -1,8 +1,8 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: %pluginName
Bundle-SymbolicName: org.eclipse.net4j.db.mysql;singleton:=true
-Bundle-Version: 4.1.0.qualifier
+Bundle-Version: 4.2.0.qualifier
+Bundle-Name: %pluginName
Bundle-Vendor: %providerName
Bundle-Localization: plugin
Bundle-RequiredExecutionEnvironment: J2SE-1.5
@@ -10,9 +10,7 @@ Bundle-ClassPath: .
Bundle-ActivationPolicy: lazy
Bundle-Activator: org.eclipse.net4j.db.internal.mysql.bundle.OM$Activator
Require-Bundle: org.eclipse.net4j.db;bundle-version="[4.0.0,5.0.0)";visibility:=reexport
-Import-Package: com.mysql.jdbc;version="[5.0.0,6.0.0)",
- com.mysql.jdbc.jdbc2.optional;version="[5.0.0,6.0.0)",
- org.osgi.framework;version="[1.0.0,2.0.0)"
-Export-Package: org.eclipse.net4j.db.internal.mysql.bundle;version="4.1.0";x-internal:=true,
- org.eclipse.net4j.db.mysql;version="4.1.0"
+Import-Package: org.osgi.framework;version="[1.0.0,2.0.0)"
+Export-Package: org.eclipse.net4j.db.internal.mysql.bundle;version="4.2.0";x-internal:=true,
+ org.eclipse.net4j.db.mysql;version="4.2.0"
Eclipse-RegisterBuddy: org.eclipse.net4j.db
diff --git a/plugins/org.eclipse.net4j.db.mysql/src/org/eclipse/net4j/db/mysql/MYSQLAdapter.java b/plugins/org.eclipse.net4j.db.mysql/src/org/eclipse/net4j/db/mysql/MYSQLAdapter.java
index 7810a35c45..670d37af34 100644
--- a/plugins/org.eclipse.net4j.db.mysql/src/org/eclipse/net4j/db/mysql/MYSQLAdapter.java
+++ b/plugins/org.eclipse.net4j.db.mysql/src/org/eclipse/net4j/db/mysql/MYSQLAdapter.java
@@ -10,17 +10,11 @@
*/
package org.eclipse.net4j.db.mysql;
-import org.eclipse.net4j.db.DBException;
import org.eclipse.net4j.db.DBType;
import org.eclipse.net4j.db.IDBAdapter;
import org.eclipse.net4j.db.ddl.IDBField;
import org.eclipse.net4j.spi.db.DBAdapter;
-import com.mysql.jdbc.jdbc2.optional.MysqlDataSource;
-
-import javax.sql.DataSource;
-
-import java.sql.Driver;
import java.sql.SQLException;
/**
@@ -74,23 +68,6 @@ public class MYSQLAdapter extends DBAdapter
super(NAME, VERSION);
}
- public Driver getJDBCDriver()
- {
- try
- {
- return new com.mysql.jdbc.Driver();
- }
- catch (SQLException ex)
- {
- throw new DBException(ex);
- }
- }
-
- public DataSource createJDBCDataSource()
- {
- return new MysqlDataSource();
- }
-
/**
* @since 2.0
*/

Back to the top