Author: pmouawad
Date: Fri Feb 17 20:19:18 2012
New Revision: 1245739
URL: http://svn.apache.org/viewvc?rev=1245739&view=rev
Log:
Bug 52680 - Mention version in which function was introduced
Modified:
jmeter/trunk/src/functions/org/apache/jmeter/functions/BeanShell.java
jmeter/trunk/src/functions/org/apache/jmeter/functions/CSVRead.java
jmeter/trunk/src/functions/org/apache/jmeter/functions/CharFunction.java
jmeter/trunk/src/functions/org/apache/jmeter/functions/EscapeHtml.java
jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalFunction.java
jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalVarFunction.java
jmeter/trunk/src/functions/org/apache/jmeter/functions/FileToString.java
jmeter/trunk/src/functions/org/apache/jmeter/functions/IntSum.java
jmeter/trunk/src/functions/org/apache/jmeter/functions/IterationCounter.java
jmeter/trunk/src/functions/org/apache/jmeter/functions/JavaScript.java
jmeter/trunk/src/functions/org/apache/jmeter/functions/Jexl2Function.java
jmeter/trunk/src/functions/org/apache/jmeter/functions/JexlFunction.java
jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction.java
jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction2.java
jmeter/trunk/src/functions/org/apache/jmeter/functions/LongSum.java
jmeter/trunk/src/functions/org/apache/jmeter/functions/MachineIP.java
jmeter/trunk/src/functions/org/apache/jmeter/functions/MachineName.java
jmeter/trunk/src/functions/org/apache/jmeter/functions/Property.java
jmeter/trunk/src/functions/org/apache/jmeter/functions/Property2.java
jmeter/trunk/src/functions/org/apache/jmeter/functions/Random.java
jmeter/trunk/src/functions/org/apache/jmeter/functions/RandomString.java
jmeter/trunk/src/functions/org/apache/jmeter/functions/RegexFunction.java
jmeter/trunk/src/functions/org/apache/jmeter/functions/SamplerName.java
jmeter/trunk/src/functions/org/apache/jmeter/functions/SetProperty.java
jmeter/trunk/src/functions/org/apache/jmeter/functions/SplitFunction.java
jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java
jmeter/trunk/src/functions/org/apache/jmeter/functions/TestPlanName.java
jmeter/trunk/src/functions/org/apache/jmeter/functions/ThreadNumber.java
jmeter/trunk/src/functions/org/apache/jmeter/functions/TimeFunction.java
jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscape.java
jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscapeHtml.java
jmeter/trunk/src/functions/org/apache/jmeter/functions/Variable.java
jmeter/trunk/src/functions/org/apache/jmeter/functions/XPath.java
jmeter/trunk/xdocs/changes.xml
jmeter/trunk/xdocs/usermanual/functions.xml
Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/BeanShell.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/BeanShell.java?rev=1245739&r1=1245738&r2=1245739&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/BeanShell.java
(original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/BeanShell.java Fri
Feb 17 20:19:18 2012
@@ -35,7 +35,7 @@ import org.apache.log.Logger;
/**
* A function which understands BeanShell
- *
+ * @since 1.X
*/
public class BeanShell extends AbstractFunction {
Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/CSVRead.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/CSVRead.java?rev=1245739&r1=1245738&r2=1245739&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/CSVRead.java
(original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/CSVRead.java Fri Feb
17 20:19:18 2012
@@ -48,7 +48,7 @@ import org.apache.log.Logger;
* __CSVRead(abc.csv,*TWO);
*
* __CSVRead(*ONE,1); etc
- *
+ * @since 1.9
*/
public class CSVRead extends AbstractFunction {
private static final Logger log = LoggingManager.getLoggerForClass();
Modified:
jmeter/trunk/src/functions/org/apache/jmeter/functions/CharFunction.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/CharFunction.java?rev=1245739&r1=1245738&r2=1245739&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/CharFunction.java
(original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/CharFunction.java
Fri Feb 17 20:19:18 2012
@@ -31,6 +31,7 @@ import org.apache.log.Logger;
/**
* Function to generate chars from a list of decimal or hex values
+ * @since 2.3.3
*/
public class CharFunction extends AbstractFunction {
Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/EscapeHtml.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/EscapeHtml.java?rev=1245739&r1=1245738&r2=1245739&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/EscapeHtml.java
(original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/EscapeHtml.java Fri
Feb 17 20:19:18 2012
@@ -45,6 +45,7 @@ import org.apache.jmeter.util.JMeterUtil
* is not a legal entity and so is not supported). </p>
*
* @see StringEscapeUtils#escapeHtml(String) (Commons Lang)
+ * @since 2.3.3
*/
public class EscapeHtml extends AbstractFunction {
Modified:
jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalFunction.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalFunction.java?rev=1245739&r1=1245738&r2=1245739&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalFunction.java
(original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalFunction.java
Fri Feb 17 20:19:18 2012
@@ -35,7 +35,7 @@ import org.apache.jmeter.util.JMeterUtil
* Parameter: string to be evaluated
*
* Returns: the evaluated value
- *
+ * @since 2.3.1
*/
public class EvalFunction extends AbstractFunction {
Modified:
jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalVarFunction.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalVarFunction.java?rev=1245739&r1=1245738&r2=1245739&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalVarFunction.java
(original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/EvalVarFunction.java
Fri Feb 17 20:19:18 2012
@@ -38,7 +38,7 @@ import org.apache.log.Logger;
* Parameter: string to be evaluated
*
* Returns: the evaluated value
- *
+ * @since 2.3.1
*/
public class EvalVarFunction extends AbstractFunction {
Modified:
jmeter/trunk/src/functions/org/apache/jmeter/functions/FileToString.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/FileToString.java?rev=1245739&r1=1245738&r2=1245739&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/FileToString.java
(original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/FileToString.java
Fri Feb 17 20:19:18 2012
@@ -46,7 +46,7 @@ import org.apache.log.Logger;
* - the whole text from a file
* - or **ERR** if an error occurs
* - value is also optionally saved in the variable for later re-use.
- *
+ * @since 2.4
*/
public class FileToString extends AbstractFunction {
private static final Logger log = LoggingManager.getLoggerForClass();
Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/IntSum.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/IntSum.java?rev=1245739&r1=1245738&r2=1245739&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/IntSum.java
(original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/IntSum.java Fri Feb
17 20:19:18 2012
@@ -32,6 +32,7 @@ import org.apache.jmeter.util.JMeterUtil
* Provides an intSum function that adds two or more integer values.
*
* @see LongSum
+ * @since 1.8.1
*/
public class IntSum extends AbstractFunction {
Modified:
jmeter/trunk/src/functions/org/apache/jmeter/functions/IterationCounter.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/IterationCounter.java?rev=1245739&r1=1245738&r2=1245739&view=diff
==============================================================================
---
jmeter/trunk/src/functions/org/apache/jmeter/functions/IterationCounter.java
(original)
+++
jmeter/trunk/src/functions/org/apache/jmeter/functions/IterationCounter.java
Fri Feb 17 20:19:18 2012
@@ -31,6 +31,7 @@ import org.apache.jmeter.util.JMeterUtil
/**
* Counter that can be referenced anywhere in the Thread Group. It can be
configured per User (Thread Local)
* or globally.
+ * @since 1.X
*/
public class IterationCounter extends AbstractFunction {
Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/JavaScript.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/JavaScript.java?rev=1245739&r1=1245738&r2=1245739&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/JavaScript.java
(original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/JavaScript.java Fri
Feb 17 20:19:18 2012
@@ -37,6 +37,7 @@ import org.mozilla.javascript.Scriptable
/**
* javaScript function implementation that executes a piece of JavaScript (not
Java!) code and returns its value
+ * @since 1.9
*/
public class JavaScript extends AbstractFunction {
Modified:
jmeter/trunk/src/functions/org/apache/jmeter/functions/Jexl2Function.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/Jexl2Function.java?rev=1245739&r1=1245738&r2=1245739&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/Jexl2Function.java
(original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/Jexl2Function.java
Fri Feb 17 20:19:18 2012
@@ -37,6 +37,7 @@ import org.apache.log.Logger;
/**
* A function which understands Commons JEXL2
+ * @since 2.6
*/
// For unit tests, see TestJexlFunction
public class Jexl2Function extends AbstractFunction {
Modified:
jmeter/trunk/src/functions/org/apache/jmeter/functions/JexlFunction.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/JexlFunction.java?rev=1245739&r1=1245738&r2=1245739&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/JexlFunction.java
(original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/JexlFunction.java
Fri Feb 17 20:19:18 2012
@@ -37,6 +37,7 @@ import org.apache.log.Logger;
/**
* A function which understands Commons JEXL
+ * @since 2.2
*/
// For unit tests, see TestJexlFunction
public class JexlFunction extends AbstractFunction {
Modified:
jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction.java?rev=1245739&r1=1245738&r2=1245739&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction.java
(original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction.java Fri
Feb 17 20:19:18 2012
@@ -45,7 +45,7 @@ import org.apache.log.Priority;
* </ul>
* </p>
* Returns: - the input string
- *
+ * @since 2.2
*/
public class LogFunction extends AbstractFunction {
private static final Logger log = LoggingManager.getLoggerForClass();
Modified:
jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction2.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction2.java?rev=1245739&r1=1245738&r2=1245739&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction2.java
(original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction2.java
Fri Feb 17 20:19:18 2012
@@ -43,7 +43,7 @@ import org.apache.log.Logger;
* </ul>
* </p>
* Returns: - Empty String (so can be used where return value would be a
nuisance)
- *
+ * @since 2.2
*/
public class LogFunction2 extends AbstractFunction {
private static final Logger log = LoggingManager.getLoggerForClass();
Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/LongSum.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/LongSum.java?rev=1245739&r1=1245738&r2=1245739&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/LongSum.java
(original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/LongSum.java Fri Feb
17 20:19:18 2012
@@ -31,6 +31,7 @@ import org.apache.jmeter.util.JMeterUtil
/**
* Provides a longSum function that adds two or more long values.
* @see IntSum
+ * @since 2.3.2
*/
public class LongSum extends AbstractFunction {
Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/MachineIP.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/MachineIP.java?rev=1245739&r1=1245738&r2=1245739&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/MachineIP.java
(original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/MachineIP.java Fri
Feb 17 20:19:18 2012
@@ -22,6 +22,7 @@ import org.apache.jmeter.util.JMeterUtil
/**
* Return Machine IP
+ * @since 2.6
*/
public class MachineIP extends AbstractHostIPName {
Modified:
jmeter/trunk/src/functions/org/apache/jmeter/functions/MachineName.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/MachineName.java?rev=1245739&r1=1245738&r2=1245739&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/MachineName.java
(original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/MachineName.java Fri
Feb 17 20:19:18 2012
@@ -22,6 +22,7 @@ import org.apache.jmeter.util.JMeterUtil
/**
* Return Machine Host
+ * @since 1.X
*/
public class MachineName extends AbstractHostIPName {
Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/Property.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/Property.java?rev=1245739&r1=1245738&r2=1245739&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/Property.java
(original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/Property.java Fri
Feb 17 20:19:18 2012
@@ -40,7 +40,7 @@ import org.apache.jmeter.util.JMeterUtil
* - the property value, but if not found:
* - the default value, but if not defined:
* - the property name itself
- *
+ * @since 2.0
*/
public class Property extends AbstractFunction {
Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/Property2.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/Property2.java?rev=1245739&r1=1245738&r2=1245739&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/Property2.java
(original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/Property2.java Fri
Feb 17 20:19:18 2012
@@ -45,7 +45,7 @@ import org.apache.jmeter.util.JMeterUtil
*
* Returns: - the property value, but if not found - the default value, but if
* not present - "1" (suitable for use in ThreadGroup GUI)
- *
+ * @since 2.0
*/
public class Property2 extends AbstractFunction {
Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/Random.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/Random.java?rev=1245739&r1=1245738&r2=1245739&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/Random.java
(original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/Random.java Fri Feb
17 20:19:18 2012
@@ -31,7 +31,7 @@ import org.apache.jmeter.util.JMeterUtil
/**
* Provides a Random function which returns a random long integer between a min
* (first argument) and a max (second argument).
- *
+ * @since 1.9
*/
public class Random extends AbstractFunction {
Modified:
jmeter/trunk/src/functions/org/apache/jmeter/functions/RandomString.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/RandomString.java?rev=1245739&r1=1245738&r2=1245739&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/RandomString.java
(original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/RandomString.java
Fri Feb 17 20:19:18 2012
@@ -35,7 +35,7 @@ import org.apache.log.Logger;
/**
* Provides a RandomString function which returns a random String of length
(first argument)
* using characters (second argument)
- *
+ * @since 2.6
*/
public class RandomString extends AbstractFunction {
private static final Logger log = LoggingManager.getLoggerForClass();
Modified:
jmeter/trunk/src/functions/org/apache/jmeter/functions/RegexFunction.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/RegexFunction.java?rev=1245739&r1=1245738&r2=1245739&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/RegexFunction.java
(original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/RegexFunction.java
Fri Feb 17 20:19:18 2012
@@ -41,6 +41,7 @@ import org.apache.oro.text.regex.Perl5Co
import org.apache.oro.text.regex.Util;
/**
* Implements regular expression parsing of sample results and variables
+ * @since 1.X
*/
// @see TestRegexFunction for unit tests
Modified:
jmeter/trunk/src/functions/org/apache/jmeter/functions/SamplerName.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/SamplerName.java?rev=1245739&r1=1245738&r2=1245739&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/SamplerName.java
(original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/SamplerName.java Fri
Feb 17 20:19:18 2012
@@ -30,6 +30,7 @@ import org.apache.jmeter.util.JMeterUtil
/**
* Function to return the name of the current sampler.
+ * @since 2.5
*/
public class SamplerName extends AbstractFunction {
Modified:
jmeter/trunk/src/functions/org/apache/jmeter/functions/SetProperty.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/SetProperty.java?rev=1245739&r1=1245738&r2=1245739&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/SetProperty.java
(original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/SetProperty.java Fri
Feb 17 20:19:18 2012
@@ -39,7 +39,7 @@ import org.apache.jmeter.util.JMeterUtil
* ${__setProperty(propname,propvalue[,returnvalue?])}
*
* Returns: nothing or original value if the 3rd parameter is true
- *
+ * @since 2.1
*/
public class SetProperty extends AbstractFunction {
Modified:
jmeter/trunk/src/functions/org/apache/jmeter/functions/SplitFunction.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/SplitFunction.java?rev=1245739&r1=1245738&r2=1245739&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/SplitFunction.java
(original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/SplitFunction.java
Fri Feb 17 20:19:18 2012
@@ -53,7 +53,7 @@ import org.apache.log.Logger;
* <li>VARNAME_n - number of fields found</li>
* <li>VARNAME_1..n - fields</li>
* </ul>
- *
+ * @since 2.0.2
*/
public class SplitFunction extends AbstractFunction {
private static final Logger log = LoggingManager.getLoggerForClass();
Modified:
jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java?rev=1245739&r1=1245738&r2=1245739&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java
(original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/StringFromFile.java
Fri Feb 17 20:19:18 2012
@@ -62,6 +62,7 @@ import org.apache.log.Logger;
* <li>the output variable name is resolved every time the function is
invoked</li>
* </ul>
* Because function instances are shared, it does not make sense to use the
thread number as part of the file name.
+ * @since 1.9
*/
public class StringFromFile extends AbstractFunction implements TestListener {
private static final Logger log = LoggingManager.getLoggerForClass();
Modified:
jmeter/trunk/src/functions/org/apache/jmeter/functions/TestPlanName.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/TestPlanName.java?rev=1245739&r1=1245738&r2=1245739&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/TestPlanName.java
(original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/TestPlanName.java
Fri Feb 17 20:19:18 2012
@@ -29,6 +29,7 @@ import org.apache.jmeter.services.FileSe
/**
* Returns Test Plan name
+ * @since 2.6
*/
public class TestPlanName extends AbstractFunction {
Modified:
jmeter/trunk/src/functions/org/apache/jmeter/functions/ThreadNumber.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/ThreadNumber.java?rev=1245739&r1=1245738&r2=1245739&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/ThreadNumber.java
(original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/ThreadNumber.java
Fri Feb 17 20:19:18 2012
@@ -28,6 +28,7 @@ import org.apache.jmeter.samplers.Sample
/**
* Function to return the current thread number.
+ * @since 1.X
*/
public class ThreadNumber extends AbstractFunction {
Modified:
jmeter/trunk/src/functions/org/apache/jmeter/functions/TimeFunction.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/TimeFunction.java?rev=1245739&r1=1245738&r2=1245739&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/TimeFunction.java
(original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/TimeFunction.java
Fri Feb 17 20:19:18 2012
@@ -36,6 +36,7 @@ import org.apache.jmeter.util.JMeterUtil
/**
* __time() function - returns the current time in milliseconds
+ * @since 2.2
*/
public class TimeFunction extends AbstractFunction {
Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscape.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscape.java?rev=1245739&r1=1245738&r2=1245739&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscape.java
(original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscape.java Fri
Feb 17 20:19:18 2012
@@ -35,6 +35,7 @@ import org.apache.jmeter.util.JMeterUtil
* unless the '\' is preceded by another '\'.
*
* @see StringEscapeUtils#unescapeJava(String)
+ * @since 2.3.3
*/
public class UnEscape extends AbstractFunction {
Modified:
jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscapeHtml.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscapeHtml.java?rev=1245739&r1=1245738&r2=1245739&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscapeHtml.java
(original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/UnEscapeHtml.java
Fri Feb 17 20:19:18 2012
@@ -41,6 +41,7 @@ import org.apache.jmeter.util.JMeterUtil
* e.g. "&gt;&zzzz;x" will become ">&zzzz;x".
* </p>
* @see org.apache.commons.lang.StringEscapeUtils#unescapeHtml(String)
+ * @since 2.3.3
*/
public class UnEscapeHtml extends AbstractFunction {
Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/Variable.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/Variable.java?rev=1245739&r1=1245738&r2=1245739&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/Variable.java
(original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/Variable.java Fri
Feb 17 20:19:18 2012
@@ -37,7 +37,7 @@ import org.apache.jmeter.util.JMeterUtil
* Returns:
* - the variable value, but if not found
* - the variable name itself
- *
+ * @since 2.3RC3
*/
public class Variable extends AbstractFunction {
Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/XPath.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/XPath.java?rev=1245739&r1=1245738&r2=1245739&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/XPath.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/XPath.java Fri Feb
17 20:19:18 2012
@@ -43,7 +43,7 @@ import org.apache.log.Logger;
*
* NOTE: A single instance of each different file/expression combination
* is opened and used for all threads.
- *
+ * @since 2.0.3
*/
public class XPath extends AbstractFunction {
private static final Logger log = LoggingManager.getLoggerForClass();
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1245739&r1=1245738&r2=1245739&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Fri Feb 17 20:19:18 2012
@@ -152,6 +152,7 @@ This does not affect JMeter directly, bu
with other code that depends on an earlier version of the Rhino Javascript jar.
</li>
<li>Bug 52675 - Refactor Proxy and HttpRequestHdr to allow Sampler Creation by
Proxy</li>
+<li>Bug 52680 - Mention version in which function was introduced</li>
</ul>
</section>
Modified: jmeter/trunk/xdocs/usermanual/functions.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/functions.xml?rev=1245739&r1=1245738&r2=1245739&view=diff
==============================================================================
--- jmeter/trunk/xdocs/usermanual/functions.xml (original)
+++ jmeter/trunk/xdocs/usermanual/functions.xml Fri Feb 17 20:19:18 2012
@@ -85,40 +85,40 @@ and need to be referenced using the __P
<p>List of functions, loosely grouped into types.</p>
<table border="1">
- <tr><th>Type of function</th><th>Name</th><th>Comment</th></tr>
+ <tr><th>Type of
function</th><th>Name</th><th>Comment</th><th>Since</th></tr>
<!-- N.B. the leading space is needed to ensure the content is
processed -->
- <tr><td>Information</td><td> <a
href="#__threadNum">threadNum</a></td><td>get thread number</td></tr>
- <tr><td>Information</td><td> <a
href="#__samplerName">samplerName</a></td><td>get the sampler name
(label)</td></tr>
- <tr><td>Information</td><td> <a
href="#__machineIP">machineIP</a></td><td>get the local machine IP
address</td></tr>
- <tr><td>Information</td><td> <a
href="#__machineName">machineName</a></td><td>get the local machine
name</td></tr>
- <tr><td>Information</td><td> <a href="#__time">time</a></td><td>return
current time in various formats</td></tr>
- <tr><td>Information</td><td> <a href="#__log">log</a></td><td>log (or
display) a message (and return the value)</td></tr>
- <tr><td>Information</td><td> <a href="#__logn">logn</a></td><td>log
(or display) a message (empty return value)</td></tr>
- <tr><td>Input</td><td> <a
href="#__StringFromFile">StringFromFile</a></td><td>read a line from a
file</td></tr>
- <tr><td>Input</td><td> <a
href="#__FileToString">FileToString</a></td><td>read an entire file</td></tr>
- <tr><td>Input</td><td> <a href="#__CSVRead">CSVRead</a></td><td>read
from CSV delimited file</td></tr>
- <tr><td>Input</td><td> <a href="#__XPath">XPath</a></td><td>Use an
XPath expression to read from a file</td></tr>
- <tr><td>Calculation</td><td> <a
href="#__counter">counter</a></td><td>generate an incrementing number</td></tr>
- <tr><td>Calculation</td><td> <a
href="#__intSum">intSum</a></td><td>add int numbers</td></tr>
- <tr><td>Calculation</td><td> <a
href="#__longSum">longSum</a></td><td>add long numbers</td></tr>
- <tr><td>Calculation</td><td> <a
href="#__Random">Random</a></td><td>generate a random number</td></tr>
- <tr><td>Calculation</td><td> <a
href="#__RandomString">RandomString</a></td><td>generate a random
string</td></tr>
- <tr><td>Scripting</td><td> <a
href="#__BeanShell">BeanShell</a></td><td>run a BeanShell script</td></tr>
- <tr><td>Scripting</td><td> <a
href="#__javaScript">javaScript</a></td><td>process JavaScript (Mozilla
Rhino)</td></tr>
- <tr><td>Scripting</td><td> <a href="#__jexl">jexl,
jexl2</a></td><td>evaluate a Commons Jexl expression</td></tr>
- <tr><td>Properties</td><td> <a href="#__property">property</a>
</td><td>read a property</td></tr>
- <tr><td>Properties</td><td> <a href="#__P">P</a></td><td>read a
property (shorthand method)</td></tr>
- <tr><td>Properties</td><td> <a
href="#__setProperty">setProperty</a></td><td>set a JMeter property</td></tr>
- <tr><td>Variables</td><td> <a href="#__split">split</a></td><td>Split
a string into variables</td></tr>
- <tr><td>Variables</td><td> <a href="#__V">V</a></td><td>evaluate a
variable name</td></tr>
- <tr><td>Variables</td><td> <a href="#__eval">eval</a></td><td>evaluate
a variable expression</td></tr>
- <tr><td>Variables</td><td> <a
href="#__evalVar">evalVar</a></td><td>evaluate an expression stored in a
variable</td></tr>
- <tr><td>String</td><td> <a
href="#__regexFunction">regexFunction</a></td><td>parse previous response using
a regular expression</td></tr>
- <tr><td>String</td><td> <a href="#__char">char</a></td><td>generate
Unicode char values from a list of numbers</td></tr>
- <tr><td>String</td><td> <a
href="#__unescape">unescape</a></td><td>Process strings containing Java escapes
(e.g. \n & \t)</td></tr>
- <tr><td>String</td><td> <a
href="#__unescapeHtml">unescapeHtml</a></td><td>Decode HTML-encoded
strings</td></tr>
- <tr><td>String</td><td> <a
href="#__escapeHtml">escapeHtml</a></td><td>Encode strings using HTML
encoding</td></tr>
- <tr><td>String</td><td> <a
href="#__TestPlanName">TestPlanName</a></td><td>Return name of current test
plan</td></tr>
+ <tr><td>Information</td><td> <a
href="#__threadNum">threadNum</a></td><td>get thread
number</td><td>1.X</td></tr>
+ <tr><td>Information</td><td> <a
href="#__samplerName">samplerName</a></td><td>get the sampler name
(label)</td><td>2.5</td></tr>
+ <tr><td>Information</td><td> <a
href="#__machineIP">machineIP</a></td><td>get the local machine IP
address</td><td>2.6</td></tr>
+ <tr><td>Information</td><td> <a
href="#__machineName">machineName</a></td><td>get the local machine
name</td><td>1.X</td></tr>
+ <tr><td>Information</td><td> <a href="#__time">time</a></td><td>return
current time in various formats</td><td>2.2</td></tr>
+ <tr><td>Information</td><td> <a href="#__log">log</a></td><td>log (or
display) a message (and return the value)</td><td>2.2</td></tr>
+ <tr><td>Information</td><td> <a href="#__logn">logn</a></td><td>log
(or display) a message (empty return value)</td><td>2.2</td></tr>
+ <tr><td>Input</td><td> <a
href="#__StringFromFile">StringFromFile</a></td><td>read a line from a
file</td><td>1.9</td></tr>
+ <tr><td>Input</td><td> <a
href="#__FileToString">FileToString</a></td><td>read an entire
file</td><td>2.4</td></tr>
+ <tr><td>Input</td><td> <a href="#__CSVRead">CSVRead</a></td><td>read
from CSV delimited file</td><td>1.9</td></tr>
+ <tr><td>Input</td><td> <a href="#__XPath">XPath</a></td><td>Use an
XPath expression to read from a file</td><td>2.0.3</td></tr>
+ <tr><td>Calculation</td><td> <a
href="#__counter">counter</a></td><td>generate an incrementing
number</td><td>1.X</td></tr>
+ <tr><td>Calculation</td><td> <a
href="#__intSum">intSum</a></td><td>add int numbers</td><td>1.8.1</td></tr>
+ <tr><td>Calculation</td><td> <a
href="#__longSum">longSum</a></td><td>add long numbers</td><td>2.3.2</td></tr>
+ <tr><td>Calculation</td><td> <a
href="#__Random">Random</a></td><td>generate a random
number</td><td>1.9</td></tr>
+ <tr><td>Calculation</td><td> <a
href="#__RandomString">RandomString</a></td><td>generate a random
string</td><td>2.6</td></tr>
+ <tr><td>Scripting</td><td> <a
href="#__BeanShell">BeanShell</a></td><td>run a BeanShell
script</td><td>1.X</td></tr>
+ <tr><td>Scripting</td><td> <a
href="#__javaScript">javaScript</a></td><td>process JavaScript (Mozilla
Rhino)</td><td>1.9</td></tr>
+ <tr><td>Scripting</td><td> <a href="#__jexl">jexl,
jexl2</a></td><td>evaluate a Commons Jexl expression</td><td>jexl(2.2),
jexl2(2.6)</td></tr>
+ <tr><td>Properties</td><td> <a href="#__property">property</a>
</td><td>read a property</td><td>2.0</td></tr>
+ <tr><td>Properties</td><td> <a href="#__P">P</a></td><td>read a
property (shorthand method)</td><td>2.0</td></tr>
+ <tr><td>Properties</td><td> <a
href="#__setProperty">setProperty</a></td><td>set a JMeter
property</td><td>2.1</td></tr>
+ <tr><td>Variables</td><td> <a href="#__split">split</a></td><td>Split
a string into variables</td><td>2.0.2</td></tr>
+ <tr><td>Variables</td><td> <a href="#__V">V</a></td><td>evaluate a
variable name</td><td>2.3RC3</td></tr>
+ <tr><td>Variables</td><td> <a href="#__eval">eval</a></td><td>evaluate
a variable expression</td><td>2.3.1</td></tr>
+ <tr><td>Variables</td><td> <a
href="#__evalVar">evalVar</a></td><td>evaluate an expression stored in a
variable</td><td>2.3.1</td></tr>
+ <tr><td>String</td><td> <a
href="#__regexFunction">regexFunction</a></td><td>parse previous response using
a regular expression</td><td>1.X</td></tr>
+ <tr><td>String</td><td> <a href="#__char">char</a></td><td>generate
Unicode char values from a list of numbers</td><td>2.3.3</td></tr>
+ <tr><td>String</td><td> <a
href="#__unescape">unescape</a></td><td>Process strings containing Java escapes
(e.g. \n & \t)</td><td>2.3.3</td></tr>
+ <tr><td>String</td><td> <a
href="#__unescapeHtml">unescapeHtml</a></td><td>Decode HTML-encoded
strings</td><td>2.3.3</td></tr>
+ <tr><td>String</td><td> <a
href="#__escapeHtml">escapeHtml</a></td><td>Encode strings using HTML
encoding</td><td>2.3.3</td></tr>
+ <tr><td>String</td><td> <a
href="#__TestPlanName">TestPlanName</a></td><td>Return name of current test
plan</td><td>2.6</td></tr>
</table>
<p></p>
<subsection name="§-num;.1 What can functions do" anchor="what_can_do">
