MONDRIAN:

	Added aggregate tables into Access DB.
	Made Access DB as a zip file in Perforce.
	Added unzip-FoodMartAccessDB target and dependencies into build.xml to automate unpacking.
	Also added jdbcUser and jdbcPassword into test-dbms target.
	Additional examples of database setup in mondrian.properties

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

build.xml

@@ -226,7 +226,8 @@ parser,
 generate.resources,
 def,
 compile.java,
-unzip-FoodMartCreateData"/>
+unzip-FoodMartCreateData,
+unzip-FoodMartAccessDB"/>
 
   <target name="generate.resources">
     <taskdef name="resgen" classname="org.eigenbase.resgen.ResourceGenTask">
@@ -346,7 +347,7 @@ in {mondrian.foodmart.jdbcURL}.">
       <sysproperty key="mondrian.test.foodmart.catalogURL"
           value="${mondrian.foodmart.catalogURL}"/>
       <sysproperty key="mondrian.test.connectString"
-          value="Provider=mondrian;Jdbc='${mondrian.foodmart.jdbcURL}';Catalog='${mondrian.foodmart.catalogURL}'"/>
+          value="Provider=mondrian;Jdbc='${mondrian.foodmart.jdbcURL}';JdbcUser='${mondrian.foodmart.jdbcUser}';JdbcPassword='${mondrian.foodmart.jdbcPassword}';Catalog='${mondrian.foodmart.catalogURL}'"/>
       <!-- tests require en_US locale -->
       <sysproperty key="user.language" value="en"/>
       <sysproperty key="user.region" value="US"/>
@@ -497,10 +498,32 @@ doc/deployDoc.sh" />
     <touch file="demo/FoodMartCreateData.sql"/>
   </target>
 
+  <target name="check-FoodMartAccessDB-uptodate">
+    <condition property="FoodMartAccessDB.uptodate">
+      <or>
+        <not>
+          <available file="demo/access/MondrianFoodMart-Access.zip"/>
+        </not>
+        <uptodate
+            srcfile="demo/access/MondrianFoodMart-Access.zip"
+            targetfile="demo/access/MondrianFoodMart.mdb"/>
+      </or>
+    </condition>
+  </target>
+
+  <target name="unzip-FoodMartAccessDB"
+      depends="check-FoodMartAccessDB-uptodate"
+      unless="FoodMartAccessDB.uptodate">
+    <unzip src="demo/access/MondrianFoodMart-Access.zip" dest="demo/access">
+      <patternset includes="MondrianFoodMart.mdb"/>
+    </unzip>
+    <touch file="demo/access/MondrianFoodMart.mdb"/>
+  </target>
+
   <target name="release" depends="binzip"/>
 
   <target name="binzip"
-      depends="version,war,javadoc,srczip,unzip-FoodMartCreateData">
+      depends="version,war,javadoc,srczip,unzip-FoodMartCreateData,unzip-FoodMartAccessDB">
     <mkdir dir="${dist.dir}" />
     <delete file="${dist.bin.file}"/>
     <zip zipfile="${dist.bin.file}">

mondrian.properties

@@ -33,11 +33,42 @@
 #mondrian.test.Class=mondrian.test.AccessControlTest
 #mondrian.test.Name=.*(testDistinct.*|testUnion.*)
 
+###############################################################################
+# FoodMart database connection set up for test suite
+#
+# Uncomment and change for your installation
+#
+# Put the JDBC driver jar into mondrian/testlib
+
+# ODBC
 #mondrian.foodmart.jdbcURL=jdbc:odbc:MondrianFoodMart
-#mondrian.foodmart.jdbcURL.oracle=jdbc:oracle:oci8:foodmart/foodmart@realm1
-#mondrian.foodmart.jdbcURL.access=jdbc:odbc:FoodMart 2000
-#mondrian.foodmart.jdbcURL.hsqldb=jdbc:hsqldb:demo/hsql/FoodMart
-#mondrian.foodmart.jdbcURL.mysql=jdbc:mysql://localhost/foodmart?user=foodmart&password=foodmart
+#mondrian.jdbcDrivers=sun.jdbc.odbc.JdbcOdbcDriver
+
+# Oracle: needs user and password
+#mondrian.foodmart.jdbcURL.oracle=jdbc:oracle:thin:@//<host>:<port>/<service_name>
+#mondrian.foodmart.jdbcUser=FOODMART
+#mondrian.foodmart.jdbcPassword=oracle
+#mondrian.jdbcDrivers=<Oracle JDBC driver class>
+
+# Hypersonic
+#mondrian.foodmart.jdbcURL=jdbc:hsqldb:demo/hsql/FoodMart
+#mondrian.jdbcDrivers=<Hypersonic JDBC driver class>
+
+# MySQL: needs user and password set in JDBC URL
+#mondrian.foodmart.jdbcURL=jdbc:mysql://localhost/myisamfm?user=root&password=root
+#mondrian.jdbcDrivers=com.mysql.jdbc.Driver
+
+# 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
 
 ###############################################################################
 # Diagnostics & tuning