Merge branch 'origin/2.1.x'

unknown

2014-05-13 d3e54517458b62ea3530a89f4a0185988bb4bd7e

 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>