[jboss-cvs] JBossAS SVN: r111019 - projects/jboss-jca/branches/performance/faban/benchmarks/simple-http-benchmark/deploy.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Thu Mar 24 07:47:30 EDT 2011


Author: whitingjr
Date: 2011-03-24 07:47:30 -0400 (Thu, 24 Mar 2011)
New Revision: 111019

Modified:
   projects/jboss-jca/branches/performance/faban/benchmarks/simple-http-benchmark/deploy/benchmark.xml
   projects/jboss-jca/branches/performance/faban/benchmarks/simple-http-benchmark/deploy/config.xhtml
   projects/jboss-jca/branches/performance/faban/benchmarks/simple-http-benchmark/deploy/run.xml
Log:
Added more properties to config xml.

Modified: projects/jboss-jca/branches/performance/faban/benchmarks/simple-http-benchmark/deploy/benchmark.xml
===================================================================
--- projects/jboss-jca/branches/performance/faban/benchmarks/simple-http-benchmark/deploy/benchmark.xml	2011-03-24 11:44:03 UTC (rev 111018)
+++ projects/jboss-jca/branches/performance/faban/benchmarks/simple-http-benchmark/deploy/benchmark.xml	2011-03-24 11:47:30 UTC (rev 111019)
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
 <benchmark>
-  <name>JCA 3-tier benchmark</name>
+  <name>JCA benchmark</name>
   <version>0.1</version>
   <config-form>config.xhtml</config-form>
   <config-file-name>run.xml</config-file-name>

Modified: projects/jboss-jca/branches/performance/faban/benchmarks/simple-http-benchmark/deploy/config.xhtml
===================================================================
--- projects/jboss-jca/branches/performance/faban/benchmarks/simple-http-benchmark/deploy/config.xhtml	2011-03-24 11:44:03 UTC (rev 111018)
+++ projects/jboss-jca/branches/performance/faban/benchmarks/simple-http-benchmark/deploy/config.xhtml	2011-03-24 11:47:30 UTC (rev 111019)
@@ -159,10 +159,49 @@
             <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>
+            <xforms:bind id='bind-jcaServer-hostConfig-managedHosts'
+               xforms:nodeset='fh:managedHosts'>
+            </xforms:bind>
+            <xforms:bind id='bind-jcaServer-hostConfig-userCommands'
+               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-dbConnectUrl' xforms:nodeset='dbConnectUrl'>
+               </xforms:bind>
+               <xforms:bind id='bind-jcaServer-service-config-dbDriverClass' xforms:nodeset='dbDriverClass'>
+               </xforms:bind>
+               <xforms:bind id='bind-jcaServer-service-config-dbUsername' xforms:nodeset='dbUsername'>
+               </xforms:bind>
+               <xforms:bind id='bind-jcaServer-service-config-dbPassword' xforms:nodeset='dbPassword'>
+               </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'>
@@ -182,28 +221,72 @@
 
 <xforms:model id='benchmark-labels'>
    <xforms:instance id='benchmark-label-names'>
