MONDRIAN: integrating change 13848 into trunk, Fix for BISERVER-4632,…

… installer and archive scripts should remain the same [git-p4: depot-paths = "//open/mondrian/": change = 13849]
pentaho · Sep 27, 2010 · d3d855f · d3d855f
1 parent 9164e00
commit d3d855f
Show file tree

Hide file tree

Showing 4 changed files with 98 additions and 14 deletions.
diff --git a/workbench/set-pentaho-java.bat → workbench/set-pentaho-env.bat b/workbench/set-pentaho-java.bat → workbench/set-pentaho-env.bat
@@ -1,3 +1,4 @@
+
 rem ---------------------------------------------------------------------------
 rem Finds a suitable Java
 rem
@@ -11,9 +12,15 @@ rem
 rem The order of the search is as follows:
 rem 
 rem 1. environment variable PENTAHO_JAVA_HOME - path to Java home
-rem 2. environment variable JAVA_HOME - path to Java home
-rem 3. environment variable JRE_HOME - path to Java home
-rem 4. argument #1 - path to Java home
+rem 2. jre folder at current folder level
+rem 3. java folder at current folder level
+rem 4. jre folder one level up
+rem 5. java folder one level up
+rem 6. jre folder two levels up
+rem 7. java folder two levels up
+rem 8. environment variable JAVA_HOME - path to Java home
+rem 9. environment variable JRE_HOME - path to Java home
+rem 10. argument #1 - path to Java home
 rem 
 rem If a suitable Java is found at one of these locations, then 
 rem _PENTAHO_JAVA_HOME is set to that location and _PENTAHO_JAVA is set to the 
@@ -36,6 +43,12 @@ goto checkPentahoJavaHome
 
 :checkPentahoJavaHome
 if not "%PENTAHO_JAVA_HOME%" == "" goto gotPentahoJavaHome
+if exist "%~dp0jre" goto gotJreCurrentFolder
+if exist "%~dp0java" goto gotJavaCurrentFolder
+if exist "%~dp0..\jre" goto gotJreOneFolderUp
+if exist "%~dp0..\java" goto gotJavaOneFolderUp
+if exist "%~dp0..\..\jre" goto gotJreTwoFolderUp
+if exist "%~dp0..\..\java" goto gotJavaTwoFolderUp
 if not "%JAVA_HOME%" == "" goto gotJdkHome
 if not "%JRE_HOME%" == "" goto gotJreHome
 goto tryValueFromCaller 
@@ -46,6 +59,42 @@ set _PENTAHO_JAVA_HOME=%PENTAHO_JAVA_HOME%
 set _PENTAHO_JAVA=%_PENTAHO_JAVA_HOME%\bin\%__LAUNCHER%
 goto end
 
+:gotJreCurrentFolder
+echo DEBUG: Found JRE at the current folder
+set _PENTAHO_JAVA_HOME=%~dp0jre
+set _PENTAHO_JAVA=%_PENTAHO_JAVA_HOME%\bin\%__LAUNCHER%
+goto end
+
+:gotJavaCurrentFolder
+echo DEBUG: Found JAVA at the current folder
+set _PENTAHO_JAVA_HOME=%~dp0java
+set _PENTAHO_JAVA=%_PENTAHO_JAVA_HOME%\bin\%__LAUNCHER%
+goto end
+
+:gotJreOneFolderUp
+echo DEBUG: Found JRE one folder up
+set _PENTAHO_JAVA_HOME=%~dp0..\jre
+set _PENTAHO_JAVA=%_PENTAHO_JAVA_HOME%\bin\%__LAUNCHER%
+goto end
+
+:gotJavaOneFolderUp
+echo DEBUG: Found JAVA one folder up
+set _PENTAHO_JAVA_HOME=%~dp0..\java
+set _PENTAHO_JAVA=%_PENTAHO_JAVA_HOME%\bin\%__LAUNCHER%
+goto end
+
+:gotJreTwoFolderUp
+echo DEBUG: Found JRE two folder up
+set _PENTAHO_JAVA_HOME=%~dp0..\..\jre
+set _PENTAHO_JAVA=%_PENTAHO_JAVA_HOME%\bin\%__LAUNCHER%
+goto end
+
+:gotJavaTwoFolderUp
+echo DEBUG: Found JAVA two folder up
+set _PENTAHO_JAVA_HOME=%~dp0..\..\java
+set _PENTAHO_JAVA=%_PENTAHO_JAVA_HOME%\bin\%__LAUNCHER%
+goto end
+
 :gotJdkHome
 echo DEBUG: Using JAVA_HOME
 set _PENTAHO_JAVA_HOME=%JAVA_HOME%
@@ -78,4 +127,4 @@ goto end
 :end
 
 echo DEBUG: _PENTAHO_JAVA_HOME=%_PENTAHO_JAVA_HOME%
-echo DEBUG: _PENTAHO_JAVA=%_PENTAHO_JAVA%
+echo DEBUG: _PENTAHO_JAVA=%_PENTAHO_JAVA%
diff --git a/workbench/set-pentaho-java.sh → workbench/set-pentaho-env.sh b/workbench/set-pentaho-java.sh → workbench/set-pentaho-env.sh
@@ -10,11 +10,17 @@
 # * _PENTAHO_JAVA - absolute path to Java launcher (e.g. java)
 # 
 # The order of the search is as follows:
