Index: jmeter/build.xml
===================================================================
--- jmeter/build.xml	(revision 108932)
+++ jmeter/build.xml	(working copy)
@@ -157,7 +157,7 @@
   </target>
   
   <target name="shutdown-database">
-    <sql driver="org.hsqldb.jdbc.JDBCDriver" 
+    <sql driver="org.hsqldb.jdbcDriver" 
          url="jdbc:hsqldb:hsql://localhost" 
          userid="sa" password="" 
          classpathref="jmeter.classpath"
@@ -174,9 +174,11 @@
          classpathref="jmeter.classpath" />
   </target>
   
-  <target name="server" unless="server.isAvailable" depends="database,check-server-isRunning">
-    <exec executable="./run.sh" spawn="true" dir="${server-home}/bin" />
-    <echo message="Started server." />
+  <target name="server" unless="server.isAvailable" depends="database,check-server-isRunning,build-servers.os-check">
+    <exec executable="${exec}" spawn="true" dir="${server-home}/bin">
+      <arg line="run.${ext}"/>
+    </exec>
+    <echo message="Started server."/>
   </target>
   
   <target name="check-server-isRunning">
Index: jmeter/src/main/resources/jca-local-h2-ds.xml
===================================================================
--- jmeter/src/main/resources/jca-local-h2-ds.xml	(revision 108875)
+++ jmeter/src/main/resources/jca-local-h2-ds.xml	(working copy)
@@ -4,7 +4,7 @@
   <datasource jndi-name="SampleDS" pool-name="SampleDS">
     <connection-url>jdbc:hsqldb:hsql://localhost</connection-url>
     <!-- The driver class -->
-    <driver-class>org.hsqldb.jdbc.JDBCDriver</driver-class>
+    <driver-class>org.hsqldb.jdbcDriver</driver-class>
     <pool>
       <!-- The minimum connections in a pool/sub-pool. Pools are lazily constructed on first use -->
       <min-pool-size>5</min-pool-size>