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/AbstractOracleDatabaseJob.java | 35 ++++++++++++++++++-----------------
1 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/AbstractOracleDatabaseJob.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/AbstractOracleDatabaseJob.java
index d941a3f..4661fab 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/AbstractOracleDatabaseJob.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/AbstractOracleDatabaseJob.java
@@ -14,8 +14,9 @@
import com.ximple.eofms.util.FeatureTypeBuilderUtil;
import org.apache.commons.logging.Log;
import org.geotools.data.DataStore;
-import org.geotools.data.oracle.OracleDataStore;
-import org.geotools.data.oracle.OracleDataStoreFactory;
+import org.geotools.data.DataStoreFinder;
+import org.geotools.data.oracle.OracleNGDataStoreFactory;
+import org.geotools.jdbc.JDBCDataStore;
import org.quartz.Job;
import org.quartz.JobDataMap;
import org.quartz.JobDetail;
@@ -57,7 +58,7 @@
private static final String PROFILEMODE = "PROFILEMODE";
private static final String USEZONE121 = "USEZONE121";
- protected static OracleDataStoreFactory dataStoreFactory = new OracleDataStoreFactory();
+ protected static OracleNGDataStoreFactory dataStoreFactory = new OracleNGDataStoreFactory();
protected String _dataPath;
protected String _filterPath;
@@ -79,7 +80,7 @@
protected boolean _useTransform = true;
protected int _testCount = -1;
- protected OracleDataStore sourceDataStore;
+ protected JDBCDataStore sourceDataStore;
private boolean driverFound = true;
private long _processTime;
@@ -363,19 +364,19 @@
throw new JobExecutionException("Oracle JDBC Driver not found.-" + JDBC_DRIVER);
}
Map<String, String> map = new TreeMap<String, String>();
- map.put("host", _oracleHost);
- map.put("port", _oraclePort);
- map.put("instance", _oracleInstance);
- map.put("user", _username);
- map.put("passwd", _password);
- map.put("dbtype", "oracle");
- map.put("alias", _oracleInstance);
- map.put("namespace", null);
- if (!map.containsKey(OracleDataStoreFactory.MAXCONN.key)) {
- map.put(OracleDataStoreFactory.MAXCONN.key, "5");
+ map.put(OracleNGDataStoreFactory.HOST.key, _oracleHost);
+ map.put(OracleNGDataStoreFactory.PORT.key, _oraclePort);
+ map.put(OracleNGDataStoreFactory.DATABASE.key, _oracleInstance);
+ map.put(OracleNGDataStoreFactory.USER.key, _username);
+ map.put(OracleNGDataStoreFactory.PASSWD.key, _password);
+ map.put(OracleNGDataStoreFactory.DBTYPE.key, "oracle");
+ map.put(OracleNGDataStoreFactory.NAMESPACE.key, null);
+
+ if (!map.containsKey(OracleNGDataStoreFactory.MAXCONN.key)) {
+ map.put(OracleNGDataStoreFactory.MAXCONN.key, "5");
}
- if (!map.containsKey(OracleDataStoreFactory.MINCONN.key)) {
- map.put(OracleDataStoreFactory.MINCONN.key, "1");
+ if (!map.containsKey(OracleNGDataStoreFactory.MINCONN.key)) {
+ map.put(OracleNGDataStoreFactory.MINCONN.key, "1");
}
if (!dataStoreFactory.canProcess(map)) {
@@ -383,7 +384,7 @@
throw new JobExecutionException("cannot process properties-");
}
try {
- sourceDataStore = (OracleDataStore) dataStoreFactory.createDataStore(map);
+ sourceDataStore = dataStoreFactory.createDataStore(map);
} catch (IOException e) {
getLogger().warn(e.getMessage(), e);
throw new JobExecutionException(e.getMessage(), e);
--
Gitblit v0.0.0-SNAPSHOT