[238822] Substitute nested JDBC jars by package imports

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

20 files changed, 15 insertions, 900 deletions

diff --git a/plugins/org.eclipse.net4j.db.hsqldb/.classpath b/plugins/org.eclipse.net4j.db.hsqldb/.classpath
index c6fb0e5c84..64c5e31b7a 100644
--- a/plugins/org.eclipse.net4j.db.hsqldb/.classpath
+++ b/plugins/org.eclipse.net4j.db.hsqldb/.classpath
@@ -3,6 +3,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 kind="src" path="src"/>
-	<classpathentry exported="true" kind="lib" path="lib/hsqldb.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.db.hsqldb/META-INF/MANIFEST.MF
index 13584cf849..014665de51 100644
--- a/plugins/org.eclipse.net4j.db.hsqldb/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.db.hsqldb/META-INF/MANIFEST.MF
@@ -5,24 +5,13 @@ Bundle-SymbolicName: org.eclipse.net4j.db.hsqldb;singleton:=true
 Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
-Bundle-ClassPath: .,
- lib/hsqldb.jar
+Bundle-ClassPath: .
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.net4j.db;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
 Export-Package: org.eclipse.net4j.db.hsqldb;version="2.0.0",
  org.eclipse.net4j.db.internal.hsqldb;version="2.0.0";x-friends:="org.eclipse.net4j.db.tests",
- org.eclipse.net4j.db.internal.hsqldb.bundle;version="2.0.0";x-internal:=true,
- org.hsqldb;version="1.8.0",
- org.hsqldb.index;version="1.8.0",
- org.hsqldb.jdbc;version="1.8.0",
- org.hsqldb.lib;version="1.8.0",
- org.hsqldb.lib.java;version="1.8.0",
- org.hsqldb.persist;version="1.8.0",
- org.hsqldb.resources;version="1.8.0",
- org.hsqldb.rowio;version="1.8.0",
- org.hsqldb.scriptio;version="1.8.0",
- org.hsqldb.store;version="1.8.0",
- org.hsqldb.types;version="1.8.0",
- org.hsqldb.util;version="1.8.0"
+ org.eclipse.net4j.db.internal.hsqldb.bundle;version="2.0.0";x-internal:=true
 Eclipse-RegisterBuddy: org.eclipse.net4j.db
+Import-Package: org.hsqldb,
+ org.hsqldb.jdbc
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/build.properties b/plugins/org.eclipse.net4j.db.hsqldb/build.properties
index 514e156d39..73c6cce431 100644
--- a/plugins/org.eclipse.net4j.db.hsqldb/build.properties
+++ b/plugins/org.eclipse.net4j.db.hsqldb/build.properties
@@ -19,6 +19,4 @@ bin.includes = META-INF/,\
                epl-v10.html,\
                license.html,\
                plugin.properties,\
-               plugin.xml,\
-               lib/,\
-               lib/hsqldb.jar
+               plugin.xml
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/lib/.cvsignore b/plugins/org.eclipse.net4j.db.hsqldb/lib/.cvsignore
deleted file mode 100644
index d392f0e82c..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/lib/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.jar
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/lib/databaseinjar.txt b/plugins/org.eclipse.net4j.db.hsqldb/lib/databaseinjar.txt
deleted file mode 100644
index 3383501955..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/lib/databaseinjar.txt
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
-A patch for storing a readonly hsqldb database in a Jar was contributed by Brendan Ryan
-and has been incorporated into the code base. Additional work on connection URL
-allow more uniform access to this feature.
-
-The steps required are as follows:
-
-Ensure the database does not contain CACHED or TEXT tables.
-Make the database radonly after a SHUTDOWN.
-Include the two database files *.properties and *.script in a directory in your Jar
-Access the database with the jdbc:hsqldb:res: protocol
-
-The relative location of the database as taken from the jdbc url is used.
-For example, if the url is specified as "jdbc:hsqldb:res:/testdata/felder"
-then the database is loaded from the "/testdata/" directory in the jar
-and the database file names are "felder.properties" and
-felder.script" in that directory.
-
-Brendan Ryan wrote (text and sample changed):
-
-I have made a small change to allow a readonly hsqldb database (.script and
-.properties) to be stored in a JAR file so that it can be used with JWS.
-
-A sample jnlp file is given below.
-
-I hope the code is useful for someone.
-
-Regards
-Brendan Ryan
--->
-
-<jnlp spec="1.0+" codebase="file:///c:/ERM/internet/build/pass/">
-<information>
-  <title>Mask Builder</title>
-  <vendor>PUI</vendor>
-  <homepage href="http://www.pi-ag.com" />
-  <description>Demonstration of JNLP</description>
-  <icon href="raptor.gif"/>
-</information>
-<offline-allowed/>
-<security>
-  <all-permissions/>
-</security>
-<resources>
-  <j2se version="1.4+" />
-  <jar href="pass-maskbuilder.jar"/>
-  <jar href="jaxb-rt-1.0-ea.jar"/>
-  <jar href="hsqldb.jar"/>
-  <jar href="testdb.jar"/>
-  <property name="jdbc.drivers" value="org.hsqldb.jdbcDriver"/>
-  <property name="jdbc.url" value="jdbc:hsqldb:res:/testdata/felder"/>
-  <property name="jdbc.user" value="sa"/>
-  <property name="jdbc.password" value="" />
-</resources>
-<application-desc />
-</jnlp>
-
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/lib/hsqlFindFile.html b/plugins/org.eclipse.net4j.db.hsqldb/lib/hsqlFindFile.html
deleted file mode 100644
index 55f34afc55..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/lib/hsqlFindFile.html
+++ /dev/null
@@ -1,29 +0,0 @@
-<html>
-<head>
-<meta http-equiv=Content-Type content="text/html; charset=us-ascii">
-<title>HSQLDB Find File Sample Application</title>
-</head>
-<body bgcolor=#FFFFFF lang=EN-GB class="Normal">
-<h2>HSQLDB  Find File Sample Application</h2>
-<p>This application builds a database of a directory tree and allows you to search 
-  the database.</p>
-<p>This example application is designed for programmers who are new to the JDBC. 
-  The functionality is kept low, so it should be easy to understand what is going 
-  on. It connects, execute queries and inserts data into the database. </p>
-<p>First, the database must be initialized with a path. All the file names in 
-  this directory and all its subdirectories will be stored in the database. After 
-  this is done, the database can be searched for files that match a specific pattern. 
-</p>
-<p>This sample application is not compiled as part of the hsqldb jar. You should 
-  compile it yourself. You should modify the following examples to include the 
-  correct location of the hsqldb.jar in the commands. </p>
-<h4>Usage</h4>
-<p>Re-create database from directory '.': </p>
-<p><code><span style='font-size:10.0pt;font-family:"Courier New"'>java -classpath 
-  hsqldb.jar org.hsqldb.sample.FindFile -init .</span></code> </p>
-<p>Find files like 'name': </p>
-<p><code><span style='font-size:10.0pt;font-family:"Courier New"'>java -classpath 
-  hsqldb.jar org.hsqldb.sample.FindFile name</span></code> </p>
-<p><font size="-1">This text is based on HypersonicSQL documentation, updated to reflect the latest version of HSQLDB</font></p>
-</body>
-</html>
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/lib/hsqlSoftwareLinks.html b/plugins/org.eclipse.net4j.db.hsqldb/lib/hsqlSoftwareLinks.html
deleted file mode 100644
index f545bfb5fa..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/lib/hsqlSoftwareLinks.html
+++ /dev/null
@@ -1,36 +0,0 @@
-<HTML>

