From d3e54517458b62ea3530a89f4a0185988bb4bd7e Mon Sep 17 00:00:00 2001
From: unknown <yuanhung@ximple.com.tw>
Date: Tue, 13 May 2014 11:40:51 +0800
Subject: [PATCH] Merge branch 'origin/2.1.x'
---
xdgnjobs/pom.xml | 4
xdgnjobs/ximple-jobcarrier/quartz_jobs_resetview.xml | 173 +++++++++++++++++++++++++++++++++++++++++++
xdgnjobs/ximple-jobcarrier/quartz.properties | 3
xdgnjobs/ximple-jobcarrier/src/main/resources/quartz.properties | 4
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/OracleConvertPostGISJobContext.java | 6 +
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/OracleConvertDgn2PostGISJob.java | 3
xdgnjobs/ximple-jobcarrier/quartz_jobs_colowner.xml | 8 +-
xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs_colowner.xml | 8 +-
8 files changed, 195 insertions(+), 14 deletions(-)
diff --git a/xdgnjobs/pom.xml b/xdgnjobs/pom.xml
index 2dd14d4..159737c 100644
--- a/xdgnjobs/pom.xml
+++ b/xdgnjobs/pom.xml
@@ -19,7 +19,7 @@
<src.output>${basedir}/target</src.output>
<java5>1.6</java5>
<xdgnio.version>2.1.1</xdgnio.version>
- <gt.version>10.4.x</gt.version>
+ <gt.version>10.6.x</gt.version>
<failIfNoTests>false</failIfNoTests>
<stress.skip.pattern></stress.skip.pattern>
<online.skip.pattern></online.skip.pattern>
@@ -100,7 +100,7 @@
<url>http://www.ximple.com.tw</url>
</organization>
- <inceptionYear>2012</inceptionYear>
+ <inceptionYear>2014</inceptionYear>
<!-- =========================================================== -->
<!-- Issue managements and mailing lists. -->
diff --git a/xdgnjobs/ximple-jobcarrier/quartz.properties b/xdgnjobs/ximple-jobcarrier/quartz.properties
index 9244172..42bec0e 100644
--- a/xdgnjobs/ximple-jobcarrier/quartz.properties
+++ b/xdgnjobs/ximple-jobcarrier/quartz.properties
@@ -24,10 +24,11 @@
org.quartz.plugin.jobInitializer.class: org.quartz.plugins.xml.XMLSchedulingDataProcessorPlugin
#org.quartz.plugin.jobInitializer.fileNames = quartz_jobs_dmmsroadfee.xml
-org.quartz.plugin.jobInitializer.fileNames = quartz_jobs.xml
+#org.quartz.plugin.jobInitializer.fileNames = quartz_jobs.xml
#org.quartz.plugin.jobInitializer.fileNames = quartz_jobs_inc.xml
#org.quartz.plugin.jobInitializer.fileNames = quartz_jobs_edb.xml
#org.quartz.plugin.jobInitializer.fileNames = quartz_jobs_colowner.xml
+org.quartz.plugin.jobInitializer.fileNames = quartz_jobs_resetview.xml
#org.quartz.plugin.jobInitializer.fileNames = quartz_jobs_dmmsroadfee.xml
#org.quartz.plugin.jobInitializer.fileNames = quartz_jobs_nddjpb.xml
diff --git a/xdgnjobs/ximple-jobcarrier/quartz_jobs_colowner.xml b/xdgnjobs/ximple-jobcarrier/quartz_jobs_colowner.xml
index 30d36a9..9db802d 100644
--- a/xdgnjobs/ximple-jobcarrier/quartz_jobs_colowner.xml
+++ b/xdgnjobs/ximple-jobcarrier/quartz_jobs_colowner.xml
@@ -30,12 +30,12 @@
<job-data-map>
<entry>
<key>JOBDATA_DIR</key>
- <value>/Users/ulysseskao/Projects/XGeoDMMS/xjobrun/tctpcjobs/jobdata</value>
+ <value>/Users/ulysseskao/Projects/XGeoDMMS/xjobrun/nntpcjobs/jobdata</value>
<!--value>/mnt/hdisk/home.data/private/projects/xdcad/xjobrun/nntpcjobs/jobdata</value-->
</entry>
<entry>
<key>PGHOST</key>
- <value>10.10.1.17</value>
+ <value>10.10.1.19</value>
</entry>
<entry>
<key>PGDATBASE</key>
@@ -59,7 +59,7 @@
</entry>
<entry>
<key>ORAHOST</key>
- <value>10.10.1.17</value>
+ <value>10.10.1.19</value>
</entry>
<entry>
<key>ORAINST</key>
@@ -75,7 +75,7 @@
</entry>
<entry>
<key>ORAPASS</key>
- <value>simple000</value>
+ <value>SYSTEM000</value>
</entry>
<entry>
<key>ORGSCHEMA</key>
diff --git a/xdgnjobs/ximple-jobcarrier/quartz_jobs_resetview.xml b/xdgnjobs/ximple-jobcarrier/quartz_jobs_resetview.xml
new file mode 100644
index 0000000..6d2c7c8
--- /dev/null
+++ b/xdgnjobs/ximple-jobcarrier/quartz_jobs_resetview.xml
@@ -0,0 +1,173 @@
+<?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>
+ <!-- clear all jobs in scheduler -->
+ <delete-triggers-in-group>*</delete-triggers-in-group>
+ <!-- clear all triggers in scheduler -->
+ </pre-processing-commands>
+
+ <processing-directives>
+ <!-- if there are any jobs/trigger in scheduler of same name (as in this file), overwrite them -->
+ <overwrite-existing-data>true</overwrite-existing-data>
+ <!-- if there are any jobs/trigger in scheduler of same name (as in this file), and over-write is false, ignore them rather then generating an error -->
+ <ignore-duplicates>false</ignore-duplicates>
+ </processing-directives>
+
+ <schedule>
+ <job>
+ <name>ConvertDMMS2PostGisWithGeoserver</name>
+ <group>DEFAULT</group>
+ <description>A job that convert dgn to postgis</description>
+ <!--job-class>com.ximple.eofms.jobs.OracleConvertDgn2PostGISJob</job-class-->
+ <job-class>com.ximple.eofms.jobs.GeoserverIntegrateConfigJob</job-class>
+ <!--job-class>com.ximple.eofms.jobs.OracleTransformColorOwnerJob</job-class-->
+ <!--job-class>com.ximple.eofms.jobs.OracleTransformColorOwner2CSVJob</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>/Users/ulysseskao/Projects/XGeoDMMS/xjobrun/nntpcjobs/jobdata</value>
+ <!--value>/home/ulysseskao/projects/xgeodmms/xjobrun/nntpcjobs/jobdata</value-->
+ </entry>
+ <entry>
+ <key>PGHOST</key>
+ <value>10.10.1.19</value>
+ </entry>
+ <entry>
+ <key>PGDATBASE</key>
+ <value>pgDMMS</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>10.10.1.19</value>
+ </entry>
+ <entry>
+ <key>ORAINST</key>
+ <value>orcl</value>
+ </entry>
+ <entry>
+ <key>ORAPORT</key>
+ <value>1521</value>
+ </entry>
+ <entry>
+ <key>ORAUSER</key>
+ <value>system</value>
+ </entry>
+ <entry>
+ <key>ORAPASS</key>
+ <value>SYSTEM000</value>
+ </entry>
+ <entry>
+ <key>ORGSCHEMA</key>
+ <!--value>SPATIALDB</value-->
+ <value>SPATIALDB, CMMS_SPATIALDB</value>
+ </entry>
+ <entry>
+ <key>CONVERTDB</key>
+ <value>false</value>
+ </entry>
+ <entry>
+ <key>CONVERTFILE</key>
+ <value>false</value>
+ </entry>
+ <entry>
+ <key>CONVERTELEMIN</key>
+ <value>false</value>
+ </entry>
+ <entry>
+ <key>CONVERTPWTHEMES</key>
+ <value>true</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>
+ <entry>
+ <key>GEOSERVER_URL</key>
+ <value>http://10.10.1.7:8080/geoserver</value>
+ </entry>
+ <entry>
+ <key>GEOSERVER_USER</key>
+ <value>admin</value>
+ </entry>
+ <entry>
+ <key>GEOSERVER_PASS</key>
+ <value>geoserver</value>
+ </entry>
+ <entry>
+ <key>IGNORE_DBETL</key>
+ <value>false</value>
+ </entry>
+ </job-data-map>
+ </job>
+
+ <trigger>
+ <simple>
+ <name>convertTrigger</name>
+ <group>DEFAULT</group>
+ <job-name>ConvertDMMS2PostGisWithGeoserver</job-name>
+ <job-group>DEFAULT</job-group>
+ <start-time>2013-03-01T18:00:00</start-time>
+ <!-- repeat indefinitely every 10 seconds -->
+ <repeat-count>0</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/resources/quartz.properties b/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz.properties
index 57f4f19..a6c66cb 100644
--- a/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz.properties
+++ b/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz.properties
@@ -24,10 +24,10 @@
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.xml
#org.quartz.plugin.jobInitializer.fileNames = quartz_jobs_inc.xml
#org.quartz.plugin.jobInitializer.fileNames = quartz_jobs_edb.xml
-#org.quartz.plugin.jobInitializer.fileNames = quartz_jobs_colowner.xml
+org.quartz.plugin.jobInitializer.fileNames = quartz_jobs_colowner.xml
#org.quartz.plugin.jobInitializer.fileNames = quartz_jobs_dmmsroadfee.xml
#org.quartz.plugin.jobInitializer.fileNames = quartz_jobs_nddjpb.xml
diff --git a/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs_colowner.xml b/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs_colowner.xml
index 30d36a9..9db802d 100644
--- a/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs_colowner.xml
+++ b/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs_colowner.xml
@@ -30,12 +30,12 @@
<job-data-map>
<entry>
<key>JOBDATA_DIR</key>
- <value>/Users/ulysseskao/Projects/XGeoDMMS/xjobrun/tctpcjobs/jobdata</value>
+ <value>/Users/ulysseskao/Projects/XGeoDMMS/xjobrun/nntpcjobs/jobdata</value>
<!--value>/mnt/hdisk/home.data/private/projects/xdcad/xjobrun/nntpcjobs/jobdata</value-->
</entry>
<entry>
<key>PGHOST</key>
- <value>10.10.1.17</value>
+ <value>10.10.1.19</value>
</entry>
<entry>
<key>PGDATBASE</key>
@@ -59,7 +59,7 @@
</entry>
<entry>
<key>ORAHOST</key>
- <value>10.10.1.17</value>
+ <value>10.10.1.19</value>
</entry>
<entry>
<key>ORAINST</key>
@@ -75,7 +75,7 @@
</entry>
<entry>
<key>ORAPASS</key>
- <value>simple000</value>
+ <value>SYSTEM000</value>
</entry>
<entry>
<key>ORGSCHEMA</key>
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 93b1a89..e8cd4c9 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
@@ -1939,7 +1939,8 @@
}
} else {
stmt.execute("TRUNCATE "+ tableName + " CASCADE");
- stmt.execute("SELECT * INTO " + tableName + " FROM " + tempTable);
+ // stmt.execute("SELECT * INTO " + tableName + " FROM " + tempTable);
+ stmt.execute("INSERT INTO " + tableName + " SELECT * FROM " + tempTable);
}
stmt.execute("DROP TABLE " + tempTable);
} finally {
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/OracleConvertPostGISJobContext.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/OracleConvertPostGISJobContext.java
index f6a8741..752cf56 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/OracleConvertPostGISJobContext.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/OracleConvertPostGISJobContext.java
@@ -120,6 +120,12 @@
boolean isEmptySize = false;
FrammeAttributeData linkage =
AbstractFLinkageDispatchableFilter.getFeatureLinkage(element);
+ if (linkage != null) {
+ if (linkage.getFsc() == 423) {
+ return;
+ }
+ }
+
logger.warn("Unknown Element:" + element.getElementType().toString() +
":type=" + element.getType() + ":lv=" + element.getLevelIndex() + ":id=" +
(linkage == null ? "NULL" : "FSC=" + (linkage.getFsc() + "|UFID=" + linkage.getUfid() +
--
Gitblit v0.0.0-SNAPSHOT