From fc9880cd77a09dcfdea2791dee418f54f5721cf3 Mon Sep 17 00:00:00 2001
From: Dennis Kao <ulysseskao@ximple.com.tw>
Date: Wed, 05 Jun 2013 11:32:43 +0800
Subject: [PATCH] update JarCollector
---
xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/Lock.java | 2
xdgnjobs/ximple-jobcarrier/pom.xml | 6 +
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/postjts/JtsWrapper.java | 5 +
xdgnjobs/ximple-dgnio/pom.xml | 2
xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/UserAttributeData.java | 2
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/TWDDatumConverter.java | 13 ---
xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/FrammeAttributeData.java | 2
xdgnjobs/pom.xml | 25 +++---
xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/GeometryConverter.java | 2
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/TPCLIDConverter.java | 8 +-
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/BinConverter.java | 1
xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/StreamLogging.java | 2
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/LangUtil.java | 1
xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/Dgn7OracleReader.java | 2
xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/Dgn7fileHeader.java | 2
xdgnjobs/ximple-dgnio/src/test/java/com/ximple/io/dgn7/OracleTarget.java | 4
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/GeomUtil.java | 1
xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/ComplexElement.java | 2
xdgnjobs/ximple-build/maven/jar-collector/src/main/java/com/ximple/eofms/maven/JarCollector.java | 49 +++++-------
xdgnjobs/ximple-jobcarrier/src/main/resources/com/ximple/eofms/XQuartzJobWizard_zh_TW.properties | 12 +-
xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml | 10 +-
/dev/null | 0
xdgnjobs/ximple-dgnio/src/main/java/com/ximple/util/DgnUtility.java | 2
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/postjts/JtsGisWrapper.java | 6 +
xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/ByteArrayCompressor.java | 1
xdgnjobs/ximple-jobcarrier/quartz_jobs.xml | 37 ++++----
26 files changed, 95 insertions(+), 104 deletions(-)
diff --git a/xdgnjobs/pom.xml b/xdgnjobs/pom.xml
index fe8c072..0872296 100644
--- a/xdgnjobs/pom.xml
+++ b/xdgnjobs/pom.xml
@@ -19,7 +19,7 @@
<src.output>${basedir}/target</src.output>
<java5>1.6</java5>
<xdgnio.version>1.3.0</xdgnio.version>
- <gt.version>8.4.x</gt.version>
+ <gt.version>9.2.x</gt.version>
<failIfNoTests>false</failIfNoTests>
<stress.skip.pattern></stress.skip.pattern>
<online.skip.pattern></online.skip.pattern>
@@ -57,9 +57,9 @@
<scm>
<connection>
- scm:svn:http://www.ximple.com.tw:8079/svn/xeofms/xspatialjob/truck/
+ scm:svn:http://www.ximple.com.tw/svn/xeofms/xspatialjob/truck/
</connection>
- <url>http://www.ximple.com.tw:8079/svn/xeofms/xspatialjob/truck/</url>
+ <url>http://www.ximple.com.tw/svn/xeofms/xspatialjob/truck/</url>
</scm>
<groupId>com.ximple.eofms</groupId>
@@ -161,13 +161,13 @@
<dependency>
<groupId>log4j</groupId>
<artifactId>log4j</artifactId>
- <version>1.2.16</version>
+ <version>1.2.17</version>
<!-- Same as the dependency in commons-logging -->
</dependency>
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi</artifactId>
- <version>3.8</version>
+ <version>3.9</version>
</dependency>
<!-- geotools -->
@@ -298,7 +298,7 @@
<dependency>
<groupId>org.postgis</groupId>
<artifactId>postgis-driver</artifactId>
- <version>1.5.3</version>
+ <version>2.0.2</version>
</dependency>
<!--dependency>
@@ -324,7 +324,7 @@
<dependency>
<groupId>org.quartz-scheduler</groupId>
<artifactId>quartz</artifactId>
- <version>2.1.6</version>
+ <version>2.1.7</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
@@ -357,7 +357,7 @@
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
- <version>6.8</version>
+ <version>6.8.5</version>
<scope>test</scope>
</dependency>
</dependencies>
@@ -499,9 +499,9 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <source>1.5</source>
+ <source>1.6</source>
<!-- The -source argument for the Java compiler. -->
- <target>1.5</target>
+ <target>1.6</target>
<!-- The -target argument for the Java compiler. -->
<debug>true</debug>
<!-- Whether to include debugging information. -->
@@ -517,6 +517,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
+ <version>2.14.1</version>
<configuration>
<includes>
<include>**/*Test.java</include>
@@ -642,13 +643,13 @@
<uniqueVersion>false</uniqueVersion>
<id>ximple</id>
<name>Ximple - Artifactory lib repo</name>
- <url>dav:http://www.ximple.com.tw:8180/artifactory/libs-releases-local</url>
+ <url>dav:http://www.ximple.com.tw/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:8180/artifactory/libs-snapshots-local</url>
+ <url>dav:http://www.ximple.com.tw/artifactory/libs-snapshots-local</url>
</snapshotRepository>
</distributionManagement>
diff --git a/xdgnjobs/ximple-build/maven/jar-collector/src/main/java/com/ximple/eofms/maven/JarCollector.java b/xdgnjobs/ximple-build/maven/jar-collector/src/main/java/com/ximple/eofms/maven/JarCollector.java
index ecd6b30..2aeb460 100644
--- a/xdgnjobs/ximple-build/maven/jar-collector/src/main/java/com/ximple/eofms/maven/JarCollector.java
+++ b/xdgnjobs/ximple-build/maven/jar-collector/src/main/java/com/ximple/eofms/maven/JarCollector.java
@@ -55,14 +55,6 @@
private String jarName;
/**
- * Project dependencies.
- *
- * @parameter expression="${project.artifacts}"
- * @required
- */
- private Set /*<Artifact>*/ dependencies;
-
- /**
* The Maven project running this plugin.
*
* @parameter expression="${project}"
@@ -118,7 +110,7 @@
if (!collect.exists()) {
if (!collect.mkdir()) {
- throw new MojoExecutionException("Failed to create target directory.");
+ throw new MojoExecutionException("Failed to create target directory: " + collect.getAbsolutePath());
}
}
@@ -145,29 +137,30 @@
int count = 1;
FileUtils.copyFileToDirectory(jarFile, collect);
-
+ Set<Artifact> dependencies = project.getDependencyArtifacts();
if (dependencies != null) {
- for (final Iterator it = dependencies.iterator(); it.hasNext();) {
- final Artifact artifact = (Artifact) it.next();
+ for (final Artifact artifact : dependencies) {
+ System.out.println("+++++++++++++++++++++++ DEP: " + artifact.getDependencyTrail());
final String scope = artifact.getScope();
-
- if ((scope != null) // Maven 2.0.6 bug?
- && (scope.equalsIgnoreCase(Artifact.SCOPE_COMPILE)
- || scope.equalsIgnoreCase(Artifact.SCOPE_RUNTIME))) {
+ if (scope != null && // Maven 2.0.6 bug?
+ (scope.equalsIgnoreCase(Artifact.SCOPE_COMPILE) ||
+ scope.equalsIgnoreCase(Artifact.SCOPE_RUNTIME)))
+ {
final File file = artifact.getFile();
- final File copy = new File(collect, file.getName());
-
- if (!copy.exists()) {
- /*
- * Copies the dependency only if it was not already copied. Note that
- * the module's JAR was copied inconditionnaly above (because it may
- * be the result of a new compilation). If a Geotools JAR from the
- * dependencies list changed, it will be copied inconditionnaly when
- * the module for this JAR will be processed by Maven.
- */
- FileUtils.copyFileToDirectory(file, collect);
- count++;
+ if (!artifact.getGroupId().startsWith("com.ximple.eofms")) {
+ final File copy = new File(collect, file.getName());
+ if (copy.exists()) {
+ /*
+ * Copies the dependency only if it was not already copied. Note that
+ * the module's JAR was copied inconditionnaly above (because it may
+ * be the result of a new compilation). If a Geotools JAR from the
+ * dependencies list changed, it will be copied inconditionnaly when
+ * the module for this JAR will be processed by Maven.
+ */
+ continue;
+ }
}
+ FileUtils.copyFileToDirectory(file, collect);
}
}
}
diff --git a/xdgnjobs/ximple-dgnio/pom.xml b/xdgnjobs/ximple-dgnio/pom.xml
index 9fe8352..952804d 100644
--- a/xdgnjobs/ximple-dgnio/pom.xml
+++ b/xdgnjobs/ximple-dgnio/pom.xml
@@ -74,7 +74,7 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <version>2.1</version>
+ <version>2.4</version>
<scope>test</scope>
</dependency>
</dependencies>
diff --git a/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/ComplexElement.java b/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/ComplexElement.java
index b1cc520..42dc018 100644
--- a/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/ComplexElement.java
+++ b/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/ComplexElement.java
@@ -9,7 +9,7 @@
*
* @author Ulysses
* @version 0.1
- * @since 2006/5/18 �U�� 04:17:37
+ * @since 2006/5/18
*/
public interface ComplexElement extends List<Element> {
}
diff --git a/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/Dgn7OracleReader.java b/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/Dgn7OracleReader.java
index 40be619..189c289 100644
--- a/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/Dgn7OracleReader.java
+++ b/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/Dgn7OracleReader.java
@@ -19,7 +19,7 @@
* Dgn7OracleReader
* User: Ulysses
* Date: 2007/10/24
- * Time: �U�� 01:01:08
+ * Time:
*/
public class Dgn7OracleReader implements Iterator<Element> {
private final static Logger logger = Logger.getLogger(Dgn7OracleReader.class);
diff --git a/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/Dgn7fileHeader.java b/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/Dgn7fileHeader.java
index 5233a28..ca59edf 100644
--- a/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/Dgn7fileHeader.java
+++ b/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/Dgn7fileHeader.java
@@ -13,7 +13,7 @@
*
* @author Ulysses
* @version 0.1
- * @since 2006/5/17 �U�� 01:21:00
+ * @since 2006/5/17
*/
public class Dgn7fileHeader {
private short elmtype;
diff --git a/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/FrammeAttributeData.java b/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/FrammeAttributeData.java
index 4458937..b7ea2bb 100644
--- a/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/FrammeAttributeData.java
+++ b/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/FrammeAttributeData.java
@@ -5,7 +5,7 @@
*
* @author Ulysses
* @version 0.1
- * @since 2006/5/18 �U�� 06:36:55
+ * @since 2006/5/18
*/
public class FrammeAttributeData extends UserAttributeData {
public FrammeAttributeData(short id) {
diff --git a/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/GeometryConverter.java b/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/GeometryConverter.java
index 72f11fe..5f82888 100644
--- a/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/GeometryConverter.java
+++ b/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/GeometryConverter.java
@@ -10,7 +10,7 @@
*
* @author Ulysses
* @version 0.1
- * @since 2006/5/18 �W�� 11:38:57
+ * @since 2006/5/18
*/
public interface GeometryConverter {
public Geometry toGeometry(GeometryFactory factory);
diff --git a/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/Lock.java b/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/Lock.java
index a92c304..2bd43f6 100644
--- a/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/Lock.java
+++ b/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/Lock.java
@@ -14,7 +14,7 @@
*
* @author Ulysses
* @version 0.1
- * @since 2006/5/18 �W�� 10:27:24
+ * @since 2006/5/18
*/
public class Lock {
Logger logger = LogManager.getLogger("com.ximple.io.dgn7");
diff --git a/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/StreamLogging.java b/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/StreamLogging.java
index 33f797a..04d0673 100644
--- a/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/StreamLogging.java
+++ b/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/StreamLogging.java
@@ -10,7 +10,7 @@
*
* @author Ulysses
* @version 0.1
- * @since 2006/5/18 �W�� 10:31:08
+ * @since 2006/5/18
*/
public class StreamLogging {
private static final Logger LOGGER = LogManager.getLogger("com.ximple.io.dgn7");
diff --git a/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/UserAttributeData.java b/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/UserAttributeData.java
index 748ec07..c14aa67 100644
--- a/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/UserAttributeData.java
+++ b/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/io/dgn7/UserAttributeData.java
@@ -5,7 +5,7 @@
*
* @author Ulysses
* @version 0.1
- * @since 2006/5/18 �U�� 02:29:29
+ * @since 2006/5/18
*/
public class UserAttributeData {
protected short[] _src;
diff --git a/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/util/DgnUtility.java b/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/util/DgnUtility.java
index 7e03eb2..2ed1f27 100644
--- a/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/util/DgnUtility.java
+++ b/xdgnjobs/ximple-dgnio/src/main/java/com/ximple/util/DgnUtility.java
@@ -12,7 +12,7 @@
*
* @author Ulysses
* @version 0.1
- * @since 2006/5/18 �U�� 01:33:00
+ * @since 2006/5/18
*/
public final class DgnUtility {
private static final Logger logger = Logger.getLogger(DgnUtility.class);
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 7580a8d..46ae455 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
@@ -25,8 +25,8 @@
private static final String ORACLE_URL = "jdbc:oracle:thin:@";
private static final String _propUsrKey = "user";
private static final String _propPassKey = "password";
- private static String _oracleHost = "192.168.11.199";
- private static String _oracleInstance = "NNTPC";
+ private static String _oracleHost = "10.10.1.7";
+ private static String _oracleInstance = "ORCL";
private static String _oraclePort = "1521";
static {
diff --git a/xdgnjobs/ximple-dgnio/src/test/resources/com/ximple/io/dgn7/test-data/Demo.dgn b/xdgnjobs/ximple-dgnio/src/test/resources/com/ximple/io/dgn7/test-data/Demo.dgn
deleted file mode 100644
index d749f68..0000000
--- a/xdgnjobs/ximple-dgnio/src/test/resources/com/ximple/io/dgn7/test-data/Demo.dgn
+++ /dev/null
Binary files differ
diff --git a/xdgnjobs/ximple-jobcarrier/pom.xml b/xdgnjobs/ximple-jobcarrier/pom.xml
index 5f5a6c2..8d27fc8 100644
--- a/xdgnjobs/ximple-jobcarrier/pom.xml
+++ b/xdgnjobs/ximple-jobcarrier/pom.xml
@@ -287,7 +287,7 @@
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>native2ascii-maven-plugin</artifactId>
- <version>1.0-alpha-1</version>
+ <version>1.0-beta-1</version>
<configuration>
<dest>target/classes/com/ximple/eofms</dest>
<src>src/main/resources/com/ximple/eofms</src>
@@ -300,7 +300,9 @@
</goals>
<configuration>
<encoding>UTF8</encoding>
- <includes>XQuartzJobWizard_zh*.properties</includes>
+ <includes>
+ <include>XQuartzJobWizard_zh*.properties</include>
+ </includes>
</configuration>
</execution>
</executions>
diff --git a/xdgnjobs/ximple-jobcarrier/quartz_jobs.xml b/xdgnjobs/ximple-jobcarrier/quartz_jobs.xml
index 9813c4d..1bd14c2 100644
--- a/xdgnjobs/ximple-jobcarrier/quartz_jobs.xml
+++ b/xdgnjobs/ximple-jobcarrier/quartz_jobs.xml
@@ -1,21 +1,21 @@
<?xml version='1.0' encoding='utf-8'?>
<job-scheduling-data xmlns="http://www.quartz-scheduler.org/xml/JobSchedulingData"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.quartz-scheduler.org/xml/JobSchedulingData http://www.quartz-scheduler.org/xml/job_scheduling_data_1_8.xsd"
- version="1.8">
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://www.quartz-scheduler.org/xml/JobSchedulingData http://www.quartz-scheduler.org/xml/job_scheduling_data_1_8.xsd"
+ 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 -->
- </pre-processing-commands>
+ <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 -->
+ </pre-processing-commands>
- <processing-directives>
- <!-- if there are any jobs/trigger in scheduler of same name (as in this file), overwrite them -->
- <overwrite-existing-data>true</overwrite-existing-data>
- <!-- if there are any jobs/trigger in scheduler of same name (as in this file), and over-write is false, ignore them rather then generating an error -->
- <ignore-duplicates>false</ignore-duplicates>
- </processing-directives>
+ <processing-directives>
+ <!-- if there are any jobs/trigger in scheduler of same name (as in this file), overwrite them -->
+ <overwrite-existing-data>true</overwrite-existing-data>
+ <!-- if there are any jobs/trigger in scheduler of same name (as in this file), and over-write is false, ignore them rather then generating an error -->
+ <ignore-duplicates>false</ignore-duplicates>
+ </processing-directives>
<schedule>
<job>
@@ -30,15 +30,15 @@
<job-data-map>
<entry>
<key>JOBDATA_DIR</key>
- <value>~/Projects/XDCAD/xjobrun/nntpcjobs/jobdata</value>
+ <value>/mnt/hdisk/home.data/private/projects/xdcad/xjobrun/nstpcjobs/jobdata</value>
</entry>
<entry>
<key>PGHOST</key>
- <value>192.168.11.99</value>
+ <value>10.10.1.6</value>
</entry>
<entry>
<key>PGDATBASE</key>
- <value>pgNNTPC</value>
+ <value>pgNSTPC</value>
</entry>
<entry>
<key>PGPORT</key>
@@ -58,11 +58,11 @@
</entry>
<entry>
<key>ORAHOST</key>
- <value>192.168.11.99</value>
+ <value>10.10.1.7</value>
</entry>
<entry>
<key>ORAINST</key>
- <value>nntpc</value>
+ <value>orcl</value>
</entry>
<entry>
<key>ORAPORT</key>
@@ -78,6 +78,7 @@
</entry>
<entry>
<key>ORGSCHEMA</key>
+ <!--value>SPATIALDB</value-->
<value>SPATIALDB, CMMS_SPATIALDB</value>
</entry>
<entry>
diff --git a/xdgnjobs/ximple-jobcarrier/src/main/resources/com/ximple/eofms/XQuartzJobWizard_zh_TW.properties b/xdgnjobs/ximple-jobcarrier/src/main/resources/com/ximple/eofms/XQuartzJobWizard_zh_TW.properties
index 0323202..80e1bf3 100644
--- a/xdgnjobs/ximple-jobcarrier/src/main/resources/com/ximple/eofms/XQuartzJobWizard_zh_TW.properties
+++ b/xdgnjobs/ximple-jobcarrier/src/main/resources/com/ximple/eofms/XQuartzJobWizard_zh_TW.properties
@@ -1,23 +1,23 @@
title=Ximple Quartz Job Wizard
-first.title=�Ŷ�����ഫ
-first.description=�Ŷ�����ഫ�N�|Ū�� OMS/CMMS �Ŷ���Ʈw���e�ഫ�� PostGIS �Ŷ���Ʈw
+first.title=空間資料轉換
+first.description=空間資料轉換將會讀取 OMS/CMMS 空間資料庫內容轉換至 PostGIS 空間資料庫
first.label.text=<html>This wizard will not install anything on your computer.<br/>It only demonstrates <b>Awl</b> functionnalities.</html>
-second.title=���v�n��
+second.title=版權聲明
second.description=Accept the license of this software
second.licenseAccepted=I accept the terms of this license agreement
second.licenseRefused=I do not accept the terms of this license agreement
second.messageContent=Accept the terms of the license
-third.title=�պA�]�w��m
+third.title=組態設定位置
third.description=Select the location where to install this software
third.label.text=Install location
third.fileChooser.selectLabel=Select
third.fileChooser.description=Select
third.messageContent=You must choose a valid location
-fourth.title=�}�l����...
+fourth.title=開始轉檔...
fourth.description=Installation progress
fourth.inProgress.text=Installation in progress...
-fourth.finished.text=Installation finished
+fourth.finished.text=Installation finished
\ No newline at end of file
diff --git a/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml b/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml
index d2a8428..c001564 100644
--- a/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml
+++ b/xdgnjobs/ximple-jobcarrier/src/main/resources/quartz_jobs.xml
@@ -30,15 +30,15 @@
<job-data-map>
<entry>
<key>JOBDATA_DIR</key>
- <value>/Users/ulysseskao/Projects/XDCAD/xjobrun/nntpcjobs/jobdata</value>
+ <value>/mnt/hdisk/home.data/private/projects/xdcad/xjobrun/nstpcjobs/jobdata</value>
</entry>
<entry>
<key>PGHOST</key>
- <value>192.168.11.99</value>
+ <value>10.10.1.6</value>
</entry>
<entry>
<key>PGDATBASE</key>
- <value>pgNNTPC</value>
+ <value>pgNSTPC</value>
</entry>
<entry>
<key>PGPORT</key>
@@ -58,11 +58,11 @@
</entry>
<entry>
<key>ORAHOST</key>
- <value>192.168.11.99</value>
+ <value>10.10.1.7</value>
</entry>
<entry>
<key>ORAINST</key>
- <value>nntpc</value>
+ <value>orcl</value>
</entry>
<entry>
<key>ORAPORT</key>
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/BinConverter.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/BinConverter.java
index 293119c..cce5008 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/BinConverter.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/BinConverter.java
@@ -10,7 +10,6 @@
* BinConverter
* User: Ulysses
* Date: 2007/9/17
- * Time: �W�� 01:13:13
*/
public class BinConverter {
// our table for binhex conversion
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/ByteArrayCompressor.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/ByteArrayCompressor.java
index ab015f9..22e1be5 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/ByteArrayCompressor.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/ByteArrayCompressor.java
@@ -12,7 +12,6 @@
* ByteArrayCompressor
* User: Ulysses
* Date: 2007/6/15
- * Time: �U�� 02:21:00
* To change this template use File | Settings | File Templates.
*/
public final class ByteArrayCompressor {
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/GeomUtil.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/GeomUtil.java
index d55a3c0..2a13867 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/GeomUtil.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/GeomUtil.java
@@ -7,7 +7,6 @@
* Created by IntelliJ IDEA.
* User: Ulysses
* Date: 2007/6/15
- * Time: �W�� 01:20:20
* To change this template use File | Settings | File Templates.
*/
public final class GeomUtil {
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/LangUtil.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/LangUtil.java
index 5cfe502..6c9a245 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/LangUtil.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/LangUtil.java
@@ -13,7 +13,6 @@
* Created by IntelliJ IDEA.
* User: Ulysses
* Date: 2007/6/15
- * Time: �W�� 01:21:25
* To change this template use File | Settings | File Templates.
*/
public class LangUtil {
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/TPCLIDConverter.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/TPCLIDConverter.java
index 61a2eb7..907cc5c 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/TPCLIDConverter.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/TPCLIDConverter.java
@@ -604,7 +604,7 @@
Point.y = 2500000;
break;
}
- case 83: //���� S
+ case 83: // S
{
Point.x = 10000;
Point.y = 2894000;
@@ -634,19 +634,19 @@
Point.y = 2400000;
break;
}
- case 88: //��� X
+ case 88: //X
{
Point.x = 10000;
Point.y = 2614000;
break;
}
- case 89: //��� Y
+ case 89: //Y
{
Point.x = 10000;
Point.y = 2564000;
break;
}
- case 90: //���� ��Z
+ case 90: //Z
{
Point.x = (xMapId < 51) ? 90000 : 10000;
Point.y = 2675800;
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/TWDDatumConverter.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/TWDDatumConverter.java
index 494d163..9630267 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/TWDDatumConverter.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/TWDDatumConverter.java
@@ -6,7 +6,6 @@
* TWDDatumConverter
* User: Ulysses
* Date: 2007/10/8
- * Time: �U�� 01:35:03
* To change this template use File | Settings | File Templates.
*/
public abstract class TWDDatumConverter {
@@ -450,12 +449,6 @@
* }
*/
- /**
- * ��TM2�y���ഫ��TWD97�y��
- *
- * @param pt TM2��m
- * @return �s��TWD97�y��
- */
public static Coordinate fromTM2ToEPSG3826(Coordinate pt) {
Coordinate ptTWD67 = fromTM2(TWD67_A, TWD67_ECC, TWD67_ECC2, 0, 121, TWD67_TM2, pt.x - 250000.0, pt.y);
ptTWD67.z = 0;
@@ -466,12 +459,6 @@
return pt97TM2;
}
- /**
- * ��TM2�y���ഫ��TWD97�y��
- *
- * @param pt TM2��m
- * @return �s��TWD97�y��
- */
public static Coordinate fromTM2ToEPSG3825(Coordinate pt) {
Coordinate ptTWD67 = fromTM2(TWD67_A, TWD67_ECC, TWD67_ECC2, 0, 191, TWD67_TM2, pt.x - 250000.0, pt.y);
ptTWD67.z = 0;
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/postjts/JtsGisWrapper.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/postjts/JtsGisWrapper.java
index 53db05b..92809a0 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/postjts/JtsGisWrapper.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/postjts/JtsGisWrapper.java
@@ -27,7 +27,9 @@
import java.sql.Connection;
import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
import java.util.Properties;
+import java.util.logging.Logger;
import org.postgresql.Driver;
import org.postgresql.PGConnection;
@@ -155,4 +157,8 @@
public static String getVersion() {
return "JtsGisWrapper " + REVISION + ", wrapping " + Driver.getVersion();
}
+
+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
}
diff --git a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/postjts/JtsWrapper.java b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/postjts/JtsWrapper.java
index 235a483..6720216 100644
--- a/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/postjts/JtsWrapper.java
+++ b/xdgnjobs/ximple-spatialjob/src/main/java/com/ximple/eofms/util/postjts/JtsWrapper.java
@@ -27,6 +27,7 @@
import java.sql.Connection;
import java.sql.SQLException;
+import java.sql.SQLFeatureNotSupportedException;
import java.util.Properties;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -163,4 +164,8 @@
public static String getVersion() {
return "JtsGisWrapper " + REVISION + ", wrapping " + Driver.getVersion();
}
+
+ public Logger getParentLogger() throws SQLFeatureNotSupportedException {
+ throw new UnsupportedOperationException("Not supported yet.");
+ }
}
--
Gitblit v0.0.0-SNAPSHOT