MONDRIAN: Oops!

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

build.properties

@@ -17,10 +17,9 @@
 #build.compiler.pedantic=false
 #build.compiler.fulldepend=false
 
-# Properties for the "upload-javadoc" target. Change the password.
-pscp.password=changeme
-pscp.user=jhyde@mondrian.sourceforge.net
-pscp.path=/home/groups/m/mo/mondrian/htdocs
+# Properties for the "upload-javadoc" target.
+scp.user=jhyde@mondrian.sourceforge.net
+scp.path=/home/groups/m/mo/mondrian/htdocs
 
 # To run the test suite, first load the FoodMart data set into the
 # database of your choice. Then set the driver.classpath,
@@ -31,7 +30,7 @@ pscp.path=/home/groups/m/mo/mondrian/htdocs
 #oracle.home=G:/oracle/product/10.1.0/Db_1
 #driver.classpath=${oracle.home}/jdbc/lib/classes12.zip
 # Thin JDBC connect string:
-mondrian.foodmart.jdbcURL=jdbc:oracle:thin:@//stilton:1521/orcl
+#mondrian.foodmart.jdbcURL=jdbc:oracle:thin:@//stilton:1521/orcl
 # OCI-style connect string:
 #mondrian.foodmart.jdbcURL=jdbc:oracle:oci8:foodmart/foodmart@orcl
 #mondrian.jdbcDrivers=oracle.jdbc.OracleDriver

src/main/mondrian/olap/MondrianProperties.java

@@ -174,7 +174,7 @@ public int getResultLimit() {
 	public static final String ResultLimit = "mondrian.result.limit";
 
 	// mondrian.rolap properties
-	
+
 	/** Retrieves the value of the {@link #CachePoolCostLimit} property,
 	 * default value {@link #CachePoolCostLimit_Default}. */
 	public int getCachePoolCostLimit() {
@@ -239,12 +239,18 @@ public String getTestConnectString() {
 
 	// miscellaneous
 
-	/** Retrieves the value of the {@link #JdbcURL} property. */
+	/**
+     * Retrieves the value of the {@link #JdbcURL} property.
+     * The {@link #JdbcURL_Default default value} connects to an ODBC data
+     * source.
+     */
 	public String getFoodmartJdbcURL() {
-		return getProperty(JdbcURL, "jdbc:hsqldb:demo/hsql/FoodMart");
+		return getProperty(JdbcURL, JdbcURL_Default);
 	}
 	/** Property {@value}. */
 	public static final String JdbcURL = "mondrian.foodmart.jdbcURL";
+    /** Value is {@value}. */
+    public static final String JdbcURL_Default = "jdbc:odbc:MondrianFoodMart";
 
 	/**
 	 * Retrieves the value of the {@link #LargeDimensionThreshold} property.