From 1cc0f32f7fefa2821a052f823e735bdb14193b93 Mon Sep 17 00:00:00 2001
From: ?? ? <ulysseskao@ximple.com.tw>
Date: Mon, 24 Oct 2011 16:15:36 +0800
Subject: [PATCH]
---
xdgnjobs/ximple-jobcarrier/pom.xml | 8
xdgnjobs/ximple-build/pom.xml | 4
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleUpgradeBlob2UDTJob.java | 2
.gitattributes | 3
xdgnjobs/ximple-build/maven/jar-collector/pom.xml | 2
xdgnjobs/ximple-dgnio/pom.xml | 6
xdgnjobs/ximple-jobcarrier/src/main/resources/quartz.properties | 8
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2OraSDOJob.java | 4
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2ShpJob.java | 4
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/filter/CreateSymbolStrategy.java | 2
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/Bits.java | 2
xdgnjobs/ximple-spatialjob/pom.xml | 6
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2PostGISJob.java | 4
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2EdbGeoJob.java | 4
xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml | 4
xdgnjobs/ximple-jobcarrier/src/main/java/com/ximple/eofms/XQuartzJobCarrier.java | 24 +++-
xdgnjobs/pom.xml | 34 ++---
xdgnjobs/ximple-build/maven/pom.xml | 2
xdgnjobs/ximple-jobcarrier/quartz.properties | 35 +++++
xdgnjobs/ximple-elmparser/pom.xml | 14 +-
xdgnjobs/ximple-dgnio/src/test/java/com/ximple/io/dgn7/OracleTarget.java | 2
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2MySQLJob.java | 4
xdgnjobs/ximple-jobcarrier/quartz_jobs.xml | 143 +++++++++++++++++++++++
xdgnjobs/ximple-jobcarrier/log4j.properties | 28 ++++
24 files changed, 284 insertions(+), 65 deletions(-)
diff --git a/.gitattributes b/.gitattributes
index f605414..816d1e7 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -53,7 +53,10 @@
xdgnjobs/ximple-elmparser/src/main/resources/com/ximple/eofms/XElementParser.properties svneol=native#text/plain
xdgnjobs/ximple-elmparser/src/main/resources/com/ximple/eofms/XElementParser_zh_TW.properties svneol=native#text/plain
xdgnjobs/ximple-elmparser/src/main/resources/log4j.properties svneol=native#text/plain
+xdgnjobs/ximple-jobcarrier/log4j.properties -text
xdgnjobs/ximple-jobcarrier/pom.xml svneol=native#text/xml
+xdgnjobs/ximple-jobcarrier/quartz.properties -text
+xdgnjobs/ximple-jobcarrier/quartz_jobs.xml -text
xdgnjobs/ximple-jobcarrier/src/main/java/com/ximple/eofms/XQuartzJobCarrier.java svneol=native#text/plain
xdgnjobs/ximple-jobcarrier/src/main/java/com/ximple/eofms/XQuartzJobWizard.java svneol=native#text/plain
xdgnjobs/ximple-jobcarrier/src/main/resources/com/ximple/eofms/XQuartzJobWizard.properties svneol=native#text/plain
diff --git a/xdgnjobs/pom.xml b/xdgnjobs/pom.xml
index 7cfa6af..0dfe790 100644
--- a/xdgnjobs/pom.xml
+++ b/xdgnjobs/pom.xml
@@ -18,8 +18,8 @@
<test.maxHeapSize>512M</test.maxHeapSize>
<src.output>${basedir}/target</src.output>
<java5>1.5</java5>
- <xdgnio.version>1.2.0</xdgnio.version>
- <gt2.version>2.6.5</gt2.version>
+ <xdgnio.version>1.2.1</xdgnio.version>
+ <gt2.version>2.7.3-1</gt2.version>
<failIfNoTests>false</failIfNoTests>
<stress.skip.pattern></stress.skip.pattern>
<online.skip.pattern></online.skip.pattern>
@@ -65,7 +65,7 @@
<groupId>com.ximple.eofms</groupId>
<artifactId>ximple-dgnjobs</artifactId>
<packaging>pom</packaging>
- <version>1.2.0</version>
+ <version>1.2.1</version>
<name>ximple-dgnjobs</name>
<url>http://www.ximple.com.tw</url>
@@ -117,7 +117,7 @@
<dependency>
<groupId>com.vividsolutions</groupId>
<artifactId>jts</artifactId>
- <version>1.11</version>
+ <version>1.12</version>
</dependency>
<!-- Apache -->
@@ -136,12 +136,12 @@
<dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
- <version>2.0</version>
+ <version>2.1</version>
</dependency>
<dependency>
<groupId>commons-pool</groupId>
<artifactId>commons-pool</artifactId>
- <version>1.5.4</version>
+ <version>1.5.6</version>
</dependency>
<dependency>
<groupId>commons-logging</groupId>
@@ -161,13 +161,13 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.15</version>
+ <version>1.2.16</version>
<!-- Same as the dependency in commons-logging -->
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
- <version>3.6</version>
+ <version>3.7</version>
</dependency>
<!-- geotools -->
@@ -251,7 +251,7 @@
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity</artifactId>
- <version>1.6.3</version>
+ <version>1.7</version>
</dependency>
<!-- We need this to make the referencing module useful -->
@@ -288,24 +288,24 @@
<dependency>
<groupId>postgresql</groupId>
<artifactId>postgresql</artifactId>
- <version>8.4-701.jdbc3</version>
+ <version>8.4-702.jdbc3</version>
</dependency>
<dependency>
<groupId>org.postgis</groupId>
<artifactId>postgis-driver</artifactId>
- <version>1.5.1</version>
+ <version>1.5.3</version>
</dependency>
<dependency>
<groupId>mysql</groupId>
<artifactId>mysql-connector-java</artifactId>
- <version>5.1.12</version>
+ <version>5.1.18</version>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
- <version>1.2.141</version>
+ <version>1.3.160</version>
</dependency>
<!-- EnterpriseDB -->
@@ -319,7 +319,7 @@
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <version>1.8.3</version>
+ <version>2.1.0</version>
</dependency>
<dependency>
<groupId>org.awl</groupId>
@@ -336,8 +336,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>5.11</version>
- <classifier>jdk15</classifier>
+ <version>6.3</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -402,9 +401,8 @@
</dependency>
<dependency>
- <artifactId>testng</artifactId>
<groupId>org.testng</groupId>
- <classifier>jdk15</classifier>
+ <artifactId>testng</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/xdgnjobs/ximple-build/maven/jar-collector/pom.xml b/xdgnjobs/ximple-build/maven/jar-collector/pom.xml
index 8c4ad5b..2edc8c2 100644
--- a/xdgnjobs/ximple-build/maven/jar-collector/pom.xml
+++ b/xdgnjobs/ximple-build/maven/jar-collector/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>com.ximple.eofms.maven</groupId>
<artifactId>ximple-maven</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1</version>
</parent>
diff --git a/xdgnjobs/ximple-build/maven/pom.xml b/xdgnjobs/ximple-build/maven/pom.xml
index 0d3dd22..0d07db2 100644
--- a/xdgnjobs/ximple-build/maven/pom.xml
+++ b/xdgnjobs/ximple-build/maven/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>com.ximple.eofms.maven</groupId>
<artifactId>ximple-build</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1</version>
</parent>
diff --git a/xdgnjobs/ximple-build/pom.xml b/xdgnjobs/ximple-build/pom.xml
index e668448..290a6b2 100644
--- a/xdgnjobs/ximple-build/pom.xml
+++ b/xdgnjobs/ximple-build/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>com.ximple.eofms</groupId>
<artifactId>ximple-dgnjobs</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1</version>
</parent>
@@ -16,7 +16,7 @@
<!-- =========================================================== -->
<groupId>com.ximple.eofms.maven</groupId>
<artifactId>ximple-build</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1</version>
<packaging>pom</packaging>
<name>Build tools for Ximple DgnJobs</name>
diff --git a/xdgnjobs/ximple-dgnio/pom.xml b/xdgnjobs/ximple-dgnio/pom.xml
index d42808f..b1ba2bd 100644
--- a/xdgnjobs/ximple-dgnio/pom.xml
+++ b/xdgnjobs/ximple-dgnio/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>com.ximple.eofms</groupId>
<artifactId>ximple-dgnjobs</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1</version>
</parent>
<!-- =========================================================== -->
@@ -15,7 +15,7 @@
<!-- =========================================================== -->
<groupId>com.ximple.eofms</groupId>
<artifactId>ximple-dgnio</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1</version>
<packaging>jar</packaging>
<name>ximple-dgnio</name>
<url>http://www.ximple.com.tw</url>
@@ -74,7 +74,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>1.4</version>
+ <version>2.1</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/xdgnjobs/ximple-dgnio/src/test/java/com/ximple/io/dgn7/OracleTarget.java b/xdgnjobs/ximple-dgnio/src/test/java/com/ximple/io/dgn7/OracleTarget.java
index b8d1ab2..7580a8d 100644
--- a/xdgnjobs/ximple-dgnio/src/test/java/com/ximple/io/dgn7/OracleTarget.java
+++ b/xdgnjobs/ximple-dgnio/src/test/java/com/ximple/io/dgn7/OracleTarget.java
@@ -25,7 +25,7 @@
private static final String ORACLE_URL = "jdbc:oracle:thin:@";
private static final String _propUsrKey = "user";
private static final String _propPassKey = "password";
- private static String _oracleHost = "192.168.11.200";
+ private static String _oracleHost = "192.168.11.199";
private static String _oracleInstance = "NNTPC";
private static String _oraclePort = "1521";
diff --git a/xdgnjobs/ximple-elmparser/pom.xml b/xdgnjobs/ximple-elmparser/pom.xml
index 14d8b8d..cf0f96c 100644
--- a/xdgnjobs/ximple-elmparser/pom.xml
+++ b/xdgnjobs/ximple-elmparser/pom.xml
@@ -5,18 +5,18 @@
<parent>
<groupId>com.ximple.eofms</groupId>
<artifactId>ximple-dgnjobs</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1</version>
</parent>
<groupId>com.ximple.eofms</groupId>
<artifactId>ximple-elmparser</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1</version>
<packaging>jar</packaging>
<name>ximple-elmparser</name>
<url>http://maven.apache.org</url>
<properties>
- <xdgnio.version>1.2.0</xdgnio.version>
+ <xdgnio.version>1.2.1</xdgnio.version>
</properties>
<scm>
@@ -171,12 +171,12 @@
<dependency>
<groupId>com.ximple.eofms</groupId>
<artifactId>ximple-dgnio</artifactId>
- <version>1.2.0</version>
+ <version>${project.version}</version>
</dependency>
<dependency>
<groupId>com.ximple.eofms</groupId>
<artifactId>ximple-spatialjob</artifactId>
- <version>1.2.0</version>
+ <version>${project.version}</version>
</dependency>
</dependencies>
@@ -207,7 +207,7 @@
-->
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.1.1</version>
+ <version>1.2.1</version>
<!--
<executions>
<execution>
@@ -238,7 +238,7 @@
<plugin>
<groupId>com.ximple.eofms.maven</groupId>
<artifactId>ximple-jar-collector</artifactId>
- <version>1.2.0</version>
+ <version>${project.version}</version>
<executions>
<execution>
<goals>
diff --git a/xdgnjobs/ximple-jobcarrier/log4j.properties b/xdgnjobs/ximple-jobcarrier/log4j.properties
new file mode 100644
index 0000000..cd4d738
--- /dev/null
+++ b/xdgnjobs/ximple-jobcarrier/log4j.properties
@@ -0,0 +1,28 @@
+# Create stdout appender
+log4j.rootLogger=error, logfile, stdout
+
+# Configure the stdout appender to go to the Console
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+
+# Configure stdout appender to use the PatternLayout
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+
+# Pattern output the caller's filename and line #
+log4j.appender.stdout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
+#log4j.appender.stdout.encoding=UTF-8
+
+log4j.appender.logfile=org.apache.log4j.FileAppender
+log4j.appender.logfile.file=xjobcarrier.log
+log4j.appender.logfile.layout=org.apache.log4j.PatternLayout
+log4j.appender.logfile.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
+#log4j.appender.logfile.encoding=UTF-8
+
+log4j.appender.remoteout=com.holub.log4j.RemoteAppender
+log4j.appender.remoteout.Port=8011
+log4j.appender.remoteout.layout=org.apache.log4j.PatternLayout
+log4j.appender.remoteout.layout.ConversionPattern=%5p [%t] (%F:%L) - %m%n
+#log4j.appender.remoteout.encoding=UTF-8
+
+# Print messages of level INFO or above for examples
+log4j.logger.org.cavaness.quartzbook=INFO
+log4j.logger.com.ximple.eofms=INFO
\ No newline at end of file
diff --git a/xdgnjobs/ximple-jobcarrier/pom.xml b/xdgnjobs/ximple-jobcarrier/pom.xml
index 08cdc08..0ed209b 100644
--- a/xdgnjobs/ximple-jobcarrier/pom.xml
+++ b/xdgnjobs/ximple-jobcarrier/pom.xml
@@ -6,19 +6,19 @@
<parent>
<groupId>com.ximple.eofms</groupId>
<artifactId>ximple-dgnjobs</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1</version>
</parent>
<groupId>com.ximple.eofms</groupId>
<artifactId>ximple-jobcarrier</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1</version>
<packaging>jar</packaging>
<name>ximple-jobcarrier</name>
<url>http://maven.apache.org</url>
<properties>
- <xdgnio.version>1.2.0</xdgnio.version>
+ <xdgnio.version>1.2.1</xdgnio.version>
</properties>
<scm>
@@ -209,7 +209,7 @@
-->
<groupId>org.codehaus.mojo</groupId>
<artifactId>exec-maven-plugin</artifactId>
- <version>1.1.1</version>
+ <version>1.2.1</version>
<executions>
<execution>
<!--<phase>package</phase> -->
diff --git a/xdgnjobs/ximple-jobcarrier/quartz.properties b/xdgnjobs/ximple-jobcarrier/quartz.properties
new file mode 100644
index 0000000..3778881
--- /dev/null
+++ b/xdgnjobs/ximple-jobcarrier/quartz.properties
@@ -0,0 +1,35 @@
+#===============================================================
+#Configure Main Scheduler Properties
+#===============================================================
+org.quartz.scheduler.instanceName = QuartzScheduler
+org.quartz.scheduler.instanceId = AUTO
+
+#===============================================================
+#Configure ThreadPool
+#===============================================================
+org.quartz.threadPool.threadCount = 5
+org.quartz.threadPool.threadPriority = 5
+org.quartz.threadPool.class = org.quartz.simpl.SimpleThreadPool
+
+#===============================================================
+#Configure JobStore
+#===============================================================
+org.quartz.jobStore.class = org.quartz.simpl.RAMJobStore
+org.quartz.jobStore.misfireThreshold = 60000
+
+#===============================================================
+#Configure Plugins
+#===============================================================
+org.quartz.plugin.triggHistory.class = org.quartz.plugins.history.LoggingJobHistoryPlugin
+
+org.quartz.plugin.jobInitializer.class = org.quartz.plugins.xml.XMLSchedulingDataProcessorPlugin
+
+org.quartz.plugin.jobInitializer.fileNames = quartz_jobs.xml
+#org.quartz.plugin.jobInitializer.fileNames = quartz_jobs_edb.xml
+
+org.quartz.plugin.jobInitializer.failOnFileNotFound = true
+org.quartz.plugin.jobInitializer.scanInterval = 10
+org.quartz.plugin.jobInitializer.wrapInUserTransaction = false
+
+org.quartz.plugin.shutdownhook.class = org.quartz.plugins.management.ShutdownHookPlugin
+org.quartz.plugin.shutdownhook.cleanShutdown = true
\ No newline at end of file
diff --git a/xdgnjobs/ximple-jobcarrier/quartz_jobs.xml b/xdgnjobs/ximple-jobcarrier/quartz_jobs.xml
new file mode 100644
index 0000000..53bfdb0
--- /dev/null
+++ b/xdgnjobs/ximple-jobcarrier/quartz_jobs.xml
@@ -0,0 +1,143 @@
+<?xml version='1.0' encoding='utf-8'?>
+
+<job-scheduling-data xmlns="http://www.quartz-scheduler.org/xml/JobSchedulingData"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.quartz-scheduler.org/xml/JobSchedulingData http://www.quartz-scheduler.org/xml/job_scheduling_data_1_8.xsd"
+ version="1.8">
+
+ <!--pre-processing-commands>
+ <delete-jobs-in-group>*</delete-jobs-in-group>
+ <delete-triggers-in-group>*</delete-triggers-in-group>
+ </pre-processing-commands>
+
+ <processing-directives>
+ <overwrite-existing-data>true</overwrite-existing-data>
+ <ignore-duplicates>false</ignore-duplicates>
+ </processing-directives-->
+
+ <schedule>
+ <job>
+ <name>ConvertDgn2PostGisIntoPostgre</name>
+ <group>DEFAULT</group>
+ <description>A job that convert dgn to postgis</description>
+ <job-class>com.ximple.eofms.jobs.OracleConvertDgn2PostGISJob</job-class>
+ <volatility>false</volatility>
+ <durability>false</durability>
+ <recover>false</recover>
+ <!--job-data-map allows-transient-data="true"-->
+ <job-data-map>
+ <entry>
+ <key>JOBDATA_DIR</key>
+ <value>C:\Usr\Projects\XDCAD\nstpcjobs\jobdata</value>
+ </entry>
+ <entry>
+ <key>PGHOST</key>
+ <value>192.168.11.99</value>
+ </entry>
+ <entry>
+ <key>PGDATBASE</key>
+ <value>pgNSTPC</value>
+ </entry>
+ <entry>
+ <key>PGPORT</key>
+ <value>5432</value>
+ </entry>
+ <entry>
+ <key>PGSCHEMA</key>
+ <value>public</value>
+ </entry>
+ <entry>
+ <key>PGUSER</key>
+ <value>tpcdb</value>
+ </entry>
+ <entry>
+ <key>PGPASS</key>
+ <value>simple000</value>
+ </entry>
+ <entry>
+ <key>ORAHOST</key>
+ <value>192.168.11.199</value>
+ </entry>
+ <entry>
+ <key>ORAINST</key>
+ <value>nntpc</value>
+ </entry>
+ <entry>
+ <key>ORAPORT</key>
+ <value>1521</value>
+ </entry>
+ <entry>
+ <key>ORAUSER</key>
+ <value>spatialdb</value>
+ </entry>
+ <entry>
+ <key>ORAPASS</key>
+ <value>spatialdb000</value>
+ </entry>
+ <entry>
+ <key>ORGSCHEMA</key>
+ <value>SPATIALDB, CMMS_SPATIALDB</value>
+ </entry>
+ <entry>
+ <key>CONVERTDB</key>
+ <value>true</value>
+ </entry>
+ <entry>
+ <key>CONVERTFILE</key>
+ <value>true</value>
+ </entry>
+ <entry>
+ <key>CONVERTELEMIN</key>
+ <value>false</value>
+ </entry>
+ <entry>
+ <key>CREATEDUMMY</key>
+ <value>false</value>
+ </entry>
+ <entry>
+ <key>ELEMLOG</key>
+ <value>true</value>
+ </entry>
+ <entry>
+ <key>USEWKB</key>
+ <value>true</value>
+ </entry>
+ <entry>
+ <key>TESTMODE</key>
+ <value>false</value>
+ </entry>
+ <entry>
+ <key>TESTCOUNT</key>
+ <value>2</value>
+ </entry>
+ <entry>
+ <key>COPYCONNECTIVITYMODE</key>
+ <value>true</value>
+ </entry>
+ <entry>
+ <key>PROFILEMODE</key>
+ <value>true</value>
+ </entry>
+ <entry>
+ <key>USEZONE121</key>
+ <value>true</value>
+ </entry>
+ </job-data-map>
+ </job>
+
+ <trigger>
+ <simple>
+ <name>convertTrigger</name>
+ <group>DEFAULT</group>
+ <job-name>ConvertDgn2PostGisIntoPostgre</job-name>
+ <job-group>DEFAULT</job-group>
+ <start-time>2011-03-01T18:00:00</start-time>
+ <!-- repeat indefinitely every 10 seconds -->
+ <repeat-count>1</repeat-count>
+ <repeat-interval>500</repeat-interval>
+ <!-- <repeat-interval>72000000</repeat-interval> -->
+ </simple>
+ </trigger>
+
+ </schedule>
+</job-scheduling-data>
diff --git a/xdgnjobs/ximple-jobcarrier/src/main/java/com/ximple/eofms/XQuartzJobCarrier.java b/xdgnjobs/ximple-jobcarrier/src/main/java/com/ximple/eofms/XQuartzJobCarrier.java
index 30ef076..a2af3ee 100644
--- a/xdgnjobs/ximple-jobcarrier/src/main/java/com/ximple/eofms/XQuartzJobCarrier.java
+++ b/xdgnjobs/ximple-jobcarrier/src/main/java/com/ximple/eofms/XQuartzJobCarrier.java
@@ -15,11 +15,15 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.awl.Wizard;
+import org.quartz.DateBuilder;
+import org.quartz.JobBuilder;
import org.quartz.JobDetail;
import org.quartz.Scheduler;
import org.quartz.SchedulerException;
import org.quartz.Trigger;
+import org.quartz.TriggerBuilder;
import org.quartz.TriggerUtils;
+import org.quartz.impl.JobDetailImpl;
import org.quartz.impl.StdSchedulerFactory;
import com.ximple.eofms.jobs.OracleConvertDgn2ShpJob;
@@ -160,17 +164,25 @@
private void scheduleJob(Scheduler scheduler) throws SchedulerException {
// Create a JobDetail for the Job
- JobDetail jobDetail = new JobDetail("ScanDirectory", Scheduler.DEFAULT_GROUP,
+ /*
+ JobDetailImpl jobDetail = new JobDetailImpl("ScanDirectory", Scheduler.DEFAULT_GROUP,
OracleConvertDgn2ShpJob.class);
-
+ */
+ JobDetail jobDetail = JobBuilder.newJob(OracleConvertDgn2ShpJob.class)
+ .withIdentity("ScanDirectory", Scheduler.DEFAULT_GROUP)
+ .usingJobData("SCAN_DIR", "c:\\quartz-book\\input")
+ .build();
// Configure the directory to scan
- jobDetail.getJobDataMap().put("SCAN_DIR", "c:\\quartz-book\\input");
+ // jobDetail.getJobDataMap().put("SCAN_DIR", "c:\\quartz-book\\input");
// Create a trigger that fires every 10 seconds, forever
- Trigger trigger = TriggerUtils.makeSecondlyTrigger(10);
- trigger.setName("scanTrigger");
+ // Trigger trigger = TriggerUtils.makeSecondlyTrigger(10);
+ // trigger.setName("scanTrigger");
+ Trigger trigger = TriggerBuilder.newTrigger().withIdentity("scanTrigger")
+ .startAt(DateBuilder.futureDate(10, DateBuilder.IntervalUnit.SECOND))
+ .build();
// Start the trigger firing from now
- trigger.setStartTime(new Date());
+ // trigger.setStartTime(new Date());
// Associate the trigger with the job in the scheduler
scheduler.scheduleJob(jobDetail, trigger);
diff --git a/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz.properties b/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz.properties
index ca08623..be4ac14 100644
--- a/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz.properties
+++ b/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz.properties
@@ -22,16 +22,16 @@
#===============================================================
org.quartz.plugin.triggHistory.class = org.quartz.plugins.history.LoggingJobHistoryPlugin
-#org.quartz.plugin.jobInitializer.class = org.quartz.plugins.xml.JobInitializationPlugin
org.quartz.plugin.jobInitializer.class = org.quartz.plugins.xml.XMLSchedulingDataProcessorPlugin
+#org.quartz.plugin.jobInitializer.class = org.quartz.plugins.xml.JobInitializationPlugin
-#org.quartz.plugin.jobInitializer.fileNames = quartz_jobs_edb.xml
org.quartz.plugin.jobInitializer.fileNames = quartz_jobs.xml
+#org.quartz.plugin.jobInitializer.fileNames = quartz_jobs_edb.xml
-#org.quartz.plugin.jobInitializer.overWriteExistingJobs = true
+org.quartz.plugin.jobInitializer.overWriteExistingJobs = true
org.quartz.plugin.jobInitializer.failOnFileNotFound = true
#org.quartz.plugin.jobInitializer.validating=false
-org.quartz.plugin.jobInitializer.scanInterval = 120
+org.quartz.plugin.jobInitializer.scanInterval = 10
org.quartz.plugin.jobInitializer.wrapInUserTransaction = false
org.quartz.plugin.shutdownhook.class = org.quartz.plugins.management.ShutdownHookPlugin
diff --git a/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml b/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml
index 33dc2bb..866ca82 100644
--- a/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml
+++ b/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml
@@ -60,7 +60,7 @@
</entry>
<entry>
<key>ORAHOST</key>
- <value>192.168.11.200</value>
+ <value>192.168.11.199</value>
</entry>
<entry>
<key>ORAINST</key>
@@ -135,7 +135,7 @@
<group>DEFAULT</group>
<job-name>ConvertDgn2PostGisIntoPostgre</job-name>
<job-group>DEFAULT</job-group>
- <start-time>2008-03-01T18:10:00</start-time>
+ <start-time>2011-03-01T18:00:00</start-time>
<!-- repeat indefinitely every 10 seconds -->
<repeat-count>0</repeat-count>
<repeat-interval>500</repeat-interval>
diff --git a/xdgnjobs/ximple-spatialjob/pom.xml b/xdgnjobs/ximple-spatialjob/pom.xml
index bc76e79..5bffdb7 100644
--- a/xdgnjobs/ximple-spatialjob/pom.xml
+++ b/xdgnjobs/ximple-spatialjob/pom.xml
@@ -7,18 +7,18 @@
<parent>
<groupId>com.ximple.eofms</groupId>
<artifactId>ximple-dgnjobs</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1</version>
</parent>
<groupId>com.ximple.eofms</groupId>
<artifactId>ximple-spatialjob</artifactId>
- <version>1.2.0</version>
+ <version>1.2.1</version>
<packaging>jar</packaging>
<name>ximple-spatialjob</name>
<url>http://www.ximple.com.tw</url>
<properties>
- <xdgnio.version>1.2.0</xdgnio.version>
+ <xdgnio.version>1.2.1</xdgnio.version>
</properties>
<description>
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/filter/CreateSymbolStrategy.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/filter/CreateSymbolStrategy.java
index 37143fa..471694c 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/filter/CreateSymbolStrategy.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/filter/CreateSymbolStrategy.java
@@ -9,11 +9,11 @@
import com.ximple.io.dgn7.UserAttributeData;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.geotools.feature.IllegalAttributeException;
import org.geotools.feature.SchemaException;
import org.geotools.feature.simple.SimpleFeatureBuilder;
import org.geotools.feature.simple.SimpleFeatureTypeBuilder;
import org.geotools.geometry.jts.JTSFactoryFinder;
+import org.opengis.feature.IllegalAttributeException;
import org.opengis.feature.simple.SimpleFeature;
import org.opengis.feature.simple.SimpleFeatureType;
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2EdbGeoJob.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2EdbGeoJob.java
index a021f70..a24eccd 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2EdbGeoJob.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2EdbGeoJob.java
@@ -31,8 +31,8 @@
import org.geotools.data.jdbc.JDBCUtils;
import org.geotools.data.edbgeo.PostgisDataStore;
import org.geotools.data.edbgeo.PostgisDataStoreFactory;
-import org.geotools.feature.IllegalAttributeException;
import org.geotools.feature.SchemaException;
+import org.opengis.feature.IllegalAttributeException;
import org.quartz.JobDataMap;
import org.quartz.JobDetail;
import org.quartz.JobExecutionContext;
@@ -180,7 +180,7 @@
JobDetail jobDetail = context.getJobDetail();
// The name is defined in the job definition
- String jobName = jobDetail.getName();
+ String jobName = jobDetail.getKey().getName();
// Log the time the job started
logger.info(jobName + " fired at " + new Date());
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 99ef4d8..ef26b4a 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
@@ -27,8 +27,8 @@
import org.geotools.data.DataStore;
import org.geotools.data.mysql.MySQLDataStore;
import org.geotools.data.mysql.MySQLDataStoreFactory;
-import org.geotools.feature.IllegalAttributeException;
import org.geotools.feature.SchemaException;
+import org.opengis.feature.IllegalAttributeException;
import org.quartz.JobDataMap;
import org.quartz.JobDetail;
import org.quartz.JobExecutionContext;
@@ -168,7 +168,7 @@
JobDetail jobDetail = context.getJobDetail();
// The name is defined in the job definition
- String jobName = jobDetail.getName();
+ String jobName = jobDetail.getKey().getName();
String targetSchemaName = null;
// Log the time the job started
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 7b48d35..07a4b03 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
@@ -28,8 +28,8 @@
import org.geotools.data.jdbc.JDBCUtils;
import org.geotools.data.oracle.OracleDataStore;
import org.geotools.data.oracle.OracleDataStoreFactory;
-import org.geotools.feature.IllegalAttributeException;
import org.geotools.feature.SchemaException;
+import org.opengis.feature.IllegalAttributeException;
import org.quartz.JobDataMap;
import org.quartz.JobDetail;
import org.quartz.JobExecutionContext;
@@ -171,7 +171,7 @@
JobDetail jobDetail = context.getJobDetail();
// The name is defined in the job definition
- String jobName = jobDetail.getName();
+ String jobName = jobDetail.getKey().getName();
String targetSchemaName = null;
// Log the time the job started
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 99df9bc..0f2aede 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
@@ -32,8 +32,8 @@
import org.geotools.data.jdbc.JDBCUtils;
import org.geotools.data.postgis.PostgisDataStore;
import org.geotools.data.postgis.PostgisDataStoreFactory;
-import org.geotools.feature.IllegalAttributeException;
import org.geotools.feature.SchemaException;
+import org.opengis.feature.IllegalAttributeException;
import org.quartz.JobDataMap;
import org.quartz.JobDetail;
import org.quartz.JobExecutionContext;
@@ -182,7 +182,7 @@
JobDetail jobDetail = context.getJobDetail();
// The name is defined in the job definition
- String jobName = jobDetail.getName();
+ String jobName = jobDetail.getKey().getName();
// Log the time the job started
logger.info(jobName + " fired at " + new Date());
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 35251ae..62660e8 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
@@ -22,8 +22,8 @@
import org.apache.commons.collections.map.LinkedMap;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.geotools.feature.IllegalAttributeException;
import org.geotools.feature.SchemaException;
+import org.opengis.feature.IllegalAttributeException;
import org.quartz.JobDetail;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;
@@ -90,7 +90,7 @@
JobDetail jobDetail = context.getJobDetail();
// The name is defined in the job definition
- String jobName = jobDetail.getName();
+ String jobName = jobDetail.getKey().getName();
String targetSchemaName = null;
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 34956a6..2e95dd7 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
@@ -24,7 +24,7 @@
JobDetail jobDetail = context.getJobDetail();
// The name is defined in the job definition
- String jobName = jobDetail.getName();
+ String jobName = jobDetail.getKey().getName();
String targetSchemaName = null;
// Log the time the job started
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/Bits.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/Bits.java
index b2d02e5..c924225 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/Bits.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/Bits.java
@@ -12,7 +12,7 @@
* Bits
* User: Ulysses
* Date: 2007/6/17
- * Time: �W�� 01:16:39
+ * Time: 01:16:39
*/
public class Bits {
// -- Unsafe access --
--
Gitblit v0.0.0-SNAPSHOT