[jboss-cvs] JBossAS SVN: r110518 - in projects/jboss-jca/branches/performance: jmeter and 3 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Wed Feb 2 14:48:23 EST 2011
Author: whitingjr
Date: 2011-02-02 14:48:23 -0500 (Wed, 02 Feb 2011)
New Revision: 110518
Modified:
projects/jboss-jca/branches/performance/faban/benchmarks/simple-http-benchmark/deploy/run.xml
projects/jboss-jca/branches/performance/jmeter/build.xml
projects/jboss-jca/branches/performance/jmeter/src/main/java/org/jboss/jca/performance/servlet/http/HttpConnectionServlet.java
projects/jboss-jca/branches/performance/jmeter/src/main/resources/WEB-INF/web.xml
projects/jboss-jca/branches/performance/jmeter/src/main/resources/jca-local-h2-ds.xml
Log:
Added a servlet that calls select in the database. Added namespace declarations to run.xml.
Modified: projects/jboss-jca/branches/performance/faban/benchmarks/simple-http-benchmark/deploy/run.xml
===================================================================
--- projects/jboss-jca/branches/performance/faban/benchmarks/simple-http-benchmark/deploy/run.xml 2011-02-02 16:56:27 UTC (rev 110517)
+++ projects/jboss-jca/branches/performance/faban/benchmarks/simple-http-benchmark/deploy/run.xml 2011-02-02 19:48:23 UTC (rev 110518)
@@ -29,14 +29,15 @@
<!-- We declare the driver as the default namespace 'cause it is most common
here -->
<fa:runConfig definition="org.jboss.jca.perf.benchmark.simple.http.JCAWebDriver"
- xmlns:fa="http://faban.sunsource.net/ns/faban" xmlns:fh="http://faban.sunsource.net/ns/fabanharness"
+ xmlns:fa="http://faban.sunsource.net/ns/faban"
+ xmlns:fh="http://faban.sunsource.net/ns/fabanharness"
xmlns="http://faban.sunsource.net/ns/fabandriver">
<fh:description>Simple web IronJacamar 3 tier benchmark run</fh:description>
<!-- The hostConfig section is used by the harness to control hosts -->
<fa:hostConfig>
<fa:host>Enter middle tier host name or IP</fa:host>
<fh:enabled>false</fh:enabled>
- <fh:tools></fh:tools>
+ <fh:tools>vmstat 1</fh:tools>
</fa:hostConfig>
<!-- The scale of the benchmark run, the driver definition defines the
number of threads for each driver scale and each driver type. -->
@@ -116,19 +117,21 @@
<jcaServer>
<fa:hostConfig xmlns="http://faban.sunsource.net/ns/fabanharness"
- xmlns:fa="http://faban.sunsource.net/ns/faban">
+ xmlns:fa="http://faban.sunsource.net/ns/faban"
+ xmlns:fh="http://faban.sunsource.net/ns/fabanharness">
<fa:host>Enter middle tier host name or IP</fa:host>
- <enabled>false</enabled>
- <tools>vmstat 1</tools>
+ <fh:enabled>false</fh:enabled>
+ <fh:tools>vmstat 1</fh:tools>
</fa:hostConfig>
</jcaServer>
<dbServer>
<fa:hostConfig xmlns="http://faban.sunsource.net/ns/fabanharness"
- xmlns:fa="http://faban.sunsource.net/ns/faban">
+ xmlns:fa="http://faban.sunsource.net/ns/faban"
+ xmlns:fh="http://faban.sunsource.net/ns/fabanharness">
<fa:host>Enter middle tier host name or IP</fa:host>
- <enabled>false</enabled>
- <tools>vmstat 1</tools>
+ <fh:enabled>false</fh:enabled>
+ <fh:tools>vmstat 1</fh:tools>
</fa:hostConfig>
</dbServer>
</jcaBenchmark>
Modified: projects/jboss-jca/branches/performance/jmeter/build.xml
===================================================================
--- projects/jboss-jca/branches/performance/jmeter/build.xml 2011-02-02 16:56:27 UTC (rev 110517)
+++ projects/jboss-jca/branches/performance/jmeter/build.xml 2011-02-02 19:48:23 UTC (rev 110518)
@@ -336,9 +336,13 @@
<socket server="${env.HOSTNAME}" port="8080" />
</waitfor>
</parallel>
+ <!--
<antcall target="load-rules" />
+ -->
<echo message="Started server."/>
+ <!--
<antcall target="server-sample-data" />
+ -->
<get src="http://${env.HOSTNAME}:8080/jbjca-web/jcaconn" dest="/tmp/"/>
</target>
@@ -383,10 +387,11 @@
</target>
<target name="shutdown-server">
+ <!--
<java classname="org.jboss.byteman.agent.submit.Submit" classpathref="byteman.classpath" failonerror="false">
<arg value="-u"/>
</java>
-
+ -->
<java jar="${server-home}/lib/fungal-cli.jar" fork="true">
<arg line="-h ${env.HOSTNAME} shutdown"/>
</java>
Modified: projects/jboss-jca/branches/performance/jmeter/src/main/java/org/jboss/jca/performance/servlet/http/HttpConnectionServlet.java
===================================================================
--- projects/jboss-jca/branches/performance/jmeter/src/main/java/org/jboss/jca/performance/servlet/http/HttpConnectionServlet.java 2011-02-02 16:56:27 UTC (rev 110517)
+++ projects/jboss-jca/branches/performance/jmeter/src/main/java/org/jboss/jca/performance/servlet/http/HttpConnectionServlet.java 2011-02-02 19:48:23 UTC (rev 110518)
@@ -47,9 +47,7 @@
{
/** The serialVersionUID */
private static final long serialVersionUID = -7564771800082878267L;
-// private static final String JNDI_NAME = "java:/DefaultDS";
private static final String JNDI_NAME = "java:/SampleDS";
-// private static final String JNDI_USER_TRANSACTION = "java:comp/UserTransaction"; use this in an app server
private static final String JNDI_USER_TRANSACTION = "java:/UserTransaction";
public static final String KEY_QUERY_RESULT_BEAN = "CONNECTION_BEAN";
public static final String VIEW = "/connection.jsp";
Modified: projects/jboss-jca/branches/performance/jmeter/src/main/resources/WEB-INF/web.xml
===================================================================
--- projects/jboss-jca/branches/performance/jmeter/src/main/resources/WEB-INF/web.xml 2011-02-02 16:56:27 UTC (rev 110517)
+++ projects/jboss-jca/branches/performance/jmeter/src/main/resources/WEB-INF/web.xml 2011-02-02 19:48:23 UTC (rev 110518)
@@ -1,58 +1,62 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * JBoss, Home of Professional Open Source. * Copyright 2008, Red
- Hat Middleware LLC, and individual contributors * as indicated by
- the @author tags. See the copyright.txt file in the * distribution
- for a full listing of individual contributors. * * This is free
- software; you can redistribute it and/or modify it * under the
- terms of the GNU Lesser General Public License as * published by
- the Free Software Foundation; either version 2.1 of * the License,
- or (at your option) any later version. * * This software is
- distributed in the hope that it will be useful, * but WITHOUT ANY
- WARRANTY; without even the implied warranty of * MERCHANTABILITY
- or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * Lesser General
- Public License for more details. * * You should have received a
- copy of the GNU Lesser General Public * License along with this
- software; if not, write to the Free * Software Foundation, Inc.,
- 51 Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see
- the FSF site: http://www.fsf.org.
- -->
+<!-- * JBoss, Home of Professional Open Source. * Copyright 2008, Red Hat
+ Middleware LLC, and individual contributors * as indicated by the @author
+ tags. See the copyright.txt file in the * distribution for a full listing
+ of individual contributors. * * This is free software; you can redistribute
+ it and/or modify it * under the terms of the GNU Lesser General Public License
+ as * published by the Free Software Foundation; either version 2.1 of * the
+ License, or (at your option) any later version. * * This software is distributed
+ in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even
+ the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ See the GNU * Lesser General Public License for more details. * * You should
+ have received a copy of the GNU Lesser General Public * License along with
+ this software; if not, write to the Free * Software Foundation, Inc., 51
+ Franklin St, Fifth Floor, Boston, MA * 02110-1301 USA, or see the FSF site:
+ http://www.fsf.org. -->
<web-app id="WebApp_ID" version="2.5"
- xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <display-name>jbjcaweb</display-name>
- <servlet>
- <display-name>JCAConnection</display-name>
- <servlet-name>HttpConnectionServlet</servlet-name>
- <servlet-class>org.jboss.jca.performance.servlet.http.HttpConnectionServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
- <servlet>
- <display-name>DataLoader</display-name>
- <servlet-name>DataLoader</servlet-name>
- <servlet-class>org.jboss.jca.performance.servlet.data.LoadData</servlet-class>
- <load-on-startup>2</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>HttpConnectionServlet</servlet-name>
- <url-pattern>/jcaconn</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>DataLoader</servlet-name>
- <url-pattern>/load-data</url-pattern>
- </servlet-mapping>
- <session-config>
- <!-- Set the timeout very low to prevent load tests causing OOME. -->
- <session-timeout>3</session-timeout>
- </session-config>
- <resource-env-ref>
- <description>HSQLDB Data Source used by the connection servlet.</description>
- <resource-env-ref-name>SampleDS</resource-env-ref-name>
- <resource-env-ref-type>javax.sql.DataSource</resource-env-ref-type>
- </resource-env-ref>
- <resource-env-ref>
- <description>UserTransaction used by the connection servlet.</description>
- <resource-env-ref-name>UserTransaction</resource-env-ref-name>
- <resource-env-ref-type>javax.transaction.UserTransaction</resource-env-ref-type>
- </resource-env-ref>
+ xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
+ <display-name>jbjcaweb</display-name>
+ <servlet>
+ <display-name>JCAConnection</display-name>
+ <servlet-name>HttpConnectionServlet</servlet-name>
+ <servlet-class>org.jboss.jca.performance.servlet.http.HttpConnectionServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <servlet>
+ <display-name>DataLoader</display-name>
+ <servlet-name>DataLoader</servlet-name>
+ <servlet-class>org.jboss.jca.performance.servlet.data.LoadData</servlet-class>
+ <load-on-startup>2</load-on-startup>
+ </servlet>
+ <servlet>
+ <servlet-name>SelectStatement</servlet-name>
+ <servlet-class>org.jboss.jca.performance.servlet.http.HttpSelectServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>HttpConnectionServlet</servlet-name>
+ <url-pattern>/jcaconn</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>DataLoader</servlet-name>
+ <url-pattern>/load-data</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>SelectStatement</servlet-name>
+ <url-pattern>/jca-select</url-pattern>
+ </servlet-mapping>
+ <session-config>
+ <!-- Set the timeout very low to prevent load tests causing OOME. -->
+ <session-timeout>3</session-timeout>
+ </session-config>
+ <resource-env-ref>
+ <description>HSQLDB Data Source used by the connection servlet.</description>
+ <resource-env-ref-name>SampleDS</resource-env-ref-name>
+ <resource-env-ref-type>javax.sql.DataSource</resource-env-ref-type>
+ </resource-env-ref>
+ <resource-env-ref>
+ <description>UserTransaction used by the connection servlet.</description>
+ <resource-env-ref-name>UserTransaction</resource-env-ref-name>
+ <resource-env-ref-type>javax.transaction.UserTransaction</resource-env-ref-type>
+ </resource-env-ref>
</web-app>
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 2011-02-02 16:56:27 UTC (rev 110517)
+++ projects/jboss-jca/branches/performance/jmeter/src/main/resources/jca-local-h2-ds.xml 2011-02-02 19:48:23 UTC (rev 110518)
@@ -23,9 +23,16 @@
<datasources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://www.jboss.org/jee/schema/ironjacamar/datasources_1_0.xsd">
<datasource jndi-name="SampleDS" pool-name="SampleDS">
+ <!--
<connection-url>jdbc:hsqldb:mem:test</connection-url>
+ -->
+ <connection-url>jdbc:postgresql://whitingjrlite.localdomain/jca</connection-url>
+
<!-- The driver class -->
+ <!--
<driver-class>org.hsqldb.jdbcDriver</driver-class>
+ -->
+ <driver-class>org.postgresql.Driver</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>
@@ -34,8 +41,12 @@
<!-- The login and password -->
</pool>
<security>
+ <!--
<user-name>sa</user-name>
<password></password>
+ -->
+ <user-name>faban</user-name>
+ <password>faban</password>
</security>
<validation>
<!--valid-connection-checker-class-name>org.jboss.jca.adapters.jdbc.ValidConnectionChecker</valid-connection-checker-class-name-->
@@ -53,7 +64,7 @@
Turned off for performance optimisation.-->
<track-statements>false</track-statements>
<!-- HSQL DB benefits from prepared statement caching -->
- <prepared-statement-cache-size>32</prepared-statement-cache-size>
+ <prepared-statement-cache-size>300</prepared-statement-cache-size>
</statement>
More information about the jboss-cvs-commits
mailing list