Author: sebb
Date: Mon May 12 15:26:26 2008
New Revision: 655675

URL: http://svn.apache.org/viewvc?rev=655675&view=rev
Log:
Update some info on regular expressions

Modified:
    jakarta/jmeter/trunk/docs/usermanual/component_reference.html
    jakarta/jmeter/trunk/docs/usermanual/regular_expressions.html
    jakarta/jmeter/trunk/docs/usermanual/test_plan.html
    jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml
    jakarta/jmeter/trunk/xdocs/usermanual/regular_expressions.xml
    jakarta/jmeter/trunk/xdocs/usermanual/test_plan.xml

Modified: jakarta/jmeter/trunk/docs/usermanual/component_reference.html
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/component_reference.html?rev=655675&r1=655674&r2=655675&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/component_reference.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/component_reference.html Mon May 12 
15:26:26 2008
@@ -8219,7 +8219,11 @@
        By default, the pattern is in multi-line mode, which means that the "." 
meta-character does not match newline.
     In multi-line mode, "^" and "$" match the start or end of any line 
anywhere within the string 
     - not just the start and end of the entire string. Note that \s does match 
new-line.
-       Case is also significant. To override these settings, one can use the 
extended regular expression syntax.
+       Case is also significant. To override these settings, one can use the 
+                                                                               
                <i      >
+                                                               extended 
regular expression
+                                               </i>
+                                                                        syntax.
        For example:
 
                                                </p>
@@ -8230,8 +8234,10 @@
        (?i) - ignore case
        (?s) - treat target as single line, i.e. "." matches new-line
        (?is) - both the above
-    These can be used anywhere within the expression, e.g.
+    These can be used anywhere within the expression and remain in effect 
until overriden.  e.g.
     (?i)apple(?-i) Pie - matches "ApPLe Pie", but not "ApPLe pIe"
+    (?s)Apple.+?Pie - matches Apple followed by Pie, which may be on a 
subsequent line.
+    Apple(?s).+?Pie - same as above, but it's probably clearer to use the (?s) 
at the start.  
 
                                                </pre>
                                                                        
@@ -10397,6 +10403,7 @@
                                                                Use a value of 
zero to indicate JMeter should choose a match at random.
                                                </li>
                                                                        
+
                        
                                                                                
                <li     >
                                                                A positive 
number N means to select the nth match.
@@ -10517,8 +10524,11 @@
        
                                                                                
                <p      >
                                                                See also 
+                                                                               
                <a 
href="../usermanual/component_reference.html#Response_Assertion">Response 
Assertion</a>
+                                                                        for 
some examples of how to specify modifiers,
+       and 
                                                                                
                <a       href="regular_expressions.html">
-                                                               further 
information on regular expressions.
+                                                                for further 
information on JMeter regular expressions.
                                                </a>
                                                        </p>
                                                                        

Modified: jakarta/jmeter/trunk/docs/usermanual/regular_expressions.html
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/regular_expressions.html?rev=655675&r1=655674&r2=655675&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/regular_expressions.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/regular_expressions.html Mon May 12 
15:26:26 2008
@@ -223,8 +223,21 @@
                                                                                
                                                                                
<p      >
                                                                
 Note: unlike Perl, there is no need to (i.e. do not) enclose the regular 
expression in //. 
-So how does one use the Perl modifiers ismx etc if there is no trailing /? 
-The solution is to use Perl5 extended regular expressions, i.e. /abc/i becomes 
(?i)abc
+
+                                               </p>
+                                                                               
                                                                                
<p      >
+                                                               
+So how does one use the modifiers ismx etc if there is no trailing /? 
+The solution is to use 
+                                                                               
                <i      >
+                                                               extended 
regular expressions
+                                               </i>
+                                                                       , i.e. 
/abc/i becomes (?i)abc.
+See also 
+                                                                               
                <a       href="placement">
+                                                               Placement of 
modifiers
+                                               </a>
+                                                                        below.
 
                                                </p>
                                                                          
</blockquote>
@@ -521,6 +534,8 @@
                                                                                
                                        <p      >
                                                                
 Modifiers can be placed anywhere in the regex, and apply from that point 
onwards.
+[A bug in ORO means that they cannot be used at the very end of the regex.
+However they would have no effect there anyway.]
 
                                                </p>
                                                                                
                                                                                
<p      >

Modified: jakarta/jmeter/trunk/docs/usermanual/test_plan.html
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/test_plan.html?rev=655675&r1=655674&r2=655675&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/test_plan.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/test_plan.html Mon May 12 15:26:26 2008
@@ -965,22 +965,20 @@
                                                                                
                                                                                
<p      >
                                                                
 Note that the values defined by the 
+                                                                               
                <a href="../usermanual/component_reference.html#Test_Plan">Test 
Plan</a>
+                                                                         and 
the 
                                                                                
                <a 
href="../usermanual/component_reference.html#User_Defined_Variables">User 
Defined Variables</a>
                                                                         
configuration element
-are handled differently. 
-Such variables are made available to the whole test plan at startup, and are 
not updated.
+are made available to the whole test plan at startup. 
+If the same variable is defined by multiple elements, then the last one takes 
effect.
+
 Other elements such as the 
 
                                                                                
                <a 
href="../usermanual/component_reference.html#User_Parameters">User 
Parameters</a>
                                                                         
Pre-Processor or 
                                                                                
                <a 
href="../usermanual/component_reference.html#Regular_Expression_Extractor">Regular
 Expression Extractor</a>
                                                                         
