From c35a6b151259c980bb1ceec57abe65a79c6f6ac8 Mon Sep 17 00:00:00 2001
From: ?? ? <ulysseskao@ximple.com.tw>
Date: Fri, 23 Nov 2012 00:41:19 +0800
Subject: [PATCH] EOFM-207 and update geotools to 8.3.x
---
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2PostGISJob.java | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2PostGISJob.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2PostGISJob.java
index 0f2aede..c5938a1 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2PostGISJob.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2PostGISJob.java
@@ -30,9 +30,9 @@
import org.geotools.data.DataStore;
import org.geotools.data.Transaction;
import org.geotools.data.jdbc.JDBCUtils;
-import org.geotools.data.postgis.PostgisDataStore;
-import org.geotools.data.postgis.PostgisDataStoreFactory;
+import org.geotools.data.postgis.PostgisNGDataStoreFactory;
import org.geotools.feature.SchemaException;
+import org.geotools.jdbc.JDBCDataStore;
import org.opengis.feature.IllegalAttributeException;
import org.quartz.JobDataMap;
import org.quartz.JobDetail;
@@ -90,7 +90,7 @@
}
}
- protected static PostgisDataStoreFactory dataStoreFactory = new PostgisDataStoreFactory();
+ protected static PostgisNGDataStoreFactory dataStoreFactory = new PostgisNGDataStoreFactory();
protected String _pgHost;
protected String _pgDatabase;
@@ -101,7 +101,7 @@
protected String _pgUseWKB;
protected Map<String, String> pgProperties;
- protected PostgisDataStore targetDataStore;
+ protected JDBCDataStore targetDataStore;
// protected OracleConvertEdbGeoJobContext oracleJobContext;
private long queryTime = 0;
@@ -166,14 +166,14 @@
}
Map<String, String> remote = new TreeMap<String, String>();
- remote.put("dbtype", "postgis");
- remote.put("charset", "UTF-8");
- remote.put("host", _pgHost);
- remote.put("port", _pgPort);
- remote.put("database", _pgDatabase);
- remote.put("user", _pgUsername);
- remote.put("passwd", _pgPassword);
- remote.put("namespace", null);
+ remote.put(PostgisNGDataStoreFactory.DBTYPE.key, "postgis");
+ // remote.put("charset", "UTF-8");
+ remote.put(PostgisNGDataStoreFactory.HOST.key, _pgHost);
+ remote.put(PostgisNGDataStoreFactory.PORT.key, _pgPort);
+ remote.put(PostgisNGDataStoreFactory.DATABASE.key, _pgDatabase);
+ remote.put(PostgisNGDataStoreFactory.USER.key, _pgUsername);
+ remote.put(PostgisNGDataStoreFactory.PASSWD.key, _pgPassword);
+ // remote.put( "namespace", null);
pgProperties = remote;
}
@@ -1189,24 +1189,26 @@
}
*/
- if (!pgProperties.containsKey(PostgisDataStoreFactory.MAXCONN.key)) {
- pgProperties.put(PostgisDataStoreFactory.MAXCONN.key, "5");
+ if (!pgProperties.containsKey(PostgisNGDataStoreFactory.MAXCONN.key)) {
+ pgProperties.put(PostgisNGDataStoreFactory.MAXCONN.key, "5");
}
- if (!pgProperties.containsKey(PostgisDataStoreFactory.MINCONN.key)) {
- pgProperties.put(PostgisDataStoreFactory.MINCONN.key, "1");
+ if (!pgProperties.containsKey(PostgisNGDataStoreFactory.MINCONN.key)) {
+ pgProperties.put(PostgisNGDataStoreFactory.MINCONN.key, "1");
}
- if (!pgProperties.containsKey(PostgisDataStoreFactory.WKBENABLED.key)) {
- pgProperties.put(PostgisDataStoreFactory.WKBENABLED.key, "true");
+ /*
+ if (!pgProperties.containsKey(PostgisNGDataStoreFactory.WKBENABLED.key)) {
+ pgProperties.put(PostgisNGDataStoreFactory.WKBENABLED.key, "true");
}
+ */
if (!dataStoreFactory.canProcess(pgProperties)) {
getLogger().warn("cannot process properties-");
throw new JobExecutionException("cannot process properties-");
}
try {
- targetDataStore = (PostgisDataStore) dataStoreFactory.createDataStore(pgProperties);
+ targetDataStore = dataStoreFactory.createDataStore(pgProperties);
} catch (IOException e) {
getLogger().warn(e.getMessage(), e);
throw new JobExecutionException(e.getMessage(), e);
--
Gitblit v0.0.0-SNAPSHOT