jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From milam...@apache.org
Subject svn commit: r1532767 [6/7] - in /jmeter/trunk: docs/ docs/images/ docs/localising/ docs/usermanual/ src/core/org/apache/jmeter/util/ xdocs/
Date Wed, 16 Oct 2013 13:57:03 GMT
Modified: jmeter/trunk/docs/usermanual/functions.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/functions.html?rev=1532767&r1=1532766&r2=1532767&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/functions.html (original)
+++ jmeter/trunk/docs/usermanual/functions.html Wed Oct 16 13:57:02 2013
@@ -6,9 +6,9 @@
    The ASF licenses this file to You under the Apache License, Version 2.0
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
- 
+
        http://www.apache.org/licenses/LICENSE-2.0
- 
+
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,22 +20,16 @@
 
 
 <!-- start the processing -->
-<!-- ====================================================================== -->
-<!-- Main Page Section -->
-<!-- ====================================================================== -->
 <html>
 <head>
 <link rel="stylesheet" type="text/css" href="../css/style.css"/>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
 
-
-
 <title>Apache JMeter - User's Manual: Functions and Variables</title>
 </head>
 
 <body bgcolor="#ffffff" text="#000000" link="#525D76">
 <table border="0" cellspacing="0">
-<!-- TOP IMAGE -->
 <tr>
 <td>
 <!-- Need to specify height otherwise iframe seems to grab extra -->
@@ -65,7 +59,7 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="http://projects.apache.org/feeds/rss/jmeter.xml">Subscribe to What's New</a>
 </li>
-<li><a href="../issues.html">Issues</a>
+<li><a href="../issues.html">Issue Tracking</a>
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>
 </li>
@@ -115,8 +109,6 @@ style="border-width:0; float: left" fram
 </ul>
 <p><strong>Community</strong></p>
 <ul>
-<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
-</li>
 <li><a href="../mail.html">Mailing Lists</a>
 </li>
 <li><a href="../svnindex.html">SVN Repositories</a>
@@ -126,6 +118,8 @@ style="border-width:0; float: left" fram
 <ul>
 <li><a href="http://www.apache.org/">ASF</a>
 </li>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved in the ASF</a>
+</li>
 <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
 </li>
 <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a>
@@ -187,6 +181,35 @@ ${__time(EEE\, d MMM yyyy)}
 
 </pre>
 
