Commit 3b14971d authored by Fabio Tranchitella's avatar Fabio Tranchitella

Merge with new upstream release (1.1.5).

parent abdf017c
PostGIS 1.1.4
PostGIS 1.1.5
2006/10/13
- Java:
- Removed obsolete synchronization from Jts code.
- fixed nullpointer Exception in Geometry.equals() method
- Added EJB3Spatial.odt to fulfill the GPL requirement of
distributing the "preferred form of modification"
- Added -S option for non-multi geometries to shp2pgsql
- Updated heavily outdated README files for shp2pgsql/pgsql2shp by
merging them with the manpages.
- Fixed MingW link error that was causing pgsql2shp to
segfault on Win32 when compiled for PostgreSQL 8.2
PostGIS 1.1.4
2006/09/27
- Fixed support for PostgreSQL 8.2
- Fixed bug in collect() function discarding SRID of
input
......
How to release
~~~~~~~~~~~~~~
Date: 2006-09-27
Versioning Scheme
-----------------
Release version is composed by REL_MAJOR_VERSION, REL_MINOR_VERSION
and REL_MICRO_VERSION components. "REL" here matches SO for the server
side of PostGIS, and JDBC for the java side.
By default only [REL_MICRO_VERSION] increments between releases.
[REL_MINOR_VERSION] is incremented (and MICRO set to 0) when minor
additions have been introduced (one or two functions can be considered
*micro* additions)
[REL_MAJOR_VERSION] is incremented (and MICRO and MINOR set to 0) when
a dump/reload of existing spatial databases is *REQUIRED* for things
to work or rather *HIGHLY RECOMMENDED* to get new functionalities.
Release procedure
-----------------
1) Update Version.config as specified in Versioning Scheme above.
2) Edit CHANGES: set release date and check all notable changes are
been reported.
3) Add release notes in doc/postgis.xml
4) Tag the release:
$ base=http://svn.refractions.net/postgis/
$ rel=MAJ.MIN.MIC
$ svn copy -m "Tagged release $rel" $base/trunk $base/tags/$rel
5) Run: sh make_dist.sh MAJ.MIN.MIC
6) Publish
7) Announce
......@@ -4,9 +4,9 @@
# shared library / release version
SO_MAJOR_VERSION=1
SO_MINOR_VERSION=1
SO_MICRO_VERSION=4
SO_MICRO_VERSION=5
# JDBC code version
JDBC_MAJOR_VERSION=1
JDBC_MINOR_VERSION=1
JDBC_MICRO_VERSION=3
JDBC_MICRO_VERSION=5
This diff is collapsed.
# This file was generated.
# It contains the lists of macros which have been traced.
# It can be safely removed.
@request = (
bless( [
'0',
1,
[
'/usr/share/autoconf'
],
[
'/usr/share/autoconf/autoconf/autoconf.m4f',
'configure.in'
],
{
'm4_pattern_forbid' => 1,
'AC_CONFIG_LIBOBJ_DIR' => 1,
'AC_TYPE_OFF_T' => 1,
'AC_C_VOLATILE' => 1,
'AC_FUNC_CLOSEDIR_VOID' => 1,
'AC_REPLACE_FNMATCH' => 1,
'AC_PROG_LIBTOOL' => 1,
'AC_FUNC_STAT' => 1,
'AC_HEADER_TIME' => 1,
'AC_FUNC_WAIT3' => 1,
'AM_AUTOMAKE_VERSION' => 1,
'AC_STRUCT_TM' => 1,
'AC_FUNC_LSTAT' => 1,
'AC_TYPE_MODE_T' => 1,
'AC_FUNC_GETMNTENT' => 1,
'AC_FUNC_STRTOD' => 1,
'AC_CHECK_HEADERS' => 1,
'AC_FUNC_STRNLEN' => 1,
'm4_sinclude' => 1,
'AC_PROG_CXX' => 1,
'AC_PATH_X' => 1,
'AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK' => 1,
'AC_PROG_AWK' => 1,
'_m4_warn' => 1,
'AC_HEADER_STDC' => 1,
'AC_HEADER_MAJOR' => 1,
'AC_FUNC_ERROR_AT_LINE' => 1,
'AC_PROG_GCC_TRADITIONAL' => 1,
'AC_LIBSOURCE' => 1,
'AC_FUNC_MBRTOWC' => 1,
'AC_STRUCT_ST_BLOCKS' => 1,
'AC_TYPE_SIGNAL' => 1,
'AC_TYPE_UID_T' => 1,
'AC_CONFIG_AUX_DIR' => 1,
'AC_PROG_MAKE_SET' => 1,
'sinclude' => 1,
'm4_pattern_allow' => 1,
'AC_DEFINE_TRACE_LITERAL' => 1,
'AC_FUNC_STRERROR_R' => 1,
'AC_PROG_CC' => 1,
'AC_FUNC_FORK' => 1,
'AC_DECL_SYS_SIGLIST' => 1,
'AC_FUNC_VPRINTF' => 1,
'AC_FUNC_STRCOLL' => 1,
'AC_PROG_YACC' => 1,
'AC_INIT' => 1,
'AC_STRUCT_TIMEZONE' => 1,
'AC_FUNC_CHOWN' => 1,
'AC_SUBST' => 1,
'AC_FUNC_ALLOCA' => 1,
'AC_CANONICAL_HOST' => 1,
'AC_FUNC_GETPGRP' => 1,
'AC_PROG_RANLIB' => 1,
'AM_INIT_AUTOMAKE' => 1,
'AC_FUNC_SETPGRP' => 1,
'AC_CONFIG_SUBDIRS' => 1,
'AC_FUNC_MMAP' => 1,
'AC_FUNC_REALLOC' => 1,
'AC_TYPE_SIZE_T' => 1,
'AC_CONFIG_LINKS' => 1,
'AC_CHECK_TYPES' => 1,
'AC_CHECK_MEMBERS' => 1,
'AM_MAINTAINER_MODE' => 1,
'AC_FUNC_UTIME_NULL' => 1,
'AC_FUNC_SELECT_ARGTYPES' => 1,
'AC_FUNC_STRFTIME' => 1,
'AC_HEADER_STAT' => 1,
'AC_C_INLINE' => 1,
'AC_PROG_CPP' => 1,
'AC_TYPE_PID_T' => 1,
'AC_C_CONST' => 1,
'AC_PROG_LEX' => 1,
'AC_CONFIG_FILES' => 1,
'include' => 1,
'AC_FUNC_SETVBUF_REVERSED' => 1,
'AC_PROG_INSTALL' => 1,
'AM_GNU_GETTEXT' => 1,
'AC_FUNC_OBSTACK' => 1,
'AC_CHECK_LIB' => 1,
'AC_FUNC_MALLOC' => 1,
'AC_FUNC_GETGROUPS' => 1,
'AC_FUNC_GETLOADAVG' => 1,
'AH_OUTPUT' => 1,
'AC_FUNC_FSEEKO' => 1,
'AM_PROG_CC_C_O' => 1,
'AM_CONDITIONAL' => 1,
'AC_CANONICAL_SYSTEM' => 1,
'AC_FUNC_MKTIME' => 1,
'AC_CONFIG_HEADERS' => 1,
'AC_HEADER_SYS_WAIT' => 1,
'AC_FUNC_MEMCMP' => 1,
'AC_PROG_LN_S' => 1,
'm4_include' => 1,
'AC_HEADER_DIRENT' => 1,
'AC_CHECK_FUNCS' => 1
}
], 'Autom4te::Request' )
);
This diff is collapsed.
......@@ -4570,7 +4570,6 @@ EXE=
case $host_os in
*mingw*)
PGBEINCLUDES="$PGBEINCLUDES $PGBEINCLUDES/port/win32"
PGFELIBS=`${PGCONFIG} --libdir`"/libpq.dll"
DLSUFFIX=.dll
DLFLAGS='${PGBELIBS}'
EXE=.exe
......
......@@ -541,7 +541,6 @@ EXE=
case $host_os in
*mingw*)
PGBEINCLUDES="$PGBEINCLUDES $PGBEINCLUDES/port/win32"
PGFELIBS=`${PGCONFIG} --libdir`"/libpq.dll"
DLSUFFIX=.dll
DLFLAGS='${PGBELIBS}'
EXE=.exe
......
postgis (1.1.5-1) unstable; urgency=low
* New upstream release.
-- Fabio Tranchitella <kobold@debian.org> Tue, 31 Oct 2006 21:56:32 +0100
postgis (1.1.4-1) unstable; urgency=low
* New upstream release.
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -2,72 +2,96 @@
.SH "NAME"
.LP
pgsql2shp - postgis to shapefile dumper
.SH "SYNTAX"
.LP
pgsql2shp [\fIoptions\fR] \fIdatabase\fR [\fIschema\fR\fB.\fR]\fItable\fR
.br
pgsql2shp [\fIoptions\fR] \fIdatabase\fR \fIquery\fR
.SH "DESCRIPTION"
.LP
The pgsql2shp table dumper connects directly to the database and converts a table (possibly created by user query) into a shape file. It is compatible with
all versions of PostGIS.
The pgsql2shp table dumper connects directly to the database and converts a
table (possibly created by user query) into a shape file. It is compatible
with all versions of PostGIS.
Version: 1.1.5 (2006/10/06)
.SH "USAGE"
.LP
The <database> is the name of the database to connect to.
The <table> is the (optionally schema-qualified) table to read spatial
data from. Alternatively, you can specify a QUERY whose result will be
written into the shapefile.
.SH "OPTIONS"
.LP
The commandline options are:
.TP
\fB\-f\fR <\fIfilename\fR>
Write the output to a particular filename.
.TP
\fB\-h\fR <\fIhost\fR>
The database host to connect to.
.TP
\fB\-p\fR <\fIport\fR>
The port to connect to on the database host.
.TP
\fB\-P\fR <\fIpassword\fR>
The password to use when connecting to the database.
.TP
\fB\-u\fR <\fIuser\fR>
The username to use when connecting to the database.
.TP
\fB\-g\fR <\fIgeometry column\fR>
In the case of tables with multiple geometry columns, the geometry column to use when writing the shape file.
In the case of tables with multiple geometry columns, the geometry column
to use when writing the shape file.
.TP
\fB\-b\fR
Use a binary cursor. When used on pre\-1.0.0 PostGIS versions this will reduce the likelihood of coordinate drift due to conversion to and from WKT format.
Coordinate drifts will not occur with PostGIS 1.0.0 and newer versions.
It will be slightly faster, but might fail if any NON\-gemetry column lacks
a cast to text.
Use a binary cursor. When used on pre\-1.0.0 PostGIS versions this will
reduce the likelihood of coordinate drift due to conversion to and from
WKT format. Coordinate drifts will not occur with PostGIS 1.0.0 and newer
versions. It will be slightly faster, but might fail if any NON\-gemetry
column lacks a cast to text.
.TP
\fB\-r\fR
Raw mode. Do not drop the gid field, or escape column names.
.TP
\fB\-d\fR
For backward compatibility: write a 3\-dimensional shape file when dumping from old (pre\-1.0.0) postgis databases (the default is to write a 2\-dimensional shape file in that case). Starting from postgis\-1.0.0+, dimensions are fully encoded.
For backward compatibility: write a 3\-dimensional shape file when dumping
from old (pre\-1.0.0) postgis databases (the default is to write a
2\-dimensional shape file in that case). Starting from postgis\-1.0.0+,
dimensions are fully encoded.
.TP
\fB\-k\fR
Keep idendifiers case (don't uppercase field names).
.SH "INSTALLATION"
.LP
To compile the program from source, simply run "make" in the source directory.
Then copy the binary in your shell search path (or wherever you like). This
text is also available as a man page in the ../doc/man/ directory, ready for
copying it into the manual search path on unixoid systems.
.SH "EXAMPLES"
.LP
An example session using the dumper to create shape file from a database might
look like this:
# \fBpgsql2shp -f myfile -p 5555 my_db roads_table\fR
.SH "AUTHORS"
.LP
Originally written by Jeff Lounsbury <jeffloun@refractions.net>.
Improved and maintained by Sandro Santilli <strk@refractions.net>.
Includes small contributions and improvements by others.
This application uses functionality from shapelib 1.2.9
by Frank Warmerdam <warmerda@gdal.velocet.ca> to write to ESRI Shape files.
.SH "SEE ALSO"
.LP
shp2pgsql(1)
More information is available at http://postgis.refractions.net
......@@ -2,80 +2,104 @@
.SH "NAME"
.LP
shp2pgsql - shapefile to postgis loader
.SH "SYNTAX"
.LP
shp2pgsql [\fIoptions\fR] \fIshapefile\fR [\fIschema\fR\fB.\fR]\fItable\fR
.SH "DESCRIPTION"
.LP
The shp2pgsql data loader converts ESRI Shape files into SQL suitable for insertion into a PostGIS/PostgreSQL database.
The shp2pgsql data loader converts ESRI Shape files into SQL suitable
for insertion into a PostGIS/PostgreSQL database.
Version: 1.1.5 (2006/10/06)
.SH "USAGE"
.LP
The <shapefile> is the name of the shape file, without any extension
information. For example, 'roads' would be the name of the shapefile
comprising the 'roads.shp', 'roads.shx', and 'roads.dbf' files.
The <tablename> is the (optionally schema-qualified) name of the database
table you want the data stored in in the database. Within that table,
the geometry will be placed in the 'geo_value' column by default.
.SH "OPTIONS"
.LP
The loader has several operating modes distinguished by command line flags:
(Note that -a, -c, -d and -p are mutually exclusive.)
.TP
\fB\-d\fR
Drops the database table before creating a new table with the data in the Shape file.
Drops the database table before creating a new table with the data in the
Shape file.
.TP
\fB\-a\fR
Appends data from the Shape file into the database table. Note that to use this option to load multiple files, the files must have the same attributes and same data types.
Appends data from the Shape file into the database table. Note that to use
this option to load multiple files, the files must have the same attributes
and same data types.
.TP
\fB\-c\fR
Creates a new table and populates it from the Shape file. This is the default mode.
Creates a new table and populates it from the Shape file. This is the default
mode.
.TP
\fB\-p\fR
Only produces the table creation SQL code, without adding any actual data. This can
be used if you need to completely separate the table creation and data loading steps.
Only produces the table creation SQL code, without adding any actual data.
This can be used if you need to completely separate the table creation and
data loading steps.
.TP
\fB\-D\fR
Use the PostgreSQL "dump" format for the output data. This can be combined with -a, -c and -d.
It is much faster to load than the default "insert" SQL format. Use this for very large data sets.
Use the PostgreSQL "dump" format for the output data. This can be combined
with -a, -c and -d. It is much faster to load than the default "insert" SQL
format. Use this for very large data sets.
.TP
\fB\-s\fR <\fISRID\fR>
Creates and populates the geometry tables with the specified SRID.
.TP
\fB\-g\fR <\fIgeometry_column\fR>
Specify the name of the geometry column (mostly useful in append mode).
.TP
\fB\-k\fR
Keep idendifiers case (column, schema and attributes). Note that attributes in Shapefile are usually all UPPERCASE.
Keep idendifiers case (column, schema and attributes). Note that attributes
in Shapefile are usually all UPPERCASE.
.TP
\fB\-i\fR
Coerce all integers to standard 32\-bit integers, do not create 64\-bit bigints, even if the DBF header signature appears to warrant it.
Coerce all integers to standard 32\-bit integers, do not create 64\-bit
bigints, even if the DBF header signature appears to warrant it.
.TP
\fB\-S\fR
Generate simple Geometries instead of MULTIgeometries. Shape files don't
differ between LINESTRINGs and MULTILINESTRINGs, so shp2pgsql generates
MULTILINESTRINGs by default. This switch will produce LINESTRINGs instead,
but shp2pgsql will fail when it hits a real MULTILINESTRING. The same works
for POLYGONs vs. MULTIPOLYGONs.
.TP
\fB\-w\fR
Output WKT format, for use with older (0.x) versions of PostGIS.
Note that this will introduce coordinate drifts and will drop
M values from shapefiles.
.TP
\fB\-W\fR <\fIencoding\fR>
Specify the character \fIencoding\fR of Shapefile's attributes.
If this option is used the output will be encoded in UTF-8.
.TP
\fB\-I\fR
Create a GiST index on the geometry column.
.TP
\fB\-N\fR <\fIpolicy\fR>
Specify NULL geometries handling policy (insert,skip,abort).
.SH "INSTALLATION"
.LP
Note that -a, -c, -d and -p are mutually exclusive.
To compile the program from source, simply run "make" in the source directory.
Then copy the binary in your shell search path (or wherever you like). This
text is also available as a man page in the ../doc/man/ directory, ready for
copying it into the manual search path on unixoid systems.
.SH "EXAMPLES"
.LP
An example session using the loader to create an input file and uploading it might look like this:
An example session using the loader to create an input file and uploading it
might look like this:
# \fBshp2pgsql shaperoads roadstable roadsdb > roads.sql\fR
.br
......@@ -84,13 +108,18 @@ An example session using the loader to create an input file and uploading it mig
A conversion and upload can be done all in one step using UNIX pipes:
# \fBshp2pgsql shaperoads roadstable roadsdb | psql \-d roadsdb\fR
.SH "AUTHORS"
.LP
Originally written by Jeff Lounsbury <jeffloun@refractions.net>.
Improved and maintained by Sandro Santilli <strk@refractions.net>.
Includes small contributions and improvements by others.
This application uses functionality from shapelib 1.2.9
by Frank Warmerdam <warmerda@gdal.velocet.ca> to read from ESRI Shape files.
.SH "SEE ALSO"
.LP
pgsql2shp(1)
More information is available at http://postgis.refractions.net
......@@ -361,6 +361,19 @@
</listitem>
</orderedlist>
<sect2 id="templatepostgis">
<title>Creating PostGIS spatially-enabled databases from an in-built template</title>
<para>Some packaged distributions of PostGIS (in particular the Win32 installers for PostGIS &gt;= 1.1.5) load the PostGIS functions into a template database called <varname>template_postgis</varname>. If the <varname>template_postgis</varname> database exists in your PostgreSQL installation then it is possible for users and/or applications to create spatially-enabled databases using a single command. Note that in both cases, the database user must have been granted the privilege to create new databases.</para>
<para>From the shell:</para>
<programlisting># createdb -T template_postgis my_spatial_db</programlisting>
<para>From SQL:</para>
<programlisting>postgres=# CREATE DATABASE my_spatial_db TEMPLATE=template_postgis</programlisting>
</sect2>
<sect2 id="upgrading">
<title>Upgrading</title>
......@@ -574,7 +587,8 @@ as follow:
<para>The loader is called <filename>shp2pgsql</filename> and converts
ESRI Shape files into SQL suitable for loading in PostGIS/PostgreSQL.
The dumper is called <filename>pgsql2shp</filename> and converts PostGIS
tables (or queries) into ESRI Shape files.</para>
tables (or queries) into ESRI Shape files. For more verbose documentation,
see the online help, and the manual pages.</para>
</sect1>
</chapter>
......@@ -5312,6 +5326,54 @@ FROM geometry_table;</literallayout>
<title>Release Notes</title>
<sect2>
<title>Release 1.1.5</title>
<para>Release date: 2006/10/13</para>
<para>This is an bugfix release, including a critical
segfault on win32. Upgrade is <emphasis>encouraged</emphasis>.
</para>
<sect3>
<title>Upgrading</title>
<para>
If you are upgrading from release 1.0.3 or later follow the
<link linkend="soft_upgrade">soft upgrade</link> procedure.
</para>
<para>
If you are upgrading from a release <emphasis>between 1.0.0RC6 and
1.0.2</emphasis> (inclusive) and really want a live upgrade read the
<link linkend="rel_1.0.3_upgrading">upgrade section</link> of the 1.0.3
release notes chapter.
</para>
<para>
Upgrade from any release prior to 1.0.0RC6 requires an
<link linkend="hard_upgrade">hard upgrade</link>.
</para>
</sect3>
<sect3>
<title>Bug fixes</title>
<para>Fixed MingW link error that was causing pgsql2shp to
segfault on Win32 when compiled for PostgreSQL 8.2</para>
<para>fixed nullpointer Exception in Geometry.equals() method
in Java</para>
<para>Added EJB3Spatial.odt to fulfill the GPL requirement of
distributing the "preferred form of modification"</para>
<para>Removed obsolete synchronization from JDBC Jts code.</para>
<para>Updated heavily outdated README files for shp2pgsql/pgsql2shp by
merging them with the manpages.</para>
<para>Fixed version tag in jdbc code that still said "1.1.3" in the
"1.1.4" release.</para>
</sect3>
<sect3>
<title>New Features</title>
<para>Added -S option for non-multi geometries to shp2pgsql</para>
</sect3>
</sect2>
<sect2>
<title>Release 1.1.4</title>
<para>Release date: 2006/09/27</para>
......
$Id: README.txt 2489 2006-09-27 08:47:10Z mschaber $
(This code was contributed by Norman Barker <nbarker@ittvis.com>)
$Id: README.txt 2505 2006-10-11 10:45:28Z mschaber $
(This code was contributed by Norman Barker <norman.barker@gmail.com>)
Spatial EJB3
......@@ -13,7 +13,8 @@ the dependency on JBoss and Hibernate to incorporate other Application
Services.
Since it is useful to display screenshots in a tutorial this has been written
as a PDF and the document and source are available here.
as an Openoffice Document. For easy viewing and printing, a PDF version is
also available.
COMPILING:
......
......@@ -3,7 +3,7 @@
*
* PostGIS extension for PostgreSQL JDBC driver - EJB3 Support
*
* (C) 2006 Noarman Barker <nbarker@ittvis.com>
* (C) 2006 Norman Barker <norman.barker@gmail.com>
*
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
......@@ -19,7 +19,7 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
* http://www.gnu.org.
*
* $Id: build.xml 2476 2006-09-20 09:03:12Z mschaber $
* $Id: build.xml 2500 2006-10-09 17:12:46Z mschaber $
-->
<project name="PostGIS EJB3 Tutorial" default="compile" basedir=".">
<property name="build.dir" value="bin"/>
......
......@@ -3,7 +3,7 @@
*
* PostGIS extension for PostgreSQL JDBC driver - EJB3 Tutorial
*
* (C) 2006 Noarman Barker <nbarker@ittvis.com>
* (C) 2006 Norman Barker <norman.barker@gmail.com>
*
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
......@@ -19,7 +19,7 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
* http://www.gnu.org.
*
* $Id: PersonEntity.java 2476 2006-09-20 09:03:12Z mschaber $
* $Id: PersonEntity.java 2500 2006-10-09 17:12:46Z mschaber $
*/
package org.postgis.ejb;
......
......@@ -3,7 +3,7 @@
*
* PostGIS extension for PostgreSQL JDBC driver - EJB3 Tutorial
*
* (C) 2006 Noarman Barker <nbarker@ittvis.com>
* (C) 2006 Norman Barker <norman.barker@gmail.com>
*
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
......@@ -19,7 +19,7 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
* http://www.gnu.org.
*
* $Id: UserBean.java 2476 2006-09-20 09:03:12Z mschaber $
* $Id: UserBean.java 2500 2006-10-09 17:12:46Z mschaber $
*/
package org.postgis.ejb;
......
......@@ -3,7 +3,7 @@
*
* PostGIS extension for PostgreSQL JDBC driver - EJB3 Tutorial
*
* (C) 2006 Noarman Barker <nbarker@ittvis.com>
* (C) 2006 Norman Barker <norman.barker@gmail.com>
*
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
......@@ -19,7 +19,7 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
* http://www.gnu.org.
*
* $Id: UserBeanRemote.java 2476 2006-09-20 09:03:12Z mschaber $
* $Id: UserBeanRemote.java 2500 2006-10-09 17:12:46Z mschaber $
*/
package org.postgis.ejb;
......
......@@ -3,7 +3,7 @@
*
* PostGIS extension for PostgreSQL JDBC driver - EJB3 Tutorial
*
* (C) 2006 Noarman Barker <nbarker@ittvis.com>
* (C) 2006 Norman Barker <norman.barker@gmail.com>
*
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
......@@ -19,7 +19,7 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
* http://www.gnu.org.
*
* $Id: IngestMDB.java 2476 2006-09-20 09:03:12Z mschaber $
* $Id: IngestMDB.java 2500 2006-10-09 17:12:46Z mschaber $
*/
package org.postgis.ejb.mdb;
......
......@@ -3,7 +3,7 @@
*
* PostGIS extension for PostgreSQL JDBC driver - EJB3 Tutorial
*
* (C) 2006 Noarman Barker <nbarker@ittvis.com>
* (C) 2006 Norman Barker <norman.barker@gmail.com>
*
* This library is free software; you can redistribute it and/or modify it under
* the terms of the GNU Lesser General Public License as published by the Free
......@@ -19,7 +19,7 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
* http://www.gnu.org.
*
* $Id: GeometryType.java 2476 2006-09-20 09:03:12Z mschaber $
* $Id: GeometryType.java 2501 2006-10-09 17:22:15Z mschaber $
*/
package org.postgis.hibernate;
......@@ -111,9 +111,9 @@ public class GeometryType implements UserType {
/* (non-Javadoc)
* @see org.hibernate.usertype.UserType#replace(java.lang.Object, java.lang.Object, java.lang.Object)
*/
public Object replace(Object arg0, Object arg1, Object arg2) throws HibernateException {
// TODO Auto-generated method stub
return null;
public Object replace(Object original, Object target,
Object owner) throws HibernateException {
return original;
}
/* (non-Javadoc)
......
......@@ -19,7 +19,7 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
* http://www.gnu.org.
*
* $Id: JtsBinaryParser.java 2407 2006-07-18 18:13:31Z mschaber $
* $Id: JtsBinaryParser.java 2493 2006-10-02 14:30:47Z mschaber $
*/
package org.postgis.jts;
......@@ -68,22 +68,16 @@ public class JtsBinaryParser {
/**
* Parse a hex encoded geometry
*
* Is synchronized to protect offset counter. (Unfortunately, Java does not
* have neither call by reference nor multiple return values.)
*/
public synchronized Geometry parse(String value) {
public Geometry parse(String value) {
StringByteGetter bytes = new ByteGetter.StringByteGetter(value);
return parseGeometry(valueGetterForEndian(bytes));
}
/**
* Parse a binary encoded geometry.
*
* Is synchronized to protect offset counter. (Unfortunately, Java does not
* have neither call by reference nor multiple return values.)
*/
public synchronized Geometry parse(byte[] value) {
public Geometry parse(byte[] value) {
BinaryByteGetter bytes = new ByteGetter.BinaryByteGetter(value);
return parseGeometry(valueGetterForEndian(bytes));
}
......
......@@ -19,7 +19,7 @@
* 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
* http://www.gnu.org.
*
* $Id: JtsBinaryWriter.java 2410 2006-07-19 13:31:18Z mschaber $
* $Id: JtsBinaryWriter.java 2497 2006-10-02 23:26:34Z mschaber $
*/
package org.postgis.jts;
......@@ -74,42 +74,34 @@ public class JtsBinaryWriter {
/**
* Write a hex encoded geometry
*
* Is synchronized to protect offset counter. (Unfortunately, Java does not
* have neither call by reference nor multiple return values.) This is a
* TODO item.
*