You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2008/05/13 16:27:14 UTC

svn commit: r655879 - in /jakarta/jmeter/trunk: docs/ docs/usermanual/ src/components/org/apache/jmeter/extractor/ src/components/org/apache/jmeter/modifiers/ src/components/org/apache/jmeter/timers/ src/components/org/apache/jmeter/visualizers/ src/co...

Author: sebb
Date: Tue May 13 07:27:13 2008
New Revision: 655879

URL: http://svn.apache.org/viewvc?rev=655879&view=rev
Log:
Give Beanshell test elements access to JMeter Properties via "props" object

Modified:
    jakarta/jmeter/trunk/docs/changes.html
    jakarta/jmeter/trunk/docs/usermanual/component_reference.html
    jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources.properties
    jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources_de.properties
    jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources_tr.properties
    jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorResources.properties
    jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorResources_de.properties
    jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorResources_tr.properties
    jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/BeanShellTimerResources.properties
    jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/BeanShellTimerResources_de.properties
    jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/BeanShellTimerResources_tr.properties
    jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/BeanShellListenerResources.properties
    jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/BeanShellListenerResources_de.properties
    jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/BeanShellListenerResources_tr.properties
    jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
    jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_de.properties
    jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_tr.properties
    jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellTestElement.java
    jakarta/jmeter/trunk/xdocs/changes.xml
    jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml

Modified: jakarta/jmeter/trunk/docs/changes.html
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/changes.html?rev=655879&r1=655878&r2=655879&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/changes.html (original)
+++ jakarta/jmeter/trunk/docs/changes.html Tue May 13 07:27:13 2008
@@ -678,6 +678,11 @@
 						</li>
 									
 
+												<li	>
+								Give Beanshell test elements access to JMeter Properties via "props" object
+						</li>
+									
+
 						</ul>
 							  									 				<h4	>
 								Non-functional changes
@@ -2507,6 +2512,7 @@
 							  									 				<p	>
 								
 The JMeter.BAT file no longer changes directory to JMeter home, but runs from the current working directory.
+
 The jmeter-n.bat and jmeter-t.bat files change to the directory containing the input file.
 
 						</p>
@@ -3080,7 +3086,6 @@
 								Bug 39533 - StatCalculator added wrong items
 						</li>
 									
-
 
 												<li	>
 								Bug 39599 - ConcurrentModificationException

Modified: jakarta/jmeter/trunk/docs/usermanual/component_reference.html
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/usermanual/component_reference.html?rev=655879&r1=655878&r2=655879&view=diff
==============================================================================
--- jakarta/jmeter/trunk/docs/usermanual/component_reference.html (original)
+++ jakarta/jmeter/trunk/docs/usermanual/component_reference.html Tue May 13 07:27:13 2008
@@ -2822,6 +2822,11 @@
 								vars - JMeterVariables  - e.g. vars.get("VAR1"); vars.put("VAR2","value"); vars.remove("VAR3"); vars.putObject("OBJ1",new Object());
 						</li>
 									
+            
+												<li	>
+								props - JMeter Properties - e.g. props.get("START.HMS"); props.put("PROP1","1234");
+						</li>
+									
 		
 						</ul>
 							  									 				<p	>
@@ -6563,6 +6568,11 @@
 									
 
 												<li	>
+								props - JMeter Properties - e.g. props.get("START.HMS"); props.put("PROP1","1234");
+						</li>
+									
+
+												<li	>
 								sampleResult - (SampleResult) - gives access to the previous SampleResult
 						</li>
 									
@@ -8749,6 +8759,11 @@
 								vars - JMeterVariables  - e.g. vars.get("VAR1"); vars.put("VAR2","value"); vars.putObject("OBJ1",new Object());
 						</li>
 									
+    
+												<li	>
+								props - JMeter Properties - e.g. props.get("START.HMS"); props.put("PROP1","1234");
+						</li>
+									
 
 						</ul>
 									
@@ -9573,6 +9588,11 @@
 						</li>
 									
 
