[jboss-cvs] JBossAS SVN: r111847 - in projects/jboss-jca/branches/performance/faban/benchmarks/cli-jca-benchmark: deploy and 1 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Jul 26 13:28:27 EDT 2011


Author: whitingjr
Date: 2011-07-26 13:28:27 -0400 (Tue, 26 Jul 2011)
New Revision: 111847

Modified:
   projects/jboss-jca/branches/performance/faban/benchmarks/cli-jca-benchmark/build.xml
   projects/jboss-jca/branches/performance/faban/benchmarks/cli-jca-benchmark/deploy/config.xhtml
   projects/jboss-jca/branches/performance/faban/benchmarks/cli-jca-benchmark/deploy/run.xml
   projects/jboss-jca/branches/performance/faban/benchmarks/cli-jca-benchmark/lib/ironjacamar-performance-perfenv.jar
Log:
Updated cli benchmark.

Modified: projects/jboss-jca/branches/performance/faban/benchmarks/cli-jca-benchmark/build.xml
===================================================================
--- projects/jboss-jca/branches/performance/faban/benchmarks/cli-jca-benchmark/build.xml	2011-07-26 12:50:35 UTC (rev 111846)
+++ projects/jboss-jca/branches/performance/faban/benchmarks/cli-jca-benchmark/build.xml	2011-07-26 17:28:27 UTC (rev 111847)
@@ -63,24 +63,14 @@
     <classpath refid="taskclasspath" />
   </taskdef>
   
-  <taskdef name="deploy-cli-tests" classname="org.jboss.jca.perf.benchmark.deploy.DeployCLITests" onerror="ignore">
-    <classpath refid="clitaskclasspath" />
-  </taskdef>
 
   <target name="init">
     <mkdir dir="${classes.dir}" />
   </target>
 
-  <target name="compile.taskdef" description="Compiling taskdef source file">
-    <javac srcdir="${src.dir}" deprecation="on" target="${compiler.target.version}" destdir="${classes.dir}" debug="on">
-      <include name="org/jboss/jca/perf/benchmark/deploy/*.java" />
-      <classpath refid="perfenv.classpath" />
-    </javac>
-  </target>
-  
   <target name="compile.benchmark" depends="init" description="Compiling all source files">
     <javac srcdir="${src.dir}" deprecation="on" target="${compiler.target.version}" destdir="${classes.dir}" debug="on">
-      <include name="org/jboss/jca/perf/benchmark/**/*.java" />
+      <include name="org/jboss/jca/perf/benchmark/cli/*.java" />
       <classpath refid="classpath" />
       <classpath refid="perfenv.classpath" />
     </javac>
@@ -96,7 +86,7 @@
   </target>
 
   <target name="clean" description="cleanup module">
-    <delete>
+    <delete failonerror="false">
       <fileset dir="${build.dir}" includes="**/*" />
     </delete>
   </target>
@@ -130,19 +120,11 @@
     </jar>
   </target>
   
-  <target name="taskdef.jar" depends="compile.taskdef">
-    <jar jarfile="${build.dir}/lib/deploy-perfenv-test.jar" index="true">
-      <fileset dir="${classes.dir}">
-        <include name="org/jboss/jca/perf/benchmark/deploy/*.class"/>
-      </fileset>
-    </jar>
-  </target>
-  
-  <target name="deploy.tests.jar" depends="taskdef.jar,cli.server.tests.jar">
+  <target name="deploy.tests.jar" depends="cli.server.tests.jar">
     <copy todir="${perfenv}/tests" file="${buildlib.dir}/${tests.jar}"/>
   </target>
 
-  <target name="deploy" depends="taskdef.jar,deploy.tests.jar,deploy.jar" description="Deploys benchmark on the Faban harness">
+  <target name="deploy" depends="deploy.tests.jar,deploy.jar" description="Deploys benchmark on the Faban harness">
     <deploy url="${faban.url}" jar="${build.dir}/${bench.shortname}.jar" user="${deploy.user}" password="${deploy.password}" clearConfig="${deploy.clearconfig}" />
   </target>
 

Modified: projects/jboss-jca/branches/performance/faban/benchmarks/cli-jca-benchmark/deploy/config.xhtml
===================================================================
--- projects/jboss-jca/branches/performance/faban/benchmarks/cli-jca-benchmark/deploy/config.xhtml	2011-07-26 12:50:35 UTC (rev 111846)
+++ projects/jboss-jca/branches/performance/faban/benchmarks/cli-jca-benchmark/deploy/config.xhtml	2011-07-26 17:28:27 UTC (rev 111847)
@@ -59,6 +59,7 @@
          </xforms:bind>
          <xforms:bind id='bind-runConfig-runControl'
             xforms:nodeset='fa:runControl'>
