Add test mode that wraps connections in a connection-pool (currently …

…just apache commons-dbcp); fix xmla driver for JDK 1.4; fix connection-leak in test framework; make test framework work with commons-dbcp (but still some bugs with XMLA driver and commons-dbcp); collect into an enum all properties used by the test framework; more javadoc.

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

build.xml

@@ -60,6 +60,8 @@ ${jar-jdk14.file}"/>
  <pathelement location="${lib.dir}/xercesImpl.jar"/>
  <pathelement location="${testlib.dir}/junit.jar"/>
  <pathelement location="${testlib.dir}/servlet.jar"/>
+ <pathelement location="${testlib.dir}/commons-dbcp.jar"/>
+ <pathelement location="${testlib.dir}/commons-pool.jar"/>
  </path>
 
  <path id="project.test.classpath">
@@ -75,8 +77,6 @@ ${jar-jdk14.file}"/>
  <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"/>
@@ -491,6 +491,10 @@ META-INF/**"/>
  </target>
 
  <target name="test" depends="prepare, compile, compile.tests">
+ <antcall target="test-nobuild"/>
+ </target>
+
+ <target name="test-nobuild">
  <junit printsummary="yes" fork="yes" failureproperty="junit.failure"
  tempdir="${testlog.dir}">
  <formatter type="plain"/>

src/org/olap4j/driver/xmla/XmlaOlap4jConnection.java

@@ -740,22 +740,12 @@ public String generateRequest(
  * @param value to be xml encoded
  * @return an XML encode string or the value is not required.
  */
- private static String xmlEncode(String value){
- if (value.indexOf('&') >= 0) {
- value = value.replace("&", "&");
- }
- if (value.indexOf('<') >= 0) {
- value = value.replace("<", "&lt;");
- }
- if (value.indexOf('>') >= 0) {
- value = value.replace(">", "&gt;");
- }
- if (value.indexOf('"') >= 0) {
- value = value.replace("\"", "&quot;");
- }
- if (value.indexOf('\'') >= 0) {
- value = value.replace("'", "&apos;");
- }
+ private static String xmlEncode(String value) {
+ value = Olap4jUtil.replace(value, "&", "&amp;");
+ value = Olap4jUtil.replace(value, "<", "&lt;");
+ value = Olap4jUtil.replace(value, ">", "&gt;");
+ value = Olap4jUtil.replace(value, "\"", "&quot;");
+ value = Olap4jUtil.replace(value, "'", "&apos;");
  return value;
  }