MONDRIAN: Add olap4j to workbench classpath, and allow workbench to b…

…e invoked

    in development environment.

[git-p4: depot-paths = "//open/mondrian-release/3.2/": change = 13482]

workbench/workbench.sh

@@ -1,5 +1,6 @@
 #!/bin/bash
 # $Id$
+# Copyright (C) 2007-2010 Julian Hyde and others
 # Launch Mondrian Schema Workbench on Linux, UNIX or Cygwin
 
 # Platform specific path-separator.
@@ -9,7 +10,7 @@
 
 MONDRIAN_HOME=`cd \`dirname $0\`; pwd`
 if test ! -d "$MONDRIAN_HOME/lib"; then
-  MONDRIAN_HOME="`cd \`dirname $0\`/..; pwd`"
+    MONDRIAN_HOME="`cd \`dirname $0\`/..; pwd`"
 fi
 case `uname` in
 Windows_NT|CYGWIN*)
@@ -32,6 +33,7 @@ CP="${CP}${PS}${MONDRIAN_HOME}/lib/eigenbase-xom.jar"
 CP="${CP}${PS}${MONDRIAN_HOME}/lib/javacup.jar"
 CP="${CP}${PS}${MONDRIAN_HOME}/lib/log4j.jar"
 CP="${CP}${PS}${MONDRIAN_HOME}/lib/mondrian.jar"
+CP="${CP}${PS}${MONDRIAN_HOME}/lib/olap4j.jar"
 CP="${CP}${PS}${MONDRIAN_HOME}/lib/jlfgr.jar"
 CP="${CP}${PS}${MONDRIAN_HOME}/lib/commons-math.jar"
 CP="${CP}${PS}${MONDRIAN_HOME}/lib/commons-vfs.jar"
@@ -78,7 +80,13 @@ done
 JAVA_FLAGS="-Xms100m -Xmx500m"
 #JAVA_FLAGS="-verbose $JAVA_FLAGS"
 
-. "$MONDRIAN_HOME/set-pentaho-java.sh"
+# Standard pentaho environment. Script lives in workbench directory in a
+# development environment, MONDRIAN_HOME otherwise.
+if test -x "$MONDRIAN_HOME/workbench/set-pentaho-java.sh"; then
+    . "$MONDRIAN_HOME/workbench/set-pentaho-java.sh"
+else
+    . "$MONDRIAN_HOME/set-pentaho-java.sh"
+fi
 setPentahoJava
 
 exec "$_PENTAHO_JAVA" $JAVA_FLAGS -cp "$CP" mondrian.gui.Workbench