Java/JDBC directory reorganization

git-svn-id: http://svn.osgeo.org/postgis/trunk@2467 b70326c6-7e19-0410-871a-916f4a2858ee

diff --git a/jdbc2/ejb2/CHANGES b/java/ejb2/CHANGES
similarity index 100%
rename from jdbc2/ejb2/CHANGES
rename to java/ejb2/CHANGES

diff --git a/jdbc2/ejb2/COPYING b/java/ejb2/COPYING
similarity index 100%
rename from jdbc2/ejb2/COPYING
rename to java/ejb2/COPYING

diff --git a/jdbc2/COPYING_LGPL b/java/ejb2/COPYING_LGPL
similarity index 100%
rename from jdbc2/COPYING_LGPL
rename to java/ejb2/COPYING_LGPL

diff --git a/jdbc2/ejb2/README b/java/ejb2/README
similarity index 100%
rename from jdbc2/ejb2/README
rename to java/ejb2/README

diff --git a/jdbc2/ejb2/build.xml b/java/ejb2/build.xml
similarity index 100%
rename from jdbc2/ejb2/build.xml
rename to java/ejb2/build.xml

diff --git a/jdbc2/ejb2/prepare-jboss.xml b/java/ejb2/prepare-jboss.xml
similarity index 100%
rename from jdbc2/ejb2/prepare-jboss.xml
rename to java/ejb2/prepare-jboss.xml

diff --git a/jdbc2/ejb2/resources/application.xml b/java/ejb2/resources/application.xml
similarity index 100%
rename from jdbc2/ejb2/resources/application.xml
rename to java/ejb2/resources/application.xml

diff --git a/jdbc2/ejb2/resources/build.properties b/java/ejb2/resources/build.properties
similarity index 100%
rename from jdbc2/ejb2/resources/build.properties
rename to java/ejb2/resources/build.properties

diff --git a/jdbc2/ejb2/resources/jndi/jndi.properties b/java/ejb2/resources/jndi/jndi.properties
similarity index 100%
rename from jdbc2/ejb2/resources/jndi/jndi.properties
rename to java/ejb2/resources/jndi/jndi.properties

diff --git a/jdbc2/ejb2/resources/postgis-ejb2-ds.xml b/java/ejb2/resources/postgis-ejb2-ds.xml
similarity index 100%
rename from jdbc2/ejb2/resources/postgis-ejb2-ds.xml
rename to java/ejb2/resources/postgis-ejb2-ds.xml

diff --git a/jdbc2/ejb2/src/com/geodetix/geo/client/Client.java b/java/ejb2/src/com/geodetix/geo/client/Client.java
similarity index 100%
rename from jdbc2/ejb2/src/com/geodetix/geo/client/Client.java
rename to java/ejb2/src/com/geodetix/geo/client/Client.java

diff --git a/jdbc2/ejb2/src/com/geodetix/geo/dao/PostGisGeometryDAO.java b/java/ejb2/src/com/geodetix/geo/dao/PostGisGeometryDAO.java
similarity index 100%
rename from jdbc2/ejb2/src/com/geodetix/geo/dao/PostGisGeometryDAO.java
rename to java/ejb2/src/com/geodetix/geo/dao/PostGisGeometryDAO.java

diff --git a/jdbc2/ejb2/src/com/geodetix/geo/dao/PostGisGeometryDAOImpl.java b/java/ejb2/src/com/geodetix/geo/dao/PostGisGeometryDAOImpl.java
similarity index 100%
rename from jdbc2/ejb2/src/com/geodetix/geo/dao/PostGisGeometryDAOImpl.java
rename to java/ejb2/src/com/geodetix/geo/dao/PostGisGeometryDAOImpl.java

diff --git a/jdbc2/ejb2/src/com/geodetix/geo/ejb/GeometryBean.java b/java/ejb2/src/com/geodetix/geo/ejb/GeometryBean.java
similarity index 100%
rename from jdbc2/ejb2/src/com/geodetix/geo/ejb/GeometryBean.java
rename to java/ejb2/src/com/geodetix/geo/ejb/GeometryBean.java

diff --git a/jdbc2/ejb2/src/com/geodetix/geo/ejb/GeometryFacadeBean.java b/java/ejb2/src/com/geodetix/geo/ejb/GeometryFacadeBean.java
similarity index 100%
rename from jdbc2/ejb2/src/com/geodetix/geo/ejb/GeometryFacadeBean.java
rename to java/ejb2/src/com/geodetix/geo/ejb/GeometryFacadeBean.java

diff --git a/jdbc2/ejb2/src/com/geodetix/geo/exception/ApplicationGeoLayerException.java b/java/ejb2/src/com/geodetix/geo/exception/ApplicationGeoLayerException.java
similarity index 100%
rename from jdbc2/ejb2/src/com/geodetix/geo/exception/ApplicationGeoLayerException.java
rename to java/ejb2/src/com/geodetix/geo/exception/ApplicationGeoLayerException.java

diff --git a/jdbc2/.cvsignore b/java/jdbc/.cvsignore
similarity index 100%
rename from jdbc2/.cvsignore
rename to java/jdbc/.cvsignore

diff --git a/jdbc2/ejb2/COPYING_LGPL b/java/jdbc/COPYING_LGPL
similarity index 100%
rename from jdbc2/ejb2/COPYING_LGPL
rename to java/jdbc/COPYING_LGPL

diff --git a/jdbc2/Makefile b/java/jdbc/Makefile
similarity index 100%
rename from jdbc2/Makefile
rename to java/jdbc/Makefile

diff --git a/jdbc2/README b/java/jdbc/README
similarity index 100%
rename from jdbc2/README
rename to java/jdbc/README

diff --git a/jdbc2/jtssrc/examples/JtsTestParser.java b/java/jdbc/jtssrc/examples/JtsTestParser.java
similarity index 100%
rename from jdbc2/jtssrc/examples/JtsTestParser.java
rename to java/jdbc/jtssrc/examples/JtsTestParser.java

diff --git a/jdbc2/jtssrc/org/postgis/jts/JtsBinaryParser.java b/java/jdbc/jtssrc/org/postgis/jts/JtsBinaryParser.java
similarity index 100%
rename from jdbc2/jtssrc/org/postgis/jts/JtsBinaryParser.java
rename to java/jdbc/jtssrc/org/postgis/jts/JtsBinaryParser.java

diff --git a/jdbc2/jtssrc/org/postgis/jts/JtsBinaryWriter.java b/java/jdbc/jtssrc/org/postgis/jts/JtsBinaryWriter.java
similarity index 100%
rename from jdbc2/jtssrc/org/postgis/jts/JtsBinaryWriter.java
rename to java/jdbc/jtssrc/org/postgis/jts/JtsBinaryWriter.java

diff --git a/jdbc2/jtssrc/org/postgis/jts/JtsGeometry.java b/java/jdbc/jtssrc/org/postgis/jts/JtsGeometry.java
similarity index 100%
rename from jdbc2/jtssrc/org/postgis/jts/JtsGeometry.java
rename to java/jdbc/jtssrc/org/postgis/jts/JtsGeometry.java

diff --git a/jdbc2/jtssrc/org/postgis/jts/JtsGisWrapper.java b/java/jdbc/jtssrc/org/postgis/jts/JtsGisWrapper.java
similarity index 100%
rename from jdbc2/jtssrc/org/postgis/jts/JtsGisWrapper.java
rename to java/jdbc/jtssrc/org/postgis/jts/JtsGisWrapper.java

diff --git a/jdbc2/jtssrc/org/postgis/jts/JtsWrapper.java b/java/jdbc/jtssrc/org/postgis/jts/JtsWrapper.java
similarity index 100%
rename from jdbc2/jtssrc/org/postgis/jts/JtsWrapper.java
rename to java/jdbc/jtssrc/org/postgis/jts/JtsWrapper.java

diff --git a/jdbc2/src/examples/Test.java b/java/jdbc/src/examples/Test.java
similarity index 100%
rename from jdbc2/src/examples/Test.java
rename to java/jdbc/src/examples/Test.java

diff --git a/jdbc2/src/examples/TestAutoregister.java b/java/jdbc/src/examples/TestAutoregister.java
similarity index 100%
rename from jdbc2/src/examples/TestAutoregister.java
rename to java/jdbc/src/examples/TestAutoregister.java

diff --git a/jdbc2/src/examples/TestBoxes.java b/java/jdbc/src/examples/TestBoxes.java
similarity index 100%
rename from jdbc2/src/examples/TestBoxes.java
rename to java/jdbc/src/examples/TestBoxes.java

diff --git a/jdbc2/src/examples/TestJava2d.java b/java/jdbc/src/examples/TestJava2d.java
similarity index 100%
rename from jdbc2/src/examples/TestJava2d.java
rename to java/jdbc/src/examples/TestJava2d.java

diff --git a/jdbc2/src/examples/TestParser.java b/java/jdbc/src/examples/TestParser.java
similarity index 100%
rename from jdbc2/src/examples/TestParser.java
rename to java/jdbc/src/examples/TestParser.java

diff --git a/jdbc2/src/examples/TestServer.java b/java/jdbc/src/examples/TestServer.java
similarity index 100%
rename from jdbc2/src/examples/TestServer.java
rename to java/jdbc/src/examples/TestServer.java

diff --git a/jdbc2/src/examples/VersionPrinter.java b/java/jdbc/src/examples/VersionPrinter.java
similarity index 100%
rename from jdbc2/src/examples/VersionPrinter.java
rename to java/jdbc/src/examples/VersionPrinter.java

diff --git a/jdbc2/src/org/postgis/ComposedGeom.java b/java/jdbc/src/org/postgis/ComposedGeom.java
similarity index 100%
rename from jdbc2/src/org/postgis/ComposedGeom.java
rename to java/jdbc/src/org/postgis/ComposedGeom.java

diff --git a/jdbc2/src/org/postgis/DriverWrapper.java b/java/jdbc/src/org/postgis/DriverWrapper.java
similarity index 100%
rename from jdbc2/src/org/postgis/DriverWrapper.java
rename to java/jdbc/src/org/postgis/DriverWrapper.java

diff --git a/jdbc2/src/org/postgis/DriverWrapperAutoprobe.java b/java/jdbc/src/org/postgis/DriverWrapperAutoprobe.java
similarity index 100%
rename from jdbc2/src/org/postgis/DriverWrapperAutoprobe.java
rename to java/jdbc/src/org/postgis/DriverWrapperAutoprobe.java

diff --git a/jdbc2/src/org/postgis/DriverWrapperLW.java b/java/jdbc/src/org/postgis/DriverWrapperLW.java
similarity index 100%
rename from jdbc2/src/org/postgis/DriverWrapperLW.java
rename to java/jdbc/src/org/postgis/DriverWrapperLW.java

diff --git a/jdbc2/src/org/postgis/Geometry.java b/java/jdbc/src/org/postgis/Geometry.java
similarity index 100%
rename from jdbc2/src/org/postgis/Geometry.java
rename to java/jdbc/src/org/postgis/Geometry.java

diff --git a/jdbc2/src/org/postgis/GeometryCollection.java b/java/jdbc/src/org/postgis/GeometryCollection.java
similarity index 100%
rename from jdbc2/src/org/postgis/GeometryCollection.java
rename to java/jdbc/src/org/postgis/GeometryCollection.java

diff --git a/jdbc2/src/org/postgis/LineString.java b/java/jdbc/src/org/postgis/LineString.java
similarity index 100%
rename from jdbc2/src/org/postgis/LineString.java
rename to java/jdbc/src/org/postgis/LineString.java

diff --git a/jdbc2/src/org/postgis/LinearRing.java b/java/jdbc/src/org/postgis/LinearRing.java
similarity index 100%
rename from jdbc2/src/org/postgis/LinearRing.java
rename to java/jdbc/src/org/postgis/LinearRing.java

diff --git a/jdbc2/src/org/postgis/MultiLineString.java b/java/jdbc/src/org/postgis/MultiLineString.java
similarity index 100%
rename from jdbc2/src/org/postgis/MultiLineString.java
rename to java/jdbc/src/org/postgis/MultiLineString.java

diff --git a/jdbc2/src/org/postgis/MultiPoint.java b/java/jdbc/src/org/postgis/MultiPoint.java
similarity index 100%
rename from jdbc2/src/org/postgis/MultiPoint.java
rename to java/jdbc/src/org/postgis/MultiPoint.java

diff --git a/jdbc2/src/org/postgis/MultiPolygon.java b/java/jdbc/src/org/postgis/MultiPolygon.java
similarity index 100%
rename from jdbc2/src/org/postgis/MultiPolygon.java
rename to java/jdbc/src/org/postgis/MultiPolygon.java

diff --git a/jdbc2/src/org/postgis/PGbox2d.java b/java/jdbc/src/org/postgis/PGbox2d.java
similarity index 100%
rename from jdbc2/src/org/postgis/PGbox2d.java
rename to java/jdbc/src/org/postgis/PGbox2d.java

diff --git a/jdbc2/src/org/postgis/PGbox3d.java b/java/jdbc/src/org/postgis/PGbox3d.java
similarity index 100%
rename from jdbc2/src/org/postgis/PGbox3d.java
rename to java/jdbc/src/org/postgis/PGbox3d.java

diff --git a/jdbc2/src/org/postgis/PGboxbase.java b/java/jdbc/src/org/postgis/PGboxbase.java
similarity index 100%
rename from jdbc2/src/org/postgis/PGboxbase.java
rename to java/jdbc/src/org/postgis/PGboxbase.java

diff --git a/jdbc2/src/org/postgis/PGgeometry.java b/java/jdbc/src/org/postgis/PGgeometry.java
similarity index 100%
rename from jdbc2/src/org/postgis/PGgeometry.java
rename to java/jdbc/src/org/postgis/PGgeometry.java

diff --git a/jdbc2/src/org/postgis/PGgeometryLW.java b/java/jdbc/src/org/postgis/PGgeometryLW.java
similarity index 100%
rename from jdbc2/src/org/postgis/PGgeometryLW.java
rename to java/jdbc/src/org/postgis/PGgeometryLW.java

diff --git a/jdbc2/src/org/postgis/Point.java b/java/jdbc/src/org/postgis/Point.java
similarity index 100%
rename from jdbc2/src/org/postgis/Point.java
rename to java/jdbc/src/org/postgis/Point.java

diff --git a/jdbc2/src/org/postgis/PointComposedGeom.java b/java/jdbc/src/org/postgis/PointComposedGeom.java
similarity index 100%
rename from jdbc2/src/org/postgis/PointComposedGeom.java
rename to java/jdbc/src/org/postgis/PointComposedGeom.java

diff --git a/jdbc2/src/org/postgis/Polygon.java b/java/jdbc/src/org/postgis/Polygon.java
similarity index 100%
rename from jdbc2/src/org/postgis/Polygon.java
rename to java/jdbc/src/org/postgis/Polygon.java

diff --git a/jdbc2/src/org/postgis/Version.java b/java/jdbc/src/org/postgis/Version.java
similarity index 100%
rename from jdbc2/src/org/postgis/Version.java
rename to java/jdbc/src/org/postgis/Version.java

diff --git a/jdbc2/src/org/postgis/binary/BinaryParser.java b/java/jdbc/src/org/postgis/binary/BinaryParser.java
similarity index 100%
rename from jdbc2/src/org/postgis/binary/BinaryParser.java
rename to java/jdbc/src/org/postgis/binary/BinaryParser.java