-      <labels> <jcaBenchmark>JCA Benchmark</jcaBenchmark> <jvmConfig>Jvm
-      Config</jvmConfig> <javaHome>Java Home</javaHome> <jvmOptions>Jvm
-      Options</jvmOptions> <runConfig>Run Configuration</runConfig> <description>Description</description>
-      <hostConfig>Host Config</hostConfig> <host>Host</host> <httpPort>HTTP
-      Service Port</httpPort> <enabled>Enabled</enabled> <cpus>Cpus</cpus> <tools>Tools</tools>
-      <userCommands>User Commands</userCommands> <scale>Scale</scale> <runControl>Run
-      Control</runControl> <rampUp>Ramp Up (seconds)</rampUp> <steadyState>Steady
-      State (seconds)</steadyState> <rampDown>Ramp Down (seconds)</rampDown> <timeSync>Time
-      Sync</timeSync> <outputDir>Output Dir</outputDir> <audit>Audit</audit> <threadStart>Thread
-      Start</threadStart> <delay>Thread start delay (milli seconds)</delay> <simultaneous>Simultaneous</simultaneous>
-      <parallel>Parallel</parallel> <stats>Stats</stats> <maxRunTime>Max
-      Run Time (hours)</maxRunTime> <interval>Stats Interval (seconds)</interval> <runtimeStats>Runtime
-      Stats</runtimeStats> <driverConfig>Driver Config</driverConfig> <agents>Agents</agents>
-      <properties>Properties</properties> <property>Property</property>
-      <name>Operation name</name> <value>Value</value> <operationMix>Operation
-      Mix</operationMix> <r>R</r> <dbServer>Db Server</dbServer> <service>Service</service>
-      <restart>Restart</restart> <config>Config</config> <serverHome>Server
-      Home</serverHome> <user>User</user> <password>Password</password> <jcaServer>Jca
-      Server</jcaServer> <binPath>Bin Path</binPath> <webContext>Web
-      Context</webContext> <resourcePath>Resource Path</resourcePath> <unit>Unit</unit>
-      <time>Time (sec)</time> <cycles>Cycles</cycles> <yes>Yes</yes> <no>No</no>
-      <ok>Ok</ok> <cancel>Cancel</cancel> </labels>
+      <labels>
+    <jcaBenchmark>JCA Benchmark</jcaBenchmark>
+    <jvmConfig>Jvm Config</jvmConfig>
+    <javaHome>Java Home</javaHome>
+    <jvmOptions>Jvm Options</jvmOptions>
+    <runConfig>Run Configuration</runConfig>
+    <description>Description</description>
+    <hostConfig>Host Config</hostConfig>
+    <host>Host</host>
+    <httpPort>HTTP Service Port</httpPort>
+    <enabled>Enabled</enabled>
+    <cpus>Cpus</cpus>
+    <tools>Tools</tools>
+    <userCommands>User Commands</userCommands>
+    <scale>Scale</scale>
+    <runControl>Run Control</runControl>
+    <rampUp>Ramp Up (seconds)</rampUp>
+    <steadyState>Steady State (seconds)</steadyState>
+    <rampDown>Ramp Down (seconds)</rampDown>
+    <timeSync>Time Sync</timeSync>
+    <outputDir>Output Dir</outputDir>
+    <audit>Audit</audit>
+    <threadStart>Thread Start</threadStart>
+    <delay>Thread start delay (milli seconds)</delay>
+    <simultaneous>Simultaneous</simultaneous>
+    <parallel>Parallel</parallel>
+    <stats>Stats</stats>
+    <maxRunTime>Max Run Time (hours)</maxRunTime>
+    <interval>Stats Interval (seconds)</interval>
+    <runtimeStats>Runtime Stats</runtimeStats>
+    <driverConfig>Driver Config</driverConfig>
+    <agents>Agents</agents>
+    <properties>Properties</properties>
+    <property>Property</property>
+    <name>Operation name</name>
+    <value>Value</value>
+    <operationMix>Operation Mix</operationMix>
+    <r>R</r>
+    <dbServer>Db Server</dbServer>
+    <service>Service</service>
+    <restart>Restart</restart>
+    <config>Config</config>
+    <serverHome>Server Home</serverHome>
+    <user>User</user>
+    <password>Password</password>
+    <jcaServer>Jca Server</jcaServer>
+    <binPath>Bin Path</binPath>
+    <webContext>Web Context</webContext>
+    <resourcePath>Resource Path</resourcePath>
+    <unit>Unit</unit>
+    <time>Time (sec)</time>
+    <cycles>Cycles</cycles>
+    <yes>Yes</yes>
+    <no>No</no>
+    <ok>Ok</ok>
+    <cancel>Cancel</cancel>
+    <interfaceBindname>Network interface binding name</interfaceBindname>
+    <dbConnectUrl>Database connection Url</dbConnectUrl>
+    <dbDriverClass>Database driver classname</dbDriverClass>
+    <dbUsername>Database user name</dbUsername>
+    <dbPassword>Database password</dbPassword>
+    <listenPort>Startup listen port</listenPort>
+    <serviceName>Service Name</serviceName>
+    <managedHosts>Managed Hosts</managedHosts>
+    <runScript>Start script</runScript>
+</labels>
    </xforms:instance>
 </xforms:model>
 </head>
