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

odzależnienie budowania jdbc mysql i mssql od javy 1.6

parent 3bab6017
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
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
+11 −0
Original line number Diff line number Diff line
--- 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" />
+39 −0
Original line number Diff line number Diff line
--- 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);
 	}
+34 −0
Original line number Diff line number Diff line
--- 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/*" />
 			
+34 −0
Original line number Diff line number Diff line
--- 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/*" />
 			
Loading