Index: build.xml
===================================================================
--- build.xml	(revision 108919)
+++ build.xml	(working copy)
@@ -114,7 +114,10 @@
   <property name="version.jboss.jnp-client" value="5.0.5.Final"/>
   <property name="version.jboss.serialization" value="1.0.3.GA"/>
   <property name="version.jboss.remoting" value="2.5.3"/>
+  <property name="version.jboss.servlet-api" value="2.5.0.GA"/>
+  <property name="version.jboss.jboss-transaction-api" value="1.0.1.GA"/>
 
+
   <!-- ================================= 
        Bootstrap Ivy
        ================================= -->
@@ -356,4 +359,11 @@
     <ivy:cleancache />
   </target>
 
+  <!-- ================================= 
+       Target: jmeter              
+       ================================= -->
+  <target name="jmeter">
+    <ant dir="jmeter" target="jmeter"/>
+  </target>
+
 </project>
Index: doc/perfguide/en/modules/about.xml
===================================================================
--- doc/perfguide/en/modules/about.xml	(revision 108786)
+++ doc/perfguide/en/modules/about.xml	(working copy)
@@ -26,7 +26,7 @@
     <para>
       Dimitris Andreadis, Carlo de Wolf, Jason Green, Jonathan Halliday, Søren Hilmer, Vicky Kak,  
       Aslak Knutsen, Sacha Labourey, Alexey Loubyansky, Patrick MacDonald, Andrig Miller,
-      Andrew Lee Rubinger, Anil Saldhana and Scott Stark.
+      Andrew Lee Rubinger, Anil Saldhana, Scott Stark and Jeremy Whiting.
     </para>
     
     <para>And a special thanks goes to Adrian Brock and Ales Justin for their continuous support of this project.</para>
Index: doc/perfguide/en/modules/benchmark.xml
===================================================================
--- doc/perfguide/en/modules/benchmark.xml	(revision 108786)
+++ doc/perfguide/en/modules/benchmark.xml	(working copy)
@@ -7,7 +7,7 @@
    <section id="servers">
      <title>JBoss AS and IronJacamar</title>
 
-     <para>JBoss AS 4.2.X, 5.X, 6.0 M4, IronJacamar Beta1 and daily</para>
+     <para>JBoss AS 4.2.X, 5.X, 6.0 M4, IronJacamar Beta3 and daily</para>
 
      <programlisting>
 ant download-servers
@@ -18,5 +18,26 @@
 ant benchmark-report-summary
      </programlisting>
    </section>
+   <section id="servers">
+   <title>IronJacamar and JMeter</title>
 
+   <para>JMeter has been setup to benchmark the IronJacama server for HTTP and JDBC loads. Using JMeter has the benefit of using it's flexible test configuration, results sampling and graphing capabilities.</para>
+   <para>Before using JMeter to benchmark you will need to run the following Ant targets only once. Execute these in the root directory of the performance branch. This will retrieve the sever distribution(s) needed and configures the file permissions necessary to start the server.</para>
+   <programlisting>
+ant download-servers
+ant benchmark</programlisting>
+     
+   <para>To start JMeter call the following Ant target. Calling this target starts a HSQLDB database and server required for benchmarking. The started database is populated with sample data. When the target executes it detects if a database is already running and will start it if not. The target does the same for the server.</para>
+   <programlisting>ant jmeter</programlisting>
+
+   <para>With the JMeter integration comes several Test Plans. Test Plans are JMeter test configurations containing the sequence of requests to create the desired load. The included test plans are straight forward. The default test plan is the first listed below and will be loaded when JMeter is started. To load a different test plan select "File - Open" from the JMeter menu.</para>
+   <programlisting>src/main/resources/jmeter/Http-Test.jmx
+src/main/resources/jmeter/CPU-usage-Http-Test.jmx (not available in Beta3 release)
+src/main/resources/jmeter/Direct-JDBC.jmx
+src/main/resources/jmeter/CPU-usage-Direct-JDBC.jmx (not available in Beta3 release)</programlisting>
+   </section>
+   
+   <para>The number of concurrent threads executing the requests can be configured in JMeter. See the <ulink url="http://jakarta.apache.org/jmeter/usermanual/index.html">JMeter User Manual</ulink> for step-by-step instructions.</para>
+   <para>To view the performance graph during a test run select the "Graph Results" node in the Test Plan.</para>
+
 </chapter>
