Create META-INF/services/java.sql.Driver under classes so that driver

discovery works in dev environment.
Fix ANT_HOME and comments in buildJdk16.bat.


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

build.xml

@@ -121,6 +121,12 @@ ${jar-jdk14.file}"/>
 
   <target name="prepare">
     <mkdir dir="${classes.dir}"/>
+    <copy todir="${classes.dir}">
+      <fileset
+          dir="${src.dir}"
+          includes="
+META-INF/**"/>
+    </copy>
     <mkdir dir="${testclasses.dir}"/>
     <mkdir dir="${build.dir}"/>
     <mkdir dir="${testlib.dir}"/>
@@ -309,12 +315,6 @@ must be run under JDK 1.5." />
 
   <target name="jar" depends="version,checkIsNotJdk16,compile,compileJdk16">
     <mkdir dir="${lib.dir}" />
-    <!-- Declare driver so that it can we loaded implicitly, without using
-         'Class.forName'. Requires JDBC 4.0 (JDK 1.6) and later. -->
-    <mkdir dir="${classes.dir}/META-INF/services" />
-    <echo
-        file="${classes.dir}/META-INF/services/java.sql.Driver"
-        message="org.olap4j.driver.xmla.XmlaOlap4jDriver" />
     <zip
         zipfile="${jar.file}"
         update="true">

buildJdk16.bat

@@ -1,11 +1,15 @@
-# $Id$
-# Called recursively from 'ant release' to build the files which can only be
-# built under JDK 1.6.
+@echo off
+rem $Id$
+rem Called recursively from 'ant release' to build the files which can only be
+rem built under JDK 1.6.
+
+rem Change the following line to point to your JDK 1.6 home.
+set JAVA_HOME=C:\jdk1.6.0_11
+
+rem Change the following line to point to your ant home.
+set ANT_HOME=C:\open\thirdparty\ant
 
-# Change the following line to point to your JDK 1.6 home.
-set JAVA_HOME=C:\jdk1.6.0_01
 set PATH=%JAVA_HOME%\bin;%PATH%
-ant compile.java
+%ANT_HOME%\bin\ant compile.java
 
 # End buildJdk16.bat
-

src/META-INF/services/java.sql.Driver

@@ -0,0 +1 @@
+org.olap4j.driver.xmla.XmlaOlap4jDriver