MONDRIAN: Integrate from mondrian main to mondrian release 3.0 branch…

…@11016 (properly this time). [git-p4: depot-paths = "//open/mondrian-release/3.0/": change = 11205]
pentaho · Jun 22, 2008 · 6e398f2 · 6e398f2
1 parent ea871d9
commit 6e398f2
Show file tree

Hide file tree

Showing 164 changed files with 6,071 additions and 5,807 deletions.
diff --git a/.classpath b/.classpath
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src/main"/>
-	<classpathentry kind="src" path="testsrc/main"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="lib/commons-collections.jar"/>
-	<classpathentry kind="lib" path="lib/javacup.jar"/>
-	<classpathentry kind="lib" path="lib/jlfgr.jar"/>
-	<classpathentry kind="lib" path="lib/eigenbase-resgen.jar"/>
-	<classpathentry kind="lib" path="lib/eigenbase-xom.jar"/>
-	<classpathentry kind="lib" path="lib/xalan.jar"/>
-	<classpathentry kind="lib" path="lib/xercesImpl.jar"/>
-	<classpathentry kind="lib" path="lib/xml-apis.jar"/>
-	<classpathentry kind="lib" path="lib/jsp-api.jar"/>
-	<classpathentry kind="lib" path="lib/junit.jar"/>
-	<classpathentry kind="lib" path="lib/commons-dbcp.jar"/>
-	<classpathentry kind="lib" path="lib/commons-pool.jar"/>
-	<classpathentry kind="lib" path="lib/log4j.jar"/>
-	<classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/>
-	<classpathentry kind="lib" path="lib/eigenbase-properties.jar"/>
-	<classpathentry kind="lib" path="lib/servlet-api.jar"/>
-	<classpathentry kind="lib" path="lib/commons-math.jar"/>
-	<classpathentry kind="lib" path="lib/derby.jar"/>
-	<classpathentry kind="lib" path="lib/xmlunit.jar"/>
-	<classpathentry kind="lib" path="lib/commons-vfs.jar"/>
-	<classpathentry kind="lib" path="lib/commons-logging.jar"/>
-	<classpathentry kind="lib" path="lib/olap4j.jar"/>
-	<classpathentry kind="output" path="classes"/>
+    <classpathentry kind="src" path="src/main"/>
+    <classpathentry kind="src" path="testsrc/main"/>
+    <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+    <classpathentry kind="lib" path="lib/commons-collections.jar"/>
+    <classpathentry kind="lib" path="lib/javacup.jar"/>
+    <classpathentry kind="lib" path="lib/jlfgr-1_0.jar"/>
+    <classpathentry kind="lib" path="lib/eigenbase-resgen.jar"/>
+    <classpathentry kind="lib" path="lib/eigenbase-xom.jar"/>
+    <classpathentry kind="lib" path="lib/xalan.jar"/>
+    <classpathentry kind="lib" path="lib/xercesImpl.jar"/>
+    <classpathentry kind="lib" path="lib/xml-apis.jar"/>
+    <classpathentry kind="lib" path="lib/jsp-api.jar"/>
+    <classpathentry kind="lib" path="testlib/junit.jar"/>
+    <classpathentry kind="lib" path="lib/commons-dbcp.jar"/>
+    <classpathentry kind="lib" path="lib/commons-pool.jar"/>
+    <classpathentry kind="lib" path="lib/log4j-1.2.9.jar"/>
+    <classpathentry kind="var" path="ANT_HOME/lib/ant.jar"/>
+    <classpathentry kind="lib" path="lib/eigenbase-properties.jar"/>
+    <classpathentry kind="lib" path="lib/servlet.jar"/>
+    <classpathentry kind="lib" path="lib/commons-math-1.0.jar"/>
+    <classpathentry kind="lib" path="testlib/derby.jar"/>
+    <classpathentry kind="lib" path="testlib/xmlunit1.0.jar"/>
+    <classpathentry kind="lib" path="lib/commons-vfs.jar"/>
+    <classpathentry kind="lib" path="lib/commons-logging.jar"/>
+    <classpathentry kind="lib" path="lib/olap4j.jar"/>
+    <classpathentry kind="output" path="classes"/>
 </classpath>