Post-Processor
-may be used to define the same variables, but these will not affect the global 
values.
-For example if there is a global variable ABCD, its value will be visible to 
all threads.
-However if a thread defines the variable ABCD in a runtime element such as a 
User Parameters Pre-Processor,
-the new value will be seen by the thread, but only in the scope of the element.
-Local definitions of variables in a thread take precedence over the global 
version of the variable,
-but the global copy is unaffected.
+may be used to redefine the same variables. These redefinitions only apply to 
the current thread.
 
                                                </p>
                                                                                
                                                                                
<p      >

Modified: jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=655675&r1=655674&r2=655675&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml (original)
+++ jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml Mon May 12 
15:26:26 2008
@@ -2602,15 +2602,17 @@
        By default, the pattern is in multi-line mode, which means that the "." 
meta-character does not match newline.
     In multi-line mode, "^" and "$" match the start or end of any line 
anywhere within the string 
     - not just the start and end of the entire string. Note that \s does match 
new-line.
-       Case is also significant. To override these settings, one can use the 
extended regular expression syntax.
+       Case is also significant. To override these settings, one can use the 
<i>extended regular expression</i> syntax.
        For example:
 </p>
 <pre>
        (?i) - ignore case
        (?s) - treat target as single line, i.e. "." matches new-line
        (?is) - both the above
-    These can be used anywhere within the expression, e.g.
+    These can be used anywhere within the expression and remain in effect 
until overriden.  e.g.
     (?i)apple(?-i) Pie - matches "ApPLe Pie", but not "ApPLe pIe"
+    (?s)Apple.+?Pie - matches Apple followed by Pie, which may be on a 
subsequent line.
+    Apple(?s).+?Pie - same as above, but it's probably clearer to use the (?s) 
at the start.  
 </pre>
 
 </description>
@@ -3308,7 +3310,8 @@
        </ul>
        Note that the refName variable is always set to the default value in 
this case, 
        and the associated group variables are not set.
-       <p>See also <a href="regular_expressions.html">further information on 
regular expressions.</a></p>
+       <p>See also <complink name="Response Assertion"/> for some examples of 
how to specify modifiers,
+       and <a href="regular_expressions.html"> for further information on 
JMeter regular expressions.</a></p>
 </p>
 </component>
 

Modified: jakarta/jmeter/trunk/xdocs/usermanual/regular_expressions.xml
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/usermanual/regular_expressions.xml?rev=655675&r1=655674&r2=655675&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/usermanual/regular_expressions.xml (original)
+++ jakarta/jmeter/trunk/xdocs/usermanual/regular_expressions.xml Mon May 12 
15:26:26 2008
@@ -66,8 +66,11 @@
 </p>
 <p>
 Note: unlike Perl, there is no need to (i.e. do not) enclose the regular 
expression in //. 
-So how does one use the Perl modifiers ismx etc if there is no trailing /? 
-The solution is to use Perl5 extended regular expressions, i.e. /abc/i becomes 
(?i)abc
+</p>
+<p>
+So how does one use the modifiers ismx etc if there is no trailing /? 
+The solution is to use <i>extended regular expressions</i>, i.e. /abc/i 
becomes (?i)abc.
+See also <a href="placement">Placement of modifiers</a> below.
 </p>
 </subsection>
 <subsection name="&sect-num;.2 Examples" anchor="examples">
@@ -174,6 +177,8 @@
 <subsection name="&sect-num;.5 Placement of modifiers" anchor="placement">
 <p>
 Modifiers can be placed anywhere in the regex, and apply from that point 
onwards.
+[A bug in ORO means that they cannot be used at the very end of the regex.
+However they would have no effect there anyway.]
 </p>
 <p>
 The single-line (?s) and multi-line (?m) modifiers are normally placed at the 
start of the regex.

Modified: jakarta/jmeter/trunk/xdocs/usermanual/test_plan.xml
URL: 
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/usermanual/test_plan.xml?rev=655675&r1=655674&r2=655675&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/usermanual/test_plan.xml (original)
+++ jakarta/jmeter/trunk/xdocs/usermanual/test_plan.xml Mon May 12 15:26:26 2008
@@ -403,17 +403,13 @@
 For details of how to reference variables and functions, see <a 
href="functions.html">Functions and Variables</a>
 </p>
 <p>
-Note that the values defined by the <complink name="User Defined Variables"/> 
configuration element
-are handled differently. 
-Such variables are made available to the whole test plan at startup, and are 
not updated.
+Note that the values defined by the <complink name="Test Plan"/>  and the 
<complink name="User Defined Variables"/> configuration element
+are made available to the whole test plan at startup. 
+If the same variable is defined by multiple elements, then the last one takes 
effect.
+
 Other elements such as the 
 <complink name="User Parameters"/> Pre-Processor or <complink name="Regular 
Expression Extractor"/> Post-Processor
-may be used to define the same variables, but these will not affect the global 
values.
-For example if there is a global variable ABCD, its value will be visible to 
all threads.
-However if a thread defines the variable ABCD in a runtime element such as a 
User Parameters Pre-Processor,
-the new value will be seen by the thread, but only in the scope of the element.
-Local definitions of variables in a thread take precedence over the global 
version of the variable,
-but the global copy is unaffected.
+may be used to redefine the same variables. These redefinitions only apply to 
the current thread.
 </p>
 <p>
 Note that global variables cannot be updated during a test.



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to