[jboss-cvs] JBossAS SVN: r106520 - in projects/jboss-jca/branches/performance/rars: src/main/java/org/jboss/jca/performance/rars/workmanager and 2 other directories.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Fri Jul 9 04:14:49 EDT 2010
Author: jeff.zhang
Date: 2010-07-09 04:14:48 -0400 (Fri, 09 Jul 2010)
New Revision: 106520
Added:
projects/jboss-jca/branches/performance/rars/src/main/resources/workmanager/META-INF/
projects/jboss-jca/branches/performance/rars/src/main/resources/workmanager/META-INF/ra.xml
Removed:
projects/jboss-jca/branches/performance/rars/src/main/resources/workmanager/notrans/
projects/jboss-jca/branches/performance/rars/src/main/resources/workmanager/xatrans/
Modified:
projects/jboss-jca/branches/performance/rars/build.xml
projects/jboss-jca/branches/performance/rars/src/main/java/org/jboss/jca/performance/rars/workmanager/PerfResourceAdapter.java
Log:
[JBJCA-375] use ant macrodef
Modified: projects/jboss-jca/branches/performance/rars/build.xml
===================================================================
--- projects/jboss-jca/branches/performance/rars/build.xml 2010-07-09 02:53:30 UTC (rev 106519)
+++ projects/jboss-jca/branches/performance/rars/build.xml 2010-07-09 08:14:48 UTC (rev 106520)
@@ -20,7 +20,7 @@
* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
-->
<project name="jboss-jca-performance-rars"
- default="compile"
+ default="jars"
xmlns:ivy="antlib:org.apache.ivy.ant">
<!-- =================================
@@ -45,6 +45,31 @@
</javac>
</target>
+ <macrodef name="makerar">
+ <attribute name="count"/>
+ <attribute name="as"/>
+ <attribute name="trans"/>
+ <sequential>
+ <copy todir="${build.performance.dir}/jars/performance/@{as}/@{trans}/@{count}">
+ <fileset dir="src/main/resources/" includes="**/*"/>
+ <filterset>
+ <filter token="COUNT" value="@{count}"/>
+ <filter token="AS" value="@{as}"/>
+ <filter token="TRANS" value="@{trans}"/>
+ </filterset>
+ </copy>
+
+ <jar destfile="${target.dir}/@{as}_@{trans}_@{count}.rar"
+ manifest="src/main/resources/rar-manifest.mf">
+ <fileset dir="${build.performance.dir}/jars/performance"
+ includes="org/jboss/jca/performance/rars/workmanager/*.class"/>
+
+ <fileset dir="${build.performance.dir}/jars/performance/@{as}/@{trans}/@{count}/workmanager"
+ includes="**/**"/>
+ </jar>
+ </sequential>
+ </macrodef>
+
<!-- =================================
Target: jars
================================= -->
@@ -59,30 +84,19 @@
includes="**"/>
</copy>
- <copy todir="${build.rars.dir}/jars/rars">
- <fileset dir="src/main/resources/"
- includes="**/*"/>
- </copy>
+ <makerar count="1" as="JBJCA" trans="NoTransaction"/>
+ <makerar count="1" as="JBJCA" trans="XATransaction"/>
+ <makerar count="10" as="JBJCA" trans="NoTransaction"/>
+ <makerar count="10" as="JBJCA" trans="XATransaction"/>
+ <makerar count="100" as="JBJCA" trans="NoTransaction"/>
+ <makerar count="100" as="JBJCA" trans="XATransaction"/>
+ <makerar count="1000" as="JBJCA" trans="NoTransaction"/>
+ <makerar count="1000" as="JBJCA" trans="XATransaction"/>
+ <makerar count="10000" as="JBJCA" trans="NoTransaction"/>
+ <makerar count="10000" as="JBJCA" trans="XATransaction"/>
+ <makerar count="100000" as="JBJCA" trans="NoTransaction"/>
+ <makerar count="100000" as="JBJCA" trans="XATransaction"/>
- <jar destfile="${target.dir}/wmnotrans.rar"
- manifest="src/main/resources/rar-manifest.mf">
- <fileset dir="${build.rars.dir}/jars/rars"
- includes="org/jboss/jca/rars/rars/workmanager/*.class"/>
-
- <fileset dir="${build.rars.dir}/jars/rars/workmanager/notrans"
- includes="**/**"/>
-
- </jar>
-
- <jar destfile="${target.dir}/wmxatrans.rar"
- manifest="src/main/resources/rar-manifest.mf">
- <fileset dir="${build.rars.dir}/jars/rars"
- includes="org/jboss/jca/rars/rars/workmanager/*.class"/>
-
- <fileset dir="${build.rars.dir}/jars/rars/workmanager/xatrans"
- includes="**/**"/>
-
- </jar>
</target>
<!-- =================================
Modified: projects/jboss-jca/branches/performance/rars/src/main/java/org/jboss/jca/performance/rars/workmanager/PerfResourceAdapter.java
===================================================================
--- projects/jboss-jca/branches/performance/rars/src/main/java/org/jboss/jca/performance/rars/workmanager/PerfResourceAdapter.java 2010-07-09 02:53:30 UTC (rev 106519)
+++ projects/jboss-jca/branches/performance/rars/src/main/java/org/jboss/jca/performance/rars/workmanager/PerfResourceAdapter.java 2010-07-09 08:14:48 UTC (rev 106520)
@@ -61,6 +61,12 @@
/** testCase */
private String testCase;
+ /** app server */
+ private String appserver;
+
+ /** trans */
+ private String trans;
+
/**
* set count
* @param count The value
@@ -116,6 +122,46 @@
}
/**
+ * Set the appserver.
+ *
+ * @param appserver The appserver to set.
+ */
+ public void setAppserver(String appserver)
+ {
+ this.appserver = appserver;
+ }
+
+ /**
+ * Get the appserver.
+ *
+ * @return the appserver.
+ */
+ public String getAppserver()
+ {
+ return appserver;
+ }
+
+ /**
+ * Set the trans.
+ *
+ * @param trans The trans to set.
+ */
+ public void setTrans(String trans)
+ {
+ this.trans = trans;
+ }
+
+ /**
+ * Get the trans.
+ *
+ * @return the trans.
+ */
+ public String getTrans()
+ {
+ return trans;
+ }
+
+ /**
* This is called during the activation of a message endpoint.
*
* @param endpointFactory a message endpoint factory instance.
@@ -166,7 +212,8 @@
long l2 = System.nanoTime();
long time = (l2 - l1) / 1000000;
- System.out.println("Stat: running " + count + " time " + time + " ms");
+ System.out.println("Stat: running " + trans + " " + count +
+ " on as server " + appserver + " time: " + time + " ms" );
}
/**
@@ -255,5 +302,4 @@
return result;
}
-
}
Added: projects/jboss-jca/branches/performance/rars/src/main/resources/workmanager/META-INF/ra.xml
===================================================================
--- projects/jboss-jca/branches/performance/rars/src/main/resources/workmanager/META-INF/ra.xml (rev 0)
+++ projects/jboss-jca/branches/performance/rars/src/main/resources/workmanager/META-INF/ra.xml 2010-07-09 08:14:48 UTC (rev 106520)
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<connector xmlns="http://java.sun.com/xml/ns/j2ee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
+ http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd"
+ version="1.5">
+
+ <vendor-name>Red Hat Middleware LLC</vendor-name>
+ <eis-type>Test RA</eis-type>
+ <resourceadapter-version>0.1</resourceadapter-version>
+ <resourceadapter>
+ <resourceadapter-class>org.jboss.jca.performance.rars.workmanager.PerfResourceAdapter</resourceadapter-class>
+ <config-property>
+ <config-property-name>count</config-property-name>
+ <config-property-type>java.lang.Integer</config-property-type>
+ <config-property-value>@COUNT@</config-property-value>
+ </config-property>
+
+ <config-property>
+ <config-property-name>sleepTime</config-property-name>
+ <config-property-type>java.lang.Long</config-property-type>
+ <config-property-value>0</config-property-value>
+ </config-property>
+
+ <config-property>
+ <config-property-name>testCase</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>org.jboss.jca.performance.rars.workmanager.WorkManagerUnit</config-property-value>
+ </config-property>
+
+ <config-property>
+ <config-property-name>appserver</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>@AS@</config-property-value>
+ </config-property>
+
+ <config-property>
+ <config-property-name>trans</config-property-name>
+ <config-property-type>java.lang.String</config-property-type>
+ <config-property-value>@TRANS@</config-property-value>
+ </config-property>
+
+ <outbound-resourceadapter>
+ <connection-definition>
+ <managedconnectionfactory-class>org.jboss.jca.performance.rars.workmanager.PerfManagedConnectionFactory</managedconnectionfactory-class>
+ <connectionfactory-interface>org.jboss.jca.performance.rars.workmanager.PerfConnectionFactory</connectionfactory-interface>
+ <connectionfactory-impl-class>org.jboss.jca.performance.rars.workmanager.PerfConnectionFactoryImpl</connectionfactory-impl-class>
+ <connection-interface>org.jboss.jca.performance.rars.workmanager.PerfConnection</connection-interface>
+ <connection-impl-class>org.jboss.jca.performance.rars.workmanager.PerfConnectionImpl</connection-impl-class>
+ </connection-definition>
+ <transaction-support>@TRANS@</transaction-support>
+ <reauthentication-support>false</reauthentication-support>
+ </outbound-resourceadapter>
+ </resourceadapter>
+</connector>
More information about the jboss-cvs-commits
mailing list