Attached is a patch to remove the ConnectionHook functionality and thus
the JDK 1.3 dependency. For a further explanation see my posting to the
JDBC list on Friday, explaining why this is being done.
thanks,
--Barry
PS. In addition to the diffs in this patch, the file
src/interfaces/jdbc/org/postgresql/core/ConnectionHook.java is obsoleted
and needs to be removed from 7.2, but of course the file is still needed
for 7.1 builds.
*** ./interfaces/jdbc/build.xml.orig Fri Jun 29 19:06:30 2001
--- ./interfaces/jdbc/build.xml Fri Jun 29 19:09:20 2001
***************
*** 37,43 ****
-->
<target name="check_versions">
<available property="jdk1.2+" classname="java.lang.ThreadLocal" />
- <available property="jdk1.3+" classname="java.lang.StrictMath" />
<available property="jdk1.2e+" classname="javax.sql.DataSource" />
<available property="junit" classname="junit.framework.Test" />
</target>
--- 37,42 ----
***************
*** 58,68 ****
<property name="connectclass" value="org.postgresql.jdbc1.Connection" />
<available property="connectclass" value="org.postgresql.jdbc2.Connection" classname="java.lang.ThreadLocal" />
- <!-- comment out 1.3+ stuff -->
- <property name="jdk13only" value="//" />
- <available property="jdk13only" value="" classname="java.lang.StrictMath" />
- <filter token="JDK1.3ONLY" value="${jdk13only}" />
-
<!-- Some defaults -->
<filter token="MAJORVERSION" value="${major}" />
<filter token="MINORVERSION" value="${minor}" />
--- 57,62 ----
***************
*** 104,110 ****
<target name="compile" depends="prepare,check_versions,driver">
<javac srcdir="${src}" destdir="${dest}">
<include name="${package}/**" />
- <exclude name="${package}/core/ConnectionHook.java" unless="jdk1.3+" />
<exclude name="${package}/jdbc1/**" if="jdk1.2+" />
<exclude name="${package}/jdbc2/**" unless="jdk1.2+" />
<exclude name="${package}/largeobject/PGblob.java" unless="jdk1.2+" />
--- 98,103 ----
*** ./interfaces/jdbc/org/postgresql/Driver.java.in.orig Fri Jun 29 19:13:40 2001
--- ./interfaces/jdbc/org/postgresql/Driver.java.in Fri Jun 29 19:16:58 2001
***************
*** 36,44 ****
// Placing it here, means that the driver is registered once only.
java.sql.DriverManager.registerDriver(new Driver());
- // New in 7.1 - register ourselves with the JVM - JDK1.3+ only
- @JDK1.3ONLY@org.postgresql.core.ConnectionHook.init();
-
} catch (SQLException e) {
e.printStackTrace();
}
--- 36,41 ----
