diff --git a/build.xml b/build.xml
index eb46c41..4b3755e 100644
--- a/build.xml
+++ b/build.xml
@@ -96,7 +96,7 @@ src/org/olap4j/driver/xmla/XmlaOlap4jDriverVersion.java" />
-
-
+
-
-
@@ -344,12 +340,8 @@ class XmlaOlap4jDriverVersion {
-
-
-
-
diff --git a/ivy-tck.xml b/ivy-tck.xml
index 9e5d732..692cc2b 100644
--- a/ivy-tck.xml
+++ b/ivy-tck.xml
@@ -50,7 +50,9 @@
-
+
+
diff --git a/test.properties b/test.properties
index 92ce817..215769c 100644
--- a/test.properties
+++ b/test.properties
@@ -33,8 +33,8 @@
###############################################################################
# This activates the Mondrian in-process tester.
# It is the default in-process Mondrian tester.
-# By default, it will use a file based HSQLDB in the
-# /foodmart folder. If you want to test olap4j against
+# By default, it will use a MySQL database containing
+# the Foodmart database. If you want to test olap4j against
# a different database, edit 'org.olap4j.test.connectUrl'
org.olap4j.test.helperClassName=mondrian.test.MondrianOlap4jTester
@@ -87,27 +87,30 @@ org.olap4j.test.helperClassName=mondrian.test.MondrianOlap4jTester
# tester, or if your Foodmart is deployed on another DBMS.
# If you deploy Foodmart in another DBMS and you modify this line,
# you might want to set 'org.olap4j.foodmartLoader.disabled' down below.
-org.olap4j.test.connectUrl=jdbc\:mondrian\:Catalog\=./foodmart/FoodMart.xml;;JdbcDriver\=org.hsqldb.jdbcDriver;Jdbc\=jdbc\:hsqldb\:file\:foodmart/foodmart;JdbcUser\=sa;JdbcPassword\=
+org.olap4j.test.connectUrl=jdbc\:mondrian\:Catalog\=./foodmart/FoodMart.xml;JdbcDrivers\=com.mysql.jdbc.Driver;Jdbc\=jdbc\:mysql\://localhost\:3306/foodmart;JdbcUser\=foodmart;JdbcPassword\=foodmart
-# This is an example URL for Foodmart deployed in MySQL.
+# This is an example URL for Foodmart deployed in HSQL.
# You will need to add a JAR driver into the 'dev-lib' folder
# for it to work.
-#org.olap4j.test.connectUrl=jdbc\:mondrian\:Catalog\=./foodmart/FoodMart.xml;;JdbcDriver\=com.mysql.jdbc.Driver;Jdbc\=jdbc\:mysql\://localhost\:3306/foodmart;JdbcUser\=foodmart;JdbcPassword\=foodmart
+#org.olap4j.test.connectUrl=jdbc\:mondrian\:Catalog\=./foodmart/FoodMart.xml;;JdbcDriver\=org.hsqldb.jdbcDriver;Jdbc\=jdbc\:hsqldb\:file\:foodmart/foodmart;JdbcUser\=sa;JdbcPassword\=
###############################################################################
# These properties allow the build script to load FoodMart into
-# an HSQLDB database so it can run the tests.
-# It only gets executed once, or after invocations of 'clean-all'.
-# It is possible to make this script deploy Foodmart in another
+# a database so it can run the tests.
+# It is possible to make this script deploy Foodmart in a
# DBMS and run the tests against it, but it needs some hacking.
-# You would need to tweak 'org.olap4j.test.connectUrl' and
+# The Ant targets to clean/deploy Foodmart are 'clean-foodmart'
+# and 'init-foodmart'.
+# You also need to tweak 'org.olap4j.test.connectUrl' and
# disable some checks in build.xml.
-org.olap4j.foodmartLoader.driver=org.hsqldb.jdbcDriver
-org.olap4j.foodmartLoader.url=jdbc\:hsqldb\:file\:foodmart/foodmart
-org.olap4j.foodmartLoader.user=sa
-org.olap4j.foodmartLoader.password=
-# You can disable the loader altogether by uncommenting this line.
-#org.olap4j.foodmartLoader.disabled=true
+
+#org.olap4j.foodmartLoader.driver=com.mysql.jdbc.Driver
+#org.olap4j.foodmartLoader.url=jdbc\:mysql\://localhost\:3306/foodmart
+#org.olap4j.foodmartLoader.user=foodmart
+#org.olap4j.foodmartLoader.password=foodmart
+
+# You can enable the loader by uncommenting this line.
+org.olap4j.foodmartLoader.disabled=true
###############################################################################
# End test.properties