Up olap4j version; remove jars required by mondrian driver (now that …

…it lives under mondrian).

git-svn-id: https://olap4j.svn.sourceforge.net/svnroot/olap4j/trunk@72 c6a108a4-781c-0410-a6c6-c2d559e19af0

README.txt

@@ -1,6 +1,6 @@
 # $Id$
 
-olap4j, release 0.9 (beta)
+olap4j, release 0.9.4 (beta)
 
 Contents of this distribution
 -----------------------------
@@ -9,34 +9,15 @@ This is a distribution of olap4j, the open Java API for accessing OLAP data.
 For version information, see VERSION.txt.
 For licensing, see LICENSE.html.
 
-This release of olap4j contains a driver implementation based on the mondrian
-OLAP engine. In a future version, the driver will become part of the mondrian
-project and distribution, and the olap4j distribution will get a lot lighter!
+This release of olap4j contains a driver implementation based on the XML for
+Analysis (XML/A) protocol. There is also an olap4j driver for mondrian; this
+is part of the mondrian distribution from mondrian-3.0 onwards.
 
 olap4j requires the following files at run time:
 
 * lib/olap4j.jar (or lib/olap4j-jdk14.jar if you are running JDK 1.4)
 * lib/javacup.jar
-
-The mondrian driver requires the following additional files at run time:
-
-* lib/log4j-1.2.9.jar
-* lib/mondrian.jar (or lib/mondrian-jdk14.jar if you are running JDK 1.4)
-* lib/commons-dbcp.jar
-* lib/commons-pool.jar
-* lib/commons-collections.jar
-* lib/commons-math-1.0.jar
-* lib/commons-logging.jar
-* lib/commons-vfs.jar
-* lib/eigenbase-properties.jar
-* lib/eigenbase-resgen.jar
-* lib/eigenbase-xom.jar
 * lib/log4j-1.2.9.jar
-* lib/javacup.jar
-
-Note that mondrian.jar is built from a development version of mondrian, not
-an official release. The source code was p4:perforce.eigenbase.org:1666 (a
-point between mondrian-2.4.2 and mondrian-3.0), change 10247.
 
 Building olap4j from source
 ---------------------------
@@ -74,7 +55,7 @@ Running the test suite
 
 Follow the instructions for 'Building olap4j from source'. Then:
 
-1. Download the latest mondrian release (mondrian-2.4.2) and use the
+1. Download the latest mondrian release and use the
  MondrianFoodMartLoader utility to load the sample database into the DBMS of
  your choice.
 2. In the root of the source tree, create a file called "test.properties"
@@ -95,13 +76,12 @@ You can now write and run a simple program against olap4j. For example,
  import org.olap4j.metadata.Member;
  import java.sql.*;
 
- Class.forName("mondrian.olap4j.MondrianOlap4jDriver");
+ Class.forName("org.olap4j.driver.xmla.XmlaOlap4jDriver");
  Connection connection =
  DriverManager.getConnection(
- "jdbc:mondrian:"
- + "Jdbc='jdbc:odbc:MondrianFoodMart';"
- + "Catalog='file://c:/open/mondrian/demo/FoodMart.xml';"
- + "JdbcDrivers=sun.jdbc.odbc.JdbcOdbcDriver;");
+ "jdbc:xmla:"
+ + "Server=http://deedub:8080/mondrian/xmla;"
+ + "Catalog=FoodMart");
  OlapConnection olapConnection = connection.unwrap(OlapConnection.class);
  OlapStatement statement = olapConnection.createStatement();
  CellSet cellSet =
@@ -123,11 +103,24 @@ You can now write and run a simple program against olap4j. For example,
  }
  }
 
+
+Or if you are using the in-process mondrian driver, include mondrian.jar
+and its dependencies in your classpath, and change the
+appropriate lines in the above code to the following:
+
+ Class.forName("mondrian.olap4j.MondrianOlap4jDriver");
+ Connection connection =
+ DriverManager.getConnection(
+ "jdbc:mondrian:"
+ + "Jdbc='jdbc:odbc:MondrianFoodMart';"
+ + "Catalog='file://c:/open/mondrian/demo/FoodMart.xml';"
+ + "JdbcDrivers=sun.jdbc.odbc.JdbcOdbcDriver;");
+
 JDK 1.4
 -------
 
