Author: sebb
Date: Thu Sep 6 05:00:38 2007
New Revision: 573235
URL: http://svn.apache.org/viewvc?rev=573235&view=rev
Log:
Javascript is Mozilla Rhino, not Apache!
Added links to language documentation
Clarified properties and variables
Modified:
jakarta/jmeter/branches/rel-2-2/docs/changes.html
jakarta/jmeter/branches/rel-2-2/docs/usermanual/functions.html
jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
jakarta/jmeter/branches/rel-2-2/xdocs/usermanual/functions.xml
Modified: jakarta/jmeter/branches/rel-2-2/docs/changes.html
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/docs/changes.html?rev=573235&r1=573234&r2=573235&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/docs/changes.html (original)
+++ jakarta/jmeter/branches/rel-2-2/docs/changes.html Thu Sep 6 05:00:38 2007
@@ -143,7 +143,7 @@
<li >
- Fix NPE in
SampleResultConverter - XStream PrettyPrinteWriter cannot handle nulls
+ Fix NPE in
SampleResultConverter - XStream PrettyPrintWriter cannot handle nulls
</li>
@@ -164,6 +164,11 @@
</li>
+
<li >
+ Add
documentation links for Rhino and BeanShell to functions; clarify variables and
properties
+ </li>
+
+
</ul>
<h4 >
Fixes since
2.3RC3
@@ -540,6 +545,7 @@
</p>
<p >
+
Control-Z no longer used for Remote Start All - this now uses Control+Shift+R
</p>
Modified: jakarta/jmeter/branches/rel-2-2/docs/usermanual/functions.html
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/docs/usermanual/functions.html?rev=573235&r1=573234&r2=573235&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/docs/usermanual/functions.html (original)
+++ jakarta/jmeter/branches/rel-2-2/docs/usermanual/functions.html Thu Sep 6
05:00:38 2007
@@ -181,6 +181,13 @@
</p>
+
<p><table border="1" bgcolor="#bbbb00" width="50%" cellspacing="0"
cellpadding="2">
+ <tr><td>
+Properties are not the same as variables.
+Variables are local to a thread; properties are common to all threads.
+
+ </td></tr>
+ </table></p>
<p >
List of
functions:
</p>
@@ -231,7 +238,7 @@
<li >
<a href="#__javaScript">
- JavaScript
(Apache Rhino)
+ JavaScript
(Mozilla Rhino)
</a>
</li>
@@ -1091,6 +1098,17 @@
</p>
+
<p >
+
+For details of the language, please see
+
<a href="http://www.mozilla.org/rhino/overview.html";>
+ Mozilla Rhino
Overview
+ </a>
+
+
+ </p>
+
+
<p><table border="1" bgcolor="#bbbb00" width="50%"
cellspacing="0" cellpadding="2">
<tr><td>
JMeter is not a browser, and does not interpret the JavaScript in downloaded
pages.
@@ -1633,7 +1651,12 @@
<br >
</br>
-For full details on using BeanShell, please see the BeanShell web-site at
http://www.beanshell.org/.
+For full details on using BeanShell, please see the BeanShell web-site at
+
<a href="http://www.beanshell.org/";>
+
http://www.beanshell.org/
+ </a>
+
+
</b>
@@ -2233,6 +2256,11 @@
</li>
+
<li >
+ START variables
(see next section)
+ </li>
+
+
</ul>
</blockquote>
</td></tr>
@@ -2248,9 +2276,14 @@
<blockquote>
<p >
-Properties are defined in jmeter.properties, or on the command line.
-Some additional properties are defined by JMeter. These are listed below.
-The START properties are also copied to variables with the same names.
+The set of JMeter properties is initialised from the system properties defined
when JMeter starts;
+additional JMeter properties are defined in jmeter.properties, user.properties
or on the command line.
+
+ </p>
+
<p >
+
+Some built-in properties are defined by JMeter. These are listed below.
+For convenience, the START properties are also copied to variables with the
same names.
</p>
<ul >
Modified: jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml?rev=573235&r1=573234&r2=573235&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml (original)
+++ jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml Thu Sep 6 05:00:38 2007
@@ -33,13 +33,14 @@
<h4>Bug fixes</h4>
<ul>
-<li>Fix NPE in SampleResultConverter - XStream PrettyPrinteWriter cannot
handle nulls</li>
+<li>Fix NPE in SampleResultConverter - XStream PrettyPrintWriter cannot handle
nulls</li>
</ul>
<h4>Improvements</h4>
<ul>
<li>Add nameSpace option to XPath extractor</li>
<li>Add NULL parameter option to JDBC sampler</li>
+<li>Add documentation links for Rhino and BeanShell to functions; clarify
variables and properties</li>
</ul>
<h4>Fixes since 2.3RC3</h4>
Modified: jakarta/jmeter/branches/rel-2-2/xdocs/usermanual/functions.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/xdocs/usermanual/functions.xml?rev=573235&r1=573234&r2=573235&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/xdocs/usermanual/functions.xml (original)
+++ jakarta/jmeter/branches/rel-2-2/xdocs/usermanual/functions.xml Thu Sep 6
05:00:38 2007
@@ -66,6 +66,10 @@
${VARIABLE}
</pre>
</p>
+<note>
+Properties are not the same as variables.
+Variables are local to a thread; properties are common to all threads.
+</note>
<p>List of functions:</p>
<ul>
<li><a href="#__regexFunction">regexFunction - regular expression
evaluator</a></li>
@@ -74,7 +78,7 @@
<li><a href="#__intSum">intSum - add variables</a></li>
<li><a href="#__StringFromFile">StringFromFile - read a line from a
file</a></li>
<li><a href="#__machineName">machineName - get the local machine
name</a></li>
- <li><a href="#__javaScript">JavaScript (Apache Rhino)</a></li>
+ <li><a href="#__javaScript">JavaScript (Mozilla Rhino)</a></li>
<li><a href="#__Random">random number</a></li>
<li><a href="#__CSVRead">CSVRead - read from CSV delimited
file</a></li>
<li><a href="#__property">read a property</a></li>
@@ -373,6 +377,9 @@
<p>
The JMeter Javascript function calls a standalone JavaScript interpreter.
Javascript is used as a scripting language, so you can do calculations etc.</p>
+<p>
+For details of the language, please see <a
href="http://www.mozilla.org/rhino/overview.html";>Mozilla Rhino Overview</a>
+</p>
<note>
JMeter is not a browser, and does not interpret the JavaScript in downloaded
pages.
</note>
@@ -557,7 +564,8 @@
<p>
<b>Please note that the BeanShell jar file is not included with JMeter; it
needs to be separately downloaded.
<br></br>
-For full details on using BeanShell, please see the BeanShell web-site at
http://www.beanshell.org/.</b>
+For full details on using BeanShell, please see the BeanShell web-site at <a
href="http://www.beanshell.org/";>http://www.beanshell.org/</a>
+</b>
</p>
<p>
Note that a different Interpreter is used for each independent occurence of
the function
@@ -764,13 +772,17 @@
<ul>
<li>cookiename - contains the cookie value</li>
<li>JMeterThread.last_sample_ok - whether or not the last sample was OK -
true/false</li>
+<li>START variables (see next section)</li>
</ul>
</subsection>
<subsection name="§-num;.6 Pre-defined Properties"
anchor="predefinedprops">
<p>
-Properties are defined in jmeter.properties, or on the command line.
-Some additional properties are defined by JMeter. These are listed below.
-The START properties are also copied to variables with the same names.
+The set of JMeter properties is initialised from the system properties defined
when JMeter starts;
+additional JMeter properties are defined in jmeter.properties, user.properties
or on the command line.
+</p>
+<p>
+Some built-in properties are defined by JMeter. These are listed below.
+For convenience, the START properties are also copied to variables with the
same names.
</p>
<ul>
<li>START.MS - start time in milliseconds</li>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
