Author: sebb
Date: Tue Nov 3 15:55:56 2009
New Revision: 832463
URL: http://svn.apache.org/viewvc?rev=832463&view=rev
Log:
Add JSR223 Assertion, Timer, Sampler
Added:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223Assertion.java
(with props)
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223AssertionBeanInfo.java
(with props)
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223AssertionResources.properties
(with props)
jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/JSR223Timer.java
(with props)
jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/JSR223TimerBeanInfo.java
(with props)
jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/JSR223TimerResources.properties
(with props)
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java
(with props)
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerBeanInfo.java
(with props)
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerResources.properties
(with props)
Modified:
jakarta/jmeter/trunk/xdocs/changes.xml
Added:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223Assertion.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223Assertion.java?rev=832463&view=auto
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223Assertion.java
(added)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223Assertion.java
Tue Nov 3 15:55:56 2009
@@ -0,0 +1,63 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.jmeter.assertions;
+
+import java.io.IOException;
+
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+
+import org.apache.jmeter.samplers.SampleResult;
+import org.apache.jmeter.testbeans.TestBean;
+import org.apache.jmeter.util.JSR223TestElement;
+import org.apache.jorphan.logging.LoggingManager;
+import org.apache.log.Logger;
+
+public class JSR223Assertion extends JSR223TestElement implements Cloneable,
Assertion, TestBean
+{
+ private static final Logger log = LoggingManager.getLoggerForClass();
+
+ private static final long serialVersionUID = 234L;
+
+ public AssertionResult getResult(SampleResult response) {
+ AssertionResult result = new AssertionResult(getName());
+ try {
+ ScriptEngineManager mgr = getManager();
+ if (mgr == null) {
+ result.setFailure(true);
+ result.setError(true);
+ result.setFailureMessage("JSR223 Manager not found");
+ return result;
+ }
+ mgr.put("SampleResult", response);
+ mgr.put("AssertionResult", result);
+ processFileOrScript(mgr);
+ result.setError(false);
+ } catch (IOException e) {
+ log.warn("Problem in JSR223 script "+e);
+ result.setError(true);
+ result.setFailureMessage(e.toString());
+ } catch (ScriptException e) {
+ log.warn("Problem in JSR223 script "+e);
+ result.setError(true);
+ result.setFailureMessage(e.toString());
+ }
+ return result;
+ }
+}
Propchange:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223Assertion.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223Assertion.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223AssertionBeanInfo.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223AssertionBeanInfo.java?rev=832463&view=auto
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223AssertionBeanInfo.java
(added)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223AssertionBeanInfo.java
Tue Nov 3 15:55:56 2009
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.jmeter.assertions;
+
+import org.apache.jmeter.util.BSFBeanInfoSupport;
+
+public class JSR223AssertionBeanInfo extends BSFBeanInfoSupport {
+
+ public JSR223AssertionBeanInfo() {
+ super(JSR223Assertion.class);
+ }
+
+}
Propchange:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223AssertionBeanInfo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223AssertionBeanInfo.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223AssertionResources.properties
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223AssertionResources.properties?rev=832463&view=auto
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223AssertionResources.properties
(added)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223AssertionResources.properties
Tue Nov 3 15:55:56 2009
@@ -0,0 +1,28 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+displayName=JSR223 Assertion
+scriptingLanguage.displayName=Script language (e.g. beanshell, javascript,
jexl)
+scriptLanguage.displayName=Language
+scriptLanguage.shortDescription=Name of JSR223 language, e.g. beanshell,
javascript, jexl
+scripting.displayName=Script (variables: ctx vars props SampleResult (aka
prev) AssertionResult sampler log Label Filename Parameters args[] OUT)
+script.displayName=Script
+script.shortDescription=Script in the appropriate BSF language
+parameterGroup.displayName=Parameters to be passed to script (=> String
Parameters and String []args)
+parameters.displayName=Parameters
+parameters.shortDescription=Parameters to be passed to the file or script
+filenameGroup.displayName=Script file (overrides script)
+filename.displayName=File Name
+filename.shortDescription=Script file (overrides script)
\ No newline at end of file
Propchange:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/JSR223AssertionResources.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/JSR223Timer.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/JSR223Timer.java?rev=832463&view=auto
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/JSR223Timer.java
(added)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/JSR223Timer.java
Tue Nov 3 15:55:56 2009
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.jmeter.timers;
+
+import java.io.IOException;
+
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+
+import org.apache.jmeter.testbeans.TestBean;
+import org.apache.jmeter.util.JSR223TestElement;
+import org.apache.jorphan.logging.LoggingManager;
+import org.apache.log.Logger;
+
+public class JSR223Timer extends JSR223TestElement implements Cloneable,
Timer, TestBean {
+ private static final Logger log = LoggingManager.getLoggerForClass();
+
+ private static final long serialVersionUID = 4;
+
+ /** {...@inheritdoc} */
+ public long delay() {
+ long delay = 0;
+ try {
+ ScriptEngineManager mgr = getManager();
+ if (mgr == null) {
+ return 0;
+ }
+ Object o = processFileOrScript(mgr);
+ delay = Long.valueOf(o.toString()).longValue();
+ } catch (NumberFormatException e) {
+ log.warn("Problem in JSR223 script "+e);
+ } catch (IOException e) {
+ log.warn("Problem in JSR223 script "+e);
+ } catch (ScriptException e) {
+ log.warn("Problem in JSR223 script "+e);
+ }
+ return delay;
+ }
+}
Propchange:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/JSR223Timer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/JSR223Timer.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/JSR223TimerBeanInfo.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/JSR223TimerBeanInfo.java?rev=832463&view=auto
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/JSR223TimerBeanInfo.java
(added)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/JSR223TimerBeanInfo.java
Tue Nov 3 15:55:56 2009
@@ -0,0 +1,29 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ * License for the specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+
+package org.apache.jmeter.timers;
+
+import org.apache.jmeter.util.BSFBeanInfoSupport;
+
+public class JSR223TimerBeanInfo extends BSFBeanInfoSupport {
+
+ public JSR223TimerBeanInfo() {
+ super(JSR223Timer.class);
+ }
+
+}
Propchange:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/JSR223TimerBeanInfo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/JSR223TimerBeanInfo.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/JSR223TimerResources.properties
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/JSR223TimerResources.properties?rev=832463&view=auto
==============================================================================
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/JSR223TimerResources.properties
(added)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/JSR223TimerResources.properties
Tue Nov 3 15:55:56 2009
@@ -0,0 +1,28 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+displayName=JSR223 Timer
+scriptingLanguage.displayName=Script language (e.g. beanshell, javascript,
jexl)
+scriptLanguage.displayName=Language
+scriptLanguage.shortDescription=Name of JSR223 language, e.g. beanshell,
javascript, jexl
+scripting.displayName=Script (variables: ctx vars props log)
+script.displayName=Script
+script.shortDescription=Script in the appropriate JSR223 language
+parameterGroup.displayName=Parameters to be passed to script (=> String
Parameters and String []args)
+parameters.displayName=Parameters
+parameters.shortDescription=Parameters to be passed to the file or script
+filenameGroup.displayName=Script file (overrides script)
+filename.displayName=File Name
+filename.shortDescription=Script file (overrides script)
\ No newline at end of file
Propchange:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/timers/JSR223TimerResources.properties
------------------------------------------------------------------------------
svn:eol-style = native
Added:
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java?rev=832463&view=auto
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java
(added)
+++
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java
Tue Nov 3 15:55:56 2009
@@ -0,0 +1,79 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.jmeter.protocol.java.sampler;
+
+import java.io.IOException;
+
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+
+import org.apache.jmeter.samplers.Entry;
+import org.apache.jmeter.samplers.SampleResult;
+import org.apache.jmeter.samplers.Sampler;
+import org.apache.jmeter.testbeans.TestBean;
+import org.apache.jmeter.util.JSR223TestElement;
+import org.apache.jorphan.logging.LoggingManager;
+import org.apache.log.Logger;
+
+public class JSR223Sampler extends JSR223TestElement implements Cloneable,
Sampler, TestBean {
+
+ private static final long serialVersionUID = 234L;
+
+ private static final Logger log = LoggingManager.getLoggerForClass();
+
+ public SampleResult sample(Entry entry) {
+ SampleResult result = new SampleResult();
+ result.setSampleLabel(getName());
+ final String filename = getFilename();
+ if (filename.length() > 0){
+ result.setSamplerData("File: "+filename);
+ } else {
+ result.setSamplerData(getScript());
+ }
+ result.setDataType(SampleResult.TEXT);
+ result.sampleStart();
+ try {
+ ScriptEngineManager mgr = getManager();
+ if (mgr == null) {
+ result.setSuccessful(false);
+ result.setResponseCode("500"); // $NON-NLS-1$
+ result.setResponseMessage("Could not instantiate
ScriptManager");
+ return result;
+ }
+ Object ret = processFileOrScript(mgr);
+ result.setSuccessful(true);
+ result.setResponseCodeOK();
+ result.setResponseMessageOK();
+ // TODO what encoding to use?
+ result.setResponseData(ret.toString().getBytes());
+ } catch (IOException e) {
+ log.warn("Problem in JSR223 script "+e);
+ result.setSuccessful(false);
+ result.setResponseCode("500"); // $NON-NLS-1$
+ result.setResponseMessage(e.toString());
+ } catch (ScriptException e) {
+ log.warn("Problem in JSR223 script "+e);
+ result.setSuccessful(false);
+ result.setResponseCode("500"); // $NON-NLS-1$
+ result.setResponseMessage(e.toString());
+ }
+ result.sampleEnd();
+ return result;
+ }
+}
Propchange:
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223Sampler.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerBeanInfo.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerBeanInfo.java?rev=832463&view=auto
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerBeanInfo.java
(added)
+++
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerBeanInfo.java
Tue Nov 3 15:55:56 2009
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.jmeter.protocol.java.sampler;
+
+import org.apache.jmeter.util.BSFBeanInfoSupport;
+
+public class JSR223SamplerBeanInfo extends BSFBeanInfoSupport {
+
+ public JSR223SamplerBeanInfo() {
+ super(JSR223Sampler.class);
+ }
+}
Propchange:
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerBeanInfo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerBeanInfo.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Added:
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerResources.properties
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerResources.properties?rev=832463&view=auto
==============================================================================
---
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerResources.properties
(added)
+++
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerResources.properties
Tue Nov 3 15:55:56 2009
@@ -0,0 +1,28 @@
+# Licensed to the Apache Software Foundation (ASF) under one or more
+# contributor license agreements. See the NOTICE file distributed with
+# this work for additional information regarding copyright ownership.
+# The ASF licenses this file to You under the Apache License, Version 2.0
+# (the "License"); you may not use this file except in compliance with
+# the License. You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+displayName=JSR223 Sampler
+scriptingLanguage.displayName=Script language (e.g. beanshell, javascript,
jexl)
+scriptLanguage.displayName=Language
+scriptLanguage.shortDescription=Name of JSR 223 language, e.g. beanshell,
javascript, jexl
+scripting.displayName=Script (variables: ctx vars props sampleResult (aka
prev) sampleEvent sampler log Label Filename Parameters args[] OUT)
+script.displayName=Script
+script.shortDescription=Script in the appropriate JSR 223 language
+parameterGroup.displayName=Parameters to be passed to script (=> String
Parameters and String []args)
+parameters.displayName=Parameters
+parameters.shortDescription=Parameters to be passed to the file or script
+filenameGroup.displayName=Script file (overrides script)
+filename.displayName=File Name
+filename.shortDescription=Script file (overrides script)
\ No newline at end of file
Propchange:
jakarta/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JSR223SamplerResources.properties
------------------------------------------------------------------------------
svn:eol-style = native
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=832463&r1=832462&r2=832463&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Tue Nov 3 15:55:56 2009
@@ -119,6 +119,7 @@
<ul>
<li>JUnit sampler now supports JUnit4 tests (using annotations)</li>
<li>Bug 47900 - Allow JMS SubscriberSampler to be interrupted</li>
+<li>Added JSR223 Sampler</li>
</ul>
<h3>Controllers</h3>
@@ -132,12 +133,16 @@
<li>Added Comparison Assertion Visualizer</li>
<li>Bug 36726 - add search function to Tree View Listener</li>
<li>Bug 47869 - Ability to cleanup fields of SampleResult</li>
+<li>Bug 47952 - Added JSR223 Listener</li>
</ul>
-<h3>Assertions, Config, Pre- & Post-Processors</h3>
+<h3>Timers, Assertions, Config, Pre- & Post-Processors</h3>
<ul>
<li>Bug 47338 - XPath Extractor forces retrieval of document DTD</li>
<li>Added Comparison Assertion</li>
+<li>Bug 47952 - Added JSR223 PreProcessor and PostProcessor</li>
+<li>Added JSR223 Assertion</li>
+<li>Added BSF Timer and JSR223 Timer</li>
</ul>
<h3>Functions</h3>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
