mstover1 2003/06/15 08:28:40
Modified: xdocs/stylesheets site.vsl site_printable.vsl
xdocs/usermanual component_reference.xml
Log:
doc and build file tweaks
Revision Changes Path
1.17 +2 -2 jakarta-jmeter/xdocs/stylesheets/site.vsl
Index: site.vsl
===================================================================
RCS file: /home/cvs/jakarta-jmeter/xdocs/stylesheets/site.vsl,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- site.vsl 13 Jun 2003 14:51:51 -0000 1.16
+++ site.vsl 15 Jun 2003 15:28:39 -0000 1.17
@@ -249,7 +249,7 @@
#macro ( component $component)
#set ($screenshot = "")
- #set ($screenshot = "$sshotdir/$component.getAttributeValue('screenshot')" )
+ #set ($screenshot = $component.getAttributeValue('screenshot') )
<table border="0" cellspacing="0" cellpadding="2">
<tr><td>
<font face="arial,helvetica,sanserif">
@@ -265,7 +265,7 @@
#runloop($c_items)
#if ($screenshot != "")
<p><b>Control Panel</b></p>
- <div align="center"><img
src="$screenshot"></div>
+ <div align="center"><img
src="$sshotdir/$screenshot"></div>
#end
#else
#unknown($c_items)
1.8 +3 -3 jakarta-jmeter/xdocs/stylesheets/site_printable.vsl
Index: site_printable.vsl
===================================================================
RCS file: /home/cvs/jakarta-jmeter/xdocs/stylesheets/site_printable.vsl,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- site_printable.vsl 13 Jun 2003 14:51:51 -0000 1.7
+++ site_printable.vsl 15 Jun 2003 15:28:39 -0000 1.8
@@ -243,7 +243,7 @@
#macro ( component $component)
#set ($screenshot = "")
- #set ($screenshot = "$sshotdir/$component.getAttributeValue('screenshot')" )
+ #set ($screenshot = $component.getAttributeValue('screenshot') )
<table border="0" cellspacing="0" cellpadding="2">
<tr><td>
<font face="arial,helvetica,sanserif">
@@ -254,9 +254,9 @@
#foreach ( $items in $component.getChildren() )
#if ($items.getName().equals("description"))
#runloop($items)
- <p><b>Control Panel</b></p>
#if ($screenshot != "")
- <div align="center"><img
src="$screenshot"></div>
+ <p><b>Control Panel</b></p>
+ <div align="center"><img
src="$sshotdir/$screenshot"></div>
#end
#else
#unknown($items)
1.47 +9 -3 jakarta-jmeter/xdocs/usermanual/component_reference.xml
Index: component_reference.xml
===================================================================
RCS file: /home/cvs/jakarta-jmeter/xdocs/usermanual/component_reference.xml,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -r1.46 -r1.47
--- component_reference.xml 13 Jun 2003 14:51:51 -0000 1.46
+++ component_reference.xml 15 Jun 2003 15:28:39 -0000 1.47
@@ -287,12 +287,13 @@
<section name="13.2 Logic Controllers" anchor="logic_controllers">
-<component index="13.2.1" name="Interleave Controller"
screenshot="logic-controller/interleave-controller.gif">
+<component index="13.2.1" name="Interleave Controller"
screenshot="logic-controller/interleave-controller.png">
<description><p>If you add Generative or Logic Controllers to an Interleave
Controller, JMeter will alternate among each of the
other controllers for each loop iteration. </p>
</description>
<properties>
<property name="name" required="No">Descriptive name for this controller
that is shown in the tree.</property>
+ <property name="ignore sub-controller blocks" required="No">If checked, the
interleave controller will treat sub-controllers like single request elements and only
allow one request per controller at a time. </property>
</properties>
<!--
@@ -348,8 +349,13 @@
<p>The outer Interleave Controller alternates between the
two inner ones. Then, each inner Interleave Controller alternates between each of
the HTTP Requests. Each JMeter
-thread will send the requests in the following order: Home Page, Bug Page, CVS
Page, and FAQ Page.
+thread will send the requests in the following order: Home Page, Interleaved, Bug
Page, Interleaved, CVS Page, Interleaved, and FAQ Page, Interleaved.
Note, the File Reporter is configured to store the results in a file named
"interleave-test2.dat" in the current directory.</p>
+
+<figure image="logic-controller/interleave3.png">
+ Figure 3 - Interleave Controller Example 3
+</figure>
+<p>If the two interleave controllers under the main interleave controller were
instead simple controllers, then the order would be: Home Page, CVS Page, Interleaved,
Bug Page, FAQ Page, Interleaved. However, if "ignore sub-controller blocks" was
checked on the main interleave controller, then the order would be: Home Page,
Interleaved, Bug Page, Interleaved, CVS Page, Interleaved, and FAQ Page,
Interleaved.</p>
</example>
</component>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
