Commit Graph

4259 Commits

Author SHA1 Message Date
Sebastian Bazley 27568c1cbc Allow title to be provided for error messages
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@542615 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: f4e11abf62
2007-05-29 18:35:52 +00:00
Sebastian Bazley 64391560ab JMeter requires JVM 1.4+
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@541902 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: 46a2dcbe45
2007-05-26 15:14:34 +00:00
Sebastian Bazley 17954b0b1e Bug 41913 - TransactionController now creates samples as sub-samples of the transaction
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@541883 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: cf1c0dc659
2007-05-26 10:16:18 +00:00
Sebastian Bazley 7ed6a73463 Remove unused import
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@541881 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: 85cb254243
2007-05-26 09:54:07 +00:00
Sebastian Bazley 45928e568a TransactionSampler is not a real sampler
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@541880 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: 222a9db7b7
2007-05-26 09:51:07 +00:00
Sebastian Bazley 544965c740 Move Transaction Controller to core
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@541877 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: b1a69fd139
2007-05-26 09:12:04 +00:00
Sebastian Bazley 42fdafc342 Add accelerator (Ctrl+Shift+E) for clear
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@541794 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: 535203ca8a
2007-05-25 21:59:09 +00:00
Sebastian Bazley ffda0d65ad Clear the sample count
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@541782 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: b20b75c463
2007-05-25 21:07:44 +00:00
Sebastian Bazley 4a7a2b3928 Fix CLI long optional argument to require "=" (as for short options)
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@539898 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: 1785fbc5b2
2007-05-20 17:38:24 +00:00
Sebastian Bazley ad6a95d6dd Correct error in optional description
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@539809 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: 36c3bf38f0
2007-05-19 23:17:49 +00:00
Sebastian Bazley 80035d8e33 Functions are shared between threads, so setParameters() and execute() need to be synchronized if there are any class fields.
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@539807 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: 02db307750
2007-05-19 23:03:55 +00:00
Sebastian Bazley 644f594ca8 Functions are shared between threads, so setParameters() and execute() need to be synchronized if there are any class fields.
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@539777 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: b20adb8d26
2007-05-19 17:04:39 +00:00
Sebastian Bazley 6d8b5739bd Functions are shared between threads, so setParameters() and execute() need to be synchronized if there are any class fields.
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@539775 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: f15ab5e49c
2007-05-19 17:01:40 +00:00
Sebastian Bazley f44f5c6da5 New tests for constructor(boolean) and setFormatter()
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@539762 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: c8f4cc1f5b
2007-05-19 14:29:13 +00:00
Sebastian Bazley 9439d5459c Need to set printMilliseconds correctly
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@539761 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: cbaea5251b
2007-05-19 14:28:15 +00:00
Sebastian Bazley da0235f68e Improved loading of CSV log files:
- Listener config now used
- Header line used to determine format if possible
- log messages give field name and line number
- try simple date format if cannot parse milliseconds

git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@539749 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: 751fd1cfe6
2007-05-19 13:12:45 +00:00
Sebastian Bazley b6a76a6463 Allow setup of formatter by OldSaveService (CSV)
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@539748 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: 00a1b6aea2
2007-05-19 13:08:59 +00:00
Sebastian Bazley c81cd6aeff Use ISO format date
Use StringBuffer instead of multiple GUI element inserts

git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@539739 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: 298ffdcebe
2007-05-19 12:15:45 +00:00
Sebastian Bazley 3c6d03624a Implement readResolve for transient formatter
Add constructor for use by OldSaveService (and testing)

git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@539726 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: db4198f334
2007-05-19 10:34:17 +00:00
Sebastian Bazley 8d0654a3de Pass save configuration to CSV loader
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@539663 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: 77938eb17e
2007-05-19 01:27:19 +00:00
Sebastian Bazley c16d30b9c9 Remove unused field
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@539661 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: b8f7feeb18
2007-05-19 01:25:35 +00:00
Sebastian Bazley 66e198538d Only read timestamp if timestamp was saved
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@539655 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: 57bc67807d
2007-05-19 01:15:41 +00:00
Sebastian Bazley 872bc0c7ba Only write timestamp heading if timestamp is saved
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@539652 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: 8b5a73e38c
2007-05-19 01:11:45 +00:00
Sebastian Bazley 73f569674b Fix saveservice values to correspond with defaults
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@539649 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: ecde49b402
2007-05-19 00:36:44 +00:00
Sebastian Bazley fdca029d56 Log which field was being parsed when an error is detected
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@539646 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: 03b6a8ad7f
2007-05-19 00:07:19 +00:00
Sebastian Bazley 98d6178697 Improved error handling
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@539644 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: 2891bf2c4e
2007-05-19 00:05:37 +00:00
Sebastian Bazley 345c1502dd Revert to parameterless -r option as the change could break some command files; add -R option with parameter instead.
Fix JMeterHome path check to avoid the need to generate URLS

git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@539549 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: 755948b997
2007-05-18 18:32:35 +00:00
Sebastian Bazley 33708f2119 Better representation of TEXT options
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@539546 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: 7870b1745a
2007-05-18 18:16:36 +00:00
Sebastian Bazley f21d6b025f Fix clone() methods; add serialversionid
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@538379 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: f81702aa1c
2007-05-15 23:19:07 +00:00
Sebastian Bazley ad062f8da8 Bug 42379 - GUI JUnit tests fails when test are executed in non-English Locale
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@537665 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: aa00c515f0
2007-05-13 22:16:36 +00:00
Sebastian Bazley ccff06f3ac Bug 24684 - remote startup problems if spaces in the path of the jmeter
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@537663 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: 797cf35b85
2007-05-13 22:05:45 +00:00
Sebastian Bazley f0b8bf98aa Bug 40851 - Loop controller with 0 iterations, stops evaluating the iterations field
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@537660 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: fd1b0bea4d
2007-05-13 21:17:14 +00:00
Sebastian Bazley 7916570d42 Bug 25441 - TestPlan changes sometimes detected incorrectly (isDirty)
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@536710 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: 986530c487
2007-05-09 23:24:40 +00:00
Sebastian Bazley e8fb442302 Bug 42346 (patch 20143) - Objects that doesn´t save changes
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@536372 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: ecb301a263
2007-05-08 23:04:47 +00:00
Sebastian Bazley f3f823782f Minor docn fix
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@535921 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: 796007bb1b
2007-05-07 16:38:07 +00:00
Sebastian Bazley 266269d5d4 Bug 39734 - Listeners shared after copy/paste operation
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@535913 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: 5cdef8a87f
2007-05-07 15:57:47 +00:00
Sebastian Bazley 5a63623c5a Allow user to cancel out of Close dialogue
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@535905 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: 7fad70e2be
2007-05-07 15:33:51 +00:00
Sebastian Bazley 8cc5c70997 Update comments; add NLS marker
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@535893 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: 50371072a8
2007-05-07 15:13:34 +00:00
Sebastian Bazley 4a84406797 Bug 25441 - TestPlan changes sometimes detected incorrectly (isDirty)
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@535891 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: d4bac6c0f0
2007-05-07 15:10:46 +00:00
Sebastian Bazley e5cc4d345c Bug 40027 - small typo in Junit sampler documentation
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@535881 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: 5a3359d7c2
2007-05-07 14:24:09 +00:00
Sebastian Bazley 90b049500c Add NLS markers
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@535575 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: 9c4460de60
2007-05-05 23:43:53 +00:00
Sebastian Bazley 073401cd73 Add NLS markers; extract string constants and general tidy up
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@535574 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: 837a232529
2007-05-05 23:40:43 +00:00
Sebastian Bazley 2574d6b1dc Add some Function resources
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@535571 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: 4e3eab5136
2007-05-05 23:16:40 +00:00
Sebastian Bazley eef8f08274 Fix GUI alignment
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@535563 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: 6fb17a5ca9
2007-05-05 20:57:50 +00:00
Sebastian Bazley 1a0300c811 Not used
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@535550 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: 00e1eb1319
2007-05-05 17:35:38 +00:00
Sebastian Bazley 5c082d6875 Fix GUI layout problems
Add NLS markers where appropriate

git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@535538 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: 92889407ae
2007-05-05 15:08:46 +00:00
Sebastian Bazley 43e8162324 Add NLS markers
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@535537 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: e7987ae046
2007-05-05 15:03:33 +00:00
Sebastian Bazley a1fc20461c Does not appear to be used
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@535522 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: 8630533e4e
2007-05-05 13:46:03 +00:00
Sebastian Bazley d74f3b61a8 Remove deprecated methods; remove duplicate output in toString()
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@535426 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: a8fbb48886
2007-05-05 00:34:07 +00:00
Sebastian Bazley fc50d50e9f Fixup description for optional parameters
git-svn-id: https://svn.apache.org/repos/asf/jakarta/jmeter/branches/rel-2-2@535425 13f79535-47bb-0310-9956-ffa450edef68

Former-commit-id: 7bd850ecef
2007-05-05 00:31:54 +00:00