sebb 2004/07/08 17:24:54
Modified: src/core/org/apache/jmeter JMeter.java
bin jmeter.properties
src/core/org/apache/jmeter/engine
RemoteJMeterEngineImpl.java
Log:
Add server_port property to allow non-default RMI port to be used
Revision Changes Path
1.31 +7 -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.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- JMeter.java 20 Jun 2004 00:32:52 -0000 1.30
+++ JMeter.java 9 Jul 2004 00:24:54 -0000 1.31
@@ -268,7 +268,7 @@
}
else if (parser.getArgumentById(SERVER_OPT) != null)
{
- startServer();
+ startServer(JMeterUtils.getPropDefault("server_port",0));
startBSH();
}
else if (parser.getArgumentById(NONGUI_OPT) == null)
@@ -438,9 +438,14 @@
public void startServer()
{
+ startServer(0);
+ }
+
+ public void startServer(int port)
+ {
try
{
- new RemoteJMeterEngineImpl();
+ new RemoteJMeterEngineImpl(port);
while (true)
{
Thread.sleep(Long.MAX_VALUE);
1.110 +4 -0 jakarta-jmeter/bin/jmeter.properties
Index: jmeter.properties
===================================================================
RCS file: /home/cvs/jakarta-jmeter/bin/jmeter.properties,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -r1.109 -r1.110
--- jmeter.properties 5 Jul 2004 23:28:30 -0000 1.109
+++ jmeter.properties 9 Jul 2004 00:24:54 -0000 1.110
@@ -78,6 +78,10 @@
# Remote Hosts - comma delimited
remote_hosts=127.0.0.1
+#remote_hosts:localhost:1099,localhost:2010
+
+# RMI port to be used by the server
+#server_port=1099
#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
1.17 +19 -5
jakarta-jmeter/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java
Index: RemoteJMeterEngineImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- RemoteJMeterEngineImpl.java 12 Feb 2004 23:59:01 -0000 1.16
+++ RemoteJMeterEngineImpl.java 9 Jul 2004 00:24:54 -0000 1.17
@@ -19,8 +19,9 @@
package org.apache.jmeter.engine;
import java.net.InetAddress;
-import java.rmi.Naming;
import java.rmi.RemoteException;
+import java.rmi.registry.LocateRegistry;
+import java.rmi.registry.Registry;
import org.apache.jorphan.collections.HashTree;
import org.apache.jorphan.logging.LoggingManager;
@@ -37,16 +38,29 @@
transient private static Logger log = LoggingManager.getLoggerForClass();
JMeterEngine backingEngine;
+ public static final int DEFAULT_RMI_PORT = 1099;
+
public RemoteJMeterEngineImpl() throws RemoteException
{
- log.info("Starting backing engine");
+ init(DEFAULT_RMI_PORT);
+ }
+ public RemoteJMeterEngineImpl(int port) throws RemoteException
+ {
+ init(port == 0 ? DEFAULT_RMI_PORT : port);
+ }
+
+ private void init(int port) throws RemoteException
+ {
+ log.info("Starting backing engine on "+port);
log.debug("This = "+ this);
try
{
+ Registry reg = LocateRegistry.getRegistry(port);
backingEngine =
new StandardJMeterEngine(
InetAddress.getLocalHost().getHostName());
- Naming.rebind("JMeterEngine", this);
+ reg.rebind("JMeterEngine", this);
+ log.info("Bound to registry on port " + port);
}
catch(Exception ex){
log.error(
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
