olap4j build: don't include java.sql.Driver twice in olap4j.jar; gene…

…rate javadoc for XMLA driver; rename olap4j-sources.jar to olap4j-source.jar

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

build.xml

@@ -3,7 +3,7 @@
  == This software is subject to the terms of the Common Public License
  == Agreement, available at the following URL:
  == http://www.opensource.org/licenses/cpl.html.
- == Copyright (C) 2006-2008 Julian Hyde and others.
+ == Copyright (C) 2006-2009 Julian Hyde and others.
  == All Rights Reserved.
  == You must accept the terms of that agreement to use this software.
  -->
@@ -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.7.135"/>
+ <property name="version" value="0.9.7.145"/>
  <property name="dist.name" value="${name}-${version}" />
 
  <!-- properties related to paths -->
@@ -38,12 +38,11 @@
  <property name="mondrian.classes.dir" value="${mondrian.dir}/classes" />
  <property name="mondrian.testclasses.dir" value="${mondrian.dir}/testclasses" />
  <property name="mondrian.lib.dir" value="${mondrian.dir}/lib" />
- <property name="mondrian.testlib.dir" value="${mondrian.dir}/testlib" />
 
  <!-- generated files -->
  <property name="jar.file" value="${lib.dir}/${name}.jar" />
  <property name="jar-jdk14.file" value="${lib.dir}/${name}-jdk14.jar" />
- <property name="sources.jar.file" value="${lib.dir}/${name}-sources.jar" />
+ <property name="source.jar.file" value="${lib.dir}/${name}-source.jar" />
  <property name="javadoc.jar.file" value="${lib.dir}/${name}-javadoc.jar" />
  <property name="dist.bin.file" value="${dist.dir}/${dist.name}.zip" />
  <property name="dist.src.file" value="${dist.dir}/${dist.name}-src.zip" />
@@ -55,7 +54,7 @@ ${src.dir}/org/olap4j/mdx/parser/impl/DefaultMdxParserSym.java"/>
 
  <property name="generated.lib.files" value="
 ${jar.file},
-${sources.jar.file},
+${source.jar.file},
 ${javadoc.jar.file},
 ${jar-jdk14.file}"/>
 
@@ -80,9 +79,6 @@ ${jar-jdk14.file}"/>
  <fileset dir="${mondrian.lib.dir}">
  <include name="**/*.jar"/>
  </fileset>
- <fileset dir="${mondrian.testlib.dir}">
- <include name="**/*.jar"/>
- </fileset>
  <pathelement location="${mondrian.classes.dir}"/>
  <pathelement location="${mondrian.testclasses.dir}"/>
  </path>
@@ -235,7 +231,7 @@ buildJdk16.sh" />
  </zip>
  </target>
 
- <target name="release" depends="clean-deep, binzip, sourcesjar, javadocjar"/>
+ <target name="release" depends="clean-deep, binzip, sourcejar, javadocjar"/>
 
  <target name="binzip"
  depends="clean,version,jar,srczip,retroweave,jar-jdk14,javadoc,javadoc-pdf">
@@ -309,8 +305,12 @@ must be run under JDK 1.5." />
  </target>
 
  <target name="compileJdk16">
- <exec osfamily="unix" executable="buildJdk16.sh"/>
- <exec osfamily="windows" executable="buildJdk16.bat"/>
+ <exec osfamily="unix" executable="buildJdk16.sh">
+ <arg line="compile"/>
+ </exec>
+ <exec osfamily="windows" executable="buildJdk16.bat">
+ <arg line="compile"/>
+ </exec>
  </target>
 
  <target name="jar" depends="version,checkIsNotJdk16,compile,compileJdk16">
@@ -331,10 +331,6 @@ META-INF/**"/>
 LICENSE.html,
 README.txt,
 VERSION.txt"/>
- <fileset
- dir="${src.dir}"
- includes="
-META-INF/**"/>
  </zip>
  </target>
 
@@ -376,7 +372,7 @@ META-INF/**"/>
  classpathref="project.test.classpath"
  destdir="${javadoc.dir}"
  packagenames="org.olap4j.*"
- excludepackagenames="org.olap4j.driver.*,org.olap4j.impl.*,org.olap4j.mdx.parser.impl.*,org.olap4j.sample.*"
+ excludepackagenames="org.olap4j.impl.*,org.olap4j.mdx.parser.impl.*,org.olap4j.sample.*"
  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=168953&#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"
@@ -473,7 +469,7 @@ META-INF/**"/>
  classpathref="project.test.classpath"
  destdir="${javadoc.dir}"
  packagenames="org.olap4j.*"
- excludepackagenames="org.olap4j.driver.*,org.olap4j.impl.*,org.olap4j.mdx.parser.impl.*,org.olap4j.sample.*"
+ excludepackagenames="org.olap4j.impl.*,org.olap4j.mdx.parser.impl.*,org.olap4j.sample.*"
  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=168953&#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"
@@ -516,7 +512,7 @@ META-INF/**"/>
  <javadoc sourcepath="${src.dir}"
  classpathref="project.test.classpath"
  packagenames="org.olap4j.*"
- excludepackagenames="org.olap4j.driver.*,org.olap4j.mdx.parser.impl.*,org.olap4j.sample.*"
+ excludepackagenames="org.olap4j.impl.*,org.olap4j.mdx.parser.impl.*,org.olap4j.sample.*"
  overview="${src.dir}/overview.html"
  author="true"
  source="1.5"
@@ -566,13 +562,13 @@ META-INF/**"/>
  Does not include housekeeping files (e.g. build.xml) or even java
  source files from the test suite, so this is no substitute for the
  source distribution generated by srczip. -->
- <target name="sourcesjar"
+ <target name="sourcejar"
  depends="version"
  description="">
  <mkdir dir="${dist.dir}" />
- <delete file="${sources.jar.file}"/>
+ <delete file="${source.jar.file}"/>
  <zip
- zipfile="${sources.jar.file}"
+ zipfile="${source.jar.file}"
  update="true">
  <zipfileset
  dir="."