Commit a72f94a5 authored by Jerzy Kołosowski's avatar Jerzy Kołosowski

odzależnienie budowania jdbc mysql i mssql od javy 1.6

parent 3bab6017
AUX 5.0.5-dist-target-depends.patch 380 SHA256 42d4e0a8ac2217045116403bc34642aed78eb99210aa259a8dfd8663a2e5cc84 SHA512 407ba02b1e2b3a514a9e270356a15f97eaa19197117a9f2752ee6b78fba0dd7cab150f7eaac02f8d6cb9d3bfe6d0edd3e68f38457310d69123c97b9231d621c4 WHIRLPOOL 5693bd335c9e713920260e8b5d0f53f7e518a7ecb70088b44770337820fb197fb87473c97871d4d7732177a00b1da87fbe77dc27c875eab8e989e3f5843890d9
AUX 5.0.5-remove-jboss-dependency-from-tests.patch 1541 SHA256 8c7cfb3116baafda7c708c8cad05b63e15ea5027ce7804b268f8b245e1e1a199 SHA512 43e91aa4ff599cb958cb6c098cbc1a28511b2fe12ea44dcee20fffe0efbfd1ce31bb29dfc9330a30d99174ed80abbb8512a0cdf3b4155fbf3d78ef776a5ebcb5 WHIRLPOOL a359149459f7b5106e3d366e77c68fd08c9a90d63e2b38725d7b0f08a391326fdf743b998453ed52c0e6b5b134c0aae15c075da371e65c1a68e0001a1a580a40
AUX 5.1.11-java6.patch 1188 SHA256 69f6d028a489d5dda58286aa4488a24827f998300a04a8126fe78ec7ae163ada SHA512 d54217a067ae077112bbfc075341d3b2d33d67ca55841beb8b76dd8a89b693fc66d95bf7cb9deffeb0e3c29dff6e67f45139f89f1aca6c1522f4ab8c220d0057 WHIRLPOOL 758bb11fc9814172731094c2d1119059a5ec5d9cba8b45d540bd299cedce2e0210150c43947bc6df831981d096ba5cb07b6e5b63780a6268879515a97729745e
AUX 5.1.14-java6.patch 1301 SHA256 ec8a6063e3bd9c6e37dc5be646b47dfe86c0bc819411d280b19645951f7b3376 SHA512 1b630781201478dee6da3d2322755ff87b2e2c9c1cd49a127bbcd56a0cc25e7bed06ed5f0758709c2e120fc85273755ee28c7ba21ac7b75e97ac6043216413a1 WHIRLPOOL 4f54f083bf388320eceeb5eaae0358b938804589aa20571f4741e3eaea59cc9f63000848616828603e6b234321d73f72627c09b8cdb8f315c751239a9d06957b
DIST mysql-connector-java-5.1.26.tar.gz 3724076 SHA256 fade4caa398c41f537d9b7bcaf83aabaa1eab1ef23c81de49979b5b04ba395bd SHA512 93b882f5262dc991aa885ed9ae7fead02b9d28431022c86c6724272b508e78eee3df7310e9964e60f68953ed56f4fcdf9159a90f463eb39aea65af2453371879 WHIRLPOOL 9ecf39094c1a07f5658a24574f7852aadf51c024495572bedf38ee74f83f6380159e60ce8b6a415480d8e9ec923174a0f6ba2209cdcb96167bcf8ed4e1e3a9b9
EBUILD jdbc-mysql-5.1.26-r1.ebuild 1999 SHA256 36c4ce41e97c5f8c5dff571ef0fcf26d48bf95046d1102a054b7f2b343195583 SHA512 3e28f650d2df5fe4cdb0dcd753eea644ab2c759ad11191ee8b5cb417e0484601ac5abf9ad26d31d4cce8a0af5b8d1c23330fd17c023342f609065df926c6ce45 WHIRLPOOL 1a44960c28f5d073da5a28dd358d1abbdecf3e6a4b60484f66b381808294fb551649b1ca6c4695dc4fcc3c941b89e0b8399ca3e0cb521b7ae04622e4401720f4
MISC metadata.xml 275 SHA256 66f7ef9181218b25bd6152f27a5e0e6699cfad8967bbf535da17c0caff9591d4 SHA512 6cfe64455de2349845f69e33129056d17e3598cc57947055043fe526554a6f5660cc2d28e28eea372d58a8db0fe5cb7520697dafc8f8be0ddca55ece474b9704 WHIRLPOOL 28b171077b7f315805c52bdd43771053fa493c4cff1d5affeb3505fd540c6a74296d5e061f681ee257b6c78d8f2406df3d15fdff42dd5ae53cf39d0db859fe40
--- 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" />
--- 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);
}
--- build.xml.orig 2010-01-20 19:45:30.000000000 +0100
+++ build.xml 2010-02-13 00:34:30.000000000 +0100
@@ -124,7 +124,7 @@
</if>
</target>
- <target name="init" depends="-compiler-check, -init-copy, -init-no-crypto">
+ <target name="init" depends="-init-copy, -init-no-crypto">
<!-- If we're building under cruise control, update ourself -->
<if>
@@ -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/*" />
--- 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/*" />
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/jdbc-mysql/jdbc-mysql-5.1.26.ebuild,v 1.1 2013/09/14 13:38:22 tomwij Exp $
EAPI="5"
JAVA_PKG_IUSE="source"
JAVA_PKG_WANT_BOOTCLASSPATH="1.5"
WANT_ANT_TASKS="ant-contrib"
inherit eutils java-pkg-2 java-ant-2
MY_PN="mysql-connector-java"
MY_P="${MY_PN}-${PV}"
DESCRIPTION="MySQL JDBC driver"
HOMEPAGE="http://www.mysql.com/products/connector/j/"
SRC_URI="mirror://mysql/Downloads/Connector-J/${MY_P}.tar.gz"
LICENSE="GPL-2-with-MySQL-FLOSS-exception"
SLOT="0"
KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
IUSE="c3p0 log4j"
COMMON_DEP="
dev-java/slf4j-api:0
log4j? ( dev-java/log4j:0 )
c3p0? ( dev-java/c3p0:0 )"
RDEPEND=">=virtual/jre-1.6
${COMMON_DEP}"
DEPEND=">=virtual/jdk-1.6
${COMMON_DEP}"
S="${WORKDIR}/${MY_P}"
java_prepare() {
epatch "${FILESDIR}/5.0.5-remove-jboss-dependency-from-tests.patch"
# http://bugs.mysql.com/bug.php?id=28286
epatch "${FILESDIR}/5.0.5-dist-target-depends.patch"
# Use java6 for everything except jdbc3 - #283848
epatch "${FILESDIR}/5.1.14-java6.patch"
find . -name '*.jar' -print -delete || die
cd src/lib
java-pkg_jar-from slf4j-api
use log4j && java-pkg_jar-from log4j
use c3p0 && java-pkg_jar-from c3p0
}
JAVA_ANT_IGNORE_SYSTEM_CLASSES="true"
EANT_BUILD_TARGET="dist"
src_compile() {
# Cannot use rewrite-bootclasspath because of the jdbc4 part.
java-pkg-2_src_compile \
-Dgentoo.bootclasspath="$(java-pkg_get-bootclasspath 1.5)"
}
# Tests need a mysql DB to exist.
RESTRICT="test"
src_test() {
cd src/lib
java-pkg_jar-from junit
cd "${S}"
ANT_TASKS="ant-junit" eant test -Dcom.mysql.jdbc.noCleanBetweenCompiles=true
}
src_install() {
# Skip bytecode check because we want two versions there
JAVA_PKG_STRICT= java-pkg_newjar build/${MY_P}-SNAPSHOT/${MY_P}-SNAPSHOT-bin.jar ${PN}.jar
dodoc README CHANGES
dohtml docs/*.html
use source && java-pkg_dosrc src/com src/org
}
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>java</herd>
<use>
<flag name="c3p0">Enable c3p0 support</flag>
<flag name="log4j">Enable log4 support</flag>
</use>
</pkgmetadata>
AUX 1.2.4-buildxml.patch 1009 SHA256 79cb55d1a57b7d6d1f89ace77ddf71a3248ac213adb1e2059d7ebc2d4701fa88 SHA512 6cbee0e153ee66a5f7120ab297784093e4719b057d91fa3e4c36ce63066b71e06509c46b4aa07973675c7c08dd1e9915859344936be1fe9a510c93975202da1d WHIRLPOOL d4f04d37d4c23550d80f31844258f8e408e14e9d22586314bc54e206b0cb5ef94936174b49dec1dd64578b36e46a4aafaa3ea587ae44d63da3fc592d5d053ae9
AUX jtds-1.2.5-build.xml.patch 1009 SHA256 79cb55d1a57b7d6d1f89ace77ddf71a3248ac213adb1e2059d7ebc2d4701fa88 SHA512 6cbee0e153ee66a5f7120ab297784093e4719b057d91fa3e4c36ce63066b71e06509c46b4aa07973675c7c08dd1e9915859344936be1fe9a510c93975202da1d WHIRLPOOL d4f04d37d4c23550d80f31844258f8e408e14e9d22586314bc54e206b0cb5ef94936174b49dec1dd64578b36e46a4aafaa3ea587ae44d63da3fc592d5d053ae9
AUX jtds-1.3.0-build.xml.patch 285 SHA256 995cf012aca97c6908186b3a96723d965a9dd17e5e3f5fc3730dd56da46bc6ab SHA512 9ec6a3e92d33ebe5bb62cd25814729b3f95ee1fc4ff9aa72257fc26106d469de431d60f40972f61c2bc193d8b6f7c2ba181f00f11361d6f79b78aa530b34f1bd WHIRLPOOL 84df412ddf7f46a702408c56894d787bab3ae2f32b4bc9fe5aab815f0075e24f3cbfdbbca415c3f9729902a7cf950ed4b3ef496de5910f90ed3dc95f93f137cc
DIST jtds-1.2.5-src.zip 3953955 SHA256 d86c7244826543d2f2f9cdc1d50888003596c1ec18f30808b21627e8889e9114 SHA512 d2b496a7aac4e4c9c0e164c1514d2d21392024903e1376b13fa6a3396d045a1bfc6a085b2beb1202703a6b6e59e8b534bc82508fcb58c71a25b6a13a3d051eda WHIRLPOOL b5e88e6cdb00f797de1d824a7581d693111d4d746ce6d5a709934ce00befbed4fb4c3b248448715bdf27691c33d8f1cca8ca270e942eb27907cd2567e919084d
EBUILD jtds-1.2.5-r2.ebuild 1133 SHA256 b572c1a63fb0ee57b79f801b41d805deebd838abce8bc4f6c16d8abb848fc3ce SHA512 b81c524a38f40ddc8d0549b304f92d965f12edf93d897849a85690b394bab906c76848f04e6f70ef8db7e17d217cd12803587cb53e9d9d1f6fd8c252d7ead97e WHIRLPOOL 42eabdc53d94ed6bb66a19e685c5977b44f03b53e5405aab69343dd57c90f539a5cf739c832fa0d68b43850e4423ebaff54faab707dc82ef40d0c5ed87c4922b
MISC metadata.xml 723 SHA256 465dd20f6c462d27f6ea146e8e74123b9fcb70d59476e7f2be93f5b32d71d47a SHA512 f6c39c65fde1f2ef766ddf6a3574fb9fe96122e8789d870678b416755c7497b648e72ff98d12c940fc69392c065eee5d2b3a6b2e7b4e48f89af1d0da32c2d810 WHIRLPOOL 0173482879a754497fee42fbb3247aa6dfc2dd13756866741aee23637cf6a7a1218501e640b646ccf28fe38d3a0a58ec5e006129ca49187442d679892a349463
--- build.xml.orig 2009-11-07 18:55:41.000000000 +0100
+++ build.xml 2009-11-07 18:58:17.000000000 +0100
@@ -75,13 +75,13 @@
</junit>
</target>
- <target name="dist" depends="clean,compile,javadoc">
+ <target name="jar" depends="compile">
<mkdir dir="${dist}"/>
<!-- Runtime jar -->
<jar basedir="${build}/classes"
excludes="net/sourceforge/jtds/test/*.class"
includes="**/*"
- jarfile="${build}/${ant.project.name}-${version}.jar">
+ jarfile="${build}/${ant.project.name}.jar">
<manifest>
<attribute name="Implementation-Title" value="jTDS JDBC Driver"/>
<attribute name="Implementation-Version" value="${version}"/>
@@ -92,6 +92,10 @@
<attribute name="Main-Class" value="net.sourceforge.jtds.jdbc.Driver"/>
</manifest>
</jar>
+
+ </target>
+
+ <target name="dist" depends="jar">
<!-- Source package -->
<copy todir="${dist}/tmp/doc">
--- build.xml.orig 2009-11-07 18:55:41.000000000 +0100
+++ build.xml 2009-11-07 18:58:17.000000000 +0100
@@ -75,13 +75,13 @@
</junit>
</target>
- <target name="dist" depends="clean,compile,javadoc">
+ <target name="jar" depends="compile">
<mkdir dir="${dist}"/>
<!-- Runtime jar -->
<jar basedir="${build}/classes"
excludes="net/sourceforge/jtds/test/*.class"
includes="**/*"
- jarfile="${build}/${ant.project.name}-${version}.jar">
+ jarfile="${build}/${ant.project.name}.jar">
<manifest>
<attribute name="Implementation-Title" value="jTDS JDBC Driver"/>
<attribute name="Implementation-Version" value="${version}"/>
@@ -92,6 +92,10 @@
<attribute name="Main-Class" value="net.sourceforge.jtds.jdbc.Driver"/>
</manifest>
</jar>
+
+ </target>
+
+ <target name="dist" depends="jar">
<!-- Source package -->
<copy todir="${dist}/tmp/doc">
--- build.xml
+++ build.xml
@@ -117,7 +117,9 @@
</junit>
</target>
- <target name="dist" depends="clean,compile,javadoc">
+ <target name="dist" depends="clean,jar,javadoc"/>
+
+ <target name="jar" depends="compile">
<mkdir dir="${dist}"/>
<!-- runtime jar -->
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/dev-java/jtds/jtds-1.2.5-r1.ebuild,v 1.3 2012/12/26 19:13:33 jdhore Exp $
EAPI=5
JAVA_PKG_IUSE="doc source"
inherit eutils java-pkg-2 java-ant-2
DESCRIPTION="jTDS - SQL Server and Sybase JDBC driver"
SRC_URI="mirror://sourceforge/${PN}/${P}-src.zip"
HOMEPAGE="http://jtds.sourceforge.net"
LICENSE="LGPL-2.1"
SLOT="1.2"
KEYWORDS="amd64 x86"
IUSE=""
# Would need a running server
RESTRICT="test"
COMMON_DEPEND="
dev-java/jcifs:1.1"
RDEPEND="${COMMON_DEPEND}
>=virtual/jre-1.6"
DEPEND="${COMMON_DEPEND}
>=virtual/jdk-1.6
app-arch/unzip"
S=${WORKDIR}
java_prepare() {
find -name '*.jar' -exec rm -v {} + || die
epatch "${FILESDIR}"/${P}-build.xml.patch
rm -vr ./src/test/net/sourceforge/jtds/test || die
}
JAVA_ANT_REWRITE_CLASSPATH="yes"
JAVA_ANT_CLASSPATH_TAGS+=" javadoc"
EANT_GENTOO_CLASSPATH="jcifs-1.1"
src_install() {
java-pkg_dojar build/${PN}.jar
dodoc CHANGELOG README*
use doc && java-pkg_dojavadoc build/doc
use source && java-pkg_dosrc "${S}"/src/main/*
}
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<herd>java</herd>
<longdescription>
jTDS is an open source 100% pure Java (type 4) JDBC 3.0 driver for Microsoft SQL
Server (6.5, 7, 2000 and 2005) and Sybase (10, 11, 12). jTDS is based on the
work of the FreeTDS project and is currently the fastest complete JDBC driver
for SQL Server and Sybase. Starting with release 0.9 jTDS is 100% JDBC 3.0
compatible, supporting forward-only and scrollable/updateable ResultSets,
multiple concurrent (completely independent) Statements per Connection and
implementing all the DatabaseMetaData and ResultSetMetaData methods.
</longdescription>
</pkgmetadata>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment