From 87b6412b7ca011e425d721d7ae04b8d97b52f82a Mon Sep 17 00:00:00 2001
From: Baris Ergun <barisergun75@gmail.com>
Date: Tue, 4 Mar 2014 20:35:44 +0000
Subject: [PATCH] #2626 moving jtssrc folder as a separate maven project to
 ./java/jdbc_jtsparser

git-svn-id: http://svn.osgeo.org/postgis/trunk@12292 b70326c6-7e19-0410-871a-916f4a2858ee
---
 java/jdbc/pom.xml                             |   2 +-
 java/jdbc_jtsparser/README                    |   2 +
 java/{jdbc/jtssrc => jdbc_jtsparser}/pom.xml  | 103 +++++-------------
 .../main/java}/examples/JtsTestParser.java    |   0
 .../main/java}/org/postgis/jts/JTSShape.java  |   0
 .../org/postgis/jts/JtsBinaryParser.java      |   0
 .../org/postgis/jts/JtsBinaryWriter.java      |   0
 .../java}/org/postgis/jts/JtsGeometry.java    |   0
 .../java}/org/postgis/jts/JtsGisWrapper.java  |   0
 .../java}/org/postgis/jts/JtsWrapper.java     |   0
 .../main/java/org/postgis/jts/overview.html   |   9 ++
 11 files changed, 42 insertions(+), 74 deletions(-)
 create mode 100644 java/jdbc_jtsparser/README
 rename java/{jdbc/jtssrc => jdbc_jtsparser}/pom.xml (57%)
 rename java/{jdbc/jtssrc => jdbc_jtsparser/src/main/java}/examples/JtsTestParser.java (100%)
 rename java/{jdbc/jtssrc => jdbc_jtsparser/src/main/java}/org/postgis/jts/JTSShape.java (100%)
 rename java/{jdbc/jtssrc => jdbc_jtsparser/src/main/java}/org/postgis/jts/JtsBinaryParser.java (100%)
 rename java/{jdbc/jtssrc => jdbc_jtsparser/src/main/java}/org/postgis/jts/JtsBinaryWriter.java (100%)
 rename java/{jdbc/jtssrc => jdbc_jtsparser/src/main/java}/org/postgis/jts/JtsGeometry.java (100%)
 rename java/{jdbc/jtssrc => jdbc_jtsparser/src/main/java}/org/postgis/jts/JtsGisWrapper.java (100%)
 rename java/{jdbc/jtssrc => jdbc_jtsparser/src/main/java}/org/postgis/jts/JtsWrapper.java (100%)
 create mode 100644 java/jdbc_jtsparser/src/main/java/org/postgis/jts/overview.html

diff --git a/java/jdbc/pom.xml b/java/jdbc/pom.xml
index 0b2e87156..29d26fbbd 100644
--- a/java/jdbc/pom.xml
+++ b/java/jdbc/pom.xml
@@ -111,7 +111,7 @@
         <dependency>
             <groupId>postgresql</groupId>
             <artifactId>postgresql</artifactId>
-            <version>9.1-901.jdbc3</version>
+            <version>[9.1-901.jdbc3 ,)</version>
         </dependency>
     </dependencies>
 	
diff --git a/java/jdbc_jtsparser/README b/java/jdbc_jtsparser/README
new file mode 100644
index 000000000..06ee3db6d
--- /dev/null
+++ b/java/jdbc_jtsparser/README
@@ -0,0 +1,2 @@
+#TODO Complete me
+As a first step build jdbc driver with 'mvn clean install' so that you have a local copy of latest postgis-jdbc.jar which this project has a dependency to.
diff --git a/java/jdbc/jtssrc/pom.xml b/java/jdbc_jtsparser/pom.xml
similarity index 57%
rename from java/jdbc/jtssrc/pom.xml
rename to java/jdbc_jtsparser/pom.xml
index 90dc0f4ff..e4bc1f093 100644
--- a/java/jdbc/jtssrc/pom.xml
+++ b/java/jdbc_jtsparser/pom.xml
@@ -3,11 +3,17 @@
 
 	<modelVersion>4.0.0</modelVersion>
 
+	<parent>
+		<groupId>org.sonatype.oss</groupId>
+		<artifactId>oss-parent</artifactId>
+		<version>7</version>
+	</parent>
+
+
 	<groupId>org.postgis</groupId>
 	<artifactId>postgis-jdbc-jtsparser</artifactId>
-	<version>2.0.0</version>
+	<version>2.1.0SVN</version>
 	<packaging>jar</packaging>
-
 	<name>Postgis JDBC Driver JTS Parser</name>
 	<url>http://www.postgis.org</url>
 	<description>Parser between JTS and PostGIS geometry formats.</description>
@@ -28,6 +34,10 @@
 			<name>María Arias de Reyna</name>
 			<email>delawen en gmail.com</email>
 		</developer>
+		<developer>
+			<name>Baris ERGUN</name>
+			<email>barisergun75@gmail.com</email>
+		</developer>
 	</developers>
 	<contributors>
 		<contributor>
@@ -38,6 +48,14 @@
 				<role>Maven Packager</role>
 			</roles>
 		</contributor>
+		<contributor>
+			<name>Baris Ergun</name>
+			<email>barisergun75@gmail.com</email>
+			<url>http://www.barisergun.com/</url>
+			<roles>
+				<role>Maven Packager</role>
+			</roles>
+		</contributor>
 	</contributors>
 	<mailingLists>
 		<mailingList>
@@ -55,46 +73,26 @@
 			<archive>http://lists.osgeo.org/pipermail/postgis-devel/</archive>
 		</mailingList>
 	</mailingLists>
+
 	<issueManagement>
 		<system>Trac</system>
 		<url>http://trac.osgeo.org/postgis/</url>
 	</issueManagement>
+
 	<scm>
-		<url>http://trac.osgeo.org/postgis/browser/tags/2.0.0</url>
-		<connection>scm:svn:http://svn.osgeo.org/postgis/tags/2.0.0/</connection>
-		<developerConnection>scm:svn:http://svn.osgeo.org/postgis/tags/2.0.0/</developerConnection>
+		<url>http://trac.osgeo.org/postgis/browser/trunk</url>
+		<connection>scm:svn:http://svn.osgeo.org/postgis/trunk</connection>
+		<developerConnection>scm:svn:http://svn.osgeo.org/postgis/trunk</developerConnection>
 	</scm>
 
 	<build>
-		<sourceDirectory>${basedir}/org</sourceDirectory>
 		<plugins>
-
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-source-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>attach-sources</id>
-						<phase>verify</phase>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
-			</plugin>
-
 			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-javadoc-plugin</artifactId>
-				<executions>
-					<execution>
-						<id>attach-javadocs</id>
-						<phase>verify</phase>
-						<goals>
-							<goal>jar</goal>
-						</goals>
-					</execution>
-				</executions>
+				<version>2.9.1</version>
+				<configuration>
+					<overview>${basedir}/src/java/org/postgis/jts/overview.html</overview>
+				</configuration>
 			</plugin>
 		</plugins>
 
@@ -104,7 +102,7 @@
 		<dependency>
 			<groupId>org.postgis</groupId>
 			<artifactId>postgis-jdbc</artifactId>
-			<version>2.0.0</version>
+			<version>[2.1.0, )</version>
 		</dependency>
 		<dependency>
 			<groupId>com.vividsolutions</groupId>
@@ -113,47 +111,6 @@
 		</dependency>
 
 	</dependencies>
-	<reporting>
-		<plugins>
-			<plugin>
-				<artifactId>maven-javadoc-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<artifactId>maven-dependency-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<artifactId>maven-project-info-reports-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<artifactId>maven-surefire-report-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>findbugs-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>javancss-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>jdepend-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>jxr-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>taglist-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.codehaus.mojo</groupId>
-				<artifactId>versions-maven-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</reporting>
-
 
 	<distributionManagement>
 		<repository>
diff --git a/java/jdbc/jtssrc/examples/JtsTestParser.java b/java/jdbc_jtsparser/src/main/java/examples/JtsTestParser.java
similarity index 100%
rename from java/jdbc/jtssrc/examples/JtsTestParser.java
rename to java/jdbc_jtsparser/src/main/java/examples/JtsTestParser.java
diff --git a/java/jdbc/jtssrc/org/postgis/jts/JTSShape.java b/java/jdbc_jtsparser/src/main/java/org/postgis/jts/JTSShape.java
similarity index 100%
rename from java/jdbc/jtssrc/org/postgis/jts/JTSShape.java
rename to java/jdbc_jtsparser/src/main/java/org/postgis/jts/JTSShape.java
diff --git a/java/jdbc/jtssrc/org/postgis/jts/JtsBinaryParser.java b/java/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsBinaryParser.java
similarity index 100%
rename from java/jdbc/jtssrc/org/postgis/jts/JtsBinaryParser.java
rename to java/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsBinaryParser.java
diff --git a/java/jdbc/jtssrc/org/postgis/jts/JtsBinaryWriter.java b/java/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsBinaryWriter.java
similarity index 100%
rename from java/jdbc/jtssrc/org/postgis/jts/JtsBinaryWriter.java
rename to java/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsBinaryWriter.java
diff --git a/java/jdbc/jtssrc/org/postgis/jts/JtsGeometry.java b/java/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsGeometry.java
similarity index 100%
rename from java/jdbc/jtssrc/org/postgis/jts/JtsGeometry.java
rename to java/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsGeometry.java
diff --git a/java/jdbc/jtssrc/org/postgis/jts/JtsGisWrapper.java b/java/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsGisWrapper.java
similarity index 100%
rename from java/jdbc/jtssrc/org/postgis/jts/JtsGisWrapper.java
rename to java/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsGisWrapper.java
diff --git a/java/jdbc/jtssrc/org/postgis/jts/JtsWrapper.java b/java/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsWrapper.java
similarity index 100%
rename from java/jdbc/jtssrc/org/postgis/jts/JtsWrapper.java
rename to java/jdbc_jtsparser/src/main/java/org/postgis/jts/JtsWrapper.java
diff --git a/java/jdbc_jtsparser/src/main/java/org/postgis/jts/overview.html b/java/jdbc_jtsparser/src/main/java/org/postgis/jts/overview.html
new file mode 100644
index 000000000..559b8a926
--- /dev/null
+++ b/java/jdbc_jtsparser/src/main/java/org/postgis/jts/overview.html
@@ -0,0 +1,9 @@
+<BODY>
+    <P>
+	Parser between JTS and PostGIS geometry formats.
+    </P>
+    <ul>
+        <li>Enter the java/jdbc_jtsparser sub-directory of the PostGIS distribution.</li>
+        <li>Run the mvn clean install command. postgis_jts_parser.jar file will be deployed on your local maven repository</li>
+    </ul>
+</BODY>
-- 
2.50.1