Index: jmeter/build.xml
===================================================================
--- jmeter/build.xml	(revision 108875)
+++ jmeter/build.xml	(working copy)
@@ -22,156 +22,149 @@
 -->
 <project name="ironjacamar-performance-jmeter" default="jmeter" xmlns:ivy="antlib:org.apache.ivy.ant">
 
-  <!-- ================================= 
+   <import file="../build.xml" as="build-root" />
+   <import file="../servers/build.xml" as="build-servers" />
+
+   <!-- ================================= 
        Properties              
        ================================= -->
-  <property name="build.dir" value="../build/impl" />
-  <property name="build.jmeter.dir" value="${build.dir}/jmeter" />
-  <property name="target.dir" value="../target" />
-  <property name="javac.debug" value="false" />
-  <property name="javac.deprecation" value="false" />
-  <property name="javac.optimize" value="false" />
-  <property name="target.dir" value="false" />
-  <property name="jbjca-home" value="../root/servers/jbjca-1.0.0.Beta2/ironjacamar-1.0.0.Beta3" />
-  <property name="jmeter.tools.dir" value="../tools/jmeter" />
-  <property name="hsqldb.tools.dir" value="../tools/hsqldb" />
-  <import file="../build.xml" as="build-root"/>
-  
-  <path id="src.compile.classpath">
-    <fileset dir="../lib/common" includes="*.jar" />
-  </path>
-  
-  <path id="jmeter.classpath">
-    <fileset dir="${jmeter.tools.dir}">
-      <include name="**/*.jar"/>
-    </fileset>
-    <fileset dir="${hsqldb.tools.dir}">
-      <include name="**/*.jar"/>
-    </fileset>
-  </path>
-  
-  <!-- ================================= 
+   <property name="build.dir" value="../build/impl" />
+   <property name="build.jmeter.dir" value="${build.dir}/jmeter" />
+   <property name="target.dir" value="../target" />
+   <property name="javac.debug" value="false" />
+   <property name="javac.deprecation" value="false" />
+   <property name="javac.optimize" value="false" />
+   <property name="target.dir" value="false" />
+   <property name="server-home" value="../root/servers/jbjca-${ironjacamar.version}/ironjacamar-${ironjacamar.version}" />
+   <property name="jmeter.tools.dir" value="../tools/jmeter" />
+   <property name="hsqldb.tools.dir" value="../tools/hsqldb" />
+
+   <path id="src.compile.classpath">
+      <fileset dir="../lib/common" includes="*.jar" />
+   </path>
+
+   <path id="jmeter.classpath">
+      <fileset dir="${jmeter.tools.dir}">
+         <include name="**/*.jar" />
+      </fileset>
+      <fileset dir="${hsqldb.tools.dir}">
+         <include name="**/*.jar" />
+      </fileset>
+   </path>
+
+   <!-- ================================= 
        Target: compile
        ================================= -->
-  <target name="compile">
-    <mkdir dir="${build.jmeter.dir}" />
-    <mkdir dir="${build.jmeter.dir}/impl" />
-    
-    <delete>
-      <fileset dir="${build.jmeter.dir}/impl">
-        <include name="**/*.class"/>
-      </fileset>
-    </delete>
-    <javac srcdir="src/main/java"
-           destdir="${build.jmeter.dir}/impl"
-           classpathref="src.compile.classpath"
-           debug="true" deprecation="true" optimize="true" >
-      <compilerarg value="-Xlint" />
-    </javac>
-  </target>
-  
-  <!-- ================================= 
+   <target name="compile">
+      <mkdir dir="${build.jmeter.dir}" />
+      <mkdir dir="${build.jmeter.dir}/impl" />
+
+      <delete>
+         <fileset dir="${build.jmeter.dir}/impl">
+            <include name="**/*.class" />
+         </fileset>
+      </delete>
+      <javac srcdir="src/main/java" destdir="${build.jmeter.dir}/impl" classpathref="src.compile.classpath" debug="true" deprecation="true" optimize="true">
+         <compilerarg value="-Xlint" />
+      </javac>
+   </target>
+
+   <!-- ================================= 
        Target: jars and wars 
        ================================= -->
