Author: sebb
Date: Wed Jan 30 14:52:33 2008
New Revision: 616939
URL: http://svn.apache.org/viewvc?rev=616939&view=rev
Log:
Allow Global properties to be loaded from a file, e.g. -Gglobal.properties
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
jakarta/jmeter/trunk/xdocs/changes.xml
jakarta/jmeter/trunk/xdocs/usermanual/get-started.xml
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java?rev=616939&r1=616938&r2=616939&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Wed Jan 30
14:52:33 2008
@@ -169,7 +169,7 @@
"Define additional JMeter properties"),
new CLOptionDescriptor("globalproperty",
CLOptionDescriptor.DUPLICATES_ALLOWED
|
CLOptionDescriptor.ARGUMENTS_REQUIRED_2, JMETER_GLOBAL_PROP,
- "Define Global properties (sent to servers)"),
+ "Define Global properties (sent to servers)\n\t\te.g.
-Gport=123 or -Gglobal.properties"),
new CLOptionDescriptor("systemproperty",
CLOptionDescriptor.DUPLICATES_ALLOWED
|
CLOptionDescriptor.ARGUMENTS_REQUIRED_2, SYSTEM_PROPERTY,
"Define additional system properties"),
@@ -595,6 +595,22 @@
if (value.length() > 0) { // Set it
log.info("Setting Global property: " +
name + "=" + value);
remoteProps.setProperty(name, value);
+ } else {
+ File propFile = new File(name);
+ if (propFile.canRead()) {
+ log.info("Setting Global
properties from the file "+name);
+ fis = null;
+ try {
+ fis = new
FileInputStream(propFile);
+ remoteProps.load(fis);
+ } catch (FileNotFoundException
e) {
+ log.warn("Could not
find properties file: "+e.getLocalizedMessage());
+ } catch (IOException e) {
+ log.warn("Could not
load properties file: "+e.getLocalizedMessage());
+ } finally {
+
JOrphanUtils.closeQuietly(fis);
+ }
+ }
}
break;
case LOGLEVEL:
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=616939&r1=616938&r2=616939&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Wed Jan 30 14:52:33 2008
@@ -90,6 +90,7 @@
<li>Added "Save Table Data" buttons to Aggregate and Summary Reports - save
table as CSV format with header</li>
<li>Allow most functions to be used on the Test Plan.
Note __split() and __regex() cannot be used on the Test Plan.</li>
+<li>Allow Global properties to be loaded from a file, e.g.
-Gglobal.properties</li>
</ul>
<h4>Non-functional changes</h4>
Modified: jakarta/jmeter/trunk/xdocs/usermanual/get-started.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/usermanual/get-started.xml?rev=616939&r1=616938&r2=616939&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/usermanual/get-started.xml (original)
+++ jakarta/jmeter/trunk/xdocs/usermanual/get-started.xml Wed Jan 30 14:52:33
2008
@@ -361,8 +361,10 @@
Set password for proxy server that JMeter is to use
-J, --jmeterproperty {argument}={value}
Define additional JMeter properties
- -G, --globalproperty (argument)=(value)
+ -G, --globalproperty (argument)[=(value)]
Define Global properties (sent to servers)
+ e.g. -Gport=123
+ or -Gglobal.properties
-D, --systemproperty {argument}={value}
Define additional System properties
-S, --systemPropertyFile {filename}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
