[jboss-svn-commits] JBL Code SVN: r31631 - in labs/jbosstm/workspace/whitingjr/trunk/performance: src/main/resources/xsl and 1 other directory.

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

Author: whitingjr
Date: 2010-02-12 13:49:13 -0500 (Fri, 12 Feb 2010)
New Revision: 31631

Modified:
   labs/jbosstm/workspace/whitingjr/trunk/performance/build.properties
   labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml
   labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/xsl/basedata.xsl
Log:
Moved count configuration to build.properties
Changed basedata stylesheet to generate the necessary number of users for all threads.
Added condition in build script to skip categorising data when profiling is turned off.


Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/build.properties
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/build.properties	2010-02-12 18:47:40 UTC (rev 31630)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/build.properties	2010-02-12 18:49:13 UTC (rev 31631)
@@ -4,24 +4,25 @@
 
 transaction.strategy=jta-managed
 resource.A.db.installation=co-located-db
-resource.A.db.vendor=oracle
-resource.A.jdbc-datasource=local-tx
+resource.A.db.vendor=mysql
+resource.A.jdbc-datasource=xa
 resource.B.db.installation=co-located-db
-resource.B.db.vendor=oracle
-resource.B.jdbc-datasource=local-tx
+resource.B.db.vendor=mysql
+resource.B.jdbc-datasource=xa
 profiler=jip
 
-
 # optional
 
 transaction.log.store=logs
 
-threads=45
+threads=5
+warmup-count=1
+profiled-count=1
+
 # y or n
-profiled=y
+profiled=n
 
 # does the profiled wait for a debugger to be attached ?
 # y or n
-suspend=n
+suspend=y
 
-testcase.xpaths=

Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml	2010-02-12 18:47:40 UTC (rev 31630)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/build.xml	2010-02-12 18:49:13 UTC (rev 31631)
@@ -300,9 +300,6 @@
 				<expandproperties />
 			</filterchain>
 		</copy>
-		<xslt in="src/main/resources/basedata.xml" out="build/classes/basedata.xml" style="src/main/resources/xsl/basedata.xsl">
-			<outputproperty name="indent" value="yes" />
-		</xslt>
 
 		<copy file="src/main/resources/log4j.xml" todir="build/classes" />
 
@@ -338,6 +335,10 @@
 		<condition property="ignore-categorise">
          <equals arg1="${profiled}" arg2="n" />
       </condition>
+		
+		<xslt in="src/main/resources/basedata.xml" out="build/classes/basedata.xml" style="src/main/resources/xsl/basedata.xsl">
+         <param name="user-count" expression="${threads}1" />
+      </xslt>
 	</target>
 
 	<target name="compile" depends="prepare,check-xa-support">

Modified: labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/xsl/basedata.xsl
===================================================================
--- labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/xsl/basedata.xsl	2010-02-12 18:47:40 UTC (rev 31630)
+++ labs/jbosstm/workspace/whitingjr/trunk/performance/src/main/resources/xsl/basedata.xsl	2010-02-12 18:49:13 UTC (rev 31631)
@@ -1,12 +1,24 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <xsl:stylesheet version="1.0"
    xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+   <xsl:param name="user-count"/>
 
    <xsl:template match="@*|node()">
       <xsl:copy>
          <xsl:apply-templates select="@*|node()" />
       </xsl:copy>
    </xsl:template>
+   
+   <xsl:template match="dataset">
+      <xsl:copy>
+         <xsl:call-template name="insert-users">
+            <xsl:with-param name="count">
+               <xsl:text>0</xsl:text>
+            </xsl:with-param>
+         </xsl:call-template>
+         <xsl:apply-templates/>
+      </xsl:copy>
+   </xsl:template>
 
    <xsl:template match="node()">
 
@@ -52,5 +64,55 @@
      </xsl:choose>
       
    </xsl:template>
+   
+   <xsl:template name="insert-users">
+      <xsl:param name="count"/>
+      <xsl:if test="number($count) != number($user-count)">
+         <xsl:element name="USERS">
+            <xsl:attribute name="USER_ID">
+               <xsl:value-of select="$count"/>
+            </xsl:attribute>
+            <xsl:attribute name="OBJ_VERSION">
+               <xsl:text>0</xsl:text>
+            </xsl:attribute>
+            <xsl:attribute name="FIRSTNAME">
+               <xsl:text>John</xsl:text>
+            </xsl:attribute>
+            <xsl:attribute name="LASTNAME">
+               <xsl:text>Doe</xsl:text>
+            </xsl:attribute>
+            <xsl:attribute name="USERNAME">
+               <xsl:text>johndoe<xsl:value-of select="$count"/></xsl:text>
+            </xsl:attribute>
+            <xsl:attribute name="PASSWD">
+               <xsl:text>secret</xsl:text>
+            </xsl:attribute>
+            <xsl:attribute name="EMAIL">
+               <xsl:text>jd at mail.tld</xsl:text>
+            </xsl:attribute>
+            <xsl:attribute name="RANK">
+               <xsl:text>0</xsl:text>
+            </xsl:attribute>
+            <xsl:attribute name="CREATED">
+               <xsl:text>2006-09-23 13:45:00</xsl:text>
+            </xsl:attribute>
+            <xsl:attribute name="HOME_STREET">
+               <xsl:text>Foostreet</xsl:text>
+            </xsl:attribute>
+            <xsl:attribute name="HOME_ZIPCODE">
+               <xsl:text>22222</xsl:text>
+            </xsl:attribute>
+            <xsl:attribute name="HOME_CITY">
+               <xsl:text>Foocity</xsl:text>
+            </xsl:attribute>
+            <xsl:attribute name="DEFAULT_BILLING_DETAILS_ID">
+               <xsl:text>[NULL]</xsl:text>
+            </xsl:attribute>
+         </xsl:element>         
+         <xsl:call-template name="insert-users">
+            <xsl:with-param name="count" select="number($count+1)"/>
+         </xsl:call-template>
+      </xsl:if>
+   </xsl:template>
 
 </xsl:stylesheet>