-# 
+#
 # 1. environment variable PENTAHO_JAVA_HOME - path to Java home
-# 2. environment variable JAVA_HOME - path to Java home
-# 3. environment variable JRE_HOME - path to Java home
-# 4. argument #1 - path to Java home
+# 2. jre folder at current folder level
+# 3. java folder at current folder level
+# 4. jre folder one level up
+# 5. java folder one level up
+# 6. jre folder two levels up
+# 7. java folder two levels up
+# 8. environment variable JAVA_HOME - path to Java home
+# 9. environment variable JRE_HOME - path to Java home
+# 10. argument #1 - path to Java home
 # 
 # If a suitable Java is found at one of these locations, then 
 # _PENTAHO_JAVA_HOME is set to that location and _PENTAHO_JAVA is set to the 
@@ -27,7 +33,12 @@
 # set, then the value java is used. 
 # -----------------------------------------------------------------------------
 
-setPentahoJava() {
+setPentahoEnv() {
+  DIR_REL=`dirname $0`
+  cd $DIR_REL
+  DIR=`pwd`
+  cd -
+
   if [ -n "$PENTAHO_JAVA" ]; then
     __LAUNCHER="$PENTAHO_JAVA"
   else
@@ -37,6 +48,30 @@ setPentahoJava() {
     echo "DEBUG: Using PENTAHO_JAVA_HOME"
     _PENTAHO_JAVA_HOME="$PENTAHO_JAVA_HOME"
     _PENTAHO_JAVA="$_PENTAHO_JAVA_HOME"/bin/$__LAUNCHER
+  elif [ -d "$DIR/jre" ]; then
+    echo DEBUG: Found JRE at the current folder
+    _PENTAHO_JAVA_HOME="$DIR/jre"
+    _PENTAHO_JAVA="$_PENTAHO_JAVA_HOME"/bin/$__LAUNCHER
+  elif [ -d "$DIR/java" ]; then
+    echo DEBUG: Found JAVA at the current folder
+    _PENTAHO_JAVA_HOME="$DIR/java"
+    _PENTAHO_JAVA="$_PENTAHO_JAVA_HOME"/bin/$__LAUNCHER
+  elif [ -d "$DIR/../jre" ]; then
+    echo DEBUG: Found JRE one folder up
+    _PENTAHO_JAVA_HOME="$DIR/../jre"
+    _PENTAHO_JAVA="$_PENTAHO_JAVA_HOME"/bin/$__LAUNCHER
+  elif [ -d "$DIR/../java" ]; then
+    echo DEBUG: Found JAVA one folder up
+    _PENTAHO_JAVA_HOME="$DIR/../java"
+    _PENTAHO_JAVA="$_PENTAHO_JAVA_HOME"/bin/$__LAUNCHER
+  elif [ -d "$DIR/../../jre" ]; then
+    echo DEBUG: Found JRE two folders up
+    _PENTAHO_JAVA_HOME="$DIR/../../jre"
+    _PENTAHO_JAVA="$_PENTAHO_JAVA_HOME"/bin/$__LAUNCHER
+  elif [ -d "$DIR/../../java" ]; then
+    echo DEBUG: Found JAVA two folders up
+    _PENTAHO_JAVA_HOME="$DIR/../../java"
+    _PENTAHO_JAVA="$_PENTAHO_JAVA_HOME"/bin/$__LAUNCHER
   elif [ -n "$JAVA_HOME" ]; then
     echo "DEBUG: Using JAVA_HOME"
     _PENTAHO_JAVA_HOME="$JAVA_HOME"

diff --git a/workbench/workbench.bat b/workbench/workbench.bat
@@ -51,7 +51,7 @@ rem add all needed plugin jars to the classpath
 for %%i in ("plugins\*.jar") do call cpappend %%i
 
 set PENTAHO_JAVA=java
-call "%~dp0set-pentaho-java.bat"
+call "%~dp0set-pentaho-env.bat"
 
 "%_PENTAHO_JAVA%" -Xms100m -Xmx500m -cp "%CP%" -Dlog4j.configuration=file:///%ROOT%\.schemaWorkbench\log4j.xml mondrian.gui.Workbench
 

diff --git a/workbench/workbench.sh b/workbench/workbench.sh
@@ -82,12 +82,12 @@ JAVA_FLAGS="-Xms100m -Xmx500m"
 
 # Standard pentaho environment. Script lives in workbench directory in a
 # development environment, MONDRIAN_HOME otherwise.
-if test -x "$MONDRIAN_HOME/workbench/set-pentaho-java.sh"; then
-    . "$MONDRIAN_HOME/workbench/set-pentaho-java.sh"
+if test -x "$MONDRIAN_HOME/workbench/set-pentaho-env.sh"; then
+    . "$MONDRIAN_HOME/workbench/set-pentaho-env.sh"
 else
-    . "$MONDRIAN_HOME/set-pentaho-java.sh"
+    . "$MONDRIAN_HOME/set-pentaho-env.sh"
 fi
-setPentahoJava
+setPentahoEnv
 
 exec "$_PENTAHO_JAVA" $JAVA_FLAGS -cp "$CP" mondrian.gui.Workbench