You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2006/09/17 01:42:41 UTC
svn commit: r446975 - in /jakarta/jmeter/branches/rel-2-2:
bin/jmeter.properties src/core/org/apache/jmeter/JMeter.java
Author: sebb
Date: Sat Sep 16 16:42:40 2006
New Revision: 446975
URL: http://svn.apache.org/viewvc?view=rev&rev=446975
Log:
Add optional BeanShell init file
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=446975&r1=446974&r2=446975
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/bin/jmeter.properties (original)
+++ jakarta/jmeter/branches/rel-2-2/bin/jmeter.properties Sat Sep 16 16:42:40 2006
@@ -416,6 +416,10 @@
beanshell.server.file=../extras/startup.bsh
#
+# Define a file to be processed at startup
+#beanshell.init.file=
+
+#
# Define the intialisation files for BeanShell Sampler and Function elements
#beanshell.sampler.init=BeanShellSampler.bshrc
#beanshell.function.init=BeanShellFunction.bshrc
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=446975&r1=446974&r2=446975
==============================================================================
--- 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 Sat Sep 16 16:42:40 2006
@@ -68,12 +68,14 @@
import org.apache.jmeter.testelement.TestPlan;
import org.apache.jmeter.threads.gui.ThreadGroupGui;
import org.apache.jmeter.timers.gui.AbstractTimerGui;
+import org.apache.jmeter.util.BeanShellInterpreter;
import org.apache.jmeter.util.BeanShellServer;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.visualizers.gui.AbstractVisualizer;
import org.apache.jorphan.collections.HashTree;
import org.apache.jorphan.gui.ComponentUtil;
import org.apache.jorphan.logging.LoggingManager;
+import org.apache.jorphan.util.JMeterException;
import org.apache.jorphan.util.JOrphanUtils;
import org.apache.log.Logger;
@@ -344,6 +346,20 @@
Runnable t = new BeanShellServer(bshport, bshfile);
t.run();
}
+
+ // Should we run a beanshell script on startup?
+ String bshinit = JMeterUtils.getProperty("beanshell.init.file");// $NON-NLS-1$
+ if (bshinit != null){
+ log.info("Run Beanshell on file: "+bshinit);
+ try {
+ BeanShellInterpreter bsi = new BeanShellInterpreter();//bshinit,log);
+ bsi.source(bshinit);
+ } catch (ClassNotFoundException e) {
+ log.warn("Could not start Beanshell: "+e.getLocalizedMessage());
+ } catch (JMeterException e) {
+ log.warn("Could not process Beanshell file: "+e.getLocalizedMessage());
+ }
+ }
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org