-This distribution includes JDK 1.4-compatible libraries for olap4j and
-mondrian. If you are using JDK version 1.4, replace olap4j.jar and mondrian.jar
-in your classpath with olap4j-jdk14.jar and mondrian-jdk14.jar.
+This distribution includes a JDK 1.4-compatible library for olap4j.
+If you are using JDK version 1.4, replace olap4j.jar in your classpath
+with olap4j-jdk14.jar.
 
 # End README.txt

build.xml

@@ -15,7 +15,7 @@
  <property file="${project.location}/test.properties"/>
  <property name="project.build.debug" value="on"/>
  <property name="name" value="olap4j"/>
- <property name="version" value="0.9.3"/>
+ <property name="version" value="0.9.4-svn072"/>
  <property name="dist.name" value="${name}-${version}" />
 
  <!-- properties related to paths -->
@@ -31,6 +31,11 @@
  <property name="javadoc.dir" value="doc/api"/>
  <property name="dist.dir" value="dist"/>
 
+ <!-- define location of mondrian; required only if testing the mondrian
+ olap4j driver -->
+ <property name="mondrian.dir" value="${project.location}/../mondrian" />
+ <property name="mondrian.lib.dir" value="${mondrian.dir}/lib" />
+
  <!-- generated files -->
  <property name="jar.file" value="${lib.dir}/${name}.jar" />
  <property name="jar-jdk14.file" value="${lib.dir}/${name}-jdk14.jar" />
@@ -54,41 +59,30 @@ ${jar-jdk14.file}"/>
  <pathelement location="${lib.dir}/javacup.jar"/>
  <pathelement location="${testlib.dir}/junit.jar"/>
  <pathelement location="${testlib.dir}/servlet.jar"/>
-
- <!-- To use the checked in mondrian.jar, make sure the <pathelement>
- element following this comment is uncommented; to develop code against
- 'live' mondrian source code, uncomment <pathelement> elements 2 and 3
- following this comment. If the latter, you will also need to define
- mondrian.dir in build.properties. Between releases, we don't keep
- mondrian.jar up to date, so probably the latter option is the only one
- which will work. One day the mondrian driver will be part of the
- mondrian source code and all mondrian dependencies will go away. -->
-<!--
- <pathelement location="${lib.dir}/mondrian.jar"/>
--->
- <pathelement location="${mondrian.dir}/classes"/>
- <pathelement location="${mondrian.dir}/testclasses"/>
-
- <!-- The following libraries are required by mondrian, and therefore olap4j
- needs them too, for now. When olap4j no longer depends on
- mondrian, and the mondrian olap4j driver is tested as part of
- mondrian's test suite, obsolete these libraries. -->
- <pathelement location="${lib.dir}/eigenbase-xom.jar"/>
- <pathelement location="${lib.dir}/eigenbase-properties.jar"/>
- <pathelement location="${lib.dir}/eigenbase-resgen.jar"/>
- <pathelement location="${lib.dir}/commons-dbcp.jar"/>
- <pathelement location="${lib.dir}/commons-pool.jar"/>
- <pathelement location="${lib.dir}/commons-collections.jar"/>
- <pathelement location="${lib.dir}/commons-vfs.jar"/>
- <pathelement location="${lib.dir}/commons-logging.jar"/>
- <pathelement location="${lib.dir}/commons-math-1.0.jar"/>
- <pathelement location="${lib.dir}/xercesImpl.jar"/>
  </path>
 
  <path id="project.test.classpath">
  <path refid="project.classpath"/>
  <pathelement location="${testclasses.dir}"/>
  <pathelement location="${org.olap4j.test.driverClasspath}"/>
