mstover1 2002/08/30 10:24:24
Modified: bin jmeter.properties
src/core/org/apache/jmeter JMeter.java
src/core/org/apache/jmeter/gui/action Load.java
Log:
-t option works with GUI startup too.
Revision Changes Path
1.46 +3 -3 jakarta-jmeter/bin/jmeter.properties
Index: jmeter.properties
===================================================================
RCS file: /home/cvs/jakarta-jmeter/bin/jmeter.properties,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -r1.45 -r1.46
--- jmeter.properties 30 Aug 2002 15:51:20 -0000 1.45
+++ jmeter.properties 30 Aug 2002 17:24:23 -0000 1.46
@@ -58,15 +58,15 @@
config.tree.icon=leafnode.gif
# Remote Hosts - comma delimited
-remote_hosts=127.0.0.1
+#remote_hosts=127.0.0.1
#Components to not display in JMeter GUI
not_in_menu=Remote Method Configuration,JNDI Configuration,JNDI Lookup
Configuration,JNDI Request,Default
Controller,org.apache.jmeter.control.DynamicController,
org.apache.jmeter.protocol.http.control.Cookie,org.apache.jmeter.protocol.http.control.Authorization,org.apache.jmeter.config.LoginConfig,Header,org.apache.jmeter.protocol.http.config.MultipartUrlConfig
#Logging levels for the logging categories in JMeter. Correct values are
FATAL_ERROR, ERROR, WARN, INFO, and DEBUG
log_level.jmeter=WARN
-log_level.jmeter.engine=DEBUG
-log_level.jmeter.gui=DEBUG
+log_level.jmeter.engine=INFO
+log_level.jmeter.gui=WARN
log_level.jmeter.elements=WARN
log_level.jmeter.util=WARN
log_level.jmeter.util.classfinder=WARN
1.4 +19 -2 jakarta-jmeter/src/core/org/apache/jmeter/JMeter.java
Index: JMeter.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/JMeter.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- JMeter.java 29 Aug 2002 18:17:38 -0000 1.3
+++ JMeter.java 30 Aug 2002 17:24:23 -0000 1.4
@@ -57,6 +57,8 @@
import java.awt.event.ActionEvent;
import java.io.File;
import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
import java.net.Authenticator;
import org.apache.avalon.excalibur.cli.CLArgsParser;
@@ -70,6 +72,7 @@
import org.apache.jmeter.gui.GuiPackage;
import org.apache.jmeter.gui.action.ActionRouter;
import org.apache.jmeter.gui.action.CheckDirty;
+import org.apache.jmeter.gui.action.Load;
import org.apache.jmeter.gui.tree.JMeterTreeListener;
import org.apache.jmeter.gui.tree.JMeterTreeModel;
import org.apache.jmeter.gui.util.ComponentUtil;
@@ -177,7 +180,7 @@
/**
* Starts up JMeter in GUI mode
*/
- public void startGui() throws IllegalUserActionException {
+ public void startGui(CLOption testFile) throws IllegalUserActionException {
JMeterTreeModel treeModel = new JMeterTreeModel();
JMeterTreeListener treeLis = new JMeterTreeListener(treeModel);
@@ -194,6 +197,20 @@
main.show();
ActionRouter.getInstance().actionPerformed(
new ActionEvent(main, 1, CheckDirty.ADD_ALL));
+ if(testFile != null)
+ {
+ try
+ {
+ File f = new File(testFile.getArgument());
+ FileInputStream reader = new FileInputStream(f);
+ ListedHashTree tree = SaveService.loadSubTree(reader);
+ new Load().insertLoadedTree(1,tree);
+ }
+ catch (Exception e)
+ {
+ log.error("Failure loading test file",e);
+ }
+ }
}
/**
@@ -219,7 +236,7 @@
} else if (parser.getArgumentById(SERVER_OPT) != null) {
startServer();
} else if (parser.getArgumentById(NONGUI_OPT) == null) {
- startGui();
+ startGui(parser.getArgumentById(TESTFILE_OPT));
} else {
startNonGui(
parser.getArgumentById(TESTFILE_OPT),
1.6 +4 -4 jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Load.java
Index: Load.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Load.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Load.java 30 Aug 2002 14:43:20 -0000 1.5
+++ Load.java 30 Aug 2002 17:24:24 -0000 1.6
@@ -165,7 +165,7 @@
}
}
- private void insertLoadedTree(int id, ListedHashTree tree) throws Exception,
IllegalUserActionException {
+ public void insertLoadedTree(int id, ListedHashTree tree) throws Exception,
IllegalUserActionException {
convertTree(tree);
GuiPackage.getInstance().addSubTree(tree);
tree = GuiPackage.getInstance().getCurrentSubTree();
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