diff --git a/README.txt b/README.txt
@@ -2,7 +2,7 @@ This is a source, binary or data distribution of Mondrian,
 an OLAP Server written in Java.
 
 This code is released under the terms of the Common Public
-License (CPL); see LICENSE.html.
+License; see LICENSE.html.
 
 For installation instructions, see doc/install.html
 (http://mondrian.pentaho.org/documentation/installation.php).

diff --git a/bin/megatest b/bin/megatest
@@ -12,14 +12,9 @@
 # release environment.
 
 ANT_FLAGS=
-CLEAN=clean
-CLEAN=
 
 # The script's path is $OPEN_DIR/mondrian/bin/megatest; deduce OPEN_DIR.
 OPEN_DIR=$(cd $(dirname $0)/../..; pwd)
-case $(uname) in
-CYGWIN*) OPEN_DIR=$(cygpath -m $OPEN_DIR);;
-esac
 
 case $(uname -n) in
 branston)
@@ -28,10 +23,10 @@ branston)
   ;;
 mackerel)
   databaseList="access derby"
-  jdkList="jdk1.4 jdk1.5 jdk1.6"
+  jdkList="jdk1.4 jdk1.6"
   ;;
 mackerel-winxp)
-  databaseList="access derby teradata"
+  databaseList="access derby"
   jdkList="jdk1.4 jdk1.5 jdk1.6"
   ;;
 marmalade)
@@ -44,11 +39,6 @@ marmalade)
   ;;
 esac
 
-case $(uname) in
-CYGWIN*) export PS=';' ;;
-*) export PS=':' ;;
-esac
-
 doTest() {
   if [ -f build.properties ]; then
     mv build.properties build.properties.bak
@@ -150,16 +140,6 @@ doTest2() {
       echo "mondrian.test.connectString=Provider=mondrian;Jdbc=${jdbcURL};JdbcUser=foodmart;JdbcPassword=foodmart;Catalog=${OPEN_DIR}/mondrian/demo/FoodMart.xml;JdbcDrivers=${jdbcDrivers};RoleXX='California manager';"
     ) >> megatest.properties
     ;;
-  teradata)
-    (
-      jdbcDrivers=com.ncr.teradata.TeraDriver
-      export jdbcURL='jdbc:teradata://localhost/foodmart'
-      echo mondrian.foodmart.jdbcURL=${jdbcURL}
-      echo mondrian.jdbcDrivers=${jdbcDrivers}
-      echo "driver.classpath=${OPEN_DIR}/mondrian/drivers/terajdbc4.jar${PS}${OPEN_DIR}/mondrian/drivers/tdgssjava.jar${PS}${OPEN_DIR}/mondrian/drivers/tdgssconfig.jar"
-      echo "mondrian.test.connectString=Provider=mondrian;Jdbc=${jdbcURL};JdbcUser=tduser;JdbcPassword=tduser;Catalog=${OPEN_DIR}/mondrian/demo/FoodMart.xml;JdbcDrivers=${jdbcDrivers};RoleXX='California manager';"
-    ) >> megatest.properties
-    ;;
   *) echo "Unknown database $database"; exit 1 ;;
   esac
 
@@ -205,24 +185,24 @@ doTest2() {
           export JAVA_HOME=$(chooseJavaHome jdk1.5)
           export PATH="$JAVA_HOME/bin:$PATH"
           export ANT_HOME=$(chooseAntHome jdk1.5)
-          $ANT_HOME/bin/ant $ANT_FLAGS ${CLEAN} all retroweave
+          $ANT_HOME/bin/ant $ANT_FLAGS clean all retroweave
         )
         export JAVA_HOME=$(chooseJavaHome jdk1.4)
         export PATH=$JAVA_HOME/bin:$PATH
         ;;
       *)
-        $ANT_HOME/bin/ant $ANT_FLAGS ${CLEAN} all retroweave
+        $ANT_HOME/bin/ant $ANT_FLAGS clean all retroweave
         ;;
       esac
       $ANT_HOME/bin/ant $ANT_FLAGS -Dmondrian.retroweave=true test-nobuild
     else
       export ANT_HOME=$(chooseAntHome $jdk)
       case $database in
       (derby|access)
-        $ANT_HOME/bin/ant $ANT_FLAGS ${CLEAN} compile compile.tests unzip-databases test-nobuild
+        $ANT_HOME/bin/ant $ANT_FLAGS clean compile compile.tests unzip-databases test-nobuild
         ;;
       (*)
-        $ANT_HOME/bin/ant $ANT_FLAGS ${CLEAN} compile compile.tests test-nobuild
+        $ANT_HOME/bin/ant $ANT_FLAGS clean compile compile.tests test-nobuild
         ;;
       esac
     fi
@@ -264,8 +244,7 @@ chooseJavaHome() {
   (mackerel)
     case $jdk in
     (jdk1.4) echo /c/j2sdk1.4.2_16 ;;
-    (jdk1.5) echo /c/jdk1.5.0_14 ;;
-    (jdk1.6) echo /c/jdk1.6.0_06 ;;
+    (jdk1.5|jdk1.6) echo /c/jdk1.6.0_01 ;;
     (*) echo "Unknown java version $jdk"; exit 1 ;;
     esac;;
   (branston)
@@ -276,9 +255,9 @@ chooseJavaHome() {
     esac;;
   (mackerel-winxp)
     case $jdk in
-    (jdk1.4) echo /e/j2sdk1.4.2_16 ;;
-    (jdk1.5) echo /e/jdk1.5.0_14 ;;
-    (jdk1.6) echo /e/jdk1.6.0_06 ;;
+    (jdk1.4) echo /c/jdk1.4.2_15 ;;
+    (jdk1.5) echo /c/jdk1.5.0_12 ;;
+    (jdk1.6) echo /c/jdk1.6.0_02 ;;
     (*) echo "Unknown java version $jdk"; exit 1 ;;
     esac;;
   (*)
@@ -660,10 +639,6 @@ doAllTests() {
   doTest jdk1.5 oracle mondrian.test.VUsers=1
   doTest jdk1.6 oracle mondrian.test.VUsers=1
 
-  doTest jdk1.6 teradata mondrian.test.VUsers=1
-  doTest jdk1.5 teradata mondrian.test.VUsers=1 mondrian.rolap.groupingsets.enable=true
-  doTest jdk1.4 teradata mondrian.test.VUsers=1
-
   doTest jdk1.5 oracle mondrian.test.ExpDependencies=10 mondrian.test.random.seed=-1 mondrian.expCache.enable=false #mondrian.test.Name=mondrian.test.ParentChildHierarchyTest
   doTest jdk1.5 access mondrian.olap.NullMemberRepresentation= mondrian.test.Class=mondrian.olap.NullMemberRepresentationTest
   doTest jdk1.5 access mondrian.olap.NullMemberRepresentation=\(null\) mondrian.test.Class=mondrian.olap.NullMemberRepresentationTest

diff --git a/bin/run.sh b/bin/run.sh
@@ -24,13 +24,12 @@ CLASSPATH="$CLASSPATH:$MONDRIAN_LIB/commons-pool.jar"
 CLASSPATH="$CLASSPATH:$MONDRIAN_LIB/eigenbase-resgen.jar"
 CLASSPATH="$CLASSPATH:$MONDRIAN_LIB/eigenbase-xom.jar"
 CLASSPATH="$CLASSPATH:$MONDRIAN_LIB/javacup.jar"
-CLASSPATH="$CLASSPATH:$MONDRIAN_LIB/log4j.jar"
-CLASSPATH="$CLASSPATH:$MONDRIAN_LIB/servlet-api.jar"
+CLASSPATH="$CLASSPATH:$MONDRIAN_LIB/log4j-1.2.9.jar"
+CLASSPATH="$CLASSPATH:$MONDRIAN_LIB/servlet.jar"
 CLASSPATH="$CLASSPATH:$MONDRIAN_LIB/eigenbase-properties.jar"
-CLASSPATH="$CLASSPATH:$MONDRIAN_LIB/commons-math.jar"
+CLASSPATH="$CLASSPATH:$MONDRIAN_LIB/commons-math-1.0.jar"
 CLASSPATH="$CLASSPATH:$MONDRIAN_LIB/commons-vfs.jar"
 CLASSPATH="$CLASSPATH:$MONDRIAN_LIB/commons-logging.jar"
-CLASSPATH="$CLASSPATH:$MONDRIAN_LIB/derby.jar"
 
 # now pick up jdbc jars
 for j in $MONDRIAN_TEST_LIB/*.jar