MONDRIAN: Fix default values in mondrian.properties (all properties a…

…re now commented out, with their default value shown). Remove some redundant stuff from build.properties.

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

build.properties

@@ -1,81 +1,31 @@
-#
 # $Id$
 # This software is subject to the terms of the Common Public License
 # Agreement, available at the following URL:
 # http://www.opensource.org/licenses/cpl.html.
-# (C) Copyright 2002-2005 Kana Software, Inc. and others.
+# Copyright (C) 2002-2002 Kana Software, Inc.
+# Copyright (C) 2002-2006 Julian Hyde and others.
 # All Rights Reserved.
 # You must accept the terms of that agreement to use this software.
 #
 # -----------------------------------------------------------------------------
 # This file contains user-specific properties, so that we don't all
 # have our own copy of build.xml.
 
+###############################################################################
+# Additional products. Uncomment the ones you have installed.
+
+#weblogic.home=E:/bea/wlserver6.1
+#catalina.home=D:/jakarta-tomcat-5.0.25
+#junit.home=D:/junit3.8.1
+
 # uncomment the following 4 lines to use jikes
 #build.compiler=jikes
 #build.compiler.emacs=true
 #build.compiler.pedantic=false
 #build.compiler.fulldepend=false
 
 # Properties for the "upload-javadoc" target.
-scp.user=jhyde@mondrian.sourceforge.net
-scp.path=/home/groups/m/mo/mondrian/htdocs
-
-# Properties for Mondrian during tests
-#mondrian.rolap.aggregates.Use=true
-#mondrian.rolap.aggregates.ChooseByVolume=false
-#mondrian.trace.level=2
-
-###############################################################################
-# To run the test suite, first load the FoodMart data set into the
-# database of your choice. Then set the driver.classpath,
-# mondrian.foodmart.jdbcURL and mondrian.jdbcDrivers properties, by
-# uncommenting and modifying one of the sections below.
-# Put the JDBC driver jar into mondrian/testlib.
-
-# FireBirdSQL
-#mondrian.foodmart.jdbcURL=jdbc:firebirdsql:localhost/3050:/mondrian/foodmart.gdb
-#mondrian.jdbcDrivers=org.firebirdsql.jdbc.FBDriver
-#driver.classpath=/jdbc/fb/firebirdsql-full.jar
-
-# Oracle (needs user and password)
-#oracle.home=G:/oracle/product/10.1.0/Db_1
-#mondrian.foodmart.jdbcURL.oracle=jdbc:oracle:thin:@//<host>:<port>/<service_name>
-#mondrian.foodmart.jdbcURL=jdbc:oracle:thin:foodmart/foodmart@//stilton:1521/orcl
-#mondrian.foodmart.jdbcURL=jdbc:oracle:oci8:foodmart/foodmart@orcl
-#mondrian.foodmart.jdbcUser=FOODMART
-#mondrian.foodmart.jdbcPassword=oracle
-#mondrian.jdbcDrivers=oracle.jdbc.OracleDriver
-#driver.classpath=/home/jhyde/open/mondrian/lib/ojdbc14.jar
-
-# ODBC (Microsoft Access)
-#mondrian.foodmart.jdbcURL=jdbc:odbc:MondrianFoodMart
-#mondrian.jdbcDrivers=sun.jdbc.odbc.JdbcOdbcDriver
-#driver.classpath=
-
-# Hypersonic
-#mondrian.foodmart.jdbcURL=jdbc:hsqldb:demo/hsql/FoodMart
-#mondrian.jdbcDrivers=org.hsqldb.jdbcDriver
-#driver.classpath=xx
-
-# MySQL: needs user and password set in JDBC URL
-#mondrian.foodmart.jdbcURL=jdbc:mysql://localhost/foodmart?user=foodmart&password=foodmart
-#mondrian.jdbcDrivers=com.mysql.jdbc.Driver
-#driver.classpath=G:/mysql-connector-3.0.18
-
-# Postgres: needs user and password
-#mondrian.foodmart.jdbcURL=jdbc:postgresql://localhost/FM3
-#mondrian.foodmart.jdbcUser=postgres
-#mondrian.foodmart.jdbcPassword=pgAdmin
-#mondrian.jdbcDrivers=org.postgresql.Driver
-
-# Derby: needs user and password
-#mondrian.foodmart.jdbcURL=jdbc:derby:/Derby_10_0_2_1/foodmart
-#mondrian.foodmart.jdbcUser=sa
-#mondrian.foodmart.jdbcPassword=sa
-#mondrian.jdbcDrivers=org.apache.derby.jdbc.EmbeddedDriver
-
+#scp.user=jhyde@mondrian.sourceforge.net
+#scp.path=/home/groups/m/mo/mondrian/htdocs
 
 # End build.properties
