From 0cf56f41953129b75c8a823a89caf505e2db013f Mon Sep 17 00:00:00 2001 From: soc Date: Wed, 9 Sep 2020 19:41:46 +0200 Subject: [PATCH] Rename package, fix Java module issues, etc. (#85) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Require Java 9 * Migrate package root from org.postgis to net.postgis * Add module-info.java files * Move classes in main postgis-jdbc module to net.postgis.jdbc * Un-collide Java example package * Move properties from illegal packages to allowed ones In the case of the org/postgres/driverconfig.properties this will break autoregistration – this feature needs to be done differently. * postgis-jdbc-geometry: Align Maven module name, Java module name, package name and directory name * postgis-jdbc: Align directory name with Maven module and Java module name * postgis-jdbc-java2d: Align package name with Maven module name, Java module name and directory name * postgis-jdbc-jts: Align Maven module name, Java module name, package name and directory name * Clean up module-info files, add exports * Deactivate module-info.java files, add `Automatic-Module-Name`s to MANIFEST.MF instead, move driver registration property file back * Revert to Java 8 Co-authored-by: Phillip Ross --- .travis/install-zulu.sh | 21 +++--- .../org/postgresql/driverconfig.properties | 9 --- pom.xml | 10 +-- .../pom.xml | 10 +++ .../src/main/java/module-info.java.off | 9 +++ .../postgis/jdbc/geometry}/ComposedGeom.java | 2 +- .../net/postgis/jdbc/geometry}/Geometry.java | 2 +- .../jdbc/geometry}/GeometryBuilder.java | 6 +- .../jdbc/geometry}/GeometryCollection.java | 2 +- .../jdbc/geometry}/GeometryTokenizer.java | 2 +- .../postgis/jdbc/geometry}/LineString.java | 2 +- .../postgis/jdbc/geometry}/LinearRing.java | 2 +- .../jdbc/geometry}/MultiLineString.java | 2 +- .../postgis/jdbc/geometry}/MultiPoint.java | 2 +- .../postgis/jdbc/geometry}/MultiPolygon.java | 2 +- .../net/postgis/jdbc/geometry}/Point.java | 2 +- .../jdbc/geometry}/PointComposedGeom.java | 2 +- .../net/postgis/jdbc/geometry}/Polygon.java | 2 +- .../jdbc/geometry}/binary/BinaryParser.java | 26 +++---- .../jdbc/geometry}/binary/BinaryWriter.java | 22 +++--- .../jdbc/geometry}/binary/ByteGetter.java | 2 +- .../jdbc/geometry}/binary/ByteSetter.java | 2 +- .../jdbc/geometry}/binary/ValueGetter.java | 2 +- .../jdbc/geometry}/binary/ValueSetter.java | 2 +- .../jdbc/geometry}/util/VersionFunctions.java | 2 +- .../jdbc/geometry}/util/VersionUtil.java | 2 +- .../jdbc/geometry}/util/package-info.java | 2 +- .../postgis/jdbc/geometry}/DatatypesTest.java | 2 +- .../postgis/jdbc/geometry}/TokenizerTest.java | 2 +- .../src/test/resources/logback-test.xml | 2 - .../src/test/resources/testng.xml | 4 +- postgis-jdbc-java2d/pom.xml | 10 +++ .../src/main/java/module-info.java.off | 11 +++ .../postgis/jdbc}/java2d/Java2DWrapper.java | 7 +- .../postgis/jdbc}/java2d/PGShapeGeometry.java | 2 +- .../jdbc}/java2d/ShapeBinaryParser.java | 28 ++++---- .../jdbc}/java2d/SimpleJava2DWrapperTest.java | 6 +- .../src/test/resources/logback-test.xml | 2 +- .../src/test/resources/testng.xml | 2 +- {jdbc_jtsparser => postgis-jdbc-jts}/pom.xml | 12 +++- .../src/main/java/module-info.java.off | 14 ++++ .../java/net/postgis/jdbc}/jts/JTSShape.java | 4 +- .../postgis/jdbc}/jts/JtsBinaryParser.java | 30 ++++---- .../postgis/jdbc}/jts/JtsBinaryWriter.java | 50 +++++++------- .../net/postgis/jdbc}/jts/JtsGeometry.java | 2 +- .../net/postgis/jdbc}/jts/JtsGisWrapper.java | 8 +-- .../net/postgis/jdbc}/jts/JtsWrapper.java | 8 +-- .../src/main/javadoc/overview.html | 0 .../net/postgis/jdbc}/jts/JtsParserTest.java | 8 +-- .../src/test/resources-filtered/testng-it.xml | 2 +- .../src/test/resources/logback-test.xml | 2 +- {jdbc => postgis-jdbc}/COPYING_LGPL | 0 {jdbc => postgis-jdbc}/README | 12 ++-- {jdbc => postgis-jdbc}/pom.xml | 10 +++ .../src/main/java/module-info.java.off | 9 +++ .../java/net/postgis/jdbc}/DriverWrapper.java | 68 +++++++++---------- .../postgis/jdbc}/DriverWrapperAutoprobe.java | 4 +- .../net/postgis/jdbc}/DriverWrapperLW.java | 4 +- .../main/java/net/postgis/jdbc}/PGbox2d.java | 4 +- .../main/java/net/postgis/jdbc}/PGbox3d.java | 4 +- .../java/net/postgis/jdbc}/PGboxbase.java | 6 +- .../main/java/net/postgis/jdbc}/PGgeo.java | 6 +- .../java/net/postgis/jdbc}/PGgeography.java | 4 +- .../java/net/postgis/jdbc}/PGgeographyLW.java | 5 +- .../java/net/postgis/jdbc}/PGgeometry.java | 4 +- .../java/net/postgis/jdbc}/PGgeometryLW.java | 5 +- .../main/java/net/postgis/jdbc}/Version.java | 4 +- .../src/main/javadoc/overview.html | 0 .../net/postgis/jdbc}/version.properties | 0 .../org/postgresql/driverconfig.properties | 9 +++ .../java/net/postgis/jdbc}/BoxesTest.java | 6 +- .../jdbc}/DatatypesAutoRegistrationTest.java | 4 +- .../java/net/postgis/jdbc}/DatatypesTest.java | 2 +- .../postgis/jdbc}/EmptyGeometriesTest.java | 6 +- .../postgis/jdbc}/GeographyDatatypeTest.java | 4 +- .../java/net/postgis/jdbc}/ParserTest.java | 16 +++-- .../net/postgis/jdbc}/SerializationTest.java | 3 +- .../java/net/postgis/jdbc}/ServerTest.java | 2 +- .../net/postgis/jdbc}/VersionPrinter.java | 2 +- .../net/postgis/jdbc}/util/VersionUtilIT.java | 4 +- .../src/test/resources-filtered/testng-it.xml | 16 ++--- .../src/test/resources/logback-test.xml | 2 +- .../src/test/resources/testng.xml | 4 +- {jdbc => postgis-jdbc}/todo.txt | 0 tools/pom.xml | 2 +- .../.gitignore | 0 .../pom.xml | 11 ++- .../postgis/jdbc/smoketest/Autoregister.java | 10 +-- .../net/postgis/jdbc/smoketest/Java2d.java | 6 +- .../net/postgis/jdbc/smoketest/OSGeo.java} | 22 +++--- .../src/main/scripts/test.sh | 4 +- .../net/postgis/jdbc/smoketest}/UtilTest.java | 4 +- .../src/test/resources-filtered/testng-it.xml | 2 +- .../src/test/resources/logback-test.xml | 2 - 94 files changed, 383 insertions(+), 278 deletions(-) delete mode 100644 jdbc/src/main/resources/org/postgresql/driverconfig.properties rename {postgis-geometry => postgis-jdbc-geometry}/pom.xml (84%) create mode 100644 postgis-jdbc-geometry/src/main/java/module-info.java.off rename {postgis-geometry/src/main/java/org/postgis => postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry}/ComposedGeom.java (99%) rename {postgis-geometry/src/main/java/org/postgis => postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry}/Geometry.java (99%) rename {postgis-geometry/src/main/java/org/postgis => postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry}/GeometryBuilder.java (96%) rename {postgis-geometry/src/main/java/org/postgis => postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry}/GeometryCollection.java (98%) rename {postgis-geometry/src/main/java/org/postgis => postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry}/GeometryTokenizer.java (98%) rename {postgis-geometry/src/main/java/org/postgis => postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry}/LineString.java (98%) rename {postgis-geometry/src/main/java/org/postgis => postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry}/LinearRing.java (98%) rename {postgis-geometry/src/main/java/org/postgis => postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry}/MultiLineString.java (98%) rename {postgis-geometry/src/main/java/org/postgis => postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry}/MultiPoint.java (97%) rename {postgis-geometry/src/main/java/org/postgis => postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry}/MultiPolygon.java (98%) rename {postgis-geometry/src/main/java/org/postgis => postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry}/Point.java (99%) rename {postgis-geometry/src/main/java/org/postgis => postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry}/PointComposedGeom.java (98%) rename {postgis-geometry/src/main/java/org/postgis => postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry}/Polygon.java (98%) rename {postgis-geometry/src/main/java/org/postgis => postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry}/binary/BinaryParser.java (93%) rename {postgis-geometry/src/main/java/org/postgis => postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry}/binary/BinaryWriter.java (96%) rename {postgis-geometry/src/main/java/org/postgis => postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry}/binary/ByteGetter.java (98%) rename {postgis-geometry/src/main/java/org/postgis => postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry}/binary/ByteSetter.java (98%) rename {postgis-geometry/src/main/java/org/postgis => postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry}/binary/ValueGetter.java (98%) rename {postgis-geometry/src/main/java/org/postgis => postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry}/binary/ValueSetter.java (99%) rename {postgis-geometry/src/main/java/org/postgis => postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry}/util/VersionFunctions.java (98%) rename {postgis-geometry/src/main/java/org/postgis => postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry}/util/VersionUtil.java (99%) rename {postgis-geometry/src/main/java/org/postgis => postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry}/util/package-info.java (57%) rename {postgis-geometry/src/test/java/org/postgis => postgis-jdbc-geometry/src/test/java/net/postgis/jdbc/geometry}/DatatypesTest.java (98%) rename {postgis-geometry/src/test/java/org/postgis => postgis-jdbc-geometry/src/test/java/net/postgis/jdbc/geometry}/TokenizerTest.java (98%) rename {postgis-geometry => postgis-jdbc-geometry}/src/test/resources/logback-test.xml (91%) rename {postgis-geometry => postgis-jdbc-geometry}/src/test/resources/testng.xml (61%) create mode 100644 postgis-jdbc-java2d/src/main/java/module-info.java.off rename postgis-jdbc-java2d/src/main/java/{org/postgis => net/postgis/jdbc}/java2d/Java2DWrapper.java (96%) rename postgis-jdbc-java2d/src/main/java/{org/postgis => net/postgis/jdbc}/java2d/PGShapeGeometry.java (99%) rename postgis-jdbc-java2d/src/main/java/{org/postgis => net/postgis/jdbc}/java2d/ShapeBinaryParser.java (90%) rename postgis-jdbc-java2d/src/test/java/{org/postgis => net/postgis/jdbc}/java2d/SimpleJava2DWrapperTest.java (88%) rename {jdbc_jtsparser => postgis-jdbc-jts}/pom.xml (87%) create mode 100644 postgis-jdbc-jts/src/main/java/module-info.java.off rename {jdbc_jtsparser/src/main/java/org/postgis => postgis-jdbc-jts/src/main/java/net/postgis/jdbc}/jts/JTSShape.java (99%) rename {jdbc_jtsparser/src/main/java/org/postgis => postgis-jdbc-jts/src/main/java/net/postgis/jdbc}/jts/JtsBinaryParser.java (90%) rename {jdbc_jtsparser/src/main/java/org/postgis => postgis-jdbc-jts/src/main/java/net/postgis/jdbc}/jts/JtsBinaryWriter.java (89%) rename {jdbc_jtsparser/src/main/java/org/postgis => postgis-jdbc-jts/src/main/java/net/postgis/jdbc}/jts/JtsGeometry.java (99%) rename {jdbc_jtsparser/src/main/java/org/postgis => postgis-jdbc-jts/src/main/java/net/postgis/jdbc}/jts/JtsGisWrapper.java (95%) rename {jdbc_jtsparser/src/main/java/org/postgis => postgis-jdbc-jts/src/main/java/net/postgis/jdbc}/jts/JtsWrapper.java (94%) rename {jdbc_jtsparser => postgis-jdbc-jts}/src/main/javadoc/overview.html (100%) rename {jdbc_jtsparser/src/test/java/org/postgis => postgis-jdbc-jts/src/test/java/net/postgis/jdbc}/jts/JtsParserTest.java (98%) rename {jdbc_jtsparser => postgis-jdbc-jts}/src/test/resources-filtered/testng-it.xml (91%) rename {tools/osgeo-postgis-jdbc-test-util => postgis-jdbc-jts}/src/test/resources/logback-test.xml (90%) rename {jdbc => postgis-jdbc}/COPYING_LGPL (100%) rename {jdbc => postgis-jdbc}/README (95%) rename {jdbc => postgis-jdbc}/pom.xml (90%) create mode 100644 postgis-jdbc/src/main/java/module-info.java.off rename {jdbc/src/main/java/org/postgis => postgis-jdbc/src/main/java/net/postgis/jdbc}/DriverWrapper.java (81%) rename {jdbc/src/main/java/org/postgis => postgis-jdbc/src/main/java/net/postgis/jdbc}/DriverWrapperAutoprobe.java (97%) rename {jdbc/src/main/java/org/postgis => postgis-jdbc/src/main/java/net/postgis/jdbc}/DriverWrapperLW.java (96%) rename {jdbc/src/main/java/org/postgis => postgis-jdbc/src/main/java/net/postgis/jdbc}/PGbox2d.java (96%) rename {jdbc/src/main/java/org/postgis => postgis-jdbc/src/main/java/net/postgis/jdbc}/PGbox3d.java (95%) rename {jdbc/src/main/java/org/postgis => postgis-jdbc/src/main/java/net/postgis/jdbc}/PGboxbase.java (96%) rename {jdbc/src/main/java/org/postgis => postgis-jdbc/src/main/java/net/postgis/jdbc}/PGgeo.java (94%) rename {jdbc/src/main/java/org/postgis => postgis-jdbc/src/main/java/net/postgis/jdbc}/PGgeography.java (96%) rename {jdbc/src/main/java/org/postgis => postgis-jdbc/src/main/java/net/postgis/jdbc}/PGgeographyLW.java (94%) rename {jdbc/src/main/java/org/postgis => postgis-jdbc/src/main/java/net/postgis/jdbc}/PGgeometry.java (96%) rename {jdbc/src/main/java/org/postgis => postgis-jdbc/src/main/java/net/postgis/jdbc}/PGgeometryLW.java (94%) rename {jdbc/src/main/java/org/postgis => postgis-jdbc/src/main/java/net/postgis/jdbc}/Version.java (97%) rename {jdbc => postgis-jdbc}/src/main/javadoc/overview.html (100%) rename {jdbc/src/main/resources/org/postgis => postgis-jdbc/src/main/resources/net/postgis/jdbc}/version.properties (100%) create mode 100644 postgis-jdbc/src/main/resources/org/postgresql/driverconfig.properties rename {jdbc/src/test/java/org/postgis => postgis-jdbc/src/test/java/net/postgis/jdbc}/BoxesTest.java (97%) rename {jdbc/src/test/java/org/postgis => postgis-jdbc/src/test/java/net/postgis/jdbc}/DatatypesAutoRegistrationTest.java (98%) rename {jdbc/src/test/java/org/postgis => postgis-jdbc/src/test/java/net/postgis/jdbc}/DatatypesTest.java (98%) rename {jdbc/src/test/java/org/postgis => postgis-jdbc/src/test/java/net/postgis/jdbc}/EmptyGeometriesTest.java (96%) rename {jdbc/src/test/java/org/postgis => postgis-jdbc/src/test/java/net/postgis/jdbc}/GeographyDatatypeTest.java (99%) rename {jdbc/src/test/java/org/postgis => postgis-jdbc/src/test/java/net/postgis/jdbc}/ParserTest.java (97%) rename {jdbc/src/test/java/org/postgis => postgis-jdbc/src/test/java/net/postgis/jdbc}/SerializationTest.java (96%) rename {jdbc/src/test/java/org/postgis => postgis-jdbc/src/test/java/net/postgis/jdbc}/ServerTest.java (99%) rename {jdbc/src/test/java/org/postgis => postgis-jdbc/src/test/java/net/postgis/jdbc}/VersionPrinter.java (99%) rename {jdbc/src/test/java/org/postgis => postgis-jdbc/src/test/java/net/postgis/jdbc}/util/VersionUtilIT.java (99%) rename {jdbc => postgis-jdbc}/src/test/resources-filtered/testng-it.xml (58%) rename {jdbc => postgis-jdbc}/src/test/resources/logback-test.xml (92%) rename {jdbc => postgis-jdbc}/src/test/resources/testng.xml (64%) rename {jdbc => postgis-jdbc}/todo.txt (100%) rename tools/{osgeo-postgis-jdbc-test-util => smoketest}/.gitignore (100%) rename tools/{osgeo-postgis-jdbc-test-util => smoketest}/pom.xml (92%) rename jdbc/src/main/java/examples/TestAutoregister.java => tools/smoketest/src/main/java/net/postgis/jdbc/smoketest/Autoregister.java (97%) rename postgis-jdbc-java2d/src/main/java/examples/TestJava2d.java => tools/smoketest/src/main/java/net/postgis/jdbc/smoketest/Java2d.java (98%) rename tools/{osgeo-postgis-jdbc-test-util/src/main/java/net/postgis/osgeo/util/Main.java => smoketest/src/main/java/net/postgis/jdbc/smoketest/OSGeo.java} (93%) rename tools/{osgeo-postgis-jdbc-test-util => smoketest}/src/main/scripts/test.sh (84%) rename tools/{osgeo-postgis-jdbc-test-util/src/test/java/net/postgis/osgeo/util => smoketest/src/test/java/net/postgis/jdbc/smoketest}/UtilTest.java (90%) rename tools/{osgeo-postgis-jdbc-test-util => smoketest}/src/test/resources-filtered/testng-it.xml (91%) rename {jdbc_jtsparser => tools/smoketest}/src/test/resources/logback-test.xml (91%) diff --git a/.travis/install-zulu.sh b/.travis/install-zulu.sh index 04024c1..359cb67 100755 --- a/.travis/install-zulu.sh +++ b/.travis/install-zulu.sh @@ -3,19 +3,20 @@ set -euf AZUL_GPG_KEY=0xB1998361219BD9C9 -ZULU_VERSION=11 -ZULU_RELEASE=11.37+17 -JAVA_HOME=/usr/lib/jvm/zulu-11-amd64 +ZULU_VERSION=8 +ZULU_RELEASE=8.0.265-5 +JAVA_HOME=/usr/lib/jvm/zulu-8-amd64 -sudo apt-get update -sudo apt-get install -y gnupg2 locales -sudo locale-gen en_US.UTF-8 sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys ${AZUL_GPG_KEY} -echo "deb http://repos.azulsystems.com/ubuntu stable main" | sudo tee -a /etc/apt/sources.list.d/zulu.list +sudo apt-add-repository 'deb http://repos.azulsystems.com/ubuntu stable main' +sudo apt-get update +sudo apt-get install -y zulu-repo sudo apt-get update -sudo apt-get install -y zulu-${ZULU_VERSION}=${ZULU_RELEASE} -export ALTERNATIVES_JAVA=$(realpath /etc/alternatives/java) -export JAVA_HOME=${ALTERNATIVES_JAVA%/bin/java} +sudo apt-get install -y zulu${ZULU_VERSION}=${ZULU_RELEASE} +sudo sed -i.orig -e "s/^hl /jre /g" -e "s/^jdkhl /jdk /g" /usr/lib/jvm/.zulu8-ca-amd64.jinfo +sudo update-java-alternatives --set zulu8-ca-amd64 +export ALTERNATIVES_JAVAC=$(realpath /etc/alternatives/javac) +export JAVA_HOME=${ALTERNATIVES_JAVAC%/bin/javac} export PATH=$JAVA_HOME/bin:$PATH java -version diff --git a/jdbc/src/main/resources/org/postgresql/driverconfig.properties b/jdbc/src/main/resources/org/postgresql/driverconfig.properties deleted file mode 100644 index 62ee9e7..0000000 --- a/jdbc/src/main/resources/org/postgresql/driverconfig.properties +++ /dev/null @@ -1,9 +0,0 @@ -# -# This property file is included in the postgis jar and autoregisters the -# PostGIS datatypes within the jdbc driver. -# - -datatype.geometry=org.postgis.PGgeometry -datatype.geography=org.postgis.PGgeography -datatype.box3d=org.postgis.PGbox3d -datatype.box2d=org.postgis.PGbox2d diff --git a/pom.xml b/pom.xml index 43d1517..9d9ac7a 100644 --- a/pom.xml +++ b/pom.xml @@ -68,11 +68,11 @@ - tools - postgis-geometry - jdbc - jdbc_jtsparser + postgis-jdbc + postgis-jdbc-geometry postgis-jdbc-java2d + postgis-jdbc-jts + tools @@ -100,7 +100,7 @@ true UTF-8 UTF-8 - 1.8 + 8 3.6 false 1 diff --git a/postgis-geometry/pom.xml b/postgis-jdbc-geometry/pom.xml similarity index 84% rename from postgis-geometry/pom.xml rename to postgis-jdbc-geometry/pom.xml index f190e80..3701a2f 100644 --- a/postgis-geometry/pom.xml +++ b/postgis-jdbc-geometry/pom.xml @@ -43,6 +43,16 @@ + + maven-jar-plugin + + + + net.postgis.jdbc.geometry + + + + org.apache.maven.plugins maven-surefire-plugin diff --git a/postgis-jdbc-geometry/src/main/java/module-info.java.off b/postgis-jdbc-geometry/src/main/java/module-info.java.off new file mode 100644 index 0000000..fa996ef --- /dev/null +++ b/postgis-jdbc-geometry/src/main/java/module-info.java.off @@ -0,0 +1,9 @@ +module net.postgis.jdbc.geometry { + requires java.sql; + + requires org.slf4j; + + exports net.postgis.jdbc.geometry; + exports net.postgis.jdbc.geometry.binary; + exports net.postgis.jdbc.geometry.util; +} \ No newline at end of file diff --git a/postgis-geometry/src/main/java/org/postgis/ComposedGeom.java b/postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/ComposedGeom.java similarity index 99% rename from postgis-geometry/src/main/java/org/postgis/ComposedGeom.java rename to postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/ComposedGeom.java index 3b57faf..fb47824 100644 --- a/postgis-geometry/src/main/java/org/postgis/ComposedGeom.java +++ b/postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/ComposedGeom.java @@ -25,7 +25,7 @@ * */ -package org.postgis; +package net.postgis.jdbc.geometry; import java.sql.SQLException; import java.util.Iterator; diff --git a/postgis-geometry/src/main/java/org/postgis/Geometry.java b/postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/Geometry.java similarity index 99% rename from postgis-geometry/src/main/java/org/postgis/Geometry.java rename to postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/Geometry.java index bd4f1e3..275aff7 100644 --- a/postgis-geometry/src/main/java/org/postgis/Geometry.java +++ b/postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/Geometry.java @@ -25,7 +25,7 @@ * */ -package org.postgis; +package net.postgis.jdbc.geometry; import java.io.Serializable; diff --git a/postgis-geometry/src/main/java/org/postgis/GeometryBuilder.java b/postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/GeometryBuilder.java similarity index 96% rename from postgis-geometry/src/main/java/org/postgis/GeometryBuilder.java rename to postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/GeometryBuilder.java index 4b66b31..47b5ce8 100644 --- a/postgis-geometry/src/main/java/org/postgis/GeometryBuilder.java +++ b/postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/GeometryBuilder.java @@ -1,7 +1,7 @@ -package org.postgis; +package net.postgis.jdbc.geometry; -import org.postgis.binary.BinaryParser; +import net.postgis.jdbc.geometry.binary.BinaryParser; import java.sql.SQLException; @@ -93,7 +93,7 @@ public static Geometry geomFromString(String value, BinaryParser bp, boolean hav * Poor man's String.split() replacement, as String.split() was invented at * jdk1.4, and the Debian PostGIS Maintainer had problems building the woody * backport of his package using DFSG-free compilers. In all the cases we - * used split() in the org.postgis package, we only needed to split at the + * used split() in the net.postgis package, we only needed to split at the * first occurence, and thus this code could even be faster. * * @param whole the String to be split diff --git a/postgis-geometry/src/main/java/org/postgis/GeometryCollection.java b/postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/GeometryCollection.java similarity index 98% rename from postgis-geometry/src/main/java/org/postgis/GeometryCollection.java rename to postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/GeometryCollection.java index eacabce..0d54f14 100644 --- a/postgis-geometry/src/main/java/org/postgis/GeometryCollection.java +++ b/postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/GeometryCollection.java @@ -25,7 +25,7 @@ * */ -package org.postgis; +package net.postgis.jdbc.geometry; import java.sql.SQLException; diff --git a/postgis-geometry/src/main/java/org/postgis/GeometryTokenizer.java b/postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/GeometryTokenizer.java similarity index 98% rename from postgis-geometry/src/main/java/org/postgis/GeometryTokenizer.java rename to postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/GeometryTokenizer.java index 7831d4c..dcf84b4 100644 --- a/postgis-geometry/src/main/java/org/postgis/GeometryTokenizer.java +++ b/postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/GeometryTokenizer.java @@ -21,7 +21,7 @@ * */ -package org.postgis; +package net.postgis.jdbc.geometry; import java.util.ArrayList; diff --git a/postgis-geometry/src/main/java/org/postgis/LineString.java b/postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/LineString.java similarity index 98% rename from postgis-geometry/src/main/java/org/postgis/LineString.java rename to postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/LineString.java index 8d36369..3915d84 100644 --- a/postgis-geometry/src/main/java/org/postgis/LineString.java +++ b/postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/LineString.java @@ -25,7 +25,7 @@ * */ -package org.postgis; +package net.postgis.jdbc.geometry; import java.sql.SQLException; diff --git a/postgis-geometry/src/main/java/org/postgis/LinearRing.java b/postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/LinearRing.java similarity index 98% rename from postgis-geometry/src/main/java/org/postgis/LinearRing.java rename to postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/LinearRing.java index ce712ca..2f70b7c 100644 --- a/postgis-geometry/src/main/java/org/postgis/LinearRing.java +++ b/postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/LinearRing.java @@ -25,7 +25,7 @@ * */ -package org.postgis; +package net.postgis.jdbc.geometry; import java.sql.SQLException; import java.util.List; diff --git a/postgis-geometry/src/main/java/org/postgis/MultiLineString.java b/postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/MultiLineString.java similarity index 98% rename from postgis-geometry/src/main/java/org/postgis/MultiLineString.java rename to postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/MultiLineString.java index 0079aec..24ac917 100644 --- a/postgis-geometry/src/main/java/org/postgis/MultiLineString.java +++ b/postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/MultiLineString.java @@ -25,7 +25,7 @@ * */ -package org.postgis; +package net.postgis.jdbc.geometry; import java.sql.SQLException; diff --git a/postgis-geometry/src/main/java/org/postgis/MultiPoint.java b/postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/MultiPoint.java similarity index 97% rename from postgis-geometry/src/main/java/org/postgis/MultiPoint.java rename to postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/MultiPoint.java index 2c78f5c..5d0ce96 100644 --- a/postgis-geometry/src/main/java/org/postgis/MultiPoint.java +++ b/postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/MultiPoint.java @@ -25,7 +25,7 @@ * */ -package org.postgis; +package net.postgis.jdbc.geometry; import java.sql.SQLException; diff --git a/postgis-geometry/src/main/java/org/postgis/MultiPolygon.java b/postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/MultiPolygon.java similarity index 98% rename from postgis-geometry/src/main/java/org/postgis/MultiPolygon.java rename to postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/MultiPolygon.java index 5c4695c..8336f3c 100644 --- a/postgis-geometry/src/main/java/org/postgis/MultiPolygon.java +++ b/postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/MultiPolygon.java @@ -25,7 +25,7 @@ * */ -package org.postgis; +package net.postgis.jdbc.geometry; import java.sql.SQLException; diff --git a/postgis-geometry/src/main/java/org/postgis/Point.java b/postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/Point.java similarity index 99% rename from postgis-geometry/src/main/java/org/postgis/Point.java rename to postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/Point.java index bd6df1a..1b109af 100644 --- a/postgis-geometry/src/main/java/org/postgis/Point.java +++ b/postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/Point.java @@ -25,7 +25,7 @@ * */ -package org.postgis; +package net.postgis.jdbc.geometry; import java.sql.SQLException; import java.util.List; diff --git a/postgis-geometry/src/main/java/org/postgis/PointComposedGeom.java b/postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/PointComposedGeom.java similarity index 98% rename from postgis-geometry/src/main/java/org/postgis/PointComposedGeom.java rename to postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/PointComposedGeom.java index 6dcdc5f..d649367 100644 --- a/postgis-geometry/src/main/java/org/postgis/PointComposedGeom.java +++ b/postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/PointComposedGeom.java @@ -24,7 +24,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ -package org.postgis; +package net.postgis.jdbc.geometry; import java.sql.SQLException; diff --git a/postgis-geometry/src/main/java/org/postgis/Polygon.java b/postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/Polygon.java similarity index 98% rename from postgis-geometry/src/main/java/org/postgis/Polygon.java rename to postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/Polygon.java index 175c674..2353c4e 100644 --- a/postgis-geometry/src/main/java/org/postgis/Polygon.java +++ b/postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/Polygon.java @@ -25,7 +25,7 @@ * */ -package org.postgis; +package net.postgis.jdbc.geometry; import java.sql.SQLException; diff --git a/postgis-geometry/src/main/java/org/postgis/binary/BinaryParser.java b/postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/binary/BinaryParser.java similarity index 93% rename from postgis-geometry/src/main/java/org/postgis/binary/BinaryParser.java rename to postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/binary/BinaryParser.java index 6607931..fdc099b 100644 --- a/postgis-geometry/src/main/java/org/postgis/binary/BinaryParser.java +++ b/postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/binary/BinaryParser.java @@ -22,19 +22,19 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ -package org.postgis.binary; - -import org.postgis.Geometry; -import org.postgis.GeometryCollection; -import org.postgis.LineString; -import org.postgis.LinearRing; -import org.postgis.MultiLineString; -import org.postgis.MultiPoint; -import org.postgis.MultiPolygon; -import org.postgis.Point; -import org.postgis.Polygon; -import org.postgis.binary.ByteGetter.BinaryByteGetter; -import org.postgis.binary.ByteGetter.StringByteGetter; +package net.postgis.jdbc.geometry.binary; + +import net.postgis.jdbc.geometry.Geometry; +import net.postgis.jdbc.geometry.GeometryCollection; +import net.postgis.jdbc.geometry.LineString; +import net.postgis.jdbc.geometry.LinearRing; +import net.postgis.jdbc.geometry.MultiLineString; +import net.postgis.jdbc.geometry.MultiPoint; +import net.postgis.jdbc.geometry.MultiPolygon; +import net.postgis.jdbc.geometry.Point; +import net.postgis.jdbc.geometry.Polygon; +import net.postgis.jdbc.geometry.binary.ByteGetter.BinaryByteGetter; +import net.postgis.jdbc.geometry.binary.ByteGetter.StringByteGetter; /** diff --git a/postgis-geometry/src/main/java/org/postgis/binary/BinaryWriter.java b/postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/binary/BinaryWriter.java similarity index 96% rename from postgis-geometry/src/main/java/org/postgis/binary/BinaryWriter.java rename to postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/binary/BinaryWriter.java index dbc8a6d..d1322d9 100644 --- a/postgis-geometry/src/main/java/org/postgis/binary/BinaryWriter.java +++ b/postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/binary/BinaryWriter.java @@ -22,17 +22,17 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ -package org.postgis.binary; - -import org.postgis.Geometry; -import org.postgis.GeometryCollection; -import org.postgis.LineString; -import org.postgis.LinearRing; -import org.postgis.MultiLineString; -import org.postgis.MultiPoint; -import org.postgis.MultiPolygon; -import org.postgis.Point; -import org.postgis.Polygon; +package net.postgis.jdbc.geometry.binary; + +import net.postgis.jdbc.geometry.Geometry; +import net.postgis.jdbc.geometry.GeometryCollection; +import net.postgis.jdbc.geometry.LineString; +import net.postgis.jdbc.geometry.LinearRing; +import net.postgis.jdbc.geometry.MultiLineString; +import net.postgis.jdbc.geometry.MultiPoint; +import net.postgis.jdbc.geometry.MultiPolygon; +import net.postgis.jdbc.geometry.Point; +import net.postgis.jdbc.geometry.Polygon; /** diff --git a/postgis-geometry/src/main/java/org/postgis/binary/ByteGetter.java b/postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/binary/ByteGetter.java similarity index 98% rename from postgis-geometry/src/main/java/org/postgis/binary/ByteGetter.java rename to postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/binary/ByteGetter.java index 9b38c69..ef672ae 100644 --- a/postgis-geometry/src/main/java/org/postgis/binary/ByteGetter.java +++ b/postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/binary/ByteGetter.java @@ -23,7 +23,7 @@ * */ -package org.postgis.binary; +package net.postgis.jdbc.geometry.binary; public abstract class ByteGetter { /** diff --git a/postgis-geometry/src/main/java/org/postgis/binary/ByteSetter.java b/postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/binary/ByteSetter.java similarity index 98% rename from postgis-geometry/src/main/java/org/postgis/binary/ByteSetter.java rename to postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/binary/ByteSetter.java index 4522745..1e1ee10 100644 --- a/postgis-geometry/src/main/java/org/postgis/binary/ByteSetter.java +++ b/postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/binary/ByteSetter.java @@ -23,7 +23,7 @@ * */ -package org.postgis.binary; +package net.postgis.jdbc.geometry.binary; public abstract class ByteSetter { diff --git a/postgis-geometry/src/main/java/org/postgis/binary/ValueGetter.java b/postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/binary/ValueGetter.java similarity index 98% rename from postgis-geometry/src/main/java/org/postgis/binary/ValueGetter.java rename to postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/binary/ValueGetter.java index b1ed070..d295da7 100644 --- a/postgis-geometry/src/main/java/org/postgis/binary/ValueGetter.java +++ b/postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/binary/ValueGetter.java @@ -23,7 +23,7 @@ * */ -package org.postgis.binary; +package net.postgis.jdbc.geometry.binary; public abstract class ValueGetter { ByteGetter data; diff --git a/postgis-geometry/src/main/java/org/postgis/binary/ValueSetter.java b/postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/binary/ValueSetter.java similarity index 99% rename from postgis-geometry/src/main/java/org/postgis/binary/ValueSetter.java rename to postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/binary/ValueSetter.java index b53efc8..c92a941 100644 --- a/postgis-geometry/src/main/java/org/postgis/binary/ValueSetter.java +++ b/postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/binary/ValueSetter.java @@ -23,7 +23,7 @@ * */ -package org.postgis.binary; +package net.postgis.jdbc.geometry.binary; public abstract class ValueSetter { ByteSetter data; diff --git a/postgis-geometry/src/main/java/org/postgis/util/VersionFunctions.java b/postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/util/VersionFunctions.java similarity index 98% rename from postgis-geometry/src/main/java/org/postgis/util/VersionFunctions.java rename to postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/util/VersionFunctions.java index ff2a809..a469fe4 100644 --- a/postgis-geometry/src/main/java/org/postgis/util/VersionFunctions.java +++ b/postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/util/VersionFunctions.java @@ -16,7 +16,7 @@ * (C) 2020 Phillip Ross, phillip.w.g.ross@gmail.com */ -package org.postgis.util; +package net.postgis.jdbc.geometry.util; /** diff --git a/postgis-geometry/src/main/java/org/postgis/util/VersionUtil.java b/postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/util/VersionUtil.java similarity index 99% rename from postgis-geometry/src/main/java/org/postgis/util/VersionUtil.java rename to postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/util/VersionUtil.java index 5d484f0..289e21f 100644 --- a/postgis-geometry/src/main/java/org/postgis/util/VersionUtil.java +++ b/postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/util/VersionUtil.java @@ -16,7 +16,7 @@ * (C) 2020 Phillip Ross, phillip.w.g.ross@gmail.com */ -package org.postgis.util; +package net.postgis.jdbc.geometry.util; import org.slf4j.Logger; diff --git a/postgis-geometry/src/main/java/org/postgis/util/package-info.java b/postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/util/package-info.java similarity index 57% rename from postgis-geometry/src/main/java/org/postgis/util/package-info.java rename to postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/util/package-info.java index d6d385a..8660e7e 100644 --- a/postgis-geometry/src/main/java/org/postgis/util/package-info.java +++ b/postgis-jdbc-geometry/src/main/java/net/postgis/jdbc/geometry/util/package-info.java @@ -3,4 +3,4 @@ * * @author Phillip Ross */ -package org.postgis.util; +package net.postgis.jdbc.geometry.util; diff --git a/postgis-geometry/src/test/java/org/postgis/DatatypesTest.java b/postgis-jdbc-geometry/src/test/java/net/postgis/jdbc/geometry/DatatypesTest.java similarity index 98% rename from postgis-geometry/src/test/java/org/postgis/DatatypesTest.java rename to postgis-jdbc-geometry/src/test/java/net/postgis/jdbc/geometry/DatatypesTest.java index 912c6bf..859a446 100644 --- a/postgis-geometry/src/test/java/org/postgis/DatatypesTest.java +++ b/postgis-jdbc-geometry/src/test/java/net/postgis/jdbc/geometry/DatatypesTest.java @@ -25,7 +25,7 @@ * */ -package org.postgis; +package net.postgis.jdbc.geometry; import org.slf4j.Logger; diff --git a/postgis-geometry/src/test/java/org/postgis/TokenizerTest.java b/postgis-jdbc-geometry/src/test/java/net/postgis/jdbc/geometry/TokenizerTest.java similarity index 98% rename from postgis-geometry/src/test/java/org/postgis/TokenizerTest.java rename to postgis-jdbc-geometry/src/test/java/net/postgis/jdbc/geometry/TokenizerTest.java index 41c2f86..5badf02 100644 --- a/postgis-geometry/src/test/java/org/postgis/TokenizerTest.java +++ b/postgis-jdbc-geometry/src/test/java/net/postgis/jdbc/geometry/TokenizerTest.java @@ -21,7 +21,7 @@ * */ -package org.postgis; +package net.postgis.jdbc.geometry; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/postgis-geometry/src/test/resources/logback-test.xml b/postgis-jdbc-geometry/src/test/resources/logback-test.xml similarity index 91% rename from postgis-geometry/src/test/resources/logback-test.xml rename to postgis-jdbc-geometry/src/test/resources/logback-test.xml index 0390f76..7378bd0 100644 --- a/postgis-geometry/src/test/resources/logback-test.xml +++ b/postgis-jdbc-geometry/src/test/resources/logback-test.xml @@ -14,6 +14,4 @@ - - \ No newline at end of file diff --git a/postgis-geometry/src/test/resources/testng.xml b/postgis-jdbc-geometry/src/test/resources/testng.xml similarity index 61% rename from postgis-geometry/src/test/resources/testng.xml rename to postgis-jdbc-geometry/src/test/resources/testng.xml index 0169ee0..a5702fb 100644 --- a/postgis-geometry/src/test/resources/testng.xml +++ b/postgis-jdbc-geometry/src/test/resources/testng.xml @@ -3,8 +3,8 @@ - - + + diff --git a/postgis-jdbc-java2d/pom.xml b/postgis-jdbc-java2d/pom.xml index 52ca51f..5a7a3eb 100644 --- a/postgis-jdbc-java2d/pom.xml +++ b/postgis-jdbc-java2d/pom.xml @@ -31,6 +31,16 @@ + + maven-jar-plugin + + + + net.postgis.jdbc.java2d + + + + org.apache.maven.plugins maven-surefire-plugin diff --git a/postgis-jdbc-java2d/src/main/java/module-info.java.off b/postgis-jdbc-java2d/src/main/java/module-info.java.off new file mode 100644 index 0000000..cc1882c --- /dev/null +++ b/postgis-jdbc-java2d/src/main/java/module-info.java.off @@ -0,0 +1,11 @@ +module net.postgis.jdbc.java2d { + requires java.desktop; + requires java.sql; + + requires org.postgresql.jdbc; + + requires net.postgis.geometry; + requires net.postgis.jdbc; + + exports net.postgis.jdbc.java2d; +} \ No newline at end of file diff --git a/postgis-jdbc-java2d/src/main/java/org/postgis/java2d/Java2DWrapper.java b/postgis-jdbc-java2d/src/main/java/net/postgis/jdbc/java2d/Java2DWrapper.java similarity index 96% rename from postgis-jdbc-java2d/src/main/java/org/postgis/java2d/Java2DWrapper.java rename to postgis-jdbc-java2d/src/main/java/net/postgis/jdbc/java2d/Java2DWrapper.java index dc82b1e..e54fa77 100644 --- a/postgis-jdbc-java2d/src/main/java/org/postgis/java2d/Java2DWrapper.java +++ b/postgis-jdbc-java2d/src/main/java/net/postgis/jdbc/java2d/Java2DWrapper.java @@ -24,14 +24,13 @@ * */ -package org.postgis.java2d; +package net.postgis.jdbc.java2d; import org.postgresql.Driver; import org.postgresql.PGConnection; import java.sql.Connection; import java.sql.SQLException; -import java.sql.SQLFeatureNotSupportedException; import java.util.Properties; import java.util.logging.Logger; @@ -98,8 +97,8 @@ public java.sql.Connection connect(String url, Properties info) throws SQLExcept */ public static void addGISTypes(PGConnection pgconn) throws SQLException { pgconn.addDataType("geometry", PGShapeGeometry.class); - pgconn.addDataType("box3d", org.postgis.PGbox3d.class); - pgconn.addDataType("box2d", org.postgis.PGbox2d.class); + pgconn.addDataType("box3d", net.postgis.jdbc.PGbox3d.class); + pgconn.addDataType("box2d", net.postgis.jdbc.PGbox2d.class); } diff --git a/postgis-jdbc-java2d/src/main/java/org/postgis/java2d/PGShapeGeometry.java b/postgis-jdbc-java2d/src/main/java/net/postgis/jdbc/java2d/PGShapeGeometry.java similarity index 99% rename from postgis-jdbc-java2d/src/main/java/org/postgis/java2d/PGShapeGeometry.java rename to postgis-jdbc-java2d/src/main/java/net/postgis/jdbc/java2d/PGShapeGeometry.java index 153b9b3..cf08540 100644 --- a/postgis-jdbc-java2d/src/main/java/org/postgis/java2d/PGShapeGeometry.java +++ b/postgis-jdbc-java2d/src/main/java/net/postgis/jdbc/java2d/PGShapeGeometry.java @@ -23,7 +23,7 @@ * */ -package org.postgis.java2d; +package net.postgis.jdbc.java2d; import java.awt.Rectangle; import java.awt.Shape; diff --git a/postgis-jdbc-java2d/src/main/java/org/postgis/java2d/ShapeBinaryParser.java b/postgis-jdbc-java2d/src/main/java/net/postgis/jdbc/java2d/ShapeBinaryParser.java similarity index 90% rename from postgis-jdbc-java2d/src/main/java/org/postgis/java2d/ShapeBinaryParser.java rename to postgis-jdbc-java2d/src/main/java/net/postgis/jdbc/java2d/ShapeBinaryParser.java index 2200a4d..38d15e8 100644 --- a/postgis-jdbc-java2d/src/main/java/org/postgis/java2d/ShapeBinaryParser.java +++ b/postgis-jdbc-java2d/src/main/java/net/postgis/jdbc/java2d/ShapeBinaryParser.java @@ -1,7 +1,7 @@ /* * ShapeBinaryParser.java * - * Shape Binary Parser for Java2D - relies on org.postgis V1.0.0+ package. + * Shape Binary Parser for Java2D - relies on net.postgis V1.0.0+ package. * * (C) 2005 Markus Schaber, markus.schaber@logix-tt.com * @@ -22,15 +22,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ -package org.postgis.java2d; +package net.postgis.jdbc.java2d; import java.awt.geom.GeneralPath; -import org.postgis.Geometry; -import org.postgis.binary.ByteGetter; -import org.postgis.binary.ValueGetter; -import org.postgis.binary.ByteGetter.BinaryByteGetter; -import org.postgis.binary.ByteGetter.StringByteGetter; +import net.postgis.jdbc.geometry.Geometry; +import net.postgis.jdbc.geometry.binary.ByteGetter; +import net.postgis.jdbc.geometry.binary.ValueGetter; +import net.postgis.jdbc.geometry.binary.ByteGetter.BinaryByteGetter; +import net.postgis.jdbc.geometry.binary.ByteGetter.StringByteGetter; /** * Parse binary representation of geometries. Currently, only text rep (hexed) @@ -126,25 +126,25 @@ protected int parseGeometry(ValueGetter data, GeneralPath path) { } switch (realtype) { - case org.postgis.Geometry.POINT : + case net.postgis.jdbc.geometry.Geometry.POINT : parsePoint(data, haveZ, haveM, path); break; - case org.postgis.Geometry.LINESTRING : + case net.postgis.jdbc.geometry.Geometry.LINESTRING : parseLineString(data, haveZ, haveM, path); break; - case org.postgis.Geometry.POLYGON : + case net.postgis.jdbc.geometry.Geometry.POLYGON : parsePolygon(data, haveZ, haveM, path); break; - case org.postgis.Geometry.MULTIPOINT : + case net.postgis.jdbc.geometry.Geometry.MULTIPOINT : parseMultiPoint(data, path); break; - case org.postgis.Geometry.MULTILINESTRING : + case net.postgis.jdbc.geometry.Geometry.MULTILINESTRING : parseMultiLineString(data, path); break; - case org.postgis.Geometry.MULTIPOLYGON : + case net.postgis.jdbc.geometry.Geometry.MULTIPOLYGON : parseMultiPolygon(data, path); break; - case org.postgis.Geometry.GEOMETRYCOLLECTION : + case net.postgis.jdbc.geometry.Geometry.GEOMETRYCOLLECTION : parseCollection(data, path); break; default : diff --git a/postgis-jdbc-java2d/src/test/java/org/postgis/java2d/SimpleJava2DWrapperTest.java b/postgis-jdbc-java2d/src/test/java/net/postgis/jdbc/java2d/SimpleJava2DWrapperTest.java similarity index 88% rename from postgis-jdbc-java2d/src/test/java/org/postgis/java2d/SimpleJava2DWrapperTest.java rename to postgis-jdbc-java2d/src/test/java/net/postgis/jdbc/java2d/SimpleJava2DWrapperTest.java index 835296b..c9b5681 100644 --- a/postgis-jdbc-java2d/src/test/java/org/postgis/java2d/SimpleJava2DWrapperTest.java +++ b/postgis-jdbc-java2d/src/test/java/net/postgis/jdbc/java2d/SimpleJava2DWrapperTest.java @@ -1,7 +1,7 @@ /* * SimpleJava2DWrapperTest.java * - * SimpleJava2DWrapperTest for Java2D - relies on org.postgis V1.0.0+ package. + * SimpleJava2DWrapperTest for Java2D - relies on net.postgis V1.0.0+ package. * * (C) 2015 Phillip Ross, phillip.w.g.ross@gmail.com * @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ -package org.postgis.java2d; +package net.postgis.jdbc.java2d; import org.slf4j.Logger; @@ -38,7 +38,7 @@ public class SimpleJava2DWrapperTest { private static final Logger logger = LoggerFactory.getLogger(SimpleJava2DWrapperTest.class); - private static final String JAVA2D_WRAPPER_CLASS_NAME = "org.postgis.java2d.Java2DWrapper"; + private static final String JAVA2D_WRAPPER_CLASS_NAME = "net.postgis.jdbc.java2d.Java2DWrapper"; @Test diff --git a/postgis-jdbc-java2d/src/test/resources/logback-test.xml b/postgis-jdbc-java2d/src/test/resources/logback-test.xml index 71d8c1b..6b63bc7 100644 --- a/postgis-jdbc-java2d/src/test/resources/logback-test.xml +++ b/postgis-jdbc-java2d/src/test/resources/logback-test.xml @@ -10,6 +10,6 @@ - + \ No newline at end of file diff --git a/postgis-jdbc-java2d/src/test/resources/testng.xml b/postgis-jdbc-java2d/src/test/resources/testng.xml index 046bfa1..ce65126 100644 --- a/postgis-jdbc-java2d/src/test/resources/testng.xml +++ b/postgis-jdbc-java2d/src/test/resources/testng.xml @@ -3,7 +3,7 @@ - + diff --git a/jdbc_jtsparser/pom.xml b/postgis-jdbc-jts/pom.xml similarity index 87% rename from jdbc_jtsparser/pom.xml rename to postgis-jdbc-jts/pom.xml index a17f04a..fc60a8f 100644 --- a/jdbc_jtsparser/pom.xml +++ b/postgis-jdbc-jts/pom.xml @@ -8,7 +8,7 @@ 2.5.1-SNAPSHOT - postgis-jdbc-jtsparser + postgis-jdbc-jts 2.5.1-SNAPSHOT jar @@ -52,6 +52,16 @@ + + maven-jar-plugin + + + + net.postgis.jdbc.jts + + + + org.apache.maven.plugins maven-failsafe-plugin diff --git a/postgis-jdbc-jts/src/main/java/module-info.java.off b/postgis-jdbc-jts/src/main/java/module-info.java.off new file mode 100644 index 0000000..a850542 --- /dev/null +++ b/postgis-jdbc-jts/src/main/java/module-info.java.off @@ -0,0 +1,14 @@ +module net.postgis.jdbc.jts { + requires java.desktop; + requires java.sql; + + requires org.locationtech.jts; + requires org.postgresql.jdbc; + + requires spatial4j; + + requires net.postgis.geometry; + requires net.postgis.jdbc; + + exports net.postgis.jdbc.jts; +} \ No newline at end of file diff --git a/jdbc_jtsparser/src/main/java/org/postgis/jts/JTSShape.java b/postgis-jdbc-jts/src/main/java/net/postgis/jdbc/jts/JTSShape.java similarity index 99% rename from jdbc_jtsparser/src/main/java/org/postgis/jts/JTSShape.java rename to postgis-jdbc-jts/src/main/java/net/postgis/jdbc/jts/JTSShape.java index e508a73..9a8a878 100644 --- a/jdbc_jtsparser/src/main/java/org/postgis/jts/JTSShape.java +++ b/postgis-jdbc-jts/src/main/java/net/postgis/jdbc/jts/JTSShape.java @@ -1,7 +1,7 @@ /* * JTSShape.java * - * Binary Parser for JTS - relies on org.postgis V1.0.0+ package. + * Binary Parser for JTS - relies on net.postgis V1.0.0+ package. * * (C) 2005 Markus Schaber, markus.schaber@logix-tt.com * @@ -23,7 +23,7 @@ * */ -package org.postgis.jts; +package net.postgis.jdbc.jts; import org.locationtech.jts.geom.*; import org.locationtech.jts.geom.Point; diff --git a/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsBinaryParser.java b/postgis-jdbc-jts/src/main/java/net/postgis/jdbc/jts/JtsBinaryParser.java similarity index 90% rename from jdbc_jtsparser/src/main/java/org/postgis/jts/JtsBinaryParser.java rename to postgis-jdbc-jts/src/main/java/net/postgis/jdbc/jts/JtsBinaryParser.java index 86b6779..7f90bfd 100644 --- a/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsBinaryParser.java +++ b/postgis-jdbc-jts/src/main/java/net/postgis/jdbc/jts/JtsBinaryParser.java @@ -1,7 +1,7 @@ /* * JtsBinaryParser.java * - * Binary Parser for JTS - relies on org.postgis V1.0.0+ package. + * Binary Parser for JTS - relies on net.postgis V1.0.0+ package. * * (C) 2005 Markus Schaber, markus.schaber@logix-tt.com * @@ -22,15 +22,15 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ -package org.postgis.jts; +package net.postgis.jdbc.jts; import org.locationtech.jts.geom.*; import org.locationtech.jts.geom.impl.PackedCoordinateSequence; import org.locationtech.spatial4j.context.jts.JtsSpatialContextFactory; -import org.postgis.binary.ByteGetter; -import org.postgis.binary.ByteGetter.BinaryByteGetter; -import org.postgis.binary.ByteGetter.StringByteGetter; -import org.postgis.binary.ValueGetter; +import net.postgis.jdbc.geometry.binary.ByteGetter; +import net.postgis.jdbc.geometry.binary.ByteGetter.BinaryByteGetter; +import net.postgis.jdbc.geometry.binary.ByteGetter.StringByteGetter; +import net.postgis.jdbc.geometry.binary.ValueGetter; /** * Parse binary representation of geometries. Currently, only text rep (hexed) @@ -123,37 +123,37 @@ protected Geometry parseGeometry(ValueGetter data, int srid, boolean inheritSrid boolean haveS = (typeword & 0x20000000) != 0; if (haveS) { - int newsrid = org.postgis.Geometry.parseSRID(data.getInt()); + int newsrid = net.postgis.jdbc.geometry.Geometry.parseSRID(data.getInt()); if (inheritSrid && newsrid != srid) { throw new IllegalArgumentException("Inconsistent srids in complex geometry: " + srid + ", " + newsrid); } else { srid = newsrid; } } else if (!inheritSrid) { - srid = org.postgis.Geometry.UNKNOWN_SRID; + srid = net.postgis.jdbc.geometry.Geometry.UNKNOWN_SRID; } Geometry result; switch (realtype) { - case org.postgis.Geometry.POINT: + case net.postgis.jdbc.geometry.Geometry.POINT: result = parsePoint(data, haveZ, haveM); break; - case org.postgis.Geometry.LINESTRING: + case net.postgis.jdbc.geometry.Geometry.LINESTRING: result = parseLineString(data, haveZ, haveM); break; - case org.postgis.Geometry.POLYGON: + case net.postgis.jdbc.geometry.Geometry.POLYGON: result = parsePolygon(data, haveZ, haveM, srid); break; - case org.postgis.Geometry.MULTIPOINT: + case net.postgis.jdbc.geometry.Geometry.MULTIPOINT: result = parseMultiPoint(data, srid); break; - case org.postgis.Geometry.MULTILINESTRING: + case net.postgis.jdbc.geometry.Geometry.MULTILINESTRING: result = parseMultiLineString(data, srid); break; - case org.postgis.Geometry.MULTIPOLYGON: + case net.postgis.jdbc.geometry.Geometry.MULTIPOLYGON: result = parseMultiPolygon(data, srid); break; - case org.postgis.Geometry.GEOMETRYCOLLECTION: + case net.postgis.jdbc.geometry.Geometry.GEOMETRYCOLLECTION: result = parseCollection(data, srid); break; default: diff --git a/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsBinaryWriter.java b/postgis-jdbc-jts/src/main/java/net/postgis/jdbc/jts/JtsBinaryWriter.java similarity index 89% rename from jdbc_jtsparser/src/main/java/org/postgis/jts/JtsBinaryWriter.java rename to postgis-jdbc-jts/src/main/java/net/postgis/jdbc/jts/JtsBinaryWriter.java index 94f0375..765506f 100644 --- a/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsBinaryWriter.java +++ b/postgis-jdbc-jts/src/main/java/net/postgis/jdbc/jts/JtsBinaryWriter.java @@ -22,7 +22,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA * */ -package org.postgis.jts; +package net.postgis.jdbc.jts; import org.locationtech.jts.geom.CoordinateSequence; import org.locationtech.jts.geom.Geometry; @@ -34,8 +34,8 @@ import org.locationtech.jts.geom.Point; import org.locationtech.jts.geom.Polygon; -import org.postgis.binary.ByteSetter; -import org.postgis.binary.ValueSetter; +import net.postgis.jdbc.geometry.binary.ByteSetter; +import net.postgis.jdbc.geometry.binary.ValueSetter; /** * Create binary representation of geometries. Currently, only text rep (hexed) @@ -157,25 +157,25 @@ protected void writeGeometry(Geometry geom, ValueSetter dest) { } switch (plaintype) { - case org.postgis.Geometry.POINT: + case net.postgis.jdbc.geometry.Geometry.POINT: writePoint((Point) geom, dest); break; - case org.postgis.Geometry.LINESTRING: + case net.postgis.jdbc.geometry.Geometry.LINESTRING: writeLineString((LineString) geom, dest); break; - case org.postgis.Geometry.POLYGON: + case net.postgis.jdbc.geometry.Geometry.POLYGON: writePolygon((Polygon) geom, dest); break; - case org.postgis.Geometry.MULTIPOINT: + case net.postgis.jdbc.geometry.Geometry.MULTIPOINT: writeMultiPoint((MultiPoint) geom, dest); break; - case org.postgis.Geometry.MULTILINESTRING: + case net.postgis.jdbc.geometry.Geometry.MULTILINESTRING: writeMultiLineString((MultiLineString) geom, dest); break; - case org.postgis.Geometry.MULTIPOLYGON: + case net.postgis.jdbc.geometry.Geometry.MULTIPOLYGON: writeMultiPolygon((MultiPolygon) geom, dest); break; - case org.postgis.Geometry.GEOMETRYCOLLECTION: + case net.postgis.jdbc.geometry.Geometry.GEOMETRYCOLLECTION: writeCollection((GeometryCollection) geom, dest); break; default: @@ -187,21 +187,21 @@ public static int getWKBType(Geometry geom) { // We always write empty geometries as empty collections - for OpenGIS // conformance if (geom.isEmpty()) { - return org.postgis.Geometry.GEOMETRYCOLLECTION; + return net.postgis.jdbc.geometry.Geometry.GEOMETRYCOLLECTION; } else if (geom instanceof Point) { - return org.postgis.Geometry.POINT; + return net.postgis.jdbc.geometry.Geometry.POINT; } else if (geom instanceof org.locationtech.jts.geom.LineString) { - return org.postgis.Geometry.LINESTRING; + return net.postgis.jdbc.geometry.Geometry.LINESTRING; } else if (geom instanceof org.locationtech.jts.geom.Polygon) { - return org.postgis.Geometry.POLYGON; + return net.postgis.jdbc.geometry.Geometry.POLYGON; } else if (geom instanceof MultiPoint) { - return org.postgis.Geometry.MULTIPOINT; + return net.postgis.jdbc.geometry.Geometry.MULTIPOINT; } else if (geom instanceof MultiLineString) { - return org.postgis.Geometry.MULTILINESTRING; + return net.postgis.jdbc.geometry.Geometry.MULTILINESTRING; } else if (geom instanceof org.locationtech.jts.geom.MultiPolygon) { - return org.postgis.Geometry.MULTIPOLYGON; + return net.postgis.jdbc.geometry.Geometry.MULTIPOLYGON; } if (geom instanceof org.locationtech.jts.geom.GeometryCollection) { - return org.postgis.Geometry.GEOMETRYCOLLECTION; + return net.postgis.jdbc.geometry.Geometry.GEOMETRYCOLLECTION; } else { throw new IllegalArgumentException("Unknown Geometry Type: " + geom.getClass().getName()); } @@ -286,25 +286,25 @@ protected int estimateBytes(Geometry geom) { } switch (getWKBType(geom)) { - case org.postgis.Geometry.POINT: + case net.postgis.jdbc.geometry.Geometry.POINT: result += estimatePoint((Point) geom); break; - case org.postgis.Geometry.LINESTRING: + case net.postgis.jdbc.geometry.Geometry.LINESTRING: result += estimateLineString((LineString) geom); break; - case org.postgis.Geometry.POLYGON: + case net.postgis.jdbc.geometry.Geometry.POLYGON: result += estimatePolygon((Polygon) geom); break; - case org.postgis.Geometry.MULTIPOINT: + case net.postgis.jdbc.geometry.Geometry.MULTIPOINT: result += estimateMultiPoint((MultiPoint) geom); break; - case org.postgis.Geometry.MULTILINESTRING: + case net.postgis.jdbc.geometry.Geometry.MULTILINESTRING: result += estimateMultiLineString((MultiLineString) geom); break; - case org.postgis.Geometry.MULTIPOLYGON: + case net.postgis.jdbc.geometry.Geometry.MULTIPOLYGON: result += estimateMultiPolygon((MultiPolygon) geom); break; - case org.postgis.Geometry.GEOMETRYCOLLECTION: + case net.postgis.jdbc.geometry.Geometry.GEOMETRYCOLLECTION: result += estimateCollection((GeometryCollection) geom); break; default: diff --git a/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsGeometry.java b/postgis-jdbc-jts/src/main/java/net/postgis/jdbc/jts/JtsGeometry.java similarity index 99% rename from jdbc_jtsparser/src/main/java/org/postgis/jts/JtsGeometry.java rename to postgis-jdbc-jts/src/main/java/net/postgis/jdbc/jts/JtsGeometry.java index 9004bbb..701ddbb 100644 --- a/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsGeometry.java +++ b/postgis-jdbc-jts/src/main/java/net/postgis/jdbc/jts/JtsGeometry.java @@ -24,7 +24,7 @@ * */ -package org.postgis.jts; +package net.postgis.jdbc.jts; import java.sql.SQLException; diff --git a/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsGisWrapper.java b/postgis-jdbc-jts/src/main/java/net/postgis/jdbc/jts/JtsGisWrapper.java similarity index 95% rename from jdbc_jtsparser/src/main/java/org/postgis/jts/JtsGisWrapper.java rename to postgis-jdbc-jts/src/main/java/net/postgis/jdbc/jts/JtsGisWrapper.java index a766203..5c87b58 100644 --- a/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsGisWrapper.java +++ b/postgis-jdbc-jts/src/main/java/net/postgis/jdbc/jts/JtsGisWrapper.java @@ -24,7 +24,7 @@ * */ -package org.postgis.jts; +package net.postgis.jdbc.jts; import org.postgresql.Driver; import org.postgresql.PGConnection; @@ -91,9 +91,9 @@ public java.sql.Connection connect(String url, Properties info) throws SQLExcept * @throws SQLException when an SQLException occurs */ public static void addGISTypes(PGConnection pgconn) throws SQLException { - pgconn.addDataType("geometry", org.postgis.jts.JtsGeometry.class); - pgconn.addDataType("box3d", org.postgis.PGbox3d.class); - pgconn.addDataType("box2d", org.postgis.PGbox2d.class); + pgconn.addDataType("geometry", net.postgis.jdbc.jts.JtsGeometry.class); + pgconn.addDataType("box3d", net.postgis.jdbc.PGbox3d.class); + pgconn.addDataType("box2d", net.postgis.jdbc.PGbox2d.class); } /** diff --git a/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsWrapper.java b/postgis-jdbc-jts/src/main/java/net/postgis/jdbc/jts/JtsWrapper.java similarity index 94% rename from jdbc_jtsparser/src/main/java/org/postgis/jts/JtsWrapper.java rename to postgis-jdbc-jts/src/main/java/net/postgis/jdbc/jts/JtsWrapper.java index 9bc41f3..b0ca24a 100644 --- a/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsWrapper.java +++ b/postgis-jdbc-jts/src/main/java/net/postgis/jdbc/jts/JtsWrapper.java @@ -24,7 +24,7 @@ * */ -package org.postgis.jts; +package net.postgis.jdbc.jts; import java.sql.Connection; import java.sql.SQLException; @@ -51,14 +51,14 @@ * implementation, set the driver class property in the datasource config, the * following works for jboss: * - * <driver-class>org.postgis.jts.PostGisWrapper</driver-class> + * <driver-class>net.postgis.jdbc.jts.PostGisWrapper</driver-class> * * @author markus.schaber@logix-tt.com * */ public class JtsWrapper extends Driver { - protected static final Logger logger = Logger.getLogger("org.postgis.DriverWrapper"); + protected static final Logger logger = Logger.getLogger("net.postgis.jdbc.DriverWrapper"); private static final String POSTGRES_PROTOCOL = "jdbc:postgresql:"; private static final String POSTGIS_PROTOCOL = "jdbc:postgres_jts:"; @@ -102,7 +102,7 @@ public java.sql.Connection connect(String url, Properties info) throws SQLExcept * @throws SQLException when an SQLException occurs */ public static void addGISTypes(PGConnection pgconn) throws SQLException { - pgconn.addDataType("geometry", org.postgis.jts.JtsGeometry.class); + pgconn.addDataType("geometry", net.postgis.jdbc.jts.JtsGeometry.class); } /** diff --git a/jdbc_jtsparser/src/main/javadoc/overview.html b/postgis-jdbc-jts/src/main/javadoc/overview.html similarity index 100% rename from jdbc_jtsparser/src/main/javadoc/overview.html rename to postgis-jdbc-jts/src/main/javadoc/overview.html diff --git a/jdbc_jtsparser/src/test/java/org/postgis/jts/JtsParserTest.java b/postgis-jdbc-jts/src/test/java/net/postgis/jdbc/jts/JtsParserTest.java similarity index 98% rename from jdbc_jtsparser/src/test/java/org/postgis/jts/JtsParserTest.java rename to postgis-jdbc-jts/src/test/java/net/postgis/jdbc/jts/JtsParserTest.java index 9452b65..dda4841 100644 --- a/jdbc_jtsparser/src/test/java/org/postgis/jts/JtsParserTest.java +++ b/postgis-jdbc-jts/src/test/java/net/postgis/jdbc/jts/JtsParserTest.java @@ -1,7 +1,7 @@ /* * JtsParserTest.java * - * JtsParserTest for JTS - relies on org.postgis V1.0.0+ package. + * JtsParserTest for JTS - relies on net.postgis V1.0.0+ package. * * (C) 2015 Phillip Ross, phillip.w.g.ross@gmail.com * @@ -21,10 +21,10 @@ * */ -package org.postgis.jts; +package net.postgis.jdbc.jts; -import org.postgis.binary.ValueSetter; +import net.postgis.jdbc.geometry.binary.ValueSetter; import org.locationtech.jts.geom.*; import net.postgis.tools.testutils.TestContainerController; @@ -51,7 +51,7 @@ public class JtsParserTest { private static final Logger logger = LoggerFactory.getLogger(JtsParserTest.class); - private static final String JTS_WRAPPER_CLASS_NAME = "org.postgis.jts.JtsWrapper"; + private static final String JTS_WRAPPER_CLASS_NAME = "net.postgis.jdbc.jts.JtsWrapper"; /** The srid we use for the srid tests */ public static final int SRID = 4326; diff --git a/jdbc_jtsparser/src/test/resources-filtered/testng-it.xml b/postgis-jdbc-jts/src/test/resources-filtered/testng-it.xml similarity index 91% rename from jdbc_jtsparser/src/test/resources-filtered/testng-it.xml rename to postgis-jdbc-jts/src/test/resources-filtered/testng-it.xml index 7a9b3e0..168106f 100644 --- a/jdbc_jtsparser/src/test/resources-filtered/testng-it.xml +++ b/postgis-jdbc-jts/src/test/resources-filtered/testng-it.xml @@ -10,7 +10,7 @@ - + diff --git a/tools/osgeo-postgis-jdbc-test-util/src/test/resources/logback-test.xml b/postgis-jdbc-jts/src/test/resources/logback-test.xml similarity index 90% rename from tools/osgeo-postgis-jdbc-test-util/src/test/resources/logback-test.xml rename to postgis-jdbc-jts/src/test/resources/logback-test.xml index 2c18f5f..78243fe 100644 --- a/tools/osgeo-postgis-jdbc-test-util/src/test/resources/logback-test.xml +++ b/postgis-jdbc-jts/src/test/resources/logback-test.xml @@ -14,6 +14,6 @@ - + \ No newline at end of file diff --git a/jdbc/COPYING_LGPL b/postgis-jdbc/COPYING_LGPL similarity index 100% rename from jdbc/COPYING_LGPL rename to postgis-jdbc/COPYING_LGPL diff --git a/jdbc/README b/postgis-jdbc/README similarity index 95% rename from jdbc/README rename to postgis-jdbc/README index 897cc9d..38fea3a 100644 --- a/jdbc/README +++ b/postgis-jdbc/README @@ -121,7 +121,7 @@ There are three ways to do this: extension for the PostGIS data types (geometry, box2d, box3d) within the pgjdbc driver. -- You can use the org.postgis.DriverWrapper as replacement for the +- You can use the net.postgis.jdbc.DriverWrapper as replacement for the jdbc driver. This class wraps the PostGreSQL Driver to transparently add the PostGIS Object Classes. This method currently works both with J2EE DataSources, and with the older DriverManager @@ -132,21 +132,21 @@ There are three ways to do this: "jdbc:postgresql_postGIS" in the jdbc URL, and make your environment aware of the new Driver class. - DriverManager users simply register org/postgis/DriverWrapper + DriverManager users simply register net/postgis/DriverWrapper instead of (or in addition to) org.postgresql.Driver, see examples/TestBoxes.connect() for an working code. DataSource users similarly have to configure their datasource to use the different class. The following works for jboss, put it in - your-ds.xml: org.postgis.DriverWrapper + your-ds.xml: net.postgis.jdbc.DriverWrapper - Of course, you can also manually register the Datatypes on your pgjdbc connection. You have to cast your connection to PGConnection and then call: - pgconn.addDataType("geometry", "org.postgis.PGgeometry"); - pgconn.addDataType("box3d", "org.postgis.PGbox3d"); - pgconn.addDataType("box2d", "org.postgis.PGbox2d"); + pgconn.addDataType("geometry", "net.postgis.jdbc.PGgeometry"); + pgconn.addDataType("box3d", "net.postgis.jdbc.PGbox3d"); + pgconn.addDataType("box2d", "net.postgis.jdbc.PGbox2d"); You may need to dig through some wrappers when running in an appserver. E. G. for JBoss, The datasource actually gives you a diff --git a/jdbc/pom.xml b/postgis-jdbc/pom.xml similarity index 90% rename from jdbc/pom.xml rename to postgis-jdbc/pom.xml index 279f42b..a0dd0a0 100644 --- a/jdbc/pom.xml +++ b/postgis-jdbc/pom.xml @@ -53,6 +53,16 @@ + + maven-jar-plugin + + + + net.postgis.jdbc + + + + org.apache.maven.plugins maven-failsafe-plugin diff --git a/postgis-jdbc/src/main/java/module-info.java.off b/postgis-jdbc/src/main/java/module-info.java.off new file mode 100644 index 0000000..3520883 --- /dev/null +++ b/postgis-jdbc/src/main/java/module-info.java.off @@ -0,0 +1,9 @@ +module net.postgis.jdbc { + requires java.sql; + + requires org.postgresql.jdbc; + + requires net.postgis.geometry; + + exports net.postgis.jdbc; +} \ No newline at end of file diff --git a/jdbc/src/main/java/org/postgis/DriverWrapper.java b/postgis-jdbc/src/main/java/net/postgis/jdbc/DriverWrapper.java similarity index 81% rename from jdbc/src/main/java/org/postgis/DriverWrapper.java rename to postgis-jdbc/src/main/java/net/postgis/jdbc/DriverWrapper.java index 2a04f65..01bb858 100644 --- a/jdbc/src/main/java/org/postgis/DriverWrapper.java +++ b/postgis-jdbc/src/main/java/net/postgis/jdbc/DriverWrapper.java @@ -18,7 +18,7 @@ * (C) 2015 Phillip Ross, phillip.w.g.ross@gmail.com */ -package org.postgis; +package net.postgis.jdbc; import java.sql.Connection; @@ -50,7 +50,7 @@ * following works for jboss: * * - * <driver-class>org.postgis.DriverWrapper</driver-class> + * <driver-class>net.postgis.jdbc.DriverWrapper</driver-class> * * If you don't like or want to use the DriverWrapper, you have two * alternatives, see the README file. @@ -70,7 +70,7 @@ public class DriverWrapper extends Driver { /** The static logger instance. */ - protected static final Logger logger = Logger.getLogger("org.postgis.DriverWrapper"); + protected static final Logger logger = Logger.getLogger("net.postgis.jdbc.DriverWrapper"); public static final String POSTGRES_PROTOCOL = "jdbc:postgresql:"; public static final String POSTGIS_PROTOCOL = "jdbc:postgresql_postGIS:"; @@ -134,7 +134,7 @@ protected static TypesAdder getTypesAdder(final Driver d) throws SQLException { private static TypesAdder loadTypesAdder(final String version) throws SQLException { try { - Class klass = Class.forName("org.postgis.DriverWrapper$TypesAdder" + version); + Class klass = Class.forName("net.postgis.jdbc.DriverWrapper$TypesAdder" + version); return (TypesAdder) klass.newInstance(); } catch (Exception e) { throw new SQLException("Cannot create TypesAdder instance! " + e.getMessage()); @@ -298,29 +298,29 @@ protected static final class TypesAdder74 extends TypesAdder { @Override public void addGeometries(final Connection conn) throws SQLException { PGConnection pgconn = (PGConnection) conn; - pgconn.addDataType("geometry", org.postgis.PGgeometry.class); - pgconn.addDataType("public.geometry", org.postgis.PGgeometry.class); - pgconn.addDataType("\"public\".\"geometry\"", org.postgis.PGgeometry.class); + pgconn.addDataType("geometry", net.postgis.jdbc.PGgeometry.class); + pgconn.addDataType("public.geometry", net.postgis.jdbc.PGgeometry.class); + pgconn.addDataType("\"public\".\"geometry\"", net.postgis.jdbc.PGgeometry.class); - pgconn.addDataType("geography", org.postgis.PGgeography.class); - pgconn.addDataType("public.geography", org.postgis.PGgeography.class); - pgconn.addDataType("\"public\".\"geography\"", org.postgis.PGgeography.class); + pgconn.addDataType("geography", net.postgis.jdbc.PGgeography.class); + pgconn.addDataType("public.geography", net.postgis.jdbc.PGgeography.class); + pgconn.addDataType("\"public\".\"geography\"", net.postgis.jdbc.PGgeography.class); } /** {@inheritDoc} */ @Override public void addBoxen(final Connection conn) throws SQLException { PGConnection pgconn = (PGConnection) conn; - pgconn.addDataType("box3d", org.postgis.PGbox3d.class); - pgconn.addDataType("box2d", org.postgis.PGbox2d.class); + pgconn.addDataType("box3d", net.postgis.jdbc.PGbox3d.class); + pgconn.addDataType("box2d", net.postgis.jdbc.PGbox2d.class); } /** {@inheritDoc} */ @Override public void addBinaryGeometries(final Connection conn) throws SQLException { PGConnection pgconn = (PGConnection) conn; - pgconn.addDataType("geometry", org.postgis.PGgeometryLW.class); - pgconn.addDataType("geography", org.postgis.PGgeographyLW.class); + pgconn.addDataType("geometry", net.postgis.jdbc.PGgeometryLW.class); + pgconn.addDataType("geography", net.postgis.jdbc.PGgeographyLW.class); } } @@ -332,29 +332,29 @@ protected static class TypesAdder72 extends TypesAdder { @Override public void addGeometries(final Connection conn) throws SQLException { org.postgresql.PGConnection pgconn = (org.postgresql.PGConnection) conn; - pgconn.addDataType("geometry", org.postgis.PGgeometry.class); - pgconn.addDataType("public.geometry", org.postgis.PGgeometry.class); - pgconn.addDataType("\"public\".\"geometry\"", org.postgis.PGgeometry.class); + pgconn.addDataType("geometry", net.postgis.jdbc.PGgeometry.class); + pgconn.addDataType("public.geometry", net.postgis.jdbc.PGgeometry.class); + pgconn.addDataType("\"public\".\"geometry\"", net.postgis.jdbc.PGgeometry.class); - pgconn.addDataType("geography", org.postgis.PGgeography.class); - pgconn.addDataType("public.geography", org.postgis.PGgeography.class); - pgconn.addDataType("\"public\".\"geography\"", org.postgis.PGgeography.class); + pgconn.addDataType("geography", net.postgis.jdbc.PGgeography.class); + pgconn.addDataType("public.geography", net.postgis.jdbc.PGgeography.class); + pgconn.addDataType("\"public\".\"geography\"", net.postgis.jdbc.PGgeography.class); } /** {@inheritDoc} */ @Override public void addBoxen(final Connection conn) throws SQLException { org.postgresql.PGConnection pgconn = (org.postgresql.PGConnection) conn; - pgconn.addDataType("box3d", org.postgis.PGbox3d.class); - pgconn.addDataType("box2d", org.postgis.PGbox2d.class); + pgconn.addDataType("box3d", net.postgis.jdbc.PGbox3d.class); + pgconn.addDataType("box2d", net.postgis.jdbc.PGbox2d.class); } /** {@inheritDoc} */ @Override public void addBinaryGeometries(final Connection conn) throws SQLException { org.postgresql.PGConnection pgconn = (org.postgresql.PGConnection) conn; - pgconn.addDataType("geometry", org.postgis.PGgeometryLW.class); - pgconn.addDataType("geography", org.postgis.PGgeographyLW.class); + pgconn.addDataType("geometry", net.postgis.jdbc.PGgeometryLW.class); + pgconn.addDataType("geography", net.postgis.jdbc.PGgeographyLW.class); } } @@ -366,29 +366,29 @@ protected static class TypesAdder80 extends TypesAdder { @Override public void addGeometries(final Connection conn) throws SQLException { PGConnection pgconn = (PGConnection) conn; - pgconn.addDataType("geometry", org.postgis.PGgeometry.class); - pgconn.addDataType("public.geometry", org.postgis.PGgeometry.class); - pgconn.addDataType("\"public\".\"geometry\"", org.postgis.PGgeometry.class); + pgconn.addDataType("geometry", net.postgis.jdbc.PGgeometry.class); + pgconn.addDataType("public.geometry", net.postgis.jdbc.PGgeometry.class); + pgconn.addDataType("\"public\".\"geometry\"", net.postgis.jdbc.PGgeometry.class); - pgconn.addDataType("geography", org.postgis.PGgeometry.class); - pgconn.addDataType("public.geography", org.postgis.PGgeometry.class); - pgconn.addDataType("\"public\".\"geography\"", org.postgis.PGgeometry.class); + pgconn.addDataType("geography", net.postgis.jdbc.PGgeometry.class); + pgconn.addDataType("public.geography", net.postgis.jdbc.PGgeometry.class); + pgconn.addDataType("\"public\".\"geography\"", net.postgis.jdbc.PGgeometry.class); } /** {@inheritDoc} */ @Override public void addBoxen(final Connection conn) throws SQLException { PGConnection pgconn = (PGConnection) conn; - pgconn.addDataType("box3d", org.postgis.PGbox3d.class); - pgconn.addDataType("box2d", org.postgis.PGbox2d.class); + pgconn.addDataType("box3d", net.postgis.jdbc.PGbox3d.class); + pgconn.addDataType("box2d", net.postgis.jdbc.PGbox2d.class); } /** {@inheritDoc} */ @Override public void addBinaryGeometries(final Connection conn) throws SQLException { PGConnection pgconn = (PGConnection) conn; - pgconn.addDataType("geometry", org.postgis.PGgeometryLW.class); - pgconn.addDataType("geography", org.postgis.PGgeographyLW.class); + pgconn.addDataType("geometry", net.postgis.jdbc.PGgeometryLW.class); + pgconn.addDataType("geography", net.postgis.jdbc.PGgeographyLW.class); } } diff --git a/jdbc/src/main/java/org/postgis/DriverWrapperAutoprobe.java b/postgis-jdbc/src/main/java/net/postgis/jdbc/DriverWrapperAutoprobe.java similarity index 97% rename from jdbc/src/main/java/org/postgis/DriverWrapperAutoprobe.java rename to postgis-jdbc/src/main/java/net/postgis/jdbc/DriverWrapperAutoprobe.java index 1ba179f..727d64c 100644 --- a/jdbc/src/main/java/org/postgis/DriverWrapperAutoprobe.java +++ b/postgis-jdbc/src/main/java/net/postgis/jdbc/DriverWrapperAutoprobe.java @@ -23,7 +23,7 @@ * */ -package org.postgis; +package net.postgis.jdbc; import org.postgresql.Driver; @@ -47,7 +47,7 @@ * access incompatible PostGIS versions that reside in other schemas. * * For usage notes, see DriverWrapper class, but use "jdbc:postgresql_autogis:" - * as JDBC url prefix and org.postgis.DriverWrapperAutoprobe as driver class. + * as JDBC url prefix and net.postgis.jdbc.DriverWrapperAutoprobe as driver class. * * @author {@literal Markus Schaber } * @see DriverWrapper diff --git a/jdbc/src/main/java/org/postgis/DriverWrapperLW.java b/postgis-jdbc/src/main/java/net/postgis/jdbc/DriverWrapperLW.java similarity index 96% rename from jdbc/src/main/java/org/postgis/DriverWrapperLW.java rename to postgis-jdbc/src/main/java/net/postgis/jdbc/DriverWrapperLW.java index b312e65..96f1a66 100644 --- a/jdbc/src/main/java/org/postgis/DriverWrapperLW.java +++ b/postgis-jdbc/src/main/java/net/postgis/jdbc/DriverWrapperLW.java @@ -23,7 +23,7 @@ * */ -package org.postgis; +package net.postgis.jdbc; import org.postgresql.Driver; @@ -42,7 +42,7 @@ * representation, and thus only works against PostGIS 1.x servers and newer. * * For usage notes, see DriverWrapper class, but use "jdbc:postgresql_lwgis:" as - * JDBC url prefix and org.postgis.DriverWrapperLW as driver class. + * JDBC url prefix and net.postgis.jdbc.DriverWrapperLW as driver class. * * @author {@literal Markus Schaber } * @see DriverWrapper diff --git a/jdbc/src/main/java/org/postgis/PGbox2d.java b/postgis-jdbc/src/main/java/net/postgis/jdbc/PGbox2d.java similarity index 96% rename from jdbc/src/main/java/org/postgis/PGbox2d.java rename to postgis-jdbc/src/main/java/net/postgis/jdbc/PGbox2d.java index 46812ab..f58cb51 100644 --- a/jdbc/src/main/java/org/postgis/PGbox2d.java +++ b/postgis-jdbc/src/main/java/net/postgis/jdbc/PGbox2d.java @@ -25,7 +25,9 @@ * */ -package org.postgis; +package net.postgis.jdbc; + +import net.postgis.jdbc.geometry.Point; import java.sql.SQLException; diff --git a/jdbc/src/main/java/org/postgis/PGbox3d.java b/postgis-jdbc/src/main/java/net/postgis/jdbc/PGbox3d.java similarity index 95% rename from jdbc/src/main/java/org/postgis/PGbox3d.java rename to postgis-jdbc/src/main/java/net/postgis/jdbc/PGbox3d.java index a9f88f9..9aaec8d 100644 --- a/jdbc/src/main/java/org/postgis/PGbox3d.java +++ b/postgis-jdbc/src/main/java/net/postgis/jdbc/PGbox3d.java @@ -26,7 +26,9 @@ * */ -package org.postgis; +package net.postgis.jdbc; + +import net.postgis.jdbc.geometry.Point; import java.sql.SQLException; diff --git a/jdbc/src/main/java/org/postgis/PGboxbase.java b/postgis-jdbc/src/main/java/net/postgis/jdbc/PGboxbase.java similarity index 96% rename from jdbc/src/main/java/org/postgis/PGboxbase.java rename to postgis-jdbc/src/main/java/net/postgis/jdbc/PGboxbase.java index 04c938a..c285bf9 100644 --- a/jdbc/src/main/java/org/postgis/PGboxbase.java +++ b/postgis-jdbc/src/main/java/net/postgis/jdbc/PGboxbase.java @@ -26,8 +26,12 @@ * */ -package org.postgis; +package net.postgis.jdbc; +import net.postgis.jdbc.geometry.Geometry; +import net.postgis.jdbc.geometry.GeometryBuilder; +import net.postgis.jdbc.geometry.GeometryTokenizer; +import net.postgis.jdbc.geometry.Point; import org.postgresql.util.PGobject; import java.sql.SQLException; diff --git a/jdbc/src/main/java/org/postgis/PGgeo.java b/postgis-jdbc/src/main/java/net/postgis/jdbc/PGgeo.java similarity index 94% rename from jdbc/src/main/java/org/postgis/PGgeo.java rename to postgis-jdbc/src/main/java/net/postgis/jdbc/PGgeo.java index e1a2ac3..424e2a0 100644 --- a/jdbc/src/main/java/org/postgis/PGgeo.java +++ b/postgis-jdbc/src/main/java/net/postgis/jdbc/PGgeo.java @@ -20,10 +20,12 @@ * (C) 2015 Phillip Ross, phillip.w.g.ross@gmail.com */ -package org.postgis; +package net.postgis.jdbc; -import org.postgis.binary.BinaryParser; +import net.postgis.jdbc.geometry.Geometry; +import net.postgis.jdbc.geometry.GeometryBuilder; +import net.postgis.jdbc.geometry.binary.BinaryParser; import org.postgresql.util.PGobject; import java.sql.SQLException; diff --git a/jdbc/src/main/java/org/postgis/PGgeography.java b/postgis-jdbc/src/main/java/net/postgis/jdbc/PGgeography.java similarity index 96% rename from jdbc/src/main/java/org/postgis/PGgeography.java rename to postgis-jdbc/src/main/java/net/postgis/jdbc/PGgeography.java index 30f5647..afb20d4 100644 --- a/jdbc/src/main/java/org/postgis/PGgeography.java +++ b/postgis-jdbc/src/main/java/net/postgis/jdbc/PGgeography.java @@ -20,9 +20,11 @@ * (C) 2015 Phillip Ross, phillip.w.g.ross@gmail.com */ -package org.postgis; +package net.postgis.jdbc; +import net.postgis.jdbc.geometry.Geometry; + import java.sql.SQLException; diff --git a/jdbc/src/main/java/org/postgis/PGgeographyLW.java b/postgis-jdbc/src/main/java/net/postgis/jdbc/PGgeographyLW.java similarity index 94% rename from jdbc/src/main/java/org/postgis/PGgeographyLW.java rename to postgis-jdbc/src/main/java/net/postgis/jdbc/PGgeographyLW.java index a64b7d4..12844a5 100644 --- a/jdbc/src/main/java/org/postgis/PGgeographyLW.java +++ b/postgis-jdbc/src/main/java/net/postgis/jdbc/PGgeographyLW.java @@ -18,10 +18,11 @@ * (C) 2015 Phillip Ross, phillip.w.g.ross@gmail.com */ -package org.postgis; +package net.postgis.jdbc; -import org.postgis.binary.BinaryWriter; +import net.postgis.jdbc.geometry.Geometry; +import net.postgis.jdbc.geometry.binary.BinaryWriter; import java.sql.SQLException; diff --git a/jdbc/src/main/java/org/postgis/PGgeometry.java b/postgis-jdbc/src/main/java/net/postgis/jdbc/PGgeometry.java similarity index 96% rename from jdbc/src/main/java/org/postgis/PGgeometry.java rename to postgis-jdbc/src/main/java/net/postgis/jdbc/PGgeometry.java index acd96ca..92e1b13 100644 --- a/jdbc/src/main/java/org/postgis/PGgeometry.java +++ b/postgis-jdbc/src/main/java/net/postgis/jdbc/PGgeometry.java @@ -20,9 +20,11 @@ * (C) 2015 Phillip Ross, phillip.w.g.ross@gmail.com */ -package org.postgis; +package net.postgis.jdbc; +import net.postgis.jdbc.geometry.Geometry; + import java.sql.SQLException; diff --git a/jdbc/src/main/java/org/postgis/PGgeometryLW.java b/postgis-jdbc/src/main/java/net/postgis/jdbc/PGgeometryLW.java similarity index 94% rename from jdbc/src/main/java/org/postgis/PGgeometryLW.java rename to postgis-jdbc/src/main/java/net/postgis/jdbc/PGgeometryLW.java index b66c9fc..ed754da 100644 --- a/jdbc/src/main/java/org/postgis/PGgeometryLW.java +++ b/postgis-jdbc/src/main/java/net/postgis/jdbc/PGgeometryLW.java @@ -18,10 +18,11 @@ * (C) 2015 Phillip Ross, phillip.w.g.ross@gmail.com */ -package org.postgis; +package net.postgis.jdbc; -import org.postgis.binary.BinaryWriter; +import net.postgis.jdbc.geometry.Geometry; +import net.postgis.jdbc.geometry.binary.BinaryWriter; import java.sql.SQLException; diff --git a/jdbc/src/main/java/org/postgis/Version.java b/postgis-jdbc/src/main/java/net/postgis/jdbc/Version.java similarity index 97% rename from jdbc/src/main/java/org/postgis/Version.java rename to postgis-jdbc/src/main/java/net/postgis/jdbc/Version.java index 5c5d753..a598e1a 100644 --- a/jdbc/src/main/java/org/postgis/Version.java +++ b/postgis-jdbc/src/main/java/net/postgis/jdbc/Version.java @@ -23,7 +23,7 @@ * */ -package org.postgis; +package net.postgis.jdbc; import java.io.IOException; @@ -34,7 +34,7 @@ public class Version { /** We read our version information from this resource... */ - private static final String RESOURCE_FILENAME = "org/postgis/version.properties"; + private static final String RESOURCE_FILENAME = "net/postgis/jdbc/version.properties"; private static final String VERSION_PROPERTY_NAME = "VERSION"; diff --git a/jdbc/src/main/javadoc/overview.html b/postgis-jdbc/src/main/javadoc/overview.html similarity index 100% rename from jdbc/src/main/javadoc/overview.html rename to postgis-jdbc/src/main/javadoc/overview.html diff --git a/jdbc/src/main/resources/org/postgis/version.properties b/postgis-jdbc/src/main/resources/net/postgis/jdbc/version.properties similarity index 100% rename from jdbc/src/main/resources/org/postgis/version.properties rename to postgis-jdbc/src/main/resources/net/postgis/jdbc/version.properties diff --git a/postgis-jdbc/src/main/resources/org/postgresql/driverconfig.properties b/postgis-jdbc/src/main/resources/org/postgresql/driverconfig.properties new file mode 100644 index 0000000..76a44e3 --- /dev/null +++ b/postgis-jdbc/src/main/resources/org/postgresql/driverconfig.properties @@ -0,0 +1,9 @@ +# +# This property file is included in the postgis jar and autoregisters the +# PostGIS datatypes within the jdbc driver. +# + +datatype.geometry=net.postgis.jdbc.PGgeometry +datatype.geography=net.postgis.jdbc.PGgeography +datatype.box3d=net.postgis.jdbc.PGbox3d +datatype.box2d=net.postgis.jdbc.PGbox2d diff --git a/jdbc/src/test/java/org/postgis/BoxesTest.java b/postgis-jdbc/src/test/java/net/postgis/jdbc/BoxesTest.java similarity index 97% rename from jdbc/src/test/java/org/postgis/BoxesTest.java rename to postgis-jdbc/src/test/java/net/postgis/jdbc/BoxesTest.java index e7ddcd4..bd3170e 100644 --- a/jdbc/src/test/java/org/postgis/BoxesTest.java +++ b/postgis-jdbc/src/test/java/net/postgis/jdbc/BoxesTest.java @@ -25,11 +25,11 @@ * */ -package org.postgis; +package net.postgis.jdbc; import net.postgis.tools.testutils.TestContainerController; -import org.postgis.util.VersionUtil; +import net.postgis.jdbc.geometry.util.VersionUtil; import org.postgresql.util.PGobject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -118,7 +118,7 @@ public void initJdbcConnection(ITestContext ctx) throws Exception { Assert.assertNotNull(jdbcUsername); final String jdbcPassword = (String)ctx.getAttribute(TestContainerController.TEST_CONTAINER_ENV_PW_PARAM_NAME); Assert.assertNotNull(jdbcPassword); - Class.forName("org.postgis.DriverWrapper"); + Class.forName("net.postgis.jdbc.DriverWrapper"); connection = DriverManager.getConnection(jdbcUrl, jdbcUsername, jdbcPassword); } diff --git a/jdbc/src/test/java/org/postgis/DatatypesAutoRegistrationTest.java b/postgis-jdbc/src/test/java/net/postgis/jdbc/DatatypesAutoRegistrationTest.java similarity index 98% rename from jdbc/src/test/java/org/postgis/DatatypesAutoRegistrationTest.java rename to postgis-jdbc/src/test/java/net/postgis/jdbc/DatatypesAutoRegistrationTest.java index 7f5d4ff..8b0a73c 100644 --- a/jdbc/src/test/java/org/postgis/DatatypesAutoRegistrationTest.java +++ b/postgis-jdbc/src/test/java/net/postgis/jdbc/DatatypesAutoRegistrationTest.java @@ -18,11 +18,11 @@ * (C) 2020 Phillip Ross, phillip.w.g.ross@gmail.com */ -package org.postgis; +package net.postgis.jdbc; import net.postgis.tools.testutils.TestContainerController; -import org.postgis.util.VersionUtil; +import net.postgis.jdbc.geometry.util.VersionUtil; import org.postgresql.Driver; import org.postgresql.util.PGobject; import org.slf4j.Logger; diff --git a/jdbc/src/test/java/org/postgis/DatatypesTest.java b/postgis-jdbc/src/test/java/net/postgis/jdbc/DatatypesTest.java similarity index 98% rename from jdbc/src/test/java/org/postgis/DatatypesTest.java rename to postgis-jdbc/src/test/java/net/postgis/jdbc/DatatypesTest.java index 284f4f0..91af226 100644 --- a/jdbc/src/test/java/org/postgis/DatatypesTest.java +++ b/postgis-jdbc/src/test/java/net/postgis/jdbc/DatatypesTest.java @@ -25,7 +25,7 @@ * */ -package org.postgis; +package net.postgis.jdbc; import org.slf4j.Logger; diff --git a/jdbc/src/test/java/org/postgis/EmptyGeometriesTest.java b/postgis-jdbc/src/test/java/net/postgis/jdbc/EmptyGeometriesTest.java similarity index 96% rename from jdbc/src/test/java/org/postgis/EmptyGeometriesTest.java rename to postgis-jdbc/src/test/java/net/postgis/jdbc/EmptyGeometriesTest.java index a321a94..1a1b17e 100644 --- a/jdbc/src/test/java/org/postgis/EmptyGeometriesTest.java +++ b/postgis-jdbc/src/test/java/net/postgis/jdbc/EmptyGeometriesTest.java @@ -21,7 +21,7 @@ * */ -package org.postgis; +package net.postgis.jdbc; import net.postgis.tools.testutils.TestContainerController; @@ -47,9 +47,9 @@ public class EmptyGeometriesTest { private static final Logger logger = LoggerFactory.getLogger(EmptyGeometriesTest.class); - private static final String DRIVER_WRAPPER_CLASS_NAME = "org.postgis.DriverWrapper"; + private static final String DRIVER_WRAPPER_CLASS_NAME = "net.postgis.jdbc.DriverWrapper"; - private static final String DRIVER_WRAPPER_AUTOPROBE_CLASS_NAME = "org.postgis.DriverWrapperAutoprobe"; + private static final String DRIVER_WRAPPER_AUTOPROBE_CLASS_NAME = "net.postgis.jdbc.DriverWrapperAutoprobe"; public static final String[] geometriesToTest = new String[] { diff --git a/jdbc/src/test/java/org/postgis/GeographyDatatypeTest.java b/postgis-jdbc/src/test/java/net/postgis/jdbc/GeographyDatatypeTest.java similarity index 99% rename from jdbc/src/test/java/org/postgis/GeographyDatatypeTest.java rename to postgis-jdbc/src/test/java/net/postgis/jdbc/GeographyDatatypeTest.java index 58ead35..d80b7df 100644 --- a/jdbc/src/test/java/org/postgis/GeographyDatatypeTest.java +++ b/postgis-jdbc/src/test/java/net/postgis/jdbc/GeographyDatatypeTest.java @@ -16,7 +16,7 @@ * (C) 2020 Phillip Ross, phillip.w.g.ross@gmail.com */ -package org.postgis; +package net.postgis.jdbc; import net.postgis.tools.testutils.TestContainerController; @@ -127,7 +127,7 @@ public void initJdbcConnection(ITestContext ctx) throws Exception { Assert.assertNotNull(jdbcUsername); final String jdbcPassword = (String)ctx.getAttribute(TestContainerController.TEST_CONTAINER_ENV_PW_PARAM_NAME); Assert.assertNotNull(jdbcPassword); - Class.forName("org.postgis.DriverWrapperLW"); + Class.forName("net.postgis.jdbc.DriverWrapperLW"); connection = DriverManager.getConnection(jdbcUrl, jdbcUsername, jdbcPassword); connectionLW = DriverManager.getConnection(jdbcUrlLW, jdbcUsername, jdbcPassword); } diff --git a/jdbc/src/test/java/org/postgis/ParserTest.java b/postgis-jdbc/src/test/java/net/postgis/jdbc/ParserTest.java similarity index 97% rename from jdbc/src/test/java/org/postgis/ParserTest.java rename to postgis-jdbc/src/test/java/net/postgis/jdbc/ParserTest.java index 3db8aa1..bd81889 100644 --- a/jdbc/src/test/java/org/postgis/ParserTest.java +++ b/postgis-jdbc/src/test/java/net/postgis/jdbc/ParserTest.java @@ -25,14 +25,16 @@ * */ -package org.postgis; +package net.postgis.jdbc; -import org.postgis.binary.BinaryParser; -import org.postgis.binary.BinaryWriter; -import org.postgis.binary.ValueSetter; +import net.postgis.jdbc.geometry.Geometry; +import net.postgis.jdbc.geometry.GeometryBuilder; +import net.postgis.jdbc.geometry.binary.BinaryParser; +import net.postgis.jdbc.geometry.binary.BinaryWriter; +import net.postgis.jdbc.geometry.binary.ValueSetter; import net.postgis.tools.testutils.TestContainerController; -import org.postgis.util.VersionUtil; +import net.postgis.jdbc.geometry.util.VersionUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; @@ -55,9 +57,9 @@ public class ParserTest { private static final Logger logger = LoggerFactory.getLogger(ParserTest.class); - private static final String DRIVER_WRAPPER_CLASS_NAME = "org.postgis.DriverWrapper"; + private static final String DRIVER_WRAPPER_CLASS_NAME = "net.postgis.jdbc.DriverWrapper"; - private static final String DRIVER_WRAPPER_AUTOPROBE_CLASS_NAME = "org.postgis.DriverWrapperAutoprobe"; + private static final String DRIVER_WRAPPER_AUTOPROBE_CLASS_NAME = "net.postgis.jdbc.DriverWrapperAutoprobe"; /** The srid we use for the srid tests */ public static final int SRID = 4326; diff --git a/jdbc/src/test/java/org/postgis/SerializationTest.java b/postgis-jdbc/src/test/java/net/postgis/jdbc/SerializationTest.java similarity index 96% rename from jdbc/src/test/java/org/postgis/SerializationTest.java rename to postgis-jdbc/src/test/java/net/postgis/jdbc/SerializationTest.java index fbb3e66..34b70d5 100644 --- a/jdbc/src/test/java/org/postgis/SerializationTest.java +++ b/postgis-jdbc/src/test/java/net/postgis/jdbc/SerializationTest.java @@ -25,9 +25,10 @@ * */ -package org.postgis; +package net.postgis.jdbc; +import net.postgis.jdbc.PGgeometry; import org.testng.Assert; import org.testng.annotations.Test; diff --git a/jdbc/src/test/java/org/postgis/ServerTest.java b/postgis-jdbc/src/test/java/net/postgis/jdbc/ServerTest.java similarity index 99% rename from jdbc/src/test/java/org/postgis/ServerTest.java rename to postgis-jdbc/src/test/java/net/postgis/jdbc/ServerTest.java index 78dce1e..97617cb 100644 --- a/jdbc/src/test/java/org/postgis/ServerTest.java +++ b/postgis-jdbc/src/test/java/net/postgis/jdbc/ServerTest.java @@ -25,7 +25,7 @@ * */ -package org.postgis; +package net.postgis.jdbc; import net.postgis.tools.testutils.TestContainerController; diff --git a/jdbc/src/test/java/org/postgis/VersionPrinter.java b/postgis-jdbc/src/test/java/net/postgis/jdbc/VersionPrinter.java similarity index 99% rename from jdbc/src/test/java/org/postgis/VersionPrinter.java rename to postgis-jdbc/src/test/java/net/postgis/jdbc/VersionPrinter.java index 76cd87a..2c485bb 100644 --- a/jdbc/src/test/java/org/postgis/VersionPrinter.java +++ b/postgis-jdbc/src/test/java/net/postgis/jdbc/VersionPrinter.java @@ -23,7 +23,7 @@ * */ -package org.postgis; +package net.postgis.jdbc; import net.postgis.tools.testutils.TestContainerController; diff --git a/jdbc/src/test/java/org/postgis/util/VersionUtilIT.java b/postgis-jdbc/src/test/java/net/postgis/jdbc/util/VersionUtilIT.java similarity index 99% rename from jdbc/src/test/java/org/postgis/util/VersionUtilIT.java rename to postgis-jdbc/src/test/java/net/postgis/jdbc/util/VersionUtilIT.java index 12d7291..85e5086 100644 --- a/jdbc/src/test/java/org/postgis/util/VersionUtilIT.java +++ b/postgis-jdbc/src/test/java/net/postgis/jdbc/util/VersionUtilIT.java @@ -16,10 +16,12 @@ * (C) 2018 Phillip Ross, phillip.w.g.ross@gmail.com */ -package org.postgis.util; +package net.postgis.jdbc.util; import net.postgis.tools.testutils.TestContainerController; +import net.postgis.jdbc.geometry.util.VersionFunctions; +import net.postgis.jdbc.geometry.util.VersionUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.testng.Assert; diff --git a/jdbc/src/test/resources-filtered/testng-it.xml b/postgis-jdbc/src/test/resources-filtered/testng-it.xml similarity index 58% rename from jdbc/src/test/resources-filtered/testng-it.xml rename to postgis-jdbc/src/test/resources-filtered/testng-it.xml index dae6101..e1897fe 100644 --- a/jdbc/src/test/resources-filtered/testng-it.xml +++ b/postgis-jdbc/src/test/resources-filtered/testng-it.xml @@ -10,14 +10,14 @@ - - - - - - - - + + + + + + + + diff --git a/jdbc/src/test/resources/logback-test.xml b/postgis-jdbc/src/test/resources/logback-test.xml similarity index 92% rename from jdbc/src/test/resources/logback-test.xml rename to postgis-jdbc/src/test/resources/logback-test.xml index 0390f76..d8615b9 100644 --- a/jdbc/src/test/resources/logback-test.xml +++ b/postgis-jdbc/src/test/resources/logback-test.xml @@ -14,6 +14,6 @@ - + \ No newline at end of file diff --git a/jdbc/src/test/resources/testng.xml b/postgis-jdbc/src/test/resources/testng.xml similarity index 64% rename from jdbc/src/test/resources/testng.xml rename to postgis-jdbc/src/test/resources/testng.xml index ce948c5..c6ac2d8 100644 --- a/jdbc/src/test/resources/testng.xml +++ b/postgis-jdbc/src/test/resources/testng.xml @@ -3,8 +3,8 @@ - - + + diff --git a/jdbc/todo.txt b/postgis-jdbc/todo.txt similarity index 100% rename from jdbc/todo.txt rename to postgis-jdbc/todo.txt diff --git a/tools/pom.xml b/tools/pom.xml index ad31d37..ea40047 100644 --- a/tools/pom.xml +++ b/tools/pom.xml @@ -16,7 +16,7 @@ Miscellaneous tools and utilities - osgeo-postgis-jdbc-test-util + smoketest test-utils diff --git a/tools/osgeo-postgis-jdbc-test-util/.gitignore b/tools/smoketest/.gitignore similarity index 100% rename from tools/osgeo-postgis-jdbc-test-util/.gitignore rename to tools/smoketest/.gitignore diff --git a/tools/osgeo-postgis-jdbc-test-util/pom.xml b/tools/smoketest/pom.xml similarity index 92% rename from tools/osgeo-postgis-jdbc-test-util/pom.xml rename to tools/smoketest/pom.xml index 18a93bb..2d47523 100644 --- a/tools/osgeo-postgis-jdbc-test-util/pom.xml +++ b/tools/smoketest/pom.xml @@ -8,11 +8,11 @@ 2.5.1-SNAPSHOT - osgeo-postgis-jdbc-test-util + smoketest 2.5.1-SNAPSHOT jar - osgeo-postgis-jdbc-test-util + smoketest Simple smoke test util for verifying functionality postgis jdbc jar against a postgresql database with posgis extensions on OSGeo-Live. @@ -28,6 +28,11 @@ postgis-jdbc 2.5.1-SNAPSHOT + + net.postgis + postgis-jdbc-java2d + 2.5.1-SNAPSHOT + ch.qos.logback logback-classic @@ -94,7 +99,7 @@ - net.postgis.osgeo.util.Main + net.postgis.jdbc.smoketest.OSGeo diff --git a/jdbc/src/main/java/examples/TestAutoregister.java b/tools/smoketest/src/main/java/net/postgis/jdbc/smoketest/Autoregister.java similarity index 97% rename from jdbc/src/main/java/examples/TestAutoregister.java rename to tools/smoketest/src/main/java/net/postgis/jdbc/smoketest/Autoregister.java index e00c664..107f7a6 100644 --- a/jdbc/src/main/java/examples/TestAutoregister.java +++ b/tools/smoketest/src/main/java/net/postgis/jdbc/smoketest/Autoregister.java @@ -23,11 +23,11 @@ * */ -package examples; +package net.postgis.jdbc.smoketest; -import org.postgis.PGbox2d; -import org.postgis.PGbox3d; -import org.postgis.PGgeometry; +import net.postgis.jdbc.PGbox2d; +import net.postgis.jdbc.PGbox3d; +import net.postgis.jdbc.PGgeometry; import org.postgresql.Driver; import org.postgresql.util.PGobject; @@ -44,7 +44,7 @@ * versions. (But it will work fine against older servers.) It also checks for * postgis version to know whether box2d is available. */ -public class TestAutoregister { +public class Autoregister { public static void main(String[] args) { String dburl = null; diff --git a/postgis-jdbc-java2d/src/main/java/examples/TestJava2d.java b/tools/smoketest/src/main/java/net/postgis/jdbc/smoketest/Java2d.java similarity index 98% rename from postgis-jdbc-java2d/src/main/java/examples/TestJava2d.java rename to tools/smoketest/src/main/java/net/postgis/jdbc/smoketest/Java2d.java index 33e2444..d192786 100644 --- a/postgis-jdbc-java2d/src/main/java/examples/TestJava2d.java +++ b/tools/smoketest/src/main/java/net/postgis/jdbc/smoketest/Java2d.java @@ -25,7 +25,7 @@ * */ -package examples; +package net.postgis.jdbc.smoketest; import java.awt.*; import java.awt.event.WindowEvent; @@ -38,9 +38,9 @@ import java.sql.SQLException; import java.util.ArrayList; -import org.postgis.java2d.Java2DWrapper; +import net.postgis.jdbc.java2d.Java2DWrapper; -public class TestJava2d { +public class Java2d { private static final boolean DEBUG = true; public static final Shape[] SHAPEARRAY = new Shape[0]; diff --git a/tools/osgeo-postgis-jdbc-test-util/src/main/java/net/postgis/osgeo/util/Main.java b/tools/smoketest/src/main/java/net/postgis/jdbc/smoketest/OSGeo.java similarity index 93% rename from tools/osgeo-postgis-jdbc-test-util/src/main/java/net/postgis/osgeo/util/Main.java rename to tools/smoketest/src/main/java/net/postgis/jdbc/smoketest/OSGeo.java index e874490..a37fb26 100644 --- a/tools/osgeo-postgis-jdbc-test-util/src/main/java/net/postgis/osgeo/util/Main.java +++ b/tools/smoketest/src/main/java/net/postgis/jdbc/smoketest/OSGeo.java @@ -1,7 +1,7 @@ -package net.postgis.osgeo.util; +package net.postgis.jdbc.smoketest; -import org.postgis.PGbox3d; -import org.postgis.PGgeometry; +import net.postgis.jdbc.PGbox3d; +import net.postgis.jdbc.PGgeometry; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -21,9 +21,9 @@ * * @author Phillip Ross */ -public class Main { +public class OSGeo { - private static final Logger logger = LoggerFactory.getLogger(Main.class); + private static final Logger logger = LoggerFactory.getLogger(OSGeo.class); private static final String DEFAULT_TEST_TABLE_PREFIX = "SMOKE_TEST"; @@ -36,10 +36,10 @@ public class Main { private String testTableName = null; - public Main(final String jdbcUrl, - final String jdbcUsername, - final String jdbcPassword, - final String testTablePrefix) { + public OSGeo(final String jdbcUrl, + final String jdbcUsername, + final String jdbcPassword, + final String testTablePrefix) { try { Objects.requireNonNull(jdbcUrl, "A JDBC URL must be specified"); Objects.requireNonNull(jdbcUsername, "A database username must be specified."); @@ -226,11 +226,11 @@ public static void main(final String[] args) { if (args.length > 3) { testTablePrefix = args[3]; } - new Main(jdbcUrl, jdbcUsername, jdbcPassword, testTablePrefix); + new OSGeo(jdbcUrl, jdbcUsername, jdbcPassword, testTablePrefix); } } } -// java -classpath ~/.m2/repository/net/postgis/postgis-jdbc/2.2.1-SNAPSHOT/postgis-jdbc-2.2.1-SNAPSHOT.jar:target/osgeo-postgis-jdbc-test-util-0.0.1-SNAPSHOT.jar net.postgis.osgeo.util.Main jdbc:postgresql://db01:5432/postgis1 postgis1 postgis1 smoke_test +// java -classpath ~/.m2/repository/net/postgis/postgis-jdbc/2.2.1-SNAPSHOT/postgis-jdbc-2.2.1-SNAPSHOT.jar:target/smoketest-0.0.1-SNAPSHOT.jar net.postgis.osgeo.util.Main jdbc:postgresql://db01:5432/postgis1 postgis1 postgis1 smoke_test diff --git a/tools/osgeo-postgis-jdbc-test-util/src/main/scripts/test.sh b/tools/smoketest/src/main/scripts/test.sh similarity index 84% rename from tools/osgeo-postgis-jdbc-test-util/src/main/scripts/test.sh rename to tools/smoketest/src/main/scripts/test.sh index 4f96b26..8eb8ac8 100644 --- a/tools/osgeo-postgis-jdbc-test-util/src/main/scripts/test.sh +++ b/tools/smoketest/src/main/scripts/test.sh @@ -10,7 +10,7 @@ DB_PASSWORD=${4} # This should be the database password to be used # points to a jar file in a local maven repository. MVN_REPO_LOCATION=~/.m2/repository GROUP_ID_DIR=/net/postgis -TEST_UTIL_JAR=${MVN_REPO_LOCATION}${GROUP_ID_DIR}/osgeo-postgis-jdbc-test-util/0.0.1-SNAPSHOT/osgeo-postgis-jdbc-test-util-0.0.1-SNAPSHOT.jar +TEST_UTIL_JAR=${MVN_REPO_LOCATION}${GROUP_ID_DIR}/smoketest/0.0.1-SNAPSHOT/smoketest-0.0.1-SNAPSHOT.jar # The following variables are derived from the variables above. # They are used to invoke the JVM with the test utility. @@ -19,6 +19,6 @@ JDBC_USERNAME=${DB_USERNAME} JDBC_PASSWORD=${DB_PASSWORD} # The exactly commandline used to invoke the utility is output before it is actually invoked. -echo "==> java -classpath ${TEST_JAR}:${TEST_UTIL_JAR} net.postgis.osgeo.util.Main ${JDBC_URL} ${JDBC_USERNAME} ${JDBC_PASSWORD}" +echo "==> java -classpath ${TEST_JAR}:${TEST_UTIL_JAR} net.postgis.jdbc.smoketest.OSGeo ${JDBC_URL} ${JDBC_USERNAME} ${JDBC_PASSWORD}" java -classpath ${TEST_JAR}:${TEST_UTIL_JAR} net.postgis.osgeo.util.Main ${JDBC_URL} ${JDBC_USERNAME} ${JDBC_PASSWORD} \ No newline at end of file diff --git a/tools/osgeo-postgis-jdbc-test-util/src/test/java/net/postgis/osgeo/util/UtilTest.java b/tools/smoketest/src/test/java/net/postgis/jdbc/smoketest/UtilTest.java similarity index 90% rename from tools/osgeo-postgis-jdbc-test-util/src/test/java/net/postgis/osgeo/util/UtilTest.java rename to tools/smoketest/src/test/java/net/postgis/jdbc/smoketest/UtilTest.java index 2c85f28..b7a13da 100644 --- a/tools/osgeo-postgis-jdbc-test-util/src/test/java/net/postgis/osgeo/util/UtilTest.java +++ b/tools/smoketest/src/test/java/net/postgis/jdbc/smoketest/UtilTest.java @@ -1,4 +1,4 @@ -package net.postgis.osgeo.util; +package net.postgis.jdbc.smoketest; import net.postgis.tools.testutils.TestContainerController; import org.slf4j.Logger; @@ -26,7 +26,7 @@ public void test(ITestContext ctx) { final String jdbcUsername = (String)ctx.getAttribute(TestContainerController.TEST_CONTAINER_ENV_USER_PARAM_NAME); Assert.assertNotNull(jdbcUsername); final String jdbcPassword = (String)ctx.getAttribute(TestContainerController.TEST_CONTAINER_ENV_PW_PARAM_NAME); - Main.main(new String[] {jdbcUrl, jdbcUsername, jdbcPassword}); + OSGeo.main(new String[] {jdbcUrl, jdbcUsername, jdbcPassword}); } diff --git a/tools/osgeo-postgis-jdbc-test-util/src/test/resources-filtered/testng-it.xml b/tools/smoketest/src/test/resources-filtered/testng-it.xml similarity index 91% rename from tools/osgeo-postgis-jdbc-test-util/src/test/resources-filtered/testng-it.xml rename to tools/smoketest/src/test/resources-filtered/testng-it.xml index acc9053..4cae973 100644 --- a/tools/osgeo-postgis-jdbc-test-util/src/test/resources-filtered/testng-it.xml +++ b/tools/smoketest/src/test/resources-filtered/testng-it.xml @@ -10,7 +10,7 @@ - + diff --git a/jdbc_jtsparser/src/test/resources/logback-test.xml b/tools/smoketest/src/test/resources/logback-test.xml similarity index 91% rename from jdbc_jtsparser/src/test/resources/logback-test.xml rename to tools/smoketest/src/test/resources/logback-test.xml index 0927302..7378bd0 100644 --- a/jdbc_jtsparser/src/test/resources/logback-test.xml +++ b/tools/smoketest/src/test/resources/logback-test.xml @@ -14,6 +14,4 @@ - - \ No newline at end of file