-<h3>ANNOUNCEMENTS OF SOME ADDITIONAL SOFTWARE THAT CAN POSSIBLY BE USED WITH HSQLDB</h3>

-<p>&nbsp;</p>

-<p>This document is a compilation of some information that has been submitted to HSQLDB mailing lists or forums.  The HSQLDB project or its developers are not responsible for the software mentioned in this document, its suitability for any purpose, or the accuracy of the information provided in this document.</p>

-<hr>

-<p>LightCrypto is a set of Open Source Java<br>

-  classes with basic cryptographic routines using the BouncyCastle lightweight API.</p>

-<p>It uses a minimal amount of memory so it can be used with J2ME, browser applets, on small Java devices such as PDA's or Java enabled mobile phones or in any other situation where Sun's JCE (Java Cryptographic<br>

-  Extensions) is too heavy for the job.</p>

-<p>Hsqldb-ready functions are also included.</p>

-<p>Feature list:</p>

-<p># Create digest from strings and files with MD5 (default), SHA-1, SHA-256 , SHA-512 or RIPEMD160 hash algorithms<br>

-  # Encrypt/Decrypt strings and files using the AES (lightweight implementation) algorithm with any keylength (default 128 bits) in CBC mode with PKCS12 padding.<br>

-  # Encrypts the symmetric keystore and protects it with a passphrase (PBE)<br>

-  # Functions to hash/encrypt/decrypt data in HSQLDB embeddable database engine using SQL statements.<br>

-  # Open Source<br>

-  # 100% Java<br>

-  # Uses the BouncyCastle.org lightweight API instead of Sun's JCE (Java Cryptographic Extensions)</p>

-<p>Homepage: <a href="http://jcetaglib.sourceforge.net/lightcrypto/">http://jcetaglib.sourceforge.net/lightcrypto/</a></p>

-<p>Beta 1 (including HSqldb routines + examples) has been released and can be downloaded on<br>

-  <a href="http://sourceforge.net/project/showfiles.php?group_id=60642">http://sourceforge.net/project/showfiles.php?group_id=60642</a></p>

-<hr>

-<p>Open source, lightweight cryptography extensions to Java for use with LightCrypto or HSQLDB for SSL access can be found here:</p>

-<p><a href="http://www.bouncycastle.org/">http://www.bouncycastle.org/</a></p>

-<hr>

-<p>The open-source FormattedDataSet may be the easiest way to generate dynamic text such as HTML, and XML. </p>

-<p>I just deployed a demo WAR that allows developers to enter any hsqldb join and render the results as an HTML table that can be sorted by clicking on the column headers. I picked hsqldb for my database as I didn't want anyone that installed the war to have to worry about installing a database. </p>

-<p>The demo also times opening/closing Connections, ResultSets and Statements. This WAR would be useful for you guys to give out to demonstrate your database.</p>

-<p>The demo works with any RDBMS. </p>

-<p>Check it out at <a href="http://www.fdsapi.com">http://www.fdsapi.com</a> and select the live demo link.</p>

-<p>&nbsp;</p>

-<p>&nbsp;</p>

-

-

-</HTML>

-

