Author: sebb
Date: Mon Apr 2 18:20:48 2007
New Revision: 524991
URL: http://svn.apache.org/viewvc?view=rev&rev=524991
Log:
Optionally start mirror server
Modified:
jakarta/jmeter/branches/rel-2-2/bin/jmeter.properties
jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/JMeter.java
Modified: jakarta/jmeter/branches/rel-2-2/bin/jmeter.properties
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/bin/jmeter.properties?view=diff&rev=524991&r1=524990&r2=524991
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/bin/jmeter.properties (original)
+++ jakarta/jmeter/branches/rel-2-2/bin/jmeter.properties Mon Apr 2 18:20:48
2007
@@ -491,6 +491,9 @@
# Miscellaneous configuration
#---------------------------------------------------------------------------
+# If defined, then start the mirror server on the port
+#mirror.server.port=8080
+
# ORO PatternCacheLRU size
#oro.patterncache.size=1000
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=524991&r1=524990&r2=524991
==============================================================================
--- 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 Mon
Apr 2 18:20:48 2007
@@ -58,6 +58,7 @@
import org.apache.jmeter.gui.tree.JMeterTreeModel;
import org.apache.jmeter.plugin.JMeterPlugin;
import org.apache.jmeter.plugin.PluginManager;
+import org.apache.jmeter.protocol.http.control.HttpMirrorControl;
import org.apache.jmeter.reporters.ResultCollector;
import org.apache.jmeter.reporters.Summariser;
import org.apache.jmeter.samplers.Remoteable;
@@ -294,14 +295,14 @@
System.out.println(JMeterUtils.getResourceFileAsText("org/apache/jmeter/help.txt"));//
$NON-NLS-1$
} else if (parser.getArgumentById(SERVER_OPT) != null) {
startServer(JMeterUtils.getPropDefault("server_port", 0));// $NON-NLS-1$
- startBSH();
+ startOptionalServers();
} else if (parser.getArgumentById(NONGUI_OPT) == null) {
startGui(parser.getArgumentById(TESTFILE_OPT));
- startBSH();
+ startOptionalServers();
} else {
startNonGui(parser.getArgumentById(TESTFILE_OPT),
parser.getArgumentById(LOGFILE_OPT), parser
.getArgumentById(REMOTE_OPT));
- startBSH();
+ startOptionalServers();
}
} catch (IllegalUserActionException e) {
System.out.println(e.getMessage());
@@ -347,7 +348,7 @@
/**
*
*/
- private void startBSH() {
+ private void startOptionalServers() {
int bshport =
JMeterUtils.getPropDefault("beanshell.server.port", 0);// $NON-NLS-1$
String bshfile =
JMeterUtils.getPropDefault("beanshell.server.file", "");// $NON-NLS-1$
$NON-NLS-2$
if (bshport > 0) {
@@ -368,6 +369,14 @@
} catch (JMeterException e) {
log.warn("Could not process Beanshell file:
"+e.getLocalizedMessage());
}
+ }
+
+ int mirrorPort=JMeterUtils.getPropDefault("mirror.server.port", 0);//
$NON-NLS-1$;
+ if (mirrorPort > 0){
+ log.info("Starting Mirror server (" + mirrorPort + ")");
+ HttpMirrorControl webServerControl = new
HttpMirrorControl(mirrorPort);
+ webServerControl.startHttpMirror();
+
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