+            <xforms:bind id="bind-unit" xforms:nodeset="@unit"/>
             <xforms:bind id='bind-runConfig-runControl-rampUp'
                xforms:nodeset='fa:rampUp'>
             </xforms:bind>
@@ -120,13 +121,10 @@
             <xforms:bind id='bind-runConfig-driverConfig-runtimeStats'
                xforms:nodeset='fd:runtimeStats'>
             </xforms:bind>
-            <xforms:bind id='bind-runConfig-driverConfig-properties' xforms:nodeset='fd:properties'  >
-               <xforms:bind id='bind-runConfig-driverConfig-properties-property' xforms:nodeset='fd:property'  >
-                  <xforms:bind id='bind-runConfig-driverConfig-properties-property-name' xforms:nodeset='fd:name'  >
-                  </xforms:bind>
-                  <xforms:bind id='bind-runConfig-driverConfig-properties-property-value' xforms:nodeset='fd:value'  >
-                  </xforms:bind>
-               </xforms:bind>
+            
+            <xforms:bind id='bind-runConfig-driverConfig-properties' xforms:nodeset='fd:properties'>
+               <xforms:bind id="bind-driver-datasourceJNDI" xforms:nodeset="fd:property[fd:name='jndiName']/fd:value"/>
+               <xforms:bind id="bind-driver-fqcnTest" xforms:nodeset="fd:property[fd:name='fqcn.test']/fd:value"/>
             </xforms:bind>
             
             <xforms:bind id='bind-runConfig-driverConfig-operationMix'
@@ -152,11 +150,6 @@
             <xforms:bind id='bind-jcaServer-hostConfig-enabled'
                xforms:nodeset='fh:enabled'>
             </xforms:bind>
-            <!-- 
-            <xforms:bind id='bind-jcaServer-hostConfig-cpus'
-               xforms:nodeset='fh:cpus'>
-            </xforms:bind>
-             -->
             <xforms:bind id='bind-jcaServer-hostConfig-tools'
                xforms:nodeset='fh:tools'>
             </xforms:bind>
@@ -167,32 +160,6 @@
                xforms:nodeset='fh:userCommands'>
             </xforms:bind>
          </xforms:bind>
-         <!--
-         <xforms:bind id='bind-jcaServer-service' xforms:nodeset='fh:service'>
-            <xforms:bind id='bind-jcaServer-service-name' xforms:nodeset='fh:name'>
-            </xforms:bind>
-            <xforms:bind id='bind-jcaServer-service-enabled' xforms:nodeset='fh:enabled'>
-            </xforms:bind>
-            <xforms:bind id='bind-jcaServer-service-tools' xforms:nodeset='fh:tools'>
-            </xforms:bind>
-            <xforms:bind id='bind-jcaServer-service-restart' xforms:nodeset='fh:restart'>
-            </xforms:bind>
-             
-            <xforms:bind id='bind-jcaServer-service-config' xforms:nodeset='fh:config'>
-               <xforms:bind id='bind-jcaServer-service-config-serverHome' xforms:nodeset='serverHome'>
-               </xforms:bind>
-               <xforms:bind id='bind-jcaServer-service-config-runScript' xforms:nodeset='runScript'>
-               </xforms:bind>
-               <xforms:bind id='bind-jcaServer-service-config-interfaceBindname' xforms:nodeset='interfaceBindname'>
-               </xforms:bind>
-               <xforms:bind id='bind-jcaServer-service-config-javaOptions' xforms:nodeset='javaOptions'>
-               </xforms:bind>
-               <xforms:bind id='bind-jcaServer-service-config-listenPort' xforms:nodeset='listenPort'>
-               </xforms:bind>
-            </xforms:bind>
-             
-         </xforms:bind>
-         -->
       </xforms:bind>
 
       <xforms:bind id='bind-dbServer' xforms:nodeset='dbServer'>
@@ -274,6 +241,10 @@
     <managedHosts>Managed Hosts</managedHosts>
     <runScript>Start script</runScript>
     <javaOptions>JAVA OPTS</javaOptions>