+If the comma is not escaped - e.g. 
+<code>
+${__javaScript(Math.max(2,5))}
+</code>
+ - you will get an error such as:
+
+<pre>
+
+ERROR - jmeter.functions.JavaScript: Error processing Javascript: [Math.max(2]
+    org.mozilla.javascript.EvaluatorException: missing ) after argument list (<cmd>#1)
+ 
+</pre>
+
+ This is because the string "Math.max(2,5)" is treated as being two parameters to the __javascript function:
+<br>
+
+
+ 
+<code>
+Math.max(2
+</code>
+ and 
+<code>
+5)
+</code>
+<br>
+
+
+ Other error messages are possible. 
 
 </p>
 <p>
@@ -1005,6 +1028,50 @@ String
 </td>
 <td bgcolor="#a0ddf0"   valign="top" align="left">
 <font color="#000000" size="-1" face="arial,helvetica,sanserif">
+ <a href="#__urldecode">urldecode</a>
+</font>
+</td>
+<td bgcolor="#a0ddf0"   valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+Decode a application/x-www-form-urlencoded string
+</font>
+</td>
+<td bgcolor="#a0ddf0"   valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+2.10
+</font>
+</td>
+</tr>
+<tr>
+<td bgcolor="#a0ddf0"   valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+String
+</font>
+</td>
+<td bgcolor="#a0ddf0"   valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+ <a href="#__urlencode">urlencode</a>
+</font>
+</td>
+<td bgcolor="#a0ddf0"   valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+Encode a string to a application/x-www-form-urlencoded string
+</font>
+</td>
+<td bgcolor="#a0ddf0"   valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+2.10
+</font>
+</td>
+</tr>
+<tr>
+<td bgcolor="#a0ddf0"   valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
+String
+</font>
+</td>
+<td bgcolor="#a0ddf0"   valign="top" align="left">
+<font color="#000000" size="-1" face="arial,helvetica,sanserif">
  <a href="#__TestPlanName">TestPlanName</a>
 </font>
 </td>
@@ -1321,7 +1388,7 @@ variable will override the built-in func
 <p>
 The Function Helper dialog is available from JMeter's Tools menu.
 </p>
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='667' height='326' src="../images/screenshots/function_helper_dialog.png"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='667' height='326' src="../images/screenshots/function_helper_dialog.png"/><br>
 <font size="-1">Function Helper Dialog
 </font></td></tr></table></p>
 <p>
@@ -1784,40 +1851,40 @@ No
 </td></tr>
 <tr><td>
 
-	
+    
 <p>
 
-	The StringFromFile function can be used to read strings from a text file. 
-	This is useful for running tests that require lots of variable data.
-	For example when testing a banking application, 100s or 1000s of different account numbers might be required.
-	
+    The StringFromFile function can be used to read strings from a text file. 
+    This is useful for running tests that require lots of variable data.
+    For example when testing a banking application, 100s or 1000s of different account numbers might be required.
+    
 </p>
 
-	
+    
 <p>
 
-	See also the 
-	
+    See also the 
+    
 <a href="component_reference.html#CSV_Data_Set_Config">
 CSV Data Set Config test element
 </a>
  
-	which may be easier to use. However, that does not currently support multiple input files.
-	
+    which may be easier to use. However, that does not currently support multiple input files.
+    
 </p>
 
 
-	
+    
 <p>
 
-	Each time it is called it reads the next line from the file.
+    Each time it is called it reads the next line from the file.
     All threads share the same instance, so different threads will get different lines.
-	When the end of the file is reached, it will start reading again from the beginning,
-	unless the maximum loop count has been reached.
-	If there are multiple references to the function in a test script, each will open the file independently,
-	even if the file names are the same.
-	[If the value is to be used again elsewhere, use different variable names for each function call.]
-	
+    When the end of the file is reached, it will start reading again from the beginning,
+    unless the maximum loop count has been reached.
+    If there are multiple references to the function in a test script, each will open the file independently,
+    even if the file names are the same.
+    [If the value is to be used again elsewhere, use different variable names for each function call.]
+    
 </p>
 
     
@@ -1832,7 +1899,7 @@ CSV Data Set Config test element
 </table>
 </p>
 
-	
+    
 <p>
 If an error occurs opening or reading the file, then the function returns the string "**ERR**"
 </p>
@@ -1846,9 +1913,9 @@ If an error occurs opening or reading th
 <tr>
 <td>File Name</td>
 <td>Path to the file name.
-        	(The path can be relative to the JMeter launch directory)
-        	If using optional sequence numbers, the path name should be suitable for passing to DecimalFormat.
-        	See below for examples.
+            (The path can be relative to the JMeter launch directory)
+            If using optional sequence numbers, the path name should be suitable for passing to DecimalFormat.
+            See below for examples.
         
 </td>
 <td>
@@ -1897,10 +1964,10 @@ Using sequence numbers:
 </p>
 <p>
 When using the optional sequence numbers, the path name is used as the format string for java.text.DecimalFormat.
-	The current sequence number is passed in as the only parameter.
+    The current sequence number is passed in as the only parameter.
     If the optional start number is not specified, the path name is used as is.
-	Useful formatting sequences are:
-	
+    Useful formatting sequences are:
+    
 </p>
 <p>
 
@@ -1934,66 +2001,66 @@ Examples:
 <p>
 </p>
 
-	If more digits are required than there are formatting characters, the number will be
-	expanded as necessary.
+    If more digits are required than there are formatting characters, the number will be
+    expanded as necessary.
 <br>
 
 
-	
+    
 <b>
 To prevent a formatting character from being interpreted,
-	enclose it in single quotes. Note that "." is a formatting character,
-	and must be enclosed in single quotes
+    enclose it in single quotes. Note that "." is a formatting character,
+    and must be enclosed in single quotes
 </b>
 
-	(though #. and 000. work as expected in locales where the decimal point is also ".")
-	
+    (though #. and 000. work as expected in locales where the decimal point is also ".")
+    
 <br>
 
 
-	In other locales (e.g. fr), the decimal point is "," - which means that "#."
-	becomes "nnn,".
+    In other locales (e.g. fr), the decimal point is "," - which means that "#."
+    becomes "nnn,".
 <br>
 
 
-	See the documentation for DecimalFormat for full details.
+    See the documentation for DecimalFormat for full details.
 <br>
 
 
-	If the path name does not contain any special formatting characters,
-	the current sequence number will be appended to the name, otherwise
-	the number will be inserted aaccording to the fomatting instructions.
+    If the path name does not contain any special formatting characters,
+    the current sequence number will be appended to the name, otherwise
+    the number will be inserted aaccording to the fomatting instructions.
 <br>
 
 
-	If the start sequence number is omitted, and the end sequence number is specified,
-	the sequence number is interpreted as a loop count, and the file will be used at most "end" times.
-	In this case the filename is not formatted.
-	
+    If the start sequence number is omitted, and the end sequence number is specified,
+    the sequence number is interpreted as a loop count, and the file will be used at most "end" times.
+    In this case the filename is not formatted.
+    
 <code>
 
-	
+    
 <br>
 
 
-	${_StringFromFile(PIN#'.'DAT,,1,2)} - reads PIN1.DAT, PIN2.DAT
+    ${_StringFromFile(PIN#'.'DAT,,1,2)} - reads PIN1.DAT, PIN2.DAT
 <br>
 
 
-	${_StringFromFile(PIN.DAT,,,2)} - reads PIN.DAT twice
+    ${_StringFromFile(PIN.DAT,,,2)} - reads PIN.DAT twice
 <br>
 
 
-	
+    
 </code>
 
-	Note that the "." in PIN.DAT above should 
+    Note that the "." in PIN.DAT above should 
 <u>
 not
 </u>
  be quoted.
-	In this case the start number is omitted, so the file name is used exactly as is.
-	
+    In this case the start number is omitted, so the file name is used exactly as is.
+    
 </p>
 </td></tr>
 <tr><td><br></td></tr>
@@ -2183,35 +2250,35 @@ JMeter is not a browser, and does not in
 <tr>
 <td>Expression</td>
 <td>The JavaScript expression to be executed. For example:
-        	
+            
 <ul>
 
-        		
+                
 <li>
 new Date() - return the current date and time
 </li>
 
-        		
+                
 <li>
 Math.floor(Math.random()*(${maxRandom}+1))
-        			- a random number between 0 and the variable maxRandom
+                    - a random number between 0 and the variable maxRandom
 </li>
 
-        		
+                
 <li>
 ${minRandom}+Math.floor(Math.random()*(${maxRandom}-${minRandom}+1))
-        			- a random number between the variables minRandom and maxRandom
+                    - a random number between the variables minRandom and maxRandom
 </li>
 
-        		
+                
 <li>
 "${VAR}"=="abcd"
 </li>
 
-        	
+            
 </ul>
 
-        	
+            
 </td>
 <td>
 Yes
@@ -2389,69 +2456,69 @@ StringFromFile
 )
 </p>
 
-	
+    
 <p>
 NOTE: versions up to 1.9.1 only supported a single file. 
-		JMeter versions since 1.9.1 support multiple file names.
-	
+        JMeter versions since 1.9.1 support multiple file names.
+    
 </p>
 
-	
+    
 <p>
 <b>
 In most cases, the newer 
-	
+    
 <a href="component_reference.html#CSV_Data_Set_Config">
 CSV Data Set Config element
 </a>
 
-	 is easier to use.
+     is easier to use.
 </b>
 </p>
 
-	
+    
 <p>
 
-	When a filename is first encountered, the file is opened and read into an internal
-	array. If a blank line is detected, this is treated as end of file - this allows
-	trailing comments to be used (N.B. this feature was introduced in versions after 1.9.1)
-	
+    When a filename is first encountered, the file is opened and read into an internal
+    array. If a blank line is detected, this is treated as end of file - this allows
+    trailing comments to be used (N.B. this feature was introduced in versions after 1.9.1)
+    
 </p>
 
-	
+    
 <p>
 All subsequent references to the same file name use the same internal array.
-	N.B. the filename case is significant to the function, even if the OS doesn't care,
-	so CSVRead(abc.txt,0) and CSVRead(aBc.txt,0) would refer to different internal arrays.
-	
+    N.B. the filename case is significant to the function, even if the OS doesn't care,
+    so CSVRead(abc.txt,0) and CSVRead(aBc.txt,0) would refer to different internal arrays.
+    
 </p>
 
-	
+    
 <p>
 
-	The *ALIAS feature allows the same file to be opened more than once,
-	and also allows for shorter file names.
-	
+    The *ALIAS feature allows the same file to be opened more than once,
+    and also allows for shorter file names.
+    
 </p>
 
-	
+    
 <p>
 
-	Each thread has its own internal pointer to its current row in the file array.
-	When a thread first refers to the file it will be allocated the next free row in
-	the array, so each thread will access a different row from all other threads.
-	[Unless there are more threads than there are rows in the array.]
-	
+    Each thread has its own internal pointer to its current row in the file array.
+    When a thread first refers to the file it will be allocated the next free row in
+    the array, so each thread will access a different row from all other threads.
+    [Unless there are more threads than there are rows in the array.]
+    
 </p>
 
-	
+    
 <p>
 
-	Note: the function splits the line at every comma by default.
-	If you want to enter columns containing commas, then you will need
-	to change the delimiter to a character that does not appear in any
-	column data, by setting the property: csvread.delimiter
-	
+    Note: the function splits the line at every comma by default.
+    If you want to enter columns containing commas, then you will need
+    to change the delimiter to a character that does not appear in any
+    column data, by setting the property: csvread.delimiter
+    
 </p>
 
 
@@ -2471,11 +2538,11 @@ Yes
 <tr>
 <td>Column number</td>
 <td>
-        	The column number in the file.
-        	0 = first column, 1 = second etc.
-        	"next" - go to next line of file.
-        	*ALIAS - open a file and assign it to the alias
-        	
+            The column number in the file.
+            0 = first column, 1 = second etc.
+            "next" - go to next line of file.
+            *ALIAS - open a file and assign it to the alias
+            
 </td>
 <td>
 Yes
@@ -2549,14 +2616,14 @@ StringFromFile
 <tr><td>
 <p>
 The property function returns the value of a JMeter property. 
-	If the property value cannot be found, and no default has been supplied, it returns the property name.
-	When supplying a default value, there is no need to provide a function name - the parameter can be set to null, and it will be ignored.
-	
+    If the property value cannot be found, and no default has been supplied, it returns the property name.
+    When supplying a default value, there is no need to provide a function name - the parameter can be set to null, and it will be ignored.
+    
 </p>
 For example:
 <p>
 
-		
+        
 <ul>
 
 
@@ -2585,7 +2652,7 @@ ${__property(abcd,,atod)} - return value
 
 </p>
 
-	
+    
 <p>
 <b>Parameters</b>
 <a name="__property_parms"/>
@@ -2633,12 +2700,12 @@ No
 <tr><td>
 <p>
 This is a simplified property function which is
-	intended for use with properties defined on the command line.
-	Unlike the __property function, there is no option to save the value in a variable,
-	and if no default value is supplied, it is assumed to be 1. 
-	The value of 1 was chosen because it is valid for common test variables such
-	as loops, thread count, ramp up etc.
-	
+    intended for use with properties defined on the command line.
+    Unlike the __property function, there is no option to save the value in a variable,
+    and if no default value is supplied, it is assumed to be 1. 
+    The value of 1 was chosen because it is valid for common test variables such
+    as loops, thread count, ramp up etc.
+    
 </p>
 For example:
 <p>
@@ -2686,7 +2753,7 @@ the second would return 1 and the last w
 
 </p>
 
-	
+    
 <p>
 <b>Parameters</b>
 <a name="__P_parms"/>
@@ -2703,7 +2770,7 @@ Yes
 <tr>
 <td>Default Value</td>
 <td>The default value for the property.
-        	If omitted, the default is set to "1".
+            If omitted, the default is set to "1".
 </td>
 <td>
 No
@@ -2725,11 +2792,11 @@ No
 </td></tr>
 <tr><td>
 
-	
+    
 <p>
 
-	The log function logs a message, and returns its input string
-	
+    The log function logs a message, and returns its input string
+    
 </p>
 
 
@@ -2775,7 +2842,7 @@ No
 </p>
 <p>
 The OUT and ERR log level names are used to direct the output to System.out and System.err respectively.
-	In this case, the output is always printed - it does not depend on the current log setting.
+    In this case, the output is always printed - it does not depend on the current log setting.
 
 </p>
 <pre>
@@ -2800,11 +2867,11 @@ For example:
 </td></tr>
 <tr><td>
 
-	
+    
 <p>
 
-	The logn function logs a message, and returns the empty string
-	
+    The logn function logs a message, and returns the empty string
+    
 </p>
 
 
@@ -2841,7 +2908,7 @@ No
 </p>
 <p>
 The OUT and ERR log level names are used to direct the output to System.out and System.err respectively.
-	In this case, the output is always printed - it does not depend on the current log setting.
+    In this case, the output is always printed - it does not depend on the current log setting.
 
 </p>
 <pre>
@@ -2864,10 +2931,10 @@ For example:
 </td></tr>
 <tr><td>
 
-	
+    
 <p>
 
-	The BeanShell function evaluates the script passed to it, and returns the result.
+    The BeanShell function evaluates the script passed to it, and returns the result.
 
 </p>
 
@@ -3023,73 +3090,73 @@ Remember to include any necessary quotes
 </td></tr>
 <tr><td>
 
-	
+    
 <p>
 
-	The split function splits the string passed to it according to the delimiter,
+    The split function splits the string passed to it according to the delimiter,
     and returns the original string. If any delimiters are adjacent, "?" is returned as the value.
     The split strings are returned in the variables ${VAR_1}, ${VAR_2} etc. 
     The count of variables is returned in ${VAR_n}. 
     From JMeter 2.1.2 onwards, a trailing delimiter is treated as a missing variable, and "?" is returned.
     Also, to allow it to work better with the ForEach controller, 
     __split now deletes the first unused variable in case it was set by a previous split.
-	
+    
 </p>
 
-	
+    
 <p>
 </p>
 
-	Example:
-	
+    Example:
+    
 <code>
 
-	
+    
 <br>
 
 
-	Define VAR="a||c|" in the test plan.
-	
+    Define VAR="a||c|" in the test plan.
+    
 <br>
 
 
-	${__split(${VAR},VAR,|)}
-	
+    ${__split(${VAR},VAR,|)}
+    
 <br>
 
 
-	This will return the contents of VAR, i.e. "a||c|" and set the following variables:
-	
+    This will return the contents of VAR, i.e. "a||c|" and set the following variables:
+    
 <br>
 
 
         VAR_n=4 (3 in JMeter 2.1.1 and earlier)
-	
+    
 <br>
 
 
         VAR_1=a
-	
+    
 <br>
 
 
         VAR_2=?
-	
+    
 <br>
 
 
         VAR_3=c
-	
+    
 <br>
 
 
         VAR_4=? (null in JMeter 2.1.1 and earlier)
-	
+    
 <br>
 
 
         VAR_5=null (in JMeter 2.1.2 and later)
-	
+    
 </code>
 
 
@@ -3157,15 +3224,15 @@ No
 </td></tr>
 <tr><td>
 
-	
+    
 <p>
 
-	The XPath function reads an XML file and matches the XPath.
-	Each time the function is called, the next match will be returned.
-	At end of file, it will wrap around to the start.
-	If no nodes matched, then the function will return the empty string,
-	and a warning message will be written to the JMeter log file.
-	
+    The XPath function reads an XML file and matches the XPath.
+    Each time the function is called, the next match will be returned.
+    At end of file, it will wrap around to the start.
+    If no nodes matched, then the function will return the empty string,
+    and a warning message will be written to the JMeter log file.
+    
 <p>
 <table border="1" bgcolor="#bbbb00" width="50%" cellspacing="0" cellpadding="2">
 <tr><td>Note that the entire NodeList is held in memory.
@@ -3173,33 +3240,33 @@ No
 </table>
 </p>
 
-	
+    
 </p>
 
-	
+    
 <p>
 </p>
 
-	Example:
-	
+    Example:
+    
 <code>
 
-	
+    
 <br>
 
 
-		
-	
+
+    
 <br>
 
 
-	${__XPath(/path/to/build.xml, //target/@name)}
-	
+    ${__XPath(/path/to/build.xml, //target/@name)}
+    
 <br>
 
 
-	This will match all targets in build.xml and return the contents of the next name attribute
-	
+    This will match all targets in build.xml and return the contents of the next name attribute
+    
 </code>
 
 
@@ -3240,11 +3307,11 @@ Yes
 </td></tr>
 <tr><td>
 
-	
+    
 <p>
 The setProperty function sets the value of a JMeter property. 
-		The default return value from the function is the empty string,
-		so the function call can be used anywhere functions are valid.
+        The default return value from the function is the empty string,
+        so the function call can be used anywhere functions are valid.
 </p>
 
         
@@ -3252,13 +3319,13 @@ The setProperty function sets the value 
 The original value can be returned by setting the optional 3rd parameter to "true".
 </p>
 
-	
+    
 <p>
 Properties are global to JMeter,
-		so can be used to communicate between threads and thread groups
+        so can be used to communicate between threads and thread groups
 </p>
 
-	
+    
 <p>
 <b>Parameters</b>
 <a name="__setProperty_parms"/>
@@ -3304,12 +3371,12 @@ No
 </td></tr>
 <tr><td>
 
-	
+    
 <p>
 The time function returns the current time in various formats.
 </p>
 
-	
+    
 <p>
 <b>Parameters</b>
 <a name="__time_parms"/>
@@ -3394,16 +3461,16 @@ time.YMD=yyMMdd
 </td></tr>
 <tr><td>
 
-	
+    
 <p>
 The jexl function returns the result of evaluating a 
-	
+    
 <a href="http://commons.apache.org/jexl">
 Commons JEXL expression
 </a>
 . 
-	See links below for more information on JEXL expressions.
-	
+    See links below for more information on JEXL expressions.
+    
 </p>
 
     
@@ -3411,27 +3478,27 @@ Commons JEXL expression
 The __jexl function uses Commons JEXL 1, and the __jexl2 function uses Commons JEXL 2
 </p>
 
-	
+    
 <ul>
 
-	
+    
 <li>
 <a href="http://commons.apache.org/jexl/reference/syntax.html">
 JEXL syntax description
 </a>
 </li>
 
-	
+    
 <li>
 <a href="http://commons.apache.org/jexl/reference/examples.html#Example_Expressions">
 JEXL examples
 </a>
 </li>
 
-	
+    
 </ul>
 
-	
+    
 <p>
 <b>Parameters</b>
 <a name="__jexl_parms"/>
@@ -3559,40 +3626,40 @@ OUT - System.out - e.g. OUT.println("mes
 </td></tr>
 <tr><td>
 
-	
+    
 <p>
 The V (variable) function returns the result of evaluating a variable name expression.
-	This can be used to evaluate nested variable references (which are not currently supported).
-	
+    This can be used to evaluate nested variable references (which are not currently supported).
+    
 </p>
 
-	
+    
 <p>
 For example, if one has variables A1,A2 and N=1:
 </p>
 
-	
+    
 <ul>
 
-	
+    
 <li>
 ${A1} - works OK
 </li>
 
-	
+    
 <li>
 ${A${N}} - does not work (nested variable reference)
 </li>
 
-	
+    
 <li>
 ${__V(A${N})} - works OK. A${N} becomes A1, and the __V function returns the value of A1
 </li>
 
-	
+    
 </ul>
 
-	
+    
 <p>
 <b>Parameters</b>
 <a name="__V_parms"/>
@@ -3624,23 +3691,23 @@ Yes
 </td></tr>
 <tr><td>
 
-	
+    
 <p>
 The eval function returns the result of evaluating an expression stored in a variable.
-	
+    
 </p>
 
-	
+    
 <p>
 
-	This allows one to read a string from a file, and process any variable references in it.
-	For example, if the variable "query" contains "select ${column} from ${table}" 
-	and "column" and "table" contain "name" and "customers", then ${__evalVar(query)}
-	will evaluate as "select name from customers". 
-	
+    This allows one to read a string from a file, and process any variable references in it.
+    For example, if the variable "query" contains "select ${column} from ${table}" 
+    and "column" and "table" contain "name" and "customers", then ${__evalVar(query)}
+    will evaluate as "select name from customers". 
+    
 </p>
 
-	
+    
 <p>
 <b>Parameters</b>
 <a name="__evalVar_parms"/>
@@ -3672,56 +3739,56 @@ Yes
 </td></tr>
 <tr><td>
 
-	
+    
 <p>
 The eval function returns the result of evaluating a string expression.
-	
+    
 </p>
 
-	
+    
 <p>
 
-	This allows one to interpolate variable and function references in a string
-	which is stored in a variable.	For example, given the following variables:
-	
+    This allows one to interpolate variable and function references in a string
+    which is stored in a variable.    For example, given the following variables:
+    
 <ul>
 
-	
+    
 <li>
 name=Smith
 </li>
 
-	
+    
 <li>
 column=age
 </li>
 
-	
+    
 <li>
 table=birthdays
 </li>
 
-	
+    
 <li>
 SQL=select ${column} from ${table} where name='${name}'
 </li>
 
-	
+    
 </ul>
 
-	then ${__eval(${SQL})} will evaluate as "select age from birthdays where name='Smith'". 
-	
+    then ${__eval(${SQL})} will evaluate as "select age from birthdays where name='Smith'". 
+    
 </p>
 
-	
+    
 <p>
 
-	This can be used in conjunction with CSV Dataset, for example 
-	where the both SQL statements and the values are defined in the data file.
-	
+    This can be used in conjunction with CSV Dataset, for example 
+    where the both SQL statements and the values are defined in the data file.
+    
 </p>
 
-	
+    
 <p>
 <b>Parameters</b>
 <a name="__eval_parms"/>
@@ -4012,7 +4079,140 @@ Yes
 <tr><td>
 <font face="arial,helvetica,sanserif">
 <h3>
-<a name="__FileToString">19.5.26 __FileToString</a>
+<a name="__urldecode">19.5.26 __urldecode</a>
+<a class="sectionlink" href="#__urldecode" title="Link to here">&para;</a></h3>
+</font>
+</td></tr>
+<tr><td>
+
+    
+<p>
+
+Function to decode a application/x-www-form-urlencoded string.
+Note: use UTF-8 as the encoding scheme.
+
+</p>
+
+
+<p>
+
+For example, the string 
+<code>
+Word+%22school%22+is+%22%C3%A9cole%22+in+french
+</code>
+ would get converted to
+ 
+<code>
+Word "school" is "├ęcole" in french
+</code>
+.
+
+</p>
+
+    
+<p>
+
+    Uses Java class 
+<a href="http://docs.oracle.com/javase/6/docs/api/java/net/URLDecoder.html">
+URLDecoder
+</a>
+.
+    
+</p>
+
+    
+<p>
+<b>Parameters</b>
+<a name="__urldecode_parms"/>
+<a class="sectionlink" href="#__urldecode_parms" title="Link to here">&para;</a><table border="1" cellspacing="0" cellpadding="2">
+<tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
+<tr>
+<td>String to decode</td>
+<td>
+        The string with URL encoded chars to decode.
+        
+</td>
+<td>
+Yes
+</td>
+</tr>
+</table>
+</p>
+</td></tr>
+<tr><td><br></td></tr>
+</table>
+<hr>
+<table border="0" cellspacing="0" cellpadding="2">
+<tr><td>
+<font face="arial,helvetica,sanserif">
+<h3>
+<a name="__urlencode">19.5.27 __urlencode</a>
+<a class="sectionlink" href="#__urlencode" title="Link to here">&para;</a></h3>
+</font>
+</td></tr>
+<tr><td>
+
+    
+<p>
+
+Function to encode a string to a application/x-www-form-urlencoded string.
+
+</p>
+
+
+<p>
+
+For example, the string 
+<code>
+Word "school" is "├ęcole" in french
+</code>
+ would get converted to
+ 
+<code>
+Word+%22school%22+is+%22%C3%A9cole%22+in+french
+</code>
+.
+
+</p>
+
+    
+<p>
+
+    Uses Java class 
+<a href="http://docs.oracle.com/javase/6/docs/api/java/net/URLEncoder.html">
+URLEncoder
+</a>
+.
+    
+</p>
+
+    
+<p>
+<b>Parameters</b>
+<a name="__urlencode_parms"/>
+<a class="sectionlink" href="#__urlencode_parms" title="Link to here">&para;</a><table border="1" cellspacing="0" cellpadding="2">
+<tr><th>Attribute</th><th>Description</th><th>Required</th></tr>
+<tr>
+<td>String to encode</td>
+<td>
+        String to encode in URL encoded chars.
+        
+</td>
+<td>
+Yes
+</td>
+</tr>
+</table>
+</p>
+</td></tr>
+<tr><td><br></td></tr>
+</table>
+<hr>
+<table border="0" cellspacing="0" cellpadding="2">
+<tr><td>
+<font face="arial,helvetica,sanserif">
+<h3>
+<a name="__FileToString">19.5.28 __FileToString</a>
 <a class="sectionlink" href="#__FileToString" title="Link to here">&para;</a></h3>
 </font>
 </td></tr>
@@ -4080,7 +4280,7 @@ The file name, encoding and reference na
 <tr><td>
 <font face="arial,helvetica,sanserif">
 <h3>
-<a name="__samplerName">19.5.27 __samplerName</a>
+<a name="__samplerName">19.5.29 __samplerName</a>
 <a class="sectionlink" href="#__samplerName" title="Link to here">&para;</a></h3>
 </font>
 </td></tr>
@@ -4131,7 +4331,7 @@ No
 <tr><td>
 <font face="arial,helvetica,sanserif">
 <h3>
-<a name="__TestPlanName">19.5.28 __TestPlanName</a>
+<a name="__TestPlanName">19.5.30 __TestPlanName</a>
 <a class="sectionlink" href="#__TestPlanName" title="Link to here">&para;</a></h3>
 </font>
 </td></tr>
@@ -4153,7 +4353,7 @@ No
 <tr><td>
 <font face="arial,helvetica,sanserif">
 <h3>
-<a name="__escapeOroRegexpChars">19.5.29 __escapeOroRegexpChars</a>
+<a name="__escapeOroRegexpChars">19.5.31 __escapeOroRegexpChars</a>
 <a class="sectionlink" href="#__escapeOroRegexpChars" title="Link to here">&para;</a></h3>
 </font>
 </td></tr>
@@ -4327,6 +4527,7 @@ They are mainly intended for use in file
 </td></tr>
 <tr><td><br></td></tr>
 </table>
+<br>
 <table>
 <tr>
 <td bgcolor="#525D76">
@@ -4340,7 +4541,6 @@ They are mainly intended for use in file
 </td>
 </tr>
 </table>
-<br>
 </td>
 </tr>
 <tr><td colspan="2">
@@ -4392,3 +4592,8 @@ trademarks of the Apache Software Founda
 
 
 
+
+
+
+
+

Modified: jmeter/trunk/docs/usermanual/get-started.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/get-started.html?rev=1532767&r1=1532766&r2=1532767&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/get-started.html (original)
+++ jmeter/trunk/docs/usermanual/get-started.html Wed Oct 16 13:57:02 2013
@@ -6,9 +6,9 @@
    The ASF licenses this file to You under the Apache License, Version 2.0
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
- 
+
        http://www.apache.org/licenses/LICENSE-2.0
- 
+
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,22 +20,16 @@
 
 
 <!-- start the processing -->
-<!-- ====================================================================== -->
-<!-- Main Page Section -->
-<!-- ====================================================================== -->
 <html>
 <head>
 <link rel="stylesheet" type="text/css" href="../css/style.css"/>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
 
-
-
 <title>Apache JMeter - User's Manual: Getting Started</title>
 </head>
 
 <body bgcolor="#ffffff" text="#000000" link="#525D76">
 <table border="0" cellspacing="0">
-<!-- TOP IMAGE -->
 <tr>
 <td>
 <!-- Need to specify height otherwise iframe seems to grab extra -->
@@ -65,7 +59,7 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="http://projects.apache.org/feeds/rss/jmeter.xml">Subscribe to What's New</a>
 </li>
-<li><a href="../issues.html">Issues</a>
+<li><a href="../issues.html">Issue Tracking</a>
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>
 </li>
@@ -115,8 +109,6 @@ style="border-width:0; float: left" fram
 </ul>
 <p><strong>Community</strong></p>
 <ul>
-<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
-</li>
 <li><a href="../mail.html">Mailing Lists</a>
 </li>
 <li><a href="../svnindex.html">SVN Repositories</a>
@@ -126,6 +118,8 @@ style="border-width:0; float: left" fram
 <ul>
 <li><a href="http://www.apache.org/">ASF</a>
 </li>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved in the ASF</a>
+</li>
 <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
 </li>
 <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a>
@@ -162,7 +156,7 @@ download the latest production release
 </a>
  and install it.
 The release contains all of the files you need to build and run most types of tests,
-e.g. Web (HTTP/HTTPS), FTP, JDBC, LDAP, Java, and JUnit.
+e.g. Web (HTTP/HTTPS), FTP, JDBC, LDAP, Java, JUnit and more.
 </p>
 <p>
 If you want to perform JDBC testing,
@@ -273,6 +267,50 @@ Once you are comfortable with building a
 various configuration elements (timers, listeners, assertions, and others) which give you more control
 over your Test Plans.
 </p>
+<table border="0" cellspacing="0" cellpadding="2" width="100%">
+<tr><td bgcolor="#828DA6">
+<font color="#ffffff" face="arial,helvetica,sanserif">
+<a name="template"><strong>2.0.1 Create Test Plan from Template</strong></a>
+<a class="sectionlink" href="#template" title="Link to here">&para;</a></font>
+</td></tr>
+<tr><td>
+<blockquote>
+<p>
+You have the ability to create a new Test Plan from existing template.
+</p>
+<p>
+To do so you use the menu 
+<b>
+File
+</b>
+ > 
+<b>
+Templates...
+</b>
+ or Templates icon:
+
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img  src="../images/screenshots/template_menu.png"/><br>
+<font size="-1">Templates icon item
+</font></td></tr></table></p>
+
+
+</p>
+<p>
+A popup appears, you can then choose a template among the list:
+
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img  src="../images/screenshots/template_wizard.png"/><br>
+<font size="-1">Templates popup
+</font></td></tr></table></p>
+
+
+</p>
+<p>
+A documentation for each template explains what to do once test plan is created from template.
+</p>
+</blockquote>
+</td></tr>
+<tr><td><br></td></tr>
+</table>
 </blockquote>
 </p>
 </td></tr>
@@ -410,7 +448,7 @@ implementation.
 <p>
 JMeter has extensive Email capabilities. 
 It can send email based on test results, and has a POP3(S)/IMAP(S) sampler.
-It also has an SMTP sampler.
+It also has an SMTP(S) sampler.
 
 </p>
 </blockquote>
@@ -443,13 +481,17 @@ system.properties
 <p>
 
 JMeter HTTP defaults to protocol level TLS. This can be changed by editting the JMeter property 
-"https.default.protocol" in jmeter.properties or user.properties.
+
+<i>
+https.default.protocol
+</i>
+ in jmeter.properties or user.properties.
 
 </p>
 <p>
 <b>
 The JMeter HTTP samplers are configured to accept all certificates,
-whether trusted or not, regardless of validity periods etc.
+whether trusted or not, regardless of validity periods, etc.
 </b>
 
 This is to allow the maximum flexibility in testing servers.
@@ -464,7 +506,7 @@ There is also the 
 </p>
 <p>
 <table border="1" bgcolor="#bbbb00" width="50%" cellspacing="0" cellpadding="2">
-<tr><td>The JMeter proxy server (see below) supports recording HTTPS (SSL) in versions after 2.3.4
+<tr><td>The JMeter proxy server (see below) supports recording HTTPS (SSL)
 </td></tr>
 </table>
 </p>
@@ -600,22 +642,23 @@ Note: there can be problems (especially 
 </p>
 <p>
 
-The installation directory structure should look something like this (for version 2.7):
+The installation directory structure should look something like this (where X.Y is version number):
 
 <pre>
 
-apache-jmeter-2.7
-apache-jmeter-2.7/bin
-apache-jmeter-2.7/docs
-apache-jmeter-2.7/extras
-apache-jmeter-2.7/lib/
-apache-jmeter-2.7/lib/ext
-apache-jmeter-2.7/lib/junit
-apache-jmeter-2.7/printable_docs
+apache-jmeter-X.Y
+apache-jmeter-X.Y/bin
+apache-jmeter-X.Y/docs
+apache-jmeter-X.Y/extras
+apache-jmeter-X.Y/lib/
+apache-jmeter-X.Y/lib/ext
+apache-jmeter-X.Y/lib/junit
+apache-jmeter-X.Y/licenses
+apache-jmeter-X.Y/printable_docs
 
 </pre>
 
-You can rename the parent directory (i.e. apache-jmeter-2.7) if you want, but do not change any of the sub-directory names.
+You can rename the parent directory (i.e. apache-jmeter-X.Y) if you want, but do not change any of the sub-directory names.
 
 </p>
 </blockquote>
@@ -635,7 +678,7 @@ You can rename the parent directory (i.e
 <p>
 To run JMeter, run the jmeter.bat (for Windows) or jmeter (for Unix) file.
 These files are found in the bin directory.
-After a short pause, the JMeter GUI should appear. 
+After a short time, the JMeter GUI should appear. 
 
 </p>
 <p>
@@ -782,7 +825,7 @@ JMETER_HOME/lib - used for utility jars
 
 
 <li>
-JMETER_HOME/lib/ext - used for JMeter components and add-ons
+JMETER_HOME/lib/ext - used for JMeter components and plugins
 </li>
 
 
@@ -795,33 +838,52 @@ lib/ext
 </b>
  directory.
 JMeter will automatically find JMeter components in any jars found here.
+Do not use lib/ext for utility jars or dependency jars used by the plugins;
+it is only intended for JMeter components and plugins.
+
+</p>
+<p>
+If you don't want to put JMeter plugin jars in the 
+<b>
+lib/ext
+</b>
+ directory,
+then define the property 
+<b>
+search_paths
+</b>
+ in jmeter.properties.
 
 </p>
 <p>
-Support jars (libraries etc) should be placed in the 
+Utility and dependency jars (libraries etc) can be placed in the 
 <b>
 lib
 </b>
  directory.
 </p>
 <p>
-If you don't want to put JMeter extension jars in the 
+If you don't want to put such jars in the 
 <b>
-lib/ext
+lib
 </b>
  directory,
 then define the property 
 <b>
-search_paths
+user.classpath
 </b>
- in jmeter.properties.
-Do not use lib/ext for utility jars; it is only intended for JMeter components.
+ or 
+<b>
+plugin_dependency_paths
+</b>
+
+in jmeter.properties. See below for an explanation of the differences.
 
 </p>
 <p>
 
 Other jars (such as JDBC, JMS implementations and any other support libaries needed by the JMeter code)
- should be placed in the 
+should be placed in the 
 <b>
 lib
 </b>
@@ -829,13 +891,18 @@ lib
 <b>
 lib/ext
 </b>
- directory
+ directory,
+or added to 
+<b>
+user.classpath
+</b>
+.
 </p>
 <p>
 Note: JMeter will only find .jar files, not .zip.
 </p>
 <p>
-You can also install utility Jar files in $JAVA_HOME/jre/lib/ext, or (since 2.1.1) you can set the property 
+You can also install utility Jar files in $JAVA_HOME/jre/lib/ext, or you can set the property 
 <b>
 user.classpath
 </b>
@@ -854,14 +921,14 @@ and the java command silently ignores th
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
 <tr><td bgcolor="#828DA6">
 <font color="#ffffff" face="arial,helvetica,sanserif">
-<a name="proxy_server"><strong>2.4.2 Using a Proxy Server</strong></a>
+<a name="proxy_server"><strong>2.4.2 Using a HTTP(S) Test Script Recorder</strong></a>
 <a class="sectionlink" href="#proxy_server" title="Link to here">&para;</a></font>
 </td></tr>
 <tr><td>
 <blockquote>
 <p>
 If you are testing from behind a firewall/proxy server, you may need to provide JMeter with
-the firewall/proxy server hostname and port number.  To do so, run the jmeter.bat/jmeter file
+the firewall/proxy server hostname and port number.  To do so, run the jmeter[.bat] file
 from a command line with the following parameters:
 </p>
 <p>
@@ -895,14 +962,82 @@ Example
 : jmeter -H my.proxy.server -P 8000 -u username -a password -N localhost
 </p>
 <p>
-Alternatively, you can use --proxyHost, --proxyPort, --username, and --password
+You can also use --proxyHost, --proxyPort, --username, and --password as parameter names
 </p>
 <p>
 <table border="1" bgcolor="#bbbb00" width="50%" cellspacing="0" cellpadding="2">
-<tr><td>JMeter also has its own in-built 
-<a href="../usermanual/component_reference.html#HTTP_Proxy_Server">HTTP Proxy Server</a>
-,
-which can be used for recording HTTP or HTTPS browser sessions.
+<tr><td>
+Parameters provided on a command-line may be visible to other users on the system.
+
+</td></tr>
+</table>
+</p>
+<p>
+
+If the proxy host and port are provided, then JMeter sets the following System properties:
+
+<ul>
+
+
+<li>
+http.proxyHost
+</li>
+
+
+<li>
+http.proxyPort
+</li>
+
+
+<li>
+https.proxyHost
+</li>
+
+
+<li>
+https.proxyPort
+</li>
+
+
+</ul>
+
+If a nonproxy host list is provided, then JMeter sets the following System properties:
+
+<ul>
+
+
+<li>
+http.nonProxyHosts
+</li>
+
+
+<li>
+https.nonProxyHosts
+</li>
+
+
+</ul>
+
+So if you don't wish to set both http and https proxies, 
+you can define the relevant properties in system.properties instead of using the command-line parameters.
+
+</p>
+<p>
+
+Proxy Settings can also be defined in a Test Plan, using either the 
+<a href="../usermanual/component_reference.html#HTTP_Request_Defaults">HTTP Request Defaults</a>
+
+configuration or the 
+<a href="../usermanual/component_reference.html#HTTP_Request">HTTP Request</a>
+ sampler elements.
+
+</p>
+<p>
+<table border="1" bgcolor="#bbbb00" width="50%" cellspacing="0" cellpadding="2">
+<tr><td>JMeter also has its own in-built Proxy Server, the 
+<a href="../usermanual/component_reference.html#HTTP(S)_Test_Script_Recorder">HTTP(S) Test Script Recorder</a>
+.
+This is only used for recording HTTP or HTTPS browser sessions.
 This is not to be confused with the proxy settings described above, which are used when JMeter makes HTTP or HTTPS requests itself.
 </td></tr>
 </table>
@@ -921,35 +1056,44 @@ This is not to be confused with the prox
 <blockquote>
 <p>
 For non-interactive testing, you may choose to run JMeter without the GUI. To do so, use
-the following command options
+the following command options:
 </p>
 <p>
+
 -n This specifies JMeter is to run in non-gui mode
-</p>
-<p>
+<br>
+
+
 -t [name of JMX file that contains the Test Plan].
-</p>
-<p>
+<br>
+
+
 -l [name of JTL file to log sample results to].
-</p>
-<p>
+<br>
+
+
 -j [name of JMeter run log file].
-</p>
-<p>
+<br>
+
+
 -r Run the test in the servers specified by the JMeter property "remote_hosts"
-</p>
-<p>
+<br>
+
+
 -R [list of remote servers] Run the test in the specified remote servers
+
 </p>
 <p>
 The script also lets you specify the optional firewall/proxy server information:
 </p>
 <p>
+
 -H [proxy server hostname or ip address]
 <br>
 
 
 -P [proxy server port]
+
 </p>
 <p>
 <b>
@@ -987,7 +1131,7 @@ distributed testing
 </a>
 , run JMeter in server mode on the remote node(s), and then control the server(s) from the GUI.
 You can also use non-GUI mode to run remote tests.
-To start the server(s), run jmeter-server/jmeter-server.bat on each server host.
+To start the server(s), run jmeter-server[.bat] on each server host.
 </p>
 <p>
 The script also lets you specify the optional firewall/proxy server information:
@@ -1050,19 +1194,25 @@ Java system properties, JMeter propertie
 To do so, use the following options:
 </p>
 <p>
+
 -D[prop_name]=[value] - defines a java system property value.
-</p>
-<p>
+<br>
+
+
 -J[prop name]=[value] - defines a local JMeter property.
-</p>
-<p>
+<br>
+
+
 -G[prop name]=[value] - defines a JMeter property to be sent to all remote servers.
-</p>
-<p>
+<br>
+
+
 -G[propertyfile] - defines a file containing JMeter properties to be sent to all remote servers.
-</p>
-<p>
+<br>
+
+
 -L[category]=[priority] - overrides a logging setting, setting a particular category to the given priority level.
+
 </p>
 <p>
 The -L flag can also be used without the category name to set the root logging level.
@@ -1091,11 +1241,11 @@ N.B.
 <br>
 
 
-	The command line properties are processed early in startup, but after the logging system has been set up.
-	Attempts to use the -J flag to update log_level or log_file properties will have no effect.
+    The command line properties are processed early in startup, but after the logging system has been set up.
+    Attempts to use the -J flag to update log_level or log_file properties will have no effect.
 </b>
 
-	
+    
 </p>
 </blockquote>
 </td></tr>
@@ -1125,41 +1275,45 @@ Functions and Variables for more informa
 </p>
 <p>
 If JMeter detects an error during a test, a message will be written to the log file. 
-		The log file name is defined in the jmeter.properties file (or using the -j option, see below).
-		It defaults to 
+        The log file name is defined in the jmeter.properties file (or using the -j option, see below).
+        It defaults to 
 <b>
 jmeter.log
 </b>
 , and will be found in the directory from which JMeter was launched.
-		
+        
 </p>
 <p>
 
-		Since JMeter 2.6, menu 
+        The menu 
 <b>
 Options > Log Viewer
 </b>
  displays the log file in a bottom pane on main JMeter window. 
-		
+        
 </p>
 <p>
 
-		Since JMeter 2.7 (GUI mode), the number of error/fatal messages logged in the log file is displayed at top-right. 
-		
+        In the GUI mode, the number of error/fatal messages logged in the log file is displayed at top-right. 
+        
 </p>
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img  src="../images/screenshots/log_errors_counter.png"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img  src="../images/screenshots/log_errors_counter.png"/><br>
 <font size="-1">Error/fatal counter
 </font></td></tr></table></p>
 <p>
 
-		JMeter versions after 2.2 added a new command-line option, -j jmeterlogfile. 
-		This is processed after the initial properties file is read,
-		and before any further properties are processed. 
-		It therefore allows the default of jmeter.log to be overridden.
-		The jmeter scripts that take a test plan name as a parameter (e.g. jmeter-n.cmd) have been updated
-		to define the log file using the test plan name,
-		e.g. for the test plan Test27.jmx the log file is set to Test27.log.
-		
+        The command-line option 
+<i>
+-j jmeterlogfile
+</i>
+ allow to process
+        after the initial properties file is read,
+        and before any further properties are processed. 
+        It therefore allows the default of jmeter.log to be overridden.
+        The jmeter scripts that take a test plan name as a parameter (e.g. jmeter-n.cmd) have been updated
+        to define the log file using the test plan name,
+        e.g. for the test plan Test27.jmx the log file is set to Test27.log.
+        
 </p>
 <p>
 When running on Windows, the file may appear as just 
@@ -1167,8 +1321,8 @@ When running on Windows, the file may ap
 jmeter
 </b>
  unless you have set Windows to show file extensions.
-		[Which you should do anyway, to make it easier to detect viruses and other nasties that pretend to be text files...]
-		
+        [Which you should do anyway, to make it easier to detect viruses and other nasties that pretend to be text files...]
+        
 </p>
 <p>
 As well as recording errors, the jmeter.log file records some information about the test run. For example:
@@ -1185,7 +1339,7 @@ As well as recording errors, the jmeter.
 10/17/2003 12:19:52 PM INFO  - jmeter.engine.StandardJMeterEngine: Continue on error 
 10/17/2003 12:19:52 PM INFO  - jmeter.threads.JMeterThread: Thread BSH1-1 started 
 10/17/2003 12:19:52 PM INFO  - jmeter.threads.JMeterThread: Thread BSH1-1 is done 
-10/17/2003 12:19:52 PM INFO  - jmeter.engine.StandardJMeterEngine: Test has ended 	
+10/17/2003 12:19:52 PM INFO  - jmeter.engine.StandardJMeterEngine: Test has ended
 
 </pre>
 
@@ -1193,7 +1347,7 @@ As well as recording errors, the jmeter.
 </div>
 <p>
 The log file can be helpful in determining the cause of an error,
-	as JMeter does not interrupt a test to display an error dialogue.
+    as JMeter does not interrupt a test to display an error dialogue.
 </p>
 </blockquote>
 </td></tr>
@@ -1333,7 +1487,7 @@ If you wish to modify the properties wit
 <p>
 <table border="1" bgcolor="#bbbb00" width="50%" cellspacing="0" cellpadding="2">
 <tr><td>
-  Note: since 2.2, you can define additional JMeter properties in the file defined by the
+  Note: You can define additional JMeter properties in the file defined by the
   JMeter property 
 <b>
 user.properties
@@ -1361,8 +1515,8 @@ system.properties
 <tr>
 <td>ssl.provider</td>
 <td>You can specify the class for your SSL
-	implementation if you don't want to use the built-in Java implementation.
-	
+    implementation if you don't want to use the built-in Java implementation.
+    
 </td>
 <td>
 No
@@ -1371,7 +1525,7 @@ No
 <tr>
 <td>xml.parser</td>
 <td>You can specify an implementation as your XML
-	parser.  The default value is: org.apache.xerces.parsers.SAXParser
+    parser.  The default value is: org.apache.xerces.parsers.SAXParser
 </td>
 <td>
 No
@@ -1380,9 +1534,9 @@ No
 <tr>
 <td>remote_hosts</td>
 <td>Comma-delimited list of remote JMeter hosts (or host:port if required).
-	If you are running JMeter in a distributed environment, list the machines where
+    If you are running JMeter in a distributed environment, list the machines where
   you have JMeter remote servers running.  This will allow you to control those
-	servers from this machine's GUI
+    servers from this machine's GUI
 </td>
 <td>
 No
@@ -1391,7 +1545,7 @@ No
 <tr>
 <td>not_in_menu</td>
 <td>A list of components you do not want to see in
-	JMeter's menus.  As JMeter has more and more components added, you may wish to
+    JMeter's menus.  As JMeter has more and more components added, you may wish to
   customize your JMeter to show only those components you are interested in.
   You may list their classname or their class label (the string that appears
   in JMeter's UI) here, and they will no longer appear in the menus.
@@ -1403,9 +1557,11 @@ No
 <tr>
 <td>search_paths</td>
 <td>
-  List of paths (separated by ;) that JMeter will search for JMeter add-on classes;
-  for example additional samplers.
-  This is in addition to any jars found in the lib/ext directory.
+  List of paths (separated by ;) that JMeter will search for JMeter plugin classes,
+  for example additional samplers. A path item can either be a jar file or a directory.
+  Any jar file in such a directory will be automatically included in search_paths,
+  jar files in sub directories are ignored.
+  The given value is in addition to any jars found in the lib/ext directory.
   
 </td>
 <td>
@@ -1415,8 +1571,33 @@ No
 <tr>
 <td>user.classpath</td>
 <td>
-  List of paths that JMeter will search for utility classes.
-  This is in addition to any jars found in the lib directory.
+  List of paths that JMeter will search for utility and plugin dependency classes.
+  Use your platform path separator to separate multiple paths.
+  A path item can either be a jar file or a directory.
+  Any jar file in such a directory will be automatically included in user.classpath,
+  jar files in sub directories are ignored.
+  The given value is in addition to any jars found in the lib directory.
+  All entries will be added to the class path of the system class loader
+  and also to the path of the JMeter internal loader.
+  
+</td>
+<td>
+No
+</td>
+</tr>
+<tr>
+<td>plugin_dependency_paths</td>
+<td>
+  List of paths (separated by ;) that JMeter will search for utility
+  and plugin dependency classes.
+  A path item can either be a jar file or a directory.
+  Any jar file in such a directory will be automatically included in plugin_dependency_paths,
+  jar files in sub directories are ignored.
+  The given value is in addition to any jars found in the lib directory
+  or given by the user.classpath property.
+  All entries will be added to the path of the JMeter internal loader only.
+  For plugin dependencies using plugin_dependency_paths should be preferred over
+  user.classpath.
   
 </td>
 <td>
@@ -1505,6 +1686,7 @@ See also the comments in the jmeter.prop
 </td></tr>
 <tr><td><br></td></tr>
 </table>
+<br>
 <table>
 <tr>
 <td bgcolor="#525D76">
@@ -1518,7 +1700,6 @@ See also the comments in the jmeter.prop
 </td>
 </tr>
 </table>
-<br>
 </td>
 </tr>
 <tr><td colspan="2">
@@ -1570,3 +1751,8 @@ trademarks of the Apache Software Founda
 
 
 
+
+
+
+
+

Modified: jmeter/trunk/docs/usermanual/glossary.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/glossary.html?rev=1532767&r1=1532766&r2=1532767&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/glossary.html (original)
+++ jmeter/trunk/docs/usermanual/glossary.html Wed Oct 16 13:57:02 2013
@@ -6,9 +6,9 @@
    The ASF licenses this file to You under the Apache License, Version 2.0
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
- 
+
        http://www.apache.org/licenses/LICENSE-2.0
- 
+
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,22 +20,16 @@
 
 
 <!-- start the processing -->
-<!-- ====================================================================== -->
-<!-- Main Page Section -->
-<!-- ====================================================================== -->
 <html>
 <head>
 <link rel="stylesheet" type="text/css" href="../css/style.css"/>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
 
-
-
 <title>Apache JMeter - User's Manual: Glossary</title>
 </head>
 
 <body bgcolor="#ffffff" text="#000000" link="#525D76">
 <table border="0" cellspacing="0">
-<!-- TOP IMAGE -->
 <tr>
 <td>
 <!-- Need to specify height otherwise iframe seems to grab extra -->
@@ -65,7 +59,7 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="http://projects.apache.org/feeds/rss/jmeter.xml">Subscribe to What's New</a>
 </li>
-<li><a href="../issues.html">Issues</a>
+<li><a href="../issues.html">Issue Tracking</a>
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>
 </li>
@@ -115,8 +109,6 @@ style="border-width:0; float: left" fram
 </ul>
 <p><strong>Community</strong></p>
 <ul>
-<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
-</li>
 <li><a href="../mail.html">Mailing Lists</a>
 </li>
 <li><a href="../svnindex.html">SVN Repositories</a>
@@ -126,6 +118,8 @@ style="border-width:0; float: left" fram
 <ul>
 <li><a href="http://www.apache.org/">ASF</a>
 </li>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved in the ASF</a>
+</li>
 <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
 </li>
 <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a>
@@ -324,6 +318,7 @@ The formula is: Throughput = (number of 
 </td></tr>
 <tr><td><br></td></tr>
 </table>
+<br>
 <table>
 <tr>
 <td bgcolor="#525D76">
@@ -334,7 +329,6 @@ The formula is: Throughput = (number of 
 </td>
 </tr>
 </table>
-<br>
 </td>
 </tr>
 <tr><td colspan="2">
@@ -386,3 +380,8 @@ trademarks of the Apache Software Founda
 
 
 
+
+
+
+
+

Modified: jmeter/trunk/docs/usermanual/hints_and_tips.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/hints_and_tips.html?rev=1532767&r1=1532766&r2=1532767&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/hints_and_tips.html (original)
+++ jmeter/trunk/docs/usermanual/hints_and_tips.html Wed Oct 16 13:57:02 2013
@@ -6,9 +6,9 @@
    The ASF licenses this file to You under the Apache License, Version 2.0
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
- 
+
        http://www.apache.org/licenses/LICENSE-2.0
- 
+
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,22 +20,16 @@
 
 
 <!-- start the processing -->
-<!-- ====================================================================== -->
-<!-- Main Page Section -->
-<!-- ====================================================================== -->
 <html>
 <head>
 <link rel="stylesheet" type="text/css" href="../css/style.css"/>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
 
-
-
 <title>Apache JMeter - User's Manual: Hints and Tips</title>
 </head>
 
 <body bgcolor="#ffffff" text="#000000" link="#525D76">
 <table border="0" cellspacing="0">
-<!-- TOP IMAGE -->
 <tr>
 <td>
 <!-- Need to specify height otherwise iframe seems to grab extra -->
@@ -65,7 +59,7 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="http://projects.apache.org/feeds/rss/jmeter.xml">Subscribe to What's New</a>
 </li>
-<li><a href="../issues.html">Issues</a>
+<li><a href="../issues.html">Issue Tracking</a>
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>
 </li>
@@ -115,8 +109,6 @@ style="border-width:0; float: left" fram
 </ul>
 <p><strong>Community</strong></p>
 <ul>
-<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
-</li>
 <li><a href="../mail.html">Mailing Lists</a>
 </li>
 <li><a href="../svnindex.html">SVN Repositories</a>
@@ -126,6 +118,8 @@ style="border-width:0; float: left" fram
 <ul>
 <li><a href="http://www.apache.org/">ASF</a>
 </li>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved in the ASF</a>
+</li>
 <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
 </li>
 <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a>
@@ -288,16 +282,16 @@ Regexp : Is text to search a regexp, if 
 
 
 </p>
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='663' height='300' src="../images/screenshots/searching/raw-search.png"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='663' height='300' src="../images/screenshots/searching/raw-search.png"/><br>
 <font size="-1">Figure 1 - Search raw text in TreeView
 </font></td></tr></table></p>
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='667' height='319' src="../images/screenshots/searching/raw-search-result.png"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='667' height='319' src="../images/screenshots/searching/raw-search-result.png"/><br>
 <font size="-1">Figure 2 - Result in TreeView
 </font></td></tr></table></p>
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='642' height='307' src="../images/screenshots/searching/regexp-search.png"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='642' height='307' src="../images/screenshots/searching/regexp-search.png"/><br>
 <font size="-1">Figure 3 - Search Regexp in TreeView (in this example we search whole word)
 </font></td></tr></table></p>
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='596' height='328' src="../images/screenshots/searching/regexp-search-result.png"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img width='596' height='328' src="../images/screenshots/searching/regexp-search-result.png"/><br>
 <font size="-1">Figure 4 - Result in TreeView
 </font></td></tr></table></p>
 </blockquote>
@@ -309,6 +303,7 @@ Regexp : Is text to search a regexp, if 
 </td></tr>
 <tr><td><br></td></tr>
 </table>
+<br>
 <table>
 <tr>
 <td bgcolor="#525D76">
@@ -322,7 +317,6 @@ Regexp : Is text to search a regexp, if 
 </td>
 </tr>
 </table>
-<br>
 </td>
 </tr>
 <tr><td colspan="2">
@@ -374,3 +368,8 @@ trademarks of the Apache Software Founda
 
 
 
+
+
+
+
+

Modified: jmeter/trunk/docs/usermanual/index.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/index.html?rev=1532767&r1=1532766&r2=1532767&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/index.html (original)
+++ jmeter/trunk/docs/usermanual/index.html Wed Oct 16 13:57:02 2013
@@ -6,9 +6,9 @@
    The ASF licenses this file to You under the Apache License, Version 2.0
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
- 
+
        http://www.apache.org/licenses/LICENSE-2.0
- 
+
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,22 +20,16 @@
 
 
 <!-- start the processing -->
-<!-- ====================================================================== -->
-<!-- Main Page Section -->
-<!-- ====================================================================== -->
 <html>
 <head>
 <link rel="stylesheet" type="text/css" href="../css/style.css"/>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
 
-
-
 <title>Apache JMeter - User's Manual</title>
 </head>
 
 <body bgcolor="#ffffff" text="#000000" link="#525D76">
 <table border="0" cellspacing="0">
-<!-- TOP IMAGE -->
 <tr>
 <td>
 <!-- Need to specify height otherwise iframe seems to grab extra -->
@@ -65,7 +59,7 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="http://projects.apache.org/feeds/rss/jmeter.xml">Subscribe to What's New</a>
 </li>
-<li><a href="../issues.html">Issues</a>
+<li><a href="../issues.html">Issue Tracking</a>
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>
 </li>
@@ -115,8 +109,6 @@ style="border-width:0; float: left" fram
 </ul>
 <p><strong>Community</strong></p>
 <ul>
-<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
-</li>
 <li><a href="../mail.html">Mailing Lists</a>
 </li>
 <li><a href="../svnindex.html">SVN Repositories</a>
@@ -126,6 +118,8 @@ style="border-width:0; float: left" fram
 <ul>
 <li><a href="http://www.apache.org/">ASF</a>
 </li>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved in the ASF</a>
+</li>
 <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
 </li>
 <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a>
@@ -153,8 +147,8 @@ style="border-width:0; float: left" fram
 <blockquote>
 <p>
 Click on the section name to go straight to the section. 
-	Click on the "+" to go to the relevant section of the detailed section list,
-	where you can select individual subsections.
+    Click on the "+" to go to the relevant section of the detailed section list,
+    where you can select individual subsections.
 </p>
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
 <tr><td bgcolor="#828DA6">
@@ -454,14 +448,14 @@ Changes
   
 <ul>
 
-	 
+     
 <li>
 <a href="intro.html#history">
 1.1 History
 </a>
 </li>
 
-	 
+     
 <li>
 <a href="intro.html#future">
 1.2 The Future
@@ -483,79 +477,79 @@ Changes
   
 <ul>
 
-	 
+     
 <li>
 <a href="get-started.html#requirements">
 2.1 Requirements
 </a>
 </li>
 
-	 
+     
 <ul>
 
-		
+        
 <li>
 <a href="get-started.html#java_versions">
 2.1.1 Java Version
 </a>
 </li>
 
-		
+        
 <li>
 <a href="get-started.html#os">
 2.1.2 Operating Systems
 </a>
 </li>
 
-	 
+     
 </ul>
 
-	 
+     
 <li>
 <a href="get-started.html#optional">
 2.2 Optional
 </a>
 </li>
 
-	 
+     
 <ul>
 
-		
+        
 <li>
 <a href="get-started.html#opt_compiler">
 2.2.1 Java Compiler
 </a>
 </li>
 
-		
+        
 <li>
 <a href="get-started.html#opt_sax">
 2.2.2 SAX XML Parser
 </a>
 </li>
 
-		
+        
 <li>
 <a href="get-started.html#opt_email">
 2.2.3 Email Support
 </a>
 </li>
 
-		
+        
 <li>
 <a href="get-started.html#opt_ssl">
 2.2.4 SSL Encryption
 </a>
 </li>
 
-		
+        
 <li>
 <a href="get-started.html#opt_jdbc">
 2.2.5 JDBC Driver
 </a>
 </li>
 
-		
+        
 <li>
 <a href="get-started.html#opt_soap">
 2.2.6 Apache SOAP
@@ -576,99 +570,99 @@ Changes
 </a>
 </li>
 
-	 
+     
 </ul>
 
-	 
+     
 <li>
 <a href="get-started.html#install">
 2.3 Installation
 </a>
 </li>
 
-	 
+     
 <ul>
 
-		
+        
 <li>
 <a href="get-started.html#download_release">
 2.3.1 Downloading the Latest Release
 </a>
 </li>
 
-		
+        
 <li>
 <a href="get-started.html#download_nightly">
 2.3.2 Downloading Nightly Builds
 </a>
 </li>
 
-	 
+     
 </ul>
 
-	 
+     
 <li>
 <a href="get-started.html#running">
 2.4 Running JMeter
 </a>
 </li>
 
-	 
+     
 <ul>
 
-		
+        
 <li>
 <a href="get-started.html#classpath">
 2.4.1 JMeter's Classpath
 </a>
 </li>
 
-		
+        
 <li>
 <a href="get-started.html#proxy_server">
 2.4.2 Using a Proxy Server
 </a>
 </li>
 
-		
+        
 <li>
 <a href="get-started.html#non_gui">
 2.4.3 Non-GUI Mode
 </a>
 </li>
 
-		
+        
 <li>
 <a href="get-started.html#server">
 2.4.4 Distributed Mode
 </a>
 </li>
 
-		
+        
 <li>
 <a href="get-started.html#override">
 2.4.5 Overriding Properties Via The Command Line
 </a>
 </li>
 
-		
+        
 <li>
 <a href="get-started.html#logging">
 2.4.6 Logging and Error Messages
 </a>
 </li>
 
-		
+        
 <li>
 <a href="get-started.html#options">
 2.4.7 Full list of command-line options
 </a>
 </li>
 
-	 
+     
 </ul>
 
-	 
+     
 <li>
 <a href="get-started.html#configuring_jmeter">
 2.5 Configuring JMeter
@@ -690,21 +684,21 @@ Changes
   
 <ul>
 
-	 
+     
 <li>
 <a href="build-test-plan.html#add_remove">
 3.1 Adding and Removing Elements
 </a>
 </li>
 
-	 
+     
 <li>
 <a href="build-test-plan.html#load_save">
 3.2 Loading and Saving Elements
 </a>
 </li>
 
-	 
+     
 <li>
 <a href="build-test-plan.html#config_element">
 3.3 Configuring Tree Elements
@@ -718,14 +712,14 @@ Changes
 </a>
 </li>
 
-	 
+     
 <li>
 <a href="build-test-plan.html#run">
 3.5 Running a Test Plan
 </a>
 </li>
 
-	 
+     
 <li>
 <a href="build-test-plan.html#error_reporting">
 3.6 Error reporting
@@ -747,97 +741,97 @@ Changes
   
 <ul>
 
-	 
+     
 <li>
 <a href="test_plan.html#thread_group">
 4.1 Thread Group
 </a>
 </li>
 
-	 
+     
 <li>
 <a href="test_plan.html#controllers">
 4.2 Controllers
 </a>
 </li>
 
-	 
+     
 <ul>
 
-		
+        
 <li>
 <a href="test_plan.html#samplers">
 4.2.1 Samplers
 </a>
 </li>
 
-		
+        
 <li>
 <a href="test_plan.html#logic_controller">
 4.2.2 Logic Controllers
 </a>
 </li>
 
-	 
+     
 </ul>
 
-	 
+     
 <li>
 <a href="test_plan.html#listeners">
 4.3 Listeners
 </a>
 </li>
 
-	 
+     
 <li>
 <a href="test_plan.html#timers">
 4.4 Timers
 </a>
 </li>
 
-	 
+     
 <li>
 <a href="test_plan.html#assertions">
 4.5 Assertions
 </a>
 </li>
 
-	 
+     
 <li>
 <a href="test_plan.html#config_elements">
 4.6 Configuration Elements
 </a>
 </li>
 
-	 
+     
 <li>
 <a href="test_plan.html#preprocessors">
 4.7 Pre-Processor Elements
 </a>
 </li>
 
-	 
+     
 <li>
 <a href="test_plan.html#postprocessors">
 4.8 Post-Processor Elements
 </a>
 </li>
 
-	 
+     
 <li>
 <a href="test_plan.html#executionorder">
 4.9 Execution order
 </a>
 </li>
 
-	 
+     
 <li>
 <a href="test_plan.html#scoping_rules">
 4.10 Scoping Rules
 </a>
 </li>
 
-	 
+     
 <li>
 <a href="test_plan.html#properties">
 4.11 Properties and Variables
@@ -851,7 +845,7 @@ Changes
 </a>
 </li>
 
-	
+    
 </ul>
 
  
@@ -863,52 +857,52 @@ Changes
 </a>
 </li>
 
-	 
+     
 <ul>
 
-		
+        
 <li>
 <a href="build-web-test-plan.html#adding_users">
 5.1 Adding Users
 </a>
 </li>
 
-		
+        
 <li>
 <a href="build-web-test-plan.html#adding_defaults">
 5.2 Adding Default HTTP Request Properties
 </a>
 </li>
 
-		
+        
 <li>
 <a href="build-web-test-plan.html#adding_cookie_support">
 5.3 Adding Cookie Support
 </a>
 </li>
 
-		
+        
 <li>
 <a href="build-web-test-plan.html#adding_requests">
 5.4 Adding HTTP Requests
 </a>
 </li>
 
-		
+        
 <li>
 <a href="build-web-test-plan.html#adding_listener">
 5.5 Adding a Listener to View/Store the Test Results
 </a>
 </li>
 
-		
+        
 <li>
 <a href="build-web-test-plan.html#logging_in">
 5.6 Logging in to a web-site
 </a>
 </li>
 
-	 
+     
 </ul>
 
  
@@ -920,24 +914,24 @@ Changes
 </a>
 </li>
 
-	 
+     
 <ul>
 
-		
+        
 <li>
 <a href="build-adv-web-test-plan.html#session_url_rewriting">
 6.1 Handling User Sessions With URL Rewriting
 </a>
 </li>
 
-		
+        
 <li>
 <a href="build-adv-web-test-plan.html#header_manager">
 6.2 Using a Header Manager
 </a>
 </li>
 
-	 
+     
 </ul>
 
  
@@ -949,31 +943,31 @@ Changes
 </a>
 </li>
 
-	 
+     
 <ul>
 
-		
+        
 <li>
 <a href="build-db-test-plan.html#adding_users">
 7.1 Adding Users
 </a>
 </li>
 
-		
+        
 <li>
 <a href="build-db-test-plan.html#adding_requests">
 7.2 Adding JDBC Requests
 </a>
 </li>
 
-		
+        
 <li>
 <a href="build-db-test-plan.html#adding_listener">
 7.3 Adding a Listener to View/Store the Test Results
 </a>
 </li>
 
-	 
+     
 </ul>
 
  
@@ -985,38 +979,38 @@ Changes
 </a>
 </li>
 
-	 
+     
 <ul>
 
-		
+        
 <li>
 <a href="build-ftp-test-plan.html#adding_users">
 8.1 Adding Users
 </a>
 </li>
 
-		
+        
 <li>
 <a href="build-ftp-test-plan.html#adding_defaults">
 8.2 Adding Default FTP Request Properties
 </a>
 </li>
 
-		
+        
 <li>
 <a href="build-ftp-test-plan.html#adding_requests">
 8.3 Adding FTP Requests
 </a>
 </li>
 
-		
+        
 <li>
 <a href="build-ftp-test-plan.html#adding_listener">
 8.4 Adding a Listener to View/Store the Test Results
 </a>
 </li>
 
-	 
+     
 </ul>
 
  
@@ -1178,70 +1172,70 @@ Changes
   
 <ul>
 
-	 
+     
 <li>
 <a href="best-practices.html#limit_threads">
 16.1 Limit the Number of Threads
 </a>
 </li>
 
-	 
+     
 <li>
 <a href="best-practices.html#put_cookie_manager">
 16.2 Where to Put the Cookie Manager
 </a>
 </li>
 
-	 
+     
 <li>
 <a href="best-practices.html#put_auth_manager">
 16.3 Where to Put the Authorization Manager
 </a>
 </li>
 
-	 
+     
 <li>
 <a href="best-practices.html#proxy_server">
-16.4 Using the Proxy Server to record test scripts
+16.4 Using the HTTP(S) Test Script Recorder to record test scripts
 </a>
 </li>
 
-	 
+     
 <li>
 <a href="best-practices.html#user_variables">
 16.5 User variables
 </a>
 </li>
 
-	 
+     
 <li>
 <a href="best-practices.html#lean_mean">
 16.6 Reducing resource requirements
 </a>
 </li>
 
-	 
+     
 <li>
 <a href="best-practices.html#beanshell_server">
 16.7 BeanShell server
 </a>
 </li>
 
-	 
+     
 <li>
 <a href="best-practices.html#bsh_scripting">
 16.8 BeanShell scripting
 </a>
 </li>
 
-	 
+     
 <li>
 <a href="best-practices.html#developing_scripts">
 16.9 Developing script functions in BeanShell, Javascript or Jexl etc.
 </a>
 </li>
 
-	 
+     
 <li>
 <a href="best-practices.html#parameterising_tests">
 16.10 Parameterising tests
@@ -1317,6 +1311,7 @@ Changes
 </td></tr>
 <tr><td><br></td></tr>
 </table>
+<br>
 <table>
 <tr>
 <td bgcolor="#525D76">
@@ -1327,7 +1322,6 @@ Changes
 </td>
 </tr>
 </table>
-<br>
 </td>
 </tr>
 <tr><td colspan="2">
@@ -1379,3 +1373,8 @@ trademarks of the Apache Software Founda
 
 
 
+
+
+
+
+

Modified: jmeter/trunk/docs/usermanual/intro.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/intro.html?rev=1532767&r1=1532766&r2=1532767&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/intro.html (original)
+++ jmeter/trunk/docs/usermanual/intro.html Wed Oct 16 13:57:02 2013
@@ -6,9 +6,9 @@
    The ASF licenses this file to You under the Apache License, Version 2.0
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
- 
+
        http://www.apache.org/licenses/LICENSE-2.0
- 
+
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,22 +20,16 @@
 
 
 <!-- start the processing -->
-<!-- ====================================================================== -->
-<!-- Main Page Section -->
-<!-- ====================================================================== -->
 <html>
 <head>
 <link rel="stylesheet" type="text/css" href="../css/style.css"/>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
 
-
-
 <title>Apache JMeter - User's Manual: Introduction</title>
 </head>
 
 <body bgcolor="#ffffff" text="#000000" link="#525D76">
 <table border="0" cellspacing="0">
-<!-- TOP IMAGE -->
 <tr>
 <td>
 <!-- Need to specify height otherwise iframe seems to grab extra -->
@@ -65,7 +59,7 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="http://projects.apache.org/feeds/rss/jmeter.xml">Subscribe to What's New</a>
 </li>
-<li><a href="../issues.html">Issues</a>
+<li><a href="../issues.html">Issue Tracking</a>
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>
 </li>
@@ -115,8 +109,6 @@ style="border-width:0; float: left" fram
 </ul>
 <p><strong>Community</strong></p>
 <ul>
-<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
-</li>
 <li><a href="../mail.html">Mailing Lists</a>
 </li>
 <li><a href="../svnindex.html">SVN Repositories</a>
@@ -126,6 +118,8 @@ style="border-width:0; float: left" fram
 <ul>
 <li><a href="http://www.apache.org/">ASF</a>
 </li>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved in the ASF</a>
+</li>
 <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
 </li>
 <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a>
@@ -190,7 +184,7 @@ results you expect.  For maximum flexibi
 regular expressions.
 </p>
 <p>
-But please note that JMeter is not a browser.
+But please note that JMeter is not a browser, it works at protocol level.
 </p>
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
 <tr><td bgcolor="#828DA6">
@@ -207,6 +201,9 @@ since been replaced by the Apache Tomcat
 and to add functional-testing capabilities.
 
 </p>
+<p>
+JMeter became a Top Level Apache project in November 2011, which means it has a Project Management Commitee and a dedicated website.
+</p>
 </blockquote>
 </td></tr>
 <tr><td><br></td></tr>
@@ -221,9 +218,43 @@ and to add functional-testing capabiliti
 <blockquote>
 <p>
 We hope to see JMeter's capabilities rapidly expand as developers take advantage of its
-pluggable architecture.  The primary goal of further development is to make JMeter the most
-useful regression testing tool as possible, without compromising JMeter's load-testing
-capabilities.
+pluggable architecture. 
+<br>
+
+
+The primary goal of further developments will be:
+
+<ul>
+
+
+<li>
+Addition of Websocket protocol
+</li>
+
+
+<li>
+Addition of FTPS and SFTP protocols
+</li>
+
+
+<li>
+Enhancements to Webservices protocols (SOAP Attachments)
+</li>
+
+
+<li>
+Enhancements to JMS protocol implementation
+</li>
+
+
+<li>
+</li>
+
+
+</ul>
+
+
+
 </p>
 </blockquote>
 </td></tr>
@@ -234,6 +265,7 @@ capabilities.
 </td></tr>
 <tr><td><br></td></tr>
 </table>
+<br>
 <table>
 <tr>
 <td bgcolor="#525D76">
@@ -244,7 +276,6 @@ capabilities.
 </td>
 </tr>
 </table>
-<br>
 </td>
 </tr>
 <tr><td colspan="2">
@@ -296,3 +327,8 @@ trademarks of the Apache Software Founda
 
 
 
+
+
+
+
+

Modified: jmeter/trunk/docs/usermanual/jmeter_proxy_step_by_step.pdf
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/jmeter_proxy_step_by_step.pdf?rev=1532767&r1=1532766&r2=1532767&view=diff
==============================================================================
Binary files - no diff available.

Modified: jmeter/trunk/docs/usermanual/ldapanswer_xml.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/ldapanswer_xml.html?rev=1532767&r1=1532766&r2=1532767&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/ldapanswer_xml.html (original)
+++ jmeter/trunk/docs/usermanual/ldapanswer_xml.html Wed Oct 16 13:57:02 2013
@@ -6,9 +6,9 @@
    The ASF licenses this file to You under the Apache License, Version 2.0
    (the "License"); you may not use this file except in compliance with
    the License.  You may obtain a copy of the License at
- 
+
        http://www.apache.org/licenses/LICENSE-2.0
- 
+
    Unless required by applicable law or agreed to in writing, software
    distributed under the License is distributed on an "AS IS" BASIS,
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -20,15 +20,10 @@
 
 
 <!-- start the processing -->
-<!-- ====================================================================== -->
-<!-- Main Page Section -->
-<!-- ====================================================================== -->
 <html>
 <head>
 <link rel="stylesheet" type="text/css" href="../css/style.css"/>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
-
-
 <meta name="author" value="Dolf Smits">
 <meta name="email" value="Dolf.Smits@Siemens.com">
 
@@ -37,7 +32,6 @@
 
 <body bgcolor="#ffffff" text="#000000" link="#525D76">
 <table border="0" cellspacing="0">
-<!-- TOP IMAGE -->
 <tr>
 <td>
 <!-- Need to specify height otherwise iframe seems to grab extra -->
@@ -67,7 +61,7 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="http://projects.apache.org/feeds/rss/jmeter.xml">Subscribe to What's New</a>
 </li>
-<li><a href="../issues.html">Issues</a>
+<li><a href="../issues.html">Issue Tracking</a>
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>
 </li>
@@ -117,8 +111,6 @@ style="border-width:0; float: left" fram
 </ul>
 <p><strong>Community</strong></p>
 <ul>
-<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
-</li>
 <li><a href="../mail.html">Mailing Lists</a>
 </li>
 <li><a href="../svnindex.html">SVN Repositories</a>
@@ -128,6 +120,8 @@ style="border-width:0; float: left" fram
 <ul>
 <li><a href="http://www.apache.org/">ASF</a>
 </li>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved in the ASF</a>
+</li>
 <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
 </li>
 <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a>
@@ -145,10 +139,10 @@ style="border-width:0; float: left" fram
 <blockquote>
 <p>
 
-	The extended LDAP sampler was built to support testing for very complex testpurposes.
-	It was aimed at supporting the LDAP operations as close as possible.
-	As the results are not passed back in a user-readable form, I invented my own xml definition to 
-	construct an answer in xml encoding, so the results may be parsed with regextracter or alike functions.
+    The extended LDAP sampler was built to support testing for very complex testpurposes.
+    It was aimed at supporting the LDAP operations as close as possible.
+    As the results are not passed back in a user-readable form, I invented my own xml definition to 
+    construct an answer in xml encoding, so the results may be parsed with regextracter or alike functions.
 
 </p>
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
@@ -161,7 +155,7 @@ style="border-width:0; float: left" fram
 <blockquote>
 <p>
 
-	The global structure is as follows:
+    The global structure is as follows:
 <br>
 
 
@@ -169,14 +163,14 @@ style="border-width:0; float: left" fram
 
 <ol>
 <li>
-	&lt;ldapanswer&gt; and &lt;ldapanswer/&gt; are the begin and endtags which are used to define the beginning ands end of the answer.
+    &lt;ldapanswer&gt; and &lt;ldapanswer/&gt; are the begin and endtags which are used to define the beginning ands end of the answer.
 
 </li>
 <li>
-	each ldapanswer contains 4 sections, an "operation" section (enclosed by 
-	&lt;operation&gt; tags) a respons code section (enclosed by &lt;responsecode&gt; tags), a 
-	response message (enclosed by &lt;responsemessage&gt; tags and (only with a search 
-	request) a searchresult section (enclosed with &ltsearchresult&gt tags>
+    each ldapanswer contains 4 sections, an "operation" section (enclosed by 
+    &lt;operation&gt; tags) a respons code section (enclosed by &lt;responsecode&gt; tags), a 
+    response message (enclosed by &lt;responsemessage&gt; tags and (only with a search 
+    request) a searchresult section (enclosed with &ltsearchresult&gt tags>
 </li>
 </ol>
 
@@ -199,35 +193,35 @@ following tags (with a short explanation
 
 <ol>
 <li>
-	&lt;opertype&gt;<br>
-	Thise describes which kind of operation was sent, it can have the following values:
-	<ol>
-	<li>
-	bind<br>
-	(this code is used for both a thread bind as a single bind/unbind operation)
-	</li>
-	<li>
-	unbind
-	</li>
-	<li>
-	compare
-	</li>
-	<li>
-	add
-	</li>
-	<li>
-	delete
-	</li>
-	<li>
-	modfy
-	</li>
-	<li>
-	rename
-	</li>
-	<li>
-	search
-	</li>
-	</ol>
+    &lt;opertype&gt;<br>
+    Thise describes which kind of operation was sent, it can have the following values:
+    <ol>
+    <li>
+    bind<br>
+    (this code is used for both a thread bind as a single bind/unbind operation)
+    </li>
+    <li>
+    unbind
+    </li>
+    <li>
+    compare
+    </li>
+    <li>
+    add
+    </li>
+    <li>
+    delete
+    </li>
+    <li>
+    modfy
+    </li>
+    <li>
+    rename
+    </li>
+    <li>
+    search
+    </li>
+    </ol>
 </li>
 <li>
 &lt;attributes&gt;
@@ -452,3 +446,8 @@ trademarks of the Apache Software Founda
 
 
 
+
+
+
+
+



Mime
View raw message