Merge branch 'origin/2.1.x'

Dennis Kao

2014-04-08 90e7660cac64a949ac7d4e71302ac3509e8ce5a5

 xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml

@@ -35,11 +35,11 @@
      <job-data-map>
        <entry>
          <key>JOBDATA_DIR</key>
          <value>/Users/Shared/Public/Projects/XGeoDMMS/xjobrun/tctpcjobs/jobdata</value>
          <value>/home/ulysseskao/projects/xgeodmms/xjobrun/nntpcjobs/jobdata</value>
        </entry>
        <entry>
          <key>PGHOST</key>
          <value>10.10.1.17</value>
          <value>10.10.1.7</value>
        </entry>
        <entry>
          <key>PGDATBASE</key>
@@ -63,7 +63,7 @@
        </entry>
        <entry>
          <key>ORAHOST</key>
          <value>10.10.1.17</value>
          <value>10.10.1.7</value>
        </entry>
        <entry>
          <key>ORAINST</key>
@@ -88,7 +88,7 @@
        </entry>
        <entry>
          <key>CONVERTDB</key>
          <value>false</value>
          <value>true</value>
        </entry>
        <entry>
          <key>CONVERTFILE</key>
@@ -96,7 +96,7 @@
        </entry>
        <entry>
          <key>CONVERTELEMIN</key>
          <value>false</value>
          <value>true</value>
        </entry>
        <entry>
          <key>CONVERTPWTHEMES</key>
@@ -136,7 +136,7 @@
        </entry>
        <entry>
          <key>GEOSERVER_URL</key>
          <value>http://10.10.1.17:8080/geoserver</value>
          <value>http://10.10.1.7:8080/geoserver</value>
        </entry>
        <entry>
          <key>GEOSERVER_USER</key>