diff options
| -rw-r--r-- | src/interfaces/jdbc/build.xml | 9 | ||||
| -rw-r--r-- | src/interfaces/jdbc/org/postgresql/Driver.java.in | 3 |
2 files changed, 1 insertions, 11 deletions
diff --git a/src/interfaces/jdbc/build.xml b/src/interfaces/jdbc/build.xml index acc48a60100..9d70e2cbb8a 100644 --- a/src/interfaces/jdbc/build.xml +++ b/src/interfaces/jdbc/build.xml @@ -3,7 +3,7 @@ build file to allow ant (http://jakarta.apache.org/ant/) to be used to build the PostgreSQL JDBC Driver. - $Id: build.xml,v 1.15 2001/05/25 16:29:17 momjian Exp $ + $Id: build.xml,v 1.16 2001/07/04 15:07:54 momjian Exp $ --> @@ -37,7 +37,6 @@ --> <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> @@ -58,11 +57,6 @@ <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}" /> @@ -104,7 +98,6 @@ <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+" /> diff --git a/src/interfaces/jdbc/org/postgresql/Driver.java.in b/src/interfaces/jdbc/org/postgresql/Driver.java.in index 5d64a3f579b..c243a2f284f 100644 --- a/src/interfaces/jdbc/org/postgresql/Driver.java.in +++ b/src/interfaces/jdbc/org/postgresql/Driver.java.in @@ -36,9 +36,6 @@ public class Driver implements java.sql.Driver // 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(); } |