MONDRIAN: Modify megatest to support testing openjdk1.7 (mondrian alr…

…eady builds

    and runs fine); make jdk1.7 and mysql the default configuration.

[git-p4: depot-paths = "//open/mondrian/": change = 14757]

bin/megatest

@@ -68,7 +68,7 @@ marmalade)
   ;;
 marmite)
   databaseList="derby hsqldb mysql oracle"
-  jdkList="jdk1.4 jdk1.5 jdk1.6 jdk1.7 openjdk1.6 ibmjdk1.6"
+  jdkList="jdk1.4 jdk1.5 jdk1.6 jdk1.7 openjdk1.6 openjdk1.7 ibmjdk1.6"
   ;;
 ATRHisv1)
   databaseList="hsqldb neoview"
@@ -381,7 +381,7 @@ chooseAntHome() {
       echo $(cd /usr/local/apache-ant-1.6.0; pwd)
     esac
     ;;
-  jdk1.5|jdk1.6|jdk1.7|openjdk1.6|ibmjdk1.6)
+  jdk1.5|jdk1.6|jdk1.7|openjdk1.6|openjdk1.7|ibmjdk1.6)
     case $(uname -n) in
     (plank.disruptivetech.com)
       echo /home/jhyde/open/thirdparty/ant;;
@@ -417,15 +417,14 @@ chooseJavaHome() {
     (*) echo "Unknown java version $jdk"; exit 1 ;;
     esac;;
   (*)
-    case $jdk in
-    (jdk1.4) echo /usr/local/jdk1.4 ;;
-    (jdk1.5) echo /usr/local/jdk1.5 ;;
-    (jdk1.6) echo /usr/local/jdk1.6 ;;
-    (jdk1.7) echo /usr/lib/jvm/jdk1.7 ;;
-    (ibmjdk1.6) echo /usr/lib/jvm/ibm-jdk1.6 ;;
-    (openjdk1.6) echo /usr/lib/jvm/java-1.6.0-openjdk ;;
-    (*) echo "Unknown java version $jdk"; exit 1 ;;
-    esac;;
+    if [ -d /usr/lib/jvm/$jdk ]; then
+      echo /usr/lib/jvm/$jdk
+    elif [ -d /usr/local/$jdk ]; then
+      echo /usr/local/$jdk
+    else
+      echo "Unknown java version $jdk"
+      exit 1
+    fi
   esac
 }
 
@@ -511,9 +510,10 @@ olap4j() {
     ;;
   esac
 
-  # Javadoc only runs clean under jdk16, because it depends on JDBC 4.0
+  # Javadoc only runs clean under jdk16 or jdk17, because it depends
+  # on JDBC 4.0 or later.
   case "$jdk" in
-  (jdk1.6|openjdk1.6|ibmjdk1.6) ant javadoc ;;
+  (jdk1.6|openjdk1.6|jdk1.7|openjdk1.7|ibmjdk1.6) ant javadoc ;;
   esac
 }
 
@@ -801,7 +801,7 @@ doRandom() {
 }
 
 doQuick() {
-  doTest jdk1.6 oracle
+  doTest jdk1.7 mysql
 }
 
 # Runs the tests that are believed to be working.