@@ -434,6 +517,52 @@
                <xforms:label xforms:model='benchmark-labels'
                   xforms:ref='/labels/tools' />
             </xforms:input>
+            <xforms:input id='input-jcaServer-hostConfig-managedHosts'
+               xforms:bind='bind-jcaServer-hostConfig-managedHosts'>
+               <xforms:label xforms:model='benchmark-labels'
+                  xforms:ref='/labels/managedHosts' />
+            </xforms:input>
+            <xforms:input id='input-jcaServer-hostConfig-userCommands'
+               xforms:bind='bind-jcaServer-hostConfig-userCommands'>
+               <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-dbConnectUrl' xforms:bind='bind-jcaServer-service-config-dbConnectUrl'>
+               <xforms:label xforms:model='benchmark-labels' xforms:ref='/labels/dbConnectUrl'/>
+            </xforms:input>
+            <xforms:input id='input-jcaServer-service-config-dbDriverFQCN' xforms:bind='bind-jcaServer-service-config-dbDriverClass'>
+               <xforms:label xforms:model='benchmark-labels' xforms:ref='/labels/dbDriverClass'/>
+            </xforms:input>
+            <xforms:input id='input-jcaServer-service-config-dbUsername' xforms:bind='bind-jcaServer-service-config-dbUsername'>
+               <xforms:label xforms:model='benchmark-labels' xforms:ref='/labels/dbUsername'/>
+            </xforms:input>
+            <xforms:input id='input-jcaServer-service-config-dbPassword' xforms:bind='bind-jcaServer-service-config-dbPassword'>
+               <xforms:label xforms:model='benchmark-labels' xforms:ref='/labels/dbPassword'/>
+            </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/simple-http-benchmark/deploy/run.xml
===================================================================
--- projects/jboss-jca/branches/performance/faban/benchmarks/simple-http-benchmark/deploy/run.xml	2011-03-24 11:44:03 UTC (rev 111018)
+++ projects/jboss-jca/branches/performance/faban/benchmarks/simple-http-benchmark/deploy/run.xml	2011-03-24 11:47:30 UTC (rev 111019)
@@ -121,8 +121,27 @@
       xmlns:fh="http://faban.sunsource.net/ns/fabanharness">
       <fa:host>Enter middle tier host name or IP</fa:host>
       <fh:enabled>false</fh:enabled>
+      <fh:cpus>0</fh:cpus>
       <fh:tools>vmstat 1</fh:tools>
+      <fh:managedHosts>Enter managed host name</fh:managedHosts>
+      <userCommands></userCommands>
     </fa:hostConfig>
+    <fh:service xmlns:fh="http://faban.sunsource.net/ns/fabanharness">
+      <fh:name>IronJacamarService</fh:name>
+      <fh:enabled>true</fh:enabled>
+      <fh:tools>NONE</fh:tools>
+      <fh:restart>true</fh:restart>
+      <fh:config>
+          <serverHome>Enter JCA server install path.</serverHome>
+          <runScript>run.sh</runScript>
+          <interfaceBindname>Enter a bind name</interfaceBindname>
+          <dbConnectUrl>Connection URL</dbConnectUrl>
+          <dbDriverClass>Driver class name</dbDriverClass>
+          <dbUsername>Enter a user name</dbUsername>
+          <dbPassword></dbPassword>
+          <listenPort>8080</listenPort>
+       </fh:config>
+    </fh:service>
   </jcaServer>
 
   <dbServer>



More information about the jboss-cvs-commits mailing list