aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Makefile.global.in4
-rw-r--r--src/interfaces/Makefile8
-rw-r--r--src/interfaces/jdbc/CHANGELOG10
-rw-r--r--src/interfaces/jdbc/Makefile450
-rw-r--r--src/interfaces/jdbc/build.xml5
-rw-r--r--src/interfaces/jdbc/jdbc.jpx2
6 files changed, 41 insertions, 438 deletions
diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index ef488cbd404..955348fbc25 100644
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -1,5 +1,5 @@
# -*-makefile-*-
-# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.121 2001/03/03 15:53:41 petere Exp $
+# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.122 2001/03/05 09:39:51 peter Exp $
#------------------------------------------------------------------------------
# All PostgreSQL makefiles include this file and use the variables it sets,
@@ -107,6 +107,7 @@ odbcinst_ini_dir = @odbcinst_ini_dir@
# Records the choice of the various --enable-xxx and --with-xxx options.
with_CXX = @with_CXX@
+with_java = @with_java@
with_perl = @with_perl@
with_python = @with_python@
with_tcl = @with_tcl@
@@ -174,6 +175,7 @@ X = @EXEEXT@
# Miscellaneous
+ANT = @ANT@
AWK = @AWK@
LN_S = @LN_S@
PERL = @PERL@
diff --git a/src/interfaces/Makefile b/src/interfaces/Makefile
index ee9fed3851b..348d15b1a48 100644
--- a/src/interfaces/Makefile
+++ b/src/interfaces/Makefile
@@ -4,7 +4,7 @@
#
# Copyright (c) 1994, Regents of the University of California
#
-# $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.43 2000/09/25 22:23:00 petere Exp $
+# $Header: /cvsroot/pgsql/src/interfaces/Makefile,v 1.44 2001/03/05 09:39:52 peter Exp $
#
#-------------------------------------------------------------------------
@@ -14,7 +14,7 @@ include $(top_builddir)/src/Makefile.global
DIRS := libpq ecpg libpgeasy
-ALLDIRS := $(DIRS) odbc libpq++ libpgtcl perl5 python
+ALLDIRS := $(DIRS) odbc libpq++ libpgtcl perl5 python jdbc
ifeq ($(enable_odbc), yes)
DIRS += odbc
@@ -36,6 +36,10 @@ ifeq ($(with_python), yes)
DIRS += python
endif
+ifeq ($(with_java), yes)
+DIRS += jdbc
+endif
+
all install installdirs uninstall dep depend distprep:
@for dir in $(DIRS); do $(MAKE) -C $$dir $@ || exit; done
diff --git a/src/interfaces/jdbc/CHANGELOG b/src/interfaces/jdbc/CHANGELOG
index e9208eb606e..3614bd511b5 100644
--- a/src/interfaces/jdbc/CHANGELOG
+++ b/src/interfaces/jdbc/CHANGELOG
@@ -1,3 +1,13 @@
+Fri Mar 02 10:00:00 GMT 2001 peter@retep.org.uk
+ - Fixed build.xml so that PGclob is not built in the JDBC1.2 driver
+
+
+Fri Feb 17 18:25:00 GMT 2001 peter@retep.org.uk
+ - Removed the last deprecation warnings from the Java2 driver. Now only
+ the old examples give deprecation warnings.
+ - Added a new class into core that (JDK1.3+) ensures all connections are
+ closed when the VM terminates.
+
Fri Feb 17 15:11:00 GMT 2001 peter@retep.org.uk
- Reduced the object overhead in PreparedStatement by reusing the same
StringBuffer object throughout. Similarly SimpleDateStamp's are alse
diff --git a/src/interfaces/jdbc/Makefile b/src/interfaces/jdbc/Makefile
index abe0d375c52..c88ad683399 100644
--- a/src/interfaces/jdbc/Makefile
+++ b/src/interfaces/jdbc/Makefile
@@ -1,444 +1,28 @@
#-------------------------------------------------------------------------
#
-# Makefile
-# Makefile for Java JDBC interface
+# Makefile for src/interfaces
#
-# IDENTIFICATION
-# $Id: Makefile,v 1.26 2001/01/18 14:50:14 peter Exp $
+# Copyright (c) 1994, Regents of the University of California
#
-#-------------------------------------------------------------------------
-
-subdir = src/interfaces
-top_builddir = ../../..
-include $(top_builddir)/src/Makefile.global
-
-CP = cp
-FIND = find
-IDL2JAVA = idltojava -fno-cpp -fno-tie
-JAR = jar
-JAVA = java
-JAVAC = javac -g
-JAVADOC = javadoc
-RM = rm -f
-TOUCH = touch
-
-BUILDDRIVER = sh utils/buildDriver
-CHANGELOG = perl utils/changelog.pl
-
-# This defines how to compile a java class
-.java.class:
- $(JAVAC) $<
-
-.SUFFIXES: .class .java
-.PHONY: all clean doc examples msg
-
-# This is the base directory of the driver. In 7.0, this changed from
-# postgresql to org/postgresql
-PGBASE = org/postgresql
-
-# New for 7.1: The jar filename
-JARFILE = postgresql.jar
-
-all:
- @echo ------------------------------------------------------------
- @echo The use of Make to build the driver is now depreciated in
- @echo version 7.1 and later. To build the driver you now need to
- @echo use ANT. This is the build tool of the Jakarta project, and
- @echo you can obtain this from http://jakarta.apache.org/ant/
- @echo
- @echo Once you have this installed, change directory to the root
- @echo directory of the postgresql source and type ant.
- @echo
- @echo ie: if you are currently in the pgsql/src/interfaces/jdbc
- @echo directory then cd into the pgsql one \(cd ../../.. should
- @echo do\).
- @echo
- @echo The file Implementation contains more info on this, as does
- @echo the homepage http://jdbc.postgresql.org/
- @echo ------------------------------------------------------------
-
-# Yet another attempt to check the version. In theory, any JVM that fails
-# this is breaking the versioning specifications released by Javasoft.
-#
-# In 7.1 this is renamed oldall so that the depreciated message is shown.
-#
-oldall: utils/CheckVersion.class
- @$(MAKE) `$(JAVA) utils.CheckVersion`
-
-# For 6.5.3 and 7.0+, we need to select the correct JDBC API, so prompt
-# for the version.
-huho:
- @echo ------------------------------------------------------------
- @echo Due to problems with some JVMs that dont return a meaningful
- @echo version number, we have had to make the choice of what jdbc
- @echo version is built as a compile time option.
- @echo
- @echo If you are using JDK1.1.x, you will need the JDBC1.2 driver.
- @echo To compile, type:
- @echo " make jdbc1"
- @echo
- @echo "If you are using JDK1.2 (aka Java2) you need the JDBC2."
- @echo To compile, type:
- @echo " make jdbc2"
- @echo
- @echo "If you are using the Java2 Enterprise Edition, you can use"
- @echo "either the standard driver above, or compile the standard"
- @echo "extensions version of the driver. Type:"
- @echo " make enterprise"
- @echo
- @echo Once you have done this, a postgresql.jar file will be
- @echo produced. This file will only work with that particular
- @echo version of virtual machine.
- @echo
- @echo ------------------------------------------------------------
-
-# In 7.1 replaced msg so that the depreciated message is shown.
-msg: all
-
-oldmsg:
- @echo ------------------------------------------------------------
- @echo The JDBC driver has now been built. To make it available to
- @echo other applications, copy the postgresql.jar file to a public
- @echo "place (under unix this could be /usr/local/lib) and add it"
- @echo to the class path.
- @echo
- @echo Then either add -Djdbc.drivers=org.postgresql.Driver to the
- @echo commandline when running your application, or edit the
- @echo "properties file for your application (~/.hotjava/properties"
- @echo "under unix for HotJava), and add a line containing"
- @echo jdbc.drivers=org.postgresql.Driver
- @echo
- @echo More details are in the README file and in the main postgresql
- @echo documentation.
- @echo
- @echo ------------------------------------------------------------
- @echo To build the examples, type:
- @echo "JDBC1: make examples"
- @echo "JDBC2: make examples2"
- @echo
- @echo "To build the CORBA example (requires Java2):"
- @echo " make corba"
- @echo
- @echo "To make the tests, type:"
- @echo " make tests"
- @echo
- @echo "To build the GUI Shell, type:"
- @echo " make retepsql"
- @echo
- @echo ------------------------------------------------------------
- @echo
-
-dep depend:
-
-# This rule builds the javadoc documentation
-doc:
- export CLASSPATH=.;\
- $(JAVADOC) -public \
- org.postgresql \
- org.postgresql.fastpath \
- org.postgresql.largeobject
-
-# These classes form the driver. These, and only these are placed into
-# the jar file.
-OBJ_COMMON= $(PGBASE)/Connection.class \
- $(PGBASE)/Driver.class \
- $(PGBASE)/Field.class \
- $(PGBASE)/PG_Stream.class \
- $(PGBASE)/ResultSet.class \
- $(PGBASE)/errors.properties \
- $(PGBASE)/errors_fr.properties \
- $(PGBASE)/fastpath/Fastpath.class \
- $(PGBASE)/fastpath/FastpathArg.class \
- $(PGBASE)/geometric/PGbox.class \
- $(PGBASE)/geometric/PGcircle.class \
- $(PGBASE)/geometric/PGline.class \
- $(PGBASE)/geometric/PGlseg.class \
- $(PGBASE)/geometric/PGpath.class \
- $(PGBASE)/geometric/PGpoint.class \
- $(PGBASE)/geometric/PGpolygon.class \
- $(PGBASE)/largeobject/LargeObject.class \
- $(PGBASE)/largeobject/LargeObjectManager.class \
- $(PGBASE)/util/PGmoney.class \
- $(PGBASE)/util/PGobject.class \
- $(PGBASE)/util/PGtokenizer.class \
- $(PGBASE)/util/PSQLException.class \
- $(PGBASE)/util/Serialize.class \
- $(PGBASE)/util/UnixCrypt.class
-
-# These files are unique to the JDBC 1 (JDK 1.1) driver
-OBJ_JDBC1= $(PGBASE)/jdbc1/CallableStatement.class \
- $(PGBASE)/jdbc1/Connection.class \
- $(PGBASE)/jdbc1/DatabaseMetaData.class \
- $(PGBASE)/jdbc1/PreparedStatement.class \
- $(PGBASE)/jdbc1/ResultSet.class \
- $(PGBASE)/jdbc1/ResultSetMetaData.class \
- $(PGBASE)/jdbc1/Statement.class
-
-# These files are unique to the JDBC 2 (JDK 2 nee 1.2) driver
-OBJ_JDBC2= $(PGBASE)/jdbc2/ResultSet.class \
- $(PGBASE)/jdbc2/PreparedStatement.class \
- $(PGBASE)/jdbc2/CallableStatement.class \
- $(PGBASE)/jdbc2/Connection.class \
- $(PGBASE)/jdbc2/DatabaseMetaData.class \
- $(PGBASE)/jdbc2/ResultSetMetaData.class \
- $(PGBASE)/jdbc2/Statement.class \
- $(PGBASE)/largeobject/PGblob.class
-
-# These files are unique to the JDBC2 Enterprise driver
-OBJ_ENTER= $(OBJ_JDBC2) \
- $(PGBASE)/PostgresqlDataSource.class \
- $(PGBASE)/xa/ClientConnection.class \
- $(PGBASE)/xa/TwoPhaseConnection.class \
- $(PGBASE)/xa/TxConnection.class \
- $(PGBASE)/xa/XAConnectionImpl.class \
- $(PGBASE)/xa/XADataSourceImpl.class
-
-# This rule builds the JDBC1 compliant driver
-jdbc1:
- $(BUILDDRIVER) $(VERSION) org.postgresql.jdbc1.Connection JDBC1.1 $(PGBASE)/Driver.java
- -$(RM) postgresql.jar
- @$(MAKE) jdbc1real
-
-# This rule does the real work for JDBC1.2, however do not call it directly.
-# This is because the JDBC driver relies on the org.postgresql.DriverClass
-# class to determine the driver version.
-jdbc1real: $(OBJ_COMMON) $(OBJ_JDBC1) $(JARFILE) msg
-
-# This rule builds the JDBC2 compliant driver
-jdbc2:
- @$(MAKE) jdbc2internal msg
-
-# This allows us to build the jdbc2 driver without displaying the msg
-# refer to the retepsql rule to see why.
-jdbc2internal:
- $(BUILDDRIVER) $(VERSION) org.postgresql.jdbc2.Connection Java2 $(PGBASE)/Driver.java
- -$(RM) postgresql.jar
- @$(MAKE) jdbc2real
-
-# This rule does the real work for JDBC2, however do not call it directly.
-# This is because the JDBC driver relies on the org.postgresql.DriverClass
-# class to determine the driver version.
-jdbc2real: $(OBJ_COMMON) $(OBJ_JDBC2) $(JARFILE)
-
-# This rule builds the enterprise edition of the driver
-enterprise:
- $(BUILDDRIVER) $(VERSION) org.postgresql.jdbc2.Connection Enterprise $(PGBASE)/Driver.java
- -$(RM) postgresql.jar
- @$(MAKE) enterprisereal
-
-# This rule does the real work for JDBC2 Enterprise Edition, however do not
-# call it directly. This is because the JDBC driver relies on the
-# org.postgresql.DriverClass class to determine the driver version.
-enterprisereal: $(OBJ_COMMON) $(OBJ_ENTER) $(JARFILE)
-
-# We use the old `cmd` notation here as some older shells (mainly sh under
-# Solaris) don't recognise the newer $(cmd) syntax.
+# $Header: /cvsroot/pgsql/src/interfaces/jdbc/Attic/Makefile,v 1.27 2001/03/05 09:39:53 peter Exp $
#
-$(JARFILE): $(OBJ) $(OBJ_COMMON)
- $(JAR) -c0f $@ `$(FIND) $(PGBASE) -name "*.class" -print` \
- $(wildcard $(PGBASE)/*.properties)
-
-# This rule removes any temporary and compiled files from the source tree.
-#
-clean:
- $(FIND) . -name "*~" -exec $(RM) {} \;
- $(FIND) . -name "*.class" -exec $(RM) {} \;
- -$(RM) -rf stock example/corba/stock.built
- -$(RM) postgresql.jar org/postgresql/Driver.java
- -$(RM) -rf Package-postgresql *output
- -$(RM) retepsql.jar manifest
-
-# New for 7.1
-install: $(JARFILE)
- $(CP) $(JARFILE) $(libdir)
-
-# This converts CHANGELOG into an html format - used by peter@retep.org.uk
-# to produce an online version
-changelog: changelog.html
-changelog.html: CHANGELOG
- $(CHANGELOG) $< >$@
-
-#######################################################################
-# This helps make workout what classes are from what source files
-#
-# Java is unlike C in that one source file can generate several
-# _Different_ file names
-#
-$(PGBASE)/Connection.class: $(PGBASE)/Connection.java
-$(PGBASE)/DatabaseMetaData.class: $(PGBASE)/DatabaseMetaData.java
-$(PGBASE)/Driver.class: $(PGBASE)/Driver.java
-$(PGBASE)/Field.class: $(PGBASE)/Field.java
-$(PGBASE)/PG_Stream.class: $(PGBASE)/PG_Stream.java
-$(PGBASE)/PreparedStatement.class: $(PGBASE)/PreparedStatement.java
-$(PGBASE)/ResultSet.class: $(PGBASE)/ResultSet.java
-$(PGBASE)/ResultSetMetaData.class: $(PGBASE)/ResultSetMetaData.java
-$(PGBASE)/Statement.class: $(PGBASE)/Statement.java
-$(PGBASE)/fastpath/Fastpath.class: $(PGBASE)/fastpath/Fastpath.java
-$(PGBASE)/fastpath/FastpathArg.class: $(PGBASE)/fastpath/FastpathArg.java
-$(PGBASE)/geometric/PGbox.class: $(PGBASE)/geometric/PGbox.java
-$(PGBASE)/geometric/PGcircle.class: $(PGBASE)/geometric/PGcircle.java
-$(PGBASE)/geometric/PGlseg.class: $(PGBASE)/geometric/PGlseg.java
-$(PGBASE)/geometric/PGpath.class: $(PGBASE)/geometric/PGpath.java
-$(PGBASE)/geometric/PGpoint.class: $(PGBASE)/geometric/PGpoint.java
-$(PGBASE)/geometric/PGpolygon.class: $(PGBASE)/geometric/PGpolygon.java
-$(PGBASE)/largeobject/LargeObject.class: $(PGBASE)/largeobject/LargeObject.java
-$(PGBASE)/largeobject/LargeObjectManager.class: $(PGBASE)/largeobject/LargeObjectManager.java
-$(PGBASE)/util/PGmoney.class: $(PGBASE)/util/PGmoney.java
-$(PGBASE)/util/PGobject.class: $(PGBASE)/util/PGobject.java
-$(PGBASE)/util/PGtokenizer.class: $(PGBASE)/util/PGtokenizer.java
-$(PGBASE)/util/Serialize.class: $(PGBASE)/util/Serialize.java
-$(PGBASE)/util/UnixCrypt.class: $(PGBASE)/util/UnixCrypt.java
-
-#######################################################################
-# These classes are in the example directory, and form the examples
-EX= example/basic.class \
- example/psql.class \
- example/ImageViewer.class
-
-# These are only valid for JDBC2
-EX2= example/blobtest.class
-
-# These are really test classes not true examples
-TESTS= example/metadata.class \
- example/threadsafe.class \
- example/Unicode.class
-
-# Non functional/obsolete examples
-# example/datestyle.class \
-# example/Objects.class
-
-# This rule builds the examples
-examples: postgresql.jar $(EX)
- @echo ------------------------------------------------------------
- @echo The examples have been built.
- @echo
- @echo For instructions on how to use them, simply run them. For example:
- @echo
- @echo " java example.basic"
- @echo
- @echo This would display instructions on how to run the example.
- @echo ------------------------------------------------------------
- @echo Available examples:
- @echo
- @echo " example.basic Basic JDBC useage"
- @echo " example.datestyle Shows how datestyles are handled"
- @echo " example.ImageViewer Example application storing images"
- @echo " example.psql Simple java implementation of psql"
- @echo " "
- @echo ------------------------------------------------------------
- @echo
-
-examples2: $(EX2) examples
- @echo "The following JDBC2 only examples have also been built:"
- @echo
- @echo " example.blobtest Binary Large Object tests"
- @echo
- @echo ------------------------------------------------------------
- @echo
-
-tests: $(TESTS)
- @echo ------------------------------------------------------------
- @echo The following tests have been built:
- @echo " example.metadata Tests various metadata methods"
- @echo " example.threadsafe Tests the driver's thread safety"
- @echo " example.Unicode Tests unicode charset support"
- @echo ------------------------------------------------------------
- @echo
-
-example/basic.class: example/basic.java
-example/blobtest.class: example/blobtest.java
-example/datestyle.class: example/datestyle.java
-example/psql.class: example/psql.java
-example/ImageViewer.class: example/ImageViewer.java
-example/threadsafe.class: example/threadsafe.java
-example/metadata.class: example/metadata.java
-example/Unicode.class: example/Unicode.java
-
-#######################################################################
-#
-# CORBA This extensive example shows how to integrate PostgreSQL
-# JDBC & CORBA.
-
-CORBASRC = $(wildcard example/corba/*.java)
-CORBAOBJ = $(subst .java,.class,$(CORBASRC))
-
-corba: jdbc2 example/corba/stock.built $(CORBAOBJ)
- @echo -------------------------------------------------------
- @echo The corba example has been built. Before running, you
- @echo will need to read the example/corba/readme file on how
- @echo to run the example.
- @echo
-
-#
-# This compiles our idl file and the stubs
-#
-# Note: The idl file is in example/corba, but it builds a directory under
-# the current one. For safety, we delete that directory before running
-# idltojava
-#
-example/corba/stock.built: example/corba/stock.idl
- -rm -rf stock
- $(IDL2JAVA) $<
- $(JAVAC) stock/*.java
- $(TOUCH) $@
-
-# tip: we cant use $(wildcard stock/*.java) in the above rule as a race
-# condition occurs, where javac is passed no arguments
-#######################################################################
-#
-# JPGSql This isn't really an example, but an entire frontend
-# for PostgreSQL via Java & JDBC.
-#
-# Requirements: Java2 platform (JDK1.2.x or 1.3)
-#
-retepsql: jdbc2internal postgresql.jar
- -$(RM) retepsql.jar
- @$(MAKE) retepsql.jar
- @echo
- @echo "The retepsql application has now been built. To run, simply"
- @echo "type:"
- @echo
- @echo " java -jar retepsql.jar"
- @echo
- @echo "Note: Some operating systems recognise .jar as an executable,"
- @echo " so on those (and Windows is one of them), you can simply"
- @echo " double click the jar file to start it."
+#-------------------------------------------------------------------------
-# All my classes have this prefix
-RETEP= uk/org/retep
+subdir = src/interfaces/jdbc
+top_builddir = ../../..
+include $(top_builddir)/src/Makefile.global
-# These classes form part of my personal swing library. I have placed these
-# into the public domain, so there are no license issues... enjoy...
-RETEPUTILS= $(RETEP)/swing/SwingApplication.class \
- $(RETEP)/swing/SwingApplication.class \
+all distprep:
+ @$(ANT) -buildfile $(top_builddir)/build.xml
-# This is my postgresql frontend. As it's never been released before, I've
-# decided not only to publish it under the same licence as the JDBC driver,
-# but also to put it along side the driver. To me it makes sense as it's the
-# best example I have on showing how to use the driver ;-)
-RETEPSQL= $(RETEP)/sql/DBConnection.class \
- $(RETEP)/sql/RetepSQL.class \
+install:
+ @$(ANT) -Dinstall.directory=$(DESTDIR)$(libdir)/java \
+ -buildfile $(top_builddir)/build.xml \
+ install
-# Some ancilary files which are included in the jar file
-RETEPSQLAUX= $(RETEP)/icons/ \
+installdirs uninstall dep depend:
+ @echo Nothing for JDBC
-# The big rule, this builds the jpgsql.jar file which contains the entire
-# application. DONT call this rule directly, but use the retepsql one, as
-# it ensures that jdbc is also compiled first.
-#
-# Note: We include the postgresql.jar contents in this as well. Also the
-# manifest entry MUST be immediately after $@ (note the -m option to jar).
-#
-retepsql.jar: $(RETEPUTILS) \
- $(RETEPSQL)
- (echo "Manifest-Version: 1.0"; \
- echo "Created-By: 1.2 (Sun Microsystems Inc.)"; \
- echo "Main-Class: uk.org.retep.sql.RetepSQL"; \
- ) >manifest
- $(JAR) -c0fm $@ manifest \
- `$(FIND) $(PGBASE) -name "*.class" -print` \
- $(wildcard $(PGBASE)/*.properties) \
- `$(FIND) $(RETEP) -name "*.class" -print` \
- $(RETEPSQLAUX)
+clean distclean maintainer-clean:
+ @$(ANT) -buildfile $(top_builddir)/build.xml clean
-#######################################################################
diff --git a/src/interfaces/jdbc/build.xml b/src/interfaces/jdbc/build.xml
index 5f09ed887bc..ef2c45ceb1c 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.6 2001/02/14 17:45:13 peter Exp $
+ $Id: build.xml,v 1.7 2001/03/05 09:40:01 peter Exp $
-->
@@ -63,6 +63,7 @@
<!-- 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}" />
@@ -98,9 +99,11 @@
<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+" />
+ <exclude name="${package}/largeobject/PGclob.java" unless="jdk1.2+" />
<exclude name="${package}/PostgresqlDataSource.java" unless="jdk1.2e+" />
<exclude name="${package}/xa/**" unless="jdk1.2e+" />
<exclude name="${package}/test/**" unless="junit" />
diff --git a/src/interfaces/jdbc/jdbc.jpx b/src/interfaces/jdbc/jdbc.jpx
index 2fff9537a6a..851c013e7b8 100644
--- a/src/interfaces/jdbc/jdbc.jpx
+++ b/src/interfaces/jdbc/jdbc.jpx
@@ -9,7 +9,7 @@
<property category="sys" name="CheckStable" value="1" />
<property category="sys" name="Company" value="" />
<property category="sys" name="Copyright" value="Copyright (c) 2001" />
- <property category="sys" name="DefaultPackage" value="org.postgresql.test.jdbc2" />
+ <property category="sys" name="DefaultPackage" value="org.postgresql.core" />
<property category="sys" name="Description" value="" />
<property category="sys" name="DocPath" value="doc" />
<property category="sys" name="ExcludeClassEnabled" value="0" />