diff --git a/plugins/org.eclipse.net4j.db.hsqldb/lib/hsqldb_lic.txt b/plugins/org.eclipse.net4j.db.hsqldb/lib/hsqldb_lic.txt
deleted file mode 100644
index 953bfa0a29..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/lib/hsqldb_lic.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-/* Copyright (c) 2001-2005, The HSQL Development Group
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * Neither the name of the HSQL Development Group nor the names of its
- * contributors may be used to endorse or promote products derived from this
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL HSQL DEVELOPMENT GROUP, HSQLDB.ORG, 
- * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/lib/hypersonic_lic.txt b/plugins/org.eclipse.net4j.db.hsqldb/lib/hypersonic_lic.txt
deleted file mode 100644
index 014bf60eb9..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/lib/hypersonic_lic.txt
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Copyright (c) 1995-2000, The Hypersonic SQL Group.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * Neither the name of the Hypersonic SQL Group nor the names of its
- * contributors may be used to endorse or promote products derived from this
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE HYPERSONIC SQL GROUP, 
- * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- * This software consists of voluntary contributions made by many individuals 
- * on behalf of the Hypersonic SQL Group.
- *
- *
- * For work added by the HSQL Development Group:
- * 
- * Copyright (c) 2001-2004, The HSQL Development Group
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are met:
- *
- * Redistributions of source code must retain the above copyright notice, this
- * list of conditions and the following disclaimer.
- *
- * Redistributions in binary form must reproduce the above copyright notice,
- * this list of conditions and the following disclaimer in the documentation
- * and/or other materials provided with the distribution.
- *
- * Neither the name of the HSQL Development Group nor the names of its
- * contributors may be used to endorse or promote products derived from this
- * software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL HSQL DEVELOPMENT GROUP, HSQLDB.ORG, 
- * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
- * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/lib/readme-docauthors.txt b/plugins/org.eclipse.net4j.db.hsqldb/lib/readme-docauthors.txt
deleted file mode 100644
index a3418bdc14..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/lib/readme-docauthors.txt
+++ /dev/null
@@ -1,115 +0,0 @@
-HOW TO CREATE AND WORK WITH DOCBOOK DOCUMENTS FOR HSQLDB
-
-At some point, this document itself should be converted to DocBook format.
-
-
-Our DocBook strategy is still subject to change.  For now...
-
-
-TO CREATE A NEW DOCBOOK BOOK
-
-Think up a base filename for your document.
-It should be nice and short, without funny characters (but hyphens, other
-than leading hypends, are ok).  Example:  sqltool.
-Hereafter, I'll refer to this as your "book name".
-
-Create a subdirectory of "docsrc" with name of your book name.
-I'll refer to this directory (docsrc + book name) as "your book directory".
-
-Inside your book directory, create your main DocBook source file with name
-of your book name + ".xml", e.g. "sqltool.xml".
-
-Your DocBook document may reference or include shared files in the
-main 'docsrc' directory as well as any files which you put into your
-book directory.
-You may want to include sample .java files, screen shots, or component
-DocBook source files.
-Usually you will just copy these files right into your book directory.
-
-For examples of just about everything, see .../docsrc/sqltool/sqltool.xml.
-Notice that sqltool.xml pulls in a document section from the main docsrc
-directory.
-
-Add your book name to the .cvsignore file in the doc directory.
-
-Until all of the CVS artifacts are moved out of the "doc" directory,
-you will need to edit the clean-doc target in the build.xml file in
-the build directory so that it will remove the derived files for
-your book from under the doc directory.
-
-
-HOW TO REFERENCE OR INCLUDE OTHER FILES IN YOUR DOCBOOK SOURCE FILE(s).
-
-To link to outside documents (which you supply or not), you'll usually
-use the DocBook <ulink> element.
-
-To "import" other documents, just use the general external parsed entity 
-mechanism.
-This is a basic DTD-style XML feature where you use macros like
-&entityname;.  Either find an XML reference or look around our existing
-DocBook source files for an example to follow.
-
-One tricky point is how to include external files verbatim.
-If you just read in external files as parsed entities, they will be parsed
-as DocBook source (and therefore they must consist of, at least, legal
-XML)*.
-But often you will want to import a real, working file (like a 
-configuration file, sql file, Java source file), and you won't want to
-hack it up just so you can import it.
-(For one thing, you shouldn't have to; for another, you may want to 
-provide a link to the file for download, so you wouldn't want people
-to download a hacked-up version).
-It would be nice if you could CDATA, then include the entity, but that
-won't work since the &...; inclusion directive would thereby be escaped.
-If you don't know what the hell CDATA is, just follow the instructions
-in the next paragraph.
-
-To import a document verbatim, define an external parsed entity for 
-the file ../../docwork/BOOKNAME/cdata/file.name, where BOOKNAME is 
-your book name and file.name is the name of the file to be imported
-(which resides in the current directory).
-If you want to know, what will happen is, the Ant build will copy the 
-file-to-be-imported to the directory .../docwork/BOOKNAME/cdata and will 
-sandwich it in a CDATA directive.
-If you want to provide a link to the document, you just ulink to 
-the document in the current directory, not to the one in the cdata
-
-POSTNOTE:  The long-term way to do this is with XInclude, or some
-other generic XML inclusion mechanism.  Unfortunately, none of the
-good methods work with the Java ports of DocBook!
-
-
-=======================================================================
-
-CONVENTIONS
-
-Please use <remark> elements to mark up notes for yourself or for
-other developers.
-All <remark>s should be removed before the doc goes public!
-
-Please capitalize HSQLDB like "Hsqldb" in titles, and capitalize like
-"HSQLDB" elsewhere.  (In filepaths and package names you code as
-required for the filepath or package name, of course).
-
-=======================================================================
-
-TIPS
-
-When closing DocBook <screen> and <programlisting> elements, make
-sure that there is no line break after the text to display and before
-the closing </screen> or </programlisting> tag.
-Otherwise the resultant display will not look right.
-
-Don't capitalize words or phrases to emphasize them (including in
-section titles or headings).
-If you want to emphasize something a certain way, then use a DocBook
-emphasis role, and leave the presentation decisions to the style sheets.
-It is very easy to set a CSS style to capitalize headings if you want
-them to appear that way.
-
-
-
-* Theoretically it would be better and SHOULD be simpler to use
-unparsed entities for this purpose, but unparsed entities are a 
-messy legacy feature of DTD which is more convoluted than the 
-strategy described here.
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/lib/readme.txt b/plugins/org.eclipse.net4j.db.hsqldb/lib/readme.txt
deleted file mode 100644
index 87f934c8fd..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/lib/readme.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-Readme FileAugust 2007
-
This package contains HSQLDB 1.8.0.8
-
-HSQLDB is a relational database engine and a set of tools written in Java.The file index.html in this directory contains the list of directories with their contents.Documentation and license information can be found in the /doc directory.Project home page: http://hsqldb.orgPlease check the site periodically for updated versions.
diff --git a/plugins/org.eclipse.net4j.db.hsqldb/lib/readme_linux.txt b/plugins/org.eclipse.net4j.db.hsqldb/lib/readme_linux.txt
deleted file mode 100644
index 6a435d98f3..0000000000
--- a/plugins/org.eclipse.net4j.db.hsqldb/lib/readme_linux.txt
+++ /dev/null
@@ -1,12 +0,0 @@
-Readme Linux
-
-$Id$
-Query CVS for revision history.
-
-It is recommended to run the shell scripts(from /bin and /demo) from the 
-console, as you will not to be able see any messages from the desktop.
-You should set the env variable $JAVA_HOME before running any of the sripts,
-or you can use the -jdkhome switch instead to specify the JDK.
-
-See the UNIX Quick Start chapter of the Hsqldb User Guide about how to use
-the UNIX init script 'hsqldb'.
diff --git a/plugins/org.eclipse.net4j.db.mysql/.classpath b/plugins/org.eclipse.net4j.db.mysql/.classpath
index 600710b4fa..64c5e31b7a 100644
--- a/plugins/org.eclipse.net4j.db.mysql/.classpath
+++ b/plugins/org.eclipse.net4j.db.mysql/.classpath
@@ -3,6 +3,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 kind="src" path="src"/>
-	<classpathentry exported="true" kind="lib" path="lib/mysql-connector-java-5.1.5-bin.jar" sourcepath="org.eclipse.net4j.db.mysqlsrc.zip"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
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 3c85ca4e16..518c7fb687 100644
--- a/plugins/org.eclipse.net4j.db.mysql/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.db.mysql/META-INF/MANIFEST.MF
@@ -6,21 +6,11 @@ Bundle-Version: 2.0.0.qualifier
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
-Bundle-ClassPath: .,
- lib/mysql-connector-java-5.1.5-bin.jar
+Bundle-ClassPath: .
 Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.net4j.db;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
-Export-Package: com.mysql.jdbc;version="5.1.5",
- com.mysql.jdbc.exceptions;version="5.1.5",
- com.mysql.jdbc.exceptions.jdbc4;version="5.1.5",
- com.mysql.jdbc.integration.c3p0;version="5.1.5",
- com.mysql.jdbc.integration.jboss;version="5.1.5",
- com.mysql.jdbc.interceptors;version="5.1.5",
- com.mysql.jdbc.jdbc2.optional;version="5.1.5",
- com.mysql.jdbc.log;version="5.1.5",
- com.mysql.jdbc.profiler;version="5.1.5",
- com.mysql.jdbc.util;version="5.1.5",
- org.eclipse.net4j.db.internal.mysql;version="2.0.0";x-friends:="org.eclipse.net4j.db.tests",
- org.eclipse.net4j.db.internal.mysql.bundle;version="2.0.0";x-internal:=true,
- org.gjt.mm.mysql;version="5.1.5"
+Export-Package: org.eclipse.net4j.db.internal.mysql;version="2.0.0";x-friends:="org.eclipse.net4j.db.tests",
+ org.eclipse.net4j.db.internal.mysql.bundle;version="2.0.0";x-internal:=true
 Eclipse-RegisterBuddy: org.eclipse.net4j.db
+Import-Package: com.mysql.jdbc,
+ com.mysql.jdbc.jdbc2.optional
diff --git a/plugins/org.eclipse.net4j.db.mysql/build.properties b/plugins/org.eclipse.net4j.db.mysql/build.properties
index 8d14192ae0..73c6cce431 100644
--- a/plugins/org.eclipse.net4j.db.mysql/build.properties
+++ b/plugins/org.eclipse.net4j.db.mysql/build.properties
@@ -19,6 +19,4 @@ bin.includes = META-INF/,\
                epl-v10.html,\
                license.html,\
                plugin.properties,\
-               plugin.xml,\
-               lib/,\
-               lib/mysql-connector-java-5.1.5-bin.jar
+               plugin.xml
diff --git a/plugins/org.eclipse.net4j.db.mysql/lib/.cvsignore b/plugins/org.eclipse.net4j.db.mysql/lib/.cvsignore
deleted file mode 100644
index d392f0e82c..0000000000
--- a/plugins/org.eclipse.net4j.db.mysql/lib/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-*.jar
diff --git a/plugins/org.eclipse.net4j.db.mysql/lib/COPYING b/plugins/org.eclipse.net4j.db.mysql/lib/COPYING
deleted file mode 100644
index 025ed9e7e0..0000000000
--- a/plugins/org.eclipse.net4j.db.mysql/lib/COPYING
+++ /dev/null
@@ -1,343 +0,0 @@
-GNU General Public License
-**************************
-
-     	    GNU GENERAL PUBLIC LICENSE
-     	       Version 2, June 1991
-     
-     Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-     		  675 Mass Ave, Cambridge, MA 02139, USA
-     Everyone is permitted to copy and distribute verbatim copies
-     of this license document, but changing it is not allowed.
-     
-     		    Preamble
-     
-     The licenses for most software are designed to take away your
-     freedom to share and change it.  By contrast, the GNU General Public
-     License is intended to guarantee your freedom to share and change free
-     software--to make sure the software is free for all its users.  This
-     General Public License applies to most of the Free Software
-     Foundation's software and to any other program whose authors commit to
-     using it.  (Some other Free Software Foundation software is covered by
-     the GNU Library General Public License instead.)  You can apply it to
-     your programs, too.
-     
-     When we speak of free software, we are referring to freedom, not
-     price.  Our General Public Licenses are designed to make sure that you
-     have the freedom to distribute copies of free software (and charge for
-     this service if you wish), that you receive source code or can get it
-     if you want it, that you can change the software or use pieces of it
-     in new free programs; and that you know you can do these things.
-     
-     To protect your rights, we need to make restrictions that forbid
-     anyone to deny you these rights or to ask you to surrender the rights.
-     These restrictions translate to certain responsibilities for you if you
-     distribute copies of the software, or if you modify it.
-     
-     For example, if you distribute copies of such a program, whether
-     gratis or for a fee, you must give the recipients all the rights that
-     you have.  You must make sure that they, too, receive or can get the
-     source code.  And you must show them these terms so they know their
-     rights.
-     
-     We protect your rights with two steps: (1) copyright the software, and
-     (2) offer you this license which gives you legal permission to copy,
-     distribute and/or modify the software.
-     
-     Also, for each author's protection and ours, we want to make certain
-     that everyone understands that there is no warranty for this free
-     software.  If the software is modified by someone else and passed on, we
-     want its recipients to know that what they have is not the original, so
-     that any problems introduced by others will not reflect on the original
-     authors' reputations.
-     
-     Finally, any free program is threatened constantly by software
-     patents.  We wish to avoid the danger that redistributors of a free
-     program will individually obtain patent licenses, in effect making the
-     program proprietary.  To prevent this, we have made it clear that any
-     patent must be licensed for everyone's free use or not licensed at all.
-     
-     The precise terms and conditions for copying, distribution and
-     modification follow.
-     
-     	    GNU GENERAL PUBLIC LICENSE
-     TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-     
-     0. This License applies to any program or other work which contains
-     a notice placed by the copyright holder saying it may be distributed
-     under the terms of this General Public License.  The "Program", below,
-     refers to any such program or work, and a "work based on the Program"
-     means either the Program or any derivative work under copyright law:
-     that is to say, a work containing the Program or a portion of it,
-     either verbatim or with modifications and/or translated into another
-     language.  (Hereinafter, translation is included without limitation in
-     the term "modification".)  Each licensee is addressed as "you".
-     
-     Activities other than copying, distribution and modification are not
-     covered by this License; they are outside its scope.  The act of
-     running the Program is not restricted, and the output from the Program
-     is covered only if its contents constitute a work based on the
-     Program (independent of having been made by running the Program).
-     Whether that is true depends on what the Program does.
-     
-     1. You may copy and distribute verbatim copies of the Program's
-     source code as you receive it, in any medium, provided that you
-     conspicuously and appropriately publish on each copy an appropriate
-     copyright notice and disclaimer of warranty; keep intact all the
-     notices that refer to this License and to the absence of any warranty;
-     and give any other recipients of the Program a copy of this License
-     along with the Program.
-     
-     You may charge a fee for the physical act of transferring a copy, and
-     you may at your option offer warranty protection in exchange for a fee.
-     
-     2. You may modify your copy or copies of the Program or any portion
-     of it, thus forming a work based on the Program, and copy and
-     distribute such modifications or work under the terms of Section 1
-     above, provided that you also meet all of these conditions:
-     
-     a) You must cause the modified files to carry prominent notices
-     stating that you changed the files and the date of any change.
-     
-     b) You must cause any work that you distribute or publish, that in
-     whole or in part contains or is derived from the Program or any
-     part thereof, to be licensed as a whole at no charge to all third
-     parties under the terms of this License.
-     
-     c) If the modified program normally reads commands interactively
-     when run, you must cause it, when started running for such
-     interactive use in the most ordinary way, to print or display an
-     announcement including an appropriate copyright notice and a
-     notice that there is no warranty (or else, saying that you provide
-     a warranty) and that users may redistribute the program under
-     these conditions, and telling the user how to view a copy of this
-     License.  (Exception: if the Program itself is interactive but
-     does not normally print such an announcement, your work based on
-     the Program is not required to print an announcement.)
-     
-     These requirements apply to the modified work as a whole.  If
-     identifiable sections of that work are not derived from the Program,
-     and can be reasonably considered independent and separate works in
-     themselves, then this License, and its terms, do not apply to those
-     sections when you distribute them as separate works.  But when you
-     distribute the same sections as part of a whole which is a work based
-     on the Program, the distribution of the whole must be on the terms of
-     this License, whose permissions for other licensees extend to the
-     entire whole, and thus to each and every part regardless of who wrote it.
-     
-     Thus, it is not the intent of this section to claim rights or contest
-     your rights to work written entirely by you; rather, the intent is to
-     exercise the right to control the distribution of derivative or
-     collective works based on the Program.
-     
-     In addition, mere aggregation of another work not based on the Program
-     with the Program (or with a work based on the Program) on a volume of
-     a storage or distribution medium does not bring the other work under
-     the scope of this License.
-     
-     3. You may copy and distribute the Program (or a work based on it,
-     under Section 2) in object code or executable form under the terms of
-     Sections 1 and 2 above provided that you also do one of the following:
-     
-     a) Accompany it with the complete corresponding machine-readable
-     source code, which must be distributed under the terms of Sections
-     1 and 2 above on a medium customarily used for software interchange; or,
-     
-     b) Accompany it with a written offer, valid for at least three
-     years, to give any third party, for a charge no more than your
-     cost of physically performing source distribution, a complete
-     machine-readable copy of the corresponding source code, to be
-     distributed under the terms of Sections 1 and 2 above on a medium
-     customarily used for software interchange; or,
-     
-     c) Accompany it with the information you received as to the offer
-     to distribute corresponding source code.  (This alternative is
-     allowed only for noncommercial distribution and only if you
-     received the program in object code or executable form with such
-     an offer, in accord with Subsection b above.)
-     
-     The source code for a work means the preferred form of the work for
-     making modifications to it.  For an executable work, complete source
-     code means all the source code for all modules it contains, plus any
-     associated interface definition files, plus the scripts used to
-     control compilation and installation of the executable.  However, as a
-     special exception, the source code distributed need not include
-     anything that is normally distributed (in either source or binary
-     form) with the major components (compiler, kernel, and so on) of the
-     operating system on which the executable runs, unless that component
-     itself accompanies the executable.
-     
-     If distribution of executable or object code is made by offering
-     access to copy from a designated place, then offering equivalent
-     access to copy the source code from the same place counts as
-     distribution of the source code, even though third parties are not
-     compelled to copy the source along with the object code.
-     
-     4. You may not copy, modify, sublicense, or distribute the Program
-     except as expressly provided under this License.  Any attempt
-     otherwise to copy, modify, sublicense or distribute the Program is
-     void, and will automatically terminate your rights under this License.
-     However, parties who have received copies, or rights, from you under
-     this License will not have their licenses terminated so long as such
-     parties remain in full compliance.
-     
-     5. You are not required to accept this License, since you have not
-     signed it.  However, nothing else grants you permission to modify or
-     distribute the Program or its derivative works.  These actions are
-     prohibited by law if you do not accept this License.  Therefore, by
-     modifying or distributing the Program (or any work based on the
-     Program), you indicate your acceptance of this License to do so, and
-     all its terms and conditions for copying, distributing or modifying
-     the Program or works based on it.
-     
-     6. Each time you redistribute the Program (or any work based on the
-     Program), the recipient automatically receives a license from the
-     original licensor to copy, distribute or modify the Program subject to
-     these terms and conditions.  You may not impose any further
-     restrictions on the recipients' exercise of the rights granted herein.
-     You are not responsible for enforcing compliance by third parties to
-     this License.
-     
-     7. If, as a consequence of a court judgment or allegation of patent
-     infringement or for any other reason (not limited to patent issues),
-     conditions are imposed on you (whether by court order, agreement or
-     otherwise) that contradict the conditions of this License, they do not
-     excuse you from the conditions of this License.  If you cannot
-     distribute so as to satisfy simultaneously your obligations under this
-     License and any other pertinent obligations, then as a consequence you
-     may not distribute the Program at all.  For example, if a patent
-     license would not permit royalty-free redistribution of the Program by
-     all those who receive copies directly or indirectly through you, then
-     the only way you could satisfy both it and this License would be to
-     refrain entirely from distribution of the Program.
-     
-     If any portion of this section is held invalid or unenforceable under
-     any particular circumstance, the balance of the section is intended to
-     apply and the section as a whole is intended to apply in other
-     circumstances.
-     
-     It is not the purpose of this section to induce you to infringe any
-     patents or other property right claims or to contest validity of any
-     such claims; this section has the sole purpose of protecting the
-     integrity of the free software distribution system, which is
-     implemented by public license practices.  Many people have made
-     generous contributions to the wide range of software distributed
-     through that system in reliance on consistent application of that
-     system; it is up to the author/donor to decide if he or she is willing
-     to distribute software through any other system and a licensee cannot
-     impose that choice.
-     
-     This section is intended to make thoroughly clear what is believed to
-     be a consequence of the rest of this License.
-     
-     8. If the distribution and/or use of the Program is restricted in
-     certain countries either by patents or by copyrighted interfaces, the
-     original copyright holder who places the Program under this License
-     may add an explicit geographical distribution limitation excluding
-     those countries, so that distribution is permitted only in or among
-     countries not thus excluded.  In such case, this License incorporates
-     the limitation as if written in the body of this License.
-     
-     9. The Free Software Foundation may publish revised and/or new versions
-     of the General Public License from time to time.  Such new versions will
-     be similar in spirit to the present version, but may differ in detail to
-     address new problems or concerns.
-     
-     Each version is given a distinguishing version number.  If the Program
-     specifies a version number of this License which applies to it and "any
-     later version", you have the option of following the terms and conditions
-     either of that version or of any later version published by the Free
-     Software Foundation.  If the Program does not specify a version number of
-     this License, you may choose any version ever published by the Free Software
-     Foundation.
-     
-     10. If you wish to incorporate parts of the Program into other free
-     programs whose distribution conditions are different, write to the author
-     to ask for permission.  For software which is copyrighted by the Free
-     Software Foundation, write to the Free Software Foundation; we sometimes
-     make exceptions for this.  Our decision will be guided by the two goals
-     of preserving the free status of all derivatives of our free software and
-     of promoting the sharing and reuse of software generally.
-     
-     		    NO WARRANTY
-     
-     11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-     FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-     OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-     PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-     OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-     MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-     TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-     PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-     REPAIR OR CORRECTION.
-     
-     12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-     WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-     REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-     INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-     OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-     TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-     YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-     PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-     POSSIBILITY OF SUCH DAMAGES.
-     
-     	     END OF TERMS AND CONDITIONS
-     
-     Appendix: How to Apply These Terms to Your New Programs
-     
-     If you develop a new program, and you want it to be of the greatest
-     possible use to the public, the best way to achieve this is to make it
-     free software which everyone can redistribute and change under these terms.
-     
-     To do so, attach the following notices to the program.  It is safest
-     to attach them to the start of each source file to most effectively
-     convey the exclusion of warranty; and each file should have at least
-     the "copyright" line and a pointer to where the full notice is found.
-     
-     <one line to give the program's name and a brief idea of what it does.>
-     Copyright (C) 19yy  <name of author>
-     
-     This program is free software; you can redistribute it and/or modify
-     it under the terms of the GNU General Public License as published by
-     the Free Software Foundation; either version 2 of the License, or
-     (at your option) any later version.
-     
-     This program is distributed in the hope that it will be useful,
-     but WITHOUT ANY WARRANTY; without even the implied warranty of
-     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-     GNU General Public License for more details.
-     
-     You should have received a copy of the GNU General Public License
-     along with this program; if not, write to the Free Software
-     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-     
-     Also add information on how to contact you by electronic and paper mail.
-     
-     If the program is interactive, make it output a short notice like this
-     when it starts in an interactive mode:
-     
-     Gnomovision version 69, Copyright (C) 19yy name of author
-     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-     This is free software, and you are welcome to redistribute it
-     under certain conditions; type `show c' for details.
-     
-     The hypothetical commands `show w' and `show c' should show the appropriate
-     parts of the General Public License.  Of course, the commands you use may
-     be called something other than `show w' and `show c'; they could even be
-     mouse-clicks or menu items--whatever suits your program.
-     
-     You should also get your employer (if you work as a programmer) or your
-     school, if any, to sign a "copyright disclaimer" for the program, if
-     necessary.  Here is a sample; alter the names:
-     
-     Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-     `Gnomovision' (which makes passes at compilers) written by James Hacker.
-     
-     <signature of Ty Coon>, 1 April 1989
-     Ty Coon, President of Vice
-     
-     This General Public License does not permit incorporating your program into
-     proprietary programs.  If your program is a subroutine library, you may
-     consider it more useful to permit linking proprietary applications with the
-     library.  If this is what you want to do, use the GNU Library General
-     Public License instead of this License.
-
diff --git a/plugins/org.eclipse.net4j.db.mysql/lib/EXCEPTIONS-CONNECTOR-J b/plugins/org.eclipse.net4j.db.mysql/lib/EXCEPTIONS-CONNECTOR-J
deleted file mode 100644
index 7449551e87..0000000000
--- a/plugins/org.eclipse.net4j.db.mysql/lib/EXCEPTIONS-CONNECTOR-J
+++ /dev/null
@@ -1,119 +0,0 @@
-MySQL FLOSS License Exception
-
-The MySQL AB Exception for Free/Libre and Open Source
-Software-only Applications Using MySQL Client Libraries (the
-"FLOSS Exception").
-
-Version 0.6, 7 March 2007
-
-Exception Intent
-
-We want specified Free/Libre and Open Source Software (``FLOSS'')
-applications to be able to use specified GPL-licensed MySQL client
-libraries (the ``Program'') despite the fact that not all FLOSS
-licenses are compatible with version 2 of the GNU General Public
-License (the ``GPL'').
-
-Legal Terms and Conditions
-
-As a special exception to the terms and conditions of version 2.0
-of the GPL:
-
- 1. You are free to distribute a Derivative Work that is formed
-    entirely from the Program and one or more works (each, a
-    "FLOSS Work") licensed under one or more of the licenses
-    listed below in section 1, as long as:
-      a. You obey the GPL in all respects for the Program and the
-         Derivative Work, except for identifiable sections of the
-         Derivative Work which are not derived from the Program,
-         and which can reasonably be considered independent and
-         separate works in themselves,
-      b. all identifiable sections of the Derivative Work which
-         are not derived from the Program, and which can
-         reasonably be considered independent and separate works
-         in themselves,
-           i. are distributed subject to one of the FLOSS licenses
-              listed below, and
-          ii. the object code or executable form of those sections
-              are accompanied by the complete corresponding
-              machine-readable source code for those sections on
-              the same medium and under the same FLOSS license as
-              the corresponding object code or executable forms of
-              those sections, and
-      c. any works which are aggregated with the Program or with a
-         Derivative Work on a volume of a storage or distribution
-         medium in accordance with the GPL, can reasonably be
-         considered independent and separate works in themselves
-         which are not derivatives of either the Program, a
-         Derivative Work or a FLOSS Work.
-    If the above conditions are not met, then the Program may only
-    be copied, modified, distributed or used under the terms and
-    conditions of the GPL or another valid licensing option from
-    MySQL AB.
-
- 2. FLOSS License List
-
-License name Version(s)/Copyright Date
-Academic Free License 2.0
-Apache Software License 1.0/1.1/2.0
-Apple Public Source License 2.0
-Artistic license From Perl 5.8.0
-BSD license "July 22 1999"
-Common Development and Distribution License (CDDL) 1.0
-Common Public License 1.0
-Eclipse Public License 1.0
-GNU Library or "Lesser" General Public License (LGPL) 2.0/2.1
-Jabber Open Source License 1.0
-MIT license (As listed in file MIT-License.txt) ---
-Mozilla Public License (MPL) 1.0/1.1
-Open Software License 2.0
-OpenSSL license (with original SSLeay license) "2003" ("1998")
-PHP License 3.0
-Python license (CNRI Python License) ---
-Python Software Foundation License 2.1.1
-Sleepycat License "1999"
-University of Illinois/NCSA Open Source License ---
-W3C License "2001"
-X11 License "2001"
-Zlib/libpng License ---
-Zope Public License 2.0
-
-    Due to the many variants of some of the above licenses, we
-    require that any version follow the 2003 version of the Free
-    Software Foundation's Free Software Definition
-    (http://www.gnu.org/philosophy/free-sw.html) or version 1.9 of
-    the Open Source Definition by the Open Source Initiative
-    (http://www.opensource.org/docs/definition.php).
-
- 3. Definitions
-
-      a. Terms used, but not defined, herein shall have the
-         meaning provided in the GPL.
-      b. Derivative Work means a derivative work under copyright
-         law.
-
- 4. Applicability: This FLOSS Exception applies to all Programs
-    that contain a notice placed by MySQL AB saying that the
-    Program may be distributed under the terms of this FLOSS
-    Exception. If you create or distribute a work which is a
-    Derivative Work of both the Program and any other work
-    licensed under the GPL, then this FLOSS Exception is not
-    available for that work; thus, you must remove the FLOSS
-    Exception notice from that work and comply with the GPL in all
-    respects, including by retaining all GPL notices. You may
-    choose to redistribute a copy of the Program exclusively under
-    the terms of the GPL by removing the FLOSS Exception notice
-    from that copy of the Program, provided that the copy has
-    never been modified by you or any third party.
-
-Appendix A. Qualified Libraries and Packages
-
-The following is a non-exhaustive list of libraries and packages
-which are covered by the FLOSS License Exception. Please note that
-this appendix is provided merely as an additional service to
-specific FLOSS projects wishing to simplify licensing information
-for their users. Compliance with one of the licenses noted under
-the "FLOSS license list" section remains a prerequisite.
-
-Package Name                  Qualifying License and Version
-Apache Portable Runtime (APR) Apache Software License 2.0
\ No newline at end of file
diff --git a/plugins/org.eclipse.net4j.db.mysql/lib/README b/plugins/org.eclipse.net4j.db.mysql/lib/README
deleted file mode 100644
index 2612e4c0c0..0000000000
--- a/plugins/org.eclipse.net4j.db.mysql/lib/README
+++ /dev/null
@@ -1,45 +0,0 @@
-MySQL Connector/J @MYSQL_CJ_VERSION@ (formerly MM.MySQL)
-MySQL AB's JDBC Driver for MySQL
-Copyright (c) 2003 MySQL AB
-
-CONTENTS
-
-* License
-* Documentation Location
-
-
-LICENSE
-
-MySQL Connector/J is licensed under the GPL or a commercial license
-from MySQL AB. 
-
-If you have licensed this product under the GPL, please see the COPYING
-file for more information. 
-
-There are special exceptions to the terms and conditions of the GPL 
-as it is applied to this software. View the full text of the 
-exception in file EXCEPTIONS-CONNECTOR-J in the directory of this 
-software distribution.
-
-If you have licensed this product under a commercial license from
-MySQL AB, please see the file "MySQLEULA.txt" that comes with this 
-distribution for the terms of the license.
-
-If you need non-GPL licenses for commercial distribution please contact 
-me <mark@mysql.com> or <sales@mysql.com>.
-
-
-DOCUMENTATION LOCATION
- 
-The documentation formerly contained in this file has moved into the 
-'doc' directory, where it is available in HTML, PDF and plaintext
-forms.
-
-You may also find the latest copy of the documentation on the MySQL
-website at http://dev.mysql.com/doc/refman/5.0/en/connector-j.html
-
---
-This software is OSI Certified Open Source Software.
-OSI Certified is a certification mark of the Open Source Initiative.
-
-
diff --git a/plugins/org.eclipse.net4j.db.tests/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.db.tests/META-INF/MANIFEST.MF
index 414aa26581..b1a46378dd 100644
--- a/plugins/org.eclipse.net4j.db.tests/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.db.tests/META-INF/MANIFEST.MF
@@ -14,5 +14,8 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.net4j.db.derby;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.net4j.db.hsqldb;bundle-version="[2.0.0,3.0.0)";visibility:=reexport,
  org.eclipse.net4j.db.mysql;bundle-version="[2.0.0,3.0.0)";visibility:=reexport
-Import-Package: org.apache.derby.jdbc
+Import-Package: com.mysql.jdbc,
+ com.mysql.jdbc.jdbc2.optional,
+ org.apache.derby.jdbc,
+ org.hsqldb.jdbc
 Export-Package: org.eclipse.net4j.db.tests;version="2.0.0"