Author: sebb
Date: Fri Jan 28 22:30:38 2011
New Revision: 1064913
URL: http://svn.apache.org/viewvc?rev=1064913&view=rev
Log:
Use new FileServer methods
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Load.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportLoad.java
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=1064913&r1=1064912&r2=1064913&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Fri Jan 28
22:30:38 2011
@@ -712,7 +712,7 @@ public class JMeter implements JMeterPlu
println("Could not open " + testFile);
return;
}
- FileServer.getFileServer().setBasedir(f.getAbsolutePath());
+ FileServer.getFileServer().setBaseForScript(f);
reader = new FileInputStream(f);
log.info("Loading file: " + f);
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Load.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Load.java?rev=1064913&r1=1064912&r2=1064913&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Load.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Load.java Fri
Jan 28 22:30:38 2011
@@ -101,7 +101,7 @@ public class Load implements Command {
log.info("Merging file: " + f);
} else {
log.info("Loading file: " + f);
- FileServer.getFileServer().setBasedir(f.getAbsolutePath());
+ FileServer.getFileServer().setBaseForScript(f);
}
reader = new FileInputStream(f);
HashTree tree = SaveService.loadTree(reader);
Modified:
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportLoad.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportLoad.java?rev=1064913&r1=1064912&r2=1064913&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportLoad.java
(original)
+++
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportLoad.java
Fri Jan 28 22:30:38 2011
@@ -86,7 +86,7 @@ public class ReportLoad implements Comma
log.info("Merging file: " + f);
} else {
log.info("Loading file: " + f);
- FileServer.getFileServer().setBasedir(f.getAbsolutePath());
+ FileServer.getFileServer().setBaseForScript(f);
}
reader = new FileInputStream(f);
HashTree tree = SaveService.loadTree(reader);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
