Author: sebb
Date: Wed Mar 14 16:46:05 2007
New Revision: 518383
URL: http://svn.apache.org/viewvc?view=rev&rev=518383
Log:
New -j option to easily change jmeter log file
Modified:
jakarta/jmeter/branches/rel-2-2/bin/jmeter-n-r.cmd
jakarta/jmeter/branches/rel-2-2/bin/jmeter-n.cmd
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/JMeter.java
jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
Modified: jakarta/jmeter/branches/rel-2-2/bin/jmeter-n-r.cmd
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/bin/jmeter-n-r.cmd?view=diff&rev=518383&r1=518382&r2=518383
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/bin/jmeter-n-r.cmd (original)
+++ jakarta/jmeter/branches/rel-2-2/bin/jmeter-n-r.cmd Wed Mar 14 16:46:05 2007
@@ -48,6 +48,6 @@
cd /D %~dp1
rem use same directory to find jmeter script
-"%~dp0"jmeter -n -t "%~nx1" -l "%~n1.jtl" -r
+"%~dp0"jmeter -n -t "%~nx1" -j "%~n1.jtl" -l "%~n1.jtl" -r
:END
Modified: jakarta/jmeter/branches/rel-2-2/bin/jmeter-n.cmd
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/bin/jmeter-n.cmd?view=diff&rev=518383&r1=518382&r2=518383
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/bin/jmeter-n.cmd (original)
+++ jakarta/jmeter/branches/rel-2-2/bin/jmeter-n.cmd Wed Mar 14 16:46:05 2007
@@ -48,6 +48,6 @@
cd /D %~dp1
rem use same directory to find jmeter script
-"%~dp0"jmeter -n -t "%~nx1" -l "%~n1.jtl"
+"%~dp0"jmeter -n -t "%~nx1" -j "%~n1.log" -l "%~n1.jtl"
:END
Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/JMeter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/JMeter.java?view=diff&rev=518383&r1=518382&r2=518383
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/JMeter.java
(original)
+++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/JMeter.java Wed
Mar 14 16:46:05 2007
@@ -414,18 +414,21 @@
}
private void initializeProperties(CLArgsParser parser) {
- String jmlogfile=""; // TODO finish off
- if (parser.getArgumentById(JMLOGFILE_OPT) != null){
-
jmlogfile=parser.getArgumentById(JMLOGFILE_OPT).getArgument();
- }
if (parser.getArgumentById(PROPFILE_OPT) != null) {
-
JMeterUtils.getProperties(parser.getArgumentById(PROPFILE_OPT).getArgument());
+
JMeterUtils.loadJMeterProperties(parser.getArgumentById(PROPFILE_OPT).getArgument());
} else {
- JMeterUtils.getProperties(NewDriver.getJMeterDir() +
File.separator
+
JMeterUtils.loadJMeterProperties(NewDriver.getJMeterDir() + File.separator
+ "bin" + File.separator // $NON-NLS-1$
+ "jmeter.properties");// $NON-NLS-1$
}
+ if (parser.getArgumentById(JMLOGFILE_OPT) != null){
+ String
jmlogfile=parser.getArgumentById(JMLOGFILE_OPT).getArgument();
+
JMeterUtils.setProperty(LoggingManager.LOG_FILE,jmlogfile);
+ }
+
+ JMeterUtils.initLogging();
+ JMeterUtils.initLocale();
// Bug 33845 - allow direct override of Home dir
if (parser.getArgumentById(JMETER_HOME_OPT) == null) {
JMeterUtils.setJMeterHome(NewDriver.getJMeterDir());
Modified: jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml?view=diff&rev=518383&r1=518382&r2=518383
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml (original)
+++ jakarta/jmeter/branches/rel-2-2/xdocs/changes.xml Wed Mar 14 16:46:05 2007
@@ -117,6 +117,7 @@
<li>Bug 41704 - Allow charset encoding to be specified for CSV DataSet</li>
<li>Bug 40103 - various LDAP enhancements</li>
<li>Bug 39864 - BeanShell init files now found from currrent or bin
directory</li>
+<li>New -j option to easily change jmeter log file</li>
</ul>
<h4>Non-functional improvements:</h4>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
