From 94ae08701bbd7585a0b7e5a92d1975965a503c03 Mon Sep 17 00:00:00 2001
From: Dennis Kao <ulysseskao@gmail.com>
Date: Wed, 15 Jan 2014 11:28:52 +0800
Subject: [PATCH] Merge branch 'origin/2.1.x'

---
 xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml |  105 ++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 76 insertions(+), 29 deletions(-)

diff --git a/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml b/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml
index 73cb85a..75420ba 100644
--- a/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml
+++ b/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml
@@ -1,32 +1,49 @@
 <?xml version='1.0' encoding='utf-8'?>
 
-<quartz xmlns="http://www.opensymphony.com/quartz/JobSchedulingData"
-        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-        xsi:schemaLocation="http://www.opensymphony.com/quartz/JobSchedulingData
-        http://www.opensymphony.com/quartz/xml/job_scheduling_data_1_5.xsd"
-        version="1.5">
+<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">
 
-  <job>
-    <job-detail>
-      <name>ConvertDgn2PostGisIntoPostgre</name>
+  <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 shapefiles</description>
-      <job-class>com.ximple.eofms.jobs.OracleConvertDgn2PostGISJob</job-class>
-      <volatility>false</volatility>
+      <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 allows-transient-data="true"-->
+      <job-data-map>
         <entry>
           <key>JOBDATA_DIR</key>
-          <value>G:\Temp\JobData\tctpc</value>
+          <value>/Users/Shared/Public/Projects/XGeoDMMS/xjobrun/tctpcjobs/jobdata</value>
         </entry>
         <entry>
           <key>PGHOST</key>
-          <value>192.168.11.200</value>
+          <value>10.10.1.17</value>
         </entry>
         <entry>
-          <key>PGDDATBASE</key>
-          <value>tctpc</value>
+          <key>PGDATBASE</key>
+          <value>pgDMMS</value>
         </entry>
         <entry>
           <key>PGPORT</key>
@@ -38,19 +55,19 @@
         </entry>
         <entry>
           <key>PGUSER</key>
-          <value>spatialdb</value>
+          <value>tpcdb</value>
         </entry>
         <entry>
           <key>PGPASS</key>
-          <value>spatialdb000</value>
+          <value>simple000</value>
         </entry>
         <entry>
           <key>ORAHOST</key>
-          <value>192.168.11.200</value>
+          <value>10.10.1.17</value>
         </entry>
         <entry>
           <key>ORAINST</key>
-          <value>tctpc</value>
+          <value>orcl</value>
         </entry>
         <entry>
           <key>ORAPORT</key>
@@ -58,27 +75,32 @@
         </entry>
         <entry>
           <key>ORAUSER</key>
-          <value>spatialdb</value>
+          <value>system</value>
         </entry>
         <entry>
           <key>ORAPASS</key>
-          <value>spatialdb000</value>
+          <value>simple000</value>
         </entry>
         <entry>
           <key>ORGSCHEMA</key>
+          <!--value>SPATIALDB</value-->
           <value>SPATIALDB, CMMS_SPATIALDB</value>
         </entry>
         <entry>
           <key>CONVERTDB</key>
-          <value>true</value>
+          <value>false</value>
         </entry>
         <entry>
           <key>CONVERTFILE</key>
-          <value>true</value>
+          <value>false</value>
         </entry>
         <entry>
           <key>CONVERTELEMIN</key>
           <value>false</value>
+        </entry>
+        <entry>
+          <key>CONVERTPWTHEMES</key>
+          <value>true</value>
         </entry>
         <entry>
           <key>CREATEDUMMY</key>
@@ -104,16 +126,40 @@
           <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.17: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-detail>
+    </job>
 
     <trigger>
       <simple>
         <name>convertTrigger</name>
         <group>DEFAULT</group>
-        <job-name>ConvertDgn2PostGisIntoPostgre</job-name>
+        <job-name>ConvertDMMS2PostGisWithGeoserver</job-name>
         <job-group>DEFAULT</job-group>
-        <start-time>2008-03-01T18:10:00</start-time>
+        <start-time>2013-03-01T18:00:00</start-time>
         <!-- repeat indefinitely every 10 seconds -->
         <repeat-count>0</repeat-count>
         <repeat-interval>500</repeat-interval>
@@ -121,5 +167,6 @@
       </simple>
     </trigger>
 
-  </job>
-</quartz>
+  </schedule>
+
+</job-scheduling-data>

--
Gitblit v0.0.0-SNAPSHOT