sebb 2003/10/28 10:58:42
Modified: src/core/org/apache/jmeter JMeter.java
Log:
Optionally start a BeanShell server
Revision Changes Path
1.20 +18 -1 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.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- JMeter.java 14 Oct 2003 21:37:13 -0000 1.19
+++ JMeter.java 28 Oct 2003 18:58:42 -0000 1.20
@@ -88,6 +88,7 @@
import org.apache.jmeter.plugin.PluginManager;
import org.apache.jmeter.processor.gui.AbstractPostProcessorGui;
import org.apache.jmeter.processor.gui.AbstractPreProcessorGui;
+import org.apache.jmeter.protocol.java.BeanShellServer;
import org.apache.jmeter.reporters.ResultCollector;
import org.apache.jmeter.samplers.Remoteable;
import org.apache.jmeter.samplers.gui.AbstractSamplerGui;
@@ -302,10 +303,12 @@
else if (parser.getArgumentById(SERVER_OPT) != null)
{
startServer();
+ startBSH();
}
else if (parser.getArgumentById(NONGUI_OPT) == null)
{
startGui(parser.getArgumentById(TESTFILE_OPT));
+ startBSH();
}
else
{
@@ -313,6 +316,7 @@
parser.getArgumentById(TESTFILE_OPT),
parser.getArgumentById(LOGFILE_OPT),
parser.getArgumentById(REMOTE_OPT));
+ startBSH();
}
}
catch (IllegalUserActionException e)
@@ -330,6 +334,19 @@
}
/**
+ *
+ */
+ private void startBSH() {
+ int bshport = JMeterUtils.getPropDefault("beanshell.server.port",0);
+ String bshfile =
JMeterUtils.getPropDefault("beanshell.server.file","");
+ if (bshport > 0 ){
+ log.info("Starting Beanshell server
("+bshport+","+bshfile+")");
+ Runnable t = new BeanShellServer(bshport,bshfile);
+ t.run();
+ }
+ }
+
+ /**
* Sets a proxy server for the JVM if the command line arguments are
* specified.
*/
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
