sebb 2005/07/10 15:27:54
Modified: src/core/org/apache/jmeter/engine
RemoteJMeterEngineImpl.java
bin jmeter.properties
Log:
Bug 30379 - allow server rmi port to be overridden
Revision Changes Path
1.18 +5 -3
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.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- RemoteJMeterEngineImpl.java 9 Jul 2004 00:24:54 -0000 1.17
+++ RemoteJMeterEngineImpl.java 10 Jul 2005 22:27:54 -0000 1.18
@@ -23,6 +23,7 @@
import java.rmi.registry.LocateRegistry;
import java.rmi.registry.Registry;
+import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.collections.HashTree;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
@@ -38,7 +39,8 @@
transient private static Logger log = LoggingManager.getLoggerForClass();
JMeterEngine backingEngine;
- public static final int DEFAULT_RMI_PORT = 1099;
+ public static final int DEFAULT_RMI_PORT =
+ JMeterUtils.getPropDefault("server.rmi.port",1099);
public RemoteJMeterEngineImpl() throws RemoteException
{
1.124 +4 -1 jakarta-jmeter/bin/jmeter.properties
Index: jmeter.properties
===================================================================
RCS file: /home/cvs/jakarta-jmeter/bin/jmeter.properties,v
retrieving revision 1.123
retrieving revision 1.124
diff -u -r1.123 -r1.124
--- jmeter.properties 1 Jul 2005 22:51:02 -0000 1.123
+++ jmeter.properties 10 Jul 2005 22:27:54 -0000 1.124
@@ -354,3 +354,6 @@
# In case this causes problems, the previous behaviour can be restored by
uncommenting
# the following line.
#jmeterthread.startearlier=false
+
+# Change default port used by server (need to start rmiregistry with same
port)
+#server.rmi.port=1099
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
