mstover1 2004/10/06 07:43:57
Modified: xdocs/demos forEachTestPlan.jmx
src/core/org/apache/jmeter/engine TurnElementsOn.java
StandardJMeterEngine.java
src/functions/org/apache/jmeter/functions BeanShell.java
LogFunction.java StringFromFile.java
JavaScript.java PackageTest.java
src/core/org/apache/jmeter/engine/util FunctionParser.java
src/core/org/apache/jmeter/testbeans/gui TestBeanGUI.java
src/examples/org/apache/jmeter/examples/testbeans/example1
Example1.java
src/core/org/apache/jmeter/gui/action DragNDrop.java
Remove.java Copy.java Start.java Cut.java
Paste.java
src/core/org/apache/jmeter/testelement TestElement.java
AbstractTestElement.java
src/core/org/apache/jmeter/util SSLManager.java
JMeterVersion.java JMeterUtils.java
src/protocol/http/org/apache/jmeter/protocol/http/sampler
HTTPSampler.java HTTPSampleResult.java
SoapSampler.java
src/components/org/apache/jmeter/visualizers
ViewResultsFullVisualizer.java Graph.java
bin jmeter.properties
xdocs/usermanual component_reference.xml functions.xml
xdocs/stylesheets site_printable.vsl project.xml
xdocs/images/screenshots/logic-controller
foreach-example.png
src/examples/org/apache/jmeter/examples/testbeans/example2
Example2.java Example2BeanInfo.java
src/core/org/apache/jmeter/resources PackageTest.java
messages.properties
src/core/org/apache/jmeter/reporters ResultSaver.java
src/core/org/apache/jmeter/gui/util MenuFactory.java
. build.xml
src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler
TCPSampler.java
src/core/org/apache/jmeter/control IfController.java
src/protocol/http/org/apache/jmeter/protocol/http/proxy
ProxyControl.java
src/protocol/java/org/apache/jmeter/protocol/java/sampler
BeanShellSampler.java
src/core/org/apache/jmeter/samplers SampleResult.java
src/core/org/apache/jmeter/reporters/gui ResultSaverGui.java
src/components/org/apache/jmeter/modifiers
UserParameters.java
src/core/org/apache/jmeter/threads JMeterThread.java
src/protocol/java/org/apache/jmeter/protocol/java/test
JavaTest.java
xdocs nightly.xml changes.xml index.xml
src/protocol/http/org/apache/jmeter/protocol/http/modifier
AnchorModifier.java
src/jorphan/org/apache/jorphan/reflect ClassFinder.java
Added: src/functions/org/apache/jmeter/functions SplitFunction.java
bin BeanShellSampler.bshrc BeanShellFunction.bshrc
src/core/org/apache/jmeter/control/gui
WhileControllerGui.java
src/core/org/apache/jmeter/control WhileController.java
bin/testfiles IfTest.jmx BeanShellTest.bsh
Log:
Merging 2-0 to HEAD
Revision Changes Path
1.2 +109 -105 jakarta-jmeter/xdocs/demos/forEachTestPlan.jmx
http://cvs.apache.org/viewcvs/jakarta-jmeter/xdocs/demos/forEachTestPlan.jmx.diff?r1=1.1&r2=1.2
1.3 +15 -4
jakarta-jmeter/src/core/org/apache/jmeter/engine/TurnElementsOn.java
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/engine/TurnElementsOn.java.diff?r1=1.2&r2=1.3
1.53 +18 -0
jakarta-jmeter/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java.diff?r1=1.52&r2=1.53
1.5 +66 -19
jakarta-jmeter/src/functions/org/apache/jmeter/functions/BeanShell.java
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/functions/org/apache/jmeter/functions/BeanShell.java.diff?r1=1.4&r2=1.5
1.5 +6 -3
jakarta-jmeter/src/functions/org/apache/jmeter/functions/LogFunction.java
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/functions/org/apache/jmeter/functions/LogFunction.java.diff?r1=1.4&r2=1.5
1.19 +105 -34
jakarta-jmeter/src/functions/org/apache/jmeter/functions/StringFromFile.java
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/functions/org/apache/jmeter/functions/StringFromFile.java.diff?r1=1.18&r2=1.19
1.7 +17 -1
jakarta-jmeter/src/functions/org/apache/jmeter/functions/JavaScript.java
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/functions/org/apache/jmeter/functions/JavaScript.java.diff?r1=1.6&r2=1.7
1.12 +261 -5
jakarta-jmeter/src/functions/org/apache/jmeter/functions/PackageTest.java
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/functions/org/apache/jmeter/functions/PackageTest.java.diff?r1=1.11&r2=1.12
1.2 +127 -0
jakarta-jmeter/src/functions/org/apache/jmeter/functions/SplitFunction.java
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/functions/org/apache/jmeter/functions/SplitFunction.java.diff?r1=1.1&r2=1.2
1.6 +6 -1
jakarta-jmeter/src/core/org/apache/jmeter/engine/util/FunctionParser.java
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/engine/util/FunctionParser.java.diff?r1=1.5&r2=1.6
1.19 +7 -3
jakarta-jmeter/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/testbeans/gui/TestBeanGUI.java.diff?r1=1.18&r2=1.19
1.3 +16 -4
jakarta-jmeter/src/examples/org/apache/jmeter/examples/testbeans/example1/Example1.java
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/examples/org/apache/jmeter/examples/testbeans/example1/Example1.java.diff?r1=1.2&r2=1.3
1.5 +49 -14
jakarta-jmeter/src/core/org/apache/jmeter/gui/action/DragNDrop.java
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/DragNDrop.java.diff?r1=1.4&r2=1.5
1.11 +16 -4 jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Remove.java
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Remove.java.diff?r1=1.10&r2=1.11
1.8 +34 -4 jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Copy.java
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Copy.java.diff?r1=1.7&r2=1.8
1.14 +14 -8 jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Start.java
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Start.java.diff?r1=1.13&r2=1.14
1.7 +8 -6 jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Cut.java
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Cut.java.diff?r1=1.6&r2=1.7
1.4 +17 -12 jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Paste.java
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Paste.java.diff?r1=1.3&r2=1.4
1.13 +11 -2
jakarta-jmeter/src/core/org/apache/jmeter/testelement/TestElement.java
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/testelement/TestElement.java.diff?r1=1.12&r2=1.13
1.41 +5 -0
jakarta-jmeter/src/core/org/apache/jmeter/testelement/AbstractTestElement.java
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/testelement/AbstractTestElement.java.diff?r1=1.40&r2=1.41
1.10 +3 -4 jakarta-jmeter/src/core/org/apache/jmeter/util/SSLManager.java
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/util/SSLManager.java.diff?r1=1.9&r2=1.10
1.27 +1 -1
jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterVersion.java
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterVersion.java.diff?r1=1.26&r2=1.27
1.69 +34 -2 jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterUtils.java
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterUtils.java.diff?r1=1.68&r2=1.69
1.98 +3 -3
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java.diff?r1=1.97&r2=1.98
1.12 +3 -13
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java.diff?r1=1.11&r2=1.12
1.12 +4 -4
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/SoapSampler.java
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/SoapSampler.java.diff?r1=1.11&r2=1.12
1.46 +81 -6
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java.diff?r1=1.45&r2=1.46
1.14 +37 -37
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/Graph.java
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/Graph.java.diff?r1=1.13&r2=1.14
1.112 +62 -2 jakarta-jmeter/bin/jmeter.properties
http://cvs.apache.org/viewcvs/jakarta-jmeter/bin/jmeter.properties.diff?r1=1.111&r2=1.112
1.2 +30 -0 jakarta-jmeter/bin/BeanShellSampler.bshrc
http://cvs.apache.org/viewcvs/jakarta-jmeter/bin/BeanShellSampler.bshrc.diff?r1=1.1&r2=1.2
1.2 +30 -0 jakarta-jmeter/bin/BeanShellFunction.bshrc
http://cvs.apache.org/viewcvs/jakarta-jmeter/bin/BeanShellFunction.bshrc.diff?r1=1.1&r2=1.2
1.95 +27 -16 jakarta-jmeter/xdocs/usermanual/component_reference.xml
http://cvs.apache.org/viewcvs/jakarta-jmeter/xdocs/usermanual/component_reference.xml.diff?r1=1.94&r2=1.95
1.17 +113 -12 jakarta-jmeter/xdocs/usermanual/functions.xml
http://cvs.apache.org/viewcvs/jakarta-jmeter/xdocs/usermanual/functions.xml.diff?r1=1.16&r2=1.17
1.2 +153 -0
jakarta-jmeter/src/core/org/apache/jmeter/control/gui/WhileControllerGui.java
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/control/gui/WhileControllerGui.java.diff?r1=1.1&r2=1.2
1.15 +4 -4 jakarta-jmeter/xdocs/stylesheets/site_printable.vsl
http://cvs.apache.org/viewcvs/jakarta-jmeter/xdocs/stylesheets/site_printable.vsl.diff?r1=1.14&r2=1.15
1.26 +2 -1 jakarta-jmeter/xdocs/stylesheets/project.xml
http://cvs.apache.org/viewcvs/jakarta-jmeter/xdocs/stylesheets/project.xml.diff?r1=1.25&r2=1.26
1.2 +13 -10
jakarta-jmeter/xdocs/images/screenshots/logic-controller/foreach-example.png
<<Binary file>>
1.3 +16 -4
jakarta-jmeter/src/examples/org/apache/jmeter/examples/testbeans/example2/Example2.java
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/examples/org/apache/jmeter/examples/testbeans/example2/Example2.java.diff?r1=1.2&r2=1.3
1.2 +16 -10
jakarta-jmeter/src/examples/org/apache/jmeter/examples/testbeans/example2/Example2BeanInfo.java
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/examples/org/apache/jmeter/examples/testbeans/example2/Example2BeanInfo.java.diff?r1=1.1&r2=1.2
1.11 +8 -4
jakarta-jmeter/src/core/org/apache/jmeter/resources/PackageTest.java
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/PackageTest.java.diff?r1=1.10&r2=1.11
1.126 +3 -0
jakarta-jmeter/src/core/org/apache/jmeter/resources/messages.properties
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/messages.properties.diff?r1=1.125&r2=1.126
1.7 +9 -1
jakarta-jmeter/src/core/org/apache/jmeter/reporters/ResultSaver.java
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/reporters/ResultSaver.java.diff?r1=1.6&r2=1.7
1.31 +34 -23
jakarta-jmeter/src/core/org/apache/jmeter/gui/util/MenuFactory.java
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/util/MenuFactory.java.diff?r1=1.30&r2=1.31
1.192 +103 -40 jakarta-jmeter/build.xml
http://cvs.apache.org/viewcvs/jakarta-jmeter/build.xml.diff?r1=1.191&r2=1.192
1.10 +1 -0
jakarta-jmeter/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPSampler.java.diff?r1=1.9&r2=1.10
1.9 +11 -21
jakarta-jmeter/src/core/org/apache/jmeter/control/IfController.java
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/control/IfController.java.diff?r1=1.8&r2=1.9
1.2 +107 -0
jakarta-jmeter/src/core/org/apache/jmeter/control/WhileController.java
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/control/WhileController.java.diff?r1=1.1&r2=1.2
1.54 +6 -2
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java.diff?r1=1.53&r2=1.54
1.8 +22 -5
jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BeanShellSampler.java.diff?r1=1.7&r2=1.8
1.35 +12 -1
jakarta-jmeter/src/core/org/apache/jmeter/samplers/SampleResult.java
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/samplers/SampleResult.java.diff?r1=1.34&r2=1.35
1.2 +189 -0 jakarta-jmeter/bin/testfiles/IfTest.jmx
http://cvs.apache.org/viewcvs/jakarta-jmeter/bin/testfiles/IfTest.jmx.diff?r1=1.1&r2=1.2
1.2 +20 -0 jakarta-jmeter/bin/testfiles/BeanShellTest.bsh
http://cvs.apache.org/viewcvs/jakarta-jmeter/bin/testfiles/BeanShellTest.bsh.diff?r1=1.1&r2=1.2
1.5 +14 -4
jakarta-jmeter/src/core/org/apache/jmeter/reporters/gui/ResultSaverGui.java
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/reporters/gui/ResultSaverGui.java.diff?r1=1.4&r2=1.5
1.23 +19 -11
jakarta-jmeter/src/components/org/apache/jmeter/modifiers/UserParameters.java
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/components/org/apache/jmeter/modifiers/UserParameters.java.diff?r1=1.22&r2=1.23
1.54 +36 -5
jakarta-jmeter/src/core/org/apache/jmeter/threads/JMeterThread.java
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/threads/JMeterThread.java.diff?r1=1.53&r2=1.54
1.12 +18 -32
jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/test/JavaTest.java
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/test/JavaTest.java.diff?r1=1.11&r2=1.12
1.4 +6 -12 jakarta-jmeter/xdocs/nightly.xml
http://cvs.apache.org/viewcvs/jakarta-jmeter/xdocs/nightly.xml.diff?r1=1.3&r2=1.4
1.17 +32 -2 jakarta-jmeter/xdocs/changes.xml
http://cvs.apache.org/viewcvs/jakarta-jmeter/xdocs/changes.xml.diff?r1=1.16&r2=1.17
1.9 +3 -3 jakarta-jmeter/xdocs/index.xml
http://cvs.apache.org/viewcvs/jakarta-jmeter/xdocs/index.xml.diff?r1=1.8&r2=1.9
1.17 +10 -5
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/modifier/AnchorModifier.java.diff?r1=1.16&r2=1.17
1.10 +16 -15
jakarta-jmeter/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java.diff?r1=1.9&r2=1.10
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
