From 961a6df7bdd2877daff6b64e6d140684717feb4b Mon Sep 17 00:00:00 2001
From: ?? ? <ulysseskao@ximple.com.tw>
Date: Fri, 22 Aug 2008 19:37:10 +0800
Subject: [PATCH] update for EOFM-152
---
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleUpgradeBlob2UDTJob.java | 5 +++--
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2OraSDOJob.java | 5 +++--
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2ShpJob.java | 6 ++++--
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2MySQLJob.java | 5 +++--
4 files changed, 13 insertions(+), 8 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 ccea789..58b6715 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
@@ -104,7 +104,7 @@
return logger;
}
- protected AbstractOracleJobContext prepareJobContext(String filterPath)
+ protected AbstractOracleJobContext prepareJobContext(String targetSchemaName, String filterPath)
{
return new OracleConvertMySQLJobContext(getDataPath(), getTargetDataStore(), filterPath);
}
@@ -182,6 +182,7 @@
// The name is defined in the job definition
String jobName = jobDetail.getName();
+ String targetSchemaName = null;
// Log the time the job started
logger.info(jobName + " fired at " + new Date());
@@ -213,7 +214,7 @@
for (String orgSchema : _orgSchema)
{
OracleConvertMySQLJobContext jobContext =
- (OracleConvertMySQLJobContext) prepareJobContext(_filterPath);
+ (OracleConvertMySQLJobContext) prepareJobContext(targetSchemaName, _filterPath);
jobContext.setSourceDataStore(getSourceDataStore());
// jobContext.setConvertElementIn(_convertElementIn);
jobContext.setElementLogging(checkElementLogging());
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 e444094..8a1c243 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
@@ -104,7 +104,7 @@
return logger;
}
- protected AbstractOracleJobContext prepareJobContext(String filterPath)
+ protected AbstractOracleJobContext prepareJobContext(String targetSchemaName, String filterPath)
{
return new OracleConvertOraSDOJobContext(getDataPath(), getTargetDataStore(), filterPath);
}
@@ -182,6 +182,7 @@
// The name is defined in the job definition
String jobName = jobDetail.getName();
+ String targetSchemaName = null;
// Log the time the job started
logger.info(jobName + " fired at " + new Date());
@@ -213,7 +214,7 @@
for (String orgSchema : _orgSchema)
{
OracleConvertOraSDOJobContext jobContext =
- (OracleConvertOraSDOJobContext) prepareJobContext(_filterPath);
+ (OracleConvertOraSDOJobContext) prepareJobContext(targetSchemaName, _filterPath);
jobContext.setSourceDataStore(getSourceDataStore());
// jobContext.setConvertElementIn(_convertElementIn);
jobContext.setElementLogging(checkElementLogging());
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2ShpJob.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2ShpJob.java
index 4777d94..8d252b3 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2ShpJob.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2ShpJob.java
@@ -81,7 +81,7 @@
return logger;
}
- protected AbstractOracleJobContext prepareJobContext(String filterPath)
+ protected AbstractOracleJobContext prepareJobContext(String targetSchemaName, String filterPath)
{
return new OracleConvertShapefilesJobContext(filterPath);
}
@@ -98,6 +98,8 @@
// The name is defined in the job definition
String jobName = jobDetail.getName();
+
+ String targetSchemaName = null;
// Log the time the job started
logger.info(jobName + " fired at " + new Date());
@@ -119,7 +121,7 @@
for (String orgSchema : _orgSchema)
{
- OracleConvertShapefilesJobContext jobContext = (OracleConvertShapefilesJobContext) prepareJobContext(_filterPath);
+ OracleConvertShapefilesJobContext jobContext = (OracleConvertShapefilesJobContext) prepareJobContext(targetSchemaName, _filterPath);
jobContext.setSourceDataStore(getSourceDataStore());
jobContext.setDataPath(_dataPath);
jobContext.setConvertElementIn(_convertElementIn);
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleUpgradeBlob2UDTJob.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleUpgradeBlob2UDTJob.java
index 76865af..1888be3 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleUpgradeBlob2UDTJob.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleUpgradeBlob2UDTJob.java
@@ -28,6 +28,7 @@
// The name is defined in the job definition
String jobName = jobDetail.getName();
+ String targetSchemaName = null;
// Log the time the job started
logger.info(jobName + " fired at " + new Date());
@@ -38,7 +39,7 @@
throw new JobExecutionException("Cannot connect source oracle database.");
}
- AbstractOracleJobContext jobContext = prepareJobContext(_filterPath);
+ AbstractOracleJobContext jobContext = prepareJobContext(targetSchemaName, _filterPath);
jobContext.setSourceDataStore(getSourceDataStore());
try
@@ -58,7 +59,7 @@
return logger;
}
- protected AbstractOracleJobContext prepareJobContext(String filterPath)
+ protected AbstractOracleJobContext prepareJobContext(String targetSchemaName, String filterPath)
{
return new OracleUpgradeJobContext();
}
--
Gitblit v0.0.0-SNAPSHOT