[jboss-cvs] JBossAS SVN: r108933 - in projects/jboss-jca/branches/performance/jmeter: src/main/resources and 1 other directory.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Oct 27 09:26:47 EDT 2010
Author: jesper.pedersen
Date: 2010-10-27 09:26:47 -0400 (Wed, 27 Oct 2010)
New Revision: 108933
Modified:
projects/jboss-jca/branches/performance/jmeter/build.xml
projects/jboss-jca/branches/performance/jmeter/src/main/resources/jca-local-h2-ds.xml
Log:
[JBJCA-453] Fix JMeter integration to be platform independent
Modified: projects/jboss-jca/branches/performance/jmeter/build.xml
===================================================================
--- projects/jboss-jca/branches/performance/jmeter/build.xml 2010-10-27 13:01:48 UTC (rev 108932)
+++ projects/jboss-jca/branches/performance/jmeter/build.xml 2010-10-27 13:26:47 UTC (rev 108933)
@@ -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">
Modified: projects/jboss-jca/branches/performance/jmeter/src/main/resources/jca-local-h2-ds.xml
===================================================================
--- projects/jboss-jca/branches/performance/jmeter/src/main/resources/jca-local-h2-ds.xml 2010-10-27 13:01:48 UTC (rev 108932)
+++ projects/jboss-jca/branches/performance/jmeter/src/main/resources/jca-local-h2-ds.xml 2010-10-27 13:26:47 UTC (rev 108933)
@@ -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>
More information about the jboss-cvs-commits
mailing list