fix
unknown
2014-08-05 d45160f23680ef536e7bf56f22420630193f848d
fix
7 files modified
222 ■■■■ changed files
xdgnjobs/ximple-jobcarrier/quartz.properties 4 ●●●● patch | view | raw | blame | history
xdgnjobs/ximple-jobcarrier/quartz_jobs.xml 19 ●●●● patch | view | raw | blame | history
xdgnjobs/ximple-jobcarrier/src/main/resources/quartz.properties 4 ●●●● patch | view | raw | blame | history
xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml 30 ●●●●● patch | view | raw | blame | history
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/filter/CreateLineStringStrategy.java 2 ●●● patch | view | raw | blame | history
xdgnjobs/ximple-spatialjob/src/main/resources/com/ximple/eofms/geoserver/config/xgeosdataconfig.xml 153 ●●●●● patch | view | raw | blame | history
xdgnjobs/ximple-spatialjob/src/main/resources/conf/DefaultConvertShpFilter.xml 10 ●●●● patch | view | raw | blame | history
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
xdgnjobs/ximple-jobcarrier/quartz_jobs.xml
@@ -32,15 +32,16 @@
        <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>/mnt/hdisk/home.data/private/projects/xdcad/xjobrun/nntpcjobs/jobdata</value-->
                    <value>C:/Data/xjobs</value>
        </entry>
        <entry>
          <key>PGHOST</key>
          <value>192.168.11.99</value>
                    <value>10.16.17.14</value>
        </entry>
        <entry>
          <key>PGDATBASE</key>
          <value>pgNNTPC</value>
                    <value>pgDMMS</value>
        </entry>
        <entry>
          <key>PGPORT</key>
@@ -56,15 +57,15 @@
        </entry>
        <entry>
          <key>PGPASS</key>
          <value>simple000</value>
                    <value>tpc000</value>
        </entry>
        <entry>
          <key>ORAHOST</key>
          <value>10.10.1.7</value>
                    <value>10.16.17.14</value>
        </entry>
        <entry>
          <key>ORAINST</key>
          <value>orcl</value>
                    <value>nntpc</value>
        </entry>
        <entry>
          <key>ORAPORT</key>
@@ -76,7 +77,7 @@
        </entry>
        <entry>
          <key>ORAPASS</key>
          <value>simple000</value>
                    <value>manager</value>
        </entry>
        <entry>
          <key>ORGSCHEMA</key>
@@ -89,7 +90,7 @@
        </entry>
        <entry>
          <key>CONVERTFILE</key>
          <value>true</value>
                    <value>false</value>
        </entry>
        <entry>
          <key>CONVERTELEMIN</key>
@@ -129,7 +130,7 @@
        </entry>
        <entry>
          <key>GEOSERVER_URL</key>
          <value>http://192.168.11.99:8080/geoserver</value>
                    <value>http://192.168.11.39:8080/geosnn</value>
        </entry>
        <entry>
          <key>GEOSERVER_USER</key>
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
xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml
@@ -6,10 +6,8 @@
                     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 -->
        <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>
@@ -26,8 +24,6 @@
      <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>
@@ -35,11 +31,13 @@
      <job-data-map>
        <entry>
          <key>JOBDATA_DIR</key>
          <value>/home/ulysseskao/projects/xgeodmms/xjobrun/nntpcjobs/jobdata</value>
                    <!--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.10.1.7</value>
                    <value>10.16.17.14</value>
        </entry>
        <entry>
          <key>PGDATBASE</key>
@@ -59,15 +57,15 @@
        </entry>
        <entry>
          <key>PGPASS</key>
          <value>simple000</value>
                    <value>tpc000</value>
        </entry>
        <entry>
          <key>ORAHOST</key>
          <value>10.10.1.7</value>
                    <value>10.16.17.14</value>
        </entry>
        <entry>
          <key>ORAINST</key>
          <value>orcl</value>
                    <value>nntpc</value>
        </entry>
        <entry>
          <key>ORAPORT</key>
@@ -79,7 +77,7 @@
        </entry>
        <entry>
          <key>ORAPASS</key>
          <value>simple000</value>
                    <value>manager</value>
        </entry>
        <entry>
          <key>ORGSCHEMA</key>
@@ -96,11 +94,7 @@
        </entry>
        <entry>
          <key>CONVERTELEMIN</key>
          <value>true</value>
        </entry>
        <entry>
          <key>CONVERTPWTHEMES</key>
          <value>true</value>
                    <value>false</value>
        </entry>
        <entry>
          <key>CREATEDUMMY</key>
@@ -136,7 +130,7 @@
        </entry>
        <entry>
          <key>GEOSERVER_URL</key>
          <value>http://10.10.1.7:8080/geoserver</value>
                    <value>http://192.168.11.39:8080/geosnn</value>
        </entry>
        <entry>
          <key>GEOSERVER_USER</key>
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);
    }
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>
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>