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/OracleConvertDgn2MySQLJob.java | 16 +++++++++------- 1 files changed, 9 insertions(+), 7 deletions(-) diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2MySQLJob.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2MySQLJob.java index ef26b4a..960cbf0 100644 --- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2MySQLJob.java +++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2MySQLJob.java @@ -25,9 +25,9 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.geotools.data.DataStore; -import org.geotools.data.mysql.MySQLDataStore; import org.geotools.data.mysql.MySQLDataStoreFactory; import org.geotools.feature.SchemaException; +import org.geotools.jdbc.JDBCDataStore; import org.opengis.feature.IllegalAttributeException; import org.quartz.JobDataMap; import org.quartz.JobDetail; @@ -92,7 +92,7 @@ protected String _myUseWKB; protected Map<String, String> myProperties; - protected MySQLDataStore targetDataStore; + protected JDBCDataStore targetDataStore; public Log getLogger() { return logger; @@ -946,24 +946,26 @@ } */ - if (!myProperties.containsKey("max connections" /*MySQLDataStoreFactory.MAXCONN.key */)) { - myProperties.put("max connections", "2"); + if (!myProperties.containsKey(MySQLDataStoreFactory.MAXCONN.key)) { + myProperties.put(MySQLDataStoreFactory.MAXCONN.key, "2"); } - if (!myProperties.containsKey("min connections" /* MySQLDataStoreFactory.MINCONN.key */)) { - myProperties.put("min connections", "1"); + if (!myProperties.containsKey(MySQLDataStoreFactory.MINCONN.key)) { + myProperties.put(MySQLDataStoreFactory.MINCONN.key, "1"); } + /* if (!myProperties.containsKey(MySQLDataStoreFactory.WKBENABLED.key)) { myProperties.put(MySQLDataStoreFactory.WKBENABLED.key, "true"); } + */ if (!dataStoreFactory.canProcess(myProperties)) { getLogger().warn("cannot process properties-"); throw new JobExecutionException("cannot process properties-"); } try { - targetDataStore = (MySQLDataStore) dataStoreFactory.createDataStore(myProperties); + targetDataStore = dataStoreFactory.createDataStore(myProperties); } catch (IOException e) { getLogger().warn(e.getMessage(), e); throw new JobExecutionException(e.getMessage(), e); -- Gitblit v0.0.0-SNAPSHOT