Changed dependencies order and fixed faulty delete task.

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

build.xml

@@ -37,12 +37,12 @@ ${src.dir}/org/olap4j/mdx/parser/impl/DefaultMdxParserSym.java" />
  <target name="setup" depends="compile,create-dot-classpath"
  description="Setups the project for eclipse." />
 
- <target name="hudson" depends="clean-all,clean-tests,version-properties,jar,jar-jdk14,source.jar,test,cobertura"
+ <target name="hudson" depends="clean-all,clean-tests,version-properties,jar,source.jar,test,cobertura,jar-jdk14"
  description="Sugar goal to build Olap4j from hudson." />
 
  <!-- Override to create a proper release. -->
  <target name="dist"
- depends="version-properties,jar,jar-jdk14,javadoc,javadoc-pdf,javadoc-with-ydoc,source.zip"
+ depends="version-properties,jar,javadoc,javadoc-pdf,javadoc-with-ydoc,jar-jdk14,source.zip"
  description="Creates a distribution">
  <zip zipfile="${dist.dir}/${zip.filename}">
  <zipfileset dir="${basedir}/doc" prefix="${ivy.artifact.id}-${project.revision}/doc"
@@ -144,10 +144,13 @@ test.properties.example" />
  We need to cleanup any remaining HSQL files, because lock files
  could still be there if previous tests crashed.
  -->
- <delete includeemptydirs="false" dir="${basedir}/foodmart">
- <exclude name="foodmart.zip" />
- <exclude name="FoodMart.xml" />
- <exclude name=".svn" />
+ <delete includeemptydirs="false">
+ <fileset 
+ dir="${basedir}/foodmart"
+ defaultexcludes="true">
+ <exclude name="foodmart.zip"/>
+ <exclude name="FoodMart.xml"/>
+ </fileset>
  </delete>
  </target>
 
@@ -156,6 +159,14 @@ test.properties.example" />
  <mkdir dir="${testsrc.dir}" />
  <unzip src="${basedir}/foodmart/foodmart.zip" dest="${basedir}/foodmart/"
  overwrite="false" />
+<!-- <sql driver="org.hsqldb.jdbcDriver"-->
+<!-- url="jdbc:hsqldb:mem:olap4j-test"-->
+<!-- userid="sa" password="" >-->
+<!-- <classpath>-->
+<!-- <path refid="test.classpath" />-->
+<!-- </classpath>-->
+<!-- <transaction src="${basedir}/foodmart/foodmart.script"/>-->
+<!-- </sql>-->
  </target>
 
  <!-- override compile task to account for special jdk handling -->

simple-jndi/jdbc.properties

@@ -1,5 +1,6 @@
 SampleData/type=javax.sql.DataSource
 SampleData/driver=org.hsqldb.jdbcDriver
 SampleData/url=jdbc:hsqldb:file:foodmart/foodmart
+#SampleData/url=jdbc:hsqldb:mem:olap4j-test
 SampleData/user=sa
 SampleData/password=