-  <target name="wars" depends="compile">
-    <mkdir dir="${build.jmeter.dir}/jars" />
-    <mkdir dir="${build.jmeter.dir}/wars" />
-    
-    <delete file="${build.jmeter.dir}/jars/ironjacamar-performance-jmeter.jar"/>
-    
-    <jar destfile="${build.jmeter.dir}/jars/ironjacamar-performance-jmeter.jar"
-         basedir="${build.jmeter.dir}/impl" index="true">
-      <manifest>
-	<attribute name="Implementation-Title" value="ironjca performance jetty" />
-	<attribute name="Implementation-Vendor" value="JBoss" />
-	<attribute name="Implementation-Vendor-Id" value="org.jboss" />
-      </manifest>
-    </jar>
-    
-    <delete file="${build.jmeter.dir}/wars/jbjca-web.war"/>
-    
-    <war destfile="${build.jmeter.dir}/wars/jbjca-web.war" webxml="src/main/resources/WEB-INF/web.xml" index="true">
-      <fileset dir="src/main/resources/web">
-	<include name="**/*"/>
-      </fileset>
-      <lib dir="${build.jmeter.dir}/jars">
-	<include name="ironjacamar-performance-jmeter.jar" />
-      </lib>
-      <manifest>
-        <attribute name="Implementation-Title" value="ironjca performance jetty Web Module" />
-        <attribute name="Implementation-Vendor" value="JBoss" />
-        <attribute name="Implementation-Vendor-Id" value="org.jboss" />
-      </manifest>
-      <metainf dir="src/main/resources">
-	<include name="context.xml"/>
-      </metainf>
-    </war>
-  </target>
-  
-  <target name="deploy" depends="wars,build-root.download-servers">
-    <copy file="${build.jmeter.dir}/wars/jbjca-web.war" todir="${jbjca-home}/system"/>
-    <copy file="src/main/resources/jca-local-h2-ds.xml" todir="${jbjca-home}/deploy"/>
-  </target>
-  
-  <target name="jmeter" depends="server">
-    <java jar="${jmeter.tools.dir}/bin/ApacheJMeter.jar" fork="true" spawn="true" classpathref="jmeter.classpath" >
-      <jvmarg value="-Dapple.laf.useScreenMenuBar=true"/>
-      <arg value="-t"/>
-      <arg value="src/main/resources/jmeter/Http-Test.jmx"/>
-    </java>
-    <echo message="Started JMeter."/>
-  </target>
-  
-  <target name="database" unless="database.isAvailable" depends="check-database-isRunning">
-    <java fork="true" spawn="true" classpathref="jmeter.classpath" classname="org.hsqldb.Server">
-      <arg value="-database.0"/>
-      <arg value="mem:jbjca"/>
-      <arg value="-silent"/>
-      <arg value="false"/>
-    </java>
-    <parallel>
-      <waitfor maxwait="1" maxwaitunit="minute" checkevery="1" checkeveryunit="second">
-        <socket server="localhost" port="9001"/>
-      </waitfor>
-    </parallel>
-    <echo message="Database started."/>
-    <antcall target="sample-data"/>
-    <echo message="Sample data loaded."/>
-  </target>
-  
-  <target name="check-database-isRunning">
-    <condition property="database.isAvailable" >
-      <socket server="localhost" port="9001"/>
-    </condition>
-    <echo message="Status of running database is [${database.isAvailable}]."/>
-  </target>
-  
-  <target name="shutdown-database">
-    <sql driver="org.hsqldb.jdbc.JDBCDriver" 
-         url="jdbc:hsqldb:hsql://localhost" 
-         userid="sa" password="" 
-         classpathref="jmeter.classpath" onerror="stop">
+   <target name="wars" depends="compile">
+      <mkdir dir="${build.jmeter.dir}/jars" />
+      <mkdir dir="${build.jmeter.dir}/wars" />
+
+      <delete file="${build.jmeter.dir}/jars/ironjacamar-performance-jmeter.jar" />
+
+      <jar destfile="${build.jmeter.dir}/jars/ironjacamar-performance-jmeter.jar" basedir="${build.jmeter.dir}/impl" index="true">
+         <manifest>
+            <attribute name="Implementation-Title" value="ironjca performance jetty" />
+            <attribute name="Implementation-Vendor" value="JBoss" />
+            <attribute name="Implementation-Vendor-Id" value="org.jboss" />
+         </manifest>
+      </jar>
+
+      <delete file="${build.jmeter.dir}/wars/jbjca-web.war" />
+
+      <war destfile="${build.jmeter.dir}/wars/jbjca-web.war" webxml="src/main/resources/WEB-INF/web.xml" index="true">
+         <fileset dir="src/main/resources/web">
+            <include name="**/*" />
+         </fileset>
+         <lib dir="${build.jmeter.dir}/jars">
+            <include name="ironjacamar-performance-jmeter.jar" />
+         </lib>
+         <manifest>
+            <attribute name="Implementation-Title" value="ironjca performance jetty Web Module" />
+            <attribute name="Implementation-Vendor" value="JBoss" />
+            <attribute name="Implementation-Vendor-Id" value="org.jboss" />
+         </manifest>
+         <metainf dir="src/main/resources">
+            <include name="context.xml" />
+         </metainf>
+      </war>
+   </target>
+
+   <target name="deploy" depends="wars">
+      <copy file="${build.jmeter.dir}/wars/jbjca-web.war" todir="${server-home}/system" />
+      <copy file="src/main/resources/jca-local-h2-ds.xml" todir="${server-home}/deploy" />
+      <copy file="../tools/hsqldb/lib/hsqldb.jar" todir="${server-home}/lib" />
+   </target>
+
+   <target name="jmeter" depends="deploy,server">
+      <java jar="${jmeter.tools.dir}/bin/ApacheJMeter.jar" fork="true" spawn="true" classpathref="jmeter.classpath">
+         <jvmarg value="-Dapple.laf.useScreenMenuBar=true" />
+         <arg value="-t" />
+         <arg value="src/main/resources/jmeter/Http-Test.jmx" />
+      </java>
+      <echo message="Started JMeter." />
+   </target>
+
+   <target name="database" unless="database.isAvailable" depends="check-database-isRunning">
+      <java fork="true" spawn="true" classpathref="jmeter.classpath" classname="org.hsqldb.Server">
+         <arg value="-database.0" />
+         <arg value="mem:jbjca" />
+         <arg value="-silent" />
+         <arg value="true" />
+      </java>
+      <parallel>
+         <waitfor maxwait="1" maxwaitunit="minute" checkevery="1" checkeveryunit="second">
+            <socket server="localhost" port="9001" />
+         </waitfor>
+      </parallel>
+      <echo message="Database started." />
+      <antcall target="sample-data" />
+      <echo message="Sample data loaded." />
+   </target>
+
+   <target name="check-database-isRunning">
+      <condition property="database.isAvailable">
+         <socket server="localhost" port="9001" />
+      </condition>
+      <echo message="Status of running database is [${database.isAvailable}]." />
+   </target>
+
+   <target name="shutdown-database">
+      <sql driver="org.hsqldb.jdbc.JDBCDriver" url="jdbc:hsqldb:hsql://localhost" userid="sa" password="" classpathref="jmeter.classpath" onerror="stop">
       SHUTDOWN;
     </sql>
