[jboss-cvs] JBossAS SVN: r107660 - in projects/jboss-jca/branches/performance: servers and 1 other directory.

[jboss-cvs-commits at lists.jboss.org]

Author: jeff.zhang
Date: 2010-08-18 04:09:36 -0400 (Wed, 18 Aug 2010)
New Revision: 107660

Modified:
   projects/jboss-jca/branches/performance/apps/src/main/java/org/jboss/jca/performance/apps/BenchmarkReport.java
   projects/jboss-jca/branches/performance/servers/build.xml
Log:
[JBJCA-381] connection test report

Modified: projects/jboss-jca/branches/performance/apps/src/main/java/org/jboss/jca/performance/apps/BenchmarkReport.java
===================================================================
--- projects/jboss-jca/branches/performance/apps/src/main/java/org/jboss/jca/performance/apps/BenchmarkReport.java	2010-08-18 06:37:16 UTC (rev 107659)
+++ projects/jboss-jca/branches/performance/apps/src/main/java/org/jboss/jca/performance/apps/BenchmarkReport.java	2010-08-18 08:09:36 UTC (rev 107660)
@@ -42,6 +42,8 @@
    private List<Data> workmanagerData = new ArrayList<Data>();
    /** workmanagerBlockData */
    private List<Data> workmanagerBlockData = new ArrayList<Data>();
+   /** connectionData */
+   private List<Data> connectionData = new ArrayList<Data>();
    /** serverVersion */
    String serverVersion;
    
@@ -132,6 +134,16 @@
          writeHeader(fw);
          writeData(fw, workmanagerBlockData);
       }
+      writeEol(fw);
+      if (connectionData.size() > 0)
+      {
+         fw.write("Connection test cases");
+         writeEol(fw);
+         writeEol(fw);
+         
+         writeHeader(fw);
+         writeData(fw, connectionData);
+      }
    }
 
    /**
@@ -213,6 +225,10 @@
          {
             workmanagerBlockData.add(new Data(part[2], part[3], part[4]));
          }
+         if (part[0].equals("connection"))
+         {
+            connectionData.add(new Data(part[2], part[3], part[4]));
+         }
       }
    }
 

Modified: projects/jboss-jca/branches/performance/servers/build.xml
===================================================================
--- projects/jboss-jca/branches/performance/servers/build.xml	2010-08-18 06:37:16 UTC (rev 107659)
+++ projects/jboss-jca/branches/performance/servers/build.xml	2010-08-18 08:09:36 UTC (rev 107660)
@@ -501,8 +501,7 @@
       <fileset dir="${target.dir}" includes="connection_ejb.jar"/>
     </copy>
 
-    <sleep seconds="5"/>
-    <run-connection-client count="99" trans="NoTransaction"/>
+    <sleep seconds="10"/>
     <run-connection-client count="100000" trans="NoTransaction"/>
     <run-connection-client count="10000" trans="NoTransaction"/>
     <run-connection-client count="1000" trans="NoTransaction"/>
@@ -523,8 +522,7 @@
       <fileset dir="${target.dir}" includes="connection_ejb.jar"/>
     </copy>
 
-    <sleep seconds="5"/>
-    <run-connection-client count="99" trans="XATransaction"/>
+    <sleep seconds="10"/>
     <run-connection-client count="100000" trans="XATransaction"/>
     <run-connection-client count="10000" trans="XATransaction"/>
     <run-connection-client count="1000" trans="XATransaction"/>
@@ -591,12 +589,12 @@
 
     </sequential>
     </parallel>
-<!--
+
     <ant dir="../apps" inheritRefs="true" target="benchmark-report">
       <property name="kit.version" value="${jbas.version}"/>
       <property name="report.num" value="${run.number}"/>
     </ant>
--->
+
   </target>
 
   <target name="benchmark-prepare-jbjca">
@@ -631,9 +629,6 @@
     </exec>
     <sleep seconds="5"/>
 
-<!--
--->
-
     <deploy-rar-jbjca type="workmanager" count="100000" as="JBJCA" trans="NoTransaction" sleep="15"/>
     <deploy-rar-jbjca type="workmanager" count="100000" as="JBJCA" trans="XATransaction" sleep="15"/>
     <deploy-rar-jbjca type="workmanager" count="10000" as="JBJCA" trans="NoTransaction" sleep="6"/>
@@ -660,7 +655,6 @@
     <deploy-rar-jbjca type="workmanager-block" count="1" as="JBJCA" trans="NoTransaction" sleep="5"/>
     <deploy-rar-jbjca type="workmanager-block" count="1" as="JBJCA" trans="XATransaction" sleep="5"/>
 
-    <deploy-rar-jbjca type="connection" count="99" as="JBJCA" trans="NoTransaction" sleep="15"/>
     <deploy-rar-jbjca type="connection" count="100000" as="JBJCA" trans="NoTransaction" sleep="6"/>
     <deploy-rar-jbjca type="connection" count="100000" as="JBJCA" trans="XATransaction" sleep="6"/>
     <deploy-rar-jbjca type="connection" count="10000" as="JBJCA" trans="NoTransaction" sleep="6"/>
@@ -679,12 +673,12 @@
     <exec dir="${jbjca.home}/bin" executable="${exec}">
       <arg line="shutdown.${ext}"/>
     </exec>
-<!--
+
     <ant dir="../apps" inheritRefs="true" target="benchmark-report">
       <property name="kit.version" value="${jbjca.version}"/>
       <property name="report.num" value="${run.number}"/>
     </ant>
--->
+
   </target>
 
   <target name="benchmark" depends="os-check">