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/OracleConvertDgn2OraSDOJob.java | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2OraSDOJob.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2OraSDOJob.java
index 07a4b03..1a3a4ee 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2OraSDOJob.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2OraSDOJob.java
@@ -26,9 +26,9 @@
import org.apache.commons.logging.LogFactory;
import org.geotools.data.DataStore;
import org.geotools.data.jdbc.JDBCUtils;
-import org.geotools.data.oracle.OracleDataStore;
-import org.geotools.data.oracle.OracleDataStoreFactory;
+import org.geotools.data.oracle.OracleNGDataStoreFactory;
import org.geotools.feature.SchemaException;
+import org.geotools.jdbc.JDBCDataStore;
import org.opengis.feature.IllegalAttributeException;
import org.quartz.JobDataMap;
import org.quartz.JobDetail;
@@ -84,7 +84,7 @@
}
}
- protected static OracleDataStoreFactory dataStoreFactory = new OracleDataStoreFactory();
+ protected static OracleNGDataStoreFactory dataStoreFactory = new OracleNGDataStoreFactory();
protected String _sdoHost;
protected String _sdoDatabase;
@@ -95,7 +95,7 @@
protected String _sdoUseWKB;
protected Map<String, String> sdoProperties;
- protected OracleDataStore targetDataStore;
+ protected JDBCDataStore targetDataStore;
public Log getLogger() {
return logger;
@@ -155,14 +155,14 @@
}
Map<String, String> remote = new TreeMap<String, String>();
- remote.put("dbtype", "OraSDO");
- remote.put("charset", "UTF-8");
- remote.put("host", _sdoHost);
- remote.put("port", _sdoPort);
- remote.put("database", _sdoDatabase);
- remote.put("user", _sdoUsername);
- remote.put("passwd", _sdoPassword);
- remote.put("namespace", null);
+ remote.put(OracleNGDataStoreFactory.DBTYPE.key, "oracle");
+ // remote.put("charset", "UTF-8");
+ remote.put(OracleNGDataStoreFactory.HOST.key, _sdoHost);
+ remote.put(OracleNGDataStoreFactory.PORT.key, _sdoPort);
+ remote.put(OracleNGDataStoreFactory.DATABASE.key, _sdoDatabase);
+ remote.put(OracleNGDataStoreFactory.USER.key, _sdoUsername);
+ remote.put(OracleNGDataStoreFactory.PASSWD.key, _sdoPassword);
+ // remote.put("namespace", null);
sdoProperties = remote;
}
@@ -950,12 +950,12 @@
}
*/
- if (!sdoProperties.containsKey(OracleDataStoreFactory.MAXCONN.key)) {
- sdoProperties.put(OracleDataStoreFactory.MAXCONN.key, "2");
+ if (!sdoProperties.containsKey(OracleNGDataStoreFactory.MAXCONN.key)) {
+ sdoProperties.put(OracleNGDataStoreFactory.MAXCONN.key, "2");
}
- if (!sdoProperties.containsKey(OracleDataStoreFactory.MINCONN.key)) {
- sdoProperties.put(OracleDataStoreFactory.MINCONN.key, "1");
+ if (!sdoProperties.containsKey(OracleNGDataStoreFactory.MINCONN.key)) {
+ sdoProperties.put(OracleNGDataStoreFactory.MINCONN.key, "1");
}
/*
@@ -970,7 +970,7 @@
throw new JobExecutionException("cannot process properties-");
}
try {
- targetDataStore = (OracleDataStore) dataStoreFactory.createDataStore(sdoProperties);
+ targetDataStore = dataStoreFactory.createDataStore(sdoProperties);
} catch (IOException e) {
getLogger().warn(e.getMessage(), e);
throw new JobExecutionException(e.getMessage(), e);
--
Gitblit v0.0.0-SNAPSHOT