MONDRIAN: Initial integration to mondrian-release/3.1 branch @12687 (…

…same as mondrian-3.1.1 release).

[git-p4: depot-paths = "//open/mondrian-release/3.1/": change = 12982]

LicenseInfo.txt

@@ -1,6 +1,6 @@
-// This software is subject to the terms of the Eclipse Public License v1.0
+// This software is subject to the terms of the Common Public License
 // Agreement, available at the following URL:
-// http://www.eclipse.org/legal/epl-v10.html.
+// http://www.opensource.org/licenses/cpl.html.
 // Copyright (C) 2006-2006 Julian Hyde and others.
 // All Rights Reserved.
 // You must accept the terms of that agreement to use this software.

README.txt

@@ -1,8 +1,8 @@
 This is a source, binary or data distribution of Mondrian,
 an OLAP Engine written in Java.
 
-This code is released under the terms of the Eclipse Public
-License v1.0 (EPL); see LICENSE.html.
+This code is released under the terms of the Common Public
+License (CPL); see LICENSE.html.
 
 For installation instructions, see doc/install.html
 (http://mondrian.pentaho.org/documentation/installation.php).

bin/loadFoodMart.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 # $Id$
-# This software is subject to the terms of the Eclipse Public License v1.0
+# This software is subject to the terms of the Common Public License
 # Agreement, available at the following URL:
-# http://www.eclipse.org/legal/epl-v10.html.
+# http://www.opensource.org/licenses/cpl.html.
 # Copyright (C) 2008-2009 Julian Hyde and others.
 # All Rights Reserved.
 # You must accept the terms of that agreement to use this software.

bin/megatest

@@ -1,6 +1,6 @@
 #!/bin/bash
 # $Id$
-# Copyright (C) 2006-2009 Julian Hyde
+# Copyright (C) 2006-2008 Julian Hyde
 #
 # Script to run the Mondrian test suite under various JDKs, with parameter
 # settings, against various RDBMSes. Customize it with your environment -
@@ -13,7 +13,6 @@
 
 ANT_FLAGS=
 CLEAN=clean
-CLEAN=
 
 # The script's path is $OPEN_DIR/mondrian/bin/megatest; deduce OPEN_DIR.
 OPEN_DIR=$(cd $(dirname $0)/../..; pwd)
@@ -91,27 +90,11 @@ doTest() {
 
 doTest2() {
   olap4j=
-  mondrian=true
-  if [ "$1" = --mondrian ]; then
-    mondrian=true
-    shift
-  fi
-
-  if [ "$1" = --nomondrian ]; then
-    mondrian=
-    shift
-  fi
-
   if [ "$1" = --olap4j ]; then
     olap4j=true
     shift
   fi
 
-  if [ "$1" = --noolap4j ]; then
-    olap4j=
-    shift
-  fi
-
   retroweave=
   if [ "$1" = --retroweave ]; then
     retroweave=true
@@ -185,7 +168,7 @@ doTest2() {
   mysql)
     (
       jdbcDrivers=com.mysql.jdbc.Driver
-      export jdbcURL='jdbc:mysql://localhost/foodmart?user=foodmart&password=foodmart&characterEncoding=latin1'
+      export jdbcURL='jdbc:mysql://localhost/foodmart?user=foodmart&password=foodmart&characterEncoding=UTF-8'
       echo mondrian.foodmart.jdbcURL=${jdbcURL}
       echo mondrian.jdbcDrivers=${jdbcDrivers}
       echo driver.classpath=/usr/local/mysql-connector-java-3.1.12/mysql-connector-java-3.1.12-bin.jar
@@ -256,22 +239,15 @@ doTest2() {
         $ANT_HOME/bin/ant $ANT_FLAGS ${CLEAN} all retroweave
         ;;
       esac
-      if [ "$mondrian" ]; then
-        $ANT_HOME/bin/ant $ANT_FLAGS -Dmondrian.retroweave=true test-nobuild
-      fi
+      $ANT_HOME/bin/ant $ANT_FLAGS -Dmondrian.retroweave=true test-nobuild
     else
       export ANT_HOME=$(chooseAntHome $jdk)
-      if [ "$mondrian" ]; then
-        TEST_TARGET=test-nobuild
-      else
-        TEST_TARGET=
-      fi
       case $database in
       (derby|access)
-        $ANT_HOME/bin/ant $ANT_FLAGS ${CLEAN} compile compile.tests unzip-databases ${TEST_TARGET}
+        $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_TARGET}
+        $ANT_HOME/bin/ant $ANT_FLAGS ${CLEAN} compile compile.tests test-nobuild
         ;;
       esac
     fi
@@ -690,15 +666,7 @@ doRandom() {
 }
 
 doQuick() {
-  doTest jdk1.6 oracle
-# doTest --olap4j jdk1.6 oracle
-  if false; then
-  for db in mysql derby oracle; do
-    for tf in true false; do
-      doTest jdk1.6 $db mondrian.olap.SsasCompatibleNaming=$tf
-    done
-  done
-  fi
+  doTest --olap4j jdk1.6 access
 }
 
 doAllTests() {

build.bat

@@ -2,9 +2,9 @@
 setlocal
 
 rem $Id$
-rem This software is subject to the terms of the Eclipse Public License v1.0
+rem This software is subject to the terms of the Common Public License
 rem Agreement, available at the following URL:
-rem http://www.eclipse.org/legal/epl-v10.html.
+rem http://www.opensource.org/licenses/cpl.html.
 rem (C) Copyright 2001-2005 Kana Software, Inc. and others.
 rem All Rights Reserved.
 rem You must accept the terms of that agreement to use this software.

build.properties

@@ -1,7 +1,7 @@
 # $Id$
-# This software is subject to the terms of the Eclipse Public License v1.0
+# This software is subject to the terms of the Common Public License
 # Agreement, available at the following URL:
-# http://www.eclipse.org/legal/epl-v10.html.
+# http://www.opensource.org/licenses/cpl.html.
 # Copyright (C) 2002-2002 Kana Software, Inc.
 # Copyright (C) 2002-2007 Julian Hyde and others.
 # All Rights Reserved.

build.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 # $Id$
-# This software is subject to the terms of the Eclipse Public License v1.0
+# This software is subject to the terms of the Common Public License
 # Agreement, available at the following URL:
-# http://www.eclipse.org/legal/epl-v10.html.
+# http://www.opensource.org/licenses/cpl.html.
 # Copyright (C) 2003 Julian Hyde
 # All Rights Reserved.
 # You must accept the terms of that agreement to use this software.

build.xml

@@ -1,10 +1,10 @@
 <!--
   == $Id$
-  == This software is subject to the terms of the Eclipse Public License v1.0
+  == This software is subject to the terms of the Common Public License
   == Agreement, available at the following URL:
-  == http://www.eclipse.org/legal/epl-v10.html.
+  == http://www.opensource.org/licenses/cpl.html.
   == Copyright (C) 2001-2003 Kana Software, Inc.
-  == Copyright (C) 2001-2009 Julian Hyde and others
+  == Copyright (C) 2001-2009 Julian Hyde and others.
   == All Rights Reserved.
   == You must accept the terms of that agreement to use this software.
   -->
@@ -25,10 +25,6 @@
   <property name="name" value="mondrian"/>
   <property name="version" value="3.1-SNAPSHOT"/>
   <property name="vendor" value="Pentaho"/>
-  <property name="driver.name" value="Mondrian olap4j driver"/>
-  <property name="driver.version" value="3.1.2"/>
-  <property name="driver.version.major" value="3"/>
-  <property name="driver.version.minor" value="102"/>
   <!--
     ===================================================================
     Set the properties related to paths
@@ -886,21 +882,6 @@ in {mondrian.foodmart.jdbcURL}.">
 Version: ${version}
 Vendor: ${vendor}
 </echo>
-   <echo file="${java.dir}/mondrian/olap4j/MondrianOlap4jDriverVersion.java">/*
- * Project version information. Generated - do not modify.
- */
-package mondrian.olap4j;
-/**
- * Version information for the Mondrian olap4j driver. (Generated.)
- */
-class MondrianOlap4jDriverVersion {
-    static final String NAME = "${driver.name}";
-    static final String VERSION = "${driver.version}";
-    static final int MAJOR_VERSION = ${driver.version.major};
-    static final int MINOR_VERSION = ${driver.version.minor};
-}
-
-// End MondrianOlap4jDriverVersion.java</echo>
   </target>
 
   <target name="srczip" depends="version">
@@ -1654,11 +1635,11 @@ ${doc.dir}/api/src-html/**/*"/>
        Note that, to keep things sane, this task does not modify classes in
        place.
 
-       After you've run this task, you can invoke 'ant test' from a JDK 1.4 and
-       all the tests will run. You should also be able replace mondrian.jar with
-       mondrian-jdk14.jar and retroweaver-rt.jar (retroweaver's runtime library)
-       in your web application and run jpivot, but I haven't tried
-       that. Exercise for the reader.
+       After you've run this task, you can invoke 'ant test' from a JDK 1.4
+       and all the tests will run. You should also be able replace mondrian.jar
+       with mondrian-jdk14.jar and retroweaver-rt-1.2.4.jar (retroweaver's
+       runtime library) in your web application and run jpivot, but I haven't
+       tried that. Exercise for the reader.
 
        Choosing the right ant version is a bit tricky. The retroweaver task
        requires ant-1.6.5 or higher (and JDK 1.5), but when you run the
@@ -1667,14 +1648,12 @@ ${doc.dir}/api/src-html/**/*"/>
     -->
   <target name="retroweave" depends="jar, compile.tests">
     <taskdef name="retroweaver"
-        classname="net.sourceforge.retroweaver.ant.RetroWeaverTask">
+        classname="com.rc.retroweaver.ant.RetroWeaverTask">
       <classpath>
         <pathelement location="${lib.dir}/asm.jar" />
         <pathelement location="${lib.dir}/asm-commons.jar" />
-        <pathelement location="${lib.dir}/asm-util.jar" />
         <pathelement location="${lib.dir}/retroweaver.jar" />
         <pathelement location="${lib.dir}/retroweaver-rt.jar" />
-        <pathelement location="${lib.dir}/backport-util-concurrent.jar" />
       </classpath>
     </taskdef>
 

demo/FoodMart.xml

@@ -2,11 +2,11 @@
 <Schema name="FoodMart">
 <!--
   == $Id$
-  == This software is subject to the terms of the Eclipse Public License v1.0
+  == This software is subject to the terms of the Common Public License
   == Agreement, available at the following URL:
-  == http://www.eclipse.org/legal/epl-v10.html.
+  == http://www.opensource.org/licenses/cpl.html.
   == Copyright (C) 2000-2002 Kana Software, Inc.
-  == Copyright (C) 2002-2009 Julian Hyde and others
+  == Copyright (C) 2002-2007 Julian Hyde and others.
   == All Rights Reserved.
   == You must accept the terms of that agreement to use this software.
   -->
@@ -320,7 +320,7 @@ Iif("sales_fact_1997"."promotion_id" = 0, 0, "sales_fact_1997"."store_sales")
   <CalculatedMember
       name="Profit last Period"
       dimension="Measures"
-      formula="COALESCEEMPTY((Measures.[Profit], [Time].[Time].PREVMEMBER),    Measures.[Profit])"
+      formula="COALESCEEMPTY((Measures.[Profit], [Time].PREVMEMBER),    Measures.[Profit])"
       visible="false">
     <CalculatedMemberProperty name="FORMAT_STRING" value="$#,##0.00"/>
     <CalculatedMemberProperty name="MEMBER_ORDINAL" value="18"/>
@@ -709,7 +709,7 @@ fullname
    <CalculatedMember
        name="Profit last Period"
        dimension="Measures"
-       formula="COALESCEEMPTY((Measures.[Profit], [Time].[Time].PREVMEMBER),    Measures.[Profit])"
+       formula="COALESCEEMPTY((Measures.[Profit], [Time].PREVMEMBER),    Measures.[Profit])"
        visible="false">
       <CalculatedMemberProperty name="MEMBER_ORDINAL" value="5"/>
    </CalculatedMember>

demo/derby/datasources.xml

@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <!--
   == $Id$
-  == This software is subject to the terms of the Eclipse Public License v1.0
+  == This software is subject to the terms of the Common Public License
   == Agreement, available at the following URL:
-  == http://www.eclipse.org/legal/epl-v10.html.
+  == http://www.opensource.org/licenses/cpl.html.
   == (C) Copyright 2005-2006 Julian Hyde and others.
   == All Rights Reserved.
   == You must accept the terms of that agreement to use this software.

demo/derby/web.xml

@@ -2,9 +2,9 @@
 <!--
 $Id$
 
-This software is subject to the terms of the Eclipse Public License v1.0
+This software is subject to the terms of the Common Public License
 Agreement, available at the following URL:
-http://www.eclipse.org/legal/epl-v10.html.
+http://www.opensource.org/licenses/cpl.html.
 (C) Copyright 2003-2005 Julian Hyde and others.
 All Rights Reserved.
 You must accept the terms of that agreement to use this software.
@@ -78,7 +78,7 @@ database which is exploded in the class path of the WAR.
 
   <servlet>
     <servlet-name>MDXQueryServlet</servlet-name>
-    <servlet-class>mondrian.web.servlet.MdxQueryServlet</servlet-class>
+    <servlet-class>mondrian.web.servlet.MDXQueryServlet</servlet-class>
     <init-param>
       <param-name>connectString</param-name>
       <param-value>Provider=mondrian;Jdbc='jdbc:derby:classpath:/foodmart';Catalog=/WEB-INF/queries/FoodMart.xml;JdbcDrivers=org.apache.derby.jdbc.EmbeddedDriver;JdbcUser=sa;JdbcPassword=sa;PoolNeeded=false;</param-value>

demo/mysql/SteelWheels.sql

@@ -1,7 +1,7 @@
 -- $Id$
--- This software is subject to the terms of the Eclipse Public License v1.0
+-- This software is subject to the terms of the Common Public License
 -- Agreement, available at the following URL:
--- http://www.eclipse.org/legal/epl-v10.html.
+-- http://www.opensource.org/licenses/cpl.html.
 -- (C) Copyright 2009-2009 Pentaho Software
 -- (C) Copyright 2009-2009 Julian Hyde
 -- All Rights Reserved.

doc/aggregate_tables.html

@@ -1,10 +1,10 @@
 <html>
 <!--
   == $Id$
-  == This software is subject to the terms of the Eclipse Public License v1.0
+  == This software is subject to the terms of the Common Public License
   == Agreement, available at the following URL:
-  == http://www.eclipse.org/legal/epl-v10.html.
-  == Copyright (C) 2005-2009 Julian Hyde and others
+  == http://www.opensource.org/licenses/cpl.html.
+  == Copyright (C) 2005-2008 Julian Hyde and others
   == All Rights Reserved.
   == You must accept the terms of that agreement to use this software.
   -->
@@ -2056,7 +2056,7 @@ <h3>10. References<a name="References">&nbsp;</a></h3>
     Author: Richard Emberson; last modified by Julian Hyde, March 2008.<br/>
     Version: $Id$
     (<a href="http://p4web.eigenbase.org/open/mondrian/doc/aggregate_tables.html?ac=22">log</a>)<br/>
-    Copyright (C) 2005-2009 Julian Hyde and others
+    Copyright (C) 2005-2008 Julian Hyde and others
 </p>
 
 <br />

doc/architecture.html

@@ -1,9 +1,9 @@
 <html>
 <!--
   == $Id$
-  == This software is subject to the terms of the Eclipse Public License v1.0
+  == This software is subject to the terms of the Common Public License
   == Agreement, available at the following URL:
-  == http://www.eclipse.org/legal/epl-v10.html.
+  == http://www.opensource.org/licenses/cpl.html.
   == Copyright (C) 2001-2002 Kana Software, Inc.
   == Copyright (C) 2001-2007 Julian Hyde
   == All Rights Reserved.

doc/cache_control.html

@@ -1,10 +1,10 @@
 <html>
 <!--
   == $Id$
-  == This software is subject to the terms of the Eclipse Public License v1.0
+  == This software is subject to the terms of the Common Public License
   == Agreement, available at the following URL:
-  == http://www.eclipse.org/legal/epl-v10.html.
-  == Copyright (C) 2006-2009 Julian Hyde
+  == http://www.opensource.org/licenses/cpl.html.
+  == Copyright (C) 2006-2008 Julian Hyde
   == All Rights Reserved.
   == You must accept the terms of that agreement to use this software.
   -->
@@ -415,12 +415,12 @@ <h4>4.3. Metadata cache control<a name="Metadata_cache_control">&nbsp;</a></h4>
     Author: Julian Hyde; last modified by Julian Hyde, March 2008.<br/>
     Version: $Id$
     (<a href="http://p4web.eigenbase.org/open/mondrian/doc/cache_control.html?ac=22">log</a>)<br/>
-    Copyright (C) 2006-2009 Julian Hyde
+    Copyright (C) 2006-2008 Julian Hyde
 </p>
 
 <br />
 
 <!-- doc2web end -->
 
 </body>
-</html>
+</html>

doc/cmdrunner.html

@@ -1,9 +1,9 @@
 <html>
 <!--
   == $Id$
-  == This software is subject to the terms of the Eclipse Public License v1.0
+  == This software is subject to the terms of the Common Public License
   == Agreement, available at the following URL:
-  == http://www.eclipse.org/legal/epl-v10.html.
+  == http://www.opensource.org/licenses/cpl.html.
   == Copyright (C) 2005-2007 Julian Hyde and others
   == All Rights Reserved.
   == You must accept the terms of that agreement to use this software.