[postgis-java] 01/01: Imported Upstream version 2.2.0
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Fri Nov 27 18:29:08 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to annotated tag upstream/2.2.0
in repository postgis-java.
commit e1845ba136c08fe1c3a51f86c1f43fb776f77a32
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Nov 27 01:54:09 2015 +0100
Imported Upstream version 2.2.0
---
.gitignore | 1 +
.idea/encodings.xml | 1 +
.idea/libraries/Maven__junit_junit_4_10.xml | 13 +
.../libraries/Maven__org_apache_ant_ant_1_7_0.xml | 13 +
.../Maven__org_apache_ant_ant_launcher_1_7_0.xml | 13 +
.../Maven__org_hamcrest_hamcrest_core_1_1.xml | 13 +
...2.xml => Maven__org_slf4j_slf4j_api_1_7_13.xml} | 8 +-
..._9_4.xml => Maven__org_testng_testng_6_9_9.xml} | 8 +-
.idea/libraries/Maven__org_yaml_snakeyaml_1_15.xml | 13 +
ejb2/CHANGES | 6 -
ejb2/COPYING | 341 ------------
ejb2/COPYING_LGPL | 510 ------------------
ejb2/README | 177 -------
ejb2/build.xml | 272 ----------
ejb2/prepare-jboss.xml | 39 --
ejb2/resources/application.xml | 19 -
ejb2/resources/build.properties | 12 -
ejb2/resources/jndi/jndi.properties | 3 -
ejb2/resources/postgis-ejb2-ds.xml | 17 -
ejb2/src/com/geodetix/geo/client/Client.java | 246 ---------
.../com/geodetix/geo/dao/PostGisGeometryDAO.java | 153 ------
.../geodetix/geo/dao/PostGisGeometryDAOImpl.java | 579 ---------------------
ejb2/src/com/geodetix/geo/ejb/GeometryBean.java | 298 -----------
.../com/geodetix/geo/ejb/GeometryFacadeBean.java | 238 ---------
.../exception/ApplicationGeoLayerException.java | 66 ---
ejb3/.classpath | 11 -
ejb3/.project | 18 -
ejb3/.settings/org.eclipse.jdt.core.prefs | 7 -
ejb3/EJB3Spatial.odt | Bin 56432 -> 0 bytes
ejb3/README.txt | 27 -
ejb3/build.xml | 70 ---
ejb3/jboss/geodata-ds.xml | 13 -
ejb3/jboss/ingest-service.xml | 7 -
ejb3/src/META-INF/persistence.xml | 5 -
ejb3/src/jndi.properties | 3 -
ejb3/src/org/postgis/ejb/PersonEntity.java | 95 ----
ejb3/src/org/postgis/ejb/UserBean.java | 123 -----
ejb3/src/org/postgis/ejb/UserBeanRemote.java | 34 --
ejb3/src/org/postgis/ejb/mdb/IngestMDB.java | 98 ----
.../org/postgis/hibernate/ContainsExpression.java | 82 ---
ejb3/src/org/postgis/hibernate/GeometryType.java | 149 ------
.../postgis/hibernate/IntersectsExpression.java | 82 ---
ejb3/src/org/postgis/hibernate/PostGISDialect.java | 75 ---
.../org/postgis/hibernate/WithinExpression.java | 82 ---
jdbc/pom.xml | 4 +-
jdbc/postgis-jdbc.iml | 11 +-
jdbc/src/main/java/examples/TestAutoregister.java | 28 +-
jdbc/src/main/java/org/postgis/ComposedGeom.java | 61 ++-
jdbc/src/main/java/org/postgis/DriverWrapper.java | 52 +-
.../java/org/postgis/DriverWrapperAutoprobe.java | 32 +-
.../src/main/java/org/postgis/DriverWrapperLW.java | 32 +-
jdbc/src/main/java/org/postgis/Geometry.java | 82 ++-
.../main/java/org/postgis/GeometryCollection.java | 28 +-
.../main/java/org/postgis/GeometryTokenizer.java | 76 +++
jdbc/src/main/java/org/postgis/LineString.java | 28 +-
jdbc/src/main/java/org/postgis/LinearRing.java | 46 +-
.../src/main/java/org/postgis/MultiLineString.java | 28 +-
jdbc/src/main/java/org/postgis/MultiPoint.java | 28 +-
jdbc/src/main/java/org/postgis/MultiPolygon.java | 28 +-
jdbc/src/main/java/org/postgis/PGbox2d.java | 28 +-
jdbc/src/main/java/org/postgis/PGbox3d.java | 28 +-
jdbc/src/main/java/org/postgis/PGboxbase.java | 64 ++-
jdbc/src/main/java/org/postgis/PGgeometry.java | 41 +-
jdbc/src/main/java/org/postgis/PGgeometryLW.java | 28 +-
jdbc/src/main/java/org/postgis/Point.java | 50 +-
.../main/java/org/postgis/PointComposedGeom.java | 36 +-
jdbc/src/main/java/org/postgis/Polygon.java | 28 +-
jdbc/src/main/java/org/postgis/Version.java | 30 +-
.../main/java/org/postgis/binary/BinaryParser.java | 41 +-
.../main/java/org/postgis/binary/BinaryWriter.java | 53 +-
.../main/java/org/postgis/binary/ByteGetter.java | 31 +-
.../main/java/org/postgis/binary/ByteSetter.java | 34 +-
.../main/java/org/postgis/binary/ValueGetter.java | 42 +-
.../main/java/org/postgis/binary/ValueSetter.java | 51 +-
.../java/org/postgis/AutoRegistrationTest.java | 28 +-
jdbc/src/test/java/org/postgis/BoxesTest.java | 28 +-
jdbc/src/test/java/org/postgis/DatatypesTest.java | 28 +-
.../test/java/org/postgis/EmptyGeometriesTest.java | 23 +
jdbc/src/test/java/org/postgis/ParserTest.java | 28 +-
jdbc/src/test/java/org/postgis/ServerTest.java | 28 +-
jdbc/src/test/java/org/postgis/TokenizerTest.java | 56 ++
jdbc/src/test/java/org/postgis/VersionPrinter.java | 26 +-
jdbc/src/test/resources/testng.xml | 1 +
jdbc_jtsparser/pom.xml | 6 +-
jdbc_jtsparser/postgis-jdbc-jtsparser.iml | 11 +-
.../src/main/java/org/postgis/jts/JTSShape.java | 30 +-
.../main/java/org/postgis/jts/JtsBinaryParser.java | 50 +-
.../main/java/org/postgis/jts/JtsBinaryWriter.java | 59 ++-
.../src/main/java/org/postgis/jts/JtsGeometry.java | 35 +-
.../main/java/org/postgis/jts/JtsGisWrapper.java | 42 +-
.../src/main/java/org/postgis/jts/JtsWrapper.java | 43 +-
.../test/java/org/postgis/jts/JtsParserTest.java | 23 +
pom.xml | 72 ++-
postgis-java-aggregator.iml | 11 +-
postgis-jdbc-java2d/pom.xml | 6 +-
postgis-jdbc-java2d/postgis-jdbc-java2d.iml | 11 +-
.../src/main/java/examples/TestJava2d.java | 89 +++-
.../java/org/postgis/java2d/Java2DWrapper.java | 30 +-
.../java/org/postgis/java2d/PGShapeGeometry.java | 43 +-
.../java/org/postgis/java2d/ShapeBinaryParser.java | 38 +-
.../postgis/java2d/SimpleJava2DWrapperTest.java | 22 +
101 files changed, 1388 insertions(+), 4668 deletions(-)
diff --git a/.gitignore b/.gitignore
index 4cfdf9a..59b50f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
# Created by .ignore support plugin (hsz.mobi)
.idea/misc.xml
+.idea/uiDesigner.xml
.idea/workspace.xml
.idea/dictionaries
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 9d07f6c..5be5ab9 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -5,5 +5,6 @@
<file url="file://$PROJECT_DIR$/jdbc" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/jdbc_jtsparser" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/postgis-jdbc-java2d" charset="UTF-8" />
+ <file url="PROJECT" charset="UTF-8" />
</component>
</project>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__junit_junit_4_10.xml b/.idea/libraries/Maven__junit_junit_4_10.xml
new file mode 100644
index 0000000..ed8bf5f
--- /dev/null
+++ b/.idea/libraries/Maven__junit_junit_4_10.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: junit:junit:4.10">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.10/junit-4.10.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.10/junit-4.10-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/junit/junit/4.10/junit-4.10-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_ant_ant_1_7_0.xml b/.idea/libraries/Maven__org_apache_ant_ant_1_7_0.xml
new file mode 100644
index 0000000..8124522
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_ant_ant_1_7_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.apache.ant:ant:1.7.0">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/ant/ant/1.7.0/ant-1.7.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/ant/ant/1.7.0/ant-1.7.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/ant/ant/1.7.0/ant-1.7.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_apache_ant_ant_launcher_1_7_0.xml b/.idea/libraries/Maven__org_apache_ant_ant_launcher_1_7_0.xml
new file mode 100644
index 0000000..78f510c
--- /dev/null
+++ b/.idea/libraries/Maven__org_apache_ant_ant_launcher_1_7_0.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.apache.ant:ant-launcher:1.7.0">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/apache/ant/ant-launcher/1.7.0/ant-launcher-1.7.0-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml
new file mode 100644
index 0000000..acdf443
--- /dev/null
+++ b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.hamcrest:hamcrest-core:1.1">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_12.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_13.xml
similarity index 64%
rename from .idea/libraries/Maven__org_slf4j_slf4j_api_1_7_12.xml
rename to .idea/libraries/Maven__org_slf4j_slf4j_api_1_7_13.xml
index 411efc6..4fd913d 100644
--- a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_12.xml
+++ b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_13.xml
@@ -1,13 +1,13 @@
<component name="libraryTable">
- <library name="Maven: org.slf4j:slf4j-api:1.7.12">
+ <library name="Maven: org.slf4j:slf4j-api:1.7.13">
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.12/slf4j-api-1.7.12.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.13/slf4j-api-1.7.13.jar!/" />
</CLASSES>
<JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.12/slf4j-api-1.7.12-javadoc.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.13/slf4j-api-1.7.13-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.12/slf4j-api-1.7.12-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/slf4j/slf4j-api/1.7.13/slf4j-api-1.7.13-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_testng_testng_6_9_4.xml b/.idea/libraries/Maven__org_testng_testng_6_9_9.xml
similarity index 67%
rename from .idea/libraries/Maven__org_testng_testng_6_9_4.xml
rename to .idea/libraries/Maven__org_testng_testng_6_9_9.xml
index b0a9080..0d0a507 100644
--- a/.idea/libraries/Maven__org_testng_testng_6_9_4.xml
+++ b/.idea/libraries/Maven__org_testng_testng_6_9_9.xml
@@ -1,13 +1,13 @@
<component name="libraryTable">
- <library name="Maven: org.testng:testng:6.9.4">
+ <library name="Maven: org.testng:testng:6.9.9">
<CLASSES>
- <root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/6.9.4/testng-6.9.4.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/6.9.9/testng-6.9.9.jar!/" />
</CLASSES>
<JAVADOC>
- <root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/6.9.4/testng-6.9.4-javadoc.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/6.9.9/testng-6.9.9-javadoc.jar!/" />
</JAVADOC>
<SOURCES>
- <root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/6.9.4/testng-6.9.4-sources.jar!/" />
+ <root url="jar://$MAVEN_REPOSITORY$/org/testng/testng/6.9.9/testng-6.9.9-sources.jar!/" />
</SOURCES>
</library>
</component>
\ No newline at end of file
diff --git a/.idea/libraries/Maven__org_yaml_snakeyaml_1_15.xml b/.idea/libraries/Maven__org_yaml_snakeyaml_1_15.xml
new file mode 100644
index 0000000..02d9152
--- /dev/null
+++ b/.idea/libraries/Maven__org_yaml_snakeyaml_1_15.xml
@@ -0,0 +1,13 @@
+<component name="libraryTable">
+ <library name="Maven: org.yaml:snakeyaml:1.15">
+ <CLASSES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.15/snakeyaml-1.15.jar!/" />
+ </CLASSES>
+ <JAVADOC>
+ <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.15/snakeyaml-1.15-javadoc.jar!/" />
+ </JAVADOC>
+ <SOURCES>
+ <root url="jar://$MAVEN_REPOSITORY$/org/yaml/snakeyaml/1.15/snakeyaml-1.15-sources.jar!/" />
+ </SOURCES>
+ </library>
+</component>
\ No newline at end of file
diff --git a/ejb2/CHANGES b/ejb2/CHANGES
deleted file mode 100644
index 226efe3..0000000
--- a/ejb2/CHANGES
+++ /dev/null
@@ -1,6 +0,0 @@
-PostGIS-EJB2-POC 1.0
-2006/08/29
-
-- Initial release!
-- EJB 2.x support
-- XDoclet code generation
diff --git a/ejb2/COPYING b/ejb2/COPYING
deleted file mode 100644
index a52b16e..0000000
--- a/ejb2/COPYING
+++ /dev/null
@@ -1,341 +0,0 @@
-
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users. This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it. (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.) You can apply it to
-your programs, too.
-
- When we speak of free software, we are referring to freedom, not
-price. Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
- To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
- For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have. You must make sure that they, too, receive or can get the
-source code. And you must show them these terms so they know their
-rights.
-
- We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
- Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software. If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
- Finally, any free program is threatened constantly by software
-patents. We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary. To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
- The precise terms and conditions for copying, distribution and
-modification follow.
-
- GNU GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License. The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language. (Hereinafter, translation is included without limitation in
-the term "modification".) Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
- 1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
- 2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) You must cause the modified files to carry prominent notices
- stating that you changed the files and the date of any change.
-
- b) You must cause any work that you distribute or publish, that in
- whole or in part contains or is derived from the Program or any
- part thereof, to be licensed as a whole at no charge to all third
- parties under the terms of this License.
-
- c) If the modified program normally reads commands interactively
- when run, you must cause it, when started running for such
- interactive use in the most ordinary way, to print or display an
- announcement including an appropriate copyright notice and a
- notice that there is no warranty (or else, saying that you provide
- a warranty) and that users may redistribute the program under
- these conditions, and telling the user how to view a copy of this
- License. (Exception: if the Program itself is interactive but
- does not normally print such an announcement, your work based on
- the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
- a) Accompany it with the complete corresponding machine-readable
- source code, which must be distributed under the terms of Sections
- 1 and 2 above on a medium customarily used for software interchange; or,
-
- b) Accompany it with a written offer, valid for at least three
- years, to give any third party, for a charge no more than your
- cost of physically performing source distribution, a complete
- machine-readable copy of the corresponding source code, to be
- distributed under the terms of Sections 1 and 2 above on a medium
- customarily used for software interchange; or,
-
- c) Accompany it with the information you received as to the offer
- to distribute corresponding source code. (This alternative is
- allowed only for noncommercial distribution and only if you
- received the program in object code or executable form with such
- an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it. For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable. However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License. Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
- 5. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Program or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
- 6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
- 7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all. For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time. Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation. If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
- 10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission. For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this. Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
- NO WARRANTY
-
- 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
- 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Programs
-
- If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
- To do so, attach the following notices to the program. It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) 19yy <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
- Gnomovision version 69, Copyright (C) 19yy name of author
- Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
- This is free software, and you are welcome to redistribute it
- under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License. Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the program
- `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
- <signature of Ty Coon>, 1 April 1989
- Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs. If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library. If this is what you want to do, use the GNU Library General
-Public License instead of this License.
diff --git a/ejb2/COPYING_LGPL b/ejb2/COPYING_LGPL
deleted file mode 100644
index b124cf5..0000000
--- a/ejb2/COPYING_LGPL
+++ /dev/null
@@ -1,510 +0,0 @@
-
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL. It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
- Preamble
-
- The licenses for most software are designed to take away your
-freedom to share and change it. By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
- This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it. You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations
-below.
-
- When we speak of free software, we are referring to freedom of use,
-not price. Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
- To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights. These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
- For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you. You must make sure that they, too, receive or can get the source
-code. If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it. And you must show them these terms so they know their rights.
-
- We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
- To protect each distributor, we want to make it very clear that
-there is no warranty for the free library. Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
- Finally, software patents pose a constant threat to the existence of
-any free program. We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder. Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
- Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License. This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License. We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
- When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library. The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom. The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
- We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License. It also provides other free software developers Less
-of an advantage over competing non-free programs. These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries. However, the Lesser license provides advantages in certain
-special circumstances.
-
- For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it
-becomes a de-facto standard. To achieve this, non-free programs must
-be allowed to use the library. A more frequent case is that a free
-library does the same job as widely used non-free libraries. In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
- In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software. For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
- Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
- The precise terms and conditions for copying, distribution and
-modification follow. Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library". The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
- GNU LESSER GENERAL PUBLIC LICENSE
- TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
- 0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
- A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
- The "Library", below, refers to any such software library or work
-which has been distributed under these terms. A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language. (Hereinafter, translation is
-included without limitation in the term "modification".)
-
- "Source code" for a work means the preferred form of the work for
-making modifications to it. For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control
-compilation and installation of the library.
-
- Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope. The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it). Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
- 1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
- You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
- 2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
- a) The modified work must itself be a software library.
-
- b) You must cause the files modified to carry prominent notices
- stating that you changed the files and the date of any change.
-
- c) You must cause the whole of the work to be licensed at no
- charge to all third parties under the terms of this License.
-
- d) If a facility in the modified Library refers to a function or a
- table of data to be supplied by an application program that uses
- the facility, other than as an argument passed when the facility
- is invoked, then you must make a good faith effort to ensure that,
- in the event an application does not supply such function or
- table, the facility still operates, and performs whatever part of
- its purpose remains meaningful.
-
- (For example, a function in a library to compute square roots has
- a purpose that is entirely well-defined independent of the
- application. Therefore, Subsection 2d requires that any
- application-supplied function or table used by this function must
- be optional: if the application does not supply it, the square
- root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole. If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works. But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
- 3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library. To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License. (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.) Do not make any other change in
-these notices.
-
- Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
- This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
- 4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
- If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
- 5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library". Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
- However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library". The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
- When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library. The
-threshold for this to be true is not precisely defined by law.
-
- If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work. (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
- Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
- 6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
- You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License. You must supply a copy of this License. If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License. Also, you must do one
-of these things:
-
- a) Accompany the work with the complete corresponding
- machine-readable source code for the Library including whatever
- changes were used in the work (which must be distributed under
- Sections 1 and 2 above); and, if the work is an executable linked
- with the Library, with the complete machine-readable "work that
- uses the Library", as object code and/or source code, so that the
- user can modify the Library and then relink to produce a modified
- executable containing the modified Library. (It is understood
- that the user who changes the contents of definitions files in the
- Library will not necessarily be able to recompile the application
- to use the modified definitions.)
-
- b) Use a suitable shared library mechanism for linking with the
- Library. A suitable mechanism is one that (1) uses at run time a
- copy of the library already present on the user's computer system,
- rather than copying library functions into the executable, and (2)
- will operate properly with a modified version of the library, if
- the user installs one, as long as the modified version is
- interface-compatible with the version that the work was made with.
-
- c) Accompany the work with a written offer, valid for at least
- three years, to give the same user the materials specified in
- Subsection 6a, above, for a charge no more than the cost of
- performing this distribution.
-
- d) If distribution of the work is made by offering access to copy
- from a designated place, offer equivalent access to copy the above
- specified materials from the same place.
-
- e) Verify that the user has already received a copy of these
- materials or that you have already sent this user a copy.
-
- For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it. However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
- It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system. Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
- 7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
- a) Accompany the combined library with a copy of the same work
- based on the Library, uncombined with any other library
- facilities. This must be distributed under the terms of the
- Sections above.
-
- b) Give prominent notice with the combined library of the fact
- that part of it is a work based on the Library, and explaining
- where to find the accompanying uncombined form of the same work.
-
- 8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License. Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License. However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
- 9. You are not required to accept this License, since you have not
-signed it. However, nothing else grants you permission to modify or
-distribute the Library or its derivative works. These actions are
-prohibited by law if you do not accept this License. Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
- 10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions. You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
- 11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License. If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all. For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply, and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices. Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
- 12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License
-may add an explicit geographical distribution limitation excluding those
-countries, so that distribution is permitted only in or among
-countries not thus excluded. In such case, this License incorporates
-the limitation as if written in the body of this License.
-
- 13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number. If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation. If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
- 14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission. For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this. Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
- NO WARRANTY
-
- 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
- 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
- END OF TERMS AND CONDITIONS
-
- How to Apply These Terms to Your New Libraries
-
- If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change. You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms
-of the ordinary General Public License).
-
- To apply these terms, attach the following notices to the library.
-It is safest to attach them to the start of each source file to most
-effectively convey the exclusion of warranty; and each file should
-have at least the "copyright" line and a pointer to where the full
-notice is found.
-
-
- <one line to give the library's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or
-your school, if any, to sign a "copyright disclaimer" for the library,
-if necessary. Here is a sample; alter the names:
-
- Yoyodyne, Inc., hereby disclaims all copyright interest in the
- library `Frob' (a library for tweaking knobs) written by James
- Random Hacker.
-
- <signature of Ty Coon>, 1 April 1990
- Ty Coon, President of Vice
-
-That's all there is to it!
-
-
diff --git a/ejb2/README b/ejb2/README
deleted file mode 100644
index d67ef69..0000000
--- a/ejb2/README
+++ /dev/null
@@ -1,177 +0,0 @@
-Using PostGIS Geometry Types with EJB2 -- Proof of Concept
-----------------------------------------------------------
-Copyright (C) 2006 by the Geodetix s.r.l. Company. See
-http://www.geodetix.it/ for further information.
-
-Version 1.0.0 (2006/08/29)
-
-Table of Contents
------------------
-
-0. Licensing
-1. Introduction
-2. Directory Contents
-3. Software Requirements
-4. Installation
-5. Running
-6. Code Details
-
-
-0. Licensing
-------------
-The "Using PostGIS Geometry Types with EJB2 -- Proof of Concept" software is
-a short collection of examples related to the use of PostGIS Java API with
-the EJB 2.x technology.
-Copyright (C) 2006 by the Geodetix s.r.l. Company. See
-http://www.geodetix.it/ for further information.
-
-This library is free software; you can redistribute it and/or
-modify it under the terms of the GNU Lesser General Public
-License as published by the Free Software Foundation; either
-version 2.1 of the License, or (at your option) any later version.
-
-This library is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-Lesser General Public License for more details.
-
-You should have received a copy of the GNU Lesser General Public
-License along with this library; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-
-1. Introduction
----------------
-Our software is a simple proof-of-concept application illustrating how the
-PostGIS provided Java geometric types could be integrated with a set of
-Enterprise Java Bean 2.x components.
-
-To achieve such a goal, an attribute of type org.postgis.Geometry has been
-added to a BMP (Bean managed Persistence) Entity Bean. Furthermore, by using
-the DAO (Data Access Object) Pattern, the persistence code has been clearly
-separated from the business logic.
-
-Not to add further complexity, some proper programming behaviours were omitted.
-For example the use of PostGIS geometric types directly inside the Entity Bean
-code could be avoided by using a WKT compliant string attribute. Another issue
-is about security: table creational methods exposed in the
-com.geodetix.geo.ejb.GeometryBean home interface should be protected by
-a proper role-base security policy, to avoid normal users deleting database
-tables.
-
-Nevertheless our application, even if quite simple, still holds a lot of
-generality and some of the implemented patterns or components are readily
-usable in real-world applications.
-
-
-2. Directory Contents
----------------------
-
- ./ Build scripts (build.*), README and licensing information
- ./src Java source packages and files
- ./resources EJB specific configuration files
- ./lib JAR libraries needed to compile and run
-
-
-3. Software Requirements
-------------------------
-We here list all third-party libraries with their versions tested to work
-with the application.
-
-PostGIS JDBC driver version 1.1.3
-http://www.postgis.org/
-
-PostgreSQL JDBC driver version 8.1-404 jdbc3
-http://jdbc.postgresql.org/
-
-XDoclet lib version 1.2.3
-http://xdoclet.sourceforge.net
-
-Apache ANT version 1.6.5
-http://ant.apache.org/
-
-JBOSS Application Server version 4.0.4.GA-Patch1
-http://www.jboss.org/
-
-Note that our tool is application server agnostic and could be easily ported
-to any EJB 2.x compliant Container by modifying the provided deployment
-ant file which is, in turn, written for the JBoss Application Server.
-
-
-4. Installation
----------------
-After downloading (and compiling, if necessary) all of the required software,
-follow these steps:
-
-- copy the PostGIS driver (postgis_1.1.3.jar) into the ./lib/commonlib
-directory
-
-- copy the PostgreSQL driver (postgresql-8.1-404.jdbc3.jar) into the
-./lib/compiletimelib directory
-
-- copy the XDoclet libraries (contained in xdoclet-lib-1.2.3.tgz) into the
-./lib/xdocletlib directory
-
-- install Apache ANT (follow the installation istructions provided
-with the tool)
-
-- install the JBoss Application Server
-
-- make sure that your JBOSS_HOME environment variable correctly points to
-the JBoss installation directory (i.e. /opt/jboss-4.0.4.GA)
-
-- create a new PostGIS database according to what specified in the
-./resources/build.properties with the "database.name", "database.login",
-"database.password" properties (eventually change them to fit your needs).
-
-
-5. Running
-----------
-Start the JBoss application server with the provided scripts
-(run.bat or run.sh).
-
-From the main application directory (./) execute these commands:
-
-> ant install-JDBC-driver
-This command installs the PostgreSQL driver into JBoss
-
-> ant install-DataSource
-This command installs the DataSource Connector into JBoss
-
-> ant javadoc
-This command generates the application API documentation into the ./javadoc
-directory (use index.html to start).
-
-> ant deploy
-Installs the application into JBoss
-
-> ant run-client
-Allows to test the installed application
-
-
-6. Code Details
----------------
-The main components made available in the application are:
-
-- GeometryBean.java
-It is an entity bean containing a geometrical attribute of org.postgis.Geometry
-type which could contain every geometrical type (i.e. POINT, LINESTRING, etc.).
-The user can choose wether to create a NON-OpenGIS or an OpenGIS-compliant
-bean. The first ones can contain different geometric types in the same table
-with undefined SRID (-1), while the second ones can only contain object of the
-same type and SRID in one table;
-
-- PostgisGeometryDaoIml.java
-A DAO (Data Access Object) implementing persistence operations for the
-GeometryBean EJB in a PostGIS database;
-
-- GeometryFacadeBean.java
-A stateless session bean implementing the interface between the geometric
-entity beans and the client applications;
-
-- Client.java
-It is a simple client executing some tests thus illustrating the use of the
-provided API.
-
-Further informations could be gathered from the source code and by reading the
-javadoc API documentation.
diff --git a/ejb2/build.xml b/ejb2/build.xml
deleted file mode 100644
index beaf506..0000000
--- a/ejb2/build.xml
+++ /dev/null
@@ -1,272 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project name="postgis-ejb2-poc" default="clean" basedir=".">
- <description>Using PostGIS Geometry Types with EJB2 - Proof of Concept</description>
-
- <!-- ENVIROMENT VARIABLES -->
- <property environment="env"/>
-
- <!-- JBOSS PROPERTIES -->
- <property name="jboss.home" value="${env.JBOSS_HOME}"/>
- <property name="jboss.server.config" value="default"/>
- <property name="jboss.server.lib" value="${jboss.home}/server/default/lib"/>
- <property name="jboss.config.dir" value="${jboss.home}/server/default/conf"/>
- <property name="jboss.deploy.dir" value="${jboss.home}/server/default/deploy"/>
-
- <!-- REGULAR DIRECTORIES -->
- <property name="src.dir" value="src"/>
- <property name="build.dir" value="build"/>
- <property name="distro.dir" value="distro"/>
- <property name="resources.dir" value="resources"/>
- <property name="lib.dir" value="lib"/>
- <property name="compiletime.lib.dir" value="${lib.dir}/compiletimelib"/>
- <property name="common.jar.dir" value="common"/>
- <property name="common.lib.dir" value="${lib.dir}/commonlib"/>
- <property name="merge.dir" value="merge"/>
- <property name="ejb.jar.dir" value="ejbjars"/>
- <property name="javadoc.dir" value="javadoc"/>
-
- <!-- GENERATED DIRECTORIES -->
- <property name="gen.src.dir" value="gensrc"/>
- <property name="generated.dir" value="generated"/>
- <property name="ejb.deployment.dir" value="${generated.dir}/ejbdeploy"/>
-
- <!-- WHERE TO DEPLOY THE FINISHED EAR FILE -->
- <property name="deploy.path" value="${jboss.home}/server/${jboss.server.config}/deploy"/>
-
- <!-- WHERE XDOCLET JARS ARE -->
- <property name="xdoclet.lib.dir" value="${lib.dir}/xdocletlib"/>
-
- <!-- PATH DEFINITION -->
- <path id="classpath">
- <fileset dir="${lib.dir}" includes="*.jar"/>
- <fileset dir="${compiletime.lib.dir}" includes="*.jar"/>
- <fileset dir="${common.lib.dir}" includes="*.jar"/>
- <fileset dir="${xdoclet.lib.dir}" includes="*.jar"/>
- <fileset dir="${jboss.server.lib}" includes="*.jar"/>
- <fileset dir="${jboss.home}/client" includes="**/*.jar"/>
- <pathelement location="${resources.dir}/jndi"/>
- <pathelement location="${build.dir}"/>
- </path>
-
- <!-- LOAD USER DEFINED PROPERTIES -->
- <!-- You can add your variables and/or properties in this file -->
- <property file="${resources.dir}/build.properties" />
-
- <!-- DATABASE RELATED PROPERTIES -->
- <property name="datasource.name" value="postgis-ejb2-ds"/>
- <property name="datasource.file.name" value="postgis-ejb2-ds.xml"/>
- <property name="database.connection.port" value="5432"/>
- <property name="database.driver" value="org.postgresql.Driver"/>
- <property name="database.connection.url" value="jdbc:postgresql://${database.host}:${database.connection.port}/${database.name}"/>
-
- <!-- IMPORT RELATED BUILD FILES -->
- <import file="${basedir}/prepare-jboss.xml" />
-
-
- <target name="clean" description="Delete all temporary directories and files created in the build.">
- <echo message="Delete all temporary directories and files created in the build."/>
-
- <delete dir="${gen.src.dir}"/>
- <delete dir="${ejb.deployment.dir}"/>
- <delete dir="${ejb.jar.dir}"/>
- <delete dir="${common.jar.dir}"/>
- <delete dir="${build.dir}"/>
- <delete dir="${distro.dir}"/>
- <delete dir="${generated.dir}"/>
- <delete dir="${javadoc.dir}"/>
-
- <delete>
- <fileset dir="${basedir}" includes="**/*.bak"/>
- </delete>
- </target>
-
-
- <target name="deploy" description="Deploy the application into JBOSS." depends="build-ear">
- <echo message="Deploy EAR file."/>
- <copy file="${distro.dir}/${ant.project.name}.ear" todir="${deploy.path}"/>
- </target>
-
-
- <target name="undeploy" description="Undeploy the Application." >
- <echo message="Undeploy EAR file."/>
- <delete file="${deploy.path}/${ant.project.name}.ear" />
- </target>
-
-
- <target name="generate-ejb">
- <echo message="Generate files with XDoclet."/>
-
- <taskdef name="ejbdoclet"
- classname="xdoclet.modules.ejb.EjbDocletTask"
- classpathref="classpath"/>
-
- <!-- Generate EJB "stuff" -->
- <ejbdoclet destdir="${gen.src.dir}" mergeDir="${merge.dir}" ejbSpec="2.1">
- <packageSubstitution packages="ejb" substituteWith="interfaces"/>
-
- <fileset dir="${src.dir}">
- <include name="**/*Bean.java" />
- <include name="**/*Service.java" />
- </fileset>
-
- <!-- Generate a deployment descriptor file, including all beans processed. -->
- <deploymentdescriptor destdir="${ejb.deployment.dir}"/>
-
- <!-- Generate JBOSS specific files -->
- <jboss destdir="${ejb.deployment.dir}" version="4.0" />
-
- <!-- Generate all of the home and logical interfaces, unless told otherwise in the meta-information. -->
- <homeinterface/>
- <remoteinterface/>
- <localinterface/>
- <localhomeinterface/>
-
- <!-- Generate a value object if the bean has a @ejb.value-object tag.-->
- <valueobject>
- <packageSubstitution packages="ejb"
- substituteWith="value"/>
- </valueobject>
-
- <!-- Generate a utility object for each EJB. -->
- <utilobject includeGUID="true"
- cacheHomes="true"
- kind="physical">
- <packageSubstitution packages="ejb"
- substituteWith="util"/>
- </utilobject>
-
- <!-- Generate complete entity and session classes (including ejbXXX() methods) based on the implementation class. -->
- <entitybmp/>
- <entitycmp/>
- <session/>
-
- <entitypk>
- <packageSubstitution packages="ejb"
- substituteWith="pk"/>
- </entitypk>
-
- <dao pattern="{0}Dao">
- <packageSubstitution packages="ejb"
- substituteWith="dao"/>
- </dao>
-
- </ejbdoclet>
- </target>
-
-
- <target name="build-common-jar" >
- <mkdir dir="${common.jar.dir}"/>
-
- <jar destfile="${common.jar.dir}/common.jar">
- <fileset dir="${common.lib.dir}" includes="*.jar"/>
- </jar>
- </target>
-
-
- <target name="build-ear"
- depends="build-ejb-jar,build-common-jar"
- description="Build .ear file and put it into distro dir.">
- <mkdir dir="${distro.dir}"/>
-
- <ear destfile="${distro.dir}/${ant.project.name}.ear"
- appxml="${resources.dir}/application.xml">
- <fileset dir="${ejb.jar.dir}" includes="*.jar"/>
- <fileset dir="${common.jar.dir}" includes="*.jar"/>
- </ear>
- </target>
-
-
- <target name="build-ejb-jar" depends="compile" >
- <mkdir dir="${ejb.jar.dir}"/>
-
- <jar jarfile="${ejb.jar.dir}/ejb.jar">
- <fileset dir="${build.dir}">
- <include name="**/ejb/*.class"/>
- <include name="**/exception/*.class"/>
- <include name="**/util/*.class"/>
- <include name="**/dao/*.class"/>
- <include name="**/value/*.class"/>
- <include name="**/interfaces/*.class"/>
- <exclude name="**/client/*.class"/>
- </fileset>
-
- <metainf dir="${ejb.deployment.dir}">
- <include name="ejb-jar.xml"/>
- <include name="jboss.xml"/>
- <include name="jbosscmp-jdbc.xml"/>
- </metainf>
- </jar>
- </target>
-
-
- <target name="compile" depends="clean,generate-ejb" description="Compile EJB source code.">
- <echo message="Compile source code."/>
-
- <mkdir dir="${build.dir}"/>
-
- <javac debug="on"
- deprecation="on"
- optimize="on"
- encoding="iso-8859-1"
- listfiles="no"
- destdir="${build.dir}"
- classpathref="classpath">
- <src path="${gen.src.dir};${src.dir}"/>
- <exclude name="**/client/*.java"/>
- </javac>
- </target>
-
-
- <target name="compile-client" depends="compile" description="Compile Client source code.">
- <echo message="Compile Client source code."/>
-
- <delete>
- <fileset dir="${build.dir}" includes="**/client/*.*"/>
- </delete>
-
- <mkdir dir="${build.dir}"/>
-
- <javac debug="on"
- deprecation="on"
- optimize="on"
- encoding="iso-8859-1"
- listfiles="no"
- destdir="${build.dir}"
- classpathref="classpath">
- <src path="${gen.src.dir};${src.dir}"/>
- <include name="**/client/*.java"/>
- </javac>
- </target>
-
-
- <target name="run-client" description="Execute Client." depends="compile-client">
- <java classname="com.geodetix.geo.client.Client" dir="." fork="true" classpathref="classpath" />
- </target>
-
-
- <target name="javadoc"
- depends="compile"
- description="Create Project API documentation.">
- <delete dir="${javadoc.dir}" />
- <mkdir dir="${javadoc.dir}"/>
- <javadoc destdir="${javadoc.dir}" sourcepath="${gen.src.dir};${src.dir}">
- <classpath refid="classpath"/>
- <packageset dir="${gen.src.dir}" defaultexcludes="yes">
- <include name="**"/>
- <exclude name="**/ejb/**"/>
- </packageset>
-
- <packageset dir="${src.dir}" defaultexcludes="yes">
- <include name="**/exception/**"/>
- <include name="**/client/**"/>
- <include name="**/dao/**"/>
- <exclude name="**/ejb/**"/>
- </packageset>
-
- <doctitle><![CDATA[<h1>Using PostGIS Geometry Types with EJB2 <br> Proof of Concept</h1>]]></doctitle>
- <bottom><![CDATA[<i>Copyright © 2006 <a href="http://www.geodetix.it" target="_new">Geodetix S.r.l.</a> All Rights Reserved.</i>]]></bottom>
- </javadoc>
- </target>
-
-</project>
diff --git a/ejb2/prepare-jboss.xml b/ejb2/prepare-jboss.xml
deleted file mode 100644
index 16e9c4b..0000000
--- a/ejb2/prepare-jboss.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<project basedir=".">
-
- <!-- PROPERTY DEFINITIONS -->
- <property name="tmp.dir" value="tmp"/>
-
- <target name="install-DataSource" description="Copy DataSource definition file into JBOSS deploy dir." >
- <echo message="Copy DataSource definition file into JBOSS deploy dir"/>
-
- <copy file="${resources.dir}/${datasource.file.name}" todir="${tmp.dir}"/>
-
- <mkdir dir="${tmp.dir}"/>
-
- <replace file="${tmp.dir}/${datasource.file.name}">
- <replacefilter token="@datasource.name@" value="${datasource.name}"/>
- <replacefilter token="@database.connection.url@" value="${database.connection.url}"/>
- <replacefilter token="@database.driver@" value="${database.driver}"/>
- <replacefilter token="@database.login@" value="${database.login}"/>
- <replacefilter token="@database.password@" value="${database.password}"/>
- </replace>
-
- <copy file="${tmp.dir}/${datasource.file.name}" todir="${jboss.deploy.dir}"/>
-
- <delete dir="${tmp.dir}" />
- </target>
-
-
- <target name="install-JDBC-driver" description="Copy Postgresql JDBC Driver into JBOSS deploy dir." >
- <echo message="Postgresql JDBC Driver into JBOSS deploy dir"/>
-
- <copy todir="${jboss.deploy.dir}">
- <fileset dir="${compiletime.lib.dir}">
- <include name="postgres*.jar"/>
- </fileset>
- </copy>
- </target>
-
-</project>
diff --git a/ejb2/resources/application.xml b/ejb2/resources/application.xml
deleted file mode 100644
index 6f5654a..0000000
--- a/ejb2/resources/application.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE application PUBLIC '-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN'
- 'http://java.sun.com/dtd/application_1_3.dtd'>
-
-<application>
-
- <display-name>postgis-ejb2-poc</display-name>
-
- <description>Using PostGIS Geometry Types with EJB2 - Proof of Concept</description>
-
- <module>
- <ejb>ejb.jar</ejb>
- </module>
-
- <module>
- <java>common.jar</java>
- </module>
-
-</application>
diff --git a/ejb2/resources/build.properties b/ejb2/resources/build.properties
deleted file mode 100644
index 9209cc0..0000000
--- a/ejb2/resources/build.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-# You can change these properties to fit your environment.
-# This should be the only file to modify.
-# Note that you should NOT leave spaces after a property value
-
-# Name of the created database
-database.name=ejb2poc
-# User owner of the database tables
-database.login=CHANGEIT
-# Password for the db user
-database.password=CHANGEIT
-# IP or hostname of the machine running the database server
-database.host=127.0.0.1
diff --git a/ejb2/resources/jndi/jndi.properties b/ejb2/resources/jndi/jndi.properties
deleted file mode 100644
index 8e65c86..0000000
--- a/ejb2/resources/jndi/jndi.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-java.naming.provider.url=localhost
diff --git a/ejb2/resources/postgis-ejb2-ds.xml b/ejb2/resources/postgis-ejb2-ds.xml
deleted file mode 100644
index ec10549..0000000
--- a/ejb2/resources/postgis-ejb2-ds.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- ================================================== -->
-<!-- Datasource config for Postgres -->
-<!-- DO NOT EDIT, it is a template configuration file! -->
-<!-- ================================================== -->
-
-
-<datasources>
- <local-tx-datasource>
- <jndi-name>@datasource.name@</jndi-name>
- <connection-url>@database.connection.url@</connection-url>
- <driver-class>@database.driver@</driver-class>
- <user-name>@database.login@</user-name>
- <password>@database.password@</password>
- </local-tx-datasource>
-</datasources>
\ No newline at end of file
diff --git a/ejb2/src/com/geodetix/geo/client/Client.java b/ejb2/src/com/geodetix/geo/client/Client.java
deleted file mode 100644
index a077c2c..0000000
--- a/ejb2/src/com/geodetix/geo/client/Client.java
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
- * Client.java
- *
- * Using PostGIS Geometry Types with EJB2 - Proof of Concept
- *
- * Copyright 2006, Geodetix S.r.l. (http://www.geodetix.it)
- * and individual contributors as indicated by the @authors tag.
- *
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
- *
- */
-package com.geodetix.geo.client;
-
-import com.geodetix.geo.exception.ApplicationGeoLayerException;
-import com.geodetix.geo.interfaces.GeometryFacade;
-import com.geodetix.geo.interfaces.GeometryFacadeHome;
-
-import com.geodetix.geo.util.GeometryFacadeUtil;
-import com.geodetix.geo.value.GeometryValue;
-
-import java.rmi.RemoteException;
-
-import javax.naming.InitialContext;
-import javax.naming.Context;
-import javax.naming.NamingException;
-import javax.rmi.PortableRemoteObject;
-
-import java.util.*;
-import org.postgis.*;
-
-
-/**
- * A client executing a simple Test Case and illustrating the Geometry Bean Usage.
- *
- * @author <a href="mailto:antonio.pace at geodetix.it">Antonio Pace</a>
- */
-public class Client {
-
-
- private GeometryFacade geometryFacade;
-
- private Point p1;
- private Point p2;
- private LineString fromP1toP2;
- private Polygon searchPolygon;
-
-
- /**
- * Initializer method.
- *
- * @param geometryFacade the geometry facade object used to interact
- * with the EJBs
- */
- public Client(GeometryFacade geometryFacade) {
-
- this.geometryFacade=geometryFacade;
-
- this.init();
- }
-
- private void init(){
-
- // Create geometry stuff
-
- // City Stadium
- this.p1= new Point(16.23034006,39.31054320);
-
- // City Train Station
- this.p2= new Point(16.26002601,39.31920668);
-
- this.fromP1toP2= new LineString(new Point[] {p1,p2});
-
-
- // Create search polygon
-
- Point[] points = new Point[]{
-
- new Point(16.16399297, 39.40109388),
- new Point(16.32368776, 39.39596998),
- new Point(16.32397242, 39.25335486),
- new Point(16.16399297, 39.25534748),
- new Point(16.16399297, 39.40109388),
- };
-
- LinearRing[] linearRings = { new LinearRing(points) };
-
- // City Area Extension
- this.searchPolygon = new Polygon(linearRings);
- }
-
-
-
- private void executeNonOpenGisTest() throws ApplicationGeoLayerException, RemoteException {
-
- System.out.println("Execute some Tests on NON-OpenGIS Geometry EJBs");
-
- geometryFacade.createGeometryTable();
-
- System.out.println("create some geometry stuff...");
-
- this.showGeometry(p1);
- GeometryValue gv1 = geometryFacade.createGeometry(p1,"[ City Stadium ]");
-
- this.showGeometry(p2);
- GeometryValue gv2 = geometryFacade.createGeometry(p2,"[ City Train Station ]");
-
- this.showGeometry(fromP1toP2);
- GeometryValue gv3 = geometryFacade.createGeometry(fromP1toP2,"Line from "
- + gv1.getDescription()
- + " to "
- + gv2.getDescription());
-
- System.out.println("Searching created geometries in City Area Perimeter: ");
- this.showGeometry(searchPolygon);
-
- Collection<GeometryValue> findResults = (Collection<GeometryValue>) geometryFacade.findByPolygon(searchPolygon);
-
- System.out.println("Search Results:");
-
- for (GeometryValue geometry : findResults ) {
-
- this.showGeometry(geometry);
- }
-
- geometryFacade.dropGeometryTable();
- }
-
-
-
-
-
- private void executeOpenGisTest() throws ApplicationGeoLayerException, RemoteException {
-
- System.out.println("Execute some Tests on OpenGIS Geometry EJBs");
-
- geometryFacade.createGeometryTable("POINT",4326,2);
-
- System.out.println("Create some Points ....");
-
- // Setting SRID
- this.p1.setSrid(4326);
- this.p2.setSrid(4326);
- this.searchPolygon.setSrid(4326);
-
- this.showGeometry(p1);
- GeometryValue gv1 = geometryFacade.createGeometry(p1,"[ City Stadium ]");
-
- this.showGeometry(p2);
- GeometryValue gv2 = geometryFacade.createGeometry(p2,"[ City Train Station ]");
-
- System.out.println();
- System.out.println("Searching created Points in City Area Perimeter: ");
- this.showGeometry(searchPolygon);
-
- // Note the use of geometricFacade finder method
- Collection<GeometryValue> findResults = (Collection<GeometryValue>) geometryFacade.findByPolygon(searchPolygon);
-
- System.out.println("Search Results:");
-
- for (GeometryValue geometry : findResults ) {
-
- this.showGeometry(geometry);
- }
-
- geometryFacade.dropGeometryTable();
- }
-
-
-
- private void showGeometry(Geometry geometry) {
-
- System.out.println("Geometry: "+geometry.getTypeString()+geometry.getValue() + " SRID: "+geometry.getSrid());
- }
-
-
- private void showGeometry(GeometryValue geometryValue) {
-
- System.out.println("EJB Id: "+geometryValue.getId());
- System.out.println("Description: "+geometryValue.getDescription());
-
- this.showGeometry(geometryValue.getGeometry());
- }
-
-
- /**
- * Main client method.
- *
- * @param args arguments from the command line
- */
- public static void main(String [] args) {
-
- try {
-
- GeometryFacadeHome geometryFacadeHome= GeometryFacadeUtil.getHome();
-
- GeometryFacade geometryFacade= geometryFacadeHome.create();
-
- Client client = new Client(geometryFacade);
-
- System.out.println("===============================");
- System.out.println("== TEST 1 =====================");
- System.out.println("===============================");
- client.executeNonOpenGisTest();
-
- System.out.println("===============================");
- System.out.println("== TEST 2 =====================");
- System.out.println("===============================");
- client.executeOpenGisTest();
-
- System.out.println("===============================");
- System.out.println("DONE.");
-
- } catch (ApplicationGeoLayerException ae) {
- ae.printStackTrace();
- } catch (java.rmi.RemoteException re) {
- re.printStackTrace();
- } catch (javax.naming.NamingException ne) {
- ne.printStackTrace();
- } catch (javax.ejb.CreateException ce) {
- ce.printStackTrace();
- }
-
- }
-
-
-
- private static Context getInitialContext()
- throws javax.naming.NamingException {
-
- return new javax.naming.InitialContext();
- }
-
-}
diff --git a/ejb2/src/com/geodetix/geo/dao/PostGisGeometryDAO.java b/ejb2/src/com/geodetix/geo/dao/PostGisGeometryDAO.java
deleted file mode 100644
index 5ce836b..0000000
--- a/ejb2/src/com/geodetix/geo/dao/PostGisGeometryDAO.java
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
- * PostGisGeometryDAO.java
- *
- * Using PostGIS Geometry Types with EJB2 - Proof of Concept
- *
- * Copyright 2006, Geodetix S.r.l. (http://www.geodetix.it)
- * and individual contributors as indicated by the @authors tag.
- *
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
- *
- */
-package com.geodetix.geo.dao;
-
-
-/**
- * This is the DAO (Data Access Object) interface customized for
- * the PostGIS database which extends the XDoclet's auto-generated
- * GeometryDao interface and contains all of the SQL query statements.
- *
- * @author <a href="mailto:antonio.pace at geodetix.it">Antonio Pace</a>
- *
- */
-public interface PostGisGeometryDAO extends GeometryDao {
-
- /* ========== Constants Definition ============ */
-
- /** DataSource Lookup String */
- public static final String DATASOURCE_NAME = "java:/postgis-ejb2-ds";
-
- /* ========== SQL Queries Definition ============ */
-
- /**
- * Query executed from
- * {@link com.geodetix.geo.dao.PostGisGeometryDAOImpl}
- * on PostGIS when the method
- * {@link com.geodetix.geo.ejb.GeometryBean#ejbCreate(org.postgis.Geometry, java.lang.String)}
- * is called.
- */
- public static final String EJB_CREATE_STATEMENT =
- "INSERT INTO geometries (id,geometry,description) VALUES (?,?,?)";
-
- /**
- * Query executed from
- * {@link com.geodetix.geo.dao.PostGisGeometryDAOImpl}
- * on PostGIS when the method
- * {@link com.geodetix.geo.interfaces.GeometryLocalHome#findByPrimaryKey(java.lang.Integer)}
- * is called.
- */
- public static final String FIND_BY_PRIMARY_KEY_STATEMENT =
- "SELECT id FROM geometries WHERE id = ?";
-
-
- /**
- * Query executed from
- * {@link com.geodetix.geo.dao.PostGisGeometryDAOImpl}
- * on PostGIS when the method
- * {@link com.geodetix.geo.interfaces.GeometryLocalHome#findByPolygon(org.postgis.Polygon)}
- * is called.
- */
- public static final String FIND_BY_POLYGON_STATEMENT =
- "SELECT id FROM geometries WHERE contains(?,geometry)";
-
-
- /**
- * Query executed from
- * {@link com.geodetix.geo.dao.PostGisGeometryDAOImpl}
- * on PostGIS when the method
- * {@link com.geodetix.geo.interfaces.GeometryLocalHome#makeDbTable()}
- * is called.
- */
- public static final String HOME_CREATE_NON_OPENGIS_TABLE_STATEMENT =
- "CREATE TABLE geometries (id INT PRIMARY KEY, description TEXT, geometry GEOMETRY)";
-
-
- /**
- * Query executed from
- * {@link com.geodetix.geo.dao.PostGisGeometryDAOImpl}
- * on PostGIS when the method
- * {@link com.geodetix.geo.interfaces.GeometryLocalHome#makeDbTable(java.lang.String, int, int)}
- * is called for create initial table.
- */
- public static final String HOME_CREATE_OPENGIS_TABLE_STATEMENT =
- "CREATE TABLE geometries (id INT PRIMARY KEY, description TEXT)";
-
-
- /**
- * Query executed from
- * {@link com.geodetix.geo.dao.PostGisGeometryDAOImpl}
- * on PostGIS when the method
- * {@link com.geodetix.geo.interfaces.GeometryLocalHome#makeDbTable(java.lang.String, int, int)}
- * is called for adding geometry column.
- */
- public static final String ADD_OPEN_GIS_GEOMETRY_COLUMN_STATEMENT =
- "SELECT AddGeometryColumn('','geometries','geometry',?,?,?)";
-
-
- /**
- * Query executed from
- * {@link com.geodetix.geo.dao.PostGisGeometryDAOImpl}
- * on PostGIS when the method
- * {@link com.geodetix.geo.interfaces.GeometryLocalHome#dropDbTable()}
- * is called for adding geometry column.
- */
- public static final String DROP_TABLE_STATEMENT =
- "DROP TABLE geometries";
-
-
- /**
- * Query executed from
- * {@link com.geodetix.geo.dao.PostGisGeometryDAOImpl}
- * on PostGIS when the method
- * {@link com.geodetix.geo.ejb.GeometryBMP#ejbLoad()}
- * is called from the container.
- */
- public static final String EJB_LOAD_STATEMENT =
- "SELECT id,geometry,description FROM geometries WHERE id=?";
-
-
- /**
- * Query executed from
- * {@link com.geodetix.geo.dao.PostGisGeometryDAOImpl}
- * on PostGIS when the method
- * {@link com.geodetix.geo.ejb.GeometryBMP#ejbStore()}
- * is called from the container.
- */
- public static final String EJB_STORE_STATEMENT =
- "UPDATE geometries SET geometry=?, description=? WHERE id=?";
-
-
- /**
- * Query executed from
- * {@link com.geodetix.geo.dao.PostGisGeometryDAOImpl}
- * on PostGIS when the method
- * {@link com.geodetix.geo.ejb.GeometryBean#ejbRemove()}
- * is called from the container.
- */
- public static final String EJB_REMOVE_STATEMENT =
- "DELETE FROM geometries WHERE id = ?";
-
-} // end PostGisGeometryDAO
diff --git a/ejb2/src/com/geodetix/geo/dao/PostGisGeometryDAOImpl.java b/ejb2/src/com/geodetix/geo/dao/PostGisGeometryDAOImpl.java
deleted file mode 100644
index 51d96bb..0000000
--- a/ejb2/src/com/geodetix/geo/dao/PostGisGeometryDAOImpl.java
+++ /dev/null
@@ -1,579 +0,0 @@
-/*
- * PostGisGeometryDAOImpl.java
- *
- * Using PostGIS Geometry Types with EJB2 - Proof of Concept
- *
- * Copyright 2006, Geodetix S.r.l. (http://www.geodetix.it)
- * and individual contributors as indicated by the @authors tag.
- *
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
- *
- */
-package com.geodetix.geo.dao;
-
-import org.apache.commons.logging.*;
-
-import org.postgis.*;
-
-import java.sql.*;
-
-import java.util.*;
-
-import javax.ejb.*;
-
-import javax.naming.*;
-
-import javax.sql.*;
-
-import java.io.*;
-
-/**
- *
- * PostGis DAO Implementation for
- * {@link com.geodetix.geo.ejb.GeometryBean} BMP Persistence.
- *
- * @author <a href="mailto:antonio.pace at geodetix.it">antonio.pace</a>
- *
- */
-public class PostGisGeometryDAOImpl implements PostGisGeometryDAO {
-
-
- private DataSource dataSource;
- private Context jndiCntx;
-
- /**
- * Creates a new instance of PostGisPointDAO.
- */
- public PostGisGeometryDAOImpl() {}
-
-
-
- /** Initializes the bean. */
- public void init() {
- try {
-
- jndiCntx = new InitialContext();
- dataSource = (DataSource) jndiCntx.lookup(PostGisGeometryDAO.DATASOURCE_NAME);
-
- } catch (NamingException ne) {
- throw new EJBException(ne);
- }
- }
-
-
-
-
- /* =========== Create Methods ============ */
-
-
-
- /**
- * PostGIS implementation of the
- * {@link com.geodetix.geo.ejb.GeometryBean#ejbCreate(org.postgis.Geometry, java.lang.String)}
- * method.
- *
- * @return the primary key of the persisted bean.
- * @param ejb the bean to persist.
- * @throws javax.ejb.CreateException launched if an EJB creation error is encountered.
- * @throws javax.ejb.EJBException launched if a generic EJB error is encountered.
- */
- public java.lang.Integer create(com.geodetix.geo.ejb.GeometryBean ejb)
- throws javax.ejb.CreateException, javax.ejb.EJBException {
-
- PreparedStatement pstm = null;
- Connection con = null;
-
-
- try {
- con = this.dataSource.getConnection();
-
- pstm = con.prepareStatement(PostGisGeometryDAO.EJB_CREATE_STATEMENT);
-
- pstm.setInt(1, ejb.getId());
- pstm.setObject(2, new PGgeometry((Geometry)ejb.getGeometry()));
- pstm.setString(3,ejb.getDescription());
-
- if (pstm.executeUpdate() != 1) {
- throw new CreateException(
- "Failed to add EJB to database");
- }
-
- return ejb.getId();
-
- } catch (SQLException se) {
- throw new EJBException(se);
-
- } finally {
-
- try {
- if (pstm != null) {
- pstm.close();
- }
- } catch (Exception e) {}
-
- try {
- if (con != null) {
- con.close();
- }
-
- } catch (Exception e) {}
- }
- }
-
-
-
-
-
-
- /* ============ Finder Methods ============== */
-
-
- /**
- * PostGIS implementation of the
- * {@link com.geodetix.geo.interfaces.GeometryLocalHome#findByPrimaryKey(java.lang.Integer)}
- * method
- *
- *
- * @return the found bean's prymary key.
- * @param primaryKey primary key of searching bean.
- * @throws javax.ejb.FinderException launched if an error occours during the search operation.
- */
- public java.lang.Integer findByPrimaryKey(java.lang.Integer primaryKey)
- throws javax.ejb.FinderException {
-
- PreparedStatement pstm = null;
- Connection con = null;
- ResultSet result = null;
-
-
- try {
-
- con = this.dataSource.getConnection();
-
- pstm = con.prepareStatement(PostGisGeometryDAO.FIND_BY_PRIMARY_KEY_STATEMENT);
-
- pstm.setInt(1, primaryKey.intValue());
-
- result = pstm.executeQuery();
-
- if (!result.next()) {
- throw new ObjectNotFoundException(
- "Cannot find Geometry Bean with id = " + primaryKey);
- }
-
- } catch (SQLException se) {
- throw new EJBException(se);
- } finally {
- try {
- if (result != null) {
- result.close();
- }
- } catch (Exception e) {}
-
- try {
- if (pstm != null) {
- pstm.close();
- }
- } catch (Exception e) {}
-
- try {
- if (con != null) {
- con.close();
- }
- } catch (Exception e) {}
- }
-
- return primaryKey;
- }
-
-
-
-
- /**
- * PostGIS implementation of the
- * {@link com.geodetix.geo.interfaces.GeometryLocalHome#findByPolygon(org.postgis.Polygon)}
- * method
- *
- * @return a collection of bean's primary key beeing found.
- * @param polygon the {@link org.postgis.Polygon} to search in.
- * @throws javax.ejb.FinderException launched if an error occours during the search operation.
- */
- public java.util.Collection findByPolygon(org.postgis.Polygon polygon)
- throws javax.ejb.FinderException {
-
- PreparedStatement pstm = null;
- Connection con = null;
- ResultSet result = null;
-
- try {
-
- con = this.dataSource.getConnection();
-
- pstm = con.prepareStatement(PostGisGeometryDAO.FIND_BY_POLYGON_STATEMENT);
-
- pstm.setObject(1, new PGgeometry(polygon));
-
- result = pstm.executeQuery();
-
- Vector keys = new Vector();
-
- while (result.next()) {
- keys.addElement(result.getObject("id"));
- }
-
- return keys;
-
- } catch (SQLException se) {
- throw new EJBException(se);
-
- } finally {
- try {
- if (result != null) {
- result.close();
- }
- } catch (Exception e) {}
-
- try {
- if (pstm != null) {
- pstm.close();
- }
- } catch (Exception e) {}
-
- try {
- if (con != null) {
- con.close();
- }
- } catch (Exception e) {}
- }
- }
-
-
-
-
- /* =========== Bean's Life Cycle Methods ============= */
-
-
-
- /**
- * PostGIS implementation of the entity bean's life cycle method
- * <code>ejbLoad()</code>.
- *
- * @param pk the primary key of the bean to load.
- * @param ejb the ejb whose data must be loaded.
- * @throws javax.ejb.EJBException launched if a generic EJB error is encountered.
- */
- public void load(java.lang.Integer pk, com.geodetix.geo.ejb.GeometryBean ejb)
- throws javax.ejb.EJBException {
-
- PreparedStatement pstm = null;
- Connection con = null;
- ResultSet result = null;
-
- try {
-
- con = this.dataSource.getConnection();
-
- pstm = con.prepareStatement(PostGisGeometryDAO.EJB_LOAD_STATEMENT);
-
- pstm.setInt(1, pk.intValue());
-
- result = pstm.executeQuery();
-
- if (result.next()) {
- ejb.setId(pk);
- ejb.setGeometry(((PGgeometry) result.getObject("geometry")).getGeometry());
- ejb.setDescription((String) result.getString("description"));
-
- } else {
-
- throw new EJBException("ejbLoad unable to load EJB.");
- }
-
- } catch (SQLException se) {
- throw new EJBException(se);
-
- } finally {
- try {
- if (result != null) {
- result.close();
- }
- } catch (Exception e) {}
-
- try {
- if (pstm != null) {
- pstm.close();
- }
- } catch (Exception e) {}
-
- try {
- if (con != null) {
- con.close();
- }
- } catch (Exception e) {}
- }
- }
-
-
- /**
- * PostGIS implementation of the entity bean's lifecicle method
- * <code>ejbStore()</code>.
- *
- * @param ejb the ejb whose data must be stored.
- * @throws javax.ejb.EJBException launched if a generic EJB error is encountered.
- */
- public void store(com.geodetix.geo.ejb.GeometryBean ejb)
- throws javax.ejb.EJBException {
-
- PreparedStatement pstm = null;
- Connection con = null;
-
-
- try {
-
- con = this.dataSource.getConnection();
-
- pstm = con.prepareStatement(PostGisGeometryDAO.EJB_STORE_STATEMENT);
-
- pstm.setObject(1, new PGgeometry(ejb.getGeometry()));
- pstm.setString(2,ejb.getDescription());
- pstm.setInt(3, ejb.getId().intValue());
-
- if (pstm.executeUpdate() != 1) {
- throw new EJBException("ejbStore unable to update EJB.");
- }
-
- } catch (SQLException se) {
-
- throw new EJBException(se);
-
- } finally {
-
- try {
- if (pstm != null) {
- pstm.close();
- }
- } catch (Exception e) {}
-
- try {
- if (con != null) {
- con.close();
- }
-
- } catch (Exception e) {}
- }
- }
-
-
- /**
- * PostGIS implementation of the entity bean's lifecicle method
- * <code>ejbRemove()</code>.
- *
- *
- * @param pk primary key of the bean that must be removed .
- * @throws javax.ejb.RemoveException launched if an error during
- * EJB remove operation is encountered.
- * @throws javax.ejb.EJBException launched if a generic EJB error is encountered.
- */
- public void remove(java.lang.Integer pk)
- throws javax.ejb.RemoveException, javax.ejb.EJBException {
-
- PreparedStatement pstm = null;
- Connection con = null;
-
-
- try {
-
- con = this.dataSource.getConnection();
-
- pstm = con.prepareStatement(PostGisGeometryDAO.EJB_REMOVE_STATEMENT);
-
- pstm.setInt(1, pk.intValue());
-
- if (pstm.executeUpdate() != 1) {
- throw new EJBException("ejbRemove unable to remove EJB.");
- }
- } catch (SQLException se) {
-
- throw new EJBException(se);
-
- } finally {
- try {
- if (pstm != null) {
- pstm.close();
- }
- } catch (Exception e) {}
-
- try {
- if (con != null) {
- con.close();
- }
- } catch (Exception e) {}
- }
- }
-
-
-
-
-
- /* =========== Home Interface Utility Methods ============ */
-
-
- /**
- * PostGIS implementation of the
- * {@link com.geodetix.geo.interfaces.GeometryLocalHome#makeDbTable(java.lang.String, int, int)}
- * method creating a NON-OpenGis compliant table in the PostGIS database.
- * The table will contain the geometry EJBs.
- */
- public void makeDbTable() {
-
- PreparedStatement pstm = null;
- Connection con = null;
-
-
- try {
-
- con = this.dataSource.getConnection();
-
- System.out.println("Creating non-OpenGIG Bean table... ");
-
- pstm = con.prepareStatement(PostGisGeometryDAO.HOME_CREATE_NON_OPENGIS_TABLE_STATEMENT);
- pstm.execute();
-
- System.out.println("...done!");
-
- } catch (SQLException e) {
- throw new EJBException(e);
-
- } finally {
-
- try {
- if (pstm != null) {
- pstm.close();
- }
- } catch (Exception e) {}
-
- try {
- if (con != null) {
- con.close();
- }
-
- } catch (Exception e) {}
- }
- }
-
-
-
- /**
- * PostGIS implementation of the
- * {@link com.geodetix.geo.interfaces.GeometryLocalHome#makeDbTable(java.lang.String, int, int)}
- * method creating an OpenGIS compliant table in the PostGIS database.
- * The table will contain the geometry EJBs.
- *
- * @param gemetryType the string that rapresent a valid PostGIS
- * geometry type (i.e.: POINT, LINESTRING, POLYGON etc.).
- * @param srid the SRID of the geometry.
- * @param geometryDimension the dimension of the geometry.
- */
- public void makeDbTable(String gemetryType, int srid, int geometryDimension) {
-
- PreparedStatement pstm = null;
- Connection con = null;
-
-
- try {
-
- con = this.dataSource.getConnection();
-
- System.out.println("Creating OpenGIS Bean table...");
-
- pstm = con.prepareStatement(PostGisGeometryDAO.HOME_CREATE_OPENGIS_TABLE_STATEMENT);
- pstm.execute();
-
- pstm = con.prepareStatement(PostGisGeometryDAO.ADD_OPEN_GIS_GEOMETRY_COLUMN_STATEMENT);
- pstm.setInt(1,srid);
- pstm.setString(2,gemetryType);
- pstm.setInt(3,geometryDimension);
-
- pstm.execute();
-
- System.out.println("...done!");
-
- } catch (SQLException e) {
- throw new EJBException(e);
-
- } finally {
-
- try {
- if (pstm != null) {
- pstm.close();
- }
- } catch (Exception e) {}
-
- try {
- if (con != null) {
- con.close();
- }
-
- } catch (Exception e) {}
- }
- }
-
-
- /**
- * PostGIS implementation of the
- * {@link com.geodetix.geo.interfaces.GeometryLocalHome#dropDbTable()}
- * method removing the table related to the EJBs.
- */
- public void dropDbTable() {
-
- PreparedStatement pstm = null;
- Connection con = null;
-
-
- try {
-
- con = this.dataSource.getConnection();
-
- System.out.println("Dropping Bean Table... ");
-
- pstm = con.prepareStatement(PostGisGeometryDAO.DROP_TABLE_STATEMENT);
- pstm.execute();
-
- System.out.println("...done!");
-
- } catch (SQLException e) {
-
- throw new EJBException(e);
-
- } finally {
-
- try {
- if (pstm != null) {
- pstm.close();
- }
- } catch (Exception e) {}
-
- try {
- if (con != null) {
- con.close();
- }
-
- } catch (Exception e) {}
- }
- }
-
-
-}
\ No newline at end of file
diff --git a/ejb2/src/com/geodetix/geo/ejb/GeometryBean.java b/ejb2/src/com/geodetix/geo/ejb/GeometryBean.java
deleted file mode 100644
index d602c6a..0000000
--- a/ejb2/src/com/geodetix/geo/ejb/GeometryBean.java
+++ /dev/null
@@ -1,298 +0,0 @@
-/*
- * GeometryBean.java
- *
- * Using PostGIS Geometry Types with EJB2 - Proof of Concept
- *
- * Copyright 2006, Geodetix S.r.l. (http://www.geodetix.it)
- * and individual contributors as indicated by the @authors tag.
- *
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
- *
- */
-package com.geodetix.geo.ejb;
-
-
-import javax.ejb.*;
-
-import java.util.*;
-
-import org.postgis.*;
-
-import com.geodetix.geo.value.GeometryValue;
-
-/**
- * This BMP (Bean Managed Persistence) entity bean stores information
- * about geometrical description of a choosen entity in some application
- * domain. It stores geometrical infos in the <code>geometry</code> attribute
- * of type <code>org.postgis.Geometry</code>. Note that such an attribute could
- * even be implemented as a pure text (i.e. Java <code>String</code>) field
- * following the WKT format, thus leaving geometric details to the PostGIS
- * api classes (see <code>README</code> file for further details).
- *
- * @ejb.bean
- * name="Geometry"
- * jndi-name="geodetix/geo/Geometry"
- * local-jndi-name="geodetix/geo/GeometryLocal"
- * type="BMP"
- * view-type="local"
- * primkey-field="id"
- *
- * @ejb.dao
- * impl-class="com.geodetix.geo.dao.PostGisGeometryDAOImpl"
- *
- *
- * @ejb.transaction
- * type="RequiresNew"
- *
- *
- * @ejb.value-object
- * name="Geometry"
- * match="value"
- *
- * @author <a href="mailto:antonio.pace at geodetix.it">Antonio Pace</a>
- *
- */
-public abstract class GeometryBean implements javax.ejb.EntityBean {
-
-
- /* TEMPORARY (NOT FOR REAL WORLD) PRIMARY KEY GENERATOR */
- private static final int SIMPLE_ID_GENERATOR = (int) System.currentTimeMillis();
- private static int actualId = SIMPLE_ID_GENERATOR;
-
-
-
- /* BMP fields */
- private Integer id;
- private String description;
- private Geometry geometry;
-
-
-
-
- /* CREATE METHODS */
-
-
- /**
- * Creates a new Geometry Bean.
- *
- * @ejb.create-method
- *
- * @param geometry the <code>org.postgis.Geometry</code> that has to be
- * included in this EJB.
- * @param description the textual description of this bean.
- * @throws CreateException lauched if an error occours during the
- * EJB creation.
- * @return the EJB's primary key.
- */
- public Integer ejbCreate(org.postgis.Geometry geometry,String description)
- throws CreateException {
-
- this.id = (new Integer(actualId++));
- this.geometry = geometry;
- this.description=description;
-
- /* For now return null, this will be overrided in the DAO implementation of this method */
- return null;
- }
-
- /**
- * This method is called by the container after the EJB creation.
- *
- * @param geometry the <code>org.postgis.Geometry</code> that has to be
- * included in this EJB.
- */
- public void ejbPostCreate(org.postgis.Geometry geometry) {
-
- // Do something with Relationship.
- }
-
-
-
-
-
- /* ========== Finder Methods =========== */
-
-
- /**
- * Find a Geometry Bean from his primary key.
- *
- * @param primaryKey the primary key of the bean to found.
- * @throws FinderException lauched if an error occours during the
- * EJB search operation.
- */
- public abstract Integer ejbFindByPrimaryKey(Integer primaryKey)
- throws FinderException;
-
-
-
-
- /**
- * Find all of the geometry beans contained in a <code>Polygon</code>.
- *
- * @param polygon the Polygon to search in.
- */
- public abstract Collection ejbFindByPolygon(org.postgis.Polygon polygon)
- throws FinderException;
-
-
-
-
-
- /* ============== BMP Fields Accessor Methods ============ */
-
-
- /**
- * Returns the EJB's id field.
- *
- * @ejb.pk-field
- * @ejb.interface-method
- * @ejb.value-object match="value"
- */
- public Integer getId() {
-
- return this.id;
- }
-
-
- /**
- * Modifies the id field.
- */
- public void setId(Integer id) {
-
- this.id = id;
-
- this.makeDirty();
- }
-
-
- /**
- * Returns the EJB's textual description.
- *
- * @ejb.interface-method
- * @ejb.value-object match="value"
- * @return the Geometry Bean description.
- */
- public String getDescription() {
-
- return this.description;
- }
-
- /**
- * Modifies the EJB's textual description.
- *
- * @ejb.interface-method
- * @param description the Geometry Bean description.
- */
- public void setDescription(String description) {
-
- this.description = description;
-
- this.makeDirty();
- }
-
-
-
- /**
- * Returns the EJB's geometrical description.
- *
- * @ejb.interface-method
- * @ejb.value-object match="value"
- * @return the org.postgis.Geometry included in this bean.
- */
- public org.postgis.Geometry getGeometry() {
-
- return this.geometry;
- }
-
- /**
- * Modifies the EJB's geometrical description.
- *
- * @ejb.interface-method
- * @param geometry the <code>org.postgis.Geometry</code> that has to
- * be included in this EJB.
- */
- public void setGeometry(org.postgis.Geometry geometry) {
-
- this.geometry = geometry;
-
- this.makeDirty();
- }
-
-
-
-
-
- /* HOME INTERFACE BMP UTILITY METHODS */
-
-
- /**
- * Create a non-OpenGIS DataBase table, used to persist the Geometry Beans.
- *
- * @ejb.home-method
- *
- * @dao.call
- */
- public abstract void ejbHomeMakeDbTable();
-
-
-
- /**
- * Create OpenGIS DataBase table, used to persist the Geometry Beans.
- *
- * @ejb.home-method
- *
- * @dao.call
- */
- public abstract void ejbHomeMakeDbTable(String gemetryType, int srid, int geometryDimension);
-
-
-
- /**
- * Remove Bean's Persistence Teable of the DataBase.
- *
- * @ejb.home-method
- *
- * @dao.call
- */
- public abstract void ejbHomeDropDbTable();
-
-
-
- /* VALUE OBJECTS */
-
- /**
- * This is an abstract method to allow XDoclet to expose
- * value object functionalities in the local/remote interface.
- *
- * @ejb.interface-method
- *
- * @return a value object for this GeometryBean.
- */
- public abstract GeometryValue getGeometryValue();
-
-
-
-
-
- /* XDOCLET BMP METHODS RELATED STUFF */
-
-
- /**
- * @see com.geodetix.geo.ejb.GeometryBMP source.
- */
- protected abstract void makeDirty();
-
-}
diff --git a/ejb2/src/com/geodetix/geo/ejb/GeometryFacadeBean.java b/ejb2/src/com/geodetix/geo/ejb/GeometryFacadeBean.java
deleted file mode 100644
index 33ae6b5..0000000
--- a/ejb2/src/com/geodetix/geo/ejb/GeometryFacadeBean.java
+++ /dev/null
@@ -1,238 +0,0 @@
-/*
- * GeometryFacadeBean.java
- *
- * Using PostGIS Geometry Types with EJB2 - Proof of Concept
- *
- * Copyright 2006, Geodetix S.r.l. (http://www.geodetix.it)
- * and individual contributors as indicated by the @authors tag.
- *
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
- *
- */
-package com.geodetix.geo.ejb;
-
-
-import com.geodetix.geo.exception.ApplicationGeoLayerException;
-import com.geodetix.geo.interfaces.GeometryLocalHome;
-import com.geodetix.geo.interfaces.GeometryLocal;
-import com.geodetix.geo.util.GeometryUtil;
-import com.geodetix.geo.value.GeometryValue;
-
-import org.apache.commons.logging.*;
-
-import org.postgis.*;
-
-import java.rmi.*;
-
-import java.util.*;
-
-import javax.ejb.*;
-
-import javax.naming.*;
-
-
-/**
- * A SessionFacade for managing Geometry beans.
- *
- * @ejb.bean
- * name="GeometryFacade"
- * jndi-name="geodetix/geo/GeometryFacade"
- * local-jndi-name="geodetix/geo/GeometryFacadeLocal"
- * type="Stateless"
- * view-type="both"
- * transaction-type="Container"
- *
- * @ejb.ejb-ref
- * ejb-name="Geometry"
- * view-type="local"
- * ref-name="ejb/GeometryLocal"
- *
- * @author <a href="mailto:antonio.pace at geodetix.it">Antonio Pace</a>
- */
-public abstract class GeometryFacadeBean implements SessionBean {
- private SessionContext ctx;
-
-
- /**
- * EJB Initializer.
- *
- * @ejb.create-method
- */
- public void ejbCreate() throws CreateException {}
-
- /**
- * Called after the EJB creation.
- */
- public void ejbPostCreate() throws CreateException {}
-
- /**
- * Save the EJB session context.
- */
- public void setSessionContext(SessionContext ctx)
- throws EJBException, RemoteException {
- this.ctx = ctx;
- }
-
-
-
-
- /* ============ Finder Methods ============== */
-
- /**
- * Find all of the geometry beans contained in a <code>Polygon</code>.
- *
- * @ejb.interface-method
- *
- * @param polygon The Polygon to search in.
- */
- public Collection findByPolygon(org.postgis.Polygon polygon)
- throws ApplicationGeoLayerException {
- try {
- GeometryLocalHome geometryHome = GeometryUtil.getLocalHome();
- Collection geometries = geometryHome.findByPolygon(polygon);
-
- List result = new ArrayList();
-
- for (Iterator iter = geometries.iterator(); iter.hasNext(); ) {
- GeometryLocal geometry = (GeometryLocal) iter.next();
-
- result.add(geometry.getGeometryValue());
- }
-
- return result;
-
- } catch (NamingException e) {
- throw new ApplicationGeoLayerException(e);
- } catch (FinderException e) {
- throw new ApplicationGeoLayerException(e);
- }
- }
-
-
-
-
-
- /* =============== Business Iinterfaces Methods ============= */
-
-
- /**
- * Creates a new Geometry Bean.
- *
- * @ejb.interface-method
- *
- * @param geometry the <code>org.postgis.Geometry</code> that has to be
- * included in this EJB.
- * @param description the textual description of this bean.
- * @return a value object representing the created EJB.
- */
- public GeometryValue createGeometry(org.postgis.Geometry geometry, String description)
- throws ApplicationGeoLayerException {
- try {
- GeometryLocalHome geometryHome = GeometryUtil.getLocalHome();
- GeometryLocal geometryLocal =
- geometryHome.create(geometry,description);
-
- return geometryLocal.getGeometryValue();
- } catch (NamingException e) {
- throw new ApplicationGeoLayerException(e);
- } catch (CreateException e) {
- throw new ApplicationGeoLayerException(e);
- }
- }
-
-
-
-
-
- /* ================== BMP Utility Methods ================= */
-
-
-
- /**
- * Create a non-OpenGIS DataBase table used to persist the Geometry Beans.
- * <em>Note that in a real-world application this method should be protected
- * by using a role-based security policy.</em>
- *
- * @ejb.interface-method
- *
- * @throws ApplicationGeoLayerException thrown if an error occours
- * during table creation.
- */
- public void createGeometryTable() throws ApplicationGeoLayerException {
- try {
- GeometryLocalHome geometryHome = GeometryUtil.getLocalHome();
-
- geometryHome.makeDbTable();
- } catch (NamingException e) {
- throw new ApplicationGeoLayerException(e);
- } catch (Exception e) {
- throw new ApplicationGeoLayerException(e);
- }
- }
-
-
- /**
- * Create an OpenGIS compliant database table used to persist the
- * Geometry Beans.
- * <em>Note that in a real-world application this method should be protected
- * by using a role-based security policy.</em>
- *
- * @ejb.interface-method
- *
- * @throws ApplicationGeoLayerException thrown if an error occours
- * during table creation.
- */
- public void createGeometryTable(String gemetryType, int srid, int geometryDimension )
- throws ApplicationGeoLayerException {
- try {
- GeometryLocalHome geometryHome = GeometryUtil.getLocalHome();
-
- geometryHome.makeDbTable(gemetryType, srid, geometryDimension);
-
- } catch (NamingException e) {
- throw new ApplicationGeoLayerException(e);
- } catch (Exception e) {
- throw new ApplicationGeoLayerException(e);
- }
- }
-
-
-
- /**
- * Remove the EJB's persistence table from the database.
- * <em>Note that in a real-world application this method should be protected
- * by using a role-based security policy.</em>
- *
- * @ejb.interface-method
- *
- * @throws ApplicationGeoLayerException thrown if an error occours
- * during table creation.
- */
- public void dropGeometryTable() throws ApplicationGeoLayerException {
- try {
- GeometryLocalHome geometryHome = GeometryUtil.getLocalHome();
-
- geometryHome.dropDbTable();
- } catch (NamingException e) {
- throw new ApplicationGeoLayerException(e);
- } catch (Exception e) {
- throw new ApplicationGeoLayerException(e);
- }
- }
-
-
-
-}
diff --git a/ejb2/src/com/geodetix/geo/exception/ApplicationGeoLayerException.java b/ejb2/src/com/geodetix/geo/exception/ApplicationGeoLayerException.java
deleted file mode 100644
index a36678f..0000000
--- a/ejb2/src/com/geodetix/geo/exception/ApplicationGeoLayerException.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * ApplicationGeoLayerException.java
- *
- * Using PostGIS Geometry Types with EJB2 - Proof of Concept
- *
- * Copyright 2006, Geodetix S.r.l. (http://www.geodetix.it)
- * and individual contributors as indicated by the @authors tag.
- *
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
- *
- */
-package com.geodetix.geo.exception;
-
-
-/**
- * Generic Application Exception.
- *
- * @author <a href="mailto:antonio.pace at geodetix.it">Antonio Pace</a>
- *
- */
-public class ApplicationGeoLayerException extends Exception {
-
- /**
- * Creates a new ApplicationGeoLayerException object.
- */
- public ApplicationGeoLayerException() {
- super("unknown");
-
- } // end ApplicationGeoLayerException()
-
-
- /**
- * Creates a new ApplicationGeoLayerException object.
- *
- * @param e the wrapped Exception.
- */
- public ApplicationGeoLayerException(Exception e) {
- super(e.getMessage());
-
- } // end ApplicationGeoLayerException()
-
-
- /**
- * Creates a new ApplicationGeoLayerException object.
- *
- * @param msg the wrapped Message.
- */
- public ApplicationGeoLayerException(String msg) {
- super(msg);
-
- } // end ApplicationGeoLayerException()
-
-} // end ApplicationGeoLayerException
diff --git a/ejb3/.classpath b/ejb3/.classpath
deleted file mode 100644
index fda5da1..0000000
--- a/ejb3/.classpath
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
- <classpathentry kind="src" path="src"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="con" path="org.jboss.ide.eclipse.jdt.aop.core.classpath.AOP_15_CONTAINER"/>
- <classpathentry kind="con" path="org.jboss.ide.eclipse.jdt.ejb3.wizards.core.classpath.EJB3_CONTAINER/JBoss-4.0.4.GA"/>
- <classpathentry kind="lib" path="C:/jboss-4.0.4.GA/server/default/lib/postgis_1.1.0.jar"/>
- <classpathentry kind="lib" path="C:/jboss-4.0.4.GA/client/jbossws-client.jar"/>
- <classpathentry kind="lib" path="C:/jboss-4.0.4.GA/client/jboss-jaxrpc.jar"/>
- <classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/ejb3/.project b/ejb3/.project
deleted file mode 100644
index f495192..0000000
--- a/ejb3/.project
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>PostGISTutorial</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.eclipse.jdt.core.javabuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.jboss.ide.eclipse.ejb3.wizards.core.EJB3ProjectNature</nature>
- <nature>org.eclipse.jdt.core.javanature</nature>
- </natures>
-</projectDescription>
diff --git a/ejb3/.settings/org.eclipse.jdt.core.prefs b/ejb3/.settings/org.eclipse.jdt.core.prefs
deleted file mode 100644
index 65a5762..0000000
--- a/ejb3/.settings/org.eclipse.jdt.core.prefs
+++ /dev/null
@@ -1,7 +0,0 @@
-#Mon Sep 18 15:14:48 BST 2006
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
-org.eclipse.jdt.core.compiler.compliance=1.5
-org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
-org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
-org.eclipse.jdt.core.compiler.source=1.5
diff --git a/ejb3/EJB3Spatial.odt b/ejb3/EJB3Spatial.odt
deleted file mode 100644
index c13479e..0000000
Binary files a/ejb3/EJB3Spatial.odt and /dev/null differ
diff --git a/ejb3/README.txt b/ejb3/README.txt
deleted file mode 100644
index a4e83c1..0000000
--- a/ejb3/README.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-(This code was contributed by Norman Barker <norman.barker at gmail.com>)
-
-Spatial EJB3
-
-
-Spatial EJB3 is a quick investigation to see if it is possible to integrate the
-Java 5 annotation approach to mark a property of an object as spatial and to
-delegate to the EJB3 persistence model to store and retrieve this data.
-
-The project utilises JBoss and PostGIS, future iterations will look to remove
-the dependency on JBoss and Hibernate to incorporate other Application
-Services.
-
-Since it is useful to display screenshots in a tutorial this has been written
-as an Openoffice Document. For easy viewing and printing, a PDF version is
-also available.
-
-
-COMPILING:
-
-Run "ant" to compile.
-
-The postgis.jar, pgjdbc.jar and the other needed libs have to
-be put in the lib/ subdirectory.
-
-If your JBOSS is not installed in C:\jboss-4.0.4.GA, fix the
-path in the build.xml.
diff --git a/ejb3/build.xml b/ejb3/build.xml
deleted file mode 100644
index 97b3925..0000000
--- a/ejb3/build.xml
+++ /dev/null
@@ -1,70 +0,0 @@
-<!--
- * build file
- *
- * PostGIS extension for PostgreSQL JDBC driver - EJB3 Support
- *
- * (C) 2006 Norman Barker <norman.barker at gmail.com>
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
- *
- -->
-<project name="PostGIS EJB3 Tutorial" default="compile" basedir=".">
- <property name="build.dir" value="bin"/>
- <property name="lib.dir" value="lib"/>
- <property name="src.dir" value="src"/>
- <property name="dist.dir" value="dist"/>
- <property name="jboss.home" value="C:/jboss-4.0.4.GA"/>
- <property name="jbossconf" value="jboss"/>
-
- <path id="class.path">
- <pathelement location="${build.dir}"/>
- <fileset dir="${lib.dir}" includes="*.jar"/>
- <fileset dir="${jboss.home}/client">
- <include name="*.jar"/>
- </fileset>
- <fileset dir="${jboss.home}/server/default/lib" includes="hibernate3.jar"/>
- </path>
-
- <target name="clean" description="Removes all generated files">
- <delete dir="${build.dir}"/>
- <delete dir="${dist.dir}"/>
- </target>
-
- <target name="compile">
- <mkdir dir="${build.dir}"/>
- <javac destdir="${build.dir}" fork="true" classpathref="class.path" source="1.5" target="1.5">
- <src path="${src.dir}"/>
- </javac>
- <copy todir="${build.dir}">
- <fileset dir="${src.dir}"
- includes="**/images/*,**/*.properties" excludes="**/.svn/*"/>
- </copy>
- </target>
-
- <target name="dist" depends="clean, compile">
- <mkdir dir="${dist.dir}"/>
- <jar jarfile="${dist.dir}/ingest.jar" basedir="${build.dir}" includes="**/ejb/*, **/mdb/*, **/UserBean/*, **/hibernate/*">
- <metainf dir="${src.dir}/META-INF" includes="*.xml"/>
- </jar>
- </target>
-
- <target name="deploy" description="deploys the service to JBoss" depends="dist">
- <copy todir="${jboss.home}/server/default/deploy">
- <fileset dir="${dist.dir}" includes="ingest.jar, people.war"/>
- <fileset dir="${jbossconf}" includes="*.xml"/>
- </copy>
- </target>
-
-</project>
diff --git a/ejb3/jboss/geodata-ds.xml b/ejb3/jboss/geodata-ds.xml
deleted file mode 100644
index f681e9e..0000000
--- a/ejb3/jboss/geodata-ds.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<datasources>
- <local-tx-datasource>
- <jndi-name>GeoDataDS</jndi-name>
- <connection-url>jdbc:postgresql://127.0.0.1:5432/geotest</connection-url>
- <driver-class>org.postgis.DriverWrapper</driver-class>
- <user-name>geo</user-name>
- <password>geo</password>
- <metadata>
- <type-mapping>PostgreSQL 8.1</type-mapping>
- </metadata>
- </local-tx-datasource>
-</datasources>
diff --git a/ejb3/jboss/ingest-service.xml b/ejb3/jboss/ingest-service.xml
deleted file mode 100644
index 2e6789d..0000000
--- a/ejb3/jboss/ingest-service.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<server>
- <mbean code="org.jboss.mq.server.jmx.Queue"
- name="jboss.mq.destination:service=Queue,name=ingestQueue">
- <depends optional-attribute-name="DestinationManager">jboss.mq:service=DestinationManager</depends>
- </mbean>
-</server>
\ No newline at end of file
diff --git a/ejb3/src/META-INF/persistence.xml b/ejb3/src/META-INF/persistence.xml
deleted file mode 100644
index bb06da6..0000000
--- a/ejb3/src/META-INF/persistence.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<persistence>
- <persistence-unit name="People">
- <jta-data-source>java:/GeoDataDS</jta-data-source>
- </persistence-unit>
-</persistence>
\ No newline at end of file
diff --git a/ejb3/src/jndi.properties b/ejb3/src/jndi.properties
deleted file mode 100644
index 66babf6..0000000
--- a/ejb3/src/jndi.properties
+++ /dev/null
@@ -1,3 +0,0 @@
-java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-java.naming.provider.url=localhost:1099
diff --git a/ejb3/src/org/postgis/ejb/PersonEntity.java b/ejb3/src/org/postgis/ejb/PersonEntity.java
deleted file mode 100644
index 5dbc114..0000000
--- a/ejb3/src/org/postgis/ejb/PersonEntity.java
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
- * PersonEntity.java
- *
- * PostGIS extension for PostgreSQL JDBC driver - EJB3 Tutorial
- *
- * (C) 2006 Norman Barker <norman.barker at gmail.com>
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
- *
- */
-package org.postgis.ejb;
-
-import java.util.Date;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.NamedQuery;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-
-import org.hibernate.annotations.Type;
-import org.postgis.Geometry;
-
- at Entity
- at Table(name="people")
- at NamedQuery(name="findPerson",
- query="SELECT DISTINCT OBJECT(p) FROM PersonEntity p WHERE ((p.name = :name) AND (p.surname = :surname)) ORDER BY p.date")
-public class PersonEntity {
- private long id;
- private String name;
- private String surname;
- private Geometry location;
- private Date date;
-
- @Id
- @GeneratedValue(strategy=GenerationType.IDENTITY)
- @Column(name="id")
- public long getId() {
- return id;
- }
- public void setId(long id) {
- this.id = id;
- }
-
- @Type(type = "org.postgis.hibernate.GeometryType")
- @Column(name="location", columnDefinition="Geometry")
- public Geometry getLocation() {
- return location;
- }
- public void setLocation(Geometry location) {
- this.location = location;
- }
-
- @Column(name="name")
- public String getName() {
- return name;
- }
- public void setName(String name) {
- this.name = name;
- }
-
- @Column(name="surname")
- public String getSurname() {
- return surname;
- }
- public void setSurname(String surname) {
- this.surname = surname;
- }
-
- @Column(name="ingested")
- @Temporal(TemporalType.TIMESTAMP)
- public Date getDate() {
- return date;
- }
-
- public void setDate(Date date) {
- this.date = date;
- }
-}
diff --git a/ejb3/src/org/postgis/ejb/UserBean.java b/ejb3/src/org/postgis/ejb/UserBean.java
deleted file mode 100644
index 2b0722b..0000000
--- a/ejb3/src/org/postgis/ejb/UserBean.java
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * UserBean.java
- *
- * PostGIS extension for PostgreSQL JDBC driver - EJB3 Tutorial
- *
- * (C) 2006 Norman Barker <norman.barker at gmail.com>
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
- *
- */
-package org.postgis.ejb;
-
-import java.rmi.RemoteException;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import javax.annotation.Resource;
-import javax.annotation.security.RunAs;
-import javax.ejb.EJBException;
-import javax.ejb.Stateless;
-import javax.jms.JMSException;
-import javax.jms.MapMessage;
-import javax.jms.Queue;
-import javax.jms.QueueConnection;
-import javax.jms.QueueConnectionFactory;
-import javax.jms.QueueSender;
-import javax.jms.QueueSession;
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebResult;
-import javax.jws.WebService;
-import javax.jws.soap.SOAPBinding;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-import javax.persistence.Query;
-
-import org.jboss.annotation.security.SecurityDomain;
-
- at Stateless
- at WebService(
- name = "EndpointInterface",
- targetNamespace = "http://org.postgis/ejb/UserBean",
- serviceName = "PeopleFinder")
- at SOAPBinding(style = SOAPBinding.Style.RPC)
-public class UserBean implements UserBeanRemote{
- @PersistenceContext(unitName="People") private EntityManager entityManager;
-
- @Resource(mappedName = "java:/ConnectionFactory")
- private QueueConnectionFactory connectionFactory;
-
- @Resource(mappedName = "queue/ingestQueue")
- private Queue queue;
-
-
- @WebMethod
- public void ingest(@WebParam(name = "name") String name, at WebParam(name = "surname") String surname, at WebParam(name = "lat") double lat, @WebParam(name = "lon") double lon){
- // place message on a queue
- try {
- QueueConnection qConn = connectionFactory.createQueueConnection();
- QueueSession qSession = qConn.createQueueSession(false, QueueSession.AUTO_ACKNOWLEDGE);
- QueueSender qSender = qSession.createSender(queue);
-
- // create a message
- MapMessage message = qSession.createMapMessage();
- message.setStringProperty("MessageFormat", "Person");
- message.setString("NAME", name);
- message.setString("SURNAME", surname);
- message.setDouble("LAT", lat);
- message.setDouble("LON", lon);
- qSender.send(message);
- qSession.close();
- qConn.close();
- } catch (JMSException e) {
- throw new EJBException(e.getMessage());
- }
-
- }
-
-
- @WebMethod
- @WebResult(name="positions")
- public String[] findPerson(@WebParam(name = "name") String name, @WebParam(name = "surname") String surname)
- {
- Query query = entityManager.createNamedQuery("findPerson");
- query.setParameter("name", name);
- query.setParameter("surname", surname);
- List list = query.getResultList();
-
- if (list != null)
- {
- Iterator itr = list.iterator();
- ArrayList<String> resultList = new ArrayList<String>();
-
- while (itr.hasNext())
- {
- PersonEntity person = (PersonEntity) itr.next();
- resultList.add(person.getLocation().getValue() + "," + person.getDate() + "\r\n");
- }
-
- String[] result = (String[])(resultList.toArray(new String[resultList.size()]));
- return result;
- }
- else
- {
- return null;
- }
-
- }
-
-}
diff --git a/ejb3/src/org/postgis/ejb/UserBeanRemote.java b/ejb3/src/org/postgis/ejb/UserBeanRemote.java
deleted file mode 100644
index 70ed35e..0000000
--- a/ejb3/src/org/postgis/ejb/UserBeanRemote.java
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * UserBeanRemote.java
- *
- * PostGIS extension for PostgreSQL JDBC driver - EJB3 Tutorial
- *
- * (C) 2006 Norman Barker <norman.barker at gmail.com>
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
- *
- */
-package org.postgis.ejb;
-
-import java.rmi.RemoteException;
-
-import javax.ejb.Remote;
-import javax.jws.WebParam;
-
- at Remote
-public interface UserBeanRemote {
- public void ingest(String name, String surname, double lat, double lon) throws RemoteException;
- public String[] findPerson(String name, String surname) throws RemoteException;
-}
diff --git a/ejb3/src/org/postgis/ejb/mdb/IngestMDB.java b/ejb3/src/org/postgis/ejb/mdb/IngestMDB.java
deleted file mode 100644
index a64176e..0000000
--- a/ejb3/src/org/postgis/ejb/mdb/IngestMDB.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * IngestMDB.java
- *
- * PostGIS extension for PostgreSQL JDBC driver - EJB3 Tutorial
- *
- * (C) 2006 Norman Barker <norman.barker at gmail.com>
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
- *
- */
-package org.postgis.ejb.mdb;
-
-import java.util.Date;
-
-import javax.ejb.ActivationConfigProperty;
-import javax.ejb.MessageDriven;
-import javax.jms.JMSException;
-import javax.jms.MapMessage;
-import javax.jms.Message;
-import javax.jms.MessageListener;
-import javax.persistence.EntityManager;
-import javax.persistence.PersistenceContext;
-
-import org.postgis.Point;
-import org.postgis.ejb.PersonEntity;
-
- at MessageDriven(activationConfig={
- @ActivationConfigProperty(
- propertyName="destinationType",
- propertyValue="javax.jms.Queue"),
- @ActivationConfigProperty(
- propertyName="destination",
- propertyValue="queue/ingestQueue"),
- @ActivationConfigProperty(
- propertyName="messageSelector",
- propertyValue="MessageFormat ='Person'"),
- @ActivationConfigProperty(
- propertyName="acknowledgeMode",
- propertyValue="Auto-acknowledge")
-})
-/**
- * implements a listener interface to ingest people data
- */
-public class IngestMDB implements MessageListener {
-
- public static final String NAME = "NAME";
- public static final String SURNAME = "SURNAME";
- public static final String LATITUDE = "LAT";
- public static final String LONGITUDE = "LON";
-
- @PersistenceContext(unitName="People") private EntityManager entityManager;
-
-
- /**
- * Implements a message listener for Person ingest requests
- * @see javax.jms.MessageListener#onMessage(javax.jms.Message)
- */
- public void onMessage(Message msg) {
- if (msg instanceof MapMessage)
- {
- try {
- MapMessage m = (MapMessage)msg;
- String name = m.getString(IngestMDB.NAME);
- String surname = m.getString(IngestMDB.SURNAME);
- Double lat = m.getDouble(IngestMDB.LATITUDE);
- Double lon = m.getDouble(IngestMDB.LONGITUDE);
-
- PersonEntity person = new PersonEntity();
- person.setName(name);
- person.setSurname(surname);
- person.setLocation(new Point(lon, lat));
- person.setDate(new Date());
- entityManager.persist(person);
-
- // for tutorial info
- System.out.println("INGESTED " + name + " " + surname + " into PostGIS");
- } catch (JMSException e) {
- e.printStackTrace();
- }
-
-
- }
-
- }
-
-}
diff --git a/ejb3/src/org/postgis/hibernate/ContainsExpression.java b/ejb3/src/org/postgis/hibernate/ContainsExpression.java
deleted file mode 100644
index 8900248..0000000
--- a/ejb3/src/org/postgis/hibernate/ContainsExpression.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * ContainsExpression.java
- *
- * PostGIS extension for PostgreSQL JDBC driver - EJB3 Tutorial
- *
- * (C) 2006 Norman Barker <norman.barker at gmail.com>
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
- *
- */
-package org.postgis.hibernate;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.hibernate.Criteria;
-import org.hibernate.EntityMode;
-import org.hibernate.Hibernate;
-import org.hibernate.HibernateException;
-import org.hibernate.criterion.CriteriaQuery;
-import org.hibernate.criterion.Criterion;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.function.StandardSQLFunction;
-import org.hibernate.engine.TypedValue;
-import org.postgis.Geometry;
-
-/**
- * @author nbarker
- *
- */
-public class ContainsExpression implements Criterion{
- private static final long serialVersionUID = 1L;
- private String propertyName;
- private Geometry geom;
-
- public ContainsExpression(String propertyName, Geometry geom)
- {
- this.propertyName = propertyName;
- this.geom = geom;
- }
-
- public TypedValue[] getTypedValues(Criteria criteria, CriteriaQuery criteriaQuery) throws HibernateException {
- return new TypedValue[]{new TypedValue(Hibernate.custom(GeometryType.class), geom, EntityMode.POJO)};
- }
-
- public String toSqlString(Criteria criteria, CriteriaQuery criteriaQuery) throws HibernateException {
- Dialect dialect = criteriaQuery.getFactory().getDialect();
- String[] columns = criteriaQuery.getColumnsUsingProjection(criteria, propertyName);
-
- if (columns.length != 1) throw new HibernateException("\"contains\" may only be used with single-column properties");
- if ( dialect instanceof PostGISDialect) {
- StandardSQLFunction function = (StandardSQLFunction)dialect.getFunctions().get(PostGISDialect.NAMESPACE + "contains");
- List args = new ArrayList();
- args.add(columns[0]);
- args.add("?");
-
- return function.render(args, criteriaQuery.getFactory());
- }
- else
- {
- throw new HibernateException("\"contains\" may only be used with a spatial hibernate dialect");
- }
- }
-
- public String toString()
- {
- return propertyName + " contains " + geom;
- }
-
-}
diff --git a/ejb3/src/org/postgis/hibernate/GeometryType.java b/ejb3/src/org/postgis/hibernate/GeometryType.java
deleted file mode 100644
index fa3afda..0000000
--- a/ejb3/src/org/postgis/hibernate/GeometryType.java
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
- * GeometryType.java
- *
- * PostGIS extension for PostgreSQL JDBC driver - EJB3 Tutorial
- *
- * (C) 2006 Norman Barker <norman.barker at gmail.com>
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
- *
- */
-package org.postgis.hibernate;
-
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.Serializable;
-import java.sql.Blob;
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
-import java.sql.Types;
-
-import org.hibernate.HibernateException;
-import org.hibernate.usertype.UserType;
-import java.io.InputStream;
-import org.postgis.Geometry;
-import org.postgis.binary.BinaryParser;
-import org.postgis.binary.BinaryWriter;
-
-/**
- * @author nbarker $date 16/8/06
- */
-public class GeometryType implements UserType {
- private static final int[] SQL_TYPES = { Types.BLOB };
-
-
- /**
- * @see org.hibernate.usertype.UserType#deepCopy(java.lang.Object)
- */
- public Object deepCopy(Object value) throws HibernateException {
- return value;
- }
-
- /**
- * @see org.hibernate.usertype.UserType#equals(java.lang.Object, java.lang.Object)
- */
- public boolean equals(Object x, Object y) throws HibernateException {
- if (x == y) {
- return true;
- } else if (x == null || y == null) {
- return false;
- } else {
- return x.equals(y);
- }
- }
-
- /**
- * @see org.hibernate.usertype.UserType#hashCode(java.lang.Object)
- */
- public int hashCode(Object arg0) throws HibernateException {
- // TODO Auto-generated method stub
- return 0;
- }
-
- /**
- * @see org.hibernate.usertype.UserType#isMutable()
- */
- public boolean isMutable() {
- return false;
- }
-
- /**)
- * @see org.hibernate.usertype.UserType#nullSafeGet(java.sql.ResultSet, java.lang.String[], java.lang.Object)
- */
- public Object nullSafeGet(ResultSet resultSet,
- String[] names, Object owner) throws HibernateException, SQLException {
- Geometry result = null;
- String geom = resultSet.getString(names[0]);
- if(geom != null ) {
- BinaryParser parser = new BinaryParser();
- result = parser.parse(geom);
- }
- return result;
- }
-
- /**
- * @see org.hibernate.usertype.UserType#nullSafeSet(java.sql.PreparedStatement, java.lang.Object, int)
- */
- public void nullSafeSet(PreparedStatement statement,
- Object value, int index) throws HibernateException, SQLException {
- if (value == null) {
- statement.setBytes(index, null);
- } else {
- BinaryWriter bw = new BinaryWriter();
-
- byte[] bytes = bw.writeBinary((Geometry)value);
- statement.setBytes(index, bytes);
- }
- }
-
- /* (non-Javadoc)
- * @see org.hibernate.usertype.UserType#replace(java.lang.Object, java.lang.Object, java.lang.Object)
- */
- public Object replace(Object original, Object target,
- Object owner) throws HibernateException {
- return original;
- }
-
- /* (non-Javadoc)
- * @see org.hibernate.usertype.UserType#returnedClass()
- */
- public Class returnedClass() {
- return Geometry.class;
- }
-
- /**
- * @see org.hibernate.usertype.UserType#sqlTypes()
- */
- public int[] sqlTypes() {
- return GeometryType.SQL_TYPES;
- }
-
- /**
- * @see org.hibernate.usertype.UserType#assemble(java.io.Serializable, java.lang.Object)
- */
- public Object assemble(Serializable cached, Object owner) throws HibernateException {
- return cached;
- }
-
- /**
- * @see org.hibernate.usertype.UserType#disassemble(java.lang.Object)
- */
- public Serializable disassemble(Object value) throws HibernateException {
- return (Serializable)value;
- }
-
-}
-
diff --git a/ejb3/src/org/postgis/hibernate/IntersectsExpression.java b/ejb3/src/org/postgis/hibernate/IntersectsExpression.java
deleted file mode 100644
index b9e773a..0000000
--- a/ejb3/src/org/postgis/hibernate/IntersectsExpression.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * IntersectsExpression.java
- *
- * PostGIS extension for PostgreSQL JDBC driver - EJB3 Tutorial
- *
- * (C) 2006 Norman Barker <norman.barker at gmail.com>
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
- *
- */
-package org.postgis.hibernate;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.hibernate.Criteria;
-import org.hibernate.EntityMode;
-import org.hibernate.Hibernate;
-import org.hibernate.HibernateException;
-import org.hibernate.criterion.CriteriaQuery;
-import org.hibernate.criterion.Criterion;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.function.StandardSQLFunction;
-import org.hibernate.engine.TypedValue;
-import org.postgis.Geometry;
-
-/**
- * @author nbarker
- *
- */
-public class IntersectsExpression implements Criterion{
- private static final long serialVersionUID = 1L;
- private String propertyName;
- private Geometry geom;
-
- public IntersectsExpression(String propertyName, Geometry geom)
- {
- this.propertyName = propertyName;
- this.geom = geom;
- }
-
- public TypedValue[] getTypedValues(Criteria criteria, CriteriaQuery criteriaQuery) throws HibernateException {
- return new TypedValue[]{new TypedValue(Hibernate.custom(GeometryType.class), geom, EntityMode.POJO)};
- }
-
- public String toSqlString(Criteria criteria, CriteriaQuery criteriaQuery) throws HibernateException {
- Dialect dialect = criteriaQuery.getFactory().getDialect();
- String[] columns = criteriaQuery.getColumnsUsingProjection(criteria, propertyName);
-
- if (columns.length != 1) throw new HibernateException("\"intersects\" may only be used with single-column properties");
- if ( dialect instanceof PostGISDialect) {
- StandardSQLFunction function = (StandardSQLFunction)dialect.getFunctions().get(PostGISDialect.NAMESPACE + "intersects");
- List args = new ArrayList();
- args.add(columns[0]);
- args.add("?");
-
- return function.render(args, criteriaQuery.getFactory());
- }
- else
- {
- throw new HibernateException("\"intersects\" may only be used with a spatial hibernate dialect");
- }
- }
-
- public String toString()
- {
- return propertyName + " intersects " + geom;
- }
-
-}
diff --git a/ejb3/src/org/postgis/hibernate/PostGISDialect.java b/ejb3/src/org/postgis/hibernate/PostGISDialect.java
deleted file mode 100644
index 5dd8768..0000000
--- a/ejb3/src/org/postgis/hibernate/PostGISDialect.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * PostGISDialect.java
- *
- * PostGIS extension for PostgreSQL JDBC driver - EJB3 Tutorial
- *
- * (C) 2006 Norman Barker <norman.barker at gmail.com>
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
- *
- */
-package org.postgis.hibernate;
-
-import java.sql.Types;
-
-import org.hibernate.Hibernate;
-import org.hibernate.dialect.PostgreSQLDialect;
-import org.hibernate.dialect.function.StandardSQLFunction;
-import org.postgis.hibernate.GeometryType;
-
-/**
- * @author nbarker
- *
- */
-public class PostGISDialect extends PostgreSQLDialect{
- public static String NAMESPACE = "spatial.";
-
-
- public PostGISDialect()
- {
- super();
- registerColumnType(Types.BLOB, "geometry");
- registerFunction( PostGISDialect.NAMESPACE + "dimension", new StandardSQLFunction("dimension", Hibernate.INTEGER));
- registerFunction( PostGISDialect.NAMESPACE + "geometrytype", new StandardSQLFunction("geometrytype", Hibernate.STRING));
- registerFunction( PostGISDialect.NAMESPACE + "srid", new StandardSQLFunction("srid", Hibernate.INTEGER));
- registerFunction( PostGISDialect.NAMESPACE + "envelope", new StandardSQLFunction("envelope", Hibernate.custom(GeometryType.class)));
- registerFunction( PostGISDialect.NAMESPACE + "astext", new StandardSQLFunction("astext", Hibernate.STRING));
- registerFunction( PostGISDialect.NAMESPACE + "asbinary", new StandardSQLFunction("asbinary", Hibernate.BINARY));
- registerFunction( PostGISDialect.NAMESPACE + "isempty", new StandardSQLFunction("isempty", Hibernate.STRING));
- registerFunction( PostGISDialect.NAMESPACE + "issimple", new StandardSQLFunction("issimple", Hibernate.STRING));
- registerFunction( PostGISDialect.NAMESPACE + "boundary", new StandardSQLFunction("boundary", Hibernate.custom(GeometryType.class)));
- registerFunction( PostGISDialect.NAMESPACE + "equals", new StandardSQLFunction("equals", Hibernate.STRING));
- registerFunction( PostGISDialect.NAMESPACE + "disjoint", new StandardSQLFunction("disjoint", Hibernate.STRING));
- registerFunction( PostGISDialect.NAMESPACE + "intersects", new StandardSQLFunction("intersects", Hibernate.STRING));
- registerFunction( PostGISDialect.NAMESPACE + "touches", new StandardSQLFunction("touches", Hibernate.STRING));
- registerFunction( PostGISDialect.NAMESPACE + "crosses", new StandardSQLFunction("crosses", Hibernate.STRING));
- registerFunction( PostGISDialect.NAMESPACE + "within", new StandardSQLFunction("within", Hibernate.BOOLEAN));
- registerFunction( PostGISDialect.NAMESPACE + "contains", new StandardSQLFunction("contains", Hibernate.STRING));
- registerFunction( PostGISDialect.NAMESPACE + "overlaps", new StandardSQLFunction("overlaps", Hibernate.STRING));
- registerFunction( PostGISDialect.NAMESPACE + "relate", new StandardSQLFunction("relate", Hibernate.STRING));
- registerFunction( PostGISDialect.NAMESPACE + "distance", new StandardSQLFunction("distance", Hibernate.DOUBLE));
- registerFunction( PostGISDialect.NAMESPACE + "buffer", new StandardSQLFunction("buffer", Hibernate.custom(GeometryType.class)));
- registerFunction( PostGISDialect.NAMESPACE + "convexhull", new StandardSQLFunction("convexhull", Hibernate.custom(GeometryType.class)));
- registerFunction( PostGISDialect.NAMESPACE + "intersection", new StandardSQLFunction("intersection", Hibernate.custom(GeometryType.class)));
- registerFunction( PostGISDialect.NAMESPACE + "union", new StandardSQLFunction("geomunion", Hibernate.custom(GeometryType.class)));
- registerFunction( PostGISDialect.NAMESPACE + "difference", new StandardSQLFunction("difference", Hibernate.custom(GeometryType.class)));
- registerFunction( PostGISDialect.NAMESPACE + "symdifference", new StandardSQLFunction("symdifference", Hibernate.custom(GeometryType.class)));
- registerFunction( PostGISDialect.NAMESPACE + "numgeometries", new StandardSQLFunction("numgeometries", Hibernate.custom(GeometryType.class)));
- registerFunction( PostGISDialect.NAMESPACE + "geometryn", new StandardSQLFunction("geometryn", Hibernate.INTEGER));
- registerFunction( PostGISDialect.NAMESPACE + "x", new StandardSQLFunction("x", Hibernate.DOUBLE));
- registerFunction( PostGISDialect.NAMESPACE + "y", new StandardSQLFunction("y", Hibernate.DOUBLE));
- registerFunction( PostGISDialect.NAMESPACE + "geometryfromewtk", new StandardSQLFunction("geometryfromewtk", Hibernate.custom(GeometryType.class)));
- }
-}
diff --git a/ejb3/src/org/postgis/hibernate/WithinExpression.java b/ejb3/src/org/postgis/hibernate/WithinExpression.java
deleted file mode 100644
index a4b3c31..0000000
--- a/ejb3/src/org/postgis/hibernate/WithinExpression.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * WithinExpression.java
- *
- * PostGIS extension for PostgreSQL JDBC driver - EJB3 Tutorial
- *
- * (C) 2006 Norman Barker <norman.barker at gmail.com>
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
- *
- */
-package org.postgis.hibernate;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.hibernate.Criteria;
-import org.hibernate.EntityMode;
-import org.hibernate.Hibernate;
-import org.hibernate.HibernateException;
-import org.hibernate.criterion.CriteriaQuery;
-import org.hibernate.criterion.Criterion;
-import org.hibernate.dialect.Dialect;
-import org.hibernate.dialect.function.StandardSQLFunction;
-import org.hibernate.engine.TypedValue;
-import org.postgis.Geometry;
-
-/**
- * @author nbarker
- *
- */
-public class WithinExpression implements Criterion{
- private static final long serialVersionUID = 1L;
- private String propertyName;
- private Geometry geom;
-
- public WithinExpression(String propertyName, Geometry geom)
- {
- this.propertyName = propertyName;
- this.geom = geom;
- }
-
- public TypedValue[] getTypedValues(Criteria criteria, CriteriaQuery criteriaQuery) throws HibernateException {
- return new TypedValue[]{new TypedValue(Hibernate.custom(GeometryType.class), geom, EntityMode.POJO)};
- }
-
- public String toSqlString(Criteria criteria, CriteriaQuery criteriaQuery) throws HibernateException {
- Dialect dialect = criteriaQuery.getFactory().getDialect();
- String[] columns = criteriaQuery.getColumnsUsingProjection(criteria, propertyName);
-
- if (columns.length != 1) throw new HibernateException("\"within\" may only be used with single-column properties");
- if ( dialect instanceof PostGISDialect) {
- StandardSQLFunction function = (StandardSQLFunction)dialect.getFunctions().get(PostGISDialect.NAMESPACE + "within");
- List args = new ArrayList();
- args.add(columns[0]);
- args.add("?");
-
- return function.render(args, criteriaQuery.getFactory());
- }
- else
- {
- throw new HibernateException("\"within\" may only be used with a spatial hibernate dialect");
- }
- }
-
- public String toString()
- {
- return propertyName + " within " + geom;
- }
-
-}
diff --git a/jdbc/pom.xml b/jdbc/pom.xml
index 0f2ee97..f0d9445 100644
--- a/jdbc/pom.xml
+++ b/jdbc/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>net.postgis</groupId>
<artifactId>postgis-java-aggregator</artifactId>
- <version>2.1.7.2</version>
+ <version>2.2.1-SNAPSHOT</version>
</parent>
<artifactId>postgis-jdbc</artifactId>
- <version>2.1.7.2</version>
+ <version>2.2.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Postgis JDBC Driver</name>
diff --git a/jdbc/postgis-jdbc.iml b/jdbc/postgis-jdbc.iml
index 2c789c4..6175bda 100644
--- a/jdbc/postgis-jdbc.iml
+++ b/jdbc/postgis-jdbc.iml
@@ -15,9 +15,14 @@
<orderEntry type="library" name="Maven: postgresql:postgresql:9.1-901-1.jdbc4" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.3" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.3" level="project" />
- <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.12" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.9.4" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.13" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.9.9" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.10" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.48" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.ant:ant:1.7.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.ant:ant-launcher:1.7.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.yaml:snakeyaml:1.15" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
</component>
</module>
\ No newline at end of file
diff --git a/jdbc/src/main/java/examples/TestAutoregister.java b/jdbc/src/main/java/examples/TestAutoregister.java
index a1d165e..e00c664 100644
--- a/jdbc/src/main/java/examples/TestAutoregister.java
+++ b/jdbc/src/main/java/examples/TestAutoregister.java
@@ -4,20 +4,22 @@
* PostGIS extension for PostgreSQL JDBC driver - example and test classes
*
* (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
*
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/jdbc/src/main/java/org/postgis/ComposedGeom.java b/jdbc/src/main/java/org/postgis/ComposedGeom.java
index bac8c62..3b57faf 100644
--- a/jdbc/src/main/java/org/postgis/ComposedGeom.java
+++ b/jdbc/src/main/java/org/postgis/ComposedGeom.java
@@ -6,29 +6,30 @@
* (C) 2004 Paul Ramsey, pramsey at refractions.net
*
* (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
*
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
package org.postgis;
-import org.postgresql.util.PGtokenizer;
-
import java.sql.SQLException;
import java.util.Iterator;
+import java.util.List;
/**
* ComposedGeom - Abstract base class for all Geometries that are composed out
@@ -54,7 +55,9 @@ public abstract class ComposedGeom extends Geometry {
protected Geometry[] subgeoms = EMPTY;
/**
- * @param type
+ * Constructs an instance with the specified type
+ *
+ * @param type int value corresponding to the geometry type.
*/
public ComposedGeom(int type) {
super(type);
@@ -100,28 +103,38 @@ public abstract class ComposedGeom extends Geometry {
// (which are not OpenGIS compliant)
return;
}
- PGtokenizer t = new PGtokenizer(PGtokenizer.removePara(value), ',');
- int subgeomcount = t.getSize();
+
+ String valueNoParans = GeometryTokenizer.removeLeadingAndTrailingStrings(value, "(", ")");
+ List<String> tokens = GeometryTokenizer.tokenize(valueNoParans, ',');
+
+ int subgeomcount = tokens.size();
subgeoms = createSubGeomArray(subgeomcount);
for (int p = 0; p < subgeomcount; p++) {
- subgeoms[p] = createSubGeomInstance(t.getToken(p), haveM);
+ subgeoms[p] = createSubGeomInstance(tokens.get(p), haveM);
}
dimension = subgeoms[0].dimension;
- // fetch haveMeasure from subpoint because haveM does only work with
+ // fetch haveMeasure from sub-point because haveM does only work with
// 2d+M, not with 3d+M geometries
haveMeasure = subgeoms[0].haveMeasure;
}
/**
- * Return the appropriate instance of the subgeometry - this encapsulates
+ * Return the appropriate instance of the sub-geometry - this encapsulates
* subclass specific constructor calls
+ *
+ * @param token The token containing the value for the sub-geometry
+ * @param haveM flag to indicate the existence of a measure
+ * @return the new sub-geometry
+ * @throws SQLException if a SQLException is thrown
*/
- protected abstract Geometry createSubGeomInstance(String token, boolean haveM)
- throws SQLException;
+ protected abstract Geometry createSubGeomInstance(String token, boolean haveM) throws SQLException;
/**
- * Return the appropriate instance of the subgeometry array - this
+ * Return the appropriate instance of the sub-geometry array - this
* encapsulates subclass specific array instantiation
+ *
+ * @param size number of elements in the array
+ * @return Geometry array corresponding to the sub-geometry
*/
protected abstract Geometry[] createSubGeomArray(int size);
diff --git a/jdbc/src/main/java/org/postgis/DriverWrapper.java b/jdbc/src/main/java/org/postgis/DriverWrapper.java
index dcea806..6f66f28 100644
--- a/jdbc/src/main/java/org/postgis/DriverWrapper.java
+++ b/jdbc/src/main/java/org/postgis/DriverWrapper.java
@@ -5,19 +5,21 @@
*
* (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
*
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
@@ -87,7 +89,7 @@ public class DriverWrapper extends Driver {
*
* This also loads the appropriate TypesAdder for our SQL Driver instance.
*
- * @throws SQLException
+ * @throws SQLException when a SQLException occurs
*/
public DriverWrapper() throws SQLException {
super();
@@ -160,6 +162,9 @@ public class DriverWrapper extends Driver {
/**
* Do we have HexWKB as well known text representation - to be overridden by
* subclasses.
+ *
+ * @param result Connection to check
+ * @return true if using EWKB, false otherwise
*/
protected boolean useLW(Connection result) {
if (result == null) {
@@ -188,6 +193,8 @@ public class DriverWrapper extends Driver {
/**
* Returns our own CVS version plus postgres Version
+ *
+ * @return String value reprenstation of the version
*/
public static String getVersion() {
return "PostGisWrapper " + REVISION + ", wrapping " + Driver.getVersion();
@@ -204,8 +211,9 @@ public class DriverWrapper extends Driver {
* PostgreSQL jdbc drivers V8.0 or newer, those methods are deprecated due
* to some class loader problems (but still work for now), and you may want
* to use the method below instead.
- *
- * @throws SQLException
+ *
+ * @param pgconn The PGConnection object to add the types to
+ * @throws SQLException when a SQLException occurs
*
*/
public static void addGISTypes(PGConnection pgconn) throws SQLException {
@@ -214,6 +222,9 @@ public class DriverWrapper extends Driver {
/**
* adds the JTS/PostGIS Data types to a PG 8.0+ Connection.
+ *
+ * @param pgconn The PGConnection object to add the types to
+ * @throws SQLException when a SQLException occurs
*/
public static void addGISTypes80(PGConnection pgconn) throws SQLException {
loadTypesAdder("80").addGT((Connection) pgconn, false);
@@ -221,8 +232,9 @@ public class DriverWrapper extends Driver {
/**
* adds the JTS/PostGIS Data types to a PG 7.2 Connection.
- *
- * @throws SQLException
+ *
+ * @param pgconn The PGConnection object to add the types to
+ * @throws SQLException when a SQLException occurs
*/
public static void addGISTypes72(org.postgresql.PGConnection pgconn) throws SQLException {
loadTypesAdder("72").addGT((Connection) pgconn, false);
@@ -230,6 +242,10 @@ public class DriverWrapper extends Driver {
/**
* Mangles the PostGIS URL to return the original PostGreSQL URL
+ *
+ * @param url String containing the url to be "mangled"
+ * @return "mangled" string
+ * @throws SQLException when a SQLException occurs
*/
protected String mangleURL(String url) throws SQLException {
String myProgo = getProtoString();
diff --git a/jdbc/src/main/java/org/postgis/DriverWrapperAutoprobe.java b/jdbc/src/main/java/org/postgis/DriverWrapperAutoprobe.java
index 6cce3f2..1ba179f 100644
--- a/jdbc/src/main/java/org/postgis/DriverWrapperAutoprobe.java
+++ b/jdbc/src/main/java/org/postgis/DriverWrapperAutoprobe.java
@@ -5,19 +5,21 @@
*
* (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
*
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
@@ -57,6 +59,8 @@ public class DriverWrapperAutoprobe extends DriverWrapper {
/**
* Default constructor.
+ *
+ * @throws SQLException when a SQLExceptin occurs
*/
public DriverWrapperAutoprobe() throws SQLException {
super();
@@ -86,6 +90,8 @@ public class DriverWrapperAutoprobe extends DriverWrapper {
/**
* Returns our own CVS version plus postgres Version
+ *
+ * @return String value reprenstation of the version
*/
public static String getVersion() {
return "PostGisWrapperAutoprobe " + REVISIONAUTO + ", wrapping " + Driver.getVersion();
diff --git a/jdbc/src/main/java/org/postgis/DriverWrapperLW.java b/jdbc/src/main/java/org/postgis/DriverWrapperLW.java
index c36fa70..b312e65 100644
--- a/jdbc/src/main/java/org/postgis/DriverWrapperLW.java
+++ b/jdbc/src/main/java/org/postgis/DriverWrapperLW.java
@@ -5,19 +5,21 @@
*
* (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
*
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
@@ -52,6 +54,8 @@ public class DriverWrapperLW extends DriverWrapper {
/**
* Default constructor.
+ *
+ * @throws SQLException when a SQLException occurs
*/
public DriverWrapperLW() throws SQLException {
super();
@@ -76,6 +80,8 @@ public class DriverWrapperLW extends DriverWrapper {
/**
* Returns our own CVS version plus postgres Version
+ *
+ * @return String value reprenstation of the version
*/
public static String getVersion() {
return "PostGisWrapperLW " + REVISIONLW + ", wrapping " + Driver.getVersion();
diff --git a/jdbc/src/main/java/org/postgis/Geometry.java b/jdbc/src/main/java/org/postgis/Geometry.java
index c48b72f..bd4f1e3 100644
--- a/jdbc/src/main/java/org/postgis/Geometry.java
+++ b/jdbc/src/main/java/org/postgis/Geometry.java
@@ -7,19 +7,21 @@
*
* (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
*
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
@@ -81,6 +83,9 @@ public abstract class Geometry implements Serializable {
/**
* The Text representations of the geometry types
+ *
+ * @param type int value of the type to lookup
+ * @return String reprentation of the type.
*/
public static String getTypeString(int type) {
if (type >= 0 && type <= 7) {
@@ -119,6 +124,9 @@ public abstract class Geometry implements Serializable {
/**
* Parse a SRID value, anything {@code <= 0} is unknown
+ *
+ * @param srid the SRID to parse
+ * @return parsed SRID value
*/
public static int parseSRID(int srid) {
if (srid < 0) {
@@ -147,6 +155,9 @@ public abstract class Geometry implements Serializable {
/**
* java.lang.Object equals implementation
+ *
+ * @param other geometry to compare
+ * @return true if equal, false otherwise
*/
public boolean equals(Object other) {
return (other != null) && (other instanceof Geometry)
@@ -156,6 +167,9 @@ public abstract class Geometry implements Serializable {
/**
* geometry specific equals implementation - only defined for non-null
* values
+ *
+ * @param other geometry to compare
+ * @return true if equal, false otherwise
*/
public boolean equals(Geometry other) {
return (other != null) && (this.dimension == other.dimension)
@@ -170,36 +184,46 @@ public abstract class Geometry implements Serializable {
*
* Implementors can assume that dimensin, type, srid and haveMeasure are
* equal, other != null and other is the same subclass.
+ *
+ * @param other geometry to compare
+ * @return true if equal, false otherwise
*/
protected abstract boolean equalsintern(Geometry other);
/**
* Return the number of Points of the geometry
+ *
+ * @return number of points in the geometry
*/
public abstract int numPoints();
/**
* Get the nth Point of the geometry
*
- * @param n
- * the index of the point, from 0 to numPoints()-1;
- * @throws ArrayIndexOutOfBoundsException
- * in case of an emtpy geometry or bad index.
+ * @param n the index of the point, from 0 to numPoints()-1;
+ * @return nth point in the geometry
+ * @throws ArrayIndexOutOfBoundsException in case of an emtpy geometry or bad index.
*/
public abstract Point getPoint(int n);
/**
* Same as getPoint(0);
+ *
+ * @return the initial Point in this geometry
*/
public abstract Point getFirstPoint();
/**
* Same as getPoint(numPoints()-1);
+ *
+ * @return the final Point in this geometry
*/
public abstract Point getLastPoint();
/**
* The OGIS geometry type number of this geometry.
+ *
+ * @return int value representation for the type of this geometry
*/
public int getType() {
return this.type;
@@ -207,12 +231,18 @@ public abstract class Geometry implements Serializable {
/**
* Return the Type as String
+ *
+ * @return String representation for the type of this geometry
*/
public String getTypeString() {
return getTypeString(this.type);
}
- /** Returns whether we have a measure */
+ /**
+ * Returns whether we have a measure
+ *
+ * @return true if the geometry has a measure, false otherwise
+ */
public boolean isMeasured() {
return haveMeasure;
}
@@ -229,6 +259,8 @@ public abstract class Geometry implements Serializable {
/**
* The OGIS geometry type number of this geometry.
+ *
+ * @return the SRID of this geometry
*/
public int getSrid() {
return this.srid;
@@ -237,6 +269,8 @@ public abstract class Geometry implements Serializable {
/**
* Recursively sets the srid on this geometry and all contained
* subgeometries
+ *
+ * @param srid the SRID for this geometry
*/
public void setSrid(int srid) {
this.srid = srid;
@@ -256,6 +290,9 @@ public abstract class Geometry implements Serializable {
/**
* Render the WKT version of this Geometry (without SRID) into the given
* StringBuffer.
+ *
+ * @param sb StringBuffer to render into
+ * @param putM flag to indicate if the M character should be used.
*/
public void outerWKT(StringBuffer sb, boolean putM) {
sb.append(getTypeString());
@@ -272,6 +309,8 @@ public abstract class Geometry implements Serializable {
/**
* Render the WKT without the type name, but including the brackets into the
* StringBuffer
+ *
+ * @param sb StringBuffer to render into
*/
protected void mediumWKT(StringBuffer sb) {
sb.append('(');
@@ -282,11 +321,15 @@ public abstract class Geometry implements Serializable {
/**
* Render the "inner" part of the WKT (inside the brackets) into the
* StringBuffer.
+ *
+ * @param SB StringBuffer to render into
*/
protected abstract void innerWKT(StringBuffer SB);
/**
* backwards compatibility method
+ *
+ * @return String representation of the value for the geometry.
*/
public String getValue() {
StringBuffer sb = new StringBuffer();
@@ -314,7 +357,8 @@ public abstract class Geometry implements Serializable {
/**
* Splits the SRID=4711; part of a EWKT rep if present and sets the srid.
- *
+ *
+ * @param value String value to extract the SRID from
* @return value without the SRID=4711; part
*/
protected String initSRID(String value) {
diff --git a/jdbc/src/main/java/org/postgis/GeometryCollection.java b/jdbc/src/main/java/org/postgis/GeometryCollection.java
index 7d5a844..9fb5e2a 100644
--- a/jdbc/src/main/java/org/postgis/GeometryCollection.java
+++ b/jdbc/src/main/java/org/postgis/GeometryCollection.java
@@ -7,19 +7,21 @@
*
* (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
*
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/jdbc/src/main/java/org/postgis/GeometryTokenizer.java b/jdbc/src/main/java/org/postgis/GeometryTokenizer.java
new file mode 100644
index 0000000..7831d4c
--- /dev/null
+++ b/jdbc/src/main/java/org/postgis/GeometryTokenizer.java
@@ -0,0 +1,76 @@
+/*
+ * GeometryTokenizer.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - geometry model
+ *
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+package org.postgis;
+
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Stack;
+
+
+public class GeometryTokenizer {
+
+
+ public static List<String> tokenize(String string, char delimiter) {
+ List<String> tokens = new ArrayList<>();
+ Stack<Character> stack = new Stack<>();
+ int consumed = 0;
+ for (int position = 0; position < string.length(); position++) {
+ char character = string.charAt(position);
+ if ((character == '(') || (character == '[')) {
+ stack.push(character);
+ } else if (((character == ')') && (stack.peek() == '(')) ||
+ ((character == ']') && (stack.peek() == '['))
+ ) {
+ stack.pop();
+ }
+ if ((character == delimiter) && (stack.size() == 0)) {
+ tokens.add(string.substring(consumed, position));
+ consumed = position + 1;
+ }
+ }
+ if (consumed < string.length()) {
+ tokens.add(string.substring(consumed));
+ }
+ return tokens;
+ }
+
+
+ public static String removeLeadingAndTrailingStrings(String string, String leadingString, String trailingString) {
+ int startIndex = string.indexOf(leadingString);
+ if (startIndex == -1) {
+ startIndex = 0;
+ } else {
+ startIndex += leadingString.length();
+ }
+
+ int endIndex = string.lastIndexOf(trailingString);
+ if (endIndex == -1) {
+ endIndex = string.length();
+ }
+ return string.substring(startIndex, endIndex);
+ }
+
+
+}
\ No newline at end of file
diff --git a/jdbc/src/main/java/org/postgis/LineString.java b/jdbc/src/main/java/org/postgis/LineString.java
index 4c9cf45..8d36369 100644
--- a/jdbc/src/main/java/org/postgis/LineString.java
+++ b/jdbc/src/main/java/org/postgis/LineString.java
@@ -7,19 +7,21 @@
*
* (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
*
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/jdbc/src/main/java/org/postgis/LinearRing.java b/jdbc/src/main/java/org/postgis/LinearRing.java
index 7520cc8..ce712ca 100644
--- a/jdbc/src/main/java/org/postgis/LinearRing.java
+++ b/jdbc/src/main/java/org/postgis/LinearRing.java
@@ -6,28 +6,30 @@
* (C) 2004 Paul Ramsey, pramsey at refractions.net
*
* (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
+ *
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
package org.postgis;
-import org.postgresql.util.PGtokenizer;
-
import java.sql.SQLException;
+import java.util.List;
+
/**
* This represents the LinearRing GIS datatype. This type is used to construct
@@ -46,6 +48,7 @@ public class LinearRing extends PointComposedGeom {
* representation of a ring.
*
* @param value Definition of this ring in the PostGIS string format.
+ * @throws SQLException when a SQLException occurs
*/
public LinearRing(String value) throws SQLException {
this(value, false);
@@ -55,15 +58,17 @@ public class LinearRing extends PointComposedGeom {
* @param value The text representation of this LinearRing
* @param haveM Hint whether we have a measure. This is given to us by other
* "parent" Polygon, and is passed further to our parent.
+ * @throws SQLException when a SQLException occurs
*/
protected LinearRing(String value, boolean haveM) throws SQLException {
super(LINEARRING);
- PGtokenizer t = new PGtokenizer(PGtokenizer.removePara(value.trim()), ',');
- int npoints = t.getSize();
+ String valueNoParans = GeometryTokenizer.removeLeadingAndTrailingStrings(value.trim(), "(", ")");
+ List<String> tokens = GeometryTokenizer.tokenize(valueNoParans, ',');
+ int npoints = tokens.size();
Point[] points = new Point[npoints];
for (int p = 0; p < npoints; p++) {
- points[p] = new Point(t.getToken(p), haveM);
+ points[p] = new Point(tokens.get(p), haveM);
}
this.dimension = points[0].dimension;
// fetch haveMeasure from subpoint because haveM does only work with
@@ -71,4 +76,5 @@ public class LinearRing extends PointComposedGeom {
this.haveMeasure = points[0].haveMeasure;
this.subgeoms = points;
}
-}
+
+}
\ No newline at end of file
diff --git a/jdbc/src/main/java/org/postgis/MultiLineString.java b/jdbc/src/main/java/org/postgis/MultiLineString.java
index 4535003..0079aec 100644
--- a/jdbc/src/main/java/org/postgis/MultiLineString.java
+++ b/jdbc/src/main/java/org/postgis/MultiLineString.java
@@ -7,19 +7,21 @@
*
* (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
*
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/jdbc/src/main/java/org/postgis/MultiPoint.java b/jdbc/src/main/java/org/postgis/MultiPoint.java
index 4bfd58a..2c78f5c 100644
--- a/jdbc/src/main/java/org/postgis/MultiPoint.java
+++ b/jdbc/src/main/java/org/postgis/MultiPoint.java
@@ -7,19 +7,21 @@
*
* (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
*
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/jdbc/src/main/java/org/postgis/MultiPolygon.java b/jdbc/src/main/java/org/postgis/MultiPolygon.java
index 3c9c46a..5c4695c 100644
--- a/jdbc/src/main/java/org/postgis/MultiPolygon.java
+++ b/jdbc/src/main/java/org/postgis/MultiPolygon.java
@@ -7,19 +7,21 @@
*
* (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
*
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/jdbc/src/main/java/org/postgis/PGbox2d.java b/jdbc/src/main/java/org/postgis/PGbox2d.java
index befd021..46812ab 100644
--- a/jdbc/src/main/java/org/postgis/PGbox2d.java
+++ b/jdbc/src/main/java/org/postgis/PGbox2d.java
@@ -7,19 +7,21 @@
*
* (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
*
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/jdbc/src/main/java/org/postgis/PGbox3d.java b/jdbc/src/main/java/org/postgis/PGbox3d.java
index 2cdbb2d..a9f88f9 100644
--- a/jdbc/src/main/java/org/postgis/PGbox3d.java
+++ b/jdbc/src/main/java/org/postgis/PGbox3d.java
@@ -8,19 +8,21 @@
*
* (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
*
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/jdbc/src/main/java/org/postgis/PGboxbase.java b/jdbc/src/main/java/org/postgis/PGboxbase.java
index a0abd9f..142bc28 100644
--- a/jdbc/src/main/java/org/postgis/PGboxbase.java
+++ b/jdbc/src/main/java/org/postgis/PGboxbase.java
@@ -7,29 +7,31 @@
* (C) 2004 Paul Ramsey, pramsey at refractions.net
*
* (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
*
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
package org.postgis;
import org.postgresql.util.PGobject;
-import org.postgresql.util.PGtokenizer;
import java.sql.SQLException;
+import java.util.List;
/*
* Updates Oct 2002 - data members made private - getLLB() and getURT() methods
@@ -55,12 +57,15 @@ public abstract class PGboxbase extends PGobject {
*
* I use an abstract method here so we do not need to replicate the String
* object in every instance.
- *
+ *
+ * @return the prefix, as a string
*/
public abstract String getPrefix();
/**
* The Postgres type we have (same construct as getPrefix())
+ *
+ * @return String containing the name of the type for this box.
*/
public abstract String getPGtype();
@@ -91,9 +96,10 @@ public abstract class PGboxbase extends PGobject {
if (value.startsWith(myPrefix)) {
value = value.substring(myPrefix.length()).trim();
}
- PGtokenizer t = new PGtokenizer(PGtokenizer.removePara(value), ',');
- llb = new Point(t.getToken(0));
- urt = new Point(t.getToken(1));
+ String valueNoParans = GeometryTokenizer.removeLeadingAndTrailingStrings(value.trim(), "(", ")");
+ List<String> tokens = GeometryTokenizer.tokenize(valueNoParans, ',');
+ llb = new Point(tokens.get(0));
+ urt = new Point(tokens.get(1));
if (srid != Geometry.UNKNOWN_SRID) {
llb.setSrid(srid);
urt.setSrid(srid);
@@ -118,17 +124,27 @@ public abstract class PGboxbase extends PGobject {
/**
* Unlike geometries, toString() does _not_ contain the srid, as server-side
* PostGIS cannot parse this.
+ *
+ * @return String representation of this box
*/
public String toString() {
return getValue();
}
- /** Returns the lower left bottom corner of the box as a Point object */
+ /**
+ * Returns the lower left bottom corner of the box as a Point object
+ *
+ * @return lower left bottom corner of this box
+ */
public Point getLLB() {
return llb;
}
- /** Returns the upper right top corner of the box as a Point object */
+ /**
+ * Returns the upper right top corner of the box as a Point object
+ *
+ * @return upper right top corner of this box
+ */
public Point getURT() {
return urt;
}
@@ -146,6 +162,10 @@ public abstract class PGboxbase extends PGobject {
*
* As the Server always returns Box3D with three dimensions, z==0 equals
* dimensions==2
+ *
+ * @param first First of two points to be compared
+ * @param second Second of two points to be compared
+ * @return true if the points are the same, false otherwise
*
*/
protected static boolean compareLazyDim(Point first, Point second) {
@@ -163,11 +183,15 @@ public abstract class PGboxbase extends PGobject {
}
/**
+ * Obtain a new instance of a PGboxbase
+ *
* We could have used this.getClass().newInstance() here, but this forces us
* dealing with InstantiationException and IllegalAccessException. Due to
* the PGObject.clone() brokennes that does not allow clone() to throw
* CloneNotSupportedException, we cannot even pass this exceptions down to
* callers in a sane way.
+ *
+ * @return a new instance of PGboxbase
*/
protected abstract PGboxbase newInstance();
}
diff --git a/jdbc/src/main/java/org/postgis/PGgeometry.java b/jdbc/src/main/java/org/postgis/PGgeometry.java
index 4b37c6c..cdf6f5c 100644
--- a/jdbc/src/main/java/org/postgis/PGgeometry.java
+++ b/jdbc/src/main/java/org/postgis/PGgeometry.java
@@ -7,19 +7,21 @@
*
* (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
*
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
@@ -67,6 +69,11 @@ public class PGgeometry extends PGobject {
/**
* Maybe we could add more error checking here?
+ *
+ * @param value String representing the geometry
+ * @param bp BinaryParser to use whe parsing
+ * @return Geometry object parsed from the specified string value
+ * @throws SQLException when a SQLException occurs
*/
public static Geometry geomFromString(String value, BinaryParser bp) throws SQLException {
return geomFromString(value, bp, false);
@@ -145,15 +152,17 @@ public class PGgeometry extends PGobject {
public static final String SRIDPREFIX = "SRID=";
/**
- * Splits a String at the first occurrence of border charachter.
+ * Splits a String at the first occurrence of border character.
*
* 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
* first occurence, and thus this code could even be faster.
- *
- * @throws SQLException
+ *
+ * @param whole the String to be split
+ * @return String array containing the split elements
+ * @throws SQLException when a SQLException occurrs
*/
public static String[] splitSRID(String whole) throws SQLException {
int index = whole.indexOf(';', 5); // sridprefix length is 5
diff --git a/jdbc/src/main/java/org/postgis/PGgeometryLW.java b/jdbc/src/main/java/org/postgis/PGgeometryLW.java
index 1993021..72b3e0e 100644
--- a/jdbc/src/main/java/org/postgis/PGgeometryLW.java
+++ b/jdbc/src/main/java/org/postgis/PGgeometryLW.java
@@ -5,19 +5,21 @@
*
* (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
*
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/jdbc/src/main/java/org/postgis/Point.java b/jdbc/src/main/java/org/postgis/Point.java
index 5187c00..bd6df1a 100644
--- a/jdbc/src/main/java/org/postgis/Point.java
+++ b/jdbc/src/main/java/org/postgis/Point.java
@@ -6,28 +6,29 @@
* (C) 2004 Paul Ramsey, pramsey at refractions.net
*
* (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
*
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
package org.postgis;
-import org.postgresql.util.PGtokenizer;
-
import java.sql.SQLException;
+import java.util.List;
public class Point extends Geometry {
/* JDK 1.5 Serialization */
@@ -147,6 +148,9 @@ public class Point extends Geometry {
* Construct a Point from EWKT.
*
* (3D and measures are legal, but SRID is not allowed).
+ *
+ * @param value String representation of the geometry.
+ * @throws SQLException when a SQLException occurs
*/
public Point(String value) throws SQLException {
this(value, false);
@@ -163,6 +167,7 @@ public class Point extends Geometry {
* However, POINT does not set it to false, as they can be
* contained in measured collections, as in
* "GEOMETRYCOLLECTIONM(POINT(0 0 0))".
+ * @throws SQLException when a SQLException occurs
*/
protected Point(String value, boolean haveM) throws SQLException {
this();
@@ -174,19 +179,20 @@ public class Point extends Geometry {
} else if (value.indexOf("POINT") == 0) {
value = value.substring(5).trim();
}
- PGtokenizer t = new PGtokenizer(PGtokenizer.removePara(value), ' ');
+ String valueNoParans = GeometryTokenizer.removeLeadingAndTrailingStrings(value, "(", ")");
+ List<String> tokens = GeometryTokenizer.tokenize(valueNoParans, ' ');
try {
- x = Double.valueOf(t.getToken(0)).doubleValue();
- y = Double.valueOf(t.getToken(1)).doubleValue();
- haveM |= t.getSize() == 4;
- if ((t.getSize() == 3 && !haveM) || (t.getSize() == 4)) {
- z = Double.valueOf(t.getToken(2)).doubleValue();
+ x = Double.valueOf(tokens.get(0)).doubleValue();
+ y = Double.valueOf(tokens.get(1)).doubleValue();
+ haveM |= tokens.size() == 4;
+ if ((tokens.size() == 3 && !haveM) || (tokens.size() == 4)) {
+ z = Double.valueOf(tokens.get(2)).doubleValue();
dimension = 3;
} else {
dimension = 2;
}
if (haveM) {
- m = Double.valueOf(t.getToken(dimension)).doubleValue();
+ m = Double.valueOf(tokens.get(dimension)).doubleValue();
}
} catch (NumberFormatException e) {
throw new SQLException("Error parsing Point: " + e.toString());
diff --git a/jdbc/src/main/java/org/postgis/PointComposedGeom.java b/jdbc/src/main/java/org/postgis/PointComposedGeom.java
index f153a7f..6dcdc5f 100644
--- a/jdbc/src/main/java/org/postgis/PointComposedGeom.java
+++ b/jdbc/src/main/java/org/postgis/PointComposedGeom.java
@@ -1,5 +1,5 @@
/*
- * ComposedGeom.java
+ * PointComposedGeom.java
*
* PostGIS extension for PostgreSQL JDBC driver - geometry model
*
@@ -7,19 +7,21 @@
*
* (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
*
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
package org.postgis;
@@ -88,7 +90,11 @@ public abstract class PointComposedGeom extends ComposedGeom {
}
}
- /** Get the underlying Point array */
+ /**
+ * Get the underlying Point array
+ *
+ * @return an array of Points within this geometry
+ */
public Point[] getPoints() {
return (Point[]) subgeoms;
}
diff --git a/jdbc/src/main/java/org/postgis/Polygon.java b/jdbc/src/main/java/org/postgis/Polygon.java
index 48ae612..175c674 100644
--- a/jdbc/src/main/java/org/postgis/Polygon.java
+++ b/jdbc/src/main/java/org/postgis/Polygon.java
@@ -7,19 +7,21 @@
*
* (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
*
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/jdbc/src/main/java/org/postgis/Version.java b/jdbc/src/main/java/org/postgis/Version.java
index cc7b71b..5c5d753 100644
--- a/jdbc/src/main/java/org/postgis/Version.java
+++ b/jdbc/src/main/java/org/postgis/Version.java
@@ -5,21 +5,21 @@
*
* (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
*
- * (C) 2015 Phillip Ross {@literal <phillip.w.g.ross at gmail.com>}
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/jdbc/src/main/java/org/postgis/binary/BinaryParser.java b/jdbc/src/main/java/org/postgis/binary/BinaryParser.java
index ee6e551..e583d67 100644
--- a/jdbc/src/main/java/org/postgis/binary/BinaryParser.java
+++ b/jdbc/src/main/java/org/postgis/binary/BinaryParser.java
@@ -4,20 +4,22 @@
* PostGIS extension for PostgreSQL JDBC driver - Binary Parser
*
* (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
*
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
package org.postgis.binary;
@@ -72,6 +74,9 @@ public class BinaryParser {
*
* Is synchronized to protect offset counter. (Unfortunately, Java does not
* have neither call by reference nor multiple return values.)
+ *
+ * @param value String containing the data to be parsed
+ * @return resulting geometry for the parsed data
*/
public synchronized Geometry parse(String value) {
StringByteGetter bytes = new ByteGetter.StringByteGetter(value);
@@ -83,13 +88,21 @@ public class BinaryParser {
*
* Is synchronized to protect offset counter. (Unfortunately, Java does not
* have neither call by reference nor multiple return values.)
+ *
+ * @param value byte array containing the data to be parsed
+ * @return resulting geometry for the parsed data
*/
public synchronized Geometry parse(byte[] value) {
BinaryByteGetter bytes = new ByteGetter.BinaryByteGetter(value);
return parseGeometry(valueGetterForEndian(bytes));
}
- /** Parse a geometry starting at offset. */
+ /**
+ * Parse a geometry starting at offset.
+ *
+ * @param data ValueGetter with the data to be parsed
+ * @return the parsed geometry
+ * */
protected Geometry parseGeometry(ValueGetter data) {
byte endian = data.getByte(); // skip and test endian flag
if (endian != data.endian) {
diff --git a/jdbc/src/main/java/org/postgis/binary/BinaryWriter.java b/jdbc/src/main/java/org/postgis/binary/BinaryWriter.java
index 4ec422c..e177718 100644
--- a/jdbc/src/main/java/org/postgis/binary/BinaryWriter.java
+++ b/jdbc/src/main/java/org/postgis/binary/BinaryWriter.java
@@ -4,20 +4,22 @@
* PostGIS extension for PostgreSQL JDBC driver - Binary Writer
*
* (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
*
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
package org.postgis.binary;
@@ -52,8 +54,8 @@ public class BinaryWriter {
/**
* Get the appropriate ValueGetter for my endianness
*
- * @param bytes The appropriate Byte Getter
- *
+ * @param bytes The ByteSetter to use
+ * @param endian the endian for the ValueSetter to use
* @return the ValueGetter
*/
public static ValueSetter valueSetterForEndian(ByteSetter bytes, byte endian) {
@@ -77,6 +79,10 @@ public class BinaryWriter {
* return true. If not, the result may be invalid WKB.
*
* @see Geometry#checkConsistency() the consistency checker
+ *
+ * @param geom the geometry to be written
+ * @param REP endianness to write the bytes with
+ * @return String containing the hex encoded geometry
*/
public synchronized String writeHexed(Geometry geom, byte REP) {
int length = estimateBytes(geom);
@@ -100,6 +106,10 @@ public class BinaryWriter {
* return true. If not, the result may be invalid WKB.
*
* @see Geometry#checkConsistency()
+ *
+ * @param geom the geometry to be written
+ * @param REP endianness to write the bytes with
+ * @return byte array containing the encoded geometry
*/
public synchronized byte[] writeBinary(Geometry geom, byte REP) {
int length = estimateBytes(geom);
@@ -112,7 +122,11 @@ public class BinaryWriter {
return writeBinary(geom, ValueSetter.NDR.NUMBER);
}
- /** Parse a geometry starting at offset. */
+ /**
+ * Parse a geometry starting at offset.
+ * @param geom the geometry to write
+ * @param dest the value setting to be used for writing
+ */
protected void writeGeometry(Geometry geom, ValueSetter dest) {
// write endian flag
dest.setByte(dest.endian);
@@ -233,7 +247,12 @@ public class BinaryWriter {
writeGeometryArray(geom.getGeometries(), dest);
}
- /** Estimate how much bytes a geometry will need in WKB. */
+ /**
+ * Estimate how much bytes a geometry will need in WKB.
+ *
+ * @param geom Geometry to estimate.
+ * @return estimated number of bytes
+ */
protected int estimateBytes(Geometry geom) {
int result = 0;
diff --git a/jdbc/src/main/java/org/postgis/binary/ByteGetter.java b/jdbc/src/main/java/org/postgis/binary/ByteGetter.java
index 1790c26..9b38c69 100644
--- a/jdbc/src/main/java/org/postgis/binary/ByteGetter.java
+++ b/jdbc/src/main/java/org/postgis/binary/ByteGetter.java
@@ -4,20 +4,22 @@
* PostGIS extension for PostgreSQL JDBC driver - Binary Parser
*
* (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
*
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
@@ -26,7 +28,8 @@ package org.postgis.binary;
public abstract class ByteGetter {
/**
* Get a byte.
- *
+ *
+ * @param index the index to get the value from
* @return The result is returned as Int to eliminate sign problems when
* or'ing several values together.
*/
diff --git a/jdbc/src/main/java/org/postgis/binary/ByteSetter.java b/jdbc/src/main/java/org/postgis/binary/ByteSetter.java
index 5160a03..4522745 100644
--- a/jdbc/src/main/java/org/postgis/binary/ByteSetter.java
+++ b/jdbc/src/main/java/org/postgis/binary/ByteSetter.java
@@ -1,23 +1,25 @@
/*
- * ByteGetter.java
+ * ByteSetter.java
*
* PostGIS extension for PostgreSQL JDBC driver - Binary Parser
*
* (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
*
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
@@ -27,7 +29,9 @@ public abstract class ByteSetter {
/**
* Set a byte.
- *
+ *
+ * @param b byte value to set with
+ * @param index index to set
*/
public abstract void set(byte b, int index);
diff --git a/jdbc/src/main/java/org/postgis/binary/ValueGetter.java b/jdbc/src/main/java/org/postgis/binary/ValueGetter.java
index b10a749..b1ed070 100644
--- a/jdbc/src/main/java/org/postgis/binary/ValueGetter.java
+++ b/jdbc/src/main/java/org/postgis/binary/ValueGetter.java
@@ -4,20 +4,22 @@
* PostGIS extension for PostgreSQL JDBC driver - Binary Parser
*
* (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
*
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
@@ -35,6 +37,8 @@ public abstract class ValueGetter {
/**
* Get a byte, should be equal for all endians
+ *
+ * @return the byte value
*/
public byte getByte() {
return (byte) data.get(position++);
@@ -52,17 +56,27 @@ public abstract class ValueGetter {
return res;
}
- /** Get a 32-Bit integer */
+ /**
+ * Get a 32-Bit integer
+ *
+ * @param index the index to get the value from
+ * @return the int value
+ */
protected abstract int getInt(int index);
/**
* Get a long value. This is not needed directly, but as a nice side-effect
* from GetDouble.
+ *
+ * @param index the index to get the value from
+ * @return the long value
*/
protected abstract long getLong(int index);
/**
* Get a double.
+ *
+ * @return the double value
*/
public double getDouble() {
long bitrep = getLong();
diff --git a/jdbc/src/main/java/org/postgis/binary/ValueSetter.java b/jdbc/src/main/java/org/postgis/binary/ValueSetter.java
index 0810941..b53efc8 100644
--- a/jdbc/src/main/java/org/postgis/binary/ValueSetter.java
+++ b/jdbc/src/main/java/org/postgis/binary/ValueSetter.java
@@ -1,23 +1,25 @@
/*
- * ValueGetter.java
+ * ValueSetter.java
*
* PostGIS extension for PostgreSQL JDBC driver - Binary Parser
*
* (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
*
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
@@ -34,7 +36,9 @@ public abstract class ValueSetter {
}
/**
- * Get a byte, should be equal for all endians
+ * Set a byte, should be equal for all endians
+ *
+ * @param value byte value to be set with.
*/
public void setByte(byte value) {
data.set(value, position);
@@ -51,17 +55,28 @@ public abstract class ValueSetter {
position += 8;
}
- /** Get a 32-Bit integer */
+ /**
+ * Set a 32-Bit integer
+ *
+ * @param value int value to be set with
+ * @param index int value for the index
+ *
+ */
protected abstract void setInt(int value, int index);
/**
- * Get a long value. This is not needed directly, but as a nice side-effect
+ * Set a long value. This is not needed directly, but as a nice side-effect
* from GetDouble.
+ *
+ * @param data int value to be set with
+ * @param index int value for the index
*/
protected abstract void setLong(long data, int index);
/**
- * Get a double.
+ * Set a double.
+ *
+ * @param data double value to be set with
*/
public void setDouble(double data) {
long bitrep = Double.doubleToLongBits(data);
diff --git a/jdbc/src/test/java/org/postgis/AutoRegistrationTest.java b/jdbc/src/test/java/org/postgis/AutoRegistrationTest.java
index 3d61759..ae3e3d5 100644
--- a/jdbc/src/test/java/org/postgis/AutoRegistrationTest.java
+++ b/jdbc/src/test/java/org/postgis/AutoRegistrationTest.java
@@ -1,23 +1,23 @@
/*
- * TestAutoregister.java
+ * AutoRegistrationTest.java
*
* PostGIS extension for PostgreSQL JDBC driver - example and test classes
*
* (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
*
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/jdbc/src/test/java/org/postgis/BoxesTest.java b/jdbc/src/test/java/org/postgis/BoxesTest.java
index e02352b..4f06b2f 100644
--- a/jdbc/src/test/java/org/postgis/BoxesTest.java
+++ b/jdbc/src/test/java/org/postgis/BoxesTest.java
@@ -1,5 +1,5 @@
/*
- * Test.java
+ * BoxesTest.java
*
* PostGIS extension for PostgreSQL JDBC driver - example and test classes
*
@@ -9,19 +9,19 @@
*
* (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
*
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/jdbc/src/test/java/org/postgis/DatatypesTest.java b/jdbc/src/test/java/org/postgis/DatatypesTest.java
index 94cce06..bcfb562 100644
--- a/jdbc/src/test/java/org/postgis/DatatypesTest.java
+++ b/jdbc/src/test/java/org/postgis/DatatypesTest.java
@@ -1,5 +1,5 @@
/*
- * Test.java
+ * DatatypesTest.java
*
* PostGIS extension for PostgreSQL JDBC driver - example and test classes
*
@@ -9,19 +9,19 @@
*
* (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
*
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/jdbc/src/test/java/org/postgis/EmptyGeometriesTest.java b/jdbc/src/test/java/org/postgis/EmptyGeometriesTest.java
index 6a7729c..09af631 100644
--- a/jdbc/src/test/java/org/postgis/EmptyGeometriesTest.java
+++ b/jdbc/src/test/java/org/postgis/EmptyGeometriesTest.java
@@ -1,3 +1,26 @@
+/*
+ * EmptyGeometriesTest.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - example and test classes
+ *
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
package org.postgis;
diff --git a/jdbc/src/test/java/org/postgis/ParserTest.java b/jdbc/src/test/java/org/postgis/ParserTest.java
index 21668e8..8e6eb3a 100644
--- a/jdbc/src/test/java/org/postgis/ParserTest.java
+++ b/jdbc/src/test/java/org/postgis/ParserTest.java
@@ -1,5 +1,5 @@
/*
- * Test.java
+ * ParserTest.java
*
* PostGIS extension for PostgreSQL JDBC driver - example and test classes
*
@@ -9,19 +9,19 @@
*
* (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
*
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/jdbc/src/test/java/org/postgis/ServerTest.java b/jdbc/src/test/java/org/postgis/ServerTest.java
index 104ae29..fb01b2f 100644
--- a/jdbc/src/test/java/org/postgis/ServerTest.java
+++ b/jdbc/src/test/java/org/postgis/ServerTest.java
@@ -1,5 +1,5 @@
/*
- * Test.java
+ * ServerTest.java
*
* PostGIS extension for PostgreSQL JDBC driver - example and test classes
*
@@ -9,19 +9,19 @@
*
* (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
*
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/jdbc/src/test/java/org/postgis/TokenizerTest.java b/jdbc/src/test/java/org/postgis/TokenizerTest.java
new file mode 100644
index 0000000..41c2f86
--- /dev/null
+++ b/jdbc/src/test/java/org/postgis/TokenizerTest.java
@@ -0,0 +1,56 @@
+/*
+ * TokenizerTest.java
+ *
+ * PostGIS extension for PostgreSQL JDBC driver - example and test classes
+ *
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
+package org.postgis;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.testng.annotations.Test;
+
+import java.util.List;
+
+
+public class TokenizerTest {
+
+ private static final Logger logger = LoggerFactory.getLogger(TokenizerTest.class);
+
+
+ @Test
+ public void testTokenizer() {
+ char delimiterL1 = ',';
+ char delimiterL2 = ' ';
+ String stringToTokenize = "((1 2 3),(4 5 6),(7 8 9)";
+ logger.debug("tokenizing string value => {}", stringToTokenize);
+ List<String> tokensLevel1 = GeometryTokenizer.tokenize(GeometryTokenizer.removeLeadingAndTrailingStrings(stringToTokenize, "(", ")"), delimiterL1);
+ logger.debug("level 1 tokens [delimiter = {}] [tokenCount = {}]", delimiterL1, tokensLevel1.size());
+ for (String tokenL1 : tokensLevel1) {
+ logger.debug("L1 token => {} / {}", tokenL1, GeometryTokenizer.removeLeadingAndTrailingStrings(tokenL1, "(", ")"));
+ List<String> tokensLevel2 = GeometryTokenizer.tokenize(GeometryTokenizer.removeLeadingAndTrailingStrings(tokenL1, "(", ")"), delimiterL2);
+ logger.debug("level 2 tokens [delimiter = {}] [tokenCount = {}]", delimiterL2, tokensLevel2.size());
+ for (String tokenL2 : tokensLevel2) {
+ logger.debug("L2 token => {} / {}", tokenL2, GeometryTokenizer.removeLeadingAndTrailingStrings(tokenL2, "(", ")"));
+ }
+ }
+ }
+
+}
\ No newline at end of file
diff --git a/jdbc/src/test/java/org/postgis/VersionPrinter.java b/jdbc/src/test/java/org/postgis/VersionPrinter.java
index 155b0de..e00e4b5 100644
--- a/jdbc/src/test/java/org/postgis/VersionPrinter.java
+++ b/jdbc/src/test/java/org/postgis/VersionPrinter.java
@@ -7,19 +7,19 @@
*
* (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
*
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/jdbc/src/test/resources/testng.xml b/jdbc/src/test/resources/testng.xml
index b719b31..10fe626 100644
--- a/jdbc/src/test/resources/testng.xml
+++ b/jdbc/src/test/resources/testng.xml
@@ -15,6 +15,7 @@
<class name="org.postgis.EmptyGeometriesTest"/>
<class name="org.postgis.ParserTest"/>
<class name="org.postgis.ServerTest"/>
+ <class name="org.postgis.TokenizerTest"/>
<class name="org.postgis.VersionPrinter"/>
</classes>
</test>
diff --git a/jdbc_jtsparser/pom.xml b/jdbc_jtsparser/pom.xml
index 66fa785..10e29be 100644
--- a/jdbc_jtsparser/pom.xml
+++ b/jdbc_jtsparser/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>net.postgis</groupId>
<artifactId>postgis-java-aggregator</artifactId>
- <version>2.1.7.2</version>
+ <version>2.2.1-SNAPSHOT</version>
</parent>
<artifactId>postgis-jdbc-jtsparser</artifactId>
- <version>2.1.7.2</version>
+ <version>2.2.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Postgis JDBC Driver JTS Parser</name>
@@ -27,7 +27,7 @@
<dependency>
<groupId>net.postgis</groupId>
<artifactId>postgis-jdbc</artifactId>
- <version>2.1.7.2</version>
+ <version>[2.1.0,)</version>
</dependency>
<dependency>
<groupId>com.vividsolutions</groupId>
diff --git a/jdbc_jtsparser/postgis-jdbc-jtsparser.iml b/jdbc_jtsparser/postgis-jdbc-jtsparser.iml
index d0da452..299b5d9 100644
--- a/jdbc_jtsparser/postgis-jdbc-jtsparser.iml
+++ b/jdbc_jtsparser/postgis-jdbc-jtsparser.iml
@@ -17,9 +17,14 @@
<orderEntry type="library" name="Maven: xerces:xercesImpl:2.4.0" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.3" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.3" level="project" />
- <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.12" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.9.4" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.13" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.9.9" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.10" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.48" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.ant:ant:1.7.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.ant:ant-launcher:1.7.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.yaml:snakeyaml:1.15" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
</component>
</module>
\ No newline at end of file
diff --git a/jdbc_jtsparser/src/main/java/org/postgis/jts/JTSShape.java b/jdbc_jtsparser/src/main/java/org/postgis/jts/JTSShape.java
index 5f34991..6fde494 100644
--- a/jdbc_jtsparser/src/main/java/org/postgis/jts/JTSShape.java
+++ b/jdbc_jtsparser/src/main/java/org/postgis/jts/JTSShape.java
@@ -1,3 +1,28 @@
+/*
+ * JTSShape.java
+ *
+ * Binary Parser for JTS - relies on org.postgis V1.0.0+ package.
+ *
+ * (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
+ *
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
package org.postgis.jts;
import java.awt.Rectangle;
@@ -172,7 +197,10 @@ public class JTSShape implements Shape {
isRing = ls instanceof LinearRing;
}
- /** only to be called from PolygonPathIterator subclass */
+ /**
+ * only to be called from PolygonPathIterator subclass
+ * @param _cs A coordinate sequence to be used.
+ */
protected void reInit(CoordinateSequence _cs) {
cs = _cs;
index=0;
diff --git a/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsBinaryParser.java b/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsBinaryParser.java
index 1d2a0be..488c66c 100644
--- a/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsBinaryParser.java
+++ b/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsBinaryParser.java
@@ -5,19 +5,21 @@
*
* (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
*
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
package org.postgis.jts;
@@ -65,28 +67,46 @@ public class JtsBinaryParser {
}
}
+
/**
* Parse a hex encoded geometry
+ * @param value String containing the hex data to be parsed
+ * @return the resulting parsed geometry
*/
public Geometry parse(String value) {
StringByteGetter bytes = new ByteGetter.StringByteGetter(value);
return parseGeometry(valueGetterForEndian(bytes));
}
+
/**
* Parse a binary encoded geometry.
+ * @param value byte array containing the binary encoded geometru
+ * @return the resulting parsed geometry
*/
public Geometry parse(byte[] value) {
BinaryByteGetter bytes = new ByteGetter.BinaryByteGetter(value);
return parseGeometry(valueGetterForEndian(bytes));
}
- /** Parse a geometry starting at offset. */
+
+ /**
+ * Parse a geometry starting at offset.
+ * @param data ValueGetter for the data to be parsed
+ * @return The resulting Geometry
+ */
protected Geometry parseGeometry(ValueGetter data) {
return parseGeometry(data, 0, false);
}
- /** Parse with a known geometry factory */
+
+ /**
+ * Parse with a known geometry factory
+ * @param data ValueGetter for the data to be parsed
+ * @param srid the SRID to be used for parsing
+ * @param inheritSrid flag to toggle inheriting SRIDs
+ * @return The resulting Geometry
+ */
protected Geometry parseGeometry(ValueGetter data, int srid, boolean inheritSrid) {
byte endian = data.getByte(); // skip and test endian flag
if (endian != data.endian) {
diff --git a/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsBinaryWriter.java b/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsBinaryWriter.java
index a7dc43b..86d7c4c 100644
--- a/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsBinaryWriter.java
+++ b/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsBinaryWriter.java
@@ -5,19 +5,21 @@
*
* (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
*
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
package org.postgis.jts;
@@ -55,10 +57,9 @@ public class JtsBinaryWriter {
/**
* Get the appropriate ValueGetter for my endianness
*
- * @param bytes
- * The appropriate Byte Getter
- *
- * @return the ValueGetter
+ * @param bytes The ByteSetter
+ * @param endian The endian to be used
+ * @return the appropriate ValueSetter for the specified endian
*/
public static ValueSetter valueSetterForEndian(ByteSetter bytes, byte endian) {
if (endian == ValueSetter.XDR.NUMBER) { // XDR
@@ -75,6 +76,10 @@ public class JtsBinaryWriter {
*
* Currently, geometries with more than 2 dimensions and measures are not
* cleanly supported, but SRID is honored.
+ *
+ * @param geom The geometry to be written
+ * @param REP The endianness representation to use for writing
+ * @return String containing the hex-encoded geometry
*/
public String writeHexed(Geometry geom, byte REP) {
int length = estimateBytes(geom);
@@ -89,9 +94,13 @@ public class JtsBinaryWriter {
/**
* Write a binary encoded geometry.
- *
+ *
* Currently, geometries with more than 2 dimensions and measures are not
* cleanly supported, but SRID is honored.
+ *
+ * @param geom The geometry to be written
+ * @param REP The endianness representation to use for writing
+ * @return byte array containing the encoded geometry
*/
public byte[] writeBinary(Geometry geom, byte REP) {
int length = estimateBytes(geom);
@@ -104,7 +113,12 @@ public class JtsBinaryWriter {
return writeBinary(geom, ValueSetter.NDR.NUMBER);
}
- /** Parse a geometry starting at offset. */
+
+ /**
+ * Parse a geometry starting at offset.
+ * @param geom The Geometry to be written
+ * @param dest The ValueSettr to write to
+ */
protected void writeGeometry(Geometry geom, ValueSetter dest) {
final int dimension;
if (geom == null) {
@@ -252,7 +266,12 @@ public class JtsBinaryWriter {
}
}
- /** Estimate how much bytes a geometry will need in WKB. */
+
+ /**
+ * Estimate how much bytes a geometry will need in WKB.
+ * @param geom Geometry to estimate
+ * @return number of bytes needed
+ */
protected int estimateBytes(Geometry geom) {
int result = 0;
diff --git a/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsGeometry.java b/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsGeometry.java
index 3a4d91e..37e4e44 100644
--- a/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsGeometry.java
+++ b/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsGeometry.java
@@ -6,19 +6,21 @@
*
* (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
*
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
@@ -107,7 +109,12 @@ public class JtsGeometry extends PGobject {
}
}
- /** Recursively set a srid for the geometry and all subgeometries */
+
+ /**
+ * Recursively set a srid for the geometry and all subgeometries
+ * @param geom Geometry to work on
+ * @param srid SRID to be set to
+ */
public static void setSridRecurse(final Geometry geom, final int srid) {
geom.setSRID(srid);
if (geom instanceof GeometryCollection) {
diff --git a/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsGisWrapper.java b/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsGisWrapper.java
index 62caa0f..e993d04 100644
--- a/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsGisWrapper.java
+++ b/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsGisWrapper.java
@@ -1,24 +1,26 @@
/*
- * JtsWrapper.java
+ * JtsGisWrapper.java
*
* Allows transparent usage of JTS Geometry classes via PostgreSQL JDBC driver
* connected to a PostGIS enabled PostgreSQL server.
*
* (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
*
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
@@ -84,9 +86,9 @@ public class JtsGisWrapper extends Driver {
}
/**
- * adds the JTS/PostGIS Data types to a PG Connection.
- *
- * @throws SQLException
+ * Adds the JTS/PostGIS Data types to a PG Connection.
+ * @param pgconn The PGConnection object to add the types to
+ * @throws SQLException when an SQLException occurs
*/
public static void addGISTypes(PGConnection pgconn) throws SQLException {
pgconn.addDataType("geometry", org.postgis.jts.JtsGeometry.class);
@@ -96,6 +98,10 @@ public class JtsGisWrapper extends Driver {
/**
* Mangles the PostGIS URL to return the original PostGreSQL URL
+ *
+ * @param url String containing the url to be "mangled"
+ * @return "mangled" string
+ * @throws SQLException when a SQLException occurs
*/
public static String mangleURL(String url) throws SQLException {
if (url.startsWith(POSTGIS_PROTOCOL)) {
@@ -147,6 +153,8 @@ public class JtsGisWrapper extends Driver {
/**
* Returns our own CVS version plus postgres Version
+ *
+ * @return String representation of the version
*/
public static String getVersion() {
return "JtsGisWrapper " + REVISION + ", wrapping " + Driver.getVersion();
diff --git a/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsWrapper.java b/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsWrapper.java
index 53a70cc..bae1824 100644
--- a/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsWrapper.java
+++ b/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsWrapper.java
@@ -6,19 +6,21 @@
*
* (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
*
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
@@ -34,7 +36,7 @@ import org.postgresql.Driver;
import org.postgresql.PGConnection;
/**
- * DriverWrapper
+ * JtsWrapper
*
* Wraps the PostGreSQL Driver to add the JTS/PostGIS Object Classes.
*
@@ -90,13 +92,14 @@ public class JtsWrapper extends Driver {
public java.sql.Connection connect(String url, Properties info) throws SQLException {
url = mangleURL(url);
Connection result = super.connect(url, info);
- addGISTypes((PGConnection) result);
+ addGISTypes((PGConnection)result);
return result;
}
/**
- * adds the JTS/PostGIS Data types to a PG Connection.
- * @throws SQLException
+ * Adds the JTS/PostGIS Data types to a PG Connection.
+ * @param pgconn The PGConnection object to add the types to
+ * @throws SQLException when an SQLException occurs
*/
public static void addGISTypes(PGConnection pgconn) throws SQLException {
pgconn.addDataType("geometry", org.postgis.jts.JtsGeometry.class);
@@ -104,6 +107,10 @@ public class JtsWrapper extends Driver {
/**
* Mangles the PostGIS URL to return the original PostGreSQL URL
+ *
+ * @param url String containing the url to be "mangled"
+ * @return "mangled" string
+ * @throws SQLException when a SQLException occurs
*/
public static String mangleURL(String url) throws SQLException {
if (url.startsWith(POSTGIS_PROTOCOL)) {
@@ -152,6 +159,8 @@ public class JtsWrapper extends Driver {
/**
* Returns our own CVS version plus postgres Version
+ *
+ * @return String representation of the version
*/
public static String getVersion() {
return "JtsGisWrapper " + REVISION + ", wrapping " + Driver.getVersion();
diff --git a/jdbc_jtsparser/src/test/java/org/postgis/jts/JtsParserTest.java b/jdbc_jtsparser/src/test/java/org/postgis/jts/JtsParserTest.java
index 8840d48..a3506bb 100644
--- a/jdbc_jtsparser/src/test/java/org/postgis/jts/JtsParserTest.java
+++ b/jdbc_jtsparser/src/test/java/org/postgis/jts/JtsParserTest.java
@@ -1,3 +1,26 @@
+/*
+ * JtsParserTest.java
+ *
+ * JtsParserTest for JTS - relies on org.postgis V1.0.0+ package.
+ *
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
+
package org.postgis.jts;
diff --git a/pom.xml b/pom.xml
index 5b99218..eb6de8f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
<groupId>net.postgis</groupId>
<artifactId>postgis-java-aggregator</artifactId>
- <version>2.1.7.2</version>
+ <version>2.2.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>PostGIS Java Project</name>
@@ -77,8 +77,8 @@
<url>https://github.com/postgis/postgis-java</url>
<connection>scm:git:git://github.com/postgis/postgis-java.git</connection>
<developerConnection>scm:git:git at github.com:postgis/postgis-java.git</developerConnection>
- <tag>2.1.7.2</tag>
- </scm>
+ <tag>HEAD</tag>
+ </scm>
<issueManagement>
<system>GitHub Issues</system>
<url>https://github.com/postgis/postgis-java/issues</url>
@@ -101,26 +101,34 @@
<maven.test.skip>false</maven.test.skip>
<surefire.forkCount>1</surefire.forkCount>
<surefire.useSystemClassLoader>true</surefire.useSystemClassLoader>
+ <maven.integration.test.skip>false</maven.integration.test.skip>
+ <failsafe.forkCount>1</failsafe.forkCount>
+ <failsafe.useSystemClassLoader>true</failsafe.useSystemClassLoader>
+
<!-- Plugin versioning -->
- <maven-clean-plugin.version>2.6.1</maven-clean-plugin.version>
+ <build-helper-maven-plugin.version>1.9.1</build-helper-maven-plugin.version>
+ <download-maven-plugin.version>1.2.1</download-maven-plugin.version>
+ <maven-clean-plugin.version>3.0.0</maven-clean-plugin.version>
<maven-compiler-plugin.version>3.3</maven-compiler-plugin.version>
<maven-dependency-plugin.version>2.10</maven-dependency-plugin.version>
+ <maven-deploy-plugin.version>2.8.2</maven-deploy-plugin.version>
<maven-ear-plugin.version>2.10.1</maven-ear-plugin.version>
- <maven-enforcer-plugin.version>1.4</maven-enforcer-plugin.version>
+ <maven-enforcer-plugin.version>1.4.1</maven-enforcer-plugin.version>
+ <maven-failsafe-plugin.version>2.19</maven-failsafe-plugin.version>
<maven-gpg-plugin.version>1.6</maven-gpg-plugin.version>
<maven-install-plugin.version>2.5.2</maven-install-plugin.version>
- <maven-javadoc-plugin.version>2.10.3</maven-javadoc-plugin.version>
<maven-jar-plugin.version>2.6</maven-jar-plugin.version>
<maven-jarsigner-plugin.version>1.4</maven-jarsigner-plugin.version>
- <maven-release-plugin.version>2.5.2</maven-release-plugin.version>
+ <maven-javadoc-plugin.version>2.10.3</maven-javadoc-plugin.version>
+ <maven-release-plugin.version>2.5.3</maven-release-plugin.version>
<maven-resources-plugin.version>2.7</maven-resources-plugin.version>
<maven-source-plugin.version>2.4</maven-source-plugin.version>
- <maven-surefire-plugin.version>2.18.1</maven-surefire-plugin.version>
+ <maven-surefire-plugin.version>2.19</maven-surefire-plugin.version>
<maven-war-plugin.version>2.6</maven-war-plugin.version>
<!-- Dependency versions -->
<dependency.logback.version>1.1.3</dependency.logback.version>
- <dependency.slfj.version>1.7.12</dependency.slfj.version>
- <dependency.testng.version>6.9.4</dependency.testng.version>
+ <dependency.slfj.version>1.7.13</dependency.slfj.version>
+ <dependency.testng.version>6.9.9</dependency.testng.version>
</properties>
<dependencies>
@@ -150,6 +158,11 @@
<build>
<plugins>
<plugin>
+ <groupId>com.googlecode.maven-download-plugin</groupId>
+ <artifactId>download-maven-plugin</artifactId>
+ <version>${download-maven-plugin.version}</version>
+ </plugin>
+ <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-clean-plugin</artifactId>
<version>${maven-clean-plugin.version}</version>
@@ -170,6 +183,11 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-deploy-plugin</artifactId>
+ <version>${maven-deploy-plugin.version}</version>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-ear-plugin</artifactId>
<version>${maven-ear-plugin.version}</version>
</plugin>
@@ -195,6 +213,21 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-failsafe-plugin</artifactId>
+ <version>${maven-failsafe-plugin.version}</version>
+ <configuration>
+ <forkCount>${failsafe.forkCount}</forkCount>
+ <skip>${maven.integration.test.skip}</skip>
+ <systemPropertyVariables>
+ <derby.stream.error.file>
+ ${project.build.directory}/derby.log
+ </derby.stream.error.file>
+ </systemPropertyVariables>
+ <useSystemClassLoader>${failsafe.useSystemClassLoader}</useSystemClassLoader>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-gpg-plugin</artifactId>
<version>${maven-gpg-plugin.version}</version>
</plugin>
@@ -210,18 +243,24 @@
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-javadoc-plugin</artifactId>
- <version>${maven-javadoc-plugin.version}</version>
+ <artifactId>maven-jarsigner-plugin</artifactId>
+ <version>${maven-jarsigner-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jarsigner-plugin</artifactId>
- <version>${maven-jarsigner-plugin.version}</version>
+ <artifactId>maven-javadoc-plugin</artifactId>
+ <version>${maven-javadoc-plugin.version}</version>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
<version>${maven-release-plugin.version}</version>
+ <configuration>
+ <autoVersionSubmodules>true</autoVersionSubmodules>
+ <localCheckout>true</localCheckout>
+ <pushChanges>false</pushChanges>
+ <releaseProfiles>release-sign-artifacts</releaseProfiles>
+ </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -253,6 +292,11 @@
<artifactId>maven-war-plugin</artifactId>
<version>${maven-war-plugin.version}</version>
</plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>build-helper-maven-plugin</artifactId>
+ <version>${build-helper-maven-plugin.version}</version>
+ </plugin>
</plugins>
</build>
diff --git a/postgis-java-aggregator.iml b/postgis-java-aggregator.iml
index f6e9bf2..57a8f4f 100644
--- a/postgis-java-aggregator.iml
+++ b/postgis-java-aggregator.iml
@@ -10,9 +10,14 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.3" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.3" level="project" />
- <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.12" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.9.4" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.13" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.9.9" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.10" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.48" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.ant:ant:1.7.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.ant:ant-launcher:1.7.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.yaml:snakeyaml:1.15" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
</component>
</module>
\ No newline at end of file
diff --git a/postgis-jdbc-java2d/pom.xml b/postgis-jdbc-java2d/pom.xml
index bc9b77b..8902952 100644
--- a/postgis-jdbc-java2d/pom.xml
+++ b/postgis-jdbc-java2d/pom.xml
@@ -5,11 +5,11 @@
<parent>
<groupId>net.postgis</groupId>
<artifactId>postgis-java-aggregator</artifactId>
- <version>2.1.7.2</version>
+ <version>2.2.1-SNAPSHOT</version>
</parent>
<artifactId>postgis-jdbc-java2d</artifactId>
- <version>2.1.7.2</version>
+ <version>2.2.1-SNAPSHOT</version>
<packaging>jar</packaging>
<name>postgis-jdbc-java2d</name>
@@ -27,7 +27,7 @@
<dependency>
<groupId>net.postgis</groupId>
<artifactId>postgis-jdbc</artifactId>
- <version>2.1.7.2</version>
+ <version>2.2.1-SNAPSHOT</version>
</dependency>
</dependencies>
diff --git a/postgis-jdbc-java2d/postgis-jdbc-java2d.iml b/postgis-jdbc-java2d/postgis-jdbc-java2d.iml
index f32aba9..620cc3b 100644
--- a/postgis-jdbc-java2d/postgis-jdbc-java2d.iml
+++ b/postgis-jdbc-java2d/postgis-jdbc-java2d.iml
@@ -15,9 +15,14 @@
<orderEntry type="library" name="Maven: postgresql:postgresql:9.1-901-1.jdbc4" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-classic:1.1.3" level="project" />
<orderEntry type="library" name="Maven: ch.qos.logback:logback-core:1.1.3" level="project" />
- <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.12" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.9.4" level="project" />
- <orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
+ <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.13" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.testng:testng:6.9.9" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: junit:junit:4.10" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
<orderEntry type="library" scope="TEST" name="Maven: com.beust:jcommander:1.48" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.ant:ant:1.7.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.apache.ant:ant-launcher:1.7.0" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.yaml:snakeyaml:1.15" level="project" />
+ <orderEntry type="library" scope="TEST" name="Maven: org.beanshell:bsh:2.0b4" level="project" />
</component>
</module>
\ No newline at end of file
diff --git a/postgis-jdbc-java2d/src/main/java/examples/TestJava2d.java b/postgis-jdbc-java2d/src/main/java/examples/TestJava2d.java
index 9bc5183..33e2444 100644
--- a/postgis-jdbc-java2d/src/main/java/examples/TestJava2d.java
+++ b/postgis-jdbc-java2d/src/main/java/examples/TestJava2d.java
@@ -1,25 +1,27 @@
/*
- * Test.java
+ * TestJava2d.java
*
* PostGIS extension for PostgreSQL JDBC driver - example and test classes
*
* (C) 2004 Paul Ramsey, pramsey at refractions.net
*
* (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
- *
- * This program is free software; you can redistribute it and/or modify it under
- * the terms of the GNU General Public License as published by the Free Software
- * Foundation; either version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
- * details.
- *
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
+ *
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
@@ -43,6 +45,14 @@ public class TestJava2d {
public static final Shape[] SHAPEARRAY = new Shape[0];
+ public static final String[][] testDataset = new String[][] {
+ {"point1", "POINT(10 11)"},
+ {"multipoint1", "MULTIPOINT(10.25 11,10.5 11,10.75 11,11 11,11.25 11,11.5 11,11.75 11,12 11)"},
+ {"linestring1", "LINESTRING(0 0,100 0,100 100,0 100)"},
+ {"linestring2", "LINESTRING(-310 110,210 110,210 210,-310 210,-310 110)"},
+ {"multilinestring", "MULTILINESTRING((0 0,10 10,20 0,30 10),(40 0,40 10,50 10,50 20,60 20))"},
+ };
+
static {
new Java2DWrapper(); // make shure our driver is initialized
}
@@ -58,11 +68,14 @@ public class TestJava2d {
System.exit(1);
}
- Shape[] geometries = read(args[0], args[1], args[2], "SELECT " + args[4] + " FROM "
- + args[3]);
-
+ Shape[] geometries = read(args[0], args[1], args[2], "SELECT " + args[4] + " FROM " + args[3]);
+ if (DEBUG) {
+ System.err.println("read " + geometries.length + " geometries.");
+ }
if (geometries.length == 0) {
- System.err.println("No geometries were found.");
+ if (DEBUG) {
+ System.err.println("No geometries were read.");
+ }
return;
}
@@ -91,11 +104,15 @@ public class TestJava2d {
private static Shape[] read(String dburl, String dbuser, String dbpass, String query)
throws ClassNotFoundException, SQLException {
ArrayList geometries = new ArrayList();
- System.out.println("Creating JDBC connection...");
+ if (DEBUG) {
+ System.err.println("Creating JDBC connection...");
+ }
Class.forName("org.postgresql.Driver");
Connection conn = DriverManager.getConnection(dburl, dbuser, dbpass);
- System.out.println("fetching geometries");
+ if (DEBUG) {
+ System.err.println("fetching geometries: " + query);
+ }
ResultSet r = conn.createStatement().executeQuery(query);
while (r.next()) {
@@ -123,17 +140,33 @@ public class TestJava2d {
public void paint(Graphics og) {
Graphics2D g = (Graphics2D) og;
-
- final double scaleX = (super.getWidth() - 10) / bbox.getWidth();
- final double scaleY = (super.getHeight() - 10) / bbox.getHeight();
-
+ // Add 5% padding on all borders
+ final double paddingTop = bbox.getHeight() * 0.05;
+ final double paddingBottom = bbox.getHeight() * 0.05;
+ final double paddingLeft = bbox.getWidth() * 0.05;
+ final double paddingRight = bbox.getWidth() * 0.05;
+ // If the bounding box has negative coordinates, we need to offset by the negative coordinate
+ final double offsetX = (bbox.getX() < 0) ? (0 - bbox.getX()) : 0;
+ final double offsetY = (bbox.getY() < 0) ? (0 - bbox.getY()) : 0;
+ // Scale by the bounding box and padding
+ final double scaleX = (super.getWidth() - (paddingLeft + paddingRight)) / (bbox.getWidth());
+ final double scaleY = (super.getHeight() - (paddingTop + paddingBottom)) / (bbox.getHeight());
+ // Apply the transform parameters
AffineTransform at = new AffineTransform();
- at.translate(super.getX() + 5, super.getY() + 5);
+ at.translate(paddingLeft, paddingTop);
at.scale(scaleX, scaleY);
- at.translate(-bbox.getX(), -bbox.getY());
+ at.translate(offsetX, offsetY);
if (DEBUG) {
System.err.println();
+ System.err.println("paddingTop: " + paddingTop);
+ System.err.println("paddingBottom: " + paddingBottom);
+ System.err.println("paddingLeft: " + paddingLeft);
+ System.err.println("paddingRight: " + paddingRight);
+ System.err.println("offsetX: " + offsetX);
+ System.err.println("offsetY: " + offsetY);
+ System.err.println("scaleX: " + scaleX);
+ System.err.println("scaleY: " + scaleY);
System.err.println("bbox: " + bbox);
System.err.println("trans: " + at);
System.err.println("new: " + at.createTransformedShape(bbox).getBounds2D());
@@ -174,4 +207,4 @@ public class TestJava2d {
public void windowOpened(WindowEvent e) {//
}
}
-}
+}
\ 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/org/postgis/java2d/Java2DWrapper.java
index cc30e8b..0a0d461 100644
--- a/postgis-jdbc-java2d/src/main/java/org/postgis/java2d/Java2DWrapper.java
+++ b/postgis-jdbc-java2d/src/main/java/org/postgis/java2d/Java2DWrapper.java
@@ -1,5 +1,5 @@
/*
- * JtsWrapper.java
+ * Java2DWrapper.java
*
* Allows transparent usage of JTS Geometry classes via PostgreSQL JDBC driver
* connected to a PostGIS enabled PostgreSQL server.
@@ -7,20 +7,20 @@
* (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
*
* (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
diff --git a/postgis-jdbc-java2d/src/main/java/org/postgis/java2d/PGShapeGeometry.java b/postgis-jdbc-java2d/src/main/java/org/postgis/java2d/PGShapeGeometry.java
index acf6ad6..153b9b3 100644
--- a/postgis-jdbc-java2d/src/main/java/org/postgis/java2d/PGShapeGeometry.java
+++ b/postgis-jdbc-java2d/src/main/java/org/postgis/java2d/PGShapeGeometry.java
@@ -6,20 +6,20 @@
* (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
*
* (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
@@ -39,16 +39,11 @@ import org.postgresql.util.PGobject;
*
* As the java.awt.Shape methods currently are implemented by using a
* java.awt.geom.GeneralPath object, they have the same semantics.
- *
- * BUG/TODO: MultiPoints or Points in a Geometry Collection currently don't work
- * as expected, as some GeneralPath implementations throw away adjacent MoveTo
- * commands as an optimization (e. G. sun 1.5 and ibm 1.5). Points thus are
- * translated into MoveTo() followed by a closePath. This may change when we
- * implement our own path logics. We have to evaluate whether Graphics2D renders
- * a single MoveTo command as a single "brush tip", or we need the closePath()
- * command nevertheless to get any drawing. Maybe we need a LineTo() to the same
- * coordinages instead.
- *
+ *
+ * NOTE: (Multi)Points are translated into a sequence of single MoveTo and LineTo
+ * commands, but WITHOUT a closePath command. When rendering with a stroke that
+ * is not solid, the points may not be rendered.
+ *
* (Multi)LineStrings are translated into a sequence of a single MoveTo and
* multiple LineTo vertices, and Polygon rings into a sequence of a single
* MoveTo, multiple LineTo and a closePath command. To allow correct Polygon
diff --git a/postgis-jdbc-java2d/src/main/java/org/postgis/java2d/ShapeBinaryParser.java b/postgis-jdbc-java2d/src/main/java/org/postgis/java2d/ShapeBinaryParser.java
index b1780b5..2200a4d 100644
--- a/postgis-jdbc-java2d/src/main/java/org/postgis/java2d/ShapeBinaryParser.java
+++ b/postgis-jdbc-java2d/src/main/java/org/postgis/java2d/ShapeBinaryParser.java
@@ -1,25 +1,25 @@
/*
- * JtsBinaryParser.java
+ * ShapeBinaryParser.java
*
- * Binary Parser for JTS - relies on org.postgis V1.0.0+ package.
+ * Shape Binary Parser for Java2D - relies on org.postgis V1.0.0+ package.
*
* (C) 2005 Markus Schaber, markus.schaber at logix-tt.com
*
* (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
- *
- * This library is free software; you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License as published by the Free
- * Software Foundation, either version 2.1 of the License.
- *
- * This library is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
- * FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more
- * details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this library; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA or visit the web at
- * http://www.gnu.org.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*
*/
package org.postgis.java2d;
@@ -154,8 +154,10 @@ public class ShapeBinaryParser {
}
private void parsePoint(ValueGetter data, boolean haveZ, boolean haveM, GeneralPath path) {
- path.moveTo((float) data.getDouble(), (float) data.getDouble());
- path.closePath();
+ double x = data.getDouble();
+ double y = data.getDouble();
+ path.moveTo(x, y);
+ path.lineTo(x, y);
skipZM(data, haveZ, haveM);
}
diff --git a/postgis-jdbc-java2d/src/test/java/org/postgis/java2d/SimpleJava2DWrapperTest.java b/postgis-jdbc-java2d/src/test/java/org/postgis/java2d/SimpleJava2DWrapperTest.java
index 1ff333a..835296b 100644
--- a/postgis-jdbc-java2d/src/test/java/org/postgis/java2d/SimpleJava2DWrapperTest.java
+++ b/postgis-jdbc-java2d/src/test/java/org/postgis/java2d/SimpleJava2DWrapperTest.java
@@ -1,3 +1,25 @@
+/*
+ * SimpleJava2DWrapperTest.java
+ *
+ * SimpleJava2DWrapperTest for Java2D - relies on org.postgis V1.0.0+ package.
+ *
+ * (C) 2015 Phillip Ross, phillip.w.g.ross at gmail.com
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ *
+ */
package org.postgis.java2d;
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/postgis-java.git
More information about the Pkg-grass-devel
mailing list