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 2006/05/01 16:58:51 UTC

svn commit: r398610 - in /jakarta/jmeter/branches/rel-2-1: bin/jmeter.properties src/core/org/apache/jmeter/engine/StandardJMeterEngine.java xdocs/changes.xml

Author: sebb
Date: Mon May  1 07:58:49 2006
New Revision: 398610

URL: http://svn.apache.org/viewcvs?rev=398610&view=rev
Log:
Allow variables in Listener file names

Modified:
    jakarta/jmeter/branches/rel-2-1/bin/jmeter.properties
    jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
    jakarta/jmeter/branches/rel-2-1/xdocs/changes.xml

Modified: jakarta/jmeter/branches/rel-2-1/bin/jmeter.properties
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/bin/jmeter.properties?rev=398610&r1=398609&r2=398610&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/bin/jmeter.properties (original)
+++ jakarta/jmeter/branches/rel-2-1/bin/jmeter.properties Mon May  1 07:58:49 2006
@@ -446,6 +446,12 @@
 # the following line.
 #jmeterthread.startearlier=false
 
+# (2.1.2) StandardJMeterEngine behaviour has been changed to notify the listeners after
+# the running version is enabled. This is so they can access variables. 
+# In case this causes problems, the previous behaviour can be restored by uncommenting
+# the following line.
+#jmeterengine.startlistenerslater=false
+
 #JMeterUtils
 #
 #search_paths=null

Modified: jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java?rev=398610&r1=398609&r2=398610&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java (original)
+++ jakarta/jmeter/branches/rel-2-1/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java Mon May  1 07:58:49 2006
@@ -72,6 +72,15 @@
 
 	private transient ListenerNotifier notifier;
 
+    private static final boolean startListenersLater = 
+        JMeterUtils.getPropDefault("jmeterengine.startlistenerslater", true);
+
+    static {
+        if (startListenersLater){
+            log.info("Listeners will be started after enabling running version");
+            log.info("To revert to the earlier behaviour, define jmeterengine.startlistenerslater=false");
+        }
+    }
 	// Allow engine and threads to be stopped from outside a thread
 	// e.g. from beanshell server
 	// Assumes that there is only one instance of the engine
@@ -317,8 +326,9 @@
 		Collection col = testListeners.getSearchResults();
 		col.addAll(testList);
 		testList = null;
-		notifyTestListenersOfStart();
+		if (!startListenersLater )notifyTestListenersOfStart();
 		getTestTree().traverse(new TurnElementsOn());
+        if (startListenersLater)notifyTestListenersOfStart();
 
 		List testLevelElements = new LinkedList(getTestTree().list(getTestTree().getArray()[0]));
 		removeThreadGroups(testLevelElements);

Modified: jakarta/jmeter/branches/rel-2-1/xdocs/changes.xml
URL: http://svn.apache.org/viewcvs/jakarta/jmeter/branches/rel-2-1/xdocs/changes.xml?rev=398610&r1=398609&r2=398610&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-1/xdocs/changes.xml (original)
+++ jakarta/jmeter/branches/rel-2-1/xdocs/changes.xml Mon May  1 07:58:49 2006
@@ -24,12 +24,13 @@
 <p><b>Changes are chronologically ordered from top (most recent) to bottom 
 (least recent)</b></p>  
 
+<!--  ===================  -->
 
 <h3>Version 2.1.2</h3>
 
 <h4>Incompatible changes:</h4>
 <p>
-The time stamp is now set to start time.
+The time stamp is now set to the sampler start time (it was the end).
 To revert to the previous behaviour, change the property <b>sampleresult.timestamp.start</b> to false (or comment it)
 </p>
 <p>The JMX output format has been simplified and files are not backwards compatible</p>
@@ -37,6 +38,12 @@
 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>
+<p>
+Listeners are now started slightly later in order to allow variable names to be used.
+This may cause some problems; if so define the following in jmeter.properties:
+<br/>
+jmeterengine.startlistenerslater=false
+</p>
 
 <h4>Known problems:</h4>
 <ul>
@@ -87,6 +94,7 @@
 <li>Add support for HEAD and PUT methods</li>
 <li>Allow default HTTP implementation to be changed</li>
 <li>Optionally save active thread counts (group and all) to result files</li>
+<li>Variables/functions can now be used in Listener file names</li>
 </ul>
 
 <h4>Bug fixes:</h4>
@@ -135,7 +143,8 @@
 <li>Bug 25236 - remove double scrollbar from Assertion Result Listener</li>
 <li>Bug 38234 - Graph Listener divide by zero problem</li>
 <li>Bug 38824 - clarify behaviour of Ignore Status</li>
-<li>Bug 38250 - allow locale of zh_CN and zh_TW</li>
+<li>Bug 38250 - jmeter.properties "language" now supports country suffix, for zh_CN and zh_TW etc</li>
+<li>jmeter.properties file is now closed after it has been read</li>
 </ul>	
 	
 <h4>Other changes</h4>
@@ -148,8 +157,12 @@
 <li>Extract htmlparser interface into separate jarfile to make it possible to replace the parser</li>
 <li>Removed SQL Config GUI as no longer needed (or working!)</li>
 <li>HTTPSampler no longer logs a warning for Page not found (404)</li>
+<li>StringFromFile now callable as __StringFromFile (as well as _StringFromFile)</li>
 </ul>
 
+<!--  ===================  -->
+
+
 <hr/>
 <h3>Version 2.1.1</h3>
 <h4>New functionality:</h4>
@@ -171,6 +184,7 @@
 </ul>	
 	
 
+<!--  ===================  -->
 
 <h3>Version 2.1</h3>
 <h4>New functionality:</h4>
@@ -231,7 +245,9 @@
 <li>TCP sampler - only share sockets with same host:port details; correct the manual</li>
 <li>Extract src attribute for embed tags in JTidy and Html Parsers</li>
 </ul>	
-	
+
+<!--  ===================  -->
+
 <h3>Version 2.0.3</h3>
 <h4>New functionality:</h4>
 <ul>
@@ -274,6 +290,8 @@
 <li>Bug 33919 - increase Counter field sizes</li>
 <li>Bug 32252 - ForEach was not initialising counters</li>
 </ul>
+
+<!--  ===================  -->
 
 <h3>Version 2.0.2</h3>
 <h4>New functionality:</h4>



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