From 117f9eb43242f85926393006d05659a008bcd741 Mon Sep 17 00:00:00 2001
From: Dennis Kao <ulysseskao@gmail.com>
Date: Thu, 14 Nov 2013 12:35:19 +0800
Subject: [PATCH] update fix bug
---
xdgnjobs/ximple-jobcarrier/pom.xml | 34 +++++++++++++++-
xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml | 10 ++--
xdgnjobs/pom.xml | 16 ++++++-
xdgnjobs/ximple-build/pom.xml | 4 +-
xdgnjobs/ximple-dgnio/src/test/java/com/ximple/io/dgn7/Dgn7OracleReaderTest.java | 2
xdgnjobs/ximple-build/maven/pom.xml | 2
xdgnjobs/ximple-build/maven/jar-collector/pom.xml | 2
xdgnjobs/ximple-dgnio/pom.xml | 4 +-
xdgnjobs/ximple-elmparser/pom.xml | 4 +-
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/GeoserverIntegrateConfigJob.java | 2
xdgnjobs/ximple-dgnio/src/test/java/com/ximple/io/dgn7/OracleTarget.java | 4 +-
xdgnjobs/ximple-spatialjob/pom.xml | 6 +-
12 files changed, 64 insertions(+), 26 deletions(-)
diff --git a/xdgnjobs/pom.xml b/xdgnjobs/pom.xml
index eadbcff..6aa3b9d 100644
--- a/xdgnjobs/pom.xml
+++ b/xdgnjobs/pom.xml
@@ -18,8 +18,8 @@
<test.maxHeapSize>512M</test.maxHeapSize>
<src.output>${basedir}/target</src.output>
<java5>1.6</java5>
- <xdgnio.version>2.0.0</xdgnio.version>
- <gt.version>10.0.x</gt.version>
+ <xdgnio.version>2.0.1</xdgnio.version>
+ <gt.version>10.1.x</gt.version>
<failIfNoTests>false</failIfNoTests>
<stress.skip.pattern></stress.skip.pattern>
<online.skip.pattern></online.skip.pattern>
@@ -65,7 +65,7 @@
<groupId>com.ximple.eofms</groupId>
<artifactId>ximple-dgnjobs</artifactId>
<packaging>pom</packaging>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<name>ximple-dgnjobs</name>
<url>http://www.ximple.com.tw</url>
@@ -205,6 +205,16 @@
</dependency>
<dependency>
<groupId>org.geotools</groupId>
+ <artifactId>gt-opengis</artifactId>
+ <version>${gt.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.geotools</groupId>
+ <artifactId>gt-metadata</artifactId>
+ <version>${gt.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.geotools</groupId>
<artifactId>gt-jdbc</artifactId>
<version>${gt.version}</version>
</dependency>
diff --git a/xdgnjobs/ximple-build/maven/jar-collector/pom.xml b/xdgnjobs/ximple-build/maven/jar-collector/pom.xml
index d79f6cb..cf59bb9 100644
--- a/xdgnjobs/ximple-build/maven/jar-collector/pom.xml
+++ b/xdgnjobs/ximple-build/maven/jar-collector/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>com.ximple.eofms.maven</groupId>
<artifactId>ximple-maven</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
</parent>
diff --git a/xdgnjobs/ximple-build/maven/pom.xml b/xdgnjobs/ximple-build/maven/pom.xml
index 582c130..e954dd3 100644
--- a/xdgnjobs/ximple-build/maven/pom.xml
+++ b/xdgnjobs/ximple-build/maven/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>com.ximple.eofms.maven</groupId>
<artifactId>ximple-build</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
</parent>
diff --git a/xdgnjobs/ximple-build/pom.xml b/xdgnjobs/ximple-build/pom.xml
index b2fba94..c4dd12b 100644
--- a/xdgnjobs/ximple-build/pom.xml
+++ b/xdgnjobs/ximple-build/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>com.ximple.eofms</groupId>
<artifactId>ximple-dgnjobs</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
</parent>
@@ -16,7 +16,7 @@
<!-- =========================================================== -->
<groupId>com.ximple.eofms.maven</groupId>
<artifactId>ximple-build</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<packaging>pom</packaging>
<name>Build tools for Ximple DgnJobs</name>
diff --git a/xdgnjobs/ximple-dgnio/pom.xml b/xdgnjobs/ximple-dgnio/pom.xml
index 2bd3947..24e0823 100644
--- a/xdgnjobs/ximple-dgnio/pom.xml
+++ b/xdgnjobs/ximple-dgnio/pom.xml
@@ -7,7 +7,7 @@
<parent>
<groupId>com.ximple.eofms</groupId>
<artifactId>ximple-dgnjobs</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
</parent>
<!-- =========================================================== -->
@@ -15,7 +15,7 @@
<!-- =========================================================== -->
<groupId>com.ximple.eofms</groupId>
<artifactId>ximple-dgnio</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<packaging>jar</packaging>
<name>ximple-dgnio</name>
<url>http://www.ximple.com.tw</url>
diff --git a/xdgnjobs/ximple-dgnio/src/test/java/com/ximple/io/dgn7/Dgn7OracleReaderTest.java b/xdgnjobs/ximple-dgnio/src/test/java/com/ximple/io/dgn7/Dgn7OracleReaderTest.java
index 0996150..b792260 100644
--- a/xdgnjobs/ximple-dgnio/src/test/java/com/ximple/io/dgn7/Dgn7OracleReaderTest.java
+++ b/xdgnjobs/ximple-dgnio/src/test/java/com/ximple/io/dgn7/Dgn7OracleReaderTest.java
@@ -24,7 +24,7 @@
}
- @Test
+ // @Test
public void testOracleReader() throws SQLException, IOException {
OracleConnection connection = OracleTarget.getInstance().getOracleConnection();
// String fetchSrcStmtFmt = "SELECT IGDSELM FROM \"%s\".\"%s\" ORDER BY ROWID";
diff --git a/xdgnjobs/ximple-dgnio/src/test/java/com/ximple/io/dgn7/OracleTarget.java b/xdgnjobs/ximple-dgnio/src/test/java/com/ximple/io/dgn7/OracleTarget.java
index 46ae455..49c74e2 100644
--- a/xdgnjobs/ximple-dgnio/src/test/java/com/ximple/io/dgn7/OracleTarget.java
+++ b/xdgnjobs/ximple-dgnio/src/test/java/com/ximple/io/dgn7/OracleTarget.java
@@ -42,8 +42,8 @@
private OracleTarget() {
properties = new Properties();
- properties.put(_propUsrKey, "SPATIALDB");
- properties.put(_propPassKey, "SPATIALDB000");
+ properties.put(_propUsrKey, "system");
+ properties.put(_propPassKey, "simple000");
}
public static String getOracleHost() {
diff --git a/xdgnjobs/ximple-elmparser/pom.xml b/xdgnjobs/ximple-elmparser/pom.xml
index ec922b0..39070a3 100644
--- a/xdgnjobs/ximple-elmparser/pom.xml
+++ b/xdgnjobs/ximple-elmparser/pom.xml
@@ -5,12 +5,12 @@
<parent>
<groupId>com.ximple.eofms</groupId>
<artifactId>ximple-dgnjobs</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
</parent>
<groupId>com.ximple.eofms</groupId>
<artifactId>ximple-elmparser</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<packaging>jar</packaging>
<name>ximple-elmparser</name>
<url>http://maven.apache.org</url>
diff --git a/xdgnjobs/ximple-jobcarrier/pom.xml b/xdgnjobs/ximple-jobcarrier/pom.xml
index de095cc..e840c8f 100644
--- a/xdgnjobs/ximple-jobcarrier/pom.xml
+++ b/xdgnjobs/ximple-jobcarrier/pom.xml
@@ -6,19 +6,19 @@
<parent>
<groupId>com.ximple.eofms</groupId>
<artifactId>ximple-dgnjobs</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
</parent>
<groupId>com.ximple.eofms</groupId>
<artifactId>ximple-jobcarrier</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<packaging>jar</packaging>
<name>ximple-jobcarrier</name>
<url>http://maven.apache.org</url>
<properties>
- <xdgnio.version>2.0.0</xdgnio.version>
+ <xdgnio.version>2.0.1</xdgnio.version>
</properties>
<scm>
@@ -85,6 +85,16 @@
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.quartz-scheduler</groupId>
+ <artifactId>quartz-jobs</artifactId>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -120,6 +130,10 @@
</dependency>
<dependency>
<groupId>org.geotools</groupId>
+ <artifactId>gt-opengis</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.geotools</groupId>
<artifactId>gt-jdbc</artifactId>
</dependency>
<dependency>
@@ -133,6 +147,14 @@
<dependency>
<groupId>org.geotools.jdbc</groupId>
<artifactId>gt-jdbc-mysql</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.geotools</groupId>
+ <artifactId>gt-opengis</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.geotools</groupId>
+ <artifactId>gt-metadata</artifactId>
</dependency>
<!-- because main and sample-data depend on referencing we need a tie breaker -->
@@ -204,6 +226,12 @@
<artifactId>awl</artifactId>
</dependency>
+ <dependency>
+ <groupId>xml-apis</groupId>
+ <artifactId>xml-apis</artifactId>
+ <version>1.4.01</version>
+ </dependency>
+
<!-- Ximple Library -->
<dependency>
<artifactId>ximple-dgnio</artifactId>
diff --git a/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml b/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml
index e16c496..95903c7 100644
--- a/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml
+++ b/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml
@@ -33,15 +33,15 @@
<job-data-map>
<entry>
<key>JOBDATA_DIR</key>
- <value>/mnt/hdisk/home.data/private/projects/xdcad/xjobrun/nntpcjobs/jobdata</value>
+ <value>/Users/Shared/Public/Projects/XGeoDMMS/xjobrun/nntpcjobs/jobdata</value>
</entry>
<entry>
<key>PGHOST</key>
- <value>192.168.11.99</value>
+ <value>10.10.1.7</value>
</entry>
<entry>
<key>PGDATBASE</key>
- <value>pgNNTPC</value>
+ <value>pgDMMS</value>
</entry>
<entry>
<key>PGPORT</key>
@@ -61,7 +61,7 @@
</entry>
<entry>
<key>ORAHOST</key>
- <value>10.10.1.3</value>
+ <value>10.10.1.7</value>
</entry>
<entry>
<key>ORAINST</key>
@@ -130,7 +130,7 @@
</entry>
<entry>
<key>GEOSERVER_URL</key>
- <value>http://192.168.11.99:8780/geoserver</value>
+ <value>http://10.10.1.7:8080/geoserver</value>
</entry>
<entry>
<key>GEOSERVER_USER</key>
diff --git a/xdgnjobs/ximple-spatialjob/pom.xml b/xdgnjobs/ximple-spatialjob/pom.xml
index 037041c..1a43df5 100644
--- a/xdgnjobs/ximple-spatialjob/pom.xml
+++ b/xdgnjobs/ximple-spatialjob/pom.xml
@@ -7,18 +7,18 @@
<parent>
<groupId>com.ximple.eofms</groupId>
<artifactId>ximple-dgnjobs</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
</parent>
<groupId>com.ximple.eofms</groupId>
<artifactId>ximple-spatialjob</artifactId>
- <version>2.0.0</version>
+ <version>2.0.1</version>
<packaging>jar</packaging>
<name>ximple-spatialjob</name>
<url>http://www.ximple.com.tw</url>
<properties>
- <xdgnio.version>2.0.0</xdgnio.version>
+ <xdgnio.version>2.0.1</xdgnio.version>
</properties>
<description>
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/GeoserverIntegrateConfigJob.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/GeoserverIntegrateConfigJob.java
index 5e2aa03..ce4124f 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/GeoserverIntegrateConfigJob.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/GeoserverIntegrateConfigJob.java
@@ -160,7 +160,7 @@
}
logger.info("-- step:resetGeoServerConfig --");
tStep = System.currentTimeMillis();
- resetGeoServerConfig(jobExecutionContext);
+ // resetGeoServerConfig(jobExecutionContext);
if (isProfileMode()) {
long tStepEnd = System.currentTimeMillis();
logTimeDiff("Profile-resetGeoServerConfig", tStep, tStepEnd);
--
Gitblit v0.0.0-SNAPSHOT