+												<li	>
+								props - JMeter Properties - e.g. props.get("START.HMS"); props.put("PROP1","1234");
+						</li>
+									
+
 						</ul>
 							  									 				<p	>
 								For details of all the methods available on each of the above variables, please check the Javadoc
@@ -10295,6 +10315,11 @@
 									
 
 												<li	>
+								props - JMeter Properties - e.g. props.get("START.HMS"); props.put("PROP1","1234");
+						</li>
+									
+
+												<li	>
 								prev - (SampleResult) - gives access to the previous SampleResult (if any)
 						</li>
 									
@@ -11109,6 +11134,11 @@
 									
 
 												<li	>
+								props - JMeter Properties - e.g. props.get("START.HMS"); props.put("PROP1","1234");
+						</li>
+									
+
+												<li	>
 								prev - (SampleResult) - gives access to the previous SampleResult
 						</li>
 									

Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources.properties
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources.properties?rev=655879&r1=655878&r2=655879&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources.properties (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources.properties Tue May 13 07:27:13 2008
@@ -1,5 +1,5 @@
 displayName=BeanShell PostProcessor
-scripting.displayName=Script (variables: ctx vars prev data log)
+scripting.displayName=Script (variables: ctx vars props prev data log)
 script.displayName=
 script.shortDescription=Beanshell script
 resetGroup.displayName=Reset bsh.Interpreter before each call

Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources_de.properties
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources_de.properties?rev=655879&r1=655878&r2=655879&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources_de.properties (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources_de.properties Tue May 13 07:27:13 2008
@@ -6,4 +6,4 @@
 parameters.shortDescription=Parameter die der BeanShell \u00FCbergeben werden sollen (Datei oder Script)
 script.displayName=BeanShell Script
 script.shortDescription=BeanShell Script
-scripting.displayName=Script (Variablen\: ctx vars prev data log)
+scripting.displayName=Script (Variablen\: ctx vars props prev data log)

Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources_tr.properties
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources_tr.properties?rev=655879&r1=655878&r2=655879&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources_tr.properties (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/BeanShellPostProcessorResources_tr.properties Tue May 13 07:27:13 2008
@@ -7,4 +7,4 @@
 parameters.displayName=Parametreler
 parameters.shortDescription=BeanShell'e ge\u00E7ilecek parametreler (dosya ya da betik)
 script.shortDescription=BeanShell beti\u011Fi
-scripting.displayName=Betik (de\u011Fi\u015Fkenler\: ctx vars prev data log)
+scripting.displayName=Betik (de\u011Fi\u015Fkenler\: ctx vars props prev data log)

Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorResources.properties
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorResources.properties?rev=655879&r1=655878&r2=655879&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorResources.properties (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorResources.properties Tue May 13 07:27:13 2008
@@ -1,5 +1,5 @@
 displayName=BeanShell PreProcessor
-scripting.displayName=Script (variables: ctx vars prev sampler log)
+scripting.displayName=Script (variables: ctx vars props prev sampler log)
 script.displayName=
 script.shortDescription=Beanshell script
 resetGroup.displayName=Reset bsh.Interpreter before each call

Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorResources_de.properties
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorResources_de.properties?rev=655879&r1=655878&r2=655879&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorResources_de.properties (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorResources_de.properties Tue May 13 07:27:13 2008
@@ -7,4 +7,4 @@
 parameters.shortDescription=Parameter die der BeanShell \u00FCbergeben werden (Datei oder Script)
 script.displayName=BeanShell Script
 script.shortDescription=BeanShell Script
-scripting.displayName=Script (Variablen\: ctx vars prev sampler log)
+scripting.displayName=Script (Variablen\: ctx vars props prev sampler log)

Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorResources_tr.properties
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorResources_tr.properties?rev=655879&r1=655878&r2=655879&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorResources_tr.properties (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessorResources_tr.properties Tue May 13 07:27:13 2008
@@ -7,4 +7,4 @@
 parameters.displayName=Parametreler
 parameters.shortDescription=BeanShell'e ge\u00E7ilecek parametreler (dosya ya da betik)
 script.shortDescription=Beanshell beti\u011Fi
-scripting.displayName=Betik (de\u011Fi\u015Fkenler\: ctx vars prev sampler log)
+scripting.displayName=Betik (de\u011Fi\u015Fkenler\: ctx vars props prev sampler log)

Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/BeanShellTimerResources.properties
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/BeanShellTimerResources.properties?rev=655879&r1=655878&r2=655879&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/BeanShellTimerResources.properties (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/BeanShellTimerResources.properties Tue May 13 07:27:13 2008
@@ -1,5 +1,5 @@
 displayName=BeanShell Timer
-scripting.displayName=Script (variables: ctx vars log)
+scripting.displayName=Script (variables: ctx vars props log)
 script.displayName=
 script.shortDescription=Beanshell script to generate delay
 resetGroup.displayName=Reset bsh.Interpreter before each call

Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/BeanShellTimerResources_de.properties
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/BeanShellTimerResources_de.properties?rev=655879&r1=655878&r2=655879&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/BeanShellTimerResources_de.properties (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/BeanShellTimerResources_de.properties Tue May 13 07:27:13 2008
@@ -7,4 +7,4 @@
 parameters.shortDescription=Parameter die der BeanShell \u00FCbergeben werden (Datei oder Script)
 script.displayName=Script
 script.shortDescription=BeanShell Script zur Erzeugung der Pause
-scripting.displayName=Script (Variablen\: ctv vars log)
+scripting.displayName=Script (Variablen\: ctv vars props log)

Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/BeanShellTimerResources_tr.properties
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/BeanShellTimerResources_tr.properties?rev=655879&r1=655878&r2=655879&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/BeanShellTimerResources_tr.properties (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/BeanShellTimerResources_tr.properties Tue May 13 07:27:13 2008
@@ -7,4 +7,4 @@
 parameters.displayName=Parametreler
 parameters.shortDescription=BeanShell'e ge\u00E7ilecek parametreler (dosya ya da betik)
 script.shortDescription=Gecikmeyi yaratacak BeanShell beti\u011Fi
-scripting.displayName=Betik (de\u011Fi\u015Fkenler\: ctx vars prev sampler log)
+scripting.displayName=Betik (de\u011Fi\u015Fkenler\: ctx vars props prev sampler log)

Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/BeanShellListenerResources.properties
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/BeanShellListenerResources.properties?rev=655879&r1=655878&r2=655879&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/BeanShellListenerResources.properties (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/BeanShellListenerResources.properties Tue May 13 07:27:13 2008
@@ -1,5 +1,5 @@
 displayName=BeanShell Listener
-scripting.displayName=Script (variables: ctx vars sampleEvent sampleResult log)
+scripting.displayName=Script (variables: ctx vars props sampleEvent sampleResult log)
 script.displayName=
 script.shortDescription=Beanshell script
 resetGroup.displayName=Reset bsh.Interpreter before each call

Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/BeanShellListenerResources_de.properties
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/BeanShellListenerResources_de.properties?rev=655879&r1=655878&r2=655879&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/BeanShellListenerResources_de.properties (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/BeanShellListenerResources_de.properties Tue May 13 07:27:13 2008
@@ -6,4 +6,4 @@
 parameters.displayName=Parameter
 parameters.shortDescription=Parameter die der BeanShell \u00FCbergeben werden sollen (Datei oder Script)
 script.shortDescription=BeanShell Script
-scripting.displayName=Script (Variablen\: ctx vars sampleEvent sampleResult log)
+scripting.displayName=Script (Variablen\: ctx vars props sampleEvent sampleResult log)

Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/BeanShellListenerResources_tr.properties
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/BeanShellListenerResources_tr.properties?rev=655879&r1=655878&r2=655879&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/BeanShellListenerResources_tr.properties (original)
+++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/BeanShellListenerResources_tr.properties Tue May 13 07:27:13 2008
@@ -7,4 +7,4 @@
 parameters.displayName=Parametreler
 parameters.shortDescription=BeanShell'e ge\u00E7ilecek parametreler (dosya ya da betik)
 script.shortDescription=Beanshell beti\u011Fi
-scripting.displayName=Betik (de\u011Fi\u015Fkenler\: ctx vars sampleEvent sampleResult log)
+scripting.displayName=Betik (de\u011Fi\u015Fkenler\: ctx vars props sampleEvent sampleResult log)

Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=655879&r1=655878&r2=655879&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Tue May 13 07:27:13 2008
@@ -92,12 +92,12 @@
 bsf_script_language=Scripting language\:
 bsf_script_parameters=Parameters to pass to script/file\:
 bsh_assertion_script=Script (see below for variables that are defined)
-bsh_assertion_script_variables=The following variables are defined for the script:\nRead/Write: Failure, FailureMessage, SampleResult, vars, log.\nReadOnly: Response[Data|Code|Message|Headers], RequestHeaders, SampleLabel, SamplerData, ctx
+bsh_assertion_script_variables=The following variables are defined for the script:\nRead/Write: Failure, FailureMessage, SampleResult, vars, props, log.\nReadOnly: Response[Data|Code|Message|Headers], RequestHeaders, SampleLabel, SamplerData, ctx
 bsh_assertion_title=BeanShell Assertion
 bsh_function_expression=Expression to evaluate
 bsh_sampler_title=BeanShell Sampler
 bsh_script=Script (see below for variables that are defined)
-bsh_script_variables=The following variables are defined for the script:\nSampleResult, ResponseCode, ResponseMessage, IsSuccess, Label, FileName, ctx, vars, log
+bsh_script_variables=The following variables are defined for the script:\nSampleResult, ResponseCode, ResponseMessage, IsSuccess, Label, FileName, ctx, vars, props, log
 bsh_script_file=Script file
 bsh_script_parameters=Parameters (-> String Parameters and String []bsh.args)
 bsh_script_reset_interpreter=Reset bsh.Interpreter before each call

Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_de.properties
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_de.properties?rev=655879&r1=655878&r2=655879&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_de.properties (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_de.properties Tue May 13 07:27:13 2008
@@ -64,14 +64,14 @@
 bsf_script_file=Auszuf\u00FChrendes Script
 bsf_script_language=Scriptsprache
 bsf_script_parameters=An das Script bzw. die Script-Datei zu \u00FCbergebende Parameter
-bsf_script=Auszuf\u00FChrendes Script (Variablen\: log, Label, FileName, Parameters, args[], SampleResult, ctx, vars)
+bsf_script=Auszuf\u00FChrendes Script (Variablen\: log, Label, FileName, Parameters, args[], SampleResult, ctx, vars, props)
 bsh_assertion_script=Script (untenstehende Variablen sind definiert)
 bsh_assertion_title=BeanShell Behauptung
 bsh_function_expression=Auszuwertender Ausdruck
 bsh_sampler_title=BeanShell Sampler
 bsh_script_file=Script-Datei
 bsh_script_parameters=Parameter (String Parameters, String []bsh.args)
-bsh_script_variables=Folgende Variablen wurden f\u00FCr das Script definiert\:\nSampleResult, ResponseCode, ResponseMessage, IsSuccess, Label, FileName, ctx, vars, log
+bsh_script_variables=Folgende Variablen wurden f\u00FCr das Script definiert\:\nSampleResult, ResponseCode, ResponseMessage, IsSuccess, Label, FileName, ctx, vars, props, log
 bsh_script=Script (untenstehende Variablen sind definiert)
 busy_testing=Ich bin mit dem Testen besch\u00E4ftigt, bitte stoppen sie den Test bevor sie die Einstellungen \u00E4ndern.
 cache_session_id=Session ID zwischenspeichern?

Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_tr.properties
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_tr.properties?rev=655879&r1=655878&r2=655879&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_tr.properties (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_tr.properties Tue May 13 07:27:13 2008
@@ -67,19 +67,19 @@
 bind=\u0130\u015F Par\u00E7ac\u0131\u011F\u0131 Ba\u011Flamas\u0131
 browse=G\u00F6zat...
 bsf_sampler_title=BSF \u00D6rnekleyicisi
-bsf_script=\u00C7al\u0131\u015Ft\u0131r\u0131lacak betik (de\u011Fi\u015Fkenler\: log, Label, FileName, Parameters, args[], SampleResult, ctx, vars)
+bsf_script=\u00C7al\u0131\u015Ft\u0131r\u0131lacak betik (de\u011Fi\u015Fkenler\: log, Label, FileName, Parameters, args[], SampleResult, ctx, vars, props)
 bsf_script_file=\u00C7al\u0131\u015Ft\u0131r\u0131lacak betik dosyas\u0131
 bsf_script_language=Betik dili\:
 bsf_script_parameters=Beti\u011Fe veya betik dosyas\u0131na ge\u00E7ilecek parametreler
 bsh_assertion_script=Betik (tan\u0131ml\u0131 de\u011Fi\u015Fkenler i\u00E7in a\u015Fa\u011F\u0131ya bak\u0131n)
-bsh_assertion_script_variables=Betik i\u00E7in \u015Fu de\u011Fi\u015Fkenler tan\u0131mlanm\u0131\u015Ft\u0131r\:\nOkuma/Yazma\: Failure, FailureMessage, SampleResult, vars, log.\nSalt Okunur\: Response[Data|Code|Message|Headers], RequestHeaders, SampleLabel, SamplerData, ctx
+bsh_assertion_script_variables=Betik i\u00E7in \u015Fu de\u011Fi\u015Fkenler tan\u0131mlanm\u0131\u015Ft\u0131r\:\nOkuma/Yazma\: Failure, FailureMessage, SampleResult, vars, props, log.\nSalt Okunur\: Response[Data|Code|Message|Headers], RequestHeaders, SampleLabel, SamplerData, ctx
 bsh_assertion_title=BeanShell Do\u011Frulamas\u0131
 bsh_function_expression=De\u011Ferlendirilecek ifade
 bsh_sampler_title=BeanShell \u00D6rnekleyici
 bsh_script=Betik (tan\u0131ml\u0131 de\u011Fi\u015Fkenler i\u00E7in a\u015Fa\u011F\u0131ya bak\u0131n)
 bsh_script_file=Betik Dosyas\u0131
 bsh_script_parameters=Parametreler (-> Dizgi (String) Parametreler ve String []bsh.args)
-bsh_script_variables=Betik i\u00E7in \u015Fu de\u011Fi\u015Fkenler tan\u0131ml\u0131d\u0131r\:\nSampleResult, ResponseCode, ResponseMessage, IsSuccess, Label, FileName, ctx, vars, log
+bsh_script_variables=Betik i\u00E7in \u015Fu de\u011Fi\u015Fkenler tan\u0131ml\u0131d\u0131r\:\nSampleResult, ResponseCode, ResponseMessage, IsSuccess, Label, FileName, ctx, vars, props, log
 busy_testing=Testle me\u015Fgul\u00FCm, l\u00FCtfen ayarlar\u0131 de\u011Fi\u015Ftirmeden \u00F6nce testi durdurun
 cache_session_id=\u00D6nbellek oturum Id'si?
 cancel=\u0130ptal

Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellTestElement.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellTestElement.java?rev=655879&r1=655878&r2=655879&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellTestElement.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellTestElement.java Tue May 13 07:27:13 2008
@@ -65,10 +65,15 @@
             try {
                 bshInterpreter.reset();
             } catch (ClassNotFoundException e) {
-                log.error("Cannot find BeanShell: "+e.toString());
+                log.error("Cannot reset BeanShell: "+e.toString());
             }
         }
 
+        try {
+            bshInterpreter.set("props", JMeterUtils.getJMeterProperties());
+        } catch (JMeterException e) {
+            log.error("Cannot set 'props' object: "+e.toString());
+        }
         return bshInterpreter;
     }
 

Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=655879&r1=655878&r2=655879&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Tue May 13 07:27:13 2008
@@ -202,6 +202,7 @@
 <li>Give BeanShell, Javascript and Jexl functions access to JMeter properties via the "props" object</li>
 <li>Give BSF Sampler access to JMeter Properties via "props" object</li>
 <li>Add Jexl as a supported BSF Sampler language</li>
+<li>Give Beanshell test elements access to JMeter Properties via "props" object</li>
 </ul>
 
 <h4>Non-functional changes</h4>

Modified: jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=655879&r1=655878&r2=655879&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml (original)
+++ jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml Tue May 13 07:27:13 2008
@@ -857,6 +857,7 @@
 			<li>IsSuccess = true</li>
 			<li>ctx - JMeterContext</li>
 			<li>vars - JMeterVariables  - e.g. vars.get("VAR1"); vars.put("VAR2","value"); vars.remove("VAR3"); vars.putObject("OBJ1",new Object());</li>
+            <li>props - JMeter Properties - e.g. props.get("START.HMS"); props.put("PROP1","1234");</li>
 		</ul>
 		<p>When the script completes, control is returned to the Sampler, and it copies the contents
 			of the following script variables into the corresponding variables in the SampleResult:</p>
@@ -2095,6 +2096,7 @@
 <li>log - (Logger) - can be used to write to the log file</li>
 <li>ctx - (JMeterContext) - gives access to the context</li>
 <li>vars - (JMeterVariables) - gives read/write access to variables: vars.get(key); vars.put(key,val); vars.putObject("OBJ1",new Object());</li>
+<li>props - JMeter Properties - e.g. props.get("START.HMS"); props.put("PROP1","1234");</li>
 <li>sampleResult - (SampleResult) - gives access to the previous SampleResult</li>
 <li>sampleEvent (SampleEvent) gives access to the current sample event</li>
 </ul>
@@ -2775,6 +2777,7 @@
 	<li>SamplerData - data that was sent to the server</li>
 	<li>ctx - JMeterContext</li>
 	<li>vars - JMeterVariables  - e.g. vars.get("VAR1"); vars.put("VAR2","value"); vars.putObject("OBJ1",new Object());</li>
+    <li>props - JMeter Properties - e.g. props.get("START.HMS"); props.put("PROP1","1234");</li>
 </ul>
 </p>
 <p>The following methods of the Response object may be useful:
@@ -3009,6 +3012,7 @@
 <li>log - (Logger) - can be used to write to the log file</li>
 <li>ctx - (JMeterContext) - gives access to the context</li>
 <li>vars - (JMeterVariables) - gives read/write access to variables: vars.get(key); vars.put(key,val); vars.putObject("OBJ1",new Object());</li>
+<li>props - JMeter Properties - e.g. props.get("START.HMS"); props.put("PROP1","1234");</li>
 </ul>
 <p>For details of all the methods available on each of the above variables, please check the Javadoc</p>
 <p>If the property <b>beanshell.timer.init</b> is defined, this is used to load an initialisation file, which can be used to define methods etc for use in the BeanShell script.</p>
@@ -3242,6 +3246,7 @@
 <li>log - (Logger) - can be used to write to the log file</li>
 <li>ctx - (JMeterContext) - gives access to the context</li>
 <li>vars - (JMeterVariables) - gives read/write access to variables: vars.get(key); vars.put(key,val); vars.putObject("OBJ1",new Object());</li>
+<li>props - JMeter Properties - e.g. props.get("START.HMS"); props.put("PROP1","1234");</li>
 <li>prev - (SampleResult) - gives access to the previous SampleResult (if any)</li>
 <li>sampler - (Sampler)- gives access to the current sampler</li>
 </ul>
@@ -3489,6 +3494,7 @@
 <li>log - (Logger) - can be used to write to the log file</li>
 <li>ctx - (JMeterContext) - gives access to the context</li>
 <li>vars - (JMeterVariables) - gives read/write access to variables: vars.get(key); vars.put(key,val); vars.putObject("OBJ1",new Object());</li>
+<li>props - JMeter Properties - e.g. props.get("START.HMS"); props.put("PROP1","1234");</li>
 <li>prev - (SampleResult) - gives access to the previous SampleResult</li>
 <li>data - (byte [])- gives access to the current sample data</li>
 </ul>



---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org