diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2018-07-14 21:03:06 +0100 |
commit | 8376ef56580626e9c0f796d5b85b53a0a1c7d5f5 (patch) | |
tree | 7681bbd4e8b05407772df40a4bf04cbbc8afc3fa /dev-java/jdbc-mysql/files | |
parent | 30a9caf154332f12ca60756e1b75d2f0e3e1822d (diff) |
gentoo resync : 14.07.2018
Diffstat (limited to 'dev-java/jdbc-mysql/files')
3 files changed, 84 insertions, 0 deletions
diff --git a/dev-java/jdbc-mysql/files/5.0.5-dist-target-depends.patch b/dev-java/jdbc-mysql/files/5.0.5-dist-target-depends.patch new file mode 100644 index 000000000000..28ffc7ad0dab --- /dev/null +++ b/dev-java/jdbc-mysql/files/5.0.5-dist-target-depends.patch @@ -0,0 +1,11 @@ +--- build.xml.orig 2007-05-07 19:59:49.000000000 +0300 ++++ build.xml 2007-05-07 20:01:21.000000000 +0300 +@@ -291,7 +291,7 @@ + </if> + </target> + +- <target name="dist" depends="init, compile"> ++ <target name="dist" depends="init, compile-driver,compile.integration"> + + <delete file="${buildDir}/${fullProdName}-bin.jar" /> + <delete file="${distDir}/${fullProdName}.jar" /> diff --git a/dev-java/jdbc-mysql/files/5.0.5-remove-jboss-dependency-from-tests.patch b/dev-java/jdbc-mysql/files/5.0.5-remove-jboss-dependency-from-tests.patch new file mode 100644 index 000000000000..394830701fee --- /dev/null +++ b/dev-java/jdbc-mysql/files/5.0.5-remove-jboss-dependency-from-tests.patch @@ -0,0 +1,39 @@ +--- mysql-connector-java-5.0.5/src/testsuite/regression/DataSourceRegressionTest.java 2007-03-01 17:48:47.000000000 +0100 ++++ mysql-connector-java-5.0.5-no-jboss-test/src/testsuite/regression/DataSourceRegressionTest.java 2007-04-12 09:53:05.000000000 +0200 +@@ -52,7 +52,6 @@ + import testsuite.simple.DataSourceTest; + + import com.mysql.jdbc.NonRegisteringDriver; +-import com.mysql.jdbc.integration.jboss.MysqlValidConnectionChecker; + import com.mysql.jdbc.jdbc2.optional.MysqlConnectionPoolDataSource; + import com.mysql.jdbc.jdbc2.optional.MysqlDataSource; + import com.mysql.jdbc.jdbc2.optional.MysqlDataSourceFactory; +@@ -315,28 +314,6 @@ + assertEquals(testIntFlag, thawedDs.getBlobSendChunkSize()); + } + +- /** +- * Tests fix for BUG#20242 - MysqlValidConnectionChecker for JBoss doesn't +- * work with MySQLXADataSources. +- * +- * @throws Exception if the test fails. +- */ +- public void testBug20242() throws Exception { +- if (versionMeetsMinimum(5, 0)) { +- try { +- Class.forName("org.jboss.resource.adapter.jdbc.ValidConnectionChecker"); +- } catch (Exception ex) { +- return; // class not available for testing +- } +- +- MysqlXADataSource xaDs = new MysqlXADataSource(); +- xaDs.setUrl(dbUrl); +- +- MysqlValidConnectionChecker checker = new MysqlValidConnectionChecker(); +- assertNull(checker.isValidConnection(xaDs.getXAConnection().getConnection())); +- } +- } +- + private void bindDataSource(String name, DataSource ds) throws Exception { + this.ctx.bind(this.tempDir.getAbsolutePath() + name, ds); + } diff --git a/dev-java/jdbc-mysql/files/5.1.14-java6.patch b/dev-java/jdbc-mysql/files/5.1.14-java6.patch new file mode 100644 index 000000000000..49343706ad80 --- /dev/null +++ b/dev-java/jdbc-mysql/files/5.1.14-java6.patch @@ -0,0 +1,34 @@ +--- build.xml.orig 2010-01-20 19:45:30.000000000 +0100 ++++ build.xml 2010-02-13 00:34:30.000000000 +0100 +@@ -131,7 +131,7 @@ + </if> + </target> + +- <target name="init" depends="-compiler-check, -init-copy, -init-no-crypto"> ++ <target name="init" depends="-init-copy, -init-no-crypto"> + <!-- We need the following for source distributions as there we + can't dynamically alter the classpath, and not having this + directory present causes the build to fail --> +@@ -746,7 +746,8 @@ + <javac sourcepath="" srcdir="${buildDir}/${fullProdName}" + destdir="${compiler.output}" + deprecation="off" +- debug="${debug.enable}"> ++ debug="${debug.enable}" ++ bootclasspath="${gentoo.bootclasspath}"> + <include name="**/*.java" /> + <exclude name="testsuite/**" /> + <exclude name="com/mysql/jdbc/integration/**" /> +@@ -763,11 +764,7 @@ + <javac destdir="${compiler.output}" + deprecation="off" + debug="${debug.enable}" +- fork="yes" +- executable="${com.mysql.jdbc.java6.javac}" +- compiler="modern" +- sourcepath="" srcdir="${buildDir}/${fullProdName}" +- bootclasspath="${com.mysql.jdbc.java6.rtjar}"> ++ sourcepath="" srcdir="${buildDir}/${fullProdName}"> + <include name="**/JDBC4*.java" /> + <include name="com/mysql/jdbc/exceptions/jdbc4/*" /> + |