r2.0.1

niuxuetao · Feb 8, 2016 · f9343a4 · f9343a4
1 parent b63b292
commit f9343a4
Show file tree

Hide file tree

Showing 10 changed files with 19 additions and 16 deletions.
diff --git a/PaxmlAll/pom.xml b/PaxmlAll/pom.xml
@@ -8,7 +8,7 @@
   <parent>
 	<artifactId>paxml-root</artifactId>
 	<groupId>org.paxml</groupId>
-	<version>2.0.0</version>
+	<version>2.0.1</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>

diff --git a/PaxmlCore/pom.xml b/PaxmlCore/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>paxml-root</artifactId>
 		<groupId>org.paxml</groupId>
-		<version>2.0.0</version>
+		<version>2.0.1</version>
 	</parent>
 
 	<properties>

diff --git a/PaxmlCore/src/main/java/org/paxml/util/DBUtils.java b/PaxmlCore/src/main/java/org/paxml/util/DBUtils.java
@@ -17,6 +17,7 @@
 package org.paxml.util;
 
 import java.io.ByteArrayInputStream;
+import java.io.File;
 import java.io.IOException;
 import java.sql.SQLException;
 import java.util.ArrayList;
@@ -38,10 +39,15 @@ public class DBUtils {
 	public static final String H2_DRIVER_CLASS = "org.h2.Driver";
 	public static final String H2_USER = "sa";
 	public static final String H2_PASSWORD = "";
-
-	public static String getDefaultH2Url(){
-		String file = PaxmlUtils.getFileUnderPaxmlHome("/data/h2", true).getAbsolutePath();
-		return "jdbc:h2:" + file +";AUTO_SERVER=TRUE";
+
+	public static String getDefaultH2Url() {
+		String h2File = "/data/h2";
+		File h2 = PaxmlUtils.getFileUnderPaxmlHome(h2File, false);
+		if (h2 == null) {
+			h2 = PaxmlUtils.getFileUnderUserHome(h2File);
+		}
+		String file = h2.getAbsolutePath();
+		return "jdbc:h2:" + file + ";AUTO_SERVER=TRUE";
 	}
 
 	public static void initDatabase(DataSource ds) {

diff --git a/PaxmlCore/src/main/java/org/paxml/util/PaxmlUtils.java b/PaxmlCore/src/main/java/org/paxml/util/PaxmlUtils.java
@@ -51,10 +51,7 @@ public class PaxmlUtils {
 	public static final String PAXML_HOME_ENV_KEY = "PAXML_HOME";
 
 	public static File getPaxmlHome(boolean assert_PAXML_HOME) {
-		String paxmlHome = System.getenv(PAXML_HOME_ENV_KEY);
-		if (paxmlHome == null) {
-			paxmlHome = System.getProperty(PAXML_HOME_ENV_KEY);
-		}
+		String paxmlHome = getSystemProperty(PAXML_HOME_ENV_KEY);
 		if (paxmlHome == null) {
 			if (assert_PAXML_HOME) {
 				throw new PaxmlRuntimeException("System environment variable 'PAXML_HOME' not set!");

diff --git a/PaxmlExample/pom.xml b/PaxmlExample/pom.xml
@@ -8,7 +8,7 @@
 	<parent>
 		<artifactId>paxml-root</artifactId>
 		<groupId>org.paxml</groupId>
-		<version>2.0.0</version>
+		<version>2.0.1</version>
 	</parent>
 
 	<name>PaxmlExample</name>

diff --git a/PaxmlExecutable/pom.xml b/PaxmlExecutable/pom.xml
@@ -6,7 +6,7 @@
 	<parent>
 		<artifactId>paxml-root</artifactId>
 		<groupId>org.paxml</groupId>
-		<version>2.0.0</version>
+		<version>2.0.1</version>
 	</parent>
 
 	<modelVersion>4.0.0</modelVersion>

diff --git a/PaxmlSelenium/pom.xml b/PaxmlSelenium/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<artifactId>paxml-root</artifactId>
 		<groupId>org.paxml</groupId>
-		<version>2.0.0</version>
+		<version>2.0.1</version>
 	</parent>
 
 	<name>PaxmlSelenium</name>

diff --git a/PaxmlTestNG/pom.xml b/PaxmlTestNG/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<artifactId>paxml-root</artifactId>
 		<groupId>org.paxml</groupId>
-		<version>2.0.0</version>
+		<version>2.0.1</version>
 	</parent>
 
 	<name>PaxmlTestNG</name>

diff --git a/PaxmlWeb/pom.xml b/PaxmlWeb/pom.xml
@@ -7,7 +7,7 @@
 	<parent>
 		<artifactId>paxml-root</artifactId>
 		<groupId>org.paxml</groupId>
-		<version>2.0.0</version>
+		<version>2.0.1</version>
 	</parent>
 
 	<name>PaxmlWeb</name>

diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 	<artifactId>paxml-root</artifactId>
 	<groupId>org.paxml</groupId>
 	<name>Paxml</name>
-	<version>2.0.0</version>
+	<version>2.0.1</version>
 	<packaging>pom</packaging>
 
 	<description>Paxml - Process Automation eXtensible Markup Language</description>