+    <initialContextConfiguration>Initial Context Configuration</initialContextConfiguration>
+    <datasourceJNDI>DataSource JNDI name</datasourceJNDI>
+    <fqcnTest>Fully qualified class name</fqcnTest>
+    <perfEnvironmentConfiguration>Perf Env</perfEnvironmentConfiguration>
 </labels>
    </xforms:instance>
 </xforms:model>
@@ -366,22 +337,6 @@
                   xforms:ref='/labels/scale' />
             </xforms:input>
 
-            <xforms:input id='input-runConfig-runControl-rampUp'
-               xforms:bind='bind-runConfig-runControl-rampUp'>
-               <xforms:label xforms:model='benchmark-labels'
-                  xforms:ref='/labels/rampUp' />
-            </xforms:input>
-            <xforms:input id='input-runConfig-runControl-steadyState'
-               xforms:bind='bind-runConfig-runControl-steadyState'>
-               <xforms:label xforms:model='benchmark-labels'
-                  xforms:ref='/labels/steadyState' />
-            </xforms:input>
-            <xforms:input id='input-runConfig-runControl-rampDown'
-               xforms:bind='bind-runConfig-runControl-rampDown'>
-               <xforms:label xforms:model='benchmark-labels'
-                  xforms:ref='/labels/rampDown' />
-            </xforms:input>
-
             <xforms:input id='input-runConfig-timeSync'
                xforms:bind='bind-runConfig-timeSync'>
                <xforms:label xforms:model='benchmark-labels'
@@ -466,6 +421,45 @@
                   xforms:ref='/labels/r' />
             </xforms:input>
          </xforms:group>
+         <xforms:group id="group-runControl">
+            <xforms:label xforms:model="benchmark-labels" xforms:ref="/labels/runControl"/>
+            <xforms:output xforms:bind="bind-unit"/>
+            <xforms:input id='input-runConfig-runControl-rampUp'
+               xforms:bind='bind-runConfig-runControl-rampUp'>
+               <xforms:label xforms:model='benchmark-labels'
+                  xforms:ref='/labels/rampUp' />
+            </xforms:input>
+            <xforms:input id='input-runConfig-runControl-steadyState'
+               xforms:bind='bind-runConfig-runControl-steadyState'>
+               <xforms:label xforms:model='benchmark-labels'
+                  xforms:ref='/labels/steadyState' />
+            </xforms:input>
+            <xforms:input id='input-runConfig-runControl-rampDown'
+               xforms:bind='bind-runConfig-runControl-rampDown'>
+               <xforms:label xforms:model='benchmark-labels'
+                  xforms:ref='/labels/rampDown' />
+            </xforms:input>
+            
+         </xforms:group>
+          
+         <xforms:group id="group-initialContextConfig">
+            <xforms:label xforms:model="benchmark-labels" xforms:ref="/labels/initialContextConfiguration"/>
+            <xforms:input id='input-driver-datasourceJNDI' xforms:bind='bind-driver-datasourceJNDI'>
+               <xforms:label xforms:model='benchmark-labels' xforms:ref='/labels/datasourceJNDI' />
+               <xforms:hint>DataSource JNDI name</xforms:hint>
+               <xforms:help>Enter jndi name</xforms:help>
+            </xforms:input>
+         </xforms:group>
+         
+         <xforms:group id="group-perfEnv">
+            <xforms:label xforms:model="benchmark-labels" xforms:ref="/labels/perfEnvironmentConfiguration"/>
+            <xforms:input id='input-driver-fqcnTest' xforms:bind='bind-driver-fqcnTest'>
+               <xforms:label xforms:model='benchmark-labels' xforms:ref='/labels/fqcnTest' />
+               <xforms:hint>org.jboss.jca.perf.benchmark.cli.CLITransactionDriver</xforms:hint>
+               <xforms:help>Enter the fully qualified class name of the installed test in the PerfEnv.</xforms:help>
+            </xforms:input>
+         </xforms:group>
+          
       </xforms:case>
 
       <xforms:case id='case-jcaServer'>
@@ -495,35 +489,6 @@
                <xforms:label xforms:model='benchmark-labels'
                   xforms:ref='/labels/userCommands'/>
             </xforms:input>