+
+ <!-- Mondrian jars. If you are running against the mondrian driver,
+ define mondrian.lib.dir and uncomment the following lines. -->
+ <!--
+ <pathelement location="${mondrian.lib.dir}/mondrian.jar"/>
+ <pathelement location="${mondrian.dir}/testclasses"/>
+ <pathelement location="${mondrian.lib.dir}/eigenbase-xom.jar"/>
+ <pathelement location="${mondrian.lib.dir}/eigenbase-properties.jar"/>
+ <pathelement location="${mondrian.lib.dir}/eigenbase-resgen.jar"/>
+ <pathelement location="${mondrian.lib.dir}/commons-dbcp.jar"/>
+ <pathelement location="${mondrian.lib.dir}/commons-pool.jar"/>
+ <pathelement location="${mondrian.lib.dir}/commons-collections.jar"/>
+ <pathelement location="${mondrian.lib.dir}/commons-vfs.jar"/>
+ <pathelement location="${mondrian.lib.dir}/commons-logging.jar"/>
+ <pathelement location="${mondrian.lib.dir}/commons-math-1.0.jar"/>
+ <pathelement location="${mondrian.lib.dir}/xercesImpl.jar"/>
+ -->
+
  </path>
 
  <!-- Arguments to the java process spawned by the junit task. -->
@@ -101,7 +95,6 @@ ${jar-jdk14.file}"/>
  <echo>project.location = ${project.location}</echo>
  <echo>jdk.home = ${env.JAVA_HOME}</echo>
  <echo>junit.dir = ${junit.dir}</echo>
- <echo>retroweaver.dir = ${retroweaver.dir}</echo>
  <echo>==============================================================</echo>
  </target>
 
@@ -248,17 +241,6 @@ ${doc.dir}/api/**/*.xml,
 ${jar.file},
 ${jar-jdk14.file},
 lib/*.dtd,
-lib/mondrian.jar,
-lib/mondrian-jdk14.jar,
-lib/eigenbase-xom.jar,
-lib/eigenbase-properties.jar,
-lib/eigenbase-resgen.jar,
-lib/commons-dbcp.jar,
-lib/commons-pool.jar,
-lib/commons-collections.jar,
-lib/commons-vfs.jar,
-lib/commons-logging.jar,
-lib/commons-math-1.0.jar,
 lib/javacup.jar,
 lib/xercesImpl.jar,
 lib/log4j-1.2.9.jar,
@@ -397,7 +379,6 @@ META-INF/**"/>
  <tag name="testcase" description="Test-case:"
  scope="constructors,methods,types"/>
  <link href="http://java.sun.com/javase/6/docs/api/"/>
- <link href="http://mondrian.pentaho.org/api/"/>
  </javadoc>
  </target>
 
@@ -414,7 +395,7 @@ META-INF/**"/>
  <javadoc sourcepath="${src.dir}:${testsrc.dir}"
  classpathref="project.test.classpath"
  destdir="${javadoc.dir}"
- packagenames="org.olap4j.*,mondrian.olap4j.*"
+ packagenames="org.olap4j.*"
  overview="${src.dir}/overview.html"
  footer="&lt;a href=&quot;http://sourceforge.net/projects/olap4j&quot;&gt;&lt;img src=&quot;http://sourceforge.net/sflogo.php?group_id=35302&#38;type=1&quot; width=&quot;88&quot; height=&quot;31&quot; border=&quot;0&quot; alt=&quot;SourceForge.net_Logo&quot;&gt;&lt;/a&gt;"
  author="true"
@@ -429,7 +410,6 @@ META-INF/**"/>
  <tag name="testcase" description="Test-case:"
  scope="constructors,methods,types"/>
  <link href="http://java.sun.com/javase/6/docs/api/"/>
- <link href="http://mondrian.pentaho.org/api/"/>
  </javadoc>
  </target>
 
@@ -466,7 +446,6 @@ META-INF/**"/>
  <tag name="testcase" description="Test-case:"
  scope="constructors,methods,types"/>
  <link href="http://java.sun.com/javase/6/docs/api/"/>
- <link href="http://mondrian.pentaho.org/api/"/>
  <link href="http://www.junit.org/junit/javadoc/3.8/"/>
  <doclet
  name="ydoc.doclets.YStandard"