From d45160f23680ef536e7bf56f22420630193f848d Mon Sep 17 00:00:00 2001
From: unknown <yuanhung@ximple.com.tw>
Date: Tue, 05 Aug 2014 09:49:24 +0800
Subject: [PATCH] fix
---
xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml | 312 ++++++++++-----------
xdgnjobs/ximple-jobcarrier/quartz.properties | 4
xdgnjobs/ximple-jobcarrier/src/main/resources/quartz.properties | 4
xdgnjobs/ximple-spatialjob/src/main/resources/conf/DefaultConvertShpFilter.xml | 10
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/filter/CreateLineStringStrategy.java | 2
xdgnjobs/ximple-spatialjob/src/main/resources/com/ximple/eofms/geoserver/config/xgeosdataconfig.xml | 153 ----------
xdgnjobs/ximple-jobcarrier/quartz_jobs.xml | 311 +++++++++++-----------
7 files changed, 316 insertions(+), 480 deletions(-)
diff --git a/xdgnjobs/ximple-jobcarrier/quartz.properties b/xdgnjobs/ximple-jobcarrier/quartz.properties
index 42bec0e..03301da 100644
--- a/xdgnjobs/ximple-jobcarrier/quartz.properties
+++ b/xdgnjobs/ximple-jobcarrier/quartz.properties
@@ -24,11 +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_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.xml b/xdgnjobs/ximple-jobcarrier/quartz_jobs.xml
index c47943b..4704e6f 100644
--- a/xdgnjobs/ximple-jobcarrier/quartz_jobs.xml
+++ b/xdgnjobs/ximple-jobcarrier/quartz_jobs.xml
@@ -1,165 +1,166 @@
<?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">
+ 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>
+ <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>
+ <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>
- <!--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/Shared/Public/Projects/XGeoDMMS/xjobrun/nstpcjobs/jobdata</value-->
- <value>/mnt/hdisk/home.data/private/projects/xdcad/xjobrun/nntpcjobs/jobdata</value>
- </entry>
- <entry>
- <key>PGHOST</key>
- <value>192.168.11.99</value>
- </entry>
- <entry>
- <key>PGDATBASE</key>
- <value>pgNNTPC</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.7</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>simple000</value>
- </entry>
- <entry>
- <key>ORGSCHEMA</key>
- <!--value>SPATIALDB</value-->
- <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>
- <entry>
- <key>GEOSERVER_URL</key>
- <value>http://192.168.11.99: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>
+ <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>
+ <!--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/Shared/Public/Projects/XGeoDMMS/xjobrun/nstpcjobs/jobdata</value-->
+ <!--value>/mnt/hdisk/home.data/private/projects/xdcad/xjobrun/nntpcjobs/jobdata</value-->
+ <value>C:/Data/xjobs</value>
+ </entry>
+ <entry>
+ <key>PGHOST</key>
+ <value>10.16.17.14</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>tpc000</value>
+ </entry>
+ <entry>
+ <key>ORAHOST</key>
+ <value>10.16.17.14</value>
+ </entry>
+ <entry>
+ <key>ORAINST</key>
+ <value>nntpc</value>
+ </entry>
+ <entry>
+ <key>ORAPORT</key>
+ <value>1521</value>
+ </entry>
+ <entry>
+ <key>ORAUSER</key>
+ <value>system</value>
+ </entry>
+ <entry>
+ <key>ORAPASS</key>
+ <value>manager</value>
+ </entry>
+ <entry>
+ <key>ORGSCHEMA</key>
+ <!--value>SPATIALDB</value-->
+ <value>SPATIALDB, CMMS_SPATIALDB</value>
+ </entry>
+ <entry>
+ <key>CONVERTDB</key>
+ <value>true</value>
+ </entry>
+ <entry>
+ <key>CONVERTFILE</key>
+ <value>false</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>
+ <entry>
+ <key>GEOSERVER_URL</key>
+ <value>http://192.168.11.39:8080/geosnn</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>
+ <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>
+ </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 a6c66cb..57f4f19 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.xml b/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml
index dd4907a..4704e6f 100644
--- a/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml
+++ b/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml
@@ -5,168 +5,162 @@
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>
+ <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>
+ <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>/home/ulysseskao/projects/xgeodmms/xjobrun/nntpcjobs/jobdata</value>
- </entry>
- <entry>
- <key>PGHOST</key>
- <value>10.10.1.7</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.7</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>simple000</value>
- </entry>
- <entry>
- <key>ORGSCHEMA</key>
- <!--value>SPATIALDB</value-->
- <value>SPATIALDB, CMMS_SPATIALDB</value>
- </entry>
- <entry>
- <key>CONVERTDB</key>
- <value>true</value>
- </entry>
- <entry>
- <key>CONVERTFILE</key>
- <value>false</value>
- </entry>
- <entry>
- <key>CONVERTELEMIN</key>
- <value>true</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>
+ <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>
+ <!--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/Shared/Public/Projects/XGeoDMMS/xjobrun/nstpcjobs/jobdata</value-->
+ <!--value>/mnt/hdisk/home.data/private/projects/xdcad/xjobrun/nntpcjobs/jobdata</value-->
+ <value>C:/Data/xjobs</value>
+ </entry>
+ <entry>
+ <key>PGHOST</key>
+ <value>10.16.17.14</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>tpc000</value>
+ </entry>
+ <entry>
+ <key>ORAHOST</key>
+ <value>10.16.17.14</value>
+ </entry>
+ <entry>
+ <key>ORAINST</key>
+ <value>nntpc</value>
+ </entry>
+ <entry>
+ <key>ORAPORT</key>
+ <value>1521</value>
+ </entry>
+ <entry>
+ <key>ORAUSER</key>
+ <value>system</value>
+ </entry>
+ <entry>
+ <key>ORAPASS</key>
+ <value>manager</value>
+ </entry>
+ <entry>
+ <key>ORGSCHEMA</key>
+ <!--value>SPATIALDB</value-->
+ <value>SPATIALDB, CMMS_SPATIALDB</value>
+ </entry>
+ <entry>
+ <key>CONVERTDB</key>
+ <value>true</value>
+ </entry>
+ <entry>
+ <key>CONVERTFILE</key>
+ <value>false</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>
+ <entry>
+ <key>GEOSERVER_URL</key>
+ <value>http://192.168.11.39:8080/geosnn</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>
+ <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>
+ </schedule>
</job-scheduling-data>
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/filter/CreateLineStringStrategy.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/filter/CreateLineStringStrategy.java
index 7d10932..66861da 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/filter/CreateLineStringStrategy.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/filter/CreateLineStringStrategy.java
@@ -50,7 +50,7 @@
SimpleFeatureType featureType = typeBuilder.buildFeatureType();
typeBuilders.put(featureName, featureType);
fireFeatureTypeEvent(new FeatureTypeEvent(this, featureType));
- }
+ } //watch that!!!!!!!!!!!!!!!!!!!!!!!!!^^^^^^
return typeBuilders.get(featureName);
}
diff --git a/xdgnjobs/ximple-spatialjob/src/main/resources/com/ximple/eofms/geoserver/config/xgeosdataconfig.xml b/xdgnjobs/ximple-spatialjob/src/main/resources/com/ximple/eofms/geoserver/config/xgeosdataconfig.xml
index c5d7b90..ff748bd 100755
--- a/xdgnjobs/ximple-spatialjob/src/main/resources/com/ximple/eofms/geoserver/config/xgeosdataconfig.xml
+++ b/xdgnjobs/ximple-spatialjob/src/main/resources/com/ximple/eofms/geoserver/config/xgeosdataconfig.xml
@@ -8042,126 +8042,6 @@
</XGeosDataConfig>
<XGeosDataConfig>
<PG>pgHLVPIPE</PG>
- <FSC>423</FSC>
- <COMP>0</COMP>
- <LEV>11</LEV>
- <WEIGHT>1</WEIGHT>
- <FTYPE>xtpc-symbol</FTYPE>
- </XGeosDataConfig>
- <XGeosDataConfig>
- <PG>pgHLVPIPE</PG>
- <FSC>423</FSC>
- <COMP>0</COMP>
- <LEV>12</LEV>
- <WEIGHT>1</WEIGHT>
- <FTYPE>xtpc-symbol</FTYPE>
- </XGeosDataConfig>
- <XGeosDataConfig>
- <PG>pgHLVPIPE</PG>
- <FSC>423</FSC>
- <COMP>0</COMP>
- <LEV>4</LEV>
- <WEIGHT>1</WEIGHT>
- <FTYPE>xtpc-symbol</FTYPE>
- </XGeosDataConfig>
- <XGeosDataConfig>
- <PG>pgHLVPIPE</PG>
- <FSC>423</FSC>
- <COMP>1</COMP>
- <LEV>12</LEV>
- <WEIGHT>1</WEIGHT>
- <FTYPE>xtpc-polyline2</FTYPE>
- </XGeosDataConfig>
- <XGeosDataConfig>
- <PG>pgHLVPIPE</PG>
- <FSC>423</FSC>
- <COMP>1</COMP>
- <LEV>4</LEV>
- <WEIGHT>1</WEIGHT>
- <FTYPE>xtpc-polyline2</FTYPE>
- </XGeosDataConfig>
- <XGeosDataConfig>
- <PG>pgHLVPIPE</PG>
- <FSC>423</FSC>
- <COMP>1</COMP>
- <LEV>11</LEV>
- <WEIGHT>1</WEIGHT>
- <FTYPE>xtpc-polyline2</FTYPE>
- </XGeosDataConfig>
- <XGeosDataConfig>
- <PG>pgHLVPIPE</PG>
- <FSC>423</FSC>
- <COMP>2</COMP>
- <LEV>11</LEV>
- <WEIGHT>1</WEIGHT>
- <FTYPE>xtpc-text2</FTYPE>
- </XGeosDataConfig>
- <XGeosDataConfig>
- <PG>pgHLVPIPE</PG>
- <FSC>423</FSC>
- <COMP>2</COMP>
- <LEV>4</LEV>
- <WEIGHT>1</WEIGHT>
- <FTYPE>xtpc-text2</FTYPE>
- </XGeosDataConfig>
- <XGeosDataConfig>
- <PG>pgHLVPIPE</PG>
- <FSC>423</FSC>
- <COMP>2</COMP>
- <LEV>12</LEV>
- <WEIGHT>1</WEIGHT>
- <FTYPE>xtpc-text2</FTYPE>
- </XGeosDataConfig>
- <XGeosDataConfig>
- <PG>pgHLVPIPE</PG>
- <FSC>423</FSC>
- <COMP>3</COMP>
- <LEV>11</LEV>
- <WEIGHT>1</WEIGHT>
- <FTYPE>xtpc-text2</FTYPE>
- </XGeosDataConfig>
- <XGeosDataConfig>
- <PG>pgHLVPIPE</PG>
- <FSC>423</FSC>
- <COMP>3</COMP>
- <LEV>12</LEV>
- <WEIGHT>1</WEIGHT>
- <FTYPE>xtpc-text2</FTYPE>
- </XGeosDataConfig>
- <XGeosDataConfig>
- <PG>pgHLVPIPE</PG>
- <FSC>423</FSC>
- <COMP>3</COMP>
- <LEV>4</LEV>
- <WEIGHT>1</WEIGHT>
- <FTYPE>xtpc-text2</FTYPE>
- </XGeosDataConfig>
- <XGeosDataConfig>
- <PG>pgHLVPIPE</PG>
- <FSC>423</FSC>
- <COMP>4</COMP>
- <LEV>12</LEV>
- <WEIGHT>1</WEIGHT>
- <FTYPE>xtpc-polyline2</FTYPE>
- </XGeosDataConfig>
- <XGeosDataConfig>
- <PG>pgHLVPIPE</PG>
- <FSC>423</FSC>
- <COMP>4</COMP>
- <LEV>4</LEV>
- <WEIGHT>1</WEIGHT>
- <FTYPE>xtpc-polyline2</FTYPE>
- </XGeosDataConfig>
- <XGeosDataConfig>
- <PG>pgHLVPIPE</PG>
- <FSC>423</FSC>
- <COMP>4</COMP>
- <LEV>11</LEV>
- <WEIGHT>1</WEIGHT>
- <FTYPE>xtpc-polyline2</FTYPE>
- </XGeosDataConfig>
- <XGeosDataConfig>
- <PG>pgHLVPIPE</PG>
<FSC>424</FSC>
<COMP>0</COMP>
<LEV>1</LEV>
@@ -14320,38 +14200,7 @@
<WEIGHT>2</WEIGHT>
<FTYPE>xtpc-polyline</FTYPE>
</XGeosDataConfig>
- <XGeosDataConfig>
- <PG>pgOMS</PG>
- <FSC>106</FSC>
- <COMP>5</COMP>
- <LEV>4</LEV>
- <WEIGHT>2</WEIGHT>
- <FTYPE>xtpc-text2</FTYPE>
- </XGeosDataConfig>
- <XGeosDataConfig>
- <PG>pgOMS</PG>
- <FSC>106</FSC>
- <COMP>5</COMP>
- <LEV>3</LEV>
- <WEIGHT>2</WEIGHT>
- <FTYPE>xtpc-text2</FTYPE>
- </XGeosDataConfig>
- <XGeosDataConfig>
- <PG>pgOMS</PG>
- <FSC>106</FSC>
- <COMP>5</COMP>
- <LEV>1</LEV>
- <WEIGHT>2</WEIGHT>
- <FTYPE>xtpc-text2</FTYPE>
- </XGeosDataConfig>
- <XGeosDataConfig>
- <PG>pgOMS</PG>
- <FSC>106</FSC>
- <COMP>5</COMP>
- <LEV>2</LEV>
- <WEIGHT>2</WEIGHT>
- <FTYPE>xtpc-text2</FTYPE>
- </XGeosDataConfig>
+
<XGeosDataConfig>
<PG>pgOMS</PG>
<FSC>107</FSC>
diff --git a/xdgnjobs/ximple-spatialjob/src/main/resources/conf/DefaultConvertShpFilter.xml b/xdgnjobs/ximple-spatialjob/src/main/resources/conf/DefaultConvertShpFilter.xml
index f1a1a90..0d48358 100755
--- a/xdgnjobs/ximple-spatialjob/src/main/resources/conf/DefaultConvertShpFilter.xml
+++ b/xdgnjobs/ximple-spatialjob/src/main/resources/conf/DefaultConvertShpFilter.xml
@@ -39,15 +39,7 @@
</elementCriterion>
<TextCreateStrategy/>
</TypeCompFilter>
- <TypeCompFilter name="FSC-106.C-5">
- <tid>106</tid>
- <cid>5</cid>
- <description>線路相序</description>
- <elementCriterion>
- <elementType>17</elementType>
- </elementCriterion>
- <TextCreateStrategy/>
- </TypeCompFilter>
+
<TypeCompFilter name="FSC-106.C-99">
<tid>106</tid>
<cid>99</cid>
--
Gitblit v0.0.0-SNAPSHOT