-            <!-- 
-            <xforms:input id='input-jcaServer-service-name' xforms:bind='bind-jcaServer-service-name'>
-               <xforms:label xforms:model='benchmark-labels' xforms:ref='/labels/serviceName'/>
-            </xforms:input>
-            <xforms:input id='input-jcaServer-service-enabled' xforms:bind='bind-jcaServer-service-enabled'>
-               <xforms:label xforms:model='benchmark-labels' xforms:ref='/labels/enabled'/>
-            </xforms:input>
-            <xforms:input id='input-jcaServer-service-tools' xforms:bind='bind-jcaServer-service-tools'>
-               <xforms:label xforms:model='benchmark-labels' xforms:ref='/labels/tools'/>
-            </xforms:input>
-            <xforms:input id='input-jcaServer-service-restart' xforms:bind='bind-jcaServer-service-restart'>
-               <xforms:label xforms:model='benchmark-labels' xforms:ref='/labels/restart'/>
-            </xforms:input>
-            <xforms:input id='input-jcaServer-service-config-serverHome' xforms:bind='bind-jcaServer-service-config-serverHome'>
-               <xforms:label xforms:model='benchmark-labels' xforms:ref='/labels/serverHome'/>
-            </xforms:input>
-            <xforms:input id='input-jcaServer-service-config-runScript' xforms:bind='bind-jcaServer-service-config-runScript'>
-               <xforms:label xforms:model='benchmark-labels' xforms:ref='/labels/runScript'/>
-            </xforms:input>
-            <xforms:input id='input-jcaServer-service-config-interfaceBindname' xforms:bind='bind-jcaServer-service-config-interfaceBindname'>
-               <xforms:label xforms:model='benchmark-labels' xforms:ref='/labels/interfaceBindname'/>
-            </xforms:input>
-            <xforms:input id='input-jcaServer-service-config-javaOptions' xforms:bind='bind-jcaServer-service-config-javaOptions'>
-               <xforms:label xforms:model='benchmark-labels' xforms:ref='/labels/javaOptions'/>
-            </xforms:input>
-            <xforms:input id='input-jcaServer-service-config-listenPort' xforms:bind='bind-jcaServer-service-config-listenPort'>
-               <xforms:label xforms:model='benchmark-labels' xforms:ref='/labels/listenPort'/>
-            </xforms:input>
-             -->
          </xforms:group>
       </xforms:case>
 

Modified: projects/jboss-jca/branches/performance/faban/benchmarks/cli-jca-benchmark/deploy/run.xml
===================================================================
--- projects/jboss-jca/branches/performance/faban/benchmarks/cli-jca-benchmark/deploy/run.xml	2011-07-26 12:50:35 UTC (rev 111846)
+++ projects/jboss-jca/branches/performance/faban/benchmarks/cli-jca-benchmark/deploy/run.xml	2011-07-26 17:28:27 UTC (rev 111847)
@@ -28,7 +28,9 @@
     common here
   -->
   <fa:runConfig definition="org.jboss.jca.perf.benchmark.cli.CLITransactionDriver"
-    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:fd="http://faban.sunsource.net/ns/fabandriver"
     xmlns="http://faban.sunsource.net/ns/fabandriver">
     <fh:description>CLI IronJacamar benchmark</fh:description>
     <!-- The hostConfig section is used by the harness to control hosts -->
@@ -105,7 +107,7 @@
     </runtimeStats>
 
     <!-- The driver-specific config. -->
-    <driverConfig name="CLI Driver">
+    <fd:driverConfig name="CLI Driver">
       <!-- The number of agents, or host:agents pairs separated by space -->
       <agents>1</agents>
       <!--
@@ -119,22 +121,22 @@
       <runtimeStats target="9988">
       </runtimeStats>
       
-      <properties>
-         <property>
-            <name>jndiName</name>
-            <value>java:/H2DS</value>
-         </property>
-         <property>
-            <name>fqcn.test</name>
-            <value>org.jboss.jca.perf.benchmark.cli.CLITransactionDriver</value>
-         </property>
-      </properties>
+      <fd:properties>
+         <fd:property>
+            <fd:name>jndiName</fd:name>
+            <fd:value>java:/SampleDS</fd:value>
+         </fd:property>
+         <fd:property>
+            <fd:name>fqcn.test</fd:name>
+            <fd:value>org.jboss.jca.perf.benchmark.cli.CLITransactionDriver</fd:value>
+         </fd:property>
+      </fd:properties>
 
       <operationMix>
         <name>callTransaction</name>
         <r>100</r>
       </operationMix>
-    </driverConfig>
+    </fd:driverConfig>
   </fa:runConfig>
   
   <!--

Modified: projects/jboss-jca/branches/performance/faban/benchmarks/cli-jca-benchmark/lib/ironjacamar-performance-perfenv.jar
===================================================================
(Binary files differ)



More information about the jboss-cvs-commits mailing list