-
-

mondrian.properties

@@ -2,7 +2,8 @@
 # This software is subject to the terms of the Common Public License
 # Agreement, available at the following URL:
 # http://www.opensource.org/licenses/cpl.html.
-# Copyright (C) 2001-2005 Kana Software, Inc. and others.
+# Copyright (C) 2001-2002 Kana Software, Inc.
+# Copyright (C) 2001-2006 Julian Hyde and others.
 # All Rights Reserved.
 # You must accept the terms of that agreement to use this software.
 # jhyde, 31 October, 2001
@@ -55,8 +56,11 @@ RoleXX='California manager';
 
 # MySQL: needs user and password set in JDBC URL
 #mondrian.foodmart.jdbcURL=jdbc:mysql://localhost/foodmart?user=foodmart&password=foodmart
+#mondrian.foodmart.jdbcURL=jdbc:mysql://localhost/foodmart
+#mondrian.foodmart.jdbcUser=foodmart
+#mondrian.foodmart.jdbcPassword=foodmart
 #mondrian.jdbcDrivers=com.mysql.jdbc.Driver
-#driver.classpath=G:/mysql-connector-3.0.18
+#driver.classpath=D:/mysql-connector-3.1.12
 
 # Postgres: needs user and password
 #mondrian.foodmart.jdbcURL=jdbc:postgresql://localhost/FM3
@@ -65,10 +69,11 @@ RoleXX='California manager';
 #mondrian.jdbcDrivers=org.postgresql.Driver
 
 # Derby: needs user and password
-#mondrian.foodmart.jdbcURL=jdbc:derby:/Derby_10_0_2_1/foodmart
+#mondrian.foodmart.jdbcURL=jdbc:derby:demo/derby/foodmart
 #mondrian.foodmart.jdbcUser=sa
 #mondrian.foodmart.jdbcPassword=sa
 #mondrian.jdbcDrivers=org.apache.derby.jdbc.EmbeddedDriver
+#driver.classpath=testlib/derby.jar
 
 ###############################################################################
 # Uncomment the following lines to run subsets of the test suite.
@@ -95,28 +100,88 @@ RoleXX='California manager';
 # Replace LOG4J_PROPERTIES_LOCATION with path to log4j.properties file.
 #log4j.configuration=file://LOG4J_PROPERTIES_LOCATION/log4j.xml
 
-# Set to 1 or higher to print out SQL statements.
-#mondrian.trace.level=1
+###############################################################################
+# Property which controls the amount of tracing displayed.
+# 
+# If trace level is above 0, SQL tracing will be enabled and logged as
+# per the "mondrian.debug.out.file" below. This is separate from Log4j
+# logging.
+#mondrian.trace.level=0
+
+###############################################################################
+# Property containing the name of the file to which tracing is to be
+# written. If empty (the default), prints to stdout.
+#mondrian.debug.out.file=
 
-# Set the number of members above which a dimension is considered to be too
-# large to hold everything in memory.
+###############################################################################
+# Property which determines when a dimension is considered "large".
+# If a dimension has more than this number of members, Mondrian uses a
+# smart member reader (mondrian.rolap.SmartMemberReader).
 #mondrian.rolap.LargeDimensionThreshold=100
 
 ###############################################################################
-# Additional products. Uncomment the ones you have installed.
+# Maximum number of simultaneous queries the system will allow.
+# 
+# Oracle fails if you try to run more than the 'processes' parameter in
+# init.ora, typically 150. The throughput of Oracle and other databases
+# will probably reduce long before you get to their limit.
+#mondrian.query.limit=40
 
-#tomcat.home=E:/jakarta-tomcat-4.1.18
-#weblogic.home=E:/bea/wlserver6.1
+###############################################################################
+# Boolean property that controls whether Mondrian uses aggregate tables.
+# 
+# If true, then Mondrian uses aggregate tables. This property is
+# queried prior to each aggregate query so that changing the value of this
+# property dynamically (not just at startup) is meaningful.
+# 
+# Aggregates can be read from the database using the
+# ReadAggregates property but will not be used unless this
+# property is set to true.
+#mondrian.rolap.aggregates.Use=false
 
-# Limit the number of SQL queries we can execute at one time. Oracle fails if
-# you try to run more than the 'processes' parameter in init.ora, typically
-# 150. The throughput of Oracle and other databases will probably reduce long
-# before you get to their limit.
-#mondrian.query.limit=5
+###############################################################################
+# Boolean property which determines whether Mondrian should read aggregate
+# tables.
+#
+# If set to true, then Mondrian scans the database for aggregate tables.
+# Unless mondrian.rolap.aggregates.Use is set to true, the aggregates
+# found will not be used.
+#mondrian.rolap.aggregates.Read=false
 
-# Allow the use of aggregate tables
-mondrian.rolap.aggregates.Use=true
-mondrian.rolap.aggregates.Read=true
 #mondrian.rolap.generate.formatted.sql=true
 
+###############################################################################
+# Integer property which controls whether to test operators' dependencies,
+# and how much time to spend doing it.
+# 
+# If this property is positive, Mondrian's test framework allocates an
+# expression evaluator which evaluates each expression several times, and
+# makes sure that the results of the expression are independent of
+# dimensions which the expression claims to be independent of.
+#mondrian.test.ExpDependencies=0
+
+###############################################################################
+# Seed for random number generator used by some of the tests.
+#
+# Any value besides 0 or -1 gives deterministic behavior.
+# The default value is 1234: most users should use this.
+# Setting the seed to a different value can increase coverage, and
+# therefore may uncover new bugs.
+# 
+# If you set the value to 0, the system will generate its own
+# pseudo-random seed.
+# 
+# If you set the value to -1, Mondrian uses the next seed from an
+# internal random-number generator. This is a little more deterministic
+# than setting the value to 0.
+#mondrian.test.random.seed=1234
+
+###############################################################################
+# Boolean property which controls whether to use a cache for frequently
+# evaluated expressions. With the cache disabled, an expression like
+# Rank([Product].CurrentMember,
+# Order([Product].MEMBERS, [Measures].[Unit Sales])) would perform
+# many redundant sorts. The default is true.
+#mondrian.expCache.enable=true
+
 # End mondrian.properties

src/main/mondrian/olap/MondrianProperties.java

@@ -273,15 +273,15 @@ private void load(final PropertySource source) {
      * Property which controls the amount of tracing displayed.
      *
      * <p>If trace level is above 0, SQL tracing will be enabled and logged as
-     * per the <code>out.file</code> below. This is separate from Log4j
-     * logging.
+     * per the <code>{@link #DebugOutFile mondrian.debug.out.file}</code>
+     * property below. This is separate from Log4j logging.
      */
     public final IntegerProperty TraceLevel = new IntegerProperty(
             this, "mondrian.trace.level");
 
     /**
      * Property containing the name of the file to which tracing is to be
-     * written.
+     * written. If empty (the default), prints to stdout.
      */
     public final StringProperty DebugOutFile = new StringProperty(
             this, "mondrian.debug.out.file", null);