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 ms...@apache.org on 2005/03/18 16:27:01 UTC

cvs commit: jakarta-jmeter/src/jorphan/org/apache/jorphan/util JOrphanUtils.java

mstover1    2005/03/18 07:27:01

  Modified:    src/components/org/apache/jmeter/assertions
                        BeanShellAssertion.java
               src/functions/org/apache/jmeter/functions BeanShell.java
                        FileWrapper.java RegexFunction.java JavaScript.java
                        FileRowColContainer.java PackageTest.java
                        ThreadNumber.java
               src/core/org/apache/jmeter/resources messages_fr.properties
                        PackageTest.java messages.properties
               bin      jmeter-server.bat jmeter-n.bat jmeter.properties
                        jmeter-t.bat jmeter jmetertest.properties
                        jmeterw.bat BeanShellFunction.bshrc jmeter.bat
               src/core/org/apache/jmeter/gui
                        AbstractJMeterGuiComponent.java
               bin/testfiles HTMLScript.html
               src/components/org/apache/jmeter/assertions/gui
                        BeanShellAssertionGui.java
               src/protocol/http/org/apache/jmeter/protocol/http/sampler
                        HTTPSamplerBase.java HTTPSampleResult.java
               src/core/org/apache/jmeter/util JMeterVersion.java
                        JMeterUtils.java
               src/components/org/apache/jmeter/control/gui
                        ForeachControlPanel.java ModuleControllerGui.java
               src/protocol/http/org/apache/jmeter/protocol/http/parser
                        JTidyHTMLParser.java HTMLParser.java
                        HtmlParserHTMLParser.java
               src/core/org/apache/jmeter/testbeans/gui PackageTest.java
               src/core/org/apache/jmeter/threads/gui ThreadGroupGui.java
               xdocs/usermanual component_reference.xml functions.xml
               src/core/org/apache/jmeter/gui/action Load.java Close.java
                        CheckDirty.java
               src/core/org/apache/jmeter/control/gui
                        WhileControllerGui.java
               src/components/org/apache/jmeter/control
                        OnceOnlyController.java ForeachController.java
                        InterleaveControl.java
               src/core/org/apache/jmeter JMeter.java
               src/core/org/apache/jmeter/threads ListenerNotifier.java
                        TestCompiler.java JMeterThread.java
               src/core/org/apache/jmeter/control GenericController.java
                        WhileController.java RunTime.java IfController.java
                        LoopController.java
               .        build.xml
               lib      jar_usage.txt
               src/protocol/java/org/apache/jmeter/protocol/java/sampler
                        BeanShellSampler.java
               src/core/org/apache/jmeter/samplers SampleResult.java
               src/core/org/apache/jmeter/engine StandardJMeterEngine.java
               src/protocol/http/org/apache/jmeter/protocol/http/control
                        CookieManager.java
               src/components/org/apache/jmeter/modifiers/gui
                        CounterConfigGui.java
               xdocs    changes.xml
               src/jorphan/org/apache/jorphan/util JOrphanUtils.java
  Added:       src/components/org/apache/jmeter/assertions package.html
                        XPathAssertion.java
               src/functions/org/apache/jmeter/functions
                        XPathFileContainer.java XPathWrapper.java
                        XPath.java
               bin      BeanShellAssertion.bshrc
               bin/testfiles test.tsv HTMLParserTestFrames.all Test
                        Plan_out.jmx HTMLParserTestFrames.html
               src/jorphan/org/apache/commons/cli/avalon CLOption.java
                        ParserControl.java ClutilTestCase.java
                        CLArgsParser.java CLOptionDescriptor.java
                        AbstractParserControl.java Token.java CLUtil.java
                        package.html
               src/components/org/apache/jmeter/assertions/gui
                        XPathAssertionGui.java XMLConfPanel.java
                        XPathPanel.java
               src/core/org/apache/jmeter/util XPathUtil.java
                        BeanShellInterpreter.java
               xdocs/images/screenshots xpath_assertion.png
               src/components/org/apache/jmeter/control/gui
                        SwitchControllerGui.java
               src/components/org/apache/jmeter/control
                        SwitchController.java
               lib      LICENSE(jtidy).txt
  Removed:     lib      excalibur-compatibility-1.1.jar
                        excalibur-i18n-1.1.jar
  Log:
  Merge from 2-0 and some fixes to controllers that need to recover running version after no samplers under them have run.
  
  Revision  Changes    Path
  1.8       +23 -28    jakarta-jmeter/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java.diff?r1=1.7&r2=1.8
  
  
  1.2       +33 -0     jakarta-jmeter/src/components/org/apache/jmeter/assertions/package.html
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/components/org/apache/jmeter/assertions/package.html.diff?r1=1.1&r2=1.2
  
  
  1.2       +459 -0    jakarta-jmeter/src/components/org/apache/jmeter/assertions/XPathAssertion.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/components/org/apache/jmeter/assertions/XPathAssertion.java.diff?r1=1.1&r2=1.2
  
  
  1.7       +28 -85    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.6&r2=1.7
  
  
  1.7       +3 -3      jakarta-jmeter/src/functions/org/apache/jmeter/functions/FileWrapper.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/functions/org/apache/jmeter/functions/FileWrapper.java.diff?r1=1.6&r2=1.7
  
  
  1.23      +20 -9     jakarta-jmeter/src/functions/org/apache/jmeter/functions/RegexFunction.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/functions/org/apache/jmeter/functions/RegexFunction.java.diff?r1=1.22&r2=1.23
  
  
  1.8       +5 -4      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.7&r2=1.8
  
  
  1.7       +74 -14    jakarta-jmeter/src/functions/org/apache/jmeter/functions/FileRowColContainer.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/functions/org/apache/jmeter/functions/FileRowColContainer.java.diff?r1=1.6&r2=1.7
  
  
  1.13      +8 -4      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.12&r2=1.13
  
  
  1.9       +3 -3      jakarta-jmeter/src/functions/org/apache/jmeter/functions/ThreadNumber.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/functions/org/apache/jmeter/functions/ThreadNumber.java.diff?r1=1.8&r2=1.9
  
  
  1.2       +226 -0    jakarta-jmeter/src/functions/org/apache/jmeter/functions/XPathFileContainer.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/functions/org/apache/jmeter/functions/XPathFileContainer.java.diff?r1=1.1&r2=1.2
  
  
  1.2       +247 -0    jakarta-jmeter/src/functions/org/apache/jmeter/functions/XPathWrapper.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/functions/org/apache/jmeter/functions/XPathWrapper.java.diff?r1=1.1&r2=1.2
  
  
  1.2       +163 -0    jakarta-jmeter/src/functions/org/apache/jmeter/functions/XPath.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/functions/org/apache/jmeter/functions/XPath.java.diff?r1=1.1&r2=1.2
  
  
  1.5       +2 -2      jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_fr.properties
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/messages_fr.properties.diff?r1=1.4&r2=1.5
  
  
  1.14      +28 -6     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.13&r2=1.14
  
  
  1.136     +25 -2     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.135&r2=1.136
  
  
  1.11      +9 -1      jakarta-jmeter/bin/jmeter-server.bat
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/bin/jmeter-server.bat.diff?r1=1.10&r2=1.11
  
  
  1.3       +12 -49    jakarta-jmeter/bin/jmeter-n.bat
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/bin/jmeter-n.bat.diff?r1=1.2&r2=1.3
  
  
  1.115     +23 -2     jakarta-jmeter/bin/jmeter.properties
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/bin/jmeter.properties.diff?r1=1.114&r2=1.115
  
  
  1.3       +40 -1     jakarta-jmeter/bin/jmeter-t.bat
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/bin/jmeter-t.bat.diff?r1=1.2&r2=1.3
  
  
  1.27      +2 -2      jakarta-jmeter/bin/jmeter
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/bin/jmeter.diff?r1=1.26&r2=1.27
  
  
  1.6       +5 -2      jakarta-jmeter/bin/jmetertest.properties
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/bin/jmetertest.properties.diff?r1=1.5&r2=1.6
  
  
  1.4       +6 -45     jakarta-jmeter/bin/jmeterw.bat
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/bin/jmeterw.bat.diff?r1=1.3&r2=1.4
  
  
  1.3       +1 -1      jakarta-jmeter/bin/BeanShellFunction.bshrc
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/bin/BeanShellFunction.bshrc.diff?r1=1.2&r2=1.3
  
  
  1.30      +25 -3     jakarta-jmeter/bin/jmeter.bat
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/bin/jmeter.bat.diff?r1=1.29&r2=1.30
  
  
  1.2       +25 -0     jakarta-jmeter/bin/BeanShellAssertion.bshrc
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/bin/BeanShellAssertion.bshrc.diff?r1=1.1&r2=1.2
  
  
  1.32      +16 -16    jakarta-jmeter/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java.diff?r1=1.31&r2=1.32
  
  
  1.2       +1 -0      jakarta-jmeter/bin/testfiles/HTMLScript.html
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/bin/testfiles/HTMLScript.html.diff?r1=1.1&r2=1.2
  
  
  1.2       +4 -0      jakarta-jmeter/bin/testfiles/test.tsv
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/bin/testfiles/test.tsv.diff?r1=1.1&r2=1.2
  
  
  1.2       +3 -0      jakarta-jmeter/bin/testfiles/HTMLParserTestFrames.all
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/bin/testfiles/HTMLParserTestFrames.all.diff?r1=1.1&r2=1.2
  
  
  No                   revision
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/bin/testfiles/HTMLParserTestFrames.all.diff?r1=1.1&r2=1.2
  
  
  No                   revision
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/bin/testfiles/HTMLParserTestFrames.all.diff?r1=1.1&r2=1.2
  
  
  1.2       +23 -0     jakarta-jmeter/bin/testfiles/HTMLParserTestFrames.html
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/bin/testfiles/HTMLParserTestFrames.html.diff?r1=1.1&r2=1.2
  
  
  1.2       +173 -0    jakarta-jmeter/src/jorphan/org/apache/commons/cli/avalon/CLOption.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/jorphan/org/apache/commons/cli/avalon/CLOption.java.diff?r1=1.1&r2=1.2
  
  
  1.2       +36 -0     jakarta-jmeter/src/jorphan/org/apache/commons/cli/avalon/ParserControl.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/jorphan/org/apache/commons/cli/avalon/ParserControl.java.diff?r1=1.1&r2=1.2
  
  
  1.2       +1022 -0   jakarta-jmeter/src/jorphan/org/apache/commons/cli/avalon/ClutilTestCase.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/jorphan/org/apache/commons/cli/avalon/ClutilTestCase.java.diff?r1=1.1&r2=1.2
  
  
  1.2       +810 -0    jakarta-jmeter/src/jorphan/org/apache/commons/cli/avalon/CLArgsParser.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/jorphan/org/apache/commons/cli/avalon/CLArgsParser.java.diff?r1=1.1&r2=1.2
  
  
  1.2       +226 -0    jakarta-jmeter/src/jorphan/org/apache/commons/cli/avalon/CLOptionDescriptor.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/jorphan/org/apache/commons/cli/avalon/CLOptionDescriptor.java.diff?r1=1.1&r2=1.2
  
  
  1.2       +40 -0     jakarta-jmeter/src/jorphan/org/apache/commons/cli/avalon/AbstractParserControl.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/jorphan/org/apache/commons/cli/avalon/AbstractParserControl.java.diff?r1=1.1&r2=1.2
  
  
  1.2       +72 -0     jakarta-jmeter/src/jorphan/org/apache/commons/cli/avalon/Token.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/jorphan/org/apache/commons/cli/avalon/Token.java.diff?r1=1.1&r2=1.2
  
  
  1.2       +118 -0    jakarta-jmeter/src/jorphan/org/apache/commons/cli/avalon/CLUtil.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/jorphan/org/apache/commons/cli/avalon/CLUtil.java.diff?r1=1.1&r2=1.2
  
  
  1.2       +164 -0    jakarta-jmeter/src/jorphan/org/apache/commons/cli/avalon/package.html
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/jorphan/org/apache/commons/cli/avalon/package.html.diff?r1=1.1&r2=1.2
  
  
  1.5       +10 -2     jakarta-jmeter/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java.diff?r1=1.4&r2=1.5
  
  
  1.2       +137 -0    jakarta-jmeter/src/components/org/apache/jmeter/assertions/gui/XPathAssertionGui.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/components/org/apache/jmeter/assertions/gui/XPathAssertionGui.java.diff?r1=1.1&r2=1.2
  
  
  1.2       +143 -0    jakarta-jmeter/src/components/org/apache/jmeter/assertions/gui/XMLConfPanel.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/components/org/apache/jmeter/assertions/gui/XMLConfPanel.java.diff?r1=1.1&r2=1.2
  
  
  1.2       +237 -0    jakarta-jmeter/src/components/org/apache/jmeter/assertions/gui/XPathPanel.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/components/org/apache/jmeter/assertions/gui/XPathPanel.java.diff?r1=1.1&r2=1.2
  
  
  1.9       +5 -5      jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java.diff?r1=1.8&r2=1.9
  
  
  1.13      +3 -3      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.12&r2=1.13
  
  
  1.35      +8 -2      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.34&r2=1.35
  
  
  1.70      +3 -3      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.69&r2=1.70
  
  
  1.2       +180 -0    jakarta-jmeter/src/core/org/apache/jmeter/util/XPathUtil.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/util/XPathUtil.java.diff?r1=1.1&r2=1.2
  
  
  1.2       +177 -0    jakarta-jmeter/src/core/org/apache/jmeter/util/BeanShellInterpreter.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/util/BeanShellInterpreter.java.diff?r1=1.1&r2=1.2
  
  
  1.2       +12 -0     jakarta-jmeter/xdocs/images/screenshots/xpath_assertion.png
  
  	<<Binary file>>
  
  
  1.5       +13 -3     jakarta-jmeter/src/components/org/apache/jmeter/control/gui/ForeachControlPanel.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/components/org/apache/jmeter/control/gui/ForeachControlPanel.java.diff?r1=1.4&r2=1.5
  
  
  1.17      +2 -30     jakarta-jmeter/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/components/org/apache/jmeter/control/gui/ModuleControllerGui.java.diff?r1=1.16&r2=1.17
  
  
  1.2       +95 -0     jakarta-jmeter/src/components/org/apache/jmeter/control/gui/SwitchControllerGui.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/components/org/apache/jmeter/control/gui/SwitchControllerGui.java.diff?r1=1.1&r2=1.2
  
  
  1.14      +9 -3      jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java.diff?r1=1.13&r2=1.14
  
  
  1.26      +7 -7      jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParser.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParser.java.diff?r1=1.25&r2=1.26
  
  
  1.18      +8 -3      jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParserHTMLParser.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParserHTMLParser.java.diff?r1=1.17&r2=1.18
  
  
  1.9       +3 -3      jakarta-jmeter/src/core/org/apache/jmeter/testbeans/gui/PackageTest.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/testbeans/gui/PackageTest.java.diff?r1=1.8&r2=1.9
  
  
  1.27      +12 -5     jakarta-jmeter/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/threads/gui/ThreadGroupGui.java.diff?r1=1.26&r2=1.27
  
  
  1.103     +91 -9     jakarta-jmeter/xdocs/usermanual/component_reference.xml
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/xdocs/usermanual/component_reference.xml.diff?r1=1.102&r2=1.103
  
  
  1.18      +34 -2     jakarta-jmeter/xdocs/usermanual/functions.xml
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/xdocs/usermanual/functions.xml.diff?r1=1.17&r2=1.18
  
  
  1.27      +4 -3      jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Load.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Load.java.diff?r1=1.26&r2=1.27
  
  
  1.3       +3 -3      jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Close.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Close.java.diff?r1=1.2&r2=1.3
  
  
  1.13      +5 -5      jakarta-jmeter/src/core/org/apache/jmeter/gui/action/CheckDirty.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/CheckDirty.java.diff?r1=1.12&r2=1.13
  
  
  1.3       +2 -2      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.2&r2=1.3
  
  
  1.12      +2 -2      jakarta-jmeter/src/components/org/apache/jmeter/control/OnceOnlyController.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/components/org/apache/jmeter/control/OnceOnlyController.java.diff?r1=1.11&r2=1.12
  
  
  1.5       +37 -12    jakarta-jmeter/src/components/org/apache/jmeter/control/ForeachController.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/components/org/apache/jmeter/control/ForeachController.java.diff?r1=1.4&r2=1.5
  
  
  1.26      +3 -2      jakarta-jmeter/src/components/org/apache/jmeter/control/InterleaveControl.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/components/org/apache/jmeter/control/InterleaveControl.java.diff?r1=1.25&r2=1.26
  
  
  1.2       +279 -0    jakarta-jmeter/src/components/org/apache/jmeter/control/SwitchController.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/components/org/apache/jmeter/control/SwitchController.java.diff?r1=1.1&r2=1.2
  
  
  1.32      +50 -12    jakarta-jmeter/src/core/org/apache/jmeter/JMeter.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/JMeter.java.diff?r1=1.31&r2=1.32
  
  
  1.17      +8 -3      jakarta-jmeter/src/core/org/apache/jmeter/threads/ListenerNotifier.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/threads/ListenerNotifier.java.diff?r1=1.16&r2=1.17
  
  
  1.43      +18 -8     jakarta-jmeter/src/core/org/apache/jmeter/threads/TestCompiler.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/threads/TestCompiler.java.diff?r1=1.42&r2=1.43
  
  
  1.58      +56 -24    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.57&r2=1.58
  
  
  1.26      +3 -2      jakarta-jmeter/src/core/org/apache/jmeter/control/GenericController.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/control/GenericController.java.diff?r1=1.25&r2=1.26
  
  
  1.4       +214 -15   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.3&r2=1.4
  
  
  1.3       +34 -8     jakarta-jmeter/src/core/org/apache/jmeter/control/RunTime.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/control/RunTime.java.diff?r1=1.2&r2=1.3
  
  
  1.10      +4 -2      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.9&r2=1.10
  
  
  1.25      +3 -2      jakarta-jmeter/src/core/org/apache/jmeter/control/LoopController.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/control/LoopController.java.diff?r1=1.24&r2=1.25
  
  
  1.203     +7 -4      jakarta-jmeter/build.xml
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/build.xml.diff?r1=1.202&r2=1.203
  
  
  1.6       +8 -3      jakarta-jmeter/lib/jar_usage.txt
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/lib/jar_usage.txt.diff?r1=1.5&r2=1.6
  
  
  1.2       +49 -0     jakarta-jmeter/lib/LICENSE(jtidy).txt
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/lib/LICENSE(jtidy).txt.diff?r1=1.1&r2=1.2
  
  
  1.11      +23 -28    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.10&r2=1.11
  
  
  1.37      +16 -2     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.36&r2=1.37
  
  
  1.55      +14 -20    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.54&r2=1.55
  
  
  1.33      +27 -17    jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java.diff?r1=1.32&r2=1.33
  
  
  1.13      +5 -5      jakarta-jmeter/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java.diff?r1=1.12&r2=1.13
  
  
  1.19      +45 -1     jakarta-jmeter/xdocs/changes.xml
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/xdocs/changes.xml.diff?r1=1.18&r2=1.19
  
  
  1.12      +23 -3     jakarta-jmeter/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java.diff?r1=1.11&r2=1.12
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org