From 21982bb85c8914edda444adc02baaf763d70ee22 Mon Sep 17 00:00:00 2001
From: ?? ? <ulysseskao@ximple.com.tw>
Date: Wed, 21 Nov 2012 00:51:03 +0800
Subject: [PATCH] update for adas
---
xdgnjobs/ximple-jobcarrier/pom.xml | 34 ++++++++--------
xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml | 10 ++--
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/edbgeo/AbstractDgnToEdbGeoJobContext.java | 3 +
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/AbstractOracleToPostGISJobContext.java | 3 +
xdgnjobs/pom.xml | 10 ++--
xdgnjobs/ximple-elmparser/pom.xml | 2
xdgnjobs/ximple-spatialjob/pom.xml | 2
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/edbgeo/AbstractOracleToEdbGeoJobContext.java | 3 +
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/AbstractDgnToPostGISJobContext.java | 3 +
9 files changed, 37 insertions(+), 33 deletions(-)
diff --git a/xdgnjobs/pom.xml b/xdgnjobs/pom.xml
index 8479399..fae559c 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.5</java5>
- <xdgnio.version>1.2.1</xdgnio.version>
- <gt2.version>2.7.4-1</gt2.version>
+ <xdgnio.version>1.2.2</xdgnio.version>
+ <gt2.version>2.7.5-1</gt2.version>
<failIfNoTests>false</failIfNoTests>
<stress.skip.pattern></stress.skip.pattern>
<online.skip.pattern></online.skip.pattern>
@@ -305,7 +305,7 @@
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
- <version>1.3.160</version>
+ <version>1.3.163</version>
</dependency>
<!-- EnterpriseDB -->
@@ -637,13 +637,13 @@
<uniqueVersion>false</uniqueVersion>
<id>ximple</id>
<name>Ximple - Artifactory lib repo</name>
- <url>dav:http://www.ximple.com.tw/artifactory/libs-releases-local</url>
+ <url>dav:http://www.ximple.com.tw:8180/artifactory/libs-releases-local</url>
</repository>
<snapshotRepository>
<uniqueVersion>false</uniqueVersion>
<id>ximple-snapshots</id>
<name>Ximple - Artifactory lib-snapshots repo</name>
- <url>dav:http://www.ximple.com.tw/artifactory/libs-snapshots-local</url>
+ <url>dav:http://www.ximple.com.tw:8180/artifactory/libs-snapshots-local</url>
</snapshotRepository>
</distributionManagement>
diff --git a/xdgnjobs/ximple-elmparser/pom.xml b/xdgnjobs/ximple-elmparser/pom.xml
index 3a5d661..b22d962 100644
--- a/xdgnjobs/ximple-elmparser/pom.xml
+++ b/xdgnjobs/ximple-elmparser/pom.xml
@@ -5,7 +5,7 @@
<parent>
<groupId>com.ximple.eofms</groupId>
<artifactId>ximple-dgnjobs</artifactId>
- <version>1.2.1</version>
+ <version>1.2.2</version>
</parent>
<groupId>com.ximple.eofms</groupId>
diff --git a/xdgnjobs/ximple-jobcarrier/pom.xml b/xdgnjobs/ximple-jobcarrier/pom.xml
index 6ca938e..a819472 100644
--- a/xdgnjobs/ximple-jobcarrier/pom.xml
+++ b/xdgnjobs/ximple-jobcarrier/pom.xml
@@ -18,7 +18,7 @@
<url>http://maven.apache.org</url>
<properties>
- <xdgnio.version>1.2.1</xdgnio.version>
+ <xdgnio.version>1.2.2</xdgnio.version>
</properties>
<scm>
@@ -53,26 +53,26 @@
<contributors>
</contributors>
-
+
<profiles>
- <profile>
+ <profile>
<id>qa</id>
<build>
<plugins>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <phase>install</phase>
- <goals>
- <goal>copy-dependencies</goal>
- </goals>
- <configuration>
- <outputDirectory>${project.build.directory}/lib</outputDirectory>
- </configuration>
- </execution>
- </executions>
- </plugin>
+ <plugin>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <phase>install</phase>
+ <goals>
+ <goal>copy-dependencies</goal>
+ </goals>
+ <configuration>
+ <outputDirectory>${project.build.directory}/lib</outputDirectory>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
</plugins>
</build>
</profile>
diff --git a/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml b/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml
index a1ae3d4..2974ca1 100644
--- a/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml
+++ b/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml
@@ -30,7 +30,7 @@
<job-data-map>
<entry>
<key>JOBDATA_DIR</key>
- <value>C:\Usr\Projects\XDCAD\nstpcjobs\jobdata</value>
+ <value>C:\Usr\Projects\XDCAD\xjobrun\nntpcjobs\jobdata</value>
</entry>
<entry>
<key>PGHOST</key>
@@ -38,7 +38,7 @@
</entry>
<entry>
<key>PGDATBASE</key>
- <value>pgNSTPC</value>
+ <value>pgNNTPC</value>
</entry>
<entry>
<key>PGPORT</key>
@@ -58,7 +58,7 @@
</entry>
<entry>
<key>ORAHOST</key>
- <value>192.168.11.199</value>
+ <value>192.168.11.99</value>
</entry>
<entry>
<key>ORAINST</key>
@@ -70,11 +70,11 @@
</entry>
<entry>
<key>ORAUSER</key>
- <value>BASEDB</value>
+ <value>system</value>
</entry>
<entry>
<key>ORAPASS</key>
- <value>basedb000</value>
+ <value>simple000</value>
</entry>
<entry>
<key>ORGSCHEMA</key>
diff --git a/xdgnjobs/ximple-spatialjob/pom.xml b/xdgnjobs/ximple-spatialjob/pom.xml
index 44f9989..c64016e 100644
--- a/xdgnjobs/ximple-spatialjob/pom.xml
+++ b/xdgnjobs/ximple-spatialjob/pom.xml
@@ -18,7 +18,7 @@
<url>http://www.ximple.com.tw</url>
<properties>
- <xdgnio.version>1.2.1</xdgnio.version>
+ <xdgnio.version>1.2.2</xdgnio.version>
</properties>
<description>
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/edbgeo/AbstractDgnToEdbGeoJobContext.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/edbgeo/AbstractDgnToEdbGeoJobContext.java
index f72012a..3172de7 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/edbgeo/AbstractDgnToEdbGeoJobContext.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/edbgeo/AbstractDgnToEdbGeoJobContext.java
@@ -320,7 +320,8 @@
sql.append(encodeSchemaTableName(tableName));
sql.append(" USING GIST (");
sql.append(encodeSchemaColumnName(descriptor.getLocalName()));
- sql.append(" gist_geometry_ops);");
+ sql.append(" );");
+ // sql.append(" gist_geometry_ops);");
sqlStr = sql.toString();
getLogger().debug(sqlStr);
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/edbgeo/AbstractOracleToEdbGeoJobContext.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/edbgeo/AbstractOracleToEdbGeoJobContext.java
index b8c3ac2..03c27fe 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/edbgeo/AbstractOracleToEdbGeoJobContext.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/edbgeo/AbstractOracleToEdbGeoJobContext.java
@@ -316,7 +316,8 @@
sql.append(encodeSchemaTableName(tableName));
sql.append(" USING GIST (");
sql.append(encodeSchemaColumnName(descriptor.getLocalName()));
- sql.append(" gist_geometry_ops);");
+ sql.append(" );");
+ // sql.append(" gist_geometry_ops);");
sqlStr = sql.toString();
getLogger().debug(sqlStr);
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/AbstractDgnToPostGISJobContext.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/AbstractDgnToPostGISJobContext.java
index 2827b59..c0e2e5a 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/AbstractDgnToPostGISJobContext.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/AbstractDgnToPostGISJobContext.java
@@ -320,7 +320,8 @@
sql.append(encodeSchemaTableName(tableName));
sql.append(" USING GIST (");
sql.append(encodeSchemaColumnName(descriptor.getLocalName()));
- sql.append(" gist_geometry_ops);");
+ sql.append(" );");
+ // sql.append(" gist_geometry_ops);");
sqlStr = sql.toString();
getLogger().debug(sqlStr);
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/AbstractOracleToPostGISJobContext.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/AbstractOracleToPostGISJobContext.java
index 6350890..d88fabd 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/AbstractOracleToPostGISJobContext.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/jobs/context/postgis/AbstractOracleToPostGISJobContext.java
@@ -316,7 +316,8 @@
sql.append(encodeSchemaTableName(tableName));
sql.append(" USING GIST (");
sql.append(encodeSchemaColumnName(descriptor.getLocalName()));
- sql.append(" gist_geometry_ops);");
+ sql.append(" );");
+ // sql.append(" gist_geometry_ops);");
sqlStr = sql.toString();
getLogger().debug(sqlStr);
--
Gitblit v0.0.0-SNAPSHOT