-  </target>
-  
-  <target name="sample-data">
-    <sql src="src/main/resources/sql/sample-data.sql"
-         driver="org.hsqldb.jdbc.JDBCDriver" 
-         url="jdbc:hsqldb:hsql://localhost" 
-         userid="sa" password="" classpathref="jmeter.classpath"/>
-  </target>
-  
-  <target name="server" unless="server.isAvailable" depends="database,check-server-isRunning">
-    <exec executable="./run.sh" spawn="true" dir="${jbjca-home}/bin"/>
-    <echo message="Started server."/>
-  </target>
-  
-  <target name="check-server-isRunning">
-    <condition property="server.isAvailable" >
-      <http url="http://localhost:8080/"/>
-    </condition>
-    <echo message="Status of running server is [${server.isAvailable}]."/>
-  </target>
+   </target>
 
+   <target name="sample-data">
+      <sql src="src/main/resources/sql/sample-data.sql" driver="org.hsqldb.jdbc.JDBCDriver" url="jdbc:hsqldb:hsql://localhost" userid="sa" password="" 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>
+
+   <target name="check-server-isRunning">
+      <condition property="server.isAvailable">
+         <http url="http://localhost:8080/" />
+      </condition>
+      <echo message="Status of running server is [${server.isAvailable}]." />
+   </target>
+
 </project>
Index: servers/build.xml
===================================================================
--- servers/build.xml	(revision 108919)
+++ servers/build.xml	(working copy)
@@ -31,7 +31,7 @@
   <property name="jbossas.6.file" value="6.0.0.20100911-M5" />
   <property name="jbossas.5.version" value="5.1.0.GA" />
   <property name="jbossas.4.version" value="4.2.3.GA" />
-  <property name="ironjacamar.version" value="1.0.0.Beta2" />
+  <property name="ironjacamar.version" value="1.0.0.Beta3" />
   <property name="ironjacamar.daily" value="daily" />
 
   <property name="ironjacamar.sjc" value="${root.dir}/../../../trunk/target/sjc" />