Author: sebb Date: Sun Jun 10 14:55:11 2007 New Revision: 545952 URL: http://svn.apache.org/viewvc?view=rev&rev=545952 Log: Simplify BeanShell init and logging
Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/BeanShellTimer.java jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/BeanShellListener.java jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/BeanShellInterpreter.java jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/BeanShell.java jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java?view=diff&rev=545952&r1=545951&r2=545952 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java (original) +++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java Sun Jun 10 14:55:11 2007 @@ -67,17 +67,9 @@ private void init(){ try { - bshInterpreter = new BeanShellInterpreter(); - String init = JMeterUtils.getProperty(INIT_FILE); - try { - bshInterpreter.init(init, log); - } catch (IOException e) { - log.warn("Could not initialise interpreter", e); - } catch (JMeterException e) { - log.warn("Could not initialise interpreter", e); - } + bshInterpreter = new BeanShellInterpreter(INIT_FILE, log); } catch (ClassNotFoundException e) { - log.error("Could not establish BeanShellInterpreter: " + e); + log.error("Cannot find BeanShell: "+e.toString()); } } public String getScript() { Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java?view=diff&rev=545952&r1=545951&r2=545952 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java (original) +++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/extractor/BeanShellPostProcessor.java Sun Jun 10 14:55:11 2007 @@ -59,7 +59,7 @@ try { bshInterpreter = new BeanShellInterpreter(JMeterUtils.getProperty(INIT_FILE),log); } catch (ClassNotFoundException e) { - log.error("Cannot find BeanShell: "+e.getLocalizedMessage()); + log.error("Cannot find BeanShell: "+e.toString()); } } Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java?view=diff&rev=545952&r1=545951&r2=545952 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java (original) +++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/modifiers/BeanShellPreProcessor.java Sun Jun 10 14:55:11 2007 @@ -60,7 +60,7 @@ try { bshInterpreter = new BeanShellInterpreter(JMeterUtils.getProperty(INIT_FILE),log); } catch (ClassNotFoundException e) { - log.error("Cannot find BeanShell: "+e.getLocalizedMessage()); + log.error("Cannot find BeanShell: "+e.toString()); } } Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/BeanShellTimer.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/BeanShellTimer.java?view=diff&rev=545952&r1=545951&r2=545952 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/BeanShellTimer.java (original) +++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/timers/BeanShellTimer.java Sun Jun 10 14:55:11 2007 @@ -55,7 +55,7 @@ try { bshInterpreter = new BeanShellInterpreter(JMeterUtils.getProperty(INIT_FILE),log); } catch (ClassNotFoundException e) { - log.error(e.getLocalizedMessage()); + log.error("Cannot find BeanShell: "+e.toString()); } } Modified: jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/BeanShellListener.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/BeanShellListener.java?view=diff&rev=545952&r1=545951&r2=545952 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/BeanShellListener.java (original) +++ jakarta/jmeter/branches/rel-2-2/src/components/org/apache/jmeter/visualizers/BeanShellListener.java Sun Jun 10 14:55:11 2007 @@ -61,7 +61,7 @@ try { bshInterpreter = new BeanShellInterpreter(JMeterUtils.getProperty(INIT_FILE),log); } catch (ClassNotFoundException e) { - log.error(e.getLocalizedMessage()); + log.error("Cannot find BeanShell: "+e.toString()); } } Modified: jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/BeanShellInterpreter.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/BeanShellInterpreter.java?view=diff&rev=545952&r1=545951&r2=545952 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/BeanShellInterpreter.java (original) +++ jakarta/jmeter/branches/rel-2-2/src/core/org/apache/jmeter/util/BeanShellInterpreter.java Sun Jun 10 14:55:11 2007 @@ -144,9 +144,9 @@ try { this.init(init, _log); } catch (IOException e) { - _log.warn("Could not initialise interpreter", e); + _log.warn("Could not initialise interpreter: "+e.toString()); // no need for stack trace } catch (JMeterException e) { - _log.warn("Could not initialise interpreter", e); + _log.warn("Could not initialise interpreter: "+e.toString()); // no need for stack trace } } Modified: jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/BeanShell.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/BeanShell.java?view=diff&rev=545952&r1=545951&r2=545952 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/BeanShell.java (original) +++ jakarta/jmeter/branches/rel-2-2/src/functions/org/apache/jmeter/functions/BeanShell.java Sun Jun 10 14:55:11 2007 @@ -151,14 +151,7 @@ } try { - bshInterpreter = new BeanShellInterpreter(); - try { - bshInterpreter.init(JMeterUtils.getProperty(INIT_FILE), log); - } catch (IOException e) { - log.warn("Can't init interpreter"); - } catch (JMeterException e) { - log.warn("Can't init interpreter"); - } + bshInterpreter = new BeanShellInterpreter(INIT_FILE, log); } catch (ClassNotFoundException e) { throw new InvalidVariableException("BeanShell not found"); } Modified: jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java?view=diff&rev=545952&r1=545951&r2=545952 ============================================================================== --- jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java (original) +++ jakarta/jmeter/branches/rel-2-2/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java Sun Jun 10 14:55:11 2007 @@ -57,17 +57,9 @@ public BeanShellSampler() { try { - bshInterpreter = new BeanShellInterpreter(); - String init = JMeterUtils.getProperty(INIT_FILE); - try { - bshInterpreter.init(init, log); - } catch (IOException e) { - log.warn("Could not initialise interpreter", e); - } catch (JMeterException e) { - log.warn("Could not initialise interpreter"); // no need for stack trace - } + bshInterpreter = new BeanShellInterpreter(INIT_FILE, log); } catch (ClassNotFoundException e) { - log.error("Could not establish BeanShellInterpreter: " + e); + log.error("Cannot find BeanShell: "+e.toString()); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]