Author: sebb
Date: Thu Dec 16 19:47:02 2010
New Revision: 1050121
URL: http://svn.apache.org/viewvc?rev=1050121&view=rev
Log:
Give access to current SampleResult (and drop references to prev)
Modified:
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerResources.properties
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerResources_fr.properties
Modified:
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java?rev=1050121&r1=1050120&r2=1050121&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java
Thu Dec 16 19:47:02 2010
@@ -56,6 +56,7 @@ public class JSR223Sampler extends JSR22
result.setResponseMessage("Could not instantiate
ScriptManager");
return result;
}
+ mgr.put("SampleResult",result);
Object ret = processFileOrScript(mgr);
result.setSuccessful(true);
result.setResponseCodeOK();
Modified:
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerResources.properties
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerResources.properties?rev=1050121&r1=1050120&r2=1050121&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerResources.properties
(original)
+++
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerResources.properties
Thu Dec 16 19:47:02 2010
@@ -17,7 +17,7 @@ displayName=JSR223 Sampler
scriptingLanguage.displayName=Script language (e.g. beanshell, javascript,
jexl)
scriptLanguage.displayName=Language
scriptLanguage.shortDescription=Name of JSR 223 language, e.g. beanshell,
javascript, jexl
-scripting.displayName=Script (variables: ctx vars props prev sampler log Label
Filename Parameters args[] OUT)
+scripting.displayName=Script (variables: ctx vars props SampleResult sampler
log Label Filename Parameters args[] OUT)
script.displayName=Script
script.shortDescription=Script in the appropriate JSR 223 language
parameterGroup.displayName=Parameters to be passed to script (=> String
Parameters and String []args)
Modified:
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerResources_fr.properties
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerResources_fr.properties?rev=1050121&r1=1050120&r2=1050121&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerResources_fr.properties
(original)
+++
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerResources_fr.properties
Thu Dec 16 19:47:02 2010
@@ -24,6 +24,6 @@ parameters.shortDescription=Param\u00E8t
script.displayName=Script
script.shortDescription=Script dans le langage JSR223 appropri\u00E9
scriptLanguage.displayName=Langage
-scriptLanguage.shortDescription=Nom du langage JSR223, i.e. beanshell,
javascript, jexl, etc.
-scripting.displayName=Script (variables \: ctx vars props prev sampler log
Label Filename Parameters args[] OUT)
+scriptLanguage.shortDescription=Nom du langage JSR223, e.g. beanshell,
javascript, jexl, etc.
+scripting.displayName=Script (variables \: ctx vars props SampleResult sampler
log Label Filename Parameters args[] OUT)
scriptingLanguage.displayName=Langage de script (i.e. groovy, beanshell, jexl,
etc.)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
