diff options
| author |   Petteri Räty <betelgeuse@gentoo.org> | 2007-05-07 21:11:19 +0000 |
|---|---|---|
| committer | Petteri Räty <betelgeuse@gentoo.org> | 2007-05-07 21:11:19 +0000 |
| commit | 16b3db6596c49e264fa84e3eafaeb4f5163d4c35 (patch) | |
| tree | abd06f06b053b705fcb6189c817080220b7fc75d /dev-java/jdbc-mysql/files | |
| parent | Remove hpell depend thanks to alonbl in bug 177546 (diff) | |
| download | historical-16b3db6596c49e264fa84e3eafaeb4f5163d4c35.tar.gz historical-16b3db6596c49e264fa84e3eafaeb4f5163d4c35.tar.bz2 historical-16b3db6596c49e264fa84e3eafaeb4f5163d4c35.zip | |
Version bump. Make log4j support optional via the log4j use flag. Fixes bug #156765. Thanks to Johan Bergström <bugs@bergstroem.nu>.
Package-Manager: portage-2.1.2.5
Diffstat (limited to 'dev-java/jdbc-mysql/files')
3 files changed, 53 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/digest-jdbc-mysql-5.0.5 b/dev-java/jdbc-mysql/files/digest-jdbc-mysql-5.0.5 new file mode 100644 index 000000000000..db0e2426ef99 --- /dev/null +++ b/dev-java/jdbc-mysql/files/digest-jdbc-mysql-5.0.5 @@ -0,0 +1,3 @@ +MD5 a10578fc0a27aa4a4256adab7996dba5 mysql-connector-java-5.0.5.tar.gz 8465846 +RMD160 f96925af13a04cb82970f9a7b779bbde6ead64e2 mysql-connector-java-5.0.5.tar.gz 8465846 +SHA256 39ebd9423db4fa20bb7165acaf02c745f9d93ec1c5c7b693ebc26c3445f6a692 mysql-connector-java-5.0.5.tar.gz 8465846 |