forked from geodmms/xdgnjobs

Dennis Kao
2013-09-27 2beafbe22820de3c47e8c1128452c85ef6aeae33
update for distid
6 files modified
42 ■■■■■ changed files
xdgnjobs/ximple-jobcarrier/pom.xml 4 ●●●● patch | view | raw | blame | history
xdgnjobs/ximple-jobcarrier/quartz_jobs.xml 11 ●●●● patch | view | raw | blame | history
xdgnjobs/ximple-jobcarrier/src/main/resources/log4j.properties 2 ●●●●● patch | view | raw | blame | history
xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml 6 ●●●● patch | view | raw | blame | history
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/AbstractOracleDatabaseJob.java 5 ●●●●● patch | view | raw | blame | history
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/GeoserverIntegrateConfigJob.java 14 ●●●● patch | view | raw | blame | history
xdgnjobs/ximple-jobcarrier/pom.xml
@@ -18,7 +18,7 @@
  <url>http://maven.apache.org</url>
  <properties>
    <xdgnio.version>1.3.1</xdgnio.version>
    <xdgnio.version>2.0.0</xdgnio.version>
  </properties>
  <scm>
@@ -213,7 +213,7 @@
    <dependency>
      <artifactId>ximple-spatialjob</artifactId>
      <groupId>com.ximple.eofms</groupId>
      <version>${xdgnio.version}</version>
      <version>${project.version}</version>
    </dependency>
  </dependencies>
xdgnjobs/ximple-jobcarrier/quartz_jobs.xml
@@ -31,15 +31,16 @@
      <job-data-map>
        <entry>
          <key>JOBDATA_DIR</key>
          <value>/Users/Shared/Public/Projects/XGeoDMMS/xjobrun/nstpcjobs/jobdata</value>
          <!--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>10.10.1.6</value>
          <value>192.168.11.99</value>
        </entry>
        <entry>
          <key>PGDATBASE</key>
          <value>pgNSTPC</value>
          <value>pgNNTPC</value>
        </entry>
        <entry>
          <key>PGPORT</key>
@@ -59,7 +60,7 @@
        </entry>
        <entry>
          <key>ORAHOST</key>
          <value>10.10.1.7</value>
          <value>10.10.1.3</value>
        </entry>
        <entry>
          <key>ORAINST</key>
@@ -128,7 +129,7 @@
        </entry>
        <entry>
          <key>GEOSERVER_URL</key>
          <value>http://10.10.1.6:8080/geoserver</value>
          <value>http://192.168.11.99:8780/geoserver</value>
        </entry>
        <entry>
          <key>GEOSERVER_USER</key>
xdgnjobs/ximple-jobcarrier/src/main/resources/log4j.properties
@@ -26,3 +26,5 @@
# Print messages of level INFO or above for examples
log4j.logger.org.cavaness.quartzbook=INFO
log4j.logger.com.ximple.eofms=INFO
it.geosolutions.geoserver=INIFO
xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml
@@ -33,7 +33,7 @@
      <job-data-map>
        <entry>
          <key>JOBDATA_DIR</key>
          <value>/mnt/hdisk/home.data/private/projects/xdcad/xjobrun/nstpcjobs/jobdata</value>
          <value>/mnt/hdisk/home.data/private/projects/xdcad/xjobrun/nntpcjobs/jobdata</value>
        </entry>
        <entry>
          <key>PGHOST</key>
@@ -61,7 +61,7 @@
        </entry>
        <entry>
          <key>ORAHOST</key>
          <value>10.10.1.7</value>
          <value>10.10.1.3</value>
        </entry>
        <entry>
          <key>ORAINST</key>
@@ -130,7 +130,7 @@
        </entry>
        <entry>
          <key>GEOSERVER_URL</key>
          <value>http://www.ximple.com.tw/geoserver</value>
          <value>http://192.168.11.99:8780/geoserver</value>
        </entry>
        <entry>
          <key>GEOSERVER_USER</key>
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/AbstractOracleDatabaseJob.java
@@ -497,16 +497,17 @@
        try {
            Statement stmt = connection.createStatement();
            ResultSet rs = stmt.executeQuery(AbstractOracleJobContext.FETCH_TPDATA);
            if (rs.next()) {
            short disId = rs.getShort(1);
            jobContext.setDistId(disId);
            String distName = rs.getString(2);
            jobContext.setDistName(distName);
            }
            rs.close();
            stmt.close();
        } catch (SQLException e) {
            getLogger().warn("HIBERNATE_SEQUENCE is already exist.");
            getLogger().warn("Fetch TPDATA Error.", e);
        }
    }
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/GeoserverIntegrateConfigJob.java
@@ -357,12 +357,18 @@
        PrintfFormat pf = new PrintfFormat(CREATE_VIEWSQL);
        String sql = pf.sprintf(new Object[]{viewName, schemaName, tableName});
        Statement stmt = connection.createStatement();
        try {
        stmt.execute(sql);
        pf = new PrintfFormat(ALTER_VIEWSQL + ownerName);
        sql = pf.sprintf(viewName);
        stmt.execute(sql);
        } catch (SQLException e) {
            // logger.warn(e.getMessage(), e);
            logger.info(sql == null ? "SQL=NULL" : "SQL=" + sql);
            throw e;
        } finally {
        stmt.close();
        }
        // connection.commit();
    }
@@ -468,7 +474,7 @@
        try {
            String currentTargetSchema = retrieveCurrentSchemaName(connection, vsstatusBefore);
            if (currentTargetSchema == null) {
                logger.info("Cannot found target schema in dataStore.");
                logger.info("Cannot found target schema in dataStore. status=" + vsstatusBefore);
                return;
            }
            String existTargetSchema = null;
@@ -851,8 +857,8 @@
            };
            lge.setBounds("EPSG:3826",293838.061931726,2758423.49415501,311845.457747425,2768966.72993585);
            String defaultLayerNames = buildDefaultWMSLayerNames(DEFAULT_NAMESPACE, configs, lge);
            logger.info(key + ":" + defaultLayerNames);
            logger.info(lge.toString());
            // logger.info(key + ":" + defaultLayerNames);
            // logger.info(lge.toString());
            // wmsConfig.getBaseMapLayers().put(key, defaultLayerNames);
            String layerGroupName = key.toString();
            RESTLayerGroup layerGroup = reader.getLayerGroup(DEFAULT_NAMESPACE, layerGroupName);