From 8dbeed25e1037ee5cb8567482fca71cca049d814 Mon Sep 17 00:00:00 2001
From: Eike Stepper
Date: Sun, 28 Oct 2012 18:00:52 +0100
Subject: Don't use driver-specific subtype in return values from getDriver()

---
 plugins/org.eclipse.net4j.db.mysql/.settings/.api_filters     | 11 +++++++++++
 plugins/org.eclipse.net4j.db.mysql/META-INF/MANIFEST.MF       |  6 +++---
 .../src/org/eclipse/net4j/db/mysql/MYSQLAdapter.java          |  4 ++--
 3 files changed, 16 insertions(+), 5 deletions(-)
 create mode 100644 plugins/org.eclipse.net4j.db.mysql/.settings/.api_filters

(limited to 'plugins/org.eclipse.net4j.db.mysql')

diff --git a/plugins/org.eclipse.net4j.db.mysql/.settings/.api_filters b/plugins/org.eclipse.net4j.db.mysql/.settings/.api_filters
new file mode 100644
index 0000000000..5658e24753
--- /dev/null
+++ b/plugins/org.eclipse.net4j.db.mysql/.settings/.api_filters
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<component id="org.eclipse.net4j.db.mysql" version="2">
+    <resource path="src/org/eclipse/net4j/db/mysql/MYSQLAdapter.java" type="org.eclipse.net4j.db.mysql.MYSQLAdapter">
+        <filter id="338792546">
+            <message_arguments>
+                <message_argument value="org.eclipse.net4j.db.mysql.MYSQLAdapter"/>
+                <message_argument value="getJDBCDriver()"/>
+            </message_arguments>
+        </filter>
+    </resource>
+</component>
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 ab6e18a067..4008361af1 100644
--- a/plugins/org.eclipse.net4j.db.mysql/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.db.mysql/META-INF/MANIFEST.MF
@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: %pluginName
 Bundle-SymbolicName: org.eclipse.net4j.db.mysql;singleton:=true
-Bundle-Version: 4.0.100.qualifier
+Bundle-Version: 4.1.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
@@ -13,6 +13,6 @@ Require-Bundle: org.eclipse.net4j.db;bundle-version="[4.0.0,5.0.0)";visibility:=
 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.0.100";x-internal:=true,
- org.eclipse.net4j.db.mysql;version="4.0.100"
+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"
 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 a2257f17c4..2c5f603b43 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
@@ -16,11 +16,11 @@ import org.eclipse.net4j.db.IDBAdapter;
 import org.eclipse.net4j.db.ddl.IDBField;
 import org.eclipse.net4j.spi.db.DBAdapter;
 
-import com.mysql.jdbc.Driver;
 import com.mysql.jdbc.jdbc2.optional.MysqlDataSource;
 
 import javax.sql.DataSource;
 
+import java.sql.Driver;
 import java.sql.SQLException;
 
 /**
@@ -78,7 +78,7 @@ public class MYSQLAdapter extends DBAdapter
   {
     try
     {
-      return new Driver();
+      return new com.mysql.jdbc.Driver();
     }
     catch (SQLException ex)
     {
-- 
cgit v1.2.3