Author: sebb
Date: Sun Oct 21 16:59:54 2007
New Revision: 586977
URL: http://svn.apache.org/viewvc?rev=586977&view=rev
Log:
Add -G option: send properties to remote servers
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/JMeterEngine.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngine.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java?rev=586977&r1=586976&r2=586977&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java
Sun Oct 21 16:59:54 2007
@@ -22,6 +22,7 @@
import java.rmi.Naming;
import java.rmi.NotBoundException;
import java.rmi.RemoteException;
+import java.util.Properties;
import org.apache.jmeter.testelement.TestListener;
import org.apache.jmeter.threads.JMeterContextService;
@@ -137,6 +138,15 @@
remote.exit();
} catch (RemoteException e) {
log.warn("Could not perform remote exit: " +
e.toString());
+ }
+ }
+
+ public void setProperties(Properties p) {
+ log.info("Sending properties "+p);
+ try {
+ remote.setProperties(p);
+ } catch (RemoteException e) {
+ log.warn("Could not set properties: " + e.toString());
}
}
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/JMeterEngine.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/JMeterEngine.java?rev=586977&r1=586976&r2=586977&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/JMeterEngine.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/JMeterEngine.java
Sun Oct 21 16:59:54 2007
@@ -18,12 +18,10 @@
package org.apache.jmeter.engine;
+import java.util.Properties;
+
import org.apache.jorphan.collections.HashTree;
-/**
- * @author Michael Stover
- * @version $Revision$ Last updated $Date$
- */
public interface JMeterEngine {
void configure(HashTree testPlan);
@@ -34,6 +32,8 @@
void reset();
void setHost(String host);
+
+ void setProperties(Properties p);
void exit();
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngine.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngine.java?rev=586977&r1=586976&r2=586977&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngine.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngine.java
Sun Oct 21 16:59:54 2007
@@ -20,12 +20,10 @@
import java.rmi.Remote;
import java.rmi.RemoteException;
+import java.util.Properties;
import org.apache.jorphan.collections.HashTree;
-/**
- * @version $Revision$ Last updated $Date$
- */
public interface RemoteJMeterEngine extends Remote {
void configure(HashTree testTree) throws RemoteException;
@@ -36,6 +34,8 @@
void reset() throws RemoteException;
void setHost(String host) throws RemoteException;
+
+ void setProperties(Properties p) throws RemoteException;
void exit() throws RemoteException;
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java?rev=586977&r1=586976&r2=586977&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java
Sun Oct 21 16:59:54 2007
@@ -23,6 +23,7 @@
import java.rmi.registry.LocateRegistry;
import java.rmi.registry.Registry;
import java.util.Date;
+import java.util.Properties;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.collections.HashTree;
@@ -122,5 +123,10 @@
public void exit() throws RemoteException {
log.info("Exitting");
backingEngine.exit();
+ }
+
+ public void setProperties(Properties p) throws RemoteException {
+ log.info("Applying properties "+p);
+ JMeterUtils.getJMeterProperties().putAll(p);
}
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java?rev=586977&r1=586976&r2=586977&view=diff
==============================================================================
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
Sun Oct 21 16:59:54 2007
@@ -29,6 +29,7 @@
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
+import java.util.Properties;
import org.apache.jmeter.testbeans.TestBean;
import org.apache.jmeter.testbeans.TestBeanHelper;
@@ -540,5 +541,9 @@
};
log.info("Starting Closedown");
t.start();
+ }
+
+ public void setProperties(Properties p) {
+ //not needed locally
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