diff --git a/jdbc2/src/org/postgis/binary/BinaryWriter.java b/java/jdbc/src/org/postgis/binary/BinaryWriter.java
similarity index 100%
rename from jdbc2/src/org/postgis/binary/BinaryWriter.java
rename to java/jdbc/src/org/postgis/binary/BinaryWriter.java

diff --git a/jdbc2/src/org/postgis/binary/ByteGetter.java b/java/jdbc/src/org/postgis/binary/ByteGetter.java
similarity index 100%
rename from jdbc2/src/org/postgis/binary/ByteGetter.java
rename to java/jdbc/src/org/postgis/binary/ByteGetter.java

diff --git a/jdbc2/src/org/postgis/binary/ByteSetter.java b/java/jdbc/src/org/postgis/binary/ByteSetter.java
similarity index 100%
rename from jdbc2/src/org/postgis/binary/ByteSetter.java
rename to java/jdbc/src/org/postgis/binary/ByteSetter.java

diff --git a/jdbc2/src/org/postgis/binary/ValueGetter.java b/java/jdbc/src/org/postgis/binary/ValueGetter.java
similarity index 100%
rename from jdbc2/src/org/postgis/binary/ValueGetter.java
rename to java/jdbc/src/org/postgis/binary/ValueGetter.java

diff --git a/jdbc2/src/org/postgis/binary/ValueSetter.java b/java/jdbc/src/org/postgis/binary/ValueSetter.java
similarity index 100%
rename from jdbc2/src/org/postgis/binary/ValueSetter.java
rename to java/jdbc/src/org/postgis/binary/ValueSetter.java

diff --git a/jdbc2/src/org/postgis/java2d/Java2DWrapper.java b/java/jdbc/src/org/postgis/java2d/Java2DWrapper.java
similarity index 100%
rename from jdbc2/src/org/postgis/java2d/Java2DWrapper.java
rename to java/jdbc/src/org/postgis/java2d/Java2DWrapper.java

diff --git a/jdbc2/src/org/postgis/java2d/PGShapeGeometry.java b/java/jdbc/src/org/postgis/java2d/PGShapeGeometry.java
similarity index 100%
rename from jdbc2/src/org/postgis/java2d/PGShapeGeometry.java
rename to java/jdbc/src/org/postgis/java2d/PGShapeGeometry.java

diff --git a/jdbc2/src/org/postgis/java2d/ShapeBinaryParser.java b/java/jdbc/src/org/postgis/java2d/ShapeBinaryParser.java
similarity index 100%
rename from jdbc2/src/org/postgis/java2d/ShapeBinaryParser.java
rename to java/jdbc/src/org/postgis/java2d/ShapeBinaryParser.java

diff --git a/jdbc2/src/org/postgresql/driverconfig.properties b/java/jdbc/src/org/postgresql/driverconfig.properties
similarity index 100%
rename from jdbc2/src/org/postgresql/driverconfig.properties
rename to java/jdbc/src/org/postgresql/driverconfig.properties

diff --git a/jdbc2/stubs/LICENSE b/java/jdbc/stubs/LICENSE
similarity index 100%
rename from jdbc2/stubs/LICENSE
rename to java/jdbc/stubs/LICENSE

diff --git a/jdbc2/stubs/org/postgresql/Connection.java b/java/jdbc/stubs/org/postgresql/Connection.java
similarity index 100%
rename from jdbc2/stubs/org/postgresql/Connection.java
rename to java/jdbc/stubs/org/postgresql/Connection.java

diff --git a/jdbc2/stubs/org/postgresql/PGConnection.java b/java/jdbc/stubs/org/postgresql/PGConnection.java
similarity index 100%
rename from jdbc2/stubs/org/postgresql/PGConnection.java
rename to java/jdbc/stubs/org/postgresql/PGConnection.java

diff --git a/jdbc2/todo.txt b/java/jdbc/todo.txt
similarity index 100%
rename from jdbc2/todo.txt
rename to java/jdbc/todo.txt