mstover1    2004/06/19 17:32:53

  Modified:    .        NOTICE build.xml
               bin/testfiles AssertionTestPlan.jmx AuthManagerTestPlan.jmx
                        GuiTest.jmx HeaderManagerTestPlan.jmx
                        InterleaveTestPlan.jmx InterleaveTestPlan2.jmx
                        LoopTestPlan.jmx Modification Manager.jmx
                        OnceOnlyTestPlan.jmx ProxyServerTestPlan.jmx
                        SimpleTestPlan.jmx proxy.jmx
               src/components/org/apache/jmeter/assertions
                        BeanShellAssertion.java ResponseAssertion.java
               src/core/org/apache/jmeter JMeter.java
               src/core/org/apache/jmeter/control GenericController.java
                        LoopController.java
               src/core/org/apache/jmeter/gui/action Load.java Save.java
               src/core/org/apache/jmeter/junit JMeterTest.java
               src/core/org/apache/jmeter/reporters
                        AbstractListenerElement.java ResultCollector.java
               src/core/org/apache/jmeter/save SaveService.java
               src/core/org/apache/jmeter/testelement
                        AbstractTestElement.java TestPlan.java
               src/core/org/apache/jmeter/testelement/property
                        AbstractProperty.java BooleanProperty.java
                        CollectionProperty.java MapProperty.java
                        StringProperty.java TestElementProperty.java
               src/core/org/apache/jmeter/util JMeterVersion.java
               src/protocol/http/org/apache/jmeter/protocol/http/control
                        CookieManager.java
               src/protocol/http/org/apache/jmeter/protocol/http/modifier
                        AnchorModifier.java
               src/protocol/java/org/apache/jmeter/protocol/java/sampler
                        BSFSampler.java BeanShellSampler.java
               src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config
                        DataSourceElement.java
  Added:       lib      LICENSE(XPP3).txt LICENSE(XStream).txt
                        xpp3-1.1.3.4.D.jar xstream-1.0.1.jar
               src/core/org/apache/jmeter/save OldSaveService.java
                        ScriptWrapper.java ScriptWrapperConverter.java
               src/core/org/apache/jmeter/save/converters
                        BooleanPropertyConverter.java
                        HashTreeConverter.java
                        IntegerPropertyConverter.java
                        LongPropertyConverter.java
                        MultiPropertyConverter.java
                        SampleResultConverter.java
                        StringPropertyConverter.java
                        TestElementConverter.java
                        TestElementPropertyConverter.java
               test/src/org/apache/jmeter/gui/action TestLoad.java
               test/src/org/apache/jmeter/save TestSaveService.java
  Log:
  New XStream implementation for saving test plans
  
  Revision  Changes    Path
  1.7       +9 -0      jakarta-jmeter/NOTICE
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/NOTICE.diff?r1=1.6&r2=1.7
  
  
  1.185     +28 -3     jakarta-jmeter/build.xml
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/build.xml.diff?r1=1.184&r2=1.185
  
  
  1.7       +106 -95   jakarta-jmeter/bin/testfiles/AssertionTestPlan.jmx
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/bin/testfiles/AssertionTestPlan.jmx.diff?r1=1.6&r2=1.7
  
  
  1.6       +169 -156  jakarta-jmeter/bin/testfiles/AuthManagerTestPlan.jmx
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/bin/testfiles/AuthManagerTestPlan.jmx.diff?r1=1.5&r2=1.6
  
  
  1.9       +1030 -1056jakarta-jmeter/bin/testfiles/GuiTest.jmx
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/bin/testfiles/GuiTest.jmx.diff?r1=1.8&r2=1.9
  
  
  1.6       +96 -86    jakarta-jmeter/bin/testfiles/HeaderManagerTestPlan.jmx
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/bin/testfiles/HeaderManagerTestPlan.jmx.diff?r1=1.5&r2=1.6
  
  
  1.6       +164 -150  jakarta-jmeter/bin/testfiles/InterleaveTestPlan.jmx
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/bin/testfiles/InterleaveTestPlan.jmx.diff?r1=1.5&r2=1.6
  
  
  1.6       +209 -194  jakarta-jmeter/bin/testfiles/InterleaveTestPlan2.jmx
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/bin/testfiles/InterleaveTestPlan2.jmx.diff?r1=1.5&r2=1.6
  
  
  1.6       +138 -126  jakarta-jmeter/bin/testfiles/LoopTestPlan.jmx
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/bin/testfiles/LoopTestPlan.jmx.diff?r1=1.5&r2=1.6
  
  
  No                   revision
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/bin/testfiles/LoopTestPlan.jmx.diff?r1=1.5&r2=1.6
  
  
  No                   revision
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/bin/testfiles/LoopTestPlan.jmx.diff?r1=1.5&r2=1.6
  
  
  1.6       +136 -123  jakarta-jmeter/bin/testfiles/OnceOnlyTestPlan.jmx
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/bin/testfiles/OnceOnlyTestPlan.jmx.diff?r1=1.5&r2=1.6
  
  
  1.6       +63 -54    jakarta-jmeter/bin/testfiles/ProxyServerTestPlan.jmx
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/bin/testfiles/ProxyServerTestPlan.jmx.diff?r1=1.5&r2=1.6
  
  
  1.6       +198 -184  jakarta-jmeter/bin/testfiles/SimpleTestPlan.jmx
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/bin/testfiles/SimpleTestPlan.jmx.diff?r1=1.5&r2=1.6
  
  
  1.5       +73 -63    jakarta-jmeter/bin/testfiles/proxy.jmx
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/bin/testfiles/proxy.jmx.diff?r1=1.4&r2=1.5
  
  
  1.1                  jakarta-jmeter/lib/LICENSE(XPP3).txt
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/lib/LICENSE(XPP3).txt?rev=1.1
  
  
  1.1                  jakarta-jmeter/lib/LICENSE(XStream).txt
  
  http://cvs.apache.org/viewcvs/jakarta-jmeter/lib/LICENSE(XStream).txt?rev=1.1
  
  
  1.1                  jakarta-jmeter/lib/xpp3-1.1.3.4.D.jar
  
        <<Binary file>>
  
  
  1.1                  jakarta-jmeter/lib/xstream-1.0.1.jar
  
        <<Binary file>>
  
  
  1.6       +1 -1      
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.5&r2=1.6
  
  
  1.19      +1 -1      
jakarta-jmeter/src/components/org/apache/jmeter/assertions/ResponseAssertion.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/components/org/apache/jmeter/assertions/ResponseAssertion.java.diff?r1=1.18&r2=1.19
  
  
  1.30      +2 -2      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.29&r2=1.30
  
  
  1.24      +7 -7      
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.23&r2=1.24
  
  
  1.24      +3 -3      
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.23&r2=1.24
  
  
  1.24      +7 -150    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.23&r2=1.24
  
  
  1.23      +8 -8      jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Save.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/action/Save.java.diff?r1=1.22&r2=1.23
  
  
  1.57      +5 -6      jakarta-jmeter/src/core/org/apache/jmeter/junit/JMeterTest.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/junit/JMeterTest.java.diff?r1=1.56&r2=1.57
  
  
  1.4       +3 -3      
jakarta-jmeter/src/core/org/apache/jmeter/reporters/AbstractListenerElement.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/reporters/AbstractListenerElement.java.diff?r1=1.3&r2=1.4
  
  
  1.37      +14 -14    
jakarta-jmeter/src/core/org/apache/jmeter/reporters/ResultCollector.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/reporters/ResultCollector.java.diff?r1=1.36&r2=1.37
  
  
  1.39      +76 -1218  jakarta-jmeter/src/core/org/apache/jmeter/save/SaveService.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/save/SaveService.java.diff?r1=1.38&r2=1.39
  
  
  1.1                  
jakarta-jmeter/src/core/org/apache/jmeter/save/OldSaveService.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/save/OldSaveService.java?rev=1.1
  
  
  1.1                  
jakarta-jmeter/src/core/org/apache/jmeter/save/ScriptWrapper.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/save/ScriptWrapper.java?rev=1.1
  
  
  1.1                  
jakarta-jmeter/src/core/org/apache/jmeter/save/ScriptWrapperConverter.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/save/ScriptWrapperConverter.java?rev=1.1
  
  
  1.1                  
jakarta-jmeter/src/core/org/apache/jmeter/save/converters/BooleanPropertyConverter.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/save/converters/BooleanPropertyConverter.java?rev=1.1
  
  
  1.1                  
jakarta-jmeter/src/core/org/apache/jmeter/save/converters/HashTreeConverter.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/save/converters/HashTreeConverter.java?rev=1.1
  
  
  1.1                  
jakarta-jmeter/src/core/org/apache/jmeter/save/converters/IntegerPropertyConverter.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/save/converters/IntegerPropertyConverter.java?rev=1.1
  
  
  1.1                  
jakarta-jmeter/src/core/org/apache/jmeter/save/converters/LongPropertyConverter.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/save/converters/LongPropertyConverter.java?rev=1.1
  
  
  1.1                  
jakarta-jmeter/src/core/org/apache/jmeter/save/converters/MultiPropertyConverter.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/save/converters/MultiPropertyConverter.java?rev=1.1
  
  
  1.1                  
jakarta-jmeter/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java?rev=1.1
  
  
  1.1                  
jakarta-jmeter/src/core/org/apache/jmeter/save/converters/StringPropertyConverter.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/save/converters/StringPropertyConverter.java?rev=1.1
  
  
  1.1                  
jakarta-jmeter/src/core/org/apache/jmeter/save/converters/TestElementConverter.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/save/converters/TestElementConverter.java?rev=1.1
  
  
  1.1                  
jakarta-jmeter/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java?rev=1.1
  
  
  1.39      +4 -4      
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.38&r2=1.39
  
  
  1.12      +4 -4      
jakarta-jmeter/src/core/org/apache/jmeter/testelement/TestPlan.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/testelement/TestPlan.java.diff?r1=1.11&r2=1.12
  
  
  1.21      +4 -4      
jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java.diff?r1=1.20&r2=1.21
  
  
  1.10      +3 -3      
jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/BooleanProperty.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/BooleanProperty.java.diff?r1=1.9&r2=1.10
  
  
  1.15      +4 -4      
jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/CollectionProperty.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/CollectionProperty.java.diff?r1=1.14&r2=1.15
  
  
  1.15      +3 -3      
jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/MapProperty.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/MapProperty.java.diff?r1=1.14&r2=1.15
  
  
  1.11      +3 -3      
jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/StringProperty.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/StringProperty.java.diff?r1=1.10&r2=1.11
  
  
  1.16      +3 -3      
jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/TestElementProperty.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/core/org/apache/jmeter/testelement/property/TestElementProperty.java.diff?r1=1.15&r2=1.16
  
  
  1.23      +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.22&r2=1.23
  
  
  1.28      +3 -3      
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.27&r2=1.28
  
  
  1.15      +4 -4      
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.14&r2=1.15
  
  
  1.9       +3 -3      
jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BSFSampler.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/sampler/BSFSampler.java.diff?r1=1.8&r2=1.9
  
  
  1.7       +3 -3      
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.6&r2=1.7
  
  
  1.3       +2 -2      
jakarta-jmeter/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java.diff?r1=1.2&r2=1.3
  
  
  1.1                  
jakarta-jmeter/test/src/org/apache/jmeter/gui/action/TestLoad.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/test/src/org/apache/jmeter/gui/action/TestLoad.java?rev=1.1
  
  
  1.1                  
jakarta-jmeter/test/src/org/apache/jmeter/save/TestSaveService.java
  
  
http://cvs.apache.org/viewcvs/jakarta-jmeter/test/src/org/apache/jmeter/save/TestSaveService.java?rev=1.1
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to