svn commit: r897504 - in /jakarta/jmeter/trunk: build.xml xdocs/changes.xml
Author: sebb
Date: Sat Jan 9 18:05:47 2010
New Revision: 897504
URL: http://svn.apache.org/viewvc?rev=897504view=rev
Log:
Bug 48136 - Essential files missing from source tarball.
Modified:
jakarta/jmeter/trunk/build.xml
jakarta/jmeter/trunk/xdocs/changes.xml
Modified: jakarta/jmeter/trunk/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/build.xml?rev=897504r1=897503r2=897504view=diff
==
--- jakarta/jmeter/trunk/build.xml (original)
+++ jakarta/jmeter/trunk/build.xml Sat Jan 9 18:05:47 2010
@@ -286,7 +286,7 @@
property name=encoding value=UTF-8/
!-- 3rd party libraries to be included in the binary distribution --
- property file=build.properties/
+ property file=build.properties/ !-- defines the library version numbers
--
patternset id=external.jars.notices
include name=LICENSE/
@@ -964,11 +964,9 @@
/jar
/target
- !-- list of files needed for a binary distribution (excluding library
files) --
- patternset id=dist.binaries.native
-include name=LICENSE/
-include name=NOTICE/
-include name=README/
+ !-- lists of files needed for a binary distribution (excluding library
files) --
+ !-- Source files also needed at runtime --
+ patternset id=dist.common.native
include name=${dest.jar.jmeter}/BeanShell*.bshrc/
include name=${dest.jar.jmeter}/log4j.conf/
include name=${dest.jar.jmeter}/logkit.xml/
@@ -984,43 +982,58 @@
!-- Exclude any files that might be present from testing the release --
exclude name=${dest.jar.jmeter}/*.log/
include name=${dest.jar.jmeter}/examples/**/
- !-- JMX files are in the non-native section --
+!-- JMX files are in the non-native section --
exclude name=${dest.jar.jmeter}/examples/*.jmx/
-include name=${dest.printable_docs}/**/
-!-- Binary file types --
-exclude name=${dest.printable_docs}/**/*.pdf/
-exclude name=${dest.printable_docs}/**/*.jmx/
include name=${extras.dir}/**/
- !-- Binary file types --
+!-- Binary file types --
exclude name=${extras.dir}/*.jar/
exclude name=${extras.dir}/*.jpg/
exclude name=${extras.dir}/*.jmx/
/patternset
-
- patternset id=dist.binaries.non.native
-!-- We also need the css images for the printable docs --
+
+ patternset id=dist.binaries.native
+include name=LICENSE/
+include name=NOTICE/
+include name=README/
+ patternset refid=dist.common.native/
+ !-- Help documentation --
+include name=${dest.printable_docs}/**/
+!-- Binary file types --
+exclude name=${dest.printable_docs}/**/*.pdf/
+exclude name=${dest.printable_docs}/**/*.jmx/
+!-- We also need the shared CSS for the printable docs --
include name=${dest.docs}/css/**/
-include name=${dest.docs}/images/**/
+ /patternset
+
+ !-- Source files also needed at runtime --
+ patternset id=dist.common.non.native
include name=${dest.jar.jmeter}/jmeter*/
exclude name=${dest.jar.jmeter}/jmeter.properties/
include name=${dest.jar.jmeter}/mirror-server.*/
include name=${dest.jar.jmeter}/shutdown.*/
include name=${dest.jar.jmeter}/stoptest.*/
- !-- Fake SSL cert for JMeter proxy recorder in https --
- include name=${dest.jar.jmeter}/proxyserver.jks/
+!-- Fake SSL cert for JMeter proxy recorder in https --
+include name=${dest.jar.jmeter}/proxyserver.jks/
!-- Exclude any files that might be present from testing the release --
exclude name=${dest.jar.jmeter}/*.log/
+include name=${dest.jar.jmeter}/examples/*.jmx/
+include name=${extras.dir}/*.jar/
+include name=${extras.dir}/*.jpg/
+include name=${extras.dir}/*.jmx/
+ /patternset
+
+ patternset id=dist.binaries.non.native
+patternset refid=dist.common.non.native/
include name=${dest.jar}//
include name=${lib.dir}/bshclient.jar/
include name=${lib.dir}/jorphan.jar/
include name=${lib.dir}/junit/test.jar/
include name=${dest.jar.jmeter}/ApacheJMeter.jar/
-include name=${dest.jar.jmeter}/examples/*.jmx/
+ !-- Help documentation, binary files --
include name=${dest.printable_docs}/**/*.pdf/
include name=${dest.printable_docs}/**/*.jmx/
-include name=${extras.dir}/*.jar/
-include name=${extras.dir}/*.jpg/
-include name=${extras.dir}/*.jmx/
+!-- We also need the shared images for the printable docs --
+include name=${dest.docs}/images/**/
/patternset
!--
@@ -1031,6 +1044,11 @@
value=${dest.jar.jmeter}/jmeter ${dest.jar.jmeter}/jmeter-server
${dest.jar.jmeter}/*.sh/
!-- List of files in source distribution that are eol=native --
+ !--
+ N.B. dist.sources[.non].native sets exclude source files present in
dist.binaries[.non].native
+ so that the nightly build src archive does not duplicate stuff in the binary
archive
+ (This may change, as the overlap does not waste much space
svn commit: r897507 - /jakarta/jmeter/trunk/README
Author: sebb Date: Sat Jan 9 18:18:37 2010 New Revision: 897507 URL: http://svn.apache.org/viewvc?rev=897507view=rev Log: Tweaks Modified: jakarta/jmeter/trunk/README Modified: jakarta/jmeter/trunk/README URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/README?rev=897507r1=897506r2=897507view=diff == --- jakarta/jmeter/trunk/README (original) +++ jakarta/jmeter/trunk/README Sat Jan 9 18:18:37 2010 @@ -22,7 +22,7 @@ o Java Interpreter: - A fully compliant Java 1.4 (or later) Runtime Environment is required + A fully compliant Java 1.5 (or later) Runtime Environment is required for Apache JMeter to execute. o Optional jars: @@ -71,16 +71,20 @@ Build instructions -- - Please note: - To avoid unnecessary duplication, the source archives do not contain - the source files which are needed to run JMeter (for example properties files and scripts). - - Release builds - Unpack both the binary and source archives into the same directory structure. + Unpack the source archive into a suitable directory structure. + The 3rd party library files can either be extracted from the binary archive by unpacking it + into the same directory structure, or you can use Ant to download the files: + + ant download_jars - Nightly builds Unpack the _src, _bin and _lib archives into the same directory structure. - + + Please note: + To avoid unnecessary duplication, the nightly source archives do not contain + the source files which are needed to run JMeter (for example properties files and scripts). + Any optional jars (see above) should be placed in lib/opt and/or lib. Jars in lib/opt will be used for building JMeter and running the unit test, but won't be used at run-time. @@ -91,6 +95,8 @@ Change to the top-level directory and issue the command: + ant download_jars - if necessary + ant This will compile the application and enable you to run jmeter from the bin - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r897514 - in /jakarta/jmeter/trunk/bin: shutdown.sh stoptest.sh
Author: sebb Date: Sat Jan 9 18:31:43 2010 New Revision: 897514 URL: http://svn.apache.org/viewvc?rev=897514view=rev Log: Wrong EOL type Modified: jakarta/jmeter/trunk/bin/shutdown.sh (props changed) jakarta/jmeter/trunk/bin/stoptest.sh (props changed) Propchange: jakarta/jmeter/trunk/bin/shutdown.sh -- --- svn:eol-style (original) +++ svn:eol-style Sat Jan 9 18:31:43 2010 @@ -1 +1 @@ -native +LF Propchange: jakarta/jmeter/trunk/bin/stoptest.sh -- --- svn:eol-style (original) +++ svn:eol-style Sat Jan 9 18:31:43 2010 @@ -1 +1 @@ -native +LF - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r897543 - /jakarta/jmeter/trunk/build.xml
Author: sebb
Date: Sat Jan 9 21:04:04 2010
New Revision: 897543
URL: http://svn.apache.org/viewvc?rev=897543view=rev
Log:
Drop remaining jars from source archive
Modified:
jakarta/jmeter/trunk/build.xml
Modified: jakarta/jmeter/trunk/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/build.xml?rev=897543r1=897542r2=897543view=diff
==
--- jakarta/jmeter/trunk/build.xml (original)
+++ jakarta/jmeter/trunk/build.xml Sat Jan 9 21:04:04 2010
@@ -1086,8 +1086,6 @@
!-- Non-native items --
patternset id=dist.sources.non.native
-include name=${lib.doc}/${velocity.jar}/
-include name=${lib.api}/*.jar/
include name=${src.dir}/**/*.gif/
include name=${src.dir}/**/*.jpg/
include name=${src.dir}/**/*.png/
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r897546 - in /jakarta/jmeter/trunk: ./ lib/ src/components/org/apache/jmeter/assertions/ src/core/org/apache/jmeter/util/ src/protocol/http/org/apache/jmeter/protocol/http/parser/ xdocs/
Author: sebb Date: Sat Jan 9 21:09:02 2010 New Revision: 897546 URL: http://svn.apache.org/viewvc?rev=897546view=rev Log: Update JTidy to r938, which is compatible with Java 1.5 Modified: jakarta/jmeter/trunk/build.properties jakarta/jmeter/trunk/eclipse.classpath jakarta/jmeter/trunk/lib/ (props changed) jakarta/jmeter/trunk/lib/aareadme.txt jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/HTMLAssertion.java jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/XPathUtil.java jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java jakarta/jmeter/trunk/xdocs/changes.xml Modified: jakarta/jmeter/trunk/build.properties URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/build.properties?rev=897546r1=897545r2=897546view=diff == --- jakarta/jmeter/trunk/build.properties (original) +++ jakarta/jmeter/trunk/build.properties Sat Jan 9 21:09:02 2010 @@ -139,15 +139,9 @@ soap.loc= http://repo1.maven.org/maven2/soap/soap/2.3.1 soap.md5= AA1845E01FEE94FE4A63BBCAA55AD486 -tidy.jar= Tidy.jar -tidy.md5= 7256D79D8BA656A791926378E4ECF608 - -# Unfortunately, the r820 release requires Java 1.6 (though it builds fine with Java 1.4) -# Cannot find a download for Java 1.5+ compatible version of tidy -#tidy.jar= jtidy-r820.jar -# Note: the trailing ? is a hack to ignore the appended jar name -#tidy.loc= http://sourceforge.net/projects/jtidy/files/JTidy/r820/jtidy-r820.jar/download? -#tidy.md5= 6BBE8D9E4A75A201754FC831CFCB177A +tidy.jar= jtidy-r938.jar +tidy.loc= http://downloads.sourceforge.net/project/jtidy/JTidy/r938 +tidy.md5= 0270AA6F887C1E3EF48F102439708DFC # XStream can be found at: http://xstream.codehaus.org/ xstream.jar = xstream-1.3.1.jar Modified: jakarta/jmeter/trunk/eclipse.classpath URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/eclipse.classpath?rev=897546r1=897545r2=897546view=diff == --- jakarta/jmeter/trunk/eclipse.classpath (original) +++ jakarta/jmeter/trunk/eclipse.classpath Sat Jan 9 21:09:02 2010 @@ -42,12 +42,12 @@ classpathentry kind=lib path=lib/jCharts-0.7.5.jar/ classpathentry kind=lib path=lib/jdom-1.1.jar/ classpathentry kind=lib path=lib/js-1.6R5.jar/ +classpathentry kind=lib path=lib/jtidy-r938.jar/ classpathentry kind=lib path=lib/junit-4.7.jar/ classpathentry kind=lib path=lib/logkit-2.0.jar/ classpathentry kind=lib path=lib/oro-2.0.8.jar/ classpathentry kind=lib path=lib/serializer-2.7.1.jar/ classpathentry kind=lib path=lib/soap-2.3.1.jar/ - classpathentry kind=lib path=lib/Tidy.jar/ classpathentry kind=lib path=lib/xalan-2.7.1.jar/ classpathentry kind=lib path=lib/xercesImpl-2.9.1.jar/ classpathentry kind=lib path=lib/xml-apis-1.3.04.jar/ Propchange: jakarta/jmeter/trunk/lib/ -- --- svn:ignore (original) +++ svn:ignore Sat Jan 9 21:09:02 2010 @@ -38,3 +38,4 @@ xmlgraphics-commons-1.3.1.jar xpp3_min-1.1.4c.jar bsf-api-3.0.jar +jtidy-r*.jar Modified: jakarta/jmeter/trunk/lib/aareadme.txt URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/lib/aareadme.txt?rev=897546r1=897545r2=897546view=diff == --- jakarta/jmeter/trunk/lib/aareadme.txt (original) +++ jakarta/jmeter/trunk/lib/aareadme.txt Sat Jan 9 21:09:02 2010 @@ -121,7 +121,7 @@ -- - WebServiceSampler ONLY -Tidy +jTidy-r938 - http: various modules for parsing html - org.xml.sax - various Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/HTMLAssertion.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/HTMLAssertion.java?rev=897546r1=897545r2=897546view=diff == --- jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/HTMLAssertion.java (original) +++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/HTMLAssertion.java Sat Jan 9 21:09:02 2010 @@ -98,7 +98,8 @@ log.debug(xml mode: + isXML()); } tidy = new Tidy(); -tidy.setCharEncoding(org.w3c.tidy.Configuration.UTF8); +tidy.setInputEncoding(UTF8); +tidy.setOutputEncoding(UTF8); tidy.setQuiet(false); tidy.setShowWarnings(true
svn commit: r897548 - /jakarta/jmeter/trunk/lib/Tidy.jar
Author: sebb Date: Sat Jan 9 21:11:05 2010 New Revision: 897548 URL: http://svn.apache.org/viewvc?rev=897548view=rev Log: Delete original Tidy jar Removed: jakarta/jmeter/trunk/lib/Tidy.jar - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r897552 - in /jakarta/jmeter/trunk: README build.xml
Author: sebb Date: Sat Jan 9 21:21:33 2010 New Revision: 897552 URL: http://svn.apache.org/viewvc?rev=897552view=rev Log: Tweak docn re: jars downloads Modified: jakarta/jmeter/trunk/README jakarta/jmeter/trunk/build.xml Modified: jakarta/jmeter/trunk/README URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/README?rev=897552r1=897551r2=897552view=diff == --- jakarta/jmeter/trunk/README (original) +++ jakarta/jmeter/trunk/README Sat Jan 9 21:21:33 2010 @@ -73,8 +73,9 @@ - Release builds Unpack the source archive into a suitable directory structure. - The 3rd party library files can either be extracted from the binary archive by unpacking it - into the same directory structure, or you can use Ant to download the files: + Most of the 3rd party library files can be extracted from the binary archive by unpacking it + into the same directory structure. + You can use Ant to download any missing files: ant download_jars @@ -95,7 +96,7 @@ Change to the top-level directory and issue the command: - ant download_jars - if necessary + ant download_jars ! only needs to be done once; will download any missing 3rd party jars ant Modified: jakarta/jmeter/trunk/build.xml URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/build.xml?rev=897552r1=897551r2=897552view=diff == --- jakarta/jmeter/trunk/build.xml (original) +++ jakarta/jmeter/trunk/build.xml Sat Jan 9 21:21:33 2010 @@ -947,8 +947,8 @@ target name=_message_3rdParty unless=3rdparty.present echoCannot find all the required 3rd party libraries./echo -echoIf building from a release, you need both source and binary archives./echo -echoIf building from SVN, use ant download_jars to download them./echo +echoIf building from a release, you can get most of them from the binary archive./echo +echoUse ant download_jars to download any missing jars./echo fail message=Cannot find required classes/ /target - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r896291 - /jakarta/jmeter/trunk/NOTICE
Author: sebb Date: Wed Jan 6 00:49:33 2010 New Revision: 896291 URL: http://svn.apache.org/viewvc?rev=896291view=rev Log: New Year Modified: jakarta/jmeter/trunk/NOTICE Modified: jakarta/jmeter/trunk/NOTICE URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/NOTICE?rev=896291r1=896290r2=896291view=diff == --- jakarta/jmeter/trunk/NOTICE (original) +++ jakarta/jmeter/trunk/NOTICE Wed Jan 6 00:49:33 2010 @@ -1,5 +1,5 @@ Apache JMeter -Copyright 1998-2009 The Apache Software Foundation +Copyright 1998-2010 The Apache Software Foundation This product includes software developed at The Apache Software Foundation (http://www.apache.org/). - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r895308 - in /jakarta/bsf/trunk: docs/bsfnews.html xdocs/bsfnews.xml
Author: sebb Date: Sat Jan 2 23:17:44 2010 New Revision: 895308 URL: http://svn.apache.org/viewvc?rev=895308view=rev Log: BSF-27 - BSF Project News should acknowledge 3.0 FINAL release Modified: jakarta/bsf/trunk/docs/bsfnews.html jakarta/bsf/trunk/xdocs/bsfnews.xml Modified: jakarta/bsf/trunk/docs/bsfnews.html URL: http://svn.apache.org/viewvc/jakarta/bsf/trunk/docs/bsfnews.html?rev=895308r1=895307r2=895308view=diff == --- jakarta/bsf/trunk/docs/bsfnews.html (original) +++ jakarta/bsf/trunk/docs/bsfnews.html Sat Jan 2 23:17:44 2010 @@ -110,6 +110,24 @@ table border=0 cellspacing=0 cellpadding=2 width=100% trtd bgcolor=#525D76 font color=#ff face=arial,helvetica,sanserif +a name=BSF 3.0strongBSF 3.0/strong/a + /font +/td/tr +trtd + blockquote +h3October 9th 2009 - BSF 3.0 Final Release Available/h3 +p + The release of BSF 3.0 Final is now available for + a href=http://jakarta.apache.org/site/downloads/downloads_bsf.cgi; + download/a. If you have any feedback on this release, feel free to + join the discussion on the bsf-dev and bsf-user mailing lists. +/p +/blockquote +/td/tr + /table +table border=0 cellspacing=0 cellpadding=2 width=100% +trtd bgcolor=#525D76 + font color=#ff face=arial,helvetica,sanserif a name=BSF 3.0 Beta 3strongBSF 3.0 Beta 3/strong/a /font /td/tr Modified: jakarta/bsf/trunk/xdocs/bsfnews.xml URL: http://svn.apache.org/viewvc/jakarta/bsf/trunk/xdocs/bsfnews.xml?rev=895308r1=895307r2=895308view=diff == --- jakarta/bsf/trunk/xdocs/bsfnews.xml (original) +++ jakarta/bsf/trunk/xdocs/bsfnews.xml Sat Jan 2 23:17:44 2010 @@ -25,6 +25,16 @@ /properties body + section name=BSF 3.0 +h3October 9th 2009 - BSF 3.0 Final Release Available/h3 +p + The release of BSF 3.0 Final is now available for + a href=http://jakarta.apache.org/site/downloads/downloads_bsf.cgi; + download/a. If you have any feedback on this release, feel free to + join the discussion on the bsf-dev and bsf-user mailing lists. +/p + /section + section name=BSF 3.0 Beta 3 h3April 5th 2009 - BSF 3.0 Beta3 Release Available/h3 p - To unsubscribe, e-mail: bsf-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: bsf-dev-h...@jakarta.apache.org
svn commit: r895312 - in /jakarta/bsf/trunk: docs/bsfnews.html docs/faq.html docs/index.html docs/manual.html docs/problems.html docs/projects.html docs/resources.html xdocs/stylesheets/project.xml
Author: sebb Date: Sat Jan 2 23:36:00 2010 New Revision: 895312 URL: http://svn.apache.org/viewvc?rev=895312view=rev Log: BSF-26 - Remaining link to Bugzilla on home page Modified: jakarta/bsf/trunk/docs/bsfnews.html jakarta/bsf/trunk/docs/faq.html jakarta/bsf/trunk/docs/index.html jakarta/bsf/trunk/docs/manual.html jakarta/bsf/trunk/docs/problems.html jakarta/bsf/trunk/docs/projects.html jakarta/bsf/trunk/docs/resources.html jakarta/bsf/trunk/xdocs/stylesheets/project.xml Modified: jakarta/bsf/trunk/docs/bsfnews.html URL: http://svn.apache.org/viewvc/jakarta/bsf/trunk/docs/bsfnews.html?rev=895312r1=895311r2=895312view=diff == --- jakarta/bsf/trunk/docs/bsfnews.html (original) +++ jakarta/bsf/trunk/docs/bsfnews.html Sat Jan 2 23:36:00 2010 @@ -98,11 +98,9 @@ /li li a href=http://jakarta.apache.org/site/library.html;Reference Library/a /li - li a href=http://issues.apache.org/bugzilla/enter_bug.cgi?product=BSF;Bug Database/a + li a href=http://issues.apache.org/jira/browse/BSF;Bug Database/a /li - li a href=http://issues.apache.org/bugzilla/enter_bug.cgi?product=BSFbug_severity=Enhancement;Enhancement Requests/a - /li - li a href=http://issues.apache.org/bugzilla/buglist.cgi?bug_status=NEWbug_status=ASSIGNEDbug_status=REOPENEDemail1=emailtype1=substringemailassigned_to1=1email2=emailtype2=substringemailreporter2=1bugidtype=includebug_id=changedin=votes=chfieldfrom=chfieldto=Nowchfieldvalue=product=BSFshort_desc=%5BPATCH%5Dshort_desc_type=allwordssubstrlong_desc=long_desc_type=allwordssubstrbug_file_loc=bug_file_loc_type=allwordssubstrkeywords=keywords_type=anywordsfield0-0-0=nooptype0-0-0=noopvalue0-0-0=cmdtype=doitorder=Reuse+same+sort+as+last+time;Patch Queue/a + li a href=http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=truetype=4pid=12310621resolution=-1sorter/field=issuekeysorter/order=ASC;Enhancement Requests/a /li /ul /td Modified: jakarta/bsf/trunk/docs/faq.html URL: http://svn.apache.org/viewvc/jakarta/bsf/trunk/docs/faq.html?rev=895312r1=895311r2=895312view=diff == --- jakarta/bsf/trunk/docs/faq.html (original) +++ jakarta/bsf/trunk/docs/faq.html Sat Jan 2 23:36:00 2010 @@ -104,11 +104,9 @@ /li li a href=http://jakarta.apache.org/site/library.html;Reference Library/a /li - li a href=http://issues.apache.org/bugzilla/enter_bug.cgi?product=BSF;Bug Database/a + li a href=http://issues.apache.org/jira/browse/BSF;Bug Database/a /li - li a href=http://issues.apache.org/bugzilla/enter_bug.cgi?product=BSFbug_severity=Enhancement;Enhancement Requests/a - /li - li a href=http://issues.apache.org/bugzilla/buglist.cgi?bug_status=NEWbug_status=ASSIGNEDbug_status=REOPENEDemail1=emailtype1=substringemailassigned_to1=1email2=emailtype2=substringemailreporter2=1bugidtype=includebug_id=changedin=votes=chfieldfrom=chfieldto=Nowchfieldvalue=product=BSFshort_desc=%5BPATCH%5Dshort_desc_type=allwordssubstrlong_desc=long_desc_type=allwordssubstrbug_file_loc=bug_file_loc_type=allwordssubstrkeywords=keywords_type=anywordsfield0-0-0=nooptype0-0-0=noopvalue0-0-0=cmdtype=doitorder=Reuse+same+sort+as+last+time;Patch Queue/a + li a href=http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=truetype=4pid=12310621resolution=-1sorter/field=issuekeysorter/order=ASC;Enhancement Requests/a /li /ul /td Modified: jakarta/bsf/trunk/docs/index.html URL: http://svn.apache.org/viewvc/jakarta/bsf/trunk/docs/index.html?rev=895312r1=895311r2=895312view=diff == --- jakarta/bsf/trunk/docs/index.html (original) +++ jakarta/bsf/trunk/docs/index.html Sat Jan 2 23:36:00 2010 @@ -104,11 +104,9 @@ /li li a href=http://jakarta.apache.org/site/library.html;Reference Library/a /li - li a href=http://issues.apache.org/bugzilla/enter_bug.cgi?product=BSF;Bug Database/a + li a href=http://issues.apache.org/jira/browse/BSF;Bug Database/a /li - li a href=http://issues.apache.org/bugzilla/enter_bug.cgi?product=BSFbug_severity=Enhancement;Enhancement Requests/a - /li - li a href=http://issues.apache.org/bugzilla/buglist.cgi?bug_status=NEWbug_status=ASSIGNEDbug_status=REOPENEDemail1=emailtype1=substringemailassigned_to1=1email2=emailtype2=substringemailreporter2=1bugidtype=includebug_id=changedin=votes=chfieldfrom=chfieldto=Nowchfieldvalue=product=BSFshort_desc=%5BPATCH%5Dshort_desc_type=allwordssubstrlong_desc=long_desc_type=allwordssubstrbug_file_loc=bug_file_loc_type=allwordssubstrkeywords=keywords_type=anywordsfield0-0-0
svn commit: r894535 - in /jakarta/jmeter/trunk: src/protocol/http/org/apache/jmeter/protocol/http/sampler/SoapSampler.java xdocs/changes.xml
Author: sebb
Date: Wed Dec 30 03:14:39 2009
New Revision: 894535
URL: http://svn.apache.org/viewvc?rev=894535view=rev
Log:
Bug 48451 - Error in: SoapSampler.setPostHeaders(PostMethod post) in the else
branch
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/SoapSampler.java
jakarta/jmeter/trunk/xdocs/changes.xml
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/SoapSampler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/SoapSampler.java?rev=894535r1=894534r2=894535view=diff
==
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/SoapSampler.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/SoapSampler.java
Wed Dec 30 03:14:39 2009
@@ -142,7 +142,7 @@
}
} else {
// otherwise we use text/xml as the default
-post.addParameter(HEADER_CONTENT_TYPE, DEFAULT_CONTENT_TYPE);
//$NON-NLS-1$
+post.setRequestHeader(HEADER_CONTENT_TYPE, DEFAULT_CONTENT_TYPE);
//$NON-NLS-1$
}
if (getSendSOAPAction()) {
post.setRequestHeader(SOAPACTION, getSOAPActionQuoted());
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=894535r1=894534r2=894535view=diff
==
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Wed Dec 30 03:14:39 2009
@@ -71,15 +71,16 @@
h3HTTP Samplers and Proxy/h3
ul
-liBug 47445 - Using Proxy with https-spoofing secure cookies need to be
unsecured/li
-liBug 47442 - Missing replacement of https by http for certain conditions
using https-spoofing/li
+liBug 47445 - Using Proxy with https-spoofing secure cookies need to be
unsecured/li
+liBug 47442 - Missing replacement of https by http for certain conditions
using https-spoofing/li
+liBug 48451 - Error in: SoapSampler.setPostHeaders(PostMethod post) in the
else branch/li
/ul
h3Other Samplers/h3
ul
liBug 47420 - LDAP extended request not closing connections during add
request/li
liBug 47870 - JMSSubscriber fails due to NPE/li
-liBug 47899 - NullPointerExceptions in ReceiveSubscriber constructor/li
+liBug 47899 - NullPointerExceptions in ReceiveSubscriber constructor/li
liBug 48144 - NPE in OnMessageSubscriber/li
liBug 47992 - JMS Point-to-Point Request - Response option doesn't work/li
/ul
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r894536 - /jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/WSDLHelper.java
Author: sebb
Date: Wed Dec 30 03:16:04 2009
New Revision: 894536
URL: http://svn.apache.org/viewvc?rev=894536view=rev
Log:
Tidy code
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/WSDLHelper.java
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/WSDLHelper.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/WSDLHelper.java?rev=894536r1=894535r2=894536view=diff
==
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/WSDLHelper.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/WSDLHelper.java
Wed Dec 30 03:16:04 2009
@@ -53,37 +53,31 @@
* class to do its work
*/
-protected URL WSDLURL = null;
+private URL WSDLURL = null;
-protected URLConnection CONN = null;
+private URLConnection CONN = null;
-protected Document WSDLDOC = null;
+private Document WSDLDOC = null;
-protected String SOAPBINDING = null;
+private String SOAPBINDING = null;
-public String BINDNAME = null;
+private URL bindingURL = null;
-protected URL bindingURL = null;
+private Object[] SOAPOPS = null;
-protected Object[] SOAPOPS = null;
+private final HashMapString, String ACTIONS = new HashMapString,
String();
-protected HashMapString, String ACTIONS = new HashMapString, String();
-
-protected AuthManager AUTH = null;
+private final AuthManager AUTH;
/**
* Default constructor takes a string URL
*/
public WSDLHelper(String url) throws MalformedURLException {
-try {
-WSDLURL = new URL(url);
-} catch (MalformedURLException exception) {
-throw exception;
-}
+this(url, null);
}
public WSDLHelper(String url, AuthManager auth) throws
MalformedURLException {
-this(url);
+WSDLURL = new URL(url);
this.AUTH = auth;
}
@@ -317,8 +311,7 @@
Element nd = (Element) bindings.item(idx);
NodeList slist = nd.getElementsByTagName(soapBind);
if (slist.getLength() 0) {
-// NOTUSED Element soapbind = (Element) slist.item(0);
-this.BINDNAME = nd.getAttribute(name);
+nd.getAttribute(name);
list.add(nd);
}
}
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
Re: TCPClient classname from TCP config not applied
2009/12/22 Andrey Pohilko a...@fininfor.ru: Hello! I wrote my own TCPClient class, it successfully working when I fill TCPClient classname field in separate TCP Samplers. But it is not applied when I fill the same field in TCP Sampler Config in test plan. All other options from config (hostname, port, etc) works fine, but classname is not. Is that a feature, known or unknown bug? The last option ;-) Thanks, Andrey - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
Re: XPathExtractor failing: HTTP 503 with DTD, a bug?
On 18/12/2009, Andrey Pohilko a...@fininfor.ru wrote: Hello! I'm testing XHTML pages and trying to extract data with XPathExtractor, which works only when I use Tidy checkbox, fails otherwise. JMeter logs and sniffer says that jmeter tries to load a DTD from www.w3.org, which always responds with 503. I thought that Use namespaces will affect that behavior, but it is not. I suppose this is a bug, I tried several combinations of checkboxes and found that JMeter completely unable to extract data from my XHTML without Tidy. I wrote a unit test demonstrating the problem, 2 test files here: http://code.google.com/p/jmeter-plugins/source/browse/#svn/trunk/test/kg/ap c/jmeter/xpathextractor http://code.google.com/p/jmeter-plugins/source/browse/#svn/trunk/test/kg/apc /jmeter/xpathextractor I use fake w3.org website on test host to workaround problem, but this is not acceptable as solution I think J Any comments? This has been raised as a bug: https://issues.apache.org/bugzilla/show_bug.cgi?id=47338 It's fixed in the current source, but has yet to be released. It will be in nightly builds after 789187, if you want to try one of those - but beware that such builds have not been thoroughly tested and may misbehave badly. Thanks, Andrey PS: sorry if I used wrong mailing list. - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r891347 - /jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java
Author: sebb
Date: Wed Dec 16 17:49:00 2009
New Revision: 891347
URL: http://svn.apache.org/viewvc?rev=891347view=rev
Log:
Add saveHeaders option to saveCSVStats method
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java?rev=891347r1=891346r2=891347view=diff
==
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java
Wed Dec 16 17:49:00 2009
@@ -103,6 +103,8 @@
private static final String DEFAULT_DATE_FORMAT_STRING = MM/dd/yy
HH:mm:ss; // $NON-NLS-1$
private static final DateFormat DEFAULT_DATE_FORMAT = new
SimpleDateFormat(DEFAULT_DATE_FORMAT_STRING);
+private static final String LINE_SEP =
System.getProperty(line.separator); // $NON-NLS-1$
+
/**
* Private constructor to prevent instantiation.
*/
@@ -612,7 +614,6 @@
*/
public static void saveCSVStats(Vector? data, FileWriter writer, String
headers[]) throws IOException {
final char DELIM = ',';
-final String LINE_SEP = System.getProperty(line.separator); //
$NON-NLS-1$
final char SPECIALS[] = new char[] {DELIM, QUOTING_CHAR};
if (headers != null){
for (int i=0; i headers.length; i++){
@@ -637,7 +638,7 @@
}
/**
- * Method saves aggregate statistics as CSV from a table model.
+ * Method saves aggregate statistics (with header names) as CSV from a
table model.
* Same as {...@link #saveCSVStats(Vector, FileWriter, String[])} except
* that there is no need to create a Vector containing the data.
*
@@ -646,18 +647,33 @@
* @throws IOException
*/
public static void saveCSVStats(DefaultTableModel model, FileWriter
writer) throws IOException {
+saveCSVStats(model, writer, true);
+}
+
+/**
+ * Method saves aggregate statistics as CSV from a table model.
+ * Same as {...@link #saveCSVStats(Vector, FileWriter, String[])} except
+ * that there is no need to create a Vector containing the data.
+ *
+ * @param model table model containing the data
+ * @param writer output file
+ * @param saveHeaders whether or not to save headers
+ * @throws IOException
+ */
+public static void saveCSVStats(DefaultTableModel model, FileWriter
writer, boolean saveHeaders) throws IOException {
final char DELIM = ',';
-final String LINE_SEP = System.getProperty(line.separator); //
$NON-NLS-1$
final char SPECIALS[] = new char[] {DELIM, QUOTING_CHAR};
final int columns = model.getColumnCount();
final int rows = model.getRowCount();
-for (int i=0; i columns; i++){
-if (i0) {
-writer.write(DELIM);
+if (saveHeaders){
+for (int i=0; i columns; i++){
+if (i0) {
+writer.write(DELIM);
+}
+writer.write(quoteDelimiters(model.getColumnName(i),SPECIALS));
}
-writer.write(quoteDelimiters(model.getColumnName(i),SPECIALS));
+writer.write(LINE_SEP);
}
-writer.write(LINE_SEP);
for (int row=0; row rows; row++) {
for (int column=0; column columns; column++) {
if (column 0) {
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r891348 - in /jakarta/jmeter/trunk: src/components/org/apache/jmeter/visualizers/StatVisualizer.java src/components/org/apache/jmeter/visualizers/SummaryReport.java xdocs/changes.xml
Author: sebb
Date: Wed Dec 16 17:49:21 2009
New Revision: 891348
URL: http://svn.apache.org/viewvc?rev=891348view=rev
Log:
Aggregate Report and Summary Report now allow column headers to be optionally
excluded
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SummaryReport.java
jakarta/jmeter/trunk/xdocs/changes.xml
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java?rev=891348r1=891347r2=891348view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java
Wed Dec 16 17:49:21 2009
@@ -75,6 +75,8 @@
private static final String USE_GROUP_NAME = useGroupName; //$NON-NLS-1$
+private static final String SAVE_HEADERS = saveHeaders; //$NON-NLS-1$
+
private static final String[] COLUMNS = {
sampler_label, //$NON-NLS-1$
aggregate_report_count,//$NON-NLS-1$
@@ -97,6 +99,9 @@
private final JButton saveTable =
new JButton(JMeterUtils.getResString(aggregate_graph_save_table));
//$NON-NLS-1$
+private final JCheckBox saveHeaders = // should header be saved with the
data?
+new
JCheckBox(JMeterUtils.getResString(aggregate_graph_save_table_header),true);
//$NON-NLS-1$
+
private final JCheckBox useGroupName =
new
JCheckBox(JMeterUtils.getResString(aggregate_graph_use_group_name));
//$NON-NLS-1$
@@ -219,6 +224,7 @@
JPanel opts = new JPanel();
opts.add(useGroupName, BorderLayout.WEST);
opts.add(saveTable, BorderLayout.CENTER);
+opts.add(saveHeaders, BorderLayout.EAST);
this.add(opts,BorderLayout.SOUTH);
}
@@ -226,12 +232,14 @@
public void modifyTestElement(TestElement c) {
super.modifyTestElement(c);
c.setProperty(USE_GROUP_NAME, useGroupName.isSelected(), false);
+c.setProperty(SAVE_HEADERS, saveHeaders.isSelected(), true);
}
@Override
public void configure(TestElement el) {
super.configure(el);
useGroupName.setSelected(el.getPropertyAsBoolean(USE_GROUP_NAME,
false));
+saveHeaders.setSelected(el.getPropertyAsBoolean(SAVE_HEADERS, true));
}
public void actionPerformed(ActionEvent ev) {
@@ -243,7 +251,7 @@
FileWriter writer = null;
try {
writer = new FileWriter(chooser.getSelectedFile());
-CSVSaveService.saveCSVStats(model,writer);
+CSVSaveService.saveCSVStats(model,writer,
saveHeaders.isSelected());
} catch (FileNotFoundException e) {
log.warn(e.getMessage());
} catch (IOException e) {
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SummaryReport.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SummaryReport.java?rev=891348r1=891347r2=891348view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SummaryReport.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SummaryReport.java
Wed Dec 16 17:49:21 2009
@@ -68,6 +68,8 @@
private static final String USE_GROUP_NAME = useGroupName; //$NON-NLS-1$
+private static final String SAVE_HEADERS = saveHeaders; //$NON-NLS-1$
+
private static final String[] COLUMNS = {
sampler_label, //$NON-NLS-1$
aggregate_report_count, //$NON-NLS-1$
@@ -91,6 +93,9 @@
private final JButton saveTable =
new JButton(JMeterUtils.getResString(aggregate_graph_save_table));
//$NON-NLS-1$
+private final JCheckBox saveHeaders = // should header be saved with the
data?
+new
JCheckBox(JMeterUtils.getResString(aggregate_graph_save_table_header),true);
//$NON-NLS-1$
+
private final JCheckBox useGroupName =
new
JCheckBox(JMeterUtils.getResString(aggregate_graph_use_group_name));
//$NON-NLS-1$
@@ -210,6 +215,7 @@
JPanel opts = new JPanel();
opts.add(useGroupName, BorderLayout.WEST);
opts.add(saveTable, BorderLayout.CENTER);
+opts.add(saveHeaders, BorderLayout.EAST);
this.add(opts,BorderLayout.SOUTH);
}
@@ -217,12 +223,14 @@
public void modifyTestElement(TestElement c) {
super.modifyTestElement(c);
c.setProperty(USE_GROUP_NAME, useGroupName.isSelected(), false);
+c.setProperty
svn commit: r890851 - /jakarta/jmeter/trunk/xdocs/usermanual/regular_expressions.xml
Author: sebb Date: Tue Dec 15 15:59:12 2009 New Revision: 890851 URL: http://svn.apache.org/viewvc?rev=890851view=rev Log: Improve RE docs Modified: jakarta/jmeter/trunk/xdocs/usermanual/regular_expressions.xml Modified: jakarta/jmeter/trunk/xdocs/usermanual/regular_expressions.xml URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/usermanual/regular_expressions.xml?rev=890851r1=890850r2=890851view=diff == --- jakarta/jmeter/trunk/xdocs/usermanual/regular_expressions.xml (original) +++ jakarta/jmeter/trunk/xdocs/usermanual/regular_expressions.xml Tue Dec 15 15:59:12 2009 @@ -74,36 +74,51 @@ /p /subsection subsection name=sect-num;.2 Examples anchor=examples +h3Extract single string/h3 p -Extract single string -br/ Suppose you want to match the following portion of a web-page: br/ -name=file value=readme.txt and you want to extract readme.txt. +codename=file value=readme.txt/code br/ -A suitable reqular expression would be: +and you want to extract codereadme.txt/code. +br/ +A suitable regular expression would be: br/ -name=file value=(.+?) +codename=file value=(.+?)/code p The special characters above are: /p ul li( and ) - these enclose the portion of the match string to be returned/li -li. - match any character. + - one or more times. -? - don't be greedy, i.e. stop when first match succeeds/li +li. - match any character/li +li+ - one or more times/li +li? - don't be greedy, i.e. stop when first match succeeds/li /ul p -Note: without the ?, the .+ would continue past the first until it found the last possible - probably not what was intended. +Note: without the ?, the .+ would continue past the first code/code +until it found the last possible code/code - which is probably not what was intended. /p -pExtract multiple strings/p - -Suppose you want to match the following portion of a web-page: name=file.name value=readme.txt and you want to extract file.name and readme.txt. +p +Note: although the above expression works, it's more efficient to use the following expression: +br/ +codename=file value=([^]+)/code +wherebr/br +[^] - means match anything except br/br +In this case, the matching engine can stop looking as soon as it sees the first code/code, +whereas in the previous case the engine has to check that it has found code/code rather than say code /code. +/p +h3Extract multiple strings/h3 +p +Suppose you want to match the following portion of a web-page:br/ +codename=file.name value=readme.txt/code +and you want to extract both codefile.name/code and codereadme.txt/code. br/ A suitable reqular expression would be: br/ -name=(.+?) value=(.+?) +codename=([^]+) value=([^]+)/code br/ This would create 2 groups, which could be used in the JMeter Regular Expression Extractor template as $1$ and $2$. +/p p The JMeter Regex Extractor saves the values of the groups in additional variables. /p - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r890976 - /jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculator.java
Author: sebb
Date: Tue Dec 15 20:37:11 2009
New Revision: 890976
URL: http://svn.apache.org/viewvc?rev=890976view=rev
Log:
Sorting the map repeatedly is inefficient so we use TreeMap.
Modified:
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculator.java
Modified:
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculator.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculator.java?rev=890976r1=890975r2=890976view=diff
==
---
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculator.java
(original)
+++
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculator.java
Tue Dec 15 20:37:11 2009
@@ -18,8 +18,10 @@
package org.apache.jorphan.math;
+import java.util.ConcurrentModificationException;
import java.util.HashMap;
-import java.util.TreeSet;
+import java.util.TreeMap;
+import java.util.Map.Entry;
import org.apache.commons.lang.mutable.MutableLong;
@@ -31,7 +33,8 @@
public abstract class StatCalculatorT extends Number Comparable? super T
{
// key is the type to collect (usually long), value = count of entries
-private final HashMapT, MutableLong valuesMap = new HashMapT,
MutableLong();
+private final TreeMapT, MutableLong valuesMap = new TreeMapT,
MutableLong();
+// We use a TreeMap because we need the entries to be sorted
// Running values, updated for each sample
private double sum = 0;
@@ -48,8 +51,6 @@
private T max;
-private transient TreeSetT sortedKeys; // cached sorted set
-
private long bytes = 0;
private final T ZERO;
@@ -72,12 +73,10 @@
MIN_VALUE = min;
this.min = MAX_VALUE;
this.max = MIN_VALUE;
-sortedKeys = null;
}
public void clear() {
valuesMap.clear();
-sortedKeys = null;
sum = 0;
sumOfSquares = 0;
mean = 0;
@@ -139,14 +138,15 @@
// use Math.round () instead of simple (long) to provide correct value
rounding
long target = Math.round (count * percent);
-if (sortedKeys == null){
-sortedKeys = new TreeSetT (valuesMap.keySet());
-}
-for (T val : sortedKeys) {
-target -= valuesMap.get(val).longValue();
-if (target = 0){
-return val;
+try {
+for (EntryT, MutableLong val : valuesMap.entrySet()) {
+target -= val.getValue().longValue();
+if (target = 0){
+return val.getKey();
+}
}
+} catch (ConcurrentModificationException ignored) {
+// ignored. May happen occasionally, but no harm done if so.
}
return ZERO; // TODO should this be getMin()?
}
@@ -191,7 +191,6 @@
}
public void addValue(T val) {
-sortedKeys = null;
updateValueCount(val);
count++;
double currentVal = val.doubleValue();
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r890978 - /jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/Sample.java
Author: sebb
Date: Tue Dec 15 20:37:41 2009
New Revision: 890978
URL: http://svn.apache.org/viewvc?rev=890978view=rev
Log:
Remove unused code
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/Sample.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/Sample.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/Sample.java?rev=890978r1=890977r2=890978view=diff
==
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/Sample.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/Sample.java Tue
Dec 15 20:37:41 2009
@@ -49,17 +49,6 @@
private final int bytes;
-
-// TODO - is this used?
-public Sample(long data, long average, long deviation, double throughput,
long median, boolean success) {
-this(null, data, average, deviation, median, 0, throughput, 0,
success, 0, 0);
-}
-
-// TODO - is this used?
-public Sample(long data) {
-this(null, data, 0, 0, 0, 0, 0, 0, false, 0, 0);
-}
-
public Sample(String name, long data, long average, long deviation, long
median, long distributionLine,
double throughput, long errorCount, boolean success, long num,
long endTime) {
this.data = data;
@@ -78,23 +67,6 @@
}
public Sample(String name, long data, long average, long deviation, long
median, long distributionLine,
-double throughput, long errorCount, boolean success, long num,
long endTime, int bytes) {
-this.data = data;
-this.average = average;
-this.deviation = deviation;
-this.throughput = throughput;
-this.success = success;
-this.median = median;
-this.distributionLine = distributionLine;
-this.label = name;
-this.errorCount = errorCount;
-this.count = num;
-this.endTime = endTime;
-this.bytes = bytes;
-this.threadName = ;
-}
-
-public Sample(String name, long data, long average, long deviation, long
median, long distributionLine,
double throughput, long errorCount, boolean success, long num,
long endTime, int bytes, String threadName) {
this.data = data;
this.average = average;
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r891076 - in /jakarta/jmeter/trunk/src: components/org/apache/jmeter/visualizers/ core/org/apache/jmeter/visualizers/
Author: sebb
Date: Wed Dec 16 00:02:46 2009
New Revision: 891076
URL: http://svn.apache.org/viewvc?rev=891076view=rev
Log:
Remove cache of samples from SamplingStatCalculator and move into new subclass
CachingStatCalculator.
Only a few visualisers actually need the cache, which can take lots of memory.
Aggregate Report now uses far less memory.
Added:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/CachingStatCalculator.java
(with props)
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/Graph.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/GraphVisualizer.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SplineModel.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/Graph.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/Graph.java?rev=891076r1=891075r2=891076view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/Graph.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/Graph.java
Wed Dec 16 00:02:46 2009
@@ -51,7 +51,7 @@
private boolean wantMedian = true;
-private SamplingStatCalculator model;
+private CachingStatCalculator model;
private static final int width = 2000;
@@ -69,17 +69,9 @@
/**
* Constructor for the Graph object.
*/
-public Graph(SamplingStatCalculator model) {
+public Graph(CachingStatCalculator model) {
this();
-setModel(model);
-}
-
-/**
- * Sets the Model attribute of the Graph object.
- */
-private void setModel(Object model) {
-this.model = (SamplingStatCalculator) model;
-repaint();
+this.model = model;
}
/**
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/GraphVisualizer.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/GraphVisualizer.java?rev=891076r1=891075r2=891076view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/GraphVisualizer.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/GraphVisualizer.java
Wed Dec 16 00:02:46 2009
@@ -58,7 +58,7 @@
private NumberFormat nf = NumberFormat.getInstance(); // OK, because used
in synchronised method
-private SamplingStatCalculator model;
+private CachingStatCalculator model;
private JTextField maxYField = null;
@@ -94,7 +94,7 @@
* Constructor for the GraphVisualizer object.
*/
public GraphVisualizer() {
-model = new SamplingStatCalculator(Graph);
+model = new CachingStatCalculator(Graph);
graph = new Graph(model);
init();
}
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SplineModel.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SplineModel.java?rev=891076r1=891075r2=891076view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SplineModel.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SplineModel.java
Wed Dec 16 00:02:46 2009
@@ -37,7 +37,7 @@
//@GuardedBy(this)
private Spline3 dataCurve = null;
-final SamplingStatCalculator samples;
+final CachingStatCalculator samples;
//@GuardedBy(this)
private GraphListener listener;
@@ -46,7 +46,7 @@
private String name;
public SplineModel() {
-samples = new SamplingStatCalculator(Spline);
+samples = new CachingStatCalculator(Spline);
}
public synchronized void setListener(GraphListener vis) {
Added:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/CachingStatCalculator.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/CachingStatCalculator.java?rev=891076view=auto
==
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/CachingStatCalculator.java
(added)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/CachingStatCalculator.java
Wed Dec 16 00:02:46 2009
@@ -0,0 +1,65 @@
+/*
+ * 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
svn commit: r891086 - /jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/DistributionGraph.java
Author: sebb
Date: Wed Dec 16 00:47:57 2009
New Revision: 891086
URL: http://svn.apache.org/viewvc?rev=891086view=rev
Log:
Fix ClassCastException
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/DistributionGraph.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/DistributionGraph.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/DistributionGraph.java?rev=891086r1=891085r2=891086view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/DistributionGraph.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/DistributionGraph.java
Wed Dec 16 00:47:57 2009
@@ -168,8 +168,7 @@
int total = p_model.getCount();
CollectionNumber[] values = p_model.getDistribution().values();
-Number[][] objval = (Number[][]) new Object[values.size()];
-objval = values.toArray(objval);
+Number[][] objval = values.toArray(new Number[][]{});
// we sort the objects
Arrays.sort(objval, new NumberComparator());
int len = objval.length;
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r891088 - in /jakarta/jmeter/trunk/xdocs: changes.xml usermanual/component_reference.xml usermanual/listeners.xml
Author: sebb Date: Wed Dec 16 00:54:09 2009 New Revision: 891088 URL: http://svn.apache.org/viewvc?rev=891088view=rev Log: Document improved Listener behaviour Modified: jakarta/jmeter/trunk/xdocs/changes.xml jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml jakarta/jmeter/trunk/xdocs/usermanual/listeners.xml Modified: jakarta/jmeter/trunk/xdocs/changes.xml URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=891088r1=891087r2=891088view=diff == --- jakarta/jmeter/trunk/xdocs/changes.xml (original) +++ jakarta/jmeter/trunk/xdocs/changes.xml Wed Dec 16 00:54:09 2009 @@ -154,7 +154,11 @@ liBug 47952 - Added JSR223 Listener/li liBug 47474 - View Results Tree support for plugin renderers/li liAllow Idle Time to be saved to sample log files/li -liBug 48259 - Improve StatCalculator performance by using HashMap/li +liBug 48259 - Improve StatCalculator performance by using TreeMap/li +liListeners using SamplingStatCalculator have much reduced memory needs +as the Sample cache has been moved to the new CachingStatCalculator class. +In particular, Aggregate Report can now handle large numbers of samples. +/li /ul h3Timers, Assertions, Config, Pre- amp; Post-Processors/h3 Modified: jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=891088r1=891087r2=891088view=diff == --- jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml (original) +++ jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml Wed Dec 16 00:54:09 2009 @@ -1954,12 +1954,21 @@ /p ul liSimple Data Writer/li -liBeanShell Listener/li -liAssertion Results/li +liBeanShell/BSF Listener/li liMailer Visualizer/li liMonitor Results/li liSummary Report/li /ul +p +The following Listeners no longer need to keep copies of every single sample. +Instead, samples with the same elapsed time are aggregated. +Less memory is now needed, especially if most samples only take a second or two at most. +/p +ul +liAggregate Report/li +liAggregate Graph/li +liDistribution Graph/li +/ul pTo minimise the amount of memory needed, use the Simple Data Writer, and use the CSV format./p p note @@ -2170,10 +2179,14 @@ It is important to choose the sampler names correctly to get the best results from the Aggregate Report. /p -note -Calculation of the a href=glossary.html#MedianMedian/a and 90% Line (90supth/sup a href=glossary.html#Percentilepercentile/a) values requires a lot of memory as details of every Sample have to be saved. -See the complink name=Summary Report/ for a similar Listener that does not need so much memory. -/note +p +Calculation of the a href=glossary.html#MedianMedian/a and 90% Line (90supth/sup a href=glossary.html#Percentilepercentile/a) values requires additional memory. +For JMeter 2.3.4 and earlier, details of each sample were saved separately, which meant a lot of memory was needed. +JMeter now combines samples with the same elapsed time, so far less memory is used. +However, for samples that take more than a few seconds, the probability is that fewer samples will have identical times, +in which case more memory will be needed. +See the complink name=Summary Report/ for a similar Listener that does not store individual samples and so needs constant memory. +/p ul liLabel - The label of the sample. If Include group name in label? is selected, then the name of the thread group is added as a prefix. Modified: jakarta/jmeter/trunk/xdocs/usermanual/listeners.xml URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/usermanual/listeners.xml?rev=891088r1=891087r2=891088view=diff == --- jakarta/jmeter/trunk/xdocs/usermanual/listeners.xml (original) +++ jakarta/jmeter/trunk/xdocs/usermanual/listeners.xml Wed Dec 16 00:54:09 2009 @@ -241,12 +241,21 @@ /p ul liSimple Data Writer/li -liBeanShell Listener/li -liAssertion Results/li +liBeanShell/BSF Listener/li liMailer Visualizer/li liMonitor Results/li liSummary Report/li /ul +p +The following Listeners no longer need to keep copies of every single sample. +Instead, samples with the same elapsed time are aggregated. +Less memory is now needed, especially if most samples only take a second or two at most. +/p +ul +liAggregate Report/li +liAggregate Graph/li +liDistribution Graph/li +/ul pTo minimise the amount of memory needed, use the Simple Data Writer, and use the CSV format./p /section - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r890526 - in /jakarta/jmeter/trunk: docs/images/screenshots/ src/core/org/apache/jmeter/control/ src/core/org/apache/jmeter/control/gui/ src/core/org/apache/jmeter/resources/ xdocs/ xdocs/
Author: sebb
Date: Mon Dec 14 22:52:28 2009
New Revision: 890526
URL: http://svn.apache.org/viewvc?rev=890526view=rev
Log:
Bug 41418 - Exclude timer duration from Transaction Controller runtime in report
Modified:
jakarta/jmeter/trunk/docs/images/screenshots/transactioncontroller.png
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TransactionControllerGui.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jakarta/jmeter/trunk/xdocs/changes.xml
jakarta/jmeter/trunk/xdocs/images/screenshots/transactioncontroller.png
jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml
Modified: jakarta/jmeter/trunk/docs/images/screenshots/transactioncontroller.png
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/images/screenshots/transactioncontroller.png?rev=890526r1=890525r2=890526view=diff
==
Binary files - no diff available.
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java?rev=890526r1=890525r2=890526view=diff
==
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java
Mon Dec 14 22:52:28 2009
@@ -56,8 +56,20 @@
private transient int noFailingSamples;
+/**
+ * Cumulated pause time to excluse timer and post/pre processor times
+ */
+private transient long pauseTime;
+
+/**
+ * Previous end time
+ */
+private transient long prevEndTime;
+
private static final String PARENT = TransactionController.parent;//
$NON-NLS-1$
+private final static String INCLUDE_TIMERS =
TransactionController.includeTimers;// $NON-NLS-1$
+
/**
* Creates a Transaction Controller
*/
@@ -152,6 +164,8 @@
// Assume success
res.setSuccessful(true);
res.sampleStart();
+prevEndTime = res.getStartTime();//???
+pauseTime = 0;
}
Sampler returnValue = super.next();
@@ -159,7 +173,8 @@
if (returnValue == null) // Must be the end of the controller
{
if (res != null) {
-res.sampleEnd();
+res.setIdleTime(pauseTime+res.getIdleTime());
+ res.sampleEnd();
res.setResponseMessage(Number of samples in transaction : +
calls + , number of failing samples : + noFailingSamples);
if(res.isSuccessful()) {
res.setResponseCodeOK();
@@ -196,6 +211,10 @@
SampleResult sampleResult = se.getResult();
res.setThreadName(sampleResult.getThreadName());
res.setBytes(res.getBytes() + sampleResult.getBytes());
+if (!isIncludeTimers()) {// Accumulate waiting time for later
+ pauseTime += sampleResult.getEndTime() -
sampleResult.getTime() - prevEndTime;
+ prevEndTime = sampleResult.getEndTime();
+}
if(!sampleResult.isSuccessful()) {
res.setSuccessful(false);
noFailingSamples++;
@@ -212,4 +231,22 @@
public void sampleStopped(SampleEvent e) {
}
+
+/**
+ * Whether to include timers and pre/post processor time in overall sample.
+ * @param includeTimers
+ */
+public void setIncludeTimers(boolean includeTimers) {
+setProperty(INCLUDE_TIMERS, includeTimers, true); // default true for
compatibility
+}
+
+/**
+ * Whether to include timer and pre/post processor time in overall sample.
+ *
+ * @return boolean (defaults to true for backwards compatibility)
+ */
+public boolean isIncludeTimers() {
+ return getPropertyAsBoolean(INCLUDE_TIMERS, true);
+}
+
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TransactionControllerGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TransactionControllerGui.java?rev=890526r1=890525r2=890526view=diff
==
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TransactionControllerGui.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/gui/TransactionControllerGui.java
Mon Dec 14 22:52:28 2009
@@ -32,6 +32,8 @@
public class TransactionControllerGui extends AbstractControllerGui {
private JCheckBox parent; // If selected, then generate parent sample,
otherwise as per original
svn commit: r890544 - in /jakarta/jmeter/trunk: src/core/org/apache/jmeter/resources/messages.properties src/functions/org/apache/jmeter/functions/FileToString.java xdocs/usermanual/functions.xml
Author: sebb
Date: Mon Dec 14 23:12:57 2009
New Revision: 890544
URL: http://svn.apache.org/viewvc?rev=890544view=rev
Log:
Add optional encoding parameter to FileToString function
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/FileToString.java
jakarta/jmeter/trunk/xdocs/usermanual/functions.xml
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=890544r1=890543r2=890544view=diff
==
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
Mon Dec 14 23:12:57 2009
@@ -799,7 +799,8 @@
stopping_test=Shutting down all test threads. Please be patient.
stopping_test_failed=One or more test threads won't exit; see log file.
stopping_test_title=Stopping Test
-string_from_file_file_name=Enter full path to file
+string_from_file_encoding=File encoding if not the platform default (opt)
+string_from_file_file_name=Enter path (absolute or relative) to file
string_from_file_seq_final=Final file sequence number (opt)
string_from_file_seq_start=Start file sequence number (opt)
summariser_title=Generate Summary Results
Modified:
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/FileToString.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/FileToString.java?rev=890544r1=890543r2=890544view=diff
==
---
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/FileToString.java
(original)
+++
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/FileToString.java
Mon Dec 14 23:12:57 2009
@@ -39,6 +39,7 @@
*
* Parameters:
* - file name
+ * - file encoding (optional)
* - variable name (optional)
*
* Returns:
@@ -58,14 +59,17 @@
static {
desc.add(JMeterUtils.getResString(string_from_file_file_name));//$NON-NLS-1$
+
desc.add(JMeterUtils.getResString(string_from_file_encoding));//$NON-NLS-1$
desc.add(JMeterUtils.getResString(function_name_paropt));//$NON-NLS-1$
}
private static final int MIN_PARAM_COUNT = 1;
-private static final int MAX_PARAM_COUNT = 2;
+private static final int MAX_PARAM_COUNT = 3;
-private static final int PARAM_NAME = 2;
+private static final int ENCODING = 2;
+
+private static final int PARAM_NAME = 3;
private Object[] values;
@@ -79,6 +83,11 @@
String fileName = ((CompoundVariable) values[0]).execute();
+String encoding = null;//means platform default
+if (values.length = ENCODING) {
+encoding = ((CompoundVariable) values[ENCODING -
1]).execute().trim();
+}
+
String myName = ;//$NON-NLS-1$
if (values.length = PARAM_NAME) {
myName = ((CompoundVariable) values[PARAM_NAME -
1]).execute().trim();
@@ -87,7 +96,7 @@
String myValue = ERR_IND;
try {
-myValue = FileUtils.readFileToString(new File(fileName), null);
+myValue = FileUtils.readFileToString(new File(fileName), encoding);
} catch (IOException e) {
log.warn(Could not read file: +fileName+ +e.getMessage());
throw new JMeterStopThreadException(End of sequence);
Modified: jakarta/jmeter/trunk/xdocs/usermanual/functions.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/usermanual/functions.xml?rev=890544r1=890543r2=890544view=diff
==
--- jakarta/jmeter/trunk/xdocs/usermanual/functions.xml (original)
+++ jakarta/jmeter/trunk/xdocs/usermanual/functions.xml Mon Dec 14 23:12:57 2009
@@ -1105,11 +1105,14 @@
property name=File Name required=YesPath to the file name.
(The path can be relative to the JMeter launch directory)
/property
+property name=File encoding if not the platform default
required=No
+The encoding to be used to read the file. If not specified, the
platform default is used.
+/property
property name=Variable Name required=No
A reference name - refName - for reusing the value created by this function.
Stored values are of the form ${refName}.
/property
/properties
-pThe file name parameter and reference name parameter (if supplied) are
resolved every time the function is executed./p
+pThe file name, encoding and reference name parameters are resolved every
time the function is executed./p
/component
/subsection
svn commit: r890577 - /jakarta/jmeter/trunk/test/src/org/apache/jorphan/math/TestStatCalculator.java
Author: sebb
Date: Tue Dec 15 00:15:20 2009
New Revision: 890577
URL: http://svn.apache.org/viewvc?rev=890577view=rev
Log:
Ensure initial min and max are correct
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jorphan/math/TestStatCalculator.java
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jorphan/math/TestStatCalculator.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jorphan/math/TestStatCalculator.java?rev=890577r1=890576r2=890577view=diff
==
---
jakarta/jmeter/trunk/test/src/org/apache/jorphan/math/TestStatCalculator.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jorphan/math/TestStatCalculator.java
Tue Dec 15 00:15:20 2009
@@ -33,9 +33,6 @@
super();
}
-/**
- * @param arg0
- */
public TestStatCalculator(String arg0) {
super(arg0);
}
@@ -60,6 +57,8 @@
assertEquals(9, calc.getPercentPoint(0.899).intValue());
}
public void testCalculation() {
+assertEquals(Long.MIN_VALUE, calc.getMax().longValue());
+assertEquals(Long.MAX_VALUE, calc.getMin().longValue());
calc.addValue(18);
calc.addValue(10);
calc.addValue(9);
@@ -91,6 +90,8 @@
public void testInteger(){
StatCalculatorInteger calci = new StatCalculatorInteger();
+assertEquals(Integer.MIN_VALUE, calci.getMax().intValue());
+assertEquals(Integer.MAX_VALUE, calci.getMin().intValue());
calci.addValue(0);
calci.addValue(2);
calci.addValue(2);
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r890589 - in /jakarta/jmeter/trunk: src/jorphan/org/apache/jorphan/math/StatCalculator.java xdocs/changes.xml
Author: sebb
Date: Tue Dec 15 00:53:43 2009
New Revision: 890589
URL: http://svn.apache.org/viewvc?rev=890589view=rev
Log:
Bug 48259 - Improve StatCalculator performance by using HashMap
Modified:
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculator.java
jakarta/jmeter/trunk/xdocs/changes.xml
Modified:
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculator.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculator.java?rev=890589r1=890588r2=890589view=diff
==
---
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculator.java
(original)
+++
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculator.java
Tue Dec 15 00:53:43 2009
@@ -18,11 +18,10 @@
package org.apache.jorphan.math;
-import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
+import java.util.TreeSet;
+
+import org.apache.commons.lang.mutable.MutableLong;
/**
* This class serves as a way to calculate the median, max, min etc. of a list
of values.
@@ -31,8 +30,10 @@
*/
public abstract class StatCalculatorT extends Number Comparable? super T
{
-private final ListT values = new ArrayListT();
+// key is the type to collect (usually long), value = count of entries
+private final HashMapT, MutableLong valuesMap = new HashMapT,
MutableLong();
+// Running values, updated for each sample
private double sum = 0;
private double sumOfSquares = 0;
@@ -43,13 +44,19 @@
private int count = 0;
+private T min;
+
+private T max;
+
+private transient TreeSetT sortedKeys; // cached sorted set
+
private long bytes = 0;
private final T ZERO;
-private final T MAX_VALUE;
+private final T MAX_VALUE; // e.g. Long.MAX_VALUE
-private final T MIN_VALUE;
+private final T MIN_VALUE; // e.g. Long.MIN_VALUE
/**
* This constructor is used to set up particular values for the generic
class instance.
@@ -58,20 +65,27 @@
* @param min - value to return for minimum if there are no values
* @param max - value to return for maximum if there are no values
*/
-public StatCalculator(T zero, T min, T max) {
+public StatCalculator(final T zero, final T min, final T max) {
super();
ZERO = zero;
MAX_VALUE = max;
MIN_VALUE = min;
+this.min = MAX_VALUE;
+this.max = MIN_VALUE;
+sortedKeys = null;
}
public void clear() {
-values.clear();
+valuesMap.clear();
+sortedKeys = null;
sum = 0;
sumOfSquares = 0;
mean = 0;
deviation = 0;
count = 0;
+bytes = 0;
+max = MIN_VALUE;
+min = MAX_VALUE;
}
@@ -80,17 +94,13 @@
}
public void addAll(StatCalculatorT calc) {
-IteratorT iter = calc.values.iterator();
-while (iter.hasNext()) {
-addValue(iter.next());
+for (T val : calc.valuesMap.keySet()) {
+addValue(val);
}
}
public T getMedian() {
-if (count 0) {
-return values.get((int) (values.size() * .5));
-}
-return ZERO;
+return getPercentPoint(0.5);
}
public long getTotalBytes() {
@@ -107,10 +117,7 @@
* @return number of values less than the percentage
*/
public T getPercentPoint(float percent) {
-if (count 0) {
-return values.get((int) (values.size() * percent));
-}
-return ZERO;
+return getPercentPoint((double) percent);
}
/**
@@ -120,42 +127,45 @@
* are below, the remaining 10% are above.
*
* @param percent
- * @return number of values less than the percentage
+ * @return the value which %percent% of the values are less than
*/
public T getPercentPoint(double percent) {
-if (count 0) {
-return values.get((int) (values.size() * percent));
+if (count = 0) {
+return ZERO;
+}
+if (percent = 1.0) {
+return getMax();
}
-return ZERO;
+
+// use Math.round () instead of simple (long) to provide correct value
rounding
+long target = Math.round (count * percent);
+if (sortedKeys == null){
+sortedKeys = new TreeSetT (valuesMap.keySet());
+}
+for (T val : sortedKeys) {
+target -= valuesMap.get(val).longValue();
+if (target = 0){
+return val;
+}
+}
+return ZERO; // TODO should this be getMin()?
}
/**
* Returns the distribution of the values in the list.
*
- * TODO round values to reduce the number of distinct entries
svn commit: r889861 - in /jakarta/jmeter/trunk/bin: mirror-server.cmd mirror-server.sh
Author: sebb
Date: Fri Dec 11 23:34:54 2009
New Revision: 889861
URL: http://svn.apache.org/viewvc?rev=889861view=rev
Log:
Update libraries to current versions
Modified:
jakarta/jmeter/trunk/bin/mirror-server.cmd
jakarta/jmeter/trunk/bin/mirror-server.sh
Modified: jakarta/jmeter/trunk/bin/mirror-server.cmd
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/bin/mirror-server.cmd?rev=889861r1=889860r2=889861view=diff
==
--- jakarta/jmeter/trunk/bin/mirror-server.cmd (original)
+++ jakarta/jmeter/trunk/bin/mirror-server.cmd Fri Dec 11 23:34:54 2009
@@ -19,8 +19,9 @@
cd /D %~dp0
-set
CP=..\lib\ext\ApacheJMeter_http.jar;..\lib\ext\ApacheJMeter_core.jar;..\lib\jorphan.jar;..\lib\logkit-1.2.jar
-set CP=%CP%;..\lib\avalon-framework-4.1.4.jar;..\lib\jakarta-oro-2.0.8.jar
+set
CP=..\lib\ext\ApacheJMeter_http.jar;..\lib\ext\ApacheJMeter_core.jar;..\lib\jorphan.jar
+set
CP=%CP%;..\lib\logkit-2.0.jar;..\lib\avalon-framework-4.1.4.jar;..\lib\oro-2.0.8.jar
+
java -cp %CP% org.apache.jmeter.protocol.http.control.HttpMirrorServer %1
pause
Modified: jakarta/jmeter/trunk/bin/mirror-server.sh
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/bin/mirror-server.sh?rev=889861r1=889860r2=889861view=diff
==
--- jakarta/jmeter/trunk/bin/mirror-server.sh (original)
+++ jakarta/jmeter/trunk/bin/mirror-server.sh Fri Dec 11 23:34:54 2009
@@ -17,6 +17,7 @@
cd `dirname $0`
-CP=../lib/ext/ApacheJMeter_http.jar;../lib/ext/ApacheJMeter_core.jar;../lib/jorphan.jar;../lib/logkit-1.2.jar
-CP=${CP};;../lib/avalon-framework-4.1.4.jar;../lib/jakarta-oro-2.0.8.jar
+CP=../lib/ext/ApacheJMeter_http.jar;../lib/ext/ApacheJMeter_core.jar;../lib/jorphan.jar
+CP=${CP};../lib/logkit-2.0.jar;../lib/avalon-framework-4.1.4.jar;../lib/oro-2.0.8.jar
+
java -cp $CP org.apache.jmeter.protocol.http.control.HttpMirrorServer $1
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
Re: [VOTE] Release BSF 3.0 RC1
Not really sure ... On 10/12/2009, Rahul Akolkar rahul.akol...@gmail.com wrote: Top posting a quick question: is this vote for the 3.0 m2 repo artifacts still active? If it is, I intend to take a look in the next day or two. -Rahul On Sun, Nov 1, 2009 at 3:40 AM, ant elder ant.el...@gmail.com wrote: On Thu, Oct 29, 2009 at 7:40 AM, ant elder ant.el...@gmail.com wrote: On Thu, Oct 29, 2009 at 1:55 AM, sebb seb...@gmail.com wrote: On 28/10/2009, Rony G. Flatscher rony.flatsc...@wu-wien.ac.at wrote: ant elder wrote: On Sat, Aug 15, 2009 at 6:04 AM, ant elder ant.el...@gmail.com wrote: On Wed, Aug 12, 2009 at 7:13 PM, sebb AT ASFs...@apache.org wrote: Please review and vote on the BSF 3.0 RC1 release. The artifacts are available at: http://people.apache.org/~sebb/bsf-3.0-RC1/ and the an SVN tag is at: http://svn.apache.org/repos/asf/jakarta/bsf/tags/bsf-3.0-rc1/ The vote will be open for at least 72 hours. S/// - To unsubscribe, e-mail: bsf-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: bsf-dev-h...@jakarta.apache.org Whats there looks good, +1 There's no Maven staging repo, could that be added to this vote? ...ant We never did sort out the maven artifacts of for the 1.0 release, which means projects using maven cant use the 1.0 release. I did put some artifacts up at http://people.apache.org/~antelder/bsf/3.0-rc1/maven/ during the release vote, could we consider them part of the 1.0 release vote or should we have another vote to release them? There was a question about no license header on one of the generated pom.xml files, but i'm not sure how to fix that easily and it doesn't seem like a release blocker to me. Surely the header can just be added to the file before it is deployed? Fair point, ok I'll do that, and I think I call a vote on releasing them just to make sure its all clean and tidy. ...ant Ok that is done now, the staging repo is the same as before http://people.apache.org/~antelder/bsf/3.0-rc1/maven/ which is the one from earlier with the only change being the bsf-all jar generated pom.xml now has an AL header and is resigned. Please confirm with a +1 to include these in the 3.0 release. +1 from me. ...ant - To unsubscribe, e-mail: bsf-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: bsf-dev-h...@jakarta.apache.org - To unsubscribe, e-mail: bsf-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: bsf-dev-h...@jakarta.apache.org - To unsubscribe, e-mail: bsf-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: bsf-dev-h...@jakarta.apache.org
svn commit: r889447 - /jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ConnectionFactory.java
Author: sebb
Date: Thu Dec 10 22:41:01 2009
New Revision: 889447
URL: http://svn.apache.org/viewvc?rev=889447view=rev
Log:
Always return a valid topic connection
Modified:
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ConnectionFactory.java
Modified:
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ConnectionFactory.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ConnectionFactory.java?rev=889447r1=889446r2=889447view=diff
==
---
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ConnectionFactory.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ConnectionFactory.java
Thu Dec 10 22:41:01 2009
@@ -148,15 +148,17 @@
return qfactory;
}
-public static synchronized TopicConnection getTopicConnection() {
+/**
+ * Use the factory to create a topic connection.
+ *
+ * @return the connection
+ * @throws JMSException if the factory is null or the create() method fails
+ */
+public static synchronized TopicConnection getTopicConnection() throws
JMSException {
if (factory != null) {
-try {
-return factory.createTopicConnection();
-} catch (JMSException e) {
-log.error(e.getMessage());
-}
+return factory.createTopicConnection();
}
-return null;
+throw new JMSException(Factory has not been initialised);
}
public static synchronized QueueConnection getQueueConnection(Context ctx,
String queueConn) {
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r889456 - in /jakarta/jmeter/trunk: src/protocol/jms/org/apache/jmeter/protocol/jms/client/ src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/ xdocs/
Author: sebb
Date: Thu Dec 10 23:00:11 2009
New Revision: 889456
URL: http://svn.apache.org/viewvc?rev=889456view=rev
Log:
Bug 48155 - Multiple problems / enhancements with JMS protocol classes
Modified:
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
jakarta/jmeter/trunk/xdocs/changes.xml
Modified:
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java?rev=889456r1=889455r2=889456view=diff
==
---
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java
Thu Dec 10 23:00:11 2009
@@ -29,6 +29,7 @@
import javax.naming.InitialContext;
import javax.naming.NamingException;
+import org.apache.jmeter.protocol.jms.sampler.BaseJMSSampler;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
@@ -82,6 +83,9 @@
ConnectionFactory.getTopicConnectionFactory(ctx,connfactory);
_conn = ConnectionFactory.getTopicConnection();
_topic = InitialContextFactory.lookupTopic(ctx, topic);
+if (_topic == null){
+log.warn(topic +topic+ could not be found.);
+}
_session = _conn.createTopicSession(false,
TopicSession.AUTO_ACKNOWLEDGE);
_subscriber = _session.createSubscriber(_topic);
log.info(created the topic connection successfully);
@@ -235,6 +239,9 @@
String text = msg.getText();
if (text.trim().length() 0) {
synchronized (this) {
+this.buffer.append(BaseJMSSampler
+.getMessageHeaders(message));
+this.buffer.append(JMS Message Text:\n\n);
this.buffer.append(text);
count(1);
}
Modified:
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java?rev=889456r1=889455r2=889456view=diff
==
---
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java
Thu Dec 10 23:00:11 2009
@@ -17,6 +17,13 @@
package org.apache.jmeter.protocol.jms.sampler;
+import java.util.Date;
+
+import javax.jms.DeliveryMode;
+import javax.jms.Destination;
+import javax.jms.JMSException;
+import javax.jms.Message;
+
import org.apache.jmeter.testelement.TestListener;
import org.apache.jmeter.samplers.AbstractSampler;
import org.apache.jmeter.samplers.Entry;
@@ -280,4 +287,62 @@
public boolean getUseJNDIPropertiesAsBoolean() {
return getPropertyAsBoolean(USE_PROPERTIES_FILE);
}
+
+
+/**
+ * Returns a String with the JMS Message Header values.
+ *
+ * @param message JMS Message
+ * @return String with message header values.
+ */
+public static String getMessageHeaders(Message message) {
+final StringBuffer response = new StringBuffer(256);
+try {
+response.append(JMS Message Header Attributes:);
+response.append(\n Correlation ID: );
+response.append(message.getJMSCorrelationID());
+
+response.append(\n Delivery Mode: );
+if (message.getJMSDeliveryMode() == DeliveryMode.PERSISTENT) {
+response.append(PERSISTANT);
+} else {
+response.append(NON-PERSISTANT);
+}
+
+final Destination destination = message.getJMSDestination();
+
+response.append(\n Destination: );
+response.append((destination == null ? null : destination
+.toString()));
+
+response.append(\n Expiration: );
+response.append(new Date(message.getJMSExpiration()));
+
+response.append(\n Message ID: );
+response.append(message.getJMSMessageID());
+
+response.append(\n Priority: );
+response.append
svn commit: r889477 - /jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XMLConfPanel.java
Author: sebb
Date: Fri Dec 11 00:14:21 2009
New Revision: 889477
URL: http://svn.apache.org/viewvc?rev=889477view=rev
Log:
ActionListener was tied to the wrong button!
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XMLConfPanel.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XMLConfPanel.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XMLConfPanel.java?rev=889477r1=889476r2=889477view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XMLConfPanel.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XMLConfPanel.java
Fri Dec 11 00:14:21 2009
@@ -56,12 +56,12 @@
namespace = new
JCheckBox(JMeterUtils.getResString(xml_namespace_button)); //$NON-NLS-1$
whitespace = new
JCheckBox(JMeterUtils.getResString(xml_whitespace_button)); //$NON-NLS-1$
validate = new
JCheckBox(JMeterUtils.getResString(xml_validate_button)); //$NON-NLS-1$
-validate.addActionListener(new ActionListener(){
+tolerant = new
JCheckBox(JMeterUtils.getResString(xml_tolerant_button)); //$NON-NLS-1$
+tolerant.addActionListener(new ActionListener(){
public void actionPerformed(ActionEvent e) {
tolerant();
}
});
-tolerant = new
JCheckBox(JMeterUtils.getResString(xml_tolerant_button)); //$NON-NLS-1$
downloadDTDs = new
JCheckBox(JMeterUtils.getResString(xml_download_dtds)); //$NON-NLS-1$
Box tidyOptions = Box.createHorizontalBox();
tidyOptions.setBorder(BorderFactory.createEtchedBorder());
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r889481 - /jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml
Author: sebb Date: Fri Dec 11 00:26:33 2009 New Revision: 889481 URL: http://svn.apache.org/viewvc?rev=889481view=rev Log: Fix image sizes Modified: jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml Modified: jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=889481r1=889480r2=889481view=diff == --- jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml (original) +++ jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml Fri Dec 11 00:26:33 2009 @@ -3395,7 +3395,7 @@ /properties /component -component name=XPath Assertion index=sect-num;.5.8 width=872 height=266 screenshot=xpath_assertion.png +component name=XPath Assertion index=sect-num;.5.8 width=692 height=293 screenshot=xpath_assertion.png descriptionpThe XPath Assertion tests a document for well formedness, has the option of validating against a DTD, or putting the document through JTidy and testing for an XPath. If that XPath exists, the Assertion is true. Using / will match any well-formed @@ -3622,7 +3622,7 @@ /component -component name=BeanShell Timer index=sect-num;.6.6 width=516 height=286 screenshot=timers/beanshell_timer.png +component name=BeanShell Timer index=sect-num;.6.6 width=597 height=303 screenshot=timers/beanshell_timer.png description p The BeanShell Timer can be used to generate a delay. @@ -4075,7 +4075,7 @@ /p /component -component name=XPath Extractor index=sect-num;.8.2 width=535 height=176 screenshot=xpath_extractor.png +component name=XPath Extractor index=sect-num;.8.2 width=541 height=247 screenshot=xpath_extractor.png descriptionThis test element allows the user to extract value from structured response - XML or (X)HTML - using XPath query language. - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r889487 - in /jakarta/jmeter/trunk: docs/images/screenshots/ src/components/org/apache/jmeter/extractor/ src/components/org/apache/jmeter/extractor/gui/ src/core/org/apache/jmeter/resource
Author: sebb
Date: Fri Dec 11 01:40:43 2009
New Revision: 889487
URL: http://svn.apache.org/viewvc?rev=889487view=rev
Log:
Bug 48331 - XpathExtractor does not return XML string representations for a
Nodeset
Modified:
jakarta/jmeter/trunk/docs/images/screenshots/xpath_extractor.png
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/gui/XPathExtractorGui.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jakarta/jmeter/trunk/test/src/org/apache/jmeter/extractor/TestXPathExtractor.java
jakarta/jmeter/trunk/xdocs/changes.xml
jakarta/jmeter/trunk/xdocs/images/screenshots/xpath_extractor.png
jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml
Modified: jakarta/jmeter/trunk/docs/images/screenshots/xpath_extractor.png
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/images/screenshots/xpath_extractor.png?rev=889487r1=889486r2=889487view=diff
==
Binary files - no diff available.
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java?rev=889487r1=889486r2=889487view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/extractor/XPathExtractor.java
Fri Dec 11 01:40:43 2009
@@ -21,6 +21,7 @@
import java.io.IOException;
import java.io.Serializable;
import java.io.UnsupportedEncodingException;
+import java.io.StringWriter;
import javax.xml.parsers.ParserConfigurationException;
import javax.xml.transform.TransformerException;
@@ -46,6 +47,12 @@
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
+import javax.xml.transform.OutputKeys;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
+
//@see org.apache.jmeter.extractor.TestXPathExtractor for unit tests
/**
@@ -58,6 +65,10 @@
* ddextracts value attribute of option element that match text 'Czech
Republic'
* inside of select element with name attribute 'country'
inside of
* form with name attribute 'countryForm'/dd
+ * dt//head/dt
+ * ddextracts the XML fragment for head node./dd
+ * dt//head/text()/dt
+ * ddextracts the text content for head node./dd
* /dl
*/
/* This file is inspired by RegexExtractor.
@@ -83,6 +94,7 @@
private static final String DOWNLOAD_DTDS =
XPathExtractor.download_dtds; // $NON-NLS-1$
private static final String WHITESPACE = XPathExtractor.whitespace;
// $NON-NLS-1$
private static final String VALIDATE= XPathExtractor.validate;
// $NON-NLS-1$
+private static final String FRAGMENT= XPathExtractor.fragment;
// $NON-NLS-1$
//- JMX file attributes
@@ -203,6 +215,22 @@
return getPropertyAsBoolean(QUIET, true);
}
+/**
+ * Should we return fragment as text, rather than text of fragment?
+ * @return true if we should return fragment rather than text
+ */
+public boolean getFragment() {
+return getPropertyAsBoolean(FRAGMENT, false);
+}
+
+/**
+ * Should we return fragment as text, rather than text of fragment?
+ * @param selected true to return fragment.
+ */
+public void setFragment(boolean selected) {
+setProperty(FRAGMENT, selected, false);
+}
+
/*= internal business =*/
/**
* Converts (X)HTML response to DOM object Tree.
@@ -249,13 +277,17 @@
for (int i = 0 ; i length; i++) {
Node match = matches.item(i);
if ( match instanceof Element){
-// elements have empty nodeValue, but we are usually
interested in their content
- final Node firstChild = match.getFirstChild();
- if (firstChild != null) {
- val = firstChild.getNodeValue();
- } else {
- val = match.getNodeValue(); // TODO is this correct?
- }
+if (getFragment()){
+val = getValueForNode(match);
+} else {
+// elements have empty nodeValue, but we are usually
interested in their content
+final Node firstChild = match.getFirstChild();
+if (firstChild != null) {
+val = firstChild.getNodeValue();
+} else
svn commit: r889029 - /jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleEventConverter.java
Author: sebb
Date: Thu Dec 10 00:17:16 2009
New Revision: 889029
URL: http://svn.apache.org/viewvc?rev=889029view=rev
Log:
Javadoc fixes
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleEventConverter.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleEventConverter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleEventConverter.java?rev=889029r1=889028r2=889029view=diff
==
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleEventConverter.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleEventConverter.java
Thu Dec 10 00:17:16 2009
@@ -38,16 +38,13 @@
return $Revision$; //$NON-NLS-1$
}
-/*
- * (non-Javadoc)
- *
- * @see
com.thoughtworks.xstream.converters.Converter#canConvert(java.lang.Class)
- */
+/** {...@inheritdoc} */
@SuppressWarnings(unchecked) // superclass does not use types
public boolean canConvert(Class arg0) {
return SampleEvent.class.equals(arg0);
}
+/** {...@inheritdoc} */
// TODO save hostname; save sample type (plain or http)
public void marshal(Object source, HierarchicalStreamWriter writer,
MarshallingContext context) {
@@ -56,6 +53,7 @@
context.convertAnother(res);
}
+/** {...@inheritdoc} */
// TODO does not work yet; need to determine the sample type
public Object unmarshal(HierarchicalStreamReader reader,
UnmarshallingContext context) {
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r889030 - /jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPResultConverter.java
Author: sebb
Date: Thu Dec 10 00:18:03 2009
New Revision: 889030
URL: http://svn.apache.org/viewvc?rev=889030view=rev
Log:
Javadoc fixes; no need for method to be protected
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPResultConverter.java
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPResultConverter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPResultConverter.java?rev=889030r1=889029r2=889030view=diff
==
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPResultConverter.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPResultConverter.java
Thu Dec 10 00:18:03 2009
@@ -55,24 +55,14 @@
super(arg0);
}
-/*
- * (non-Javadoc)
- *
- * @see
com.thoughtworks.xstream.converters.Converter#canConvert(java.lang.Class)
- */
+/** {...@inheritdoc} */
@SuppressWarnings(unchecked) // superclass does not support types
@Override
public boolean canConvert(Class arg0) {
return HTTPSampleResult.class.equals(arg0);
}
-/*
- * (non-Javadoc)
- *
- * @see
com.thoughtworks.xstream.converters.Converter#marshal(java.lang.Object,
- * com.thoughtworks.xstream.io.HierarchicalStreamWriter,
- * com.thoughtworks.xstream.converters.MarshallingContext)
- */
+/** {...@inheritdoc} */
@Override
public void marshal(Object obj, HierarchicalStreamWriter writer,
MarshallingContext context) {
HTTPSampleResult res = (HTTPSampleResult) obj;
@@ -86,14 +76,7 @@
saveSamplerData(writer, context, res, save);
}
-/*
- * (non-Javadoc)
- *
- * @see
org.apache.jmeter.save.converters.SampleResultConverter#saveSamplerData(com.thoughtworks.xstream.io.HierarchicalStreamWriter,
- * org.apache.jmeter.samplers.SampleResult,
- * org.apache.jmeter.samplers.SampleSaveConfiguration)
- */
-protected void saveSamplerData(HierarchicalStreamWriter writer,
MarshallingContext context, HTTPSampleResult res,
+private void saveSamplerData(HierarchicalStreamWriter writer,
MarshallingContext context, HTTPSampleResult res,
SampleSaveConfiguration save) {
if (save.saveSamplerData(res)) {
writeString(writer, TAG_COOKIES, res.getCookies());
@@ -106,12 +89,7 @@
}
}
-/*
- * (non-Javadoc)
- *
- * @see
com.thoughtworks.xstream.converters.Converter#unmarshal(com.thoughtworks.xstream.io.HierarchicalStreamReader,
- * com.thoughtworks.xstream.converters.UnmarshallingContext)
- */
+/** {...@inheritdoc} */
@Override
public Object unmarshal(HierarchicalStreamReader reader,
UnmarshallingContext context) {
HTTPSampleResult res = (HTTPSampleResult)
createCollection(context.getRequiredType());
@@ -134,7 +112,7 @@
return res;
}
-protected void retrieveHTTPItem(HierarchicalStreamReader reader,
UnmarshallingContext context,
+private void retrieveHTTPItem(HierarchicalStreamReader reader,
UnmarshallingContext context,
HTTPSampleResult res, Object subItem) {
if (subItem instanceof URL) {
res.setURL((URL) subItem);
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r889032 - /jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/JavaScript.java
Author: sebb
Date: Thu Dec 10 00:19:02 2009
New Revision: 889032
URL: http://svn.apache.org/viewvc?rev=889032view=rev
Log:
Use generic error to catch any processing errors
Modified:
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/JavaScript.java
Modified:
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/JavaScript.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/JavaScript.java?rev=889032r1=889031r2=889032view=diff
==
---
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/JavaScript.java
(original)
+++
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/JavaScript.java
Thu Dec 10 00:19:02 2009
@@ -32,10 +32,8 @@
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
import org.mozilla.javascript.Context;
-import org.mozilla.javascript.EcmaError;
-import org.mozilla.javascript.JavaScriptException;
+import org.mozilla.javascript.RhinoException;
import org.mozilla.javascript.Scriptable;
-import org.mozilla.javascript.WrappedException;
public class JavaScript extends AbstractFunction {
@@ -90,13 +88,7 @@
vars.put(varName, resultStr);
}
-} catch (WrappedException e) {
-log.error(Error processing Javascript, e);
-throw new InvalidVariableException();
-} catch (EcmaError e) {
-log.error(Error processing Javascript, e);
-throw new InvalidVariableException();
-} catch (JavaScriptException e) {
+} catch (RhinoException e) {
log.error(Error processing Javascript, e);
throw new InvalidVariableException();
} finally {
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r889041 - /jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
Author: sebb
Date: Thu Dec 10 00:55:34 2009
New Revision: 889041
URL: http://svn.apache.org/viewvc?rev=889041view=rev
Log:
Allow idle time to be set
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java?rev=889041r1=889040r2=889041view=diff
==
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
Thu Dec 10 00:55:34 2009
@@ -844,6 +844,15 @@
time = endTime - startTime - idleTime;
}
}
+
+/**
+ * Set idle time pause.
+ * For use by SampleResultConverter/CSVSaveService.
+ * @param idle long
+ */
+public void setIdleTime(long idle) {
+idleTime = idle;
+}
private void setTimes(long start, long end) {
setStartTime(start);
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r889058 - /jakarta/jmeter/trunk/test/src/org/apache/jmeter/gui/action/TestLoad.java
Author: sebb
Date: Thu Dec 10 02:12:16 2009
New Revision: 889058
URL: http://svn.apache.org/viewvc?rev=889058view=rev
Log:
Improve error handling
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/gui/action/TestLoad.java
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/gui/action/TestLoad.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/gui/action/TestLoad.java?rev=889058r1=889057r2=889058view=diff
==
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/gui/action/TestLoad.java
(original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/gui/action/TestLoad.java
Thu Dec 10 02:12:16 2009
@@ -96,6 +96,7 @@
}
private void assertTree(HashTree tree) throws Exception {
+assertNotNull(parent+: + testFile.getName()+ caused null tree:
,tree);
final Object object = tree.getArray()[0];
final String name = testFile.getName();
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r889059 - in /jakarta/jmeter/trunk: bin/ bin/testfiles/ lib/ src/core/org/apache/jmeter/gui/action/ src/core/org/apache/jmeter/reporters/ src/core/org/apache/jmeter/samplers/ src/core/org/
Author: sebb
Date: Thu Dec 10 02:13:53 2009
New Revision: 889059
URL: http://svn.apache.org/viewvc?rev=889059view=rev
Log:
Drop support for Avalon format JMX and JTL files
Removed:
jakarta/jmeter/trunk/bin/testfiles/GuiTest203.jmx
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/OldSaveService.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/TestElementSaver.java
Modified:
jakarta/jmeter/trunk/bin/jmeter.properties
jakarta/jmeter/trunk/lib/aareadme.txt
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementConverter.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportSave.java
jakarta/jmeter/trunk/xdocs/changes.xml
Modified: jakarta/jmeter/trunk/bin/jmeter.properties
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/bin/jmeter.properties?rev=889059r1=889058r2=889059view=diff
==
--- jakarta/jmeter/trunk/bin/jmeter.properties (original)
+++ jakarta/jmeter/trunk/bin/jmeter.properties Thu Dec 10 02:13:53 2009
@@ -40,11 +40,10 @@
# file_format.testlog - affects JTL files only
#
# Possible values are:
-# 2.0 - original format
# 2.1 - initial format using XStream
# 2.2 - updated format using XStream, with shorter names
-# Note: JMeter 2.2 does not support file_format.testlog=2.1 - only 2.0 and 2.2
+# N.B. format 2.0 (Avalon) is no longer supported
#---
# XML Parser
Modified: jakarta/jmeter/trunk/lib/aareadme.txt
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/lib/aareadme.txt?rev=889059r1=889058r2=889059view=diff
==
--- jakarta/jmeter/trunk/lib/aareadme.txt (original)
+++ jakarta/jmeter/trunk/lib/aareadme.txt Thu Dec 10 02:13:53 2009
@@ -4,8 +4,8 @@
avalon-framework-4.1.4 (org.apache.avalon.framework)
--
-- LogKit (used by HttpClient ?)
-- Configuration (ResultCollector, SaveService, SampleResult, TestElementSaver)
+- LogKit (LoggingManager)
+- Configuration (DataSourceElement)
bsf-2.4.0.jar (org.apache.bsf)
-
@@ -61,8 +61,7 @@
excalibur-datasource-1.1.1 (org.apache.avalon.excalibur.datasource)
--
-- jdbc - DataSourceElement
-- JDBCSampler
+- DataSourceElement (JDBC)
excalibur-instrument-1.0 (org.apache.excalibur.instrument)
@@ -70,7 +69,6 @@
excalibur-logger-1.1 (org.apache.avalon.excalibur.logger)
-- httpclient?
- LoggingManager
excalibur-pool-1.2 (org.apache.avalon.excalibur.pool)
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java?rev=889059r1=889058r2=889059view=diff
==
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java Thu
Dec 10 02:13:53 2009
@@ -34,7 +34,6 @@
import org.apache.jmeter.gui.GuiPackage;
import org.apache.jmeter.gui.tree.JMeterTreeNode;
import org.apache.jmeter.gui.util.FileDialoger;
-import org.apache.jmeter.save.OldSaveService;
import org.apache.jmeter.save.SaveService;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.util.JMeterUtils;
@@ -136,11 +135,7 @@
FileOutputStream ostream = null;
try {
ostream = new FileOutputStream(updateFile);
-if (SaveService.isSaveTestPlanFormat20()) {
-OldSaveService.saveSubTree(subTree, ostream);
-} else {
-SaveService.saveTree(subTree, ostream);
-}
+SaveService.saveTree(subTree, ostream);
} catch (Throwable ex) {
GuiPackage.getInstance().setTestPlanFile(null);
log.error(, ex);
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java?rev=889059r1=889058r2=889059view=diff
==
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
Thu Dec 10 02:13:53 2009
@@ -35,7
svn commit: r889060 - /jakarta/jmeter/trunk/xdocs/usermanual/listeners.xml
Author: sebb
Date: Thu Dec 10 02:24:26 2009
New Revision: 889060
URL: http://svn.apache.org/viewvc?rev=889060view=rev
Log:
Drop description of Avalon format JTL files
Modified:
jakarta/jmeter/trunk/xdocs/usermanual/listeners.xml
Modified: jakarta/jmeter/trunk/xdocs/usermanual/listeners.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/usermanual/listeners.xml?rev=889060r1=889059r2=889060view=diff
==
--- jakarta/jmeter/trunk/xdocs/usermanual/listeners.xml (original)
+++ jakarta/jmeter/trunk/xdocs/usermanual/listeners.xml Thu Dec 10 02:24:26 2009
@@ -282,39 +282,7 @@
/section
-section name=sect-num;.5 XML Log format 2.0 anchor=xmlformat2.0
-p
-The format of the original XML (2.0) is as follows (line breaks will be
different):
-/p
-pre
-amp;lt;?xml version=1.0 encoding=UTF-8?
-amp;lt;testResults version=1.2
-amp;lt;sampleResult timeStamp=1144365463297 dataType=text
threadName=Listen 1-1
- label=HTTP Request time=1502
- responseMessage=OK responseCode=200 success=true
- amp;lt;sampleResult timeStamp=1144365464238 dataType=text
threadName=Listen 1-1
-label=http://www.apache.org/style/style.css; time=171
-responseMessage=OK responseCode=200 success=true
- amp;lt;property xml:space=preserve name=samplerData
- GET http://www.apache.org/style/style.css
- amp;lt;/property
- amp;lt;binary
- body, td, th {
-font-size: 95%;
-font-family: Arial, Geneva, Helvetica, sans-serif;
-color: black;
-background-color: white;
- }
- ...
- amp;lt;/binary
- amp;lt;/sampleResult
-amp;lt;/sampleResult
-...
-amp;lt;/testResults
-/pre
-/section
-
-section name=sect-num;.6 XML Log format 2.1 anchor=xmlformat2.1
+section name=sect-num;.5 XML Log format 2.1 anchor=xmlformat2.1
p
The format of the updated XML (2.1) is as follows (line breaks will be
different):
/p
@@ -407,6 +375,12 @@
/p
/section
+section name=sect-num;.6 XML Log format 2.2 anchor=xmlformat2.2
+p
+The format of the JTL files is identical for 2.2 and 2.1. Format 2.2 only
affects JMX files.
+/p
+/section
+
section name=sect-num;.7 Sample Attributes anchor=attributes
p
The sample attributes have the following meaning:
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r885849 - in /jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources: messages_fr.properties messages_pl.properties messages_pt_BR.properties messages_tr.properties
Author: sebb Date: Tue Dec 1 18:09:46 2009 New Revision: 885849 URL: http://svn.apache.org/viewvc?rev=885849view=rev Log: Obsolete entries Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pl.properties jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pt_BR.properties jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_tr.properties Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties?rev=885849r1=885848r2=885849view=diff == --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties Tue Dec 1 18:09:46 2009 @@ -762,7 +762,6 @@ view_results_latency=Latence \: view_results_load_time=Temps de r\u00E9ponse \: view_results_render=Rendu \: -view_results_render_embedded=T\u00E9l\u00E9charger les ressources incluses view_results_render_html=HTML view_results_render_json=JSON view_results_render_text=Texte brut Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pl.properties URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pl.properties?rev=885849r1=885848r2=885849view=diff == --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pl.properties (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pl.properties Tue Dec 1 18:09:46 2009 @@ -837,7 +837,6 @@ variable_name_param=Name of variable (may include variable and function references) view_graph_tree_title=View Graph Tree view_results_in_table=View Results in Table -view_results_render_embedded=Download embedded resources view_results_render_html=Render HTML view_results_render_json=Render JSON view_results_render_text=Show Text Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pt_BR.properties URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pt_BR.properties?rev=885849r1=885848r2=885849view=diff == --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pt_BR.properties (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pt_BR.properties Tue Dec 1 18:09:46 2009 @@ -871,7 +871,6 @@ view_results_in_table=Ver Resultados em Tabela view_results_latency=Lat\u00EAncia\: view_results_load_time=Tempo de Carga\: -view_results_render_embedded=Download recursos embutidos view_results_render_html=Renderizar HTML view_results_render_json=Renderizar JSON view_results_render_text=Exibir Texto Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_tr.properties URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_tr.properties?rev=885849r1=885848r2=885849view=diff == --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_tr.properties (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_tr.properties Tue Dec 1 18:09:46 2009 @@ -818,7 +818,6 @@ variable_name_param=De\u011Fi\u015Fken ismi (de\u011Fi\u015Fken ve fonksiyon referanslar\u0131 i\u00E7erebilir) view_graph_tree_title=Grafik A\u011Fac\u0131n\u0131 G\u00F6ster view_results_in_table=Sonu\u00E7 Tablosunu G\u00F6ster -view_results_render_embedded=G\u00F6m\u00FCl\u00FC kaynaklar\u0131 indir view_results_render_html=HTML i\u015Fle view_results_render_json=JSON i\u015Fle view_results_render_text=Metin G\u00F6ster - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r885851 - in /jakarta/jmeter/trunk/src: components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java core/org/apache/jmeter/util/JMeterUtils.java jorphan/org/apache/jorphan/refl
Author: sebb
Date: Tue Dec 1 18:11:50 2009
New Revision: 885851
URL: http://svn.apache.org/viewvc?rev=885851view=rev
Log:
Oops! Jorphan cannot invoke methods in JMeterUtils, so move the method there
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java?rev=885851r1=885850r2=885851view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
Tue Dec 1 18:11:50 2009
@@ -55,7 +55,6 @@
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.visualizers.gui.AbstractVisualizer;
import org.apache.jorphan.logging.LoggingManager;
-import org.apache.jorphan.reflect.ClassFinder;
import org.apache.log.Logger;
/**
@@ -278,7 +277,7 @@
// if no results render in jmeter.properties, load Standard (default)
ListString classesToAdd = Collections.StringemptyList();
try {
-classesToAdd =
ClassFinder.findClassesThatExtend(ResultRenderer.class);
+classesToAdd =
JMeterUtils.findClassesThatExtend(ResultRenderer.class);
} catch (IOException e1) {
// ignored
}
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java?rev=885851r1=885850r2=885851view=diff
==
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java Tue
Dec 1 18:11:50 2009
@@ -33,6 +33,7 @@
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Iterator;
+import java.util.List;
import java.util.Locale;
import java.util.MissingResourceException;
import java.util.Properties;
@@ -50,6 +51,7 @@
import org.apache.commons.io.IOUtils;
import org.apache.jmeter.gui.GuiPackage;
import org.apache.jorphan.logging.LoggingManager;
+import org.apache.jorphan.reflect.ClassFinder;
import org.apache.jorphan.test.UnitTestManager;
import org.apache.jorphan.util.JOrphanUtils;
import org.apache.log.Logger;
@@ -265,6 +267,20 @@
getProperties(file);
}
+/**
+ * Convenience method for
+ * {...@link ClassFinder#findClassesThatExtend(String[], Class[], boolean)}
+ * with the option to include inner classes in the search set to false
+ * and the path list is derived from JMeterUtils.getSearchPaths().
+ *
+ * @param superClass - single class to search for
+ * @return List of Strings containing discovered class names.
+ */
+public static ListString findClassesThatExtend(Class? superClass)
+throws IOException {
+return ClassFinder.findClassesThatExtend(getSearchPaths(), new
Class[]{superClass}, false);
+}
+
public static String[] getSearchPaths() {
String p = JMeterUtils.getPropDefault(search_paths, null); //
$NON-NLS-1$
String[] result = new String[1];
Modified:
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java?rev=885851r1=885850r2=885851view=diff
==
---
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java
(original)
+++
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java
Tue Dec 1 18:11:50 2009
@@ -35,7 +35,6 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
-import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.jorphan.util.JOrphanUtils;
import org.apache.log.Logger;
@@ -149,20 +148,6 @@
/**
* Convenience method for
* {...@link #findClassesThatExtend(String[], Class[], boolean)}
- * with the option to include inner classes in the search set to false
- * and the path list is derived from JMeterUtils.getSearchPaths().
- *
- * @param superClass - single class to search for
- * @return List of Strings containing discovered class names.
- */
-public static ListString findClassesThatExtend(Class? superClass)
-throws IOException {
-return findClassesThatExtend
svn commit: r885864 - /jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsRegexp.java
Author: sebb
Date: Tue Dec 1 18:53:24 2009
New Revision: 885864
URL: http://svn.apache.org/viewvc?rev=885864view=rev
Log:
Display message for non-text responses
General tidy
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsRegexp.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsRegexp.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsRegexp.java?rev=885864r1=885863r2=885864view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsRegexp.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsRegexp.java
Tue Dec 1 18:53:24 2009
@@ -41,8 +41,6 @@
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.gui.GuiUtils;
import org.apache.jorphan.gui.JLabeledTextField;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
import org.apache.oro.text.PatternCacheLRU;
import org.apache.oro.text.regex.MatchResult;
import org.apache.oro.text.regex.Pattern;
@@ -55,8 +53,6 @@
*/
public class RenderAsRegexp implements ResultRenderer, ActionListener {
-private static final Logger log = LoggingManager.getLoggerForClass();
-
private static final String REGEXP_TESTER_COMMAND = regexp_tester; //
$NON-NLS-1$
private JPanel regexpPane;
@@ -73,7 +69,10 @@
/** {...@inheritdoc} */
public void clearData() {
-this.clearFields();
+this.regexpDataField.setText(); // $NON-NLS-1$
+// don't set empty to keep regexp
+// regexpField.setText(); // $NON-NLS-1$
+this.regexpResultField.setText(); // $NON-NLS-1$
}
/** {...@inheritdoc} */
@@ -103,7 +102,6 @@
private void executeAndShowRegexpTester(String textToParse) {
if (textToParse != null textToParse.length() 0
this.regexpField.getText().length() 0) {
-log.debug(regexpField = + this.regexpField.getText());
this.regexpResultField.setText(process(textToParse));
}
}
@@ -116,26 +114,18 @@
PatternCacheLRU pcLRU = new PatternCacheLRU();
Pattern pattern = pcLRU.getPattern(regexpField.getText(),
Perl5Compiler.READ_ONLY_MASK);
ListMatchResult matches = new LinkedListMatchResult();
-int x = 0;
-boolean done = false;
-do {
-if (matcher.contains(input, pattern)) {
-//log.debug(RegexExtractor: Match found!);
-matches.add(matcher.getMatch());
-} else {
-done = true;
-}
-x++;
-} while (!done);
-
+while (matcher.contains(input, pattern)) {
+matches.add(matcher.getMatch());
+}
// Construct a multi-line string with all matches
-StringBuffer sb = new StringBuffer();
-for (int j = 0; j matches.size(); j++) {
+StringBuilder sb = new StringBuilder();
+final int size = matches.size();
+sb.append(Match count: ).append(size).append(\n);
+for (int j = 0; j size; j++) {
MatchResult mr = matches.get(j);
final int groups = mr.groups();
for (int i = 0; i groups; i++) {
-sb.append( group[ + j + ][ + i + ]= + mr.group(i) +
\n);
-
+
sb.append(Match[).append(j+1).append(][).append(i).append(]=).append(mr.group(i)).append(\n);
}
}
return sb.toString();
@@ -143,15 +133,10 @@
}
/** {...@inheritdoc} */
public void renderResult(SampleResult sampleResult) {
-this.clearFields();
-
-if ((SampleResult.TEXT).equals(sampleResult.getDataType())) {
-String response =
ViewResultsFullVisualizer.getResponseAsString(sampleResult);
-regexpDataField.setText(response);
-regexpDataField.setCaretPosition(0);
-} else {
-
regexpDataField.setText(JMeterUtils.getResString(regexp_render_no_text));
-}
+ clearData();
+String response =
ViewResultsFullVisualizer.getResponseAsString(sampleResult);
+regexpDataField.setText(response);
+regexpDataField.setCaretPosition(0);
}
/** {...@inheritdoc} */
@@ -194,7 +179,7 @@
regexpField = new
JLabeledTextField(JMeterUtils.getResString(regexp_tester_field), 30); //
$NON-NLS-1$
regexpActionPanel.add(regexpField, BorderLayout.WEST);
-JButton regexpTester = new
JButton(JMeterUtils.getResString(regexp_tester_button_test));
+JButton regexpTester = new
JButton(JMeterUtils.getResString(regexp_tester_button_test)); // $NON-NLS-1$
regexpTester.setActionCommand(REGEXP_TESTER_COMMAND);
regexpTester.addActionListener(this);
regexpActionPanel.add(regexpTester, BorderLayout.EAST
svn commit: r885865 - /jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
Author: sebb
Date: Tue Dec 1 18:54:28 2009
New Revision: 885865
URL: http://svn.apache.org/viewvc?rev=885865view=rev
Log:
Default to Text renderer; general tidyup
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java?rev=885865r1=885864r2=885865view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
Tue Dec 1 18:54:28 2009
@@ -223,7 +223,7 @@
}
Object userObject = node.getUserObject();
resultsRender.setSamplerResult(userObject);
-resultsRender.setupTabPane();
+resultsRender.setupTabPane(); // Processes Assertions
// display a SampleResult
if (userObject instanceof SampleResult) {
SampleResult sampleResult = (SampleResult) userObject;
@@ -267,7 +267,7 @@
* Create the drop-down list to changer render
* @return List of all render (implement ResultsRender)
*/
-private Component createComboRender() {// TODO move to bottom of renderer
+private Component createComboRender() {
ComboBoxModel nodesModel = new DefaultComboBoxModel();
// drop-down list for renderer
selectRenderPanel = new JComboBox(nodesModel);
@@ -281,16 +281,22 @@
} catch (IOException e1) {
// ignored
}
+String textRenderer =
JMeterUtils.getResString(view_results_render_text); // $NON-NLS-1$
+Object textObject = null;
for (String clazz : classesToAdd) {
try {
// Instantiate render classes
final ResultRenderer renderer = (ResultRenderer)
Class.forName(clazz).newInstance();
+if (textRenderer.equals(renderer.toString())){
+textObject=renderer;
+}
renderer.setBackgroundColor(getBackground());
selectRenderPanel.addItem(renderer);
} catch (Exception e) {
log.warn(Error in load result render: + clazz, e);
}
}
+nodesModel.setSelectedItem(textObject); // preset to Text option
return selectRenderPanel;
}
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r885866 - in /jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers: RenderAsHTML.java RenderAsText.java RenderAsXML.java SamplerResultTab.java
Author: sebb
Date: Tue Dec 1 18:54:42 2009
New Revision: 885866
URL: http://svn.apache.org/viewvc?rev=885866view=rev
Log:
Tidyup
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsHTML.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsText.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsXML.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SamplerResultTab.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsHTML.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsHTML.java?rev=885866r1=885865r2=885866view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsHTML.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsHTML.java
Tue Dec 1 18:54:42 2009
@@ -32,13 +32,9 @@
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.logging.LoggingManager;
-import org.apache.log.Logger;
public class RenderAsHTML extends SamplerResultTab implements ResultRenderer {
-private static final Logger log = LoggingManager.getLoggerForClass();
-
private static final String TEXT_HTML = text/html; // $NON-NLS-1$
// Keep copies of the two editors needed
@@ -82,7 +78,6 @@
* To disable downloading and rendering of images and frames, enable
the
* editor-kit. The Stream property can then be
*/
-log.debug(html embedded= + embedded);
// Must be done before setContentType
results.setEditorKitForContentType(TEXT_HTML, embedded ?
defaultHtmlEditor : customisedEditor);
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsText.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsText.java?rev=885866r1=885865r2=885866view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsText.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsText.java
Tue Dec 1 18:54:42 2009
@@ -40,7 +40,7 @@
/** {...@inheritdoc} */
@Override
public String toString() {
-return JMeterUtils.getResString(view_results_render_text);
+return JMeterUtils.getResString(view_results_render_text); //
$NON-NLS-1$
}
}
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsXML.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsXML.java?rev=885866r1=885865r2=885866view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsXML.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsXML.java
Tue Dec 1 18:54:42 2009
@@ -89,11 +89,11 @@
resultsScrollPane.setViewportView(domTreePanel);
}
-/**
+/*
*
* A Dom tree panel for to display response as tree view author a
- * href=mailto:d.ma...@mdl.com;Dave Maung/a TODO implement to find any
- * nodes in the tree using TreePath.
+ * href=mailto:d.ma...@mdl.com;Dave Maung/a
+ * TODO implement to find any nodes in the tree using TreePath.
*
*/
private static class DOMTreePanel extends JPanel {
@@ -117,7 +117,7 @@
ToolTipManager.sharedInstance().registerComponent(domJTree);
domJTree.setCellRenderer(new DomTreeRenderer());
} catch (SAXException e) {
-log.warn(, e);
+log.warn(Error trying to parse document, e);
}
}
@@ -216,7 +216,7 @@
/** {...@inheritdoc} */
@Override
public String toString() {
-return JMeterUtils.getResString(view_results_render_xml);
+return JMeterUtils.getResString(view_results_render_xml); //
$NON-NLS-1$
}
}
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SamplerResultTab.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SamplerResultTab.java?rev=885866r1=885865r2=885866view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SamplerResultTab.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/SamplerResultTab.java
Tue Dec 1 18:54:42 2009
@@ -45,13 +45,9 @@
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.util.JMeterUtils
svn commit: r885910 - in /jakarta/jmeter/trunk: docs/images/screenshots/ xdocs/ xdocs/images/screenshots/ xdocs/usermanual/
Author: sebb Date: Tue Dec 1 20:26:37 2009 New Revision: 885910 URL: http://svn.apache.org/viewvc?rev=885910view=rev Log: Document Bug 47474 - View Results Tree support for plugin renderers Added: jakarta/jmeter/trunk/docs/images/screenshots/view_results_tree_regex.png (with props) jakarta/jmeter/trunk/xdocs/images/screenshots/view_results_tree_regex.png (with props) Modified: jakarta/jmeter/trunk/docs/images/screenshots/view_results_tree.png jakarta/jmeter/trunk/xdocs/changes.xml jakarta/jmeter/trunk/xdocs/images/screenshots/view_results_tree.png jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml Modified: jakarta/jmeter/trunk/docs/images/screenshots/view_results_tree.png URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/images/screenshots/view_results_tree.png?rev=885910r1=885909r2=885910view=diff == Binary files - no diff available. Added: jakarta/jmeter/trunk/docs/images/screenshots/view_results_tree_regex.png URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/images/screenshots/view_results_tree_regex.png?rev=885910view=auto == Binary file - no diff available. Propchange: jakarta/jmeter/trunk/docs/images/screenshots/view_results_tree_regex.png -- svn:mime-type = image/png Modified: jakarta/jmeter/trunk/xdocs/changes.xml URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=885910r1=885909r2=885910view=diff == --- jakarta/jmeter/trunk/xdocs/changes.xml (original) +++ jakarta/jmeter/trunk/xdocs/changes.xml Tue Dec 1 20:26:37 2009 @@ -146,6 +146,7 @@ liBug 36726 - add search function to Tree View Listener/li liBug 47869 - Ability to cleanup fields of SampleResult/li liBug 47952 - Added JSR223 Listener/li +liBug 47474 - View Results Tree support for plugin renderers/li /ul h3Timers, Assertions, Config, Pre- amp; Post-Processors/h3 Modified: jakarta/jmeter/trunk/xdocs/images/screenshots/view_results_tree.png URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/images/screenshots/view_results_tree.png?rev=885910r1=885909r2=885910view=diff == Binary files - no diff available. Added: jakarta/jmeter/trunk/xdocs/images/screenshots/view_results_tree_regex.png URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/images/screenshots/view_results_tree_regex.png?rev=885910view=auto == Binary file - no diff available. Propchange: jakarta/jmeter/trunk/xdocs/images/screenshots/view_results_tree_regex.png -- svn:mime-type = image/png Modified: jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=885910r1=885909r2=885910view=diff == --- jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml (original) +++ jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml Tue Dec 1 20:26:37 2009 @@ -2060,23 +2060,30 @@ /links /component -component name=View Results Tree index=sect-num;.3.6 width=791 height=506 screenshot=view_results_tree.png +component name=View Results Tree index=sect-num;.3.6 width=778 height=642 screenshot=view_results_tree.png descriptionThe View Results Tree shows a tree of all sample responses, allowing you to view the response for any sample. In addition to showing the response, you can see the time it took to get this response, and some response codes. Note that the Request panel only shows the headers added by JMeter. It does not show any headers (such as Host) that may be added by the HTTP protocol implementation. p -There are several ways to view the response, selectable by a radio button./p +There are several ways to view the response, selectable by a drop-down box at the bottom of the left hand panel./p ul -liShow text/li -liRender HTML/li -liRender XML/li -liRender JSON/li +liHTML/li +liHTML (download embedded resources)/li +liJSON/li +liRegexp Tester/li +liText/li +liXML/li /ul p -The default Show text view shows all of the text contained in the -response. +Additional renderers can be created. +The class must implement the interface codeorg.apache.jmeter.visualizers.ResultRenderer/code +and/or extend the abstract class codeorg.apache.jmeter.visualizers.SamplerResultTab/code, and the +compiled code must be available to JMeter (e.g. by adding it to the lib/ext directory). +/p +p +The default Text view shows all of the text
Re: DO NOT REPLY [Bug 47474] View Results Tree support for plugin renderers
OK, done. On 01/12/2009, Milamber milambersp...@gmail.com wrote: Hello Seb, Many thanks for your works and your svn commit. It's a great news for me. In attach, a small patch for better display of french version for bug 48300 (source ip address) and regexp tester (button Test is hidden in french localisation) (it's just remove length attribut in JLabeledTextField()) Thanks again. Milamber Le 01/12/2009 20:34, bugzi...@apache.org a ecrit : https://issues.apache.org/bugzilla/show_bug.cgi?id=47474 Sebbs...@apache.org changed: What|Removed |Added Status|NEW |RESOLVED Resolution||FIXED --- Comment #13 from Sebbs...@apache.org 2009-12-01 12:34:16 UTC --- Added some docn - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r886009 - /jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
Author: sebb
Date: Tue Dec 1 23:40:15 2009
New Revision: 886009
URL: http://svn.apache.org/viewvc?rev=886009view=rev
Log:
One more warning fixed ...
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java?rev=886009r1=886008r2=886009view=diff
==
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
Tue Dec 1 23:40:15 2009
@@ -288,7 +288,9 @@
Object item = iter.next();
if (newColl == null) {
try {
-newColl = coll.getClass().newInstance();
+@SuppressWarnings(unchecked) // coll is of the correct
type
+final ClassCollectionJMeterProperty class1 =
(ClassCollectionJMeterProperty) coll.getClass();
+newColl = class1.newInstance();
} catch (Exception e) {
log.error(Bad collection, e);
return coll;
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r885401 - /jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculator.java
Author: sebb
Date: Mon Nov 30 12:49:01 2009
New Revision: 885401
URL: http://svn.apache.org/viewvc?rev=885401view=rev
Log:
Comparable parameters Consume, so should be ? super T
Modified:
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculator.java
Modified:
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculator.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculator.java?rev=885401r1=885400r2=885401view=diff
==
---
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculator.java
(original)
+++
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculator.java
Mon Nov 30 12:49:01 2009
@@ -29,7 +29,7 @@
* It is not threadsafe.
*
*/
-public abstract class StatCalculatorT extends Number ComparableT {
+public abstract class StatCalculatorT extends Number Comparable? super T
{
private final ListT values = new ArrayListT();
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r885579 - /jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java
Author: sebb
Date: Mon Nov 30 20:33:22 2009
New Revision: 885579
URL: http://svn.apache.org/viewvc?rev=885579view=rev
Log:
Add convenience method findClassesThatExtend(Class? superClass)
Make lowest level method private
Modified:
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java
Modified:
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java?rev=885579r1=885578r2=885579view=diff
==
---
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java
(original)
+++
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java
Mon Nov 30 20:33:22 2009
@@ -35,6 +35,7 @@
import java.util.zip.ZipEntry;
import java.util.zip.ZipFile;
+import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.logging.LoggingManager;
import org.apache.jorphan.util.JOrphanUtils;
import org.apache.log.Logger;
@@ -147,7 +148,21 @@
/**
* Convenience method for
- * codefindClassesThatExtend(Class[], boolean)/code
+ * {...@link #findClassesThatExtend(String[], Class[], boolean)}
+ * with the option to include inner classes in the search set to false
+ * and the path list is derived from JMeterUtils.getSearchPaths().
+ *
+ * @param superClass - single class to search for
+ * @return List of Strings containing discovered class names.
+ */
+public static ListString findClassesThatExtend(Class? superClass)
+throws IOException {
+return findClassesThatExtend(JMeterUtils.getSearchPaths(), new
Class[]{superClass}, false);
+}
+
+/**
+ * Convenience method for
+ * {...@link #findClassesThatExtend(String[], Class[], boolean)}
* with the option to include inner classes in the search set to false.
*
* @return List of Strings containing discovered class names.
@@ -252,8 +267,7 @@
*
* @return List containing discovered classes
*/
-@SuppressWarnings(unchecked)
-public static ListString findClassesThatExtend(String[] strPathsOrJars,
+private static ListString findClassesThatExtend(String[] strPathsOrJars,
final Class?[] classNames, final boolean innerClasses,
String contains, String notContains, boolean annotations)
throws IOException {
@@ -281,9 +295,11 @@
}
}
+@SuppressWarnings(unchecked) // Should only be called with classes
that extend annotations
+final Class? extends Annotation[] annoclassNames = (Class? extends
Annotation[]) classNames;
SetString listClasses =
annotations ?
-new AnnoFilterTreeSet((Class? extends Annotation[])
classNames, innerClasses)
+new AnnoFilterTreeSet(annoclassNames, innerClasses)
:
new FilterTreeSet(classNames, innerClasses, contains,
notContains);
// first get all the classes
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r885648 [2/2] - in /jakarta/jmeter/trunk/src: components/org/apache/jmeter/visualizers/ core/org/apache/jmeter/resources/ jorphan/org/apache/jorphan/gui/
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java?rev=885648r1=885647r2=885648view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java
Tue Dec 1 01:51:15 2009
@@ -9,64 +9,39 @@
* 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.
+ * 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.visualizers;
import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Component;
import java.awt.Dimension;
-import java.awt.Font;
-import java.awt.GridLayout;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
-import java.io.ByteArrayInputStream;
-import java.io.StringWriter;
-import java.text.DateFormat;
-import java.text.SimpleDateFormat;
-import java.util.Date;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-import javax.swing.BorderFactory;
-import javax.swing.Box;
-import javax.swing.BoxLayout;
-import javax.swing.ButtonGroup;
-import javax.swing.Icon;
+import java.io.IOException;
+import java.util.Collections;
+import java.util.List;
+
+import javax.swing.ComboBoxModel;
+import javax.swing.DefaultComboBoxModel;
import javax.swing.ImageIcon;
-import javax.swing.JCheckBox;
-import javax.swing.JEditorPane;
-import javax.swing.JLabel;
-import javax.swing.JOptionPane;
-import javax.swing.JPanel;
-import javax.swing.JRadioButton;
+import javax.swing.JComboBox;
import javax.swing.JScrollPane;
import javax.swing.JSplitPane;
import javax.swing.JTabbedPane;
-import javax.swing.JTextArea;
-import javax.swing.JTextPane;
import javax.swing.JTree;
-import javax.swing.ToolTipManager;
import javax.swing.event.TreeSelectionEvent;
import javax.swing.event.TreeSelectionListener;
-import javax.swing.text.BadLocationException;
-import javax.swing.text.ComponentView;
-import javax.swing.text.Document;
-import javax.swing.text.EditorKit;
-import javax.swing.text.Element;
-import javax.swing.text.Style;
-import javax.swing.text.StyleConstants;
-import javax.swing.text.StyledDocument;
-import javax.swing.text.View;
-import javax.swing.text.ViewFactory;
-import javax.swing.text.html.HTML;
-import javax.swing.text.html.HTMLEditorKit;
import javax.swing.tree.DefaultMutableTreeNode;
import javax.swing.tree.DefaultTreeCellRenderer;
import javax.swing.tree.DefaultTreeModel;
@@ -74,127 +49,49 @@
import javax.swing.tree.TreeSelectionModel;
import org.apache.jmeter.assertions.AssertionResult;
+import org.apache.jmeter.gui.util.VerticalPanel;
import org.apache.jmeter.samplers.Clearable;
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jmeter.util.XPathUtil;
import org.apache.jmeter.visualizers.gui.AbstractVisualizer;
import org.apache.jorphan.logging.LoggingManager;
-import org.apache.jorphan.util.JOrphanUtils;
+import org.apache.jorphan.reflect.ClassFinder;
import org.apache.log.Logger;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-import org.w3c.tidy.Tidy;
-import org.xml.sax.SAXException;
/**
- * Allows the tester to view the textual response from sampling an Entry. This
- * also allows to single step through the sampling process via a nice
- * Continue button.
+ * Base for ViewResults
*
- * Created 2001/07/25
*/
public class ViewResultsFullVisualizer extends AbstractVisualizer
-implements ActionListener, TreeSelectionListener, Clearable
-{
+implements ActionListener, TreeSelectionListener, Clearable {
-private static final long serialVersionUID = 1L;
+private static final long serialVersionUID = 7338676747296593842L;
private static final Logger log = LoggingManager.getLoggerForClass();
-// Maximum size that we will display
-private static final int MAX_DISPLAY_SIZE =
-JMeterUtils.getPropDefault(view.results.tree.max_size, 200 * 1024);
// $NON-NLS-1$
-
-// N.B. these are not multi-threaded, so don't make it static
-private final DateFormat dateFormat = new SimpleDateFormat(-MM-dd
HH:mm:ss z); // ISO format $NON-NLS-1$
-
-private static final String NL = \n; // $NON-NLS-1$
-
-private static final byte[] XML_PFX = ?xml
svn commit: r885226 - /jakarta/jmeter/trunk/build.xml
Author: sebb
Date: Sun Nov 29 13:38:52 2009
New Revision: 885226
URL: http://svn.apache.org/viewvc?rev=885226view=rev
Log:
Standardise on pathelement location
Modified:
jakarta/jmeter/trunk/build.xml
Modified: jakarta/jmeter/trunk/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/build.xml?rev=885226r1=885225r2=885226view=diff
==
--- jakarta/jmeter/trunk/build.xml (original)
+++ jakarta/jmeter/trunk/build.xml Sun Nov 29 13:38:52 2009
@@ -705,13 +705,13 @@
rmic base=${build.core}
classname=org.apache.jmeter.engine.RemoteJMeterEngineImpl
classpath
pathelement location=${build.jorphan}/
-pathelement path=${build.core}/
+pathelement location=${build.core}/
path refid=classpath/
/classpath
/rmic
rmic base=${build.core}
classname=org.apache.jmeter.samplers.RemoteSampleListenerImpl
classpath
-pathelement path=${build.core}/
+pathelement location=${build.core}/
path refid=classpath/
/classpath
/rmic
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r885312 - in /jakarta/jmeter/trunk: docs/images/screenshots/webtest/ src/core/org/apache/jmeter/resources/ src/protocol/http/org/apache/jmeter/protocol/http/control/gui/ src/protocol/http/
Author: sebb
Date: Mon Nov 30 02:09:55 2009
New Revision: 885312
URL: http://svn.apache.org/viewvc?rev=885312view=rev
Log:
Bug 48300 - Allow override of IP source address for HTTP HttpClient requests
Modified:
jakarta/jmeter/trunk/docs/images/screenshots/webtest/http-request.png
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui2.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java
jakarta/jmeter/trunk/xdocs/changes.xml
jakarta/jmeter/trunk/xdocs/images/screenshots/webtest/http-request.png
jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml
Modified: jakarta/jmeter/trunk/docs/images/screenshots/webtest/http-request.png
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/images/screenshots/webtest/http-request.png?rev=885312r1=885311r2=885312view=diff
==
Binary files - no diff available.
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=885312r1=885311r2=885312view=diff
==
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
Mon Nov 30 02:09:55 2009
@@ -923,6 +923,7 @@
web_server_client=Client implementation:
web_server_domain=Server Name or IP\:
web_server_port=Port Number\:
+web_testing2_source_ip=Source IP address:
web_testing2_title=HTTP Request HTTPClient
web_testing_embedded_url_pattern=Embedded URLs must match\:
web_testing_retrieve_images=Retrieve All Embedded Resources from HTML Files
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties?rev=885312r1=885311r2=885312view=diff
==
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
Mon Nov 30 02:09:55 2009
@@ -789,6 +789,7 @@
web_server_timeout_connect=Connexion \:
web_server_timeout_response=R\u00E9ponse \:
web_server_timeout_title=D\u00E9lai expiration (ms)
+web_testing2_source_ip=Adresse IP source \:
web_testing2_title=Requ\u00EAte HTTP HTTPClient
web_testing_embedded_url_pattern=Les URL \u00E0 inclure doivent correspondre
\u00E0 \:
web_testing_retrieve_images=R\u00E9cup\u00E9rer les ressources incluses
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java?rev=885312r1=885311r2=885312view=diff
==
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui.java
Mon Nov 30 02:09:55 2009
@@ -113,7 +113,7 @@
add(createOptionalTasksPanel(), BorderLayout.SOUTH);
}
-private JPanel createOptionalTasksPanel() {
+protected JPanel createOptionalTasksPanel() {
// OPTIONAL TASKS
JPanel optionalTasksPanel = new VerticalPanel();
optionalTasksPanel.setBorder(BorderFactory.createTitledBorder(BorderFactory.createEtchedBorder(),
JMeterUtils
@@ -134,7 +134,7 @@
// Embedded URL match regex
embeddedRE = new
JLabeledTextField(JMeterUtils.getResString(web_testing_embedded_url_pattern),30);
// $NON-NLS-1$
-optionalTasksPanel.add(embeddedRE);
+optionalTasksPanel.add(embeddedRE, BorderLayout.CENTER);
return optionalTasksPanel;
}
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui2.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui2.java?rev=885312r1=885311r2=885312view=diff
==
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/HttpTestSampleGui2.java
svn commit: r882556 - /jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/ResponseAssertion.java
Author: sebb Date: Fri Nov 20 13:59:28 2009 New Revision: 882556 URL: http://svn.apache.org/viewvc?rev=882556view=rev Log: Tidy up Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/ResponseAssertion.java Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/ResponseAssertion.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/ResponseAssertion.java?rev=882556r1=882555r2=882556view=diff == --- jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/ResponseAssertion.java (original) +++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/ResponseAssertion.java Fri Nov 20 13:59:28 2009 @@ -72,7 +72,7 @@ */ private final static int MATCH = 1 0; -final static int CONTAINS = 1 1; +private final static int CONTAINS = 1 1; private final static int NOT = 1 2; - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r882605 - in /jakarta/jmeter/trunk/test/src/org/apache: jmeter/protocol/http/config/ jmeter/protocol/http/proxy/ jmeter/protocol/http/sampler/ jorphan/
Author: sebb
Date: Fri Nov 20 15:32:35 2009
New Revision: 882605
URL: http://svn.apache.org/viewvc?rev=882605view=rev
Log:
Calls to deprecated methods in test code are deliberate
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/config/MultipartUrlConfigTest.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplers.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplersAgainstHttpMirrorServer.java
jakarta/jmeter/trunk/test/src/org/apache/jorphan/TestFunctorUsers.java
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/config/MultipartUrlConfigTest.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/config/MultipartUrlConfigTest.java?rev=882605r1=882604r2=882605view=diff
==
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/config/MultipartUrlConfigTest.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/config/MultipartUrlConfigTest.java
Fri Nov 20 15:32:35 2009
@@ -31,6 +31,7 @@
super(name);
}
+@SuppressWarnings(deprecation)
public void testConstructors() {
MultipartUrlConfig muc = new MultipartUrlConfig();
assertEquals(0, muc.getArguments().getArgumentCount());
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java?rev=882605r1=882604r2=882605view=diff
==
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/proxy/TestHttpRequestHdr.java
Fri Nov 20 15:32:35 2009
@@ -473,6 +473,7 @@
assertEquals(value,header.getValue());
}
+@SuppressWarnings(deprecation)
public void testPostMultipartFileUpload() throws Exception {
String url = http://localhost/matrix.html;;
// A HTTP POST request, multipart/form-data, simple values,
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java?rev=882605r1=882604r2=882605view=diff
==
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/PostWriterTest.java
Fri Nov 20 15:32:35 2009
@@ -588,6 +588,7 @@
*
* @param httpSampler
*/
+@SuppressWarnings(deprecation)
private void setupFilepart(HTTPSampler httpSampler, String fileField, File
file, String mimeType) {
httpSampler.setFileField(fileField);
if(file != null) {
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplers.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplers.java?rev=882605r1=882604r2=882605view=diff
==
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplers.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/sampler/TestHTTPSamplers.java
Fri Nov 20 15:32:35 2009
@@ -221,6 +221,7 @@
assertEquals(http://www.apache.org/index.html;,
config.getUrl().toString());
}
+@SuppressWarnings(deprecation)
public void testFileList(){
HTTPSamplerBase config = new HTTPNullSampler();
HTTPFileArg[] arg;
@@ -292,6 +293,7 @@
assertEquals(2,arg.length);
}
+@SuppressWarnings(deprecation)
public void testSetAndGetFileField() {
HTTPSamplerBase sampler = new HTTPNullSampler();
sampler.setFileField(param);
@@ -305,6 +307,7 @@
assertEquals(param2, file.getParamName());
}
+@SuppressWarnings(deprecation)
public void testSetAndGetFilename() {
HTTPSamplerBase sampler = new HTTPNullSampler();
sampler.setFilename(name);
@@ -318,6 +321,7 @@
assertEquals(name2, file.getPath());
}
+@SuppressWarnings(deprecation)
public void testSetAndGetMimetype() {
HTTPSamplerBase sampler = new HTTPNullSampler();
sampler.setMimetype(mime
svn commit: r882606 - /jakarta/jmeter/trunk/src/reports/org/apache/jmeter/control/gui/ReportGui.java
Author: sebb
Date: Fri Nov 20 15:32:56 2009
New Revision: 882606
URL: http://svn.apache.org/viewvc?rev=882606view=rev
Log:
Unused
Modified:
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/control/gui/ReportGui.java
Modified:
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/control/gui/ReportGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/control/gui/ReportGui.java?rev=882606r1=882605r2=882606view=diff
==
---
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/control/gui/ReportGui.java
(original)
+++
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/control/gui/ReportGui.java
Fri Nov 20 15:32:56 2009
@@ -23,7 +23,6 @@
import java.awt.Container;
import java.util.Collection;
-import javax.swing.JCheckBox;
import javax.swing.JLabel;
import javax.swing.JMenu;
import javax.swing.JPanel;
@@ -49,8 +48,6 @@
*/
public class ReportGui extends AbstractReportGui {
-private JCheckBox serializedMode;
-
/** A panel to contain comments on the test plan. */
private JTextField commentPanel;
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r882607 - in /jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report: ReportTable.java gui/action/ReportCopy.java gui/tree/ReportTreeModel.java
Author: sebb
Date: Fri Nov 20 15:33:49 2009
New Revision: 882607
URL: http://svn.apache.org/viewvc?rev=882607view=rev
Log:
Document OK unchecked conversions
Modified:
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/ReportTable.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportCopy.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeModel.java
Modified:
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/ReportTable.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/ReportTable.java?rev=882607r1=882606r2=882607view=diff
==
--- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/ReportTable.java
(original)
+++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/ReportTable.java
Fri Nov 20 15:33:49 2009
@@ -20,5 +20,6 @@
import java.util.List;
public interface ReportTable {
+@SuppressWarnings(unchecked) // TODO fix this when there is a real
implementation
String[][] getTableData(List data);
}
Modified:
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportCopy.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportCopy.java?rev=882607r1=882606r2=882607view=diff
==
---
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportCopy.java
(original)
+++
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/action/ReportCopy.java
Fri Nov 20 15:33:49 2009
@@ -100,6 +100,7 @@
}
private static void cloneChildren(ReportTreeNode to, ReportTreeNode from) {
+@SuppressWarnings(unchecked) // OK
EnumerationReportTreeNode enumFrom = from.children();
while (enumFrom.hasMoreElements()) {
ReportTreeNode child = enumFrom.nextElement();
Modified:
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeModel.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeModel.java?rev=882607r1=882606r2=882607view=diff
==
---
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeModel.java
(original)
+++
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/report/gui/tree/ReportTreeModel.java
Fri Nov 20 15:33:49 2009
@@ -68,6 +68,7 @@
*/
public HashTree addSubTree(HashTree subTree, ReportTreeNode current)
throws IllegalUserActionException {
+@SuppressWarnings(unchecked) // OK
IteratorTestElement iter = subTree.list().iterator();
while (iter.hasNext()) {
TestElement item = iter.next();
@@ -130,6 +131,7 @@
if (type.isInstance(node.getUserObject())) {
nodeList.add(node);
}
+@SuppressWarnings(unchecked) // OK
EnumerationReportTreeNode enumNode = node.children();
while (enumNode.hasMoreElements()) {
ReportTreeNode child = enumNode.nextElement();
@@ -142,6 +144,7 @@
if (userObject == node.getUserObject()) {
return node;
}
+@SuppressWarnings(unchecked) // OK
EnumerationReportTreeNode enumNode = node.children();
while (enumNode.hasMoreElements()) {
ReportTreeNode child = enumNode.nextElement();
@@ -155,6 +158,7 @@
public HashTree getCurrentSubTree(ReportTreeNode node) {
ListedHashTree hashTree = new ListedHashTree(node);
+@SuppressWarnings(unchecked) // OK
EnumerationReportTreeNode enumNode = node.children();
while (enumNode.hasMoreElements()) {
ReportTreeNode child = enumNode.nextElement();
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r882608 - in /jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property: AbstractProperty.java MapProperty.java
Author: sebb
Date: Fri Nov 20 15:35:11 2009
New Revision: 882608
URL: http://svn.apache.org/viewvc?rev=882608view=rev
Log:
Use interface rather than abstract implementation
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/MapProperty.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java?rev=882608r1=882607r2=882608view=diff
==
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
Fri Nov 20 15:35:11 2009
@@ -242,7 +242,7 @@
* Get the property type for this property. Used to convert raw values into
* JMeterProperties.
*/
-protected Class? extends AbstractProperty getPropertyType() {
+protected Class? extends JMeterProperty getPropertyType() {
return getClass();
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/MapProperty.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/MapProperty.java?rev=882608r1=882607r2=882608view=diff
==
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/MapProperty.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/MapProperty.java
Fri Nov 20 15:35:11 2009
@@ -76,9 +76,9 @@
* @see AbstractProperty#getPropertyType()
*/
@Override
-protected Class? extends AbstractProperty getPropertyType() {
+protected Class? extends JMeterProperty getPropertyType() {
if (value.size() 0) {
-return (Class? extends AbstractProperty)
valueIterator().next().getClass();
+return valueIterator().next().getClass();
}
return NullProperty.class;
}
@@ -103,6 +103,7 @@
private MapString, JMeterProperty cloneMap() {
try {
+@SuppressWarnings(unchecked) // value is the correct class
MapString, JMeterProperty newCol =
value.getClass().newInstance();
PropertyIterator iter = valueIterator();
while (iter.hasNext()) {
@@ -126,7 +127,7 @@
}
}
-public void setMap(Map newMap) {
+public void setMap(Map?,? newMap) {
value = normalizeMap(newMap);
}
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r882609 - /jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/ComparisonVisualizer.java
Author: sebb
Date: Fri Nov 20 15:43:07 2009
New Revision: 882609
URL: http://svn.apache.org/viewvc?rev=882609view=rev
Log:
Use non-deprecated method
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/ComparisonVisualizer.java
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/ComparisonVisualizer.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/ComparisonVisualizer.java?rev=882609r1=882608r2=882609view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/ComparisonVisualizer.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/ComparisonVisualizer.java
Fri Nov 20 15:43:07 2009
@@ -141,7 +141,7 @@
}
}
if (result == null)
-result = new CompareAssertionResult();
+result = new CompareAssertionResult(getName());
base.setText(result.getBaseResult());
secondary.setText(result.getSecondaryResult());
} catch (Exception err) {
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r882612 - /jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java
Author: sebb
Date: Fri Nov 20 15:44:00 2009
New Revision: 882612
URL: http://svn.apache.org/viewvc?rev=882612view=rev
Log:
Fix comment
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java?rev=882612r1=882611r2=882612view=diff
==
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Save.java Fri
Nov 20 15:44:00 2009
@@ -151,7 +151,7 @@
GuiPackage.getInstance().updateCurrentGui();
}
-// package protected to all for separate test code
+// package protected to allow access from test code
void convertSubTree(HashTree tree) {
IteratorJMeterTreeNode iter = new
LinkedListJMeterTreeNode(tree.list()).iterator();
while (iter.hasNext()) {
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r882613 - in /jakarta/jmeter/trunk/src/core/org/apache/jmeter: JMeter.java engine/StandardJMeterEngine.java
Author: sebb
Date: Fri Nov 20 15:44:30 2009
New Revision: 882613
URL: http://svn.apache.org/viewvc?rev=882613view=rev
Log:
Document deliberate use of deprecated methods
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java?rev=882613r1=882612r2=882613view=diff
==
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Fri Nov 20
15:44:30 2009
@@ -719,6 +719,7 @@
HashTree tree = SaveService.loadTree(reader);
+@SuppressWarnings(deprecation) // Deliberate use of deprecated
ctor
JMeterTreeModel treeModel = new JMeterTreeModel(new Object());//
Create non-GUI version to avoid headless problems
JMeterTreeNode root = (JMeterTreeNode) treeModel.getRoot();
treeModel.addSubTree(tree, root);
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java?rev=882613r1=882612r2=882613view=diff
==
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
Fri Nov 20 15:44:30 2009
@@ -266,6 +266,7 @@
}
}
+@SuppressWarnings(deprecation) // Deliberate use of deprecated method
private void notifyTestListenersOfStart(SearchByClassTestListener
testListeners) {
IteratorTestListener iter =
testListeners.getSearchResults().iterator();
while (iter.hasNext()) {
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r882614 - /jakarta/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
Author: sebb
Date: Fri Nov 20 15:50:22 2009
New Revision: 882614
URL: http://svn.apache.org/viewvc?rev=882614view=rev
Log:
Document deliberate use of deprecated methods
Modified:
jakarta/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
Modified:
jakarta/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java?rev=882614r1=882613r2=882614view=diff
==
---
jakarta/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.java
Fri Nov 20 15:50:22 2009
@@ -92,6 +92,7 @@
public void testIterationStart(LoopIterationEvent event) {
}
+@SuppressWarnings(deprecation) // call to TestBeanHelper.prepare() is
intentional
public void testStarted() {
this.setRunningVersion(true);
TestBeanHelper.prepare(this);
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r882615 - /jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
Author: sebb
Date: Fri Nov 20 15:52:14 2009
New Revision: 882615
URL: http://svn.apache.org/viewvc?rev=882615view=rev
Log:
Document deliberate use of deprecated methods
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java?rev=882615r1=882614r2=882615view=diff
==
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
Fri Nov 20 15:52:14 2009
@@ -279,6 +279,7 @@
* @param threadContext
* @return SampleResult if a transaction was processed
*/
+@SuppressWarnings(deprecation) // OK to call TestBeanHelper.prepare()
private SampleResult process_sampler(Sampler current, Sampler parent,
JMeterContext threadContext) {
SampleResult transactionResult = null;
try {
@@ -565,6 +566,7 @@
log.info(Stop Thread detected by thread: + threadName);
}
+@SuppressWarnings(deprecation) // OK to call TestBeanHelper.prepare()
private void checkAssertions(ListAssertion assertions, SampleResult
parent, JMeterContext threadContext) {
IteratorAssertion iter = assertions.iterator();
while (iter.hasNext()) {
@@ -606,6 +608,7 @@
result.addAssertionResult(assertionResult);
}
+@SuppressWarnings(deprecation) // OK to call TestBeanHelper.prepare()
private void runPostProcessors(ListPostProcessor extractors) {
ListIteratorPostProcessor iter;
if (reversePostProcessors) {// Original (rather odd) behaviour
@@ -625,6 +628,7 @@
}
}
+@SuppressWarnings(deprecation) // OK to call TestBeanHelper.prepare()
private void runPreProcessors(ListPreProcessor preProcessors) {
IteratorPreProcessor iter = preProcessors.iterator();
while (iter.hasNext()) {
@@ -637,6 +641,7 @@
}
}
+@SuppressWarnings(deprecation) // OK to call TestBeanHelper.prepare()
private void delay(ListTimer timers) {
long sum = 0;
IteratorTimer iter = timers.iterator();
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r882620 - /jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/Converter.java
Author: sebb
Date: Fri Nov 20 15:56:25 2009
New Revision: 882620
URL: http://svn.apache.org/viewvc?rev=882620view=rev
Log:
Remove unused methods
Modified:
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/Converter.java
Modified:
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/Converter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/Converter.java?rev=882620r1=882619r2=882620view=diff
==
--- jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/Converter.java
(original)
+++ jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/Converter.java Fri
Nov 20 15:56:25 2009
@@ -17,7 +17,6 @@
*/
package org.apache.jorphan.util;
-import java.net.URLEncoder;
import java.text.DateFormat;
import java.text.DecimalFormat;
import java.text.NumberFormat;
@@ -123,10 +122,6 @@
return getDate(date, Calendar.getInstance().getTime());
}
-public static String urlEncode(Object toEncode) {
-return URLEncoder.encode(getString(toEncode));
-}
-
public static Date getDate(Object date, Date defaultValue) {
Date val = null;
if (date != null date instanceof java.util.Date) {
@@ -160,11 +155,6 @@
return val;
}
-public String formatNumber(float num, String pattern) {
-NumberFormat format = new DecimalFormat(pattern);
-return format.format(num);
-}
-
public static float getFloat(Object o, float defaultValue) {
try {
if (o == null) {
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r882622 - /jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/Converter.java
Author: sebb Date: Fri Nov 20 15:57:01 2009 New Revision: 882622 URL: http://svn.apache.org/viewvc?rev=882622view=rev Log: FOrgot to remove imports Modified: jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/Converter.java Modified: jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/Converter.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/Converter.java?rev=882622r1=882621r2=882622view=diff == --- jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/Converter.java (original) +++ jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/util/Converter.java Fri Nov 20 15:57:01 2009 @@ -18,8 +18,6 @@ package org.apache.jorphan.util; import java.text.DateFormat; -import java.text.DecimalFormat; -import java.text.NumberFormat; import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Calendar; - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r882643 - in /jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads: ListenerNotifier.java TestCompiler.java
Author: sebb
Date: Fri Nov 20 17:13:57 2009
New Revision: 882643
URL: http://svn.apache.org/viewvc?rev=882643view=rev
Log:
Document deliberate use of deprecated methods
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/ListenerNotifier.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/TestCompiler.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/ListenerNotifier.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/ListenerNotifier.java?rev=882643r1=882642r2=882643view=diff
==
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/ListenerNotifier.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/ListenerNotifier.java
Fri Nov 20 17:13:57 2009
@@ -77,6 +77,7 @@
*must not be null and must contain only SampleListener
*elements.
*/
+@SuppressWarnings(deprecation) // TestBeanHelper.prepare() is OK
public void notifyListeners(SampleEvent res, ListSampleListener
listeners) {
IteratorSampleListener iter = listeners.iterator();
while (iter.hasNext()) {
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/TestCompiler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/TestCompiler.java?rev=882643r1=882642r2=882643view=diff
==
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/TestCompiler.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/TestCompiler.java
Fri Nov 20 17:13:57 2009
@@ -126,6 +126,7 @@
}
}
+@SuppressWarnings(deprecation) // TestBeanHelper.prepare() is OK
private void trackIterationListeners(LinkedListTestElement p_stack) {
TestElement child = p_stack.getLast();
if (child instanceof LoopIterationListener) {
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r882647 - in /jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections: HashTree.java ListedHashTree.java SortedHashTree.java
Author: sebb
Date: Fri Nov 20 17:21:43 2009
New Revision: 882647
URL: http://svn.apache.org/viewvc?rev=882647view=rev
Log:
Some generics tidyup
Modified:
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/ListedHashTree.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/SortedHashTree.java
Modified:
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java?rev=882647r1=882646r2=882647view=diff
==
---
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java
(original)
+++
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java
Fri Nov 20 17:21:43 2009
@@ -191,7 +191,7 @@
* @param keys
*a collection of objects to be added to the created HashTree.
*/
-public HashTree(Collection keys) {
+public HashTree(Collection? keys) {
data = new HashMapObject, HashTree();
Iterator? it = keys.iterator();
while (it.hasNext()) {
@@ -286,7 +286,7 @@
*Collection of objects to be added as keys in the secondary
*node
*/
-public void set(Object key, Collection values) {
+public void set(Object key, Collection? values) {
data.put(key, createNewTree(values));
}
@@ -324,7 +324,7 @@
* @param values
*Collection of values to be added as keys to bottom-most node
*/
-public void set(Object[] treePath, Collection values) {
+public void set(Object[] treePath, Collection? values) {
if (treePath != null) {
set(Arrays.asList(treePath), values);
}
@@ -356,7 +356,7 @@
* @param values
*Collection of objects to set as nodes.
*/
-public void set(Collection values) {
+public void set(Collection? values) {
clear();
this.add(values);
}
@@ -375,7 +375,7 @@
* @param values
*collection of values to be added as keys to bottom-most node
*/
-public void set(Collection treePath, Collection values) {
+public void set(Collection treePath, Collection? values) {
HashTree tree = addTreePath(treePath);
tree.set(values);
}
@@ -413,7 +413,7 @@
* @param keys
*Collection of Keys to be added to HashTree.
*/
-public void add(Collection keys) {
+public void add(Collection? keys) {
Iterator? it = keys.iterator();
while (it.hasNext()) {
add(it.next());
@@ -459,7 +459,7 @@
*Collection of objects to be added as keys in the secondary
*node
*/
-public void add(Object key, Collection values) {
+public void add(Object key, Collection? values) {
add(key);
getTree(key).add(values);
}
@@ -494,7 +494,7 @@
* @param values
*collection of values to be added as keys to bottom-most node
*/
-public void add(Object[] treePath, Collection values) {
+public void add(Object[] treePath, Collection? values) {
if (treePath != null) {
add(Arrays.asList(treePath), values);
}
@@ -550,7 +550,7 @@
* @param values
*Collection of values to be added as keys to bottom-most node
*/
-public void add(Collection treePath, Collection values) {
+public void add(Collection treePath, Collection? values) {
HashTree tree = addTreePath(treePath);
tree.add(values);
}
Modified:
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/ListedHashTree.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/ListedHashTree.java?rev=882647r1=882646r2=882647view=diff
==
---
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/ListedHashTree.java
(original)
+++
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/ListedHashTree.java
Fri Nov 20 17:21:43 2009
@@ -107,7 +107,7 @@
/** {...@inheritdoc} */
@Override
-public void set(Object key, Collection values) {
+public void set(Object key, Collection? values) {
if (!data.containsKey(key)) {
order.add(key);
}
@@ -137,7 +137,7 @@
/** {...@inheritdoc} */
@Override
-public HashTree createNewTree(Collection values) {
+public HashTree createNewTree(Collection? values) {
return new ListedHashTree(values);
}
@@ -155,7 +155,7 @@
/** {...@inheritdoc} */
@Override
-public Collection list() {
+public CollectionObject list() {
return order;
}
@@ -227,7
svn commit: r882651 - /jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java
Author: sebb
Date: Fri Nov 20 17:36:11 2009
New Revision: 882651
URL: http://svn.apache.org/viewvc?rev=882651view=rev
Log:
Some generics tidyup
Modified:
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java
Modified:
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java?rev=882651r1=882650r2=882651view=diff
==
---
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java
(original)
+++
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java
Fri Nov 20 17:36:11 2009
@@ -26,7 +26,6 @@
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
-import java.util.LinkedList;
import java.util.Map;
import java.util.Set;
@@ -105,7 +104,7 @@
*
* @see java.util.Map#entrySet()
*/
-public Set entrySet() {
+public Set? entrySet() {
return data.entrySet();
}
@@ -151,7 +150,7 @@
*
* @see java.util.Map#values()
*/
-public Collection values() {
+public CollectionHashTree values() {
return data.values();
}
@@ -344,7 +343,7 @@
* @param values
*array of values to be added as keys to bottom-most node
*/
-public void set(Collection treePath, Object[] values) {
+public void set(Collection? treePath, Object[] values) {
HashTree tree = addTreePath(treePath);
tree.set(Arrays.asList(values));
}
@@ -375,7 +374,7 @@
* @param values
*collection of values to be added as keys to bottom-most node
*/
-public void set(Collection treePath, Collection? values) {
+public void set(Collection? treePath, Collection? values) {
HashTree tree = addTreePath(treePath);
tree.set(values);
}
@@ -516,7 +515,7 @@
* @param values
*array of values to be added as keys to bottom-most node
*/
-public void add(Collection treePath, Object[] values) {
+public void add(Collection? treePath, Object[] values) {
HashTree tree = addTreePath(treePath);
tree.add(Arrays.asList(values));
}
@@ -533,7 +532,7 @@
* @param value
*Object to add as a node to bottom-most node
*/
-public HashTree add(Collection treePath, Object value) {
+public HashTree add(Collection? treePath, Object value) {
HashTree tree = addTreePath(treePath);
return tree.add(value);
}
@@ -550,12 +549,12 @@
* @param values
*Collection of values to be added as keys to bottom-most node
*/
-public void add(Collection treePath, Collection? values) {
+public void add(Collection? treePath, Collection? values) {
HashTree tree = addTreePath(treePath);
tree.add(values);
}
-protected HashTree addTreePath(Collection treePath) {
+protected HashTree addTreePath(Collection? treePath) {
HashTree tree = this;
Iterator? iter = treePath.iterator();
while (iter.hasNext()) {
@@ -671,7 +670,7 @@
*Collection of keys
* @return HashTree at the end of the recursion
*/
-public HashTree getTree(Collection treePath) {
+public HashTree getTree(Collection? treePath) {
return getTreePath(treePath);
}
@@ -701,7 +700,7 @@
if (temp != null) {
return temp.list();
}
-return new LinkedList(); // should we use: new HashTree().list()
+return new HashTree().list();
}
/**
@@ -742,12 +741,12 @@
*List of keys used to recurse into HashTree structure
* @return Set of all keys found in end HashTree
*/
-public Collection list(Collection treePath) {
+public Collection list(Collection? treePath) {
HashTree tree = getTreePath(treePath);
if (tree != null) {
return tree.list();
}
-return new LinkedList(); // should we use: new HashTree().list()
+return new HashTree().list();
}
/**
@@ -818,12 +817,12 @@
*list of keys used to recurse into HashTree structure
* @return array of all keys found in end HashTree
*/
-public Object[] getArray(Collection treePath) {
+public Object[] getArray(Collection? treePath) {
HashTree tree = getTreePath(treePath);
return (tree != null) ? tree.getArray() : null;
}
-protected HashTree getTreePath(Collection treePath) {
+protected HashTree getTreePath(Collection? treePath) {
HashTree tree = this;
Iterator? iter = treePath.iterator();
while (iter.hasNext()) {
-
To unsubscribe, e-mail: jmeter-dev-unsubscr
svn commit: r882684 - in /jakarta/jmeter/trunk: src/core/org/apache/jmeter/resources/ src/protocol/http/org/apache/jmeter/protocol/http/proxy/ src/protocol/http/org/apache/jmeter/protocol/http/proxy/g
Author: sebb Date: Fri Nov 20 19:08:18 2009 New Revision: 882684 URL: http://svn.apache.org/viewvc?rev=882684view=rev Log: Bug 47946 - Proxy should enable Grouping inside a Transaction Controller Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java jakarta/jmeter/trunk/xdocs/changes.xml jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=882684r1=882683r2=882684view=diff == --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Fri Nov 20 19:08:18 2009 @@ -287,6 +287,7 @@ graph_results_title=Graph Results grouping_add_separators=Add separators between groups grouping_in_controllers=Put each group in a new controller +grouping_in_transaction_controllers=Put each group in a new transaction controller grouping_mode=Grouping\: grouping_no_groups=Do not group samplers grouping_store_first_only=Store 1st sampler of each group only @@ -846,6 +847,7 @@ tr=Turkish transaction_controller_parent=Generate parent sample transaction_controller_title=Transaction Controller +transaction_controller_include_timers=Include timer duration in runtime summary. unbind=Thread Unbind unescape_html_string=String to unescape unescape_string=String containing Java escapes Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties?rev=882684r1=882683r2=882684view=diff == --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties Fri Nov 20 19:08:18 2009 @@ -260,6 +260,7 @@ graph_results_title=Graphique de r\u00E9sultats grouping_add_separators=Ajouter des s\u00E9parateurs entre les groupes grouping_in_controllers=Mettre chaque groupe dans un nouveau contr\u00F4leur +grouping_in_transaction_controllers=Mettre chaque groupe dans un nouveau contr\u00F4leur de transaction grouping_mode=Grouper \: grouping_no_groups=Ne pas grouper les \u00E9chantillons grouping_store_first_only=Stocker le 1er \u00E9chantillon pour chaque groupe uniquement @@ -718,6 +719,7 @@ tr=Turc transaction_controller_parent=G\u00E9n\u00E9rer en \u00E9chantillon parent transaction_controller_title=Contr\u00F4leur Transaction +transaction_controller_include_timers=Inclure le temps de timer dans la duree. unbind=D\u00E9connexion de l'unit\u00E9 uniform_timer_delay=D\u00E9lai de d\u00E9calage constant (en millisecondes) \: uniform_timer_memo=Ajoute un d\u00E9lai al\u00E9atoire avec une distribution uniforme Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java?rev=882684r1=882683r2=882684view=diff == --- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java (original) +++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java Fri Nov 20 19:08:18 2009 @@ -33,7 +33,9 @@ import org.apache.jmeter.config.ConfigElement; import org.apache.jmeter.config.ConfigTestElement; import org.apache.jmeter.control.GenericController; +import org.apache.jmeter.control.TransactionController; import org.apache.jmeter.control.gui.LogicControllerGui; +import org.apache.jmeter.control.gui.TransactionControllerGui; import org.apache.jmeter.engine.util.ValueReplacer; import org.apache.jmeter.exceptions.IllegalUserActionException; import org.apache.jmeter.functions.InvalidVariableException; @@ -79,6 +81,9 @@ private static final String ASSERTION_GUI = AssertionGui.class.getName(); + +private static final String TRANSACTION_CONTROLLER_GUI = TransactionControllerGui.class.getName(); + private static final String LOGIC_CONTROLLER_GUI = LogicControllerGui.class.getName(); private static final String HEADER_PANEL = HeaderPanel.class.getName(); @@ -125,13 +130,13 @@ private static final String
svn commit: r882697 - in /jakarta/jmeter/trunk: src/core/org/apache/jmeter/resources/ src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/ src/protocol/mail/org/apache/jmeter/protocol/mail/sampl
Author: sebb
Date: Fri Nov 20 19:51:23 2009
New Revision: 882697
URL: http://svn.apache.org/viewvc?rev=882697view=rev
Log:
Bug 47947 - Mail Reader Sampler should allow port to be overridden
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java
jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/gui/MailReaderSamplerGui.java
jakarta/jmeter/trunk/xdocs/changes.xml
jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=882697r1=882696r2=882697view=diff
==
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
Fri Nov 20 19:51:23 2009
@@ -468,6 +468,7 @@
mail_reader_password=Password:
mail_reader_pop3=POP3
mail_reader_pop3s=POP3S
+mail_reader_port=Port (optional):
mail_reader_server=Server:
mail_reader_server_type=Server Type:
mail_reader_storemime=Store the message using MIME
Modified:
jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java?rev=882697r1=882696r2=882697view=diff
==
---
jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java
Fri Nov 20 19:51:23 2009
@@ -47,8 +47,10 @@
public class MailReaderSampler extends AbstractSampler {
private static final Logger log = LoggingManager.getLoggerForClass();
+//+ JMX attributes - do not change the values
private final static String SERVER_TYPE = host_type; // $NON-NLS-1$
private final static String SERVER = host; // $NON-NLS-1$
+private final static String PORT = port; // $NON-NLS-1$
private final static String USERNAME = username; // $NON-NLS-1$
private final static String PASSWORD = password; // $NON-NLS-1$
private final static String FOLDER = folder; // $NON-NLS-1$
@@ -62,7 +64,9 @@
public final static String TYPE_POP3S = pop3s; // $NON-NLS-1$
public final static String TYPE_IMAP = imap; // $NON-NLS-1$
public final static String TYPE_IMAPS = imaps; // $NON-NLS-1$
-public static final int ALL_MESSAGES = -1;
+//-
+
+public static final int ALL_MESSAGES = -1; // special value
public MailReaderSampler() {
setServerType(TYPE_POP3);
@@ -82,7 +86,12 @@
boolean deleteMessages = getDeleteMessages();
parent.setSampleLabel(getName());
-parent.setSamplerData(getServerType() + :// + getUserName() + @ +
getServer());
+int port=getPortAsInt();
+if (port 0){
+parent.setSamplerData(getServerType() + :// + getUserName() +
@ + getServer()+ : + port);
+} else {
+parent.setSamplerData(getServerType() + :// + getUserName() +
@ + getServer());
+}
/*
* Perform the sampling
*/
@@ -96,7 +105,11 @@
// Get the store
Store store = session.getStore(getServerType());
-store.connect(getServer(), getUserName(), getPassword());
+if (port 0){
+store.connect(getServer(), port, getUserName(), getPassword());
+} else {
+store.connect(getServer(), getUserName(), getPassword());
+}
// Get folder
Folder folder = store.getFolder(getFolder());
@@ -268,7 +281,7 @@
* @return Server Type
*/
public String getServerType() {
-return getProperty(SERVER_TYPE).toString();
+return getPropertyAsString(SERVER_TYPE);
}
/**
@@ -283,7 +296,19 @@
* @return The name or address of the remote server.
*/
public String getServer() {
-return getProperty(SERVER).toString();
+return getPropertyAsString(SERVER);
+}
+
+public String getPort() {
+return getPropertyAsString(PORT);
+}
+
+private int getPortAsInt() {
+return getPropertyAsInt(PORT);
+}
+
+public void setPort(String port) {
+setProperty(PORT, port, );
}
/**
@@ -298,7 +323,7 @@
* @return The username of the mail account.
*/
public String getUserName() {
-return getProperty(USERNAME).toString();
+return getPropertyAsString(USERNAME
svn commit: r881964 - /jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTest.java
Author: sebb
Date: Wed Nov 18 22:18:53 2009
New Revision: 881964
URL: http://svn.apache.org/viewvc?rev=881964view=rev
Log:
Fix some warnings
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTest.java
Modified: jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTest.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTest.java?rev=881964r1=881963r2=881964view=diff
==
--- jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTest.java
(original)
+++ jakarta/jmeter/trunk/test/src/org/apache/jmeter/junit/JMeterTest.java Wed
Nov 18 22:18:53 2009
@@ -170,8 +170,10 @@
doc = bldr.build(compref);
Element root = doc.getRootElement();
Element body = root.getChild(body);
+@SuppressWarnings(unchecked)
ListElement sections = body.getChildren(section);
for (int i = 0; i sections.size(); i++) {
+@SuppressWarnings(unchecked)
ListElement components =
sections.get(i).getChildren(component);
for (int j = 0; j components.size(); j++) {
Element comp = components.get(j);
@@ -198,8 +200,10 @@
doc = bldr.build(compref);
Element root = doc.getRootElement();
Element body = root.getChild(body);
+@SuppressWarnings(unchecked)
ListElement sections = body.getChildren(section);
for (int i = 0; i sections.size(); i++) {
+@SuppressWarnings(unchecked)
ListElement components =
sections.get(i).getChildren(component);
for (int j = 0; j components.size(); j++) {
Element comp = components.get(j);
@@ -221,8 +225,10 @@
Element root = doc.getRootElement();
Element body = root.getChild(body);
Element section = body.getChild(section);
+@SuppressWarnings(unchecked)
ListElement sections = section.getChildren(subsection);
for (int i = 0; i sections.size(); i++) {
+@SuppressWarnings(unchecked)
ListElement components =
sections.get(i).getChildren(component);
for (int j = 0; j components.size(); j++) {
Element comp = components.get(j);
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r881994 - in /jakarta/jmeter/trunk: src/core/org/apache/jmeter/config/gui/ src/core/org/apache/jmeter/engine/util/ src/core/org/apache/jmeter/gui/tree/ src/core/org/apache/jmeter/save/ src
Author: sebb
Date: Wed Nov 18 23:16:09 2009
New Revision: 881994
URL: http://svn.apache.org/viewvc?rev=881994view=rev
Log:
Generics and other tidy ups
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/CompoundVariable.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/OldSaveService.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
jakarta/jmeter/trunk/src/functions/org/apache/jmeter/functions/JexlFunction.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/SearchByClass.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
jakarta/jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgumentsPanel.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/engine/util/TestValueReplacer.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java?rev=881994r1=881993r2=881994view=diff
==
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java
Wed Nov 18 23:16:09 2009
@@ -60,7 +60,7 @@
private transient JTable table;
/** The model for the arguments table. */
-protected transient ObjectTableModel tableModel;
+protected transient ObjectTableModel tableModel; // will only contain
Argument or HTTPArgument
/** A button for adding new arguments to the table. */
private JButton add;
@@ -156,6 +156,7 @@
if (args instanceof Arguments) {
arguments = (Arguments) args;
arguments.clear();
+@SuppressWarnings(unchecked) // only contains Argument (or
HTTPArgument)
IteratorArgument modelData = (IteratorArgument)
tableModel.iterator();
while (modelData.hasNext()) {
Argument arg = modelData.next();
@@ -326,7 +327,7 @@
*
* @return a new Argument object
*/
-protected Object makeNewArgument() {
+protected Argument makeNewArgument() {
return new Argument(, ); // $NON-NLS-1$ // $NON-NLS-2$
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/CompoundVariable.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/CompoundVariable.java?rev=881994r1=881993r2=881994view=diff
==
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/CompoundVariable.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/CompoundVariable.java
Wed Nov 18 23:16:09 2009
@@ -154,6 +154,7 @@
return results.toString();
}
+@SuppressWarnings(unchecked) // clone will produce correct type
public CompoundVariable getFunction() {
CompoundVariable func = new CompoundVariable();
func.compiledComponents = (LinkedListObject)
compiledComponents.clone();
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java?rev=881994r1=881993r2=881994view=diff
==
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java
Wed Nov 18 23:16:09 2009
@@ -23,6 +23,7 @@
import java.beans.IntrospectionException;
import java.beans.Introspector;
import java.util.Collection;
+import java.util.Enumeration;
import javax.swing.ImageIcon;
import javax.swing.JPopupMenu;
@@ -141,4 +142,11 @@
public void nameChanged() {
treeModel.nodeChanged(this);
}
+
+// Override in order to provide type safety
+@Override
+@SuppressWarnings(unchecked)
+public EnumerationJMeterTreeNode children() {
+return super.children();
+}
}
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/OldSaveService.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/OldSaveService.java?rev=881994r1=881993r2=881994view=diff
svn commit: r882000 - in /jakarta/jmeter/trunk: src/core/org/apache/jmeter/ src/core/org/apache/jmeter/engine/ src/core/org/apache/jmeter/threads/ src/jorphan/org/apache/jorphan/collections/ test/src/
Author: sebb
Date: Wed Nov 18 23:33:12 2009
New Revision: 882000
URL: http://svn.apache.org/viewvc?rev=882000view=rev
Log:
Add generics to SearchByClass
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
jakarta/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/SearchByClass.java
jakarta/jmeter/trunk/test/src/org/apache/jorphan/collections/PackageTest.java
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java?rev=882000r1=881999r2=882000view=diff
==
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Wed Nov 18
23:33:12 2009
@@ -724,7 +724,7 @@
treeModel.addSubTree(tree, root);
// Hack to resolve ModuleControllers in non GUI mode
-SearchByClass replaceableControllers = new
SearchByClass(ReplaceableController.class);
+SearchByClassReplaceableController replaceableControllers = new
SearchByClassReplaceableController(ReplaceableController.class);
tree.traverse(replaceableControllers);
CollectionReplaceableController replaceableControllersRes =
replaceableControllers.getSearchResults();
for (IteratorReplaceableController iter =
replaceableControllersRes.iterator(); iter.hasNext();) {
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java?rev=882000r1=881999r2=882000view=diff
==
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
Wed Nov 18 23:33:12 2009
@@ -106,7 +106,7 @@
private HashTree test;
-private volatile SearchByClass testListenersSave;
+private volatile SearchByClassTestListener testListenersSave;
private final String host;
@@ -266,7 +266,7 @@
}
}
-private void notifyTestListenersOfStart(SearchByClass testListeners) {
+private void notifyTestListenersOfStart(SearchByClassTestListener
testListeners) {
IteratorTestListener iter =
testListeners.getSearchResults().iterator();
while (iter.hasNext()) {
TestListener tl = iter.next();
@@ -281,7 +281,7 @@
}
}
-private void notifyTestListenersOfEnd(SearchByClass testListeners) {
+private void notifyTestListenersOfEnd(SearchByClassTestListener
testListeners) {
log.info(Notifying test listeners of end of test);
IteratorTestListener iter =
testListeners.getSearchResults().iterator();
while (iter.hasNext()) {
@@ -377,7 +377,7 @@
log.info(Running the test!);
running = true;
-SearchByClass testPlan = new SearchByClass(TestPlan.class);
+SearchByClassTestPlan testPlan = new
SearchByClassTestPlan(TestPlan.class);
test.traverse(testPlan);
Object[] plan = testPlan.getSearchResults().toArray();
if (plan.length == 0) {
@@ -401,7 +401,7 @@
* Notification of test listeners needs to happen after function
* replacement, but before setting RunningVersion to true.
*/
-SearchByClass testListeners = new SearchByClass(TestListener.class);
+SearchByClassTestListener testListeners = new
SearchByClassTestListener(TestListener.class);
test.traverse(testListeners);
// Merge in any additional test listeners
@@ -417,7 +417,7 @@
List? testLevelElements = new
LinkedListObject(test.list(test.getArray()[0]));
removeThreadGroups(testLevelElements);
-SearchByClass searcher = new SearchByClass(ThreadGroup.class);
+SearchByClassThreadGroup searcher = new
SearchByClassThreadGroup(ThreadGroup.class);
test.traverse(searcher);
TestCompiler.initialize();
// for each thread group, generate threads
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java?rev=882000r1=881999r2=882000view=diff
==
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java
Wed Nov 18 23:33:12 2009
@@ -125,7 +125,7 @@
testTree = test
svn commit: r882009 - /jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java
Author: sebb
Date: Wed Nov 18 23:55:01 2009
New Revision: 882009
URL: http://svn.apache.org/viewvc?rev=882009view=rev
Log:
Add generics to SearchByClass
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java?rev=882009r1=882008r2=882009view=diff
==
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java
Wed Nov 18 23:55:01 2009
@@ -65,18 +65,21 @@
this.host = host;
}
+/** {...@inheritdoc} */
public void configure(HashTree testTree) {
TreeCloner cloner = new TreeCloner(false);
testTree.traverse(cloner);
test = cloner.getClonedTree();
}
+/** {...@inheritdoc} */
public void runTest() {
log.info(about to run remote test on +host);
new Thread(this).start();
log.info(done initiating run command);
}
+/** {...@inheritdoc} */
public void stopTest() {
log.info(about to stop remote test on +host);
try {
@@ -86,6 +89,7 @@
}
}
+/** {...@inheritdoc} */
public void reset() {
try {
try {
@@ -99,14 +103,10 @@
}
}
-/*
- * (non-Javadoc)
- *
- * @see java.lang.Runnable#run()
- */
+/** {...@inheritdoc} */
public void run() {
log.info(running clientengine run method);
-SearchByClass testListeners = new SearchByClass(TestListener.class);
+SearchByClassTestListener testListeners = new
SearchByClassTestListener(TestListener.class);
ConvertListeners sampleListeners = new ConvertListeners();
HashTree testTree = test;
PreCompiler compiler = new PreCompiler(true); // limit the changes to
client only test elements
@@ -136,11 +136,7 @@
}
}
-/*
- * (non-Javadoc)
- *
- * @see org.apache.jmeter.engine.JMeterEngine#exit()
- */
+/** {...@inheritdoc} */
public void exit() {
log.info(about to exit remote server on +host);
try {
@@ -151,6 +147,7 @@
}
private Properties savep;
+/** {...@inheritdoc} */
public void setProperties(Properties p) {
savep = p;
// Sent later
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r882016 - in /jakarta/jmeter/trunk/src: core/org/apache/jmeter/gui/tree/JMeterTreeModel.java reports/org/apache/jmeter/testelement/JTLData.java
Author: sebb
Date: Thu Nov 19 00:45:51 2009
New Revision: 882016
URL: http://svn.apache.org/viewvc?rev=882016view=rev
Log:
Minor Fixes
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeModel.java
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/JTLData.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeModel.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeModel.java?rev=882016r1=882015r2=882016view=diff
==
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeModel.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeModel.java
Thu Nov 19 00:45:51 2009
@@ -89,6 +89,7 @@
* the added sub tree was a full test plan.
*/
public HashTree addSubTree(HashTree subTree, JMeterTreeNode current)
throws IllegalUserActionException {
+@SuppressWarnings(unchecked) // OK
IteratorTestElement iter = subTree.list().iterator();
while (iter.hasNext()) {
TestElement item = iter.next();
Modified:
jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/JTLData.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/JTLData.java?rev=882016r1=882015r2=882016view=diff
==
--- jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/JTLData.java
(original)
+++ jakarta/jmeter/trunk/src/reports/org/apache/jmeter/testelement/JTLData.java
Thu Nov 19 00:45:51 2009
@@ -199,7 +199,7 @@
}
SamplingStatCalculator row = data.get(url);
if (row == null) {
-row = new SamplingStatCalculator();
+row = new SamplingStatCalculator(url);
// just like the aggregate listener, we use the sample label to
represent
// a row. in this case, we use it as a key.
this.data.put(url,row);
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r881416 - /jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
Author: sebb
Date: Tue Nov 17 18:08:02 2009
New Revision: 881416
URL: http://svn.apache.org/viewvc?rev=881416view=rev
Log:
Use String constant for OK
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java?rev=881416r1=881415r2=881416view=diff
==
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
Tue Nov 17 18:08:02 2009
@@ -354,14 +354,15 @@
return responseCode;
}
-private static final String OK =
Integer.toString(HttpURLConnection.HTTP_OK);
+private static final String OK_CODE =
Integer.toString(HttpURLConnection.HTTP_OK);
+private static final String OK_MSG = OK; // $NON-NLS-1$
/**
* Set response code to OK, i.e. 200
*
*/
public void setResponseCodeOK(){
-responseCode=OK;
+responseCode=OK_CODE;
}
public void setResponseCode(String code) {
@@ -369,7 +370,7 @@
}
public boolean isResponseCodeOK(){
-return responseCode.equals(OK);
+return responseCode.equals(OK_CODE);
}
public String getResponseMessage() {
return responseMessage;
@@ -380,7 +381,7 @@
}
public void setResponseMessageOK() {
-responseMessage = OK; // $NON-NLS-1$
+responseMessage = OK_MSG;
}
public String getThreadName() {
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r881424 - /jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java
Author: sebb
Date: Tue Nov 17 18:09:44 2009
New Revision: 881424
URL: http://svn.apache.org/viewvc?rev=881424view=rev
Log:
Add convenience method setResponseNoContent()
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java?rev=881424r1=881423r2=881424view=diff
==
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java
Tue Nov 17 18:09:44 2009
@@ -18,6 +18,7 @@
package org.apache.jmeter.protocol.http.sampler;
+import java.net.HttpURLConnection;
import java.net.URL;
import org.apache.jmeter.protocol.http.util.HTTPConstants;
@@ -37,6 +38,9 @@
private String queryString = ; // never null
+private static final String HTTP_NO_CONTENT_CODE =
Integer.toString(HttpURLConnection.HTTP_NO_CONTENT);
+private static final String HTTP_NO_CONTENT_MSG = No Content; //
$NON-NLS-1$
+
public HTTPSampleResult() {
super();
setDataEncoding(DEFAULT_HTTP_ENCODING); // default if encoding not
provided be the page
@@ -198,4 +202,9 @@
}
return super.getDataEncodingWithDefault();
}
+
+public void setResponseNoContent(){
+setResponseCode(HTTP_NO_CONTENT_CODE);
+setResponseMessage(HTTP_NO_CONTENT_MSG);
+}
}
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r881425 - /jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/SoapSampler.java
Author: sebb Date: Tue Nov 17 18:11:04 2009 New Revision: 881425 URL: http://svn.apache.org/viewvc?rev=881425view=rev Log: Ensure URL is saved Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/SoapSampler.java Modified: jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/SoapSampler.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/SoapSampler.java?rev=881425r1=881424r2=881425view=diff == --- jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/SoapSampler.java (original) +++ jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/SoapSampler.java Tue Nov 17 18:11:04 2009 @@ -241,6 +241,7 @@ res.setSampleLabel(urlStr); // May be replaced later res.setHTTPMethod(HTTPConstants.POST); +res.setURL(url); res.sampleStart(); // Count the retries as well in the time HttpClient client = null; InputStream instream = null; - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r881427 - in /jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler: HTTPSampler.java HTTPSampler2.java
Author: sebb
Date: Tue Nov 17 18:13:26 2009
New Revision: 881427
URL: http://svn.apache.org/viewvc?rev=881427view=rev
Log:
Set response code for cached content to 204 - No Content
Set URL and method in response eariler
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java?rev=881427r1=881426r2=881427view=diff
==
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
Tue Nov 17 18:13:26 2009
@@ -212,8 +212,6 @@
}
if (res != null) {
-res.setURL(u);
-res.setHTTPMethod(method);
res.setRequestHeaders(getConnectionHeaders(conn));
res.setCookies(cookies);
}
@@ -452,6 +450,8 @@
res.setMonitor(isMonitor());
res.setSampleLabel(urlStr);
+res.setURL(url);
+res.setHTTPMethod(method);
res.sampleStart(); // Count the retries as well in the time
@@ -460,8 +460,7 @@
if (cacheManager != null GET.equalsIgnoreCase(method)) {
if (cacheManager.inCache(url)) {
res.sampleEnd();
- res.setResponseCodeOK();
- res.setResponseMessage(Cached);
+ res.setResponseNoContent();
res.setSuccessful(true);
return res;
}
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java?rev=881427r1=881426r2=881427view=diff
==
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java
Tue Nov 17 18:13:26 2009
@@ -628,7 +628,6 @@
setConnectionAuthorization(httpClient, u, getAuthManager());
if (res != null) {
-res.setURL(u);
res.setCookies(cookies);
}
@@ -840,6 +839,8 @@
res.setSampleLabel(urlStr); // May be replaced later
res.setHTTPMethod(method);
+res.setURL(url);
+
res.sampleStart(); // Count the retries as well in the time
HttpClient client = null;
InputStream instream = null;
@@ -863,8 +864,7 @@
if (cacheManager != null GET.equalsIgnoreCase(method)) {
if (cacheManager.inCache(url)) {
res.sampleEnd();
- res.setResponseCodeOK();
- res.setResponseMessage(Cached);
+ res.setResponseNoContent();
res.setSuccessful(true);
return res;
}
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r881451 - in /jakarta/jmeter/trunk: src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java test/src/org/apache/jmeter/protocol/http/control/TestCacheManager.java xdocs
Author: sebb
Date: Tue Nov 17 19:27:50 2009
New Revision: 881451
URL: http://svn.apache.org/viewvc?rev=881451view=rev
Log:
Bug 48153 - Support for Cache-Control and Expires headers
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestCacheManager.java
jakarta/jmeter/trunk/xdocs/changes.xml
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java?rev=881451r1=881450r2=881451view=diff
==
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java
Tue Nov 17 19:27:50 2009
@@ -108,7 +108,8 @@
String expires =
conn.getHeaderField(HTTPConstantsInterface.EXPIRES);
String etag = conn.getHeaderField(HTTPConstantsInterface.ETAG);
String url = conn.getURL().toString();
-setCache(lastModified, expires, etag, url);
+String cacheControl =
conn.getHeaderField(HTTPConstantsInterface.CACHE_CONTROL);
+setCache(lastModified, cacheControl, expires, etag, url);
}
}
@@ -124,24 +125,32 @@
String expires = getHeader(method ,HTTPConstantsInterface.EXPIRES);
String etag = getHeader(method ,HTTPConstantsInterface.ETAG);
String url = method.getURI().toString();
-setCache(lastModified, expires, etag, url);
+String cacheControl = getHeader(method,
HTTPConstantsInterface.CACHE_CONTROL);
+setCache(lastModified, cacheControl, expires, etag, url);
}
}
// helper method to save the cache entry
-private void setCache(String lastModified, String expires, String etag,
String url) {
+private void setCache(String lastModified, String cacheControl, String
expires, String etag, String url) {
if (log.isDebugEnabled()){
-log.debug(SET(both) +url + + lastModified + + +
expires + + etag);
+log.debug(SET(both) +url + + cacheControl + +
lastModified + + + expires + + etag);
}
Date expiresDate = null; // i.e. not using Expires
-if (expires != null useExpires) {// Check that the header is
present and we are processing Expires
-try {
-expiresDate = DateUtil.parseDate(expires);
-} catch (DateParseException e) {
-if (log.isDebugEnabled()){
-log.debug(Unable to parse Expires: '+expires+' +e);
+if (useExpires) {// Check that we are processing Expires/CacheControl
+final String MAX_AGE = max-age=;
+// TODO - check for other CacheControl attributes?
+if (cacheControl != null cacheControl.contains(public)
cacheControl.contains(MAX_AGE)) {
+long maxAge =
Long.parseLong(cacheControl.substring(cacheControl.indexOf(MAX_AGE)+MAX_AGE.length()))*1000;
+expiresDate=new Date(System.currentTimeMillis()+maxAge);
+} else if (expires != null) {
+try {
+expiresDate = DateUtil.parseDate(expires);
+} catch (DateParseException e) {
+if (log.isDebugEnabled()){
+log.debug(Unable to parse Expires: '+expires+' +e);
+}
+expiresDate = new Date(0L); // invalid dates must be
treated as expired
}
-expiresDate = new Date(0L); // invalid dates must be treated
as expired
}
}
getCache().put(url, new CacheEntry(lastModified, expiresDate, etag));
@@ -228,8 +237,10 @@
log.debug(Expires= + expiresDate + (Valid));
}
return true;
-} else if (log.isDebugEnabled()){
-log.debug(Expires= + expiresDate + (Expired));
+} else {
+if (log.isDebugEnabled()){
+log.debug(Expires= + expiresDate + (Expired));
+}
}
}
}
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestCacheManager.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestCacheManager.java?rev=881451r1=881450r2=881451view=diff
==
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestCacheManager.java
(original)
+++
jakarta/jmeter/trunk/test/src
svn commit: r881457 - in /jakarta/jmeter/trunk: src/core/org/apache/jmeter/resources/messages.properties xdocs/usermanual/component_reference.xml
Author: sebb Date: Tue Nov 17 19:41:36 2009 New Revision: 881457 URL: http://svn.apache.org/viewvc?rev=881457view=rev Log: Better docn of Cache-Control Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=881457r1=881456r2=881457view=diff == --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Tue Nov 17 19:41:36 2009 @@ -865,7 +865,7 @@ url_config_title=HTTP Request Defaults url_full_config_title=UrlFull Sample url_multipart_config_title=HTTP Multipart Request Defaults -use_expires=Use Expires header when processing GET requests +use_expires=Use Cache-Control/Expires header when processing GET requests use_keepalive=Use KeepAlive use_multipart_for_http_post=Use multipart/form-data for HTTP POST use_recording_controller=Use Recording Controller Modified: jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=881457r1=881456r2=881457view=diff == --- jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml (original) +++ jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml Tue Nov 17 19:41:36 2009 @@ -2684,9 +2684,10 @@ and if so, the If-Last-Modified and If-None-Match conditional headers are set for the request. /p p -Additionally, if the Use Expires header option is selected, then the Expires value is checked against the current time. +Additionally, if the Use Cache-Control/Expires header option is selected, then the Cache-Control/Expires value is checked against the current time. If the request is a GET request, and the timestamp is in the future, then the sampler returns immediately, without requesting the URL from the remote server. This is intended to emulate browser behaviour. +Note that the Cache-Control header must be public and only the max-age expiry option is processed. /p p If the requested document has not changed since it was cached, then the response body will be empty. - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r881010 - /jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestCacheManager.java
Author: sebb
Date: Mon Nov 16 22:22:49 2009
New Revision: 881010
URL: http://svn.apache.org/viewvc?rev=881010view=rev
Log:
Update to version dated 2009-11-16 12:44 UTC
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestCacheManager.java
Modified:
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestCacheManager.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestCacheManager.java?rev=881010r1=881009r2=881010view=diff
==
---
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestCacheManager.java
(original)
+++
jakarta/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestCacheManager.java
Mon Nov 16 22:22:49 2009
@@ -18,11 +18,14 @@
package org.apache.jmeter.protocol.http.control;
+import java.io.IOException;
import java.lang.reflect.Field;
import java.net.URL;
import java.net.URLConnection;
import java.text.SimpleDateFormat;
+import java.util.ArrayList;
import java.util.Date;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.SimpleTimeZone;
@@ -30,6 +33,7 @@
import org.apache.commons.httpclient.Header;
import org.apache.commons.httpclient.HttpMethod;
import org.apache.commons.httpclient.URI;
+import org.apache.commons.httpclient.URIException;
import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.commons.httpclient.util.HttpURLConnection;
import org.apache.jmeter.junit.JMeterTestCase;
@@ -39,7 +43,83 @@
public class TestCacheManager extends JMeterTestCase {
-private static final String APACHE = http://jakarta.apache.org/;;
+private class URLConnectionStub extends URLConnection {
+
+protected URLConnectionStub(URL url) {
+super(url);
+}
+
+private URLConnectionStub(URLConnection urlConnection) {
+super(urlConnection.getURL());
+}
+
+@Override
+public void connect() throws IOException {
+}
+
+@Override
+public String getHeaderField(String name) {
+if (HTTPConstantsInterface.LAST_MODIFIED.equals(name)) {
+return currentTimeInGMT;
+} else if (HTTPConstantsInterface.ETAG.equals(name)) {
+return EXPECTED_ETAG;
+}
+return super.getHeaderField(name);
+}
+@Override
+public URL getURL() {
+return url;
+}
+}
+
+private class HttpMethodStub extends PostMethod {
+Header lastModifiedHeader;
+Header etagHeader;
+
+HttpMethodStub() {
+this.lastModifiedHeader = new
Header(HTTPConstantsInterface.LAST_MODIFIED, currentTimeInGMT);
+this.etagHeader = new Header(HTTPConstantsInterface.ETAG,
EXPECTED_ETAG);
+}
+
+@Override
+public Header getResponseHeader(String headerName) {
+if (HTTPConstantsInterface.LAST_MODIFIED.equals(headerName)) {
+return this.lastModifiedHeader;
+} else if (HTTPConstantsInterface.ETAG.equals(headerName)) {
+return this.etagHeader;
+}
+return null;
+}
+
+@Override
+public URI getURI() throws URIException {
+return uri;
+}
+}
+
+private class HttpURLConnectionStub extends HttpURLConnection {
+MapString, ListString properties;
+
+public HttpURLConnectionStub(HttpMethod method, URL url) {
+super(method, url);
+this.properties = new HashMapString, ListString();
+}
+
+@Override
+public void addRequestProperty(String key, String value) {
+ListString list = new ArrayListString();
+list.add(value);
+this.properties.put(key, list);
+}
+
+@Override
+public MapString, ListString getRequestProperties() {
+return this.properties;
+}
+
+}
+
+private static final String LOCAL_HOST = http://localhost/;;
private static final String EXPECTED_ETAG = 0xCAFEBABEDEADBEEF;
private CacheManager cacheManager;
private String currentTimeInGMT;
@@ -61,11 +141,11 @@
simpleDateFormat.setTimeZone(new SimpleTimeZone(0, GMT));
simpleDateFormat.applyPattern(EEE, dd MMM HH:mm:ss z);
this.currentTimeInGMT = simpleDateFormat.format(new Date());
-this.uri = new URI(APACHE, false);
-this.url = new URL(APACHE);
-this.urlConnection = this.url.openConnection();
-this.httpMethod = new PostMethod();
-this.httpUrlConnection = new HttpURLConnection(this.httpMethod,
this.url);
+this.uri = new URI(LOCAL_HOST, false);
+this.url = new URL(LOCAL_HOST
svn commit: r881068 - in /jakarta/jmeter/trunk: src/core/org/apache/jmeter/resources/ src/protocol/http/org/apache/jmeter/protocol/http/control/ src/protocol/http/org/apache/jmeter/protocol/http/gui/
Author: sebb
Date: Tue Nov 17 00:17:11 2009
New Revision: 881068
URL: http://svn.apache.org/viewvc?rev=881068view=rev
Log:
Bug 47461 - Update Cache Manager to handle Expires HTTP header
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/CacheManagerGui.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampler2.java
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPConstantsInterface.java
jakarta/jmeter/trunk/xdocs/changes.xml
jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=881068r1=881067r2=881068view=diff
==
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
Tue Nov 17 00:17:11 2009
@@ -865,6 +865,7 @@
url_config_title=HTTP Request Defaults
url_full_config_title=UrlFull Sample
url_multipart_config_title=HTTP Multipart Request Defaults
+use_expires=Use Expires header when processing GET requests
use_keepalive=Use KeepAlive
use_multipart_for_http_post=Use multipart/form-data for HTTP POST
use_recording_controller=Use Recording Controller
Modified:
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java?rev=881068r1=881067r2=881068view=diff
==
---
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java
Tue Nov 17 00:17:11 2009
@@ -26,10 +26,13 @@
import java.net.URLConnection;
import java.util.HashMap;
import java.util.Map;
+import java.util.Date;
import org.apache.commons.httpclient.Header;
import org.apache.commons.httpclient.HttpMethod;
import org.apache.commons.httpclient.URIException;
+import org.apache.commons.httpclient.util.DateParseException;
+import org.apache.commons.httpclient.util.DateUtil;
import org.apache.jmeter.config.ConfigTestElement;
import org.apache.jmeter.engine.event.LoopIterationEvent;
import org.apache.jmeter.protocol.http.util.HTTPConstantsInterface;
@@ -44,17 +47,24 @@
*/
public class CacheManager extends ConfigTestElement implements TestListener,
Serializable {
-private static final long serialVersionUID = 233L;
+private static final long serialVersionUID = 234L;
private static final Logger log = LoggingManager.getLoggerForClass();
+//+ JMX attributes, do not change values
public static final String CLEAR = clearEachIteration; // $NON-NLS-1$
-
+public static final String USE_EXPIRES = useExpires; // $NON-NLS-1$
+//-
+
private transient ThreadLocalMapString, CacheEntry threadCache;
+private transient boolean useExpires; // Cached value
+
public CacheManager() {
setProperty(new BooleanProperty(CLEAR, false));
+setProperty(new BooleanProperty(USE_EXPIRES, false));
clearCache();
+useExpires = false;
}
/*
@@ -65,9 +75,11 @@
static class CacheEntry{
private final String lastModified;
private final String etag;
-public CacheEntry(String lastModified, String etag){
+private final Date expires;
+public CacheEntry(String lastModified, Date expires, String etag){
this.lastModified = lastModified;
this.etag = etag;
+ this.expires = expires;
}
public String getLastModified() {
return lastModified;
@@ -79,10 +91,13 @@
public String toString(){
return lastModified+ +etag;
}
+public Date getExpires() {
+return expires;
+}
}
/**
- * Save the Last-Modified and Etag headers if the result is cacheable.
+ * Save the Last-Modified, Etag, and Expires headers if the result is
cacheable.
*
* @param conn connection
* @param res result
@@ -90,14 +105,15 @@
public void saveDetails(URLConnection conn, SampleResult res){
if (isCacheable(res)){
String lastModified =
conn.getHeaderField(HTTPConstantsInterface.LAST_MODIFIED
svn commit: r836179 - /jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TextAreaEditor.java
Author: sebb
Date: Sat Nov 14 13:53:10 2009
New Revision: 836179
URL: http://svn.apache.org/viewvc?rev=836179view=rev
Log:
Tidy up
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TextAreaEditor.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TextAreaEditor.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TextAreaEditor.java?rev=836179r1=836178r2=836179view=diff
==
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TextAreaEditor.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TextAreaEditor.java
Sat Nov 14 13:53:10 2009
@@ -30,27 +30,18 @@
import javax.swing.JTextArea;
public class TextAreaEditor extends PropertyEditorSupport implements
FocusListener {
-JTextArea textUI;
+
+private JTextArea textUI;
-JScrollPane scroller;
+private JScrollPane scroller;
-/*
- * (non-Javadoc)
- *
- * @see java.awt.event.FocusListener#focusGained(java.awt.event.FocusEvent)
- */
+/** {...@inheritdoc} */
public void focusGained(FocusEvent e) {
-
}
-/*
- * (non-Javadoc)
- *
- * @see java.awt.event.FocusListener#focusLost(java.awt.event.FocusEvent)
- */
+/** {...@inheritdoc} */
public void focusLost(FocusEvent e) {
firePropertyChange();
-
}
private void init() {// called from ctor, so must not be overridable
@@ -68,7 +59,6 @@
public TextAreaEditor() {
super();
init();
-
}
/**
@@ -80,41 +70,25 @@
setValue(source);
}
-/*
- * (non-Javadoc)
- *
- * @see java.beans.PropertyEditor#getAsText()
- */
+/** {...@inheritdoc} */
@Override
public String getAsText() {
return textUI.getText();
}
-/*
- * (non-Javadoc)
- *
- * @see java.beans.PropertyEditor#getCustomEditor()
- */
+/** {...@inheritdoc} */
@Override
public Component getCustomEditor() {
return scroller;
}
-/*
- * (non-Javadoc)
- *
- * @see java.beans.PropertyEditor#setAsText(java.lang.String)
- */
+/** {...@inheritdoc} */
@Override
public void setAsText(String text) throws IllegalArgumentException {
textUI.setText(text);
}
-/*
- * (non-Javadoc)
- *
- * @see java.beans.PropertyEditor#setValue(java.lang.Object)
- */
+/** {...@inheritdoc} */
@Override
public void setValue(Object value) {
if (value != null) {
@@ -124,21 +98,13 @@
}
}
-/*
- * (non-Javadoc)
- *
- * @see java.beans.PropertyEditor#getValue()
- */
+/** {...@inheritdoc} */
@Override
public Object getValue() {
return textUI.getText();
}
-/*
- * (non-Javadoc)
- *
- * @see java.beans.PropertyEditor#supportsCustomEditor()
- */
+/** {...@inheritdoc} */
@Override
public boolean supportsCustomEditor() {
return true;
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r836188 - /jakarta/jmeter/trunk/bin/saveservice.properties
Author: sebb Date: Sat Nov 14 15:23:56 2009 New Revision: 836188 URL: http://svn.apache.org/viewvc?rev=836188view=rev Log: Add aliases for new elements Modified: jakarta/jmeter/trunk/bin/saveservice.properties Modified: jakarta/jmeter/trunk/bin/saveservice.properties URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/bin/saveservice.properties?rev=836188r1=836187r2=836188view=diff == --- jakarta/jmeter/trunk/bin/saveservice.properties (original) +++ jakarta/jmeter/trunk/bin/saveservice.properties Sat Nov 14 15:23:56 2009 @@ -81,6 +81,7 @@ BSFPostProcessor=org.apache.jmeter.extractor.BSFPostProcessor BSFSampler=org.apache.jmeter.protocol.java.sampler.BSFSampler BSFSamplerGui=org.apache.jmeter.protocol.java.control.gui.BSFSamplerGui +BSFTimer=org.apache.jmeter.timers.BSFTimer CacheManager=org.apache.jmeter.protocol.http.control.CacheManager CacheManagerGui=org.apache.jmeter.protocol.http.gui.CacheManagerGui CompareAssertion=org.apache.jmeter.assertions.CompareAssertion @@ -142,6 +143,7 @@ JavaConfig=org.apache.jmeter.protocol.java.config.JavaConfig JavaConfigGui=org.apache.jmeter.protocol.java.config.gui.JavaConfigGui JavaSampler=org.apache.jmeter.protocol.java.sampler.JavaSampler +JavaTest=org.apache.jmeter.protocol.java.test.JavaTest JavaTestSamplerGui=org.apache.jmeter.protocol.java.control.gui.JavaTestSamplerGui JDBCDataSource=org.apache.jmeter.protocol.jdbc.config.DataSourceElement JDBCSampler=org.apache.jmeter.protocol.jdbc.sampler.JDBCSampler @@ -149,6 +151,12 @@ JMSPublisherGui=org.apache.jmeter.protocol.jms.control.gui.JMSPublisherGui JMSSampler=org.apache.jmeter.protocol.jms.sampler.JMSSampler JMSSubscriberGui=org.apache.jmeter.protocol.jms.control.gui.JMSSubscriberGui +JSR223Assertion=org.apache.jmeter.assertions.JSR223Assertion +JSR223Listener=org.apache.jmeter.visualizers.JSR223Listener +JSR223PostProcessor=org.apache.jmeter.extractor.JSR223PostProcessor +JSR223PreProcessor=org.apache.jmeter.modifiers.JSR223PreProcessor +JSR223Sampler=org.apache.jmeter.protocol.java.sampler.JSR223Sampler +JSR223Timer=org.apache.jmeter.timers.JSR223Timer JUnitSampler=org.apache.jmeter.protocol.java.sampler.JUnitSampler JUnitTestSamplerGui=org.apache.jmeter.protocol.java.control.gui.JUnitTestSamplerGui LDAPArgument=org.apache.jmeter.protocol.ldap.config.gui.LDAPArgument - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r836189 - /jakarta/jmeter/trunk/build.xml
Author: sebb
Date: Sat Nov 14 15:24:37 2009
New Revision: 836189
URL: http://svn.apache.org/viewvc?rev=836189view=rev
Log:
Test needs bsf-api for Scripting Exceptions
Modified:
jakarta/jmeter/trunk/build.xml
Modified: jakarta/jmeter/trunk/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/build.xml?rev=836189r1=836188r2=836189view=diff
==
--- jakarta/jmeter/trunk/build.xml (original)
+++ jakarta/jmeter/trunk/build.xml Sat Nov 14 15:24:37 2009
@@ -1786,6 +1786,8 @@
fileset dir=${dest.jar} includes=*.jar/
pathelement location=${build.test}/
path refid=classpath/
+ !-- Needed for testing under Java 1.5 --
+ fileset dir=${lib.dir} includes=bsf-api*.jar/
/classpath
jvmarg value=-server/
sysproperty key=java.awt.headless value=${test.headless}/
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r836195 - /jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
Author: sebb
Date: Sat Nov 14 15:48:15 2009
New Revision: 836195
URL: http://svn.apache.org/viewvc?rev=836195view=rev
Log:
New properties file
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java?rev=836195r1=836194r2=836195view=diff
==
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java Sat
Nov 14 15:48:15 2009
@@ -158,7 +158,7 @@
// Internal information only
private static String fileVersion = ; // read from properties file//
$NON-NLS-1$
-private static final String FILEVERSION = 812306; // Expected value
$NON-NLS-1$
+private static final String FILEVERSION = 836188; // Expected value
$NON-NLS-1$
private static String fileEncoding = ; // read from properties file//
$NON-NLS-1$
static {
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r836214 - in /jakarta/jmeter/trunk: docs/images/screenshots/timers/bsf_timer.png xdocs/images/screenshots/timers/bsf_timer.png
Author: sebb Date: Sat Nov 14 16:59:15 2009 New Revision: 836214 URL: http://svn.apache.org/viewvc?rev=836214view=rev Log: Images for new test element Added: jakarta/jmeter/trunk/docs/images/screenshots/timers/bsf_timer.png (with props) jakarta/jmeter/trunk/xdocs/images/screenshots/timers/bsf_timer.png (with props) Added: jakarta/jmeter/trunk/docs/images/screenshots/timers/bsf_timer.png URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/docs/images/screenshots/timers/bsf_timer.png?rev=836214view=auto == Binary file - no diff available. Propchange: jakarta/jmeter/trunk/docs/images/screenshots/timers/bsf_timer.png -- svn:mime-type = image/png Added: jakarta/jmeter/trunk/xdocs/images/screenshots/timers/bsf_timer.png URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/images/screenshots/timers/bsf_timer.png?rev=836214view=auto == Binary file - no diff available. Propchange: jakarta/jmeter/trunk/xdocs/images/screenshots/timers/bsf_timer.png -- svn:mime-type = image/png - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r836217 - in /jakarta/jmeter/trunk/xdocs/stylesheets: site.vsl site_printable.vsl
Author: sebb Date: Sat Nov 14 17:12:05 2009 New Revision: 836217 URL: http://svn.apache.org/viewvc?rev=836217view=rev Log: Properly allow for null variables Modified: jakarta/jmeter/trunk/xdocs/stylesheets/site.vsl jakarta/jmeter/trunk/xdocs/stylesheets/site_printable.vsl Modified: jakarta/jmeter/trunk/xdocs/stylesheets/site.vsl URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/stylesheets/site.vsl?rev=836217r1=836216r2=836217view=diff == --- jakarta/jmeter/trunk/xdocs/stylesheets/site.vsl (original) +++ jakarta/jmeter/trunk/xdocs/stylesheets/site.vsl Sat Nov 14 17:12:05 2009 @@ -309,7 +309,7 @@ #foreach ( $c_items in $component.getChildren() ) #if ($c_items.getName().equals(description)) #runloop($c_items) -#if ($screenshot != ) +#if ($!screenshot != ) pbControl Panel/b/p div align=centerimg $dim src=$sshotdir/$screenshot/div #end Modified: jakarta/jmeter/trunk/xdocs/stylesheets/site_printable.vsl URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/stylesheets/site_printable.vsl?rev=836217r1=836216r2=836217view=diff == --- jakarta/jmeter/trunk/xdocs/stylesheets/site_printable.vsl (original) +++ jakarta/jmeter/trunk/xdocs/stylesheets/site_printable.vsl Sat Nov 14 17:12:05 2009 @@ -312,7 +312,7 @@ #foreach ( $items in $component.getChildren() ) #if ($items.getName().equals(description)) #runloop($items) -#if ($screenshot != ) +#if ($!screenshot != ) pbControl Panel/b/p div align=centerimg $dim src=$sshotdir/$screenshot/div #end - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r836220 - /jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml
Author: sebb Date: Sat Nov 14 17:21:34 2009 New Revision: 836220 URL: http://svn.apache.org/viewvc?rev=836220view=rev Log: Add BSF Timer and JSR223 test elements Modified: jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml Modified: jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=836220r1=836219r2=836220view=diff == --- jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml (original) +++ jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml Sat Nov 14 17:21:34 2009 @@ -1019,6 +1019,15 @@ /p /component +component name=JSR223 Sampler index=sect-num;.1.11.1 +description +p +The JSR223 Sampler allows JSR223 script code to be used to perform a sample. +For details, see complink name=BSF Sampler/. +/p +/description +/component + component name=TCP Sampler index=sect-num;.1.12 width=477 height=343 screenshot=tcpsampler.png description p @@ -3404,7 +3413,16 @@ pFor futher details of all the methods available on each of the above variables, please check the Javadoc/p /component -component name=Compare Assertion index=sect-num;.5.11 width=292 height=296 screenshot=assertion/compare.png +component name=JSR223 Assertion index=sect-num;.5.11 +description +p +The JSR223 Assertion allows JSR223 script code to be used to check the status of the previous sample. +For details, see complink name=BSF Assertion/. +/p +/description +/component + +component name=Compare Assertion index=sect-num;.5.12 width=292 height=296 screenshot=assertion/compare.png description The Compare Assertion can be used to compare sample results within its scope. Either the contents or the elapsed time can be compared, and the contents can be filtered before comparison. @@ -3590,6 +3608,56 @@ /component +component name=BSF Timer index=sect-num;.6.7 width=548 height=350 screenshot=timers/bsf_timer.png +description +p +The BSF Timer can be used to generate a delay using a BSF scripting language. +/p +/description +properties +property name=Name required=NoDescriptive name for this element that is shown in the tree./property +property name=ScriptLanguage required=Yes +The scripting language to be used. +/property +property name=Parameters required=NoParameters to pass to the script. +The parameters are stored in the following variables: +ul +liParameters - string containing the parameters as a single variable/li +liargs - String array containing parameters, split on white-space/li +/ul +/property +property name=Script file required=No +A file containing the script to run. + The return value is converted to a long integer and used as the number of milliseconds to wait. + /property +property name=Script required=Yes (unless script file is provided) +The script. The return value is used as the number of milliseconds to wait. +/property +/properties +pBefore invoking the script, some variables are set up in the script interpreter:/p +ul +lilog - (Logger) - can be used to write to the log file/li +lictx - (JMeterContext) - gives access to the context/li +livars - (JMeterVariables) - gives read/write access to variables: vars.get(key); vars.put(key,val); vars.putObject(OBJ1,new Object());/li +liprops - JMeter Properties - e.g. props.get(START.HMS); props.put(PROP1,1234);/li +liprev - the previous SampleResult (if any)/li +lisampler - the current Sampler/li +liLabel - the name of the Timer/li +liFilename - the file name (if any)/li +liOUT - System.out/li +/ul +pFor details of all the methods available on each of the above variables, please check the Javadoc/p +/component + +component name=JSR223 Timer index=sect-num;.6.8 +description +p +The JSR223 Timer can be used to generate a delay using a JSR223 scripting language, +For details, see complink name=BSF Timer/. +/p +/description +/component + a href=#^/a /section @@ -3832,6 +3900,15 @@ pFor details of all the methods available on each of the above variables, please check the Javadoc/p /component +component name=JSR223 PreProcessor index=sect-num;.7.8 +description +p +The JSR223 PreProcessor allows JSR223 script code to be applied before taking a sample. +For details, see complink name=BSF PreProcessor/. +/p +/description +/component + a href=#^/a /section @@ -4113,6 +4190,15 @@ pFor details of all the methods available on each of the above variables, please check the Javadoc/p /component +component name=JSR223 PostProcessor index=sect-num;.8.6 +description +p +The JSR223 PostProcessor allows JSR223 script code to be applied after taking a sample. +For details, see the complink name=BSF PostProcessor/. +/p +/description +/component + a href=#^/a /section
svn commit: r836235 - /jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml
Author: sebb Date: Sat Nov 14 18:20:31 2009 New Revision: 836235 URL: http://svn.apache.org/viewvc?rev=836235view=rev Log: Forgot the JSR223 Listener Modified: jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml Modified: jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=836235r1=836234r2=836235view=diff == --- jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml (original) +++ jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml Sat Nov 14 18:20:31 2009 @@ -2418,6 +2418,15 @@ pFor details of all the methods available on each of the above variables, please check the Javadoc/p /component +component name=JSR223 Listener index=sect-num;.3.18.1 +description +p +The JSR223 Listener allows JSR223 script code to be applied to sample results. +For details, see complink name=BSF Listener/. +/p +/description +/component + component name=Generate Summary Results index=sect-num;.3.18 width=358 height=131 screenshot=summary.png descriptionThis test element can be placed anywhere in the test plan. Generates a summary of the test run so far to the log file and/or - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r836270 - in /jakarta/jmeter/trunk: src/components/org/apache/jmeter/assertions/ src/components/org/apache/jmeter/visualizers/ src/core/org/apache/jmeter/assertions/ src/core/org/apache/jm
Author: sebb
Date: Sat Nov 14 21:52:31 2009
New Revision: 836270
URL: http://svn.apache.org/viewvc?rev=836270view=rev
Log:
Bug 47907 - Improvements (enhancements and I18N) Comparison Assertion and
Comparison Visualizer
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertion.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertionBeanInfo.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/ComparisonVisualizer.java
jakarta/jmeter/trunk/src/components/org/apache/jmeter/visualizers/TreeNodeRenderer.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/assertions/CompareAssertionResult.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jakarta/jmeter/trunk/xdocs/changes.xml
jakarta/jmeter/trunk/xdocs/usermanual/component_reference.xml
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertion.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertion.java?rev=836270r1=836269r2=836270view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertion.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertion.java
Sat Nov 14 21:52:31 2009
@@ -40,7 +40,7 @@
private transient ListSampleResult responses;
- private transient final StringSubstitution emptySub = new
StringSubstitution();
+ private transient final StringSubstitution emptySub = new
StringSubstitution(); //$NON-NLS-1$
private boolean compareContent = true;
@@ -80,13 +80,14 @@
result.setFailure(true);
StringBuilder buf = new StringBuilder();
appendResultDetails(buf, prevResult);
-buf.append(Response Time: ).append(prevTime);
+
buf.append(JMeterUtils.getResString(comparison_response_time)).append(prevTime);
result.addToBaseResult(buf.toString());
buf = new StringBuilder();
appendResultDetails(buf, sResult);
- buf.append(Response Time:
).append(currentTime);
+
buf.append(JMeterUtils.getResString(comparison_response_time)).append(currentTime);
result.addToSecondaryResult(buf.toString());
- result.setFailureMessage(Responses
differ in response time by more than +compareTime+ ms);
+
result.setFailureMessage(JMeterUtils.getResString(comparison_differ_time)
//$NON-NLS-1$
+
+compareTime+JMeterUtils.getResString(comparison_unit)); //$NON-NLS-1$
break;
}
prevResult = sResult;
@@ -118,7 +119,7 @@
appendResultDetails(buf, sResult);
buf.append(currentContent);
result.addToSecondaryResult(buf.toString());
- result.setFailureMessage(Responses
differ in content);
+
result.setFailureMessage(JMeterUtils.getResString(comparison_differ_content));
//$NON-NLS-1$
break;
}
prevResult = sResult;
@@ -132,12 +133,12 @@
if (samplerData != null){
buf.append(samplerData.trim());
}
-buf.append(\n);
+buf.append(\n); //$NON-NLS-1$
final String requestHeaders = result.getRequestHeaders();
if (requestHeaders != null){
buf.append(requestHeaders);
}
-buf.append(\n\n);
+buf.append(\n\n); //$NON-NLS-1$
}
private String filterString(String content) {
Modified:
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertionBeanInfo.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertionBeanInfo.java?rev=836270r1=836269r2=836270view=diff
==
---
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertionBeanInfo.java
(original)
+++
jakarta/jmeter/trunk/src/components/org/apache/jmeter/assertions/CompareAssertionBeanInfo.java
Sat Nov 14 21:52:31 2009
@@ -23,25 +23,28 @@
import org.apache.jmeter.testbeans.BeanInfoSupport;
import org.apache.jmeter.testbeans.gui.TableEditor;
+import org.apache.jmeter.util.JMeterUtils;
public class
svn commit: r836288 - in /jakarta/jmeter/trunk: src/core/org/apache/jmeter/engine/util/DisabledComponentRemover.java src/core/org/apache/jmeter/gui/action/Start.java xdocs/changes.xml
Author: sebb Date: Sat Nov 14 23:08:26 2009 New Revision: 836288 URL: http://svn.apache.org/viewvc?rev=836288view=rev Log: Bug 47943 - DisabledComponentRemover is not used in Start class Removed: jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/util/DisabledComponentRemover.java Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Start.java jakarta/jmeter/trunk/xdocs/changes.xml Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Start.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Start.java?rev=836288r1=836287r2=836288view=diff == --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Start.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Start.java Sat Nov 14 23:08:26 2009 @@ -28,7 +28,6 @@ import org.apache.jmeter.engine.JMeterEngineException; import org.apache.jmeter.engine.StandardJMeterEngine; import org.apache.jmeter.engine.TreeCloner; -import org.apache.jmeter.engine.util.DisabledComponentRemover; import org.apache.jmeter.gui.GuiPackage; import org.apache.jmeter.testelement.TestPlan; import org.apache.jmeter.util.JMeterUtils; @@ -89,8 +88,6 @@ GuiPackage gui = GuiPackage.getInstance(); HashTree testTree = gui.getTreeModel().getTestPlan(); JMeter.convertSubTree(testTree); -DisabledComponentRemover remover = new DisabledComponentRemover(testTree); -testTree.traverse(remover); testTree.add(testTree.getArray()[0], gui.getMainFrame()); log.debug(test plan before cloning is running version: + ((TestPlan) testTree.getArray()[0]).isRunningVersion()); Modified: jakarta/jmeter/trunk/xdocs/changes.xml URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=836288r1=836287r2=836288view=diff == --- jakarta/jmeter/trunk/xdocs/changes.xml (original) +++ jakarta/jmeter/trunk/xdocs/changes.xml Sat Nov 14 23:08:26 2009 @@ -162,6 +162,7 @@ ul liBug 47223 - Slow Aggregate Report Performance (StatCalculator)/li liBug 47980 - hostname resolves to 127.0.0.1 - specifiying IP not possible/li +liBug 47943 - DisabledComponentRemover is not used in Start class/li /ul h2Non-functional changes/h2 - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r836291 - in /jakarta/jmeter/trunk: src/components/org/apache/jmeter/control/ModuleController.java xdocs/changes.xml
Author: sebb Date: Sat Nov 14 23:24:23 2009 New Revision: 836291 URL: http://svn.apache.org/viewvc?rev=836291view=rev Log: Bug 47940 - Module controller incorrectly creates the replacement Sub Tree Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/ModuleController.java jakarta/jmeter/trunk/xdocs/changes.xml Modified: jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/ModuleController.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/ModuleController.java?rev=836291r1=836290r2=836291view=diff == --- jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/ModuleController.java (original) +++ jakarta/jmeter/trunk/src/components/org/apache/jmeter/control/ModuleController.java Sat Nov 14 23:24:23 2009 @@ -163,8 +163,8 @@ selectedNode = cloneTreeNode(selectedNode); selectedNode.setEnabled(true); } -tree.add(selectedNode); -createSubTree(tree, selectedNode); +HashTree subtree = tree.add(selectedNode); +createSubTree(subtree, selectedNode); } return tree; } Modified: jakarta/jmeter/trunk/xdocs/changes.xml URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=836291r1=836290r2=836291view=diff == --- jakarta/jmeter/trunk/xdocs/changes.xml (original) +++ jakarta/jmeter/trunk/xdocs/changes.xml Sat Nov 14 23:24:23 2009 @@ -83,6 +83,7 @@ h3Controllers/h3 ul liBug 47385 - TransactionController should set AllThreads and GroupThreads/li +liBug 47940 - Module controller incorrectly creates the replacement Sub Tree/li /ul h3Listeners/h3 - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r836293 - in /jakarta/jmeter/trunk: src/core/org/apache/jmeter/control/TransactionController.java xdocs/changes.xml
Author: sebb Date: Sat Nov 14 23:29:15 2009 New Revision: 836293 URL: http://svn.apache.org/viewvc?rev=836293view=rev Log: Bug 47909 - TransactionController should sum the latency Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java jakarta/jmeter/trunk/xdocs/changes.xml Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java?rev=836293r1=836292r2=836293view=diff == --- jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java (original) +++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java Sat Nov 14 23:29:15 2009 @@ -202,6 +202,7 @@ } res.setAllThreads(sampleResult.getAllThreads()); res.setGroupThreads(sampleResult.getGroupThreads()); +res.setLatency(res.getLatency() + sampleResult.getLatency()); } } } Modified: jakarta/jmeter/trunk/xdocs/changes.xml URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=836293r1=836292r2=836293view=diff == --- jakarta/jmeter/trunk/xdocs/changes.xml (original) +++ jakarta/jmeter/trunk/xdocs/changes.xml Sat Nov 14 23:29:15 2009 @@ -127,6 +127,7 @@ h3Controllers/h3 ul +liBug 47909 - TransactionController should sum the latency/li /ul h3Listeners/h3 - To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r836304 - /jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java
Author: sebb
Date: Sun Nov 15 01:11:50 2009
New Revision: 836304
URL: http://svn.apache.org/viewvc?rev=836304view=rev
Log:
StringBuffer = Builder
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java
Modified:
jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java?rev=836304r1=836303r2=836304view=diff
==
---
jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java
(original)
+++
jakarta/jmeter/trunk/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java
Sun Nov 15 01:11:50 2009
@@ -291,7 +291,7 @@
*/
@Override
public String toString() {
-StringBuffer mySB = new StringBuffer();
+StringBuilder mySB = new StringBuilder();
mySB.append(Samples: + this.getCount() + );
mySB.append(Avg: + this.getMean() + );
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r836305 - /jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/OnMessageSubscriber.java
Author: sebb
Date: Sun Nov 15 01:12:10 2009
New Revision: 836305
URL: http://svn.apache.org/viewvc?rev=836305view=rev
Log:
Tidy up
Modified:
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/OnMessageSubscriber.java
Modified:
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/OnMessageSubscriber.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/OnMessageSubscriber.java?rev=836305r1=836304r2=836305view=diff
==
---
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/OnMessageSubscriber.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/OnMessageSubscriber.java
Sun Nov 15 01:12:10 2009
@@ -53,13 +53,6 @@
private TopicSubscriber SUBSCRIBER = null;
/**
- *
- */
-public OnMessageSubscriber() {
-super();
-}
-
-/**
* Constructor takes the necessary JNDI related parameters to create a
* connection and begin receiving messages.
*
@@ -93,7 +86,7 @@
* @param pwd
* @return the context or null
*/
-public Context initJNDI(boolean useProps, String jndi, String url, boolean
useAuth, String user, String pwd) {
+private Context initJNDI(boolean useProps, String jndi, String url,
boolean useAuth, String user, String pwd) {
if (useProps) {
try {
return new InitialContext();
@@ -113,7 +106,7 @@
* @param connfactory
* @param topic
*/
-public void initConnection(Context ctx, String connfactory, String topic) {
+private void initConnection(Context ctx, String connfactory, String topic)
{
try {
ConnectionFactory.getTopicConnectionFactory(ctx, connfactory);
this.CONN = ConnectionFactory.getTopicConnection();
@@ -151,8 +144,6 @@
this.CONN = null;
} catch (JMSException e) {
log.error(e.getMessage());
-} catch (Throwable e) {
-log.error(e.getMessage());
}
}
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r836307 - in /jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms: client/ConnectionFactory.java sampler/MessageAdmin.java sampler/Receiver.java
Author: sebb
Date: Sun Nov 15 01:25:19 2009
New Revision: 836307
URL: http://svn.apache.org/viewvc?rev=836307view=rev
Log:
Tidy up
Modified:
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ConnectionFactory.java
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/MessageAdmin.java
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/Receiver.java
Modified:
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ConnectionFactory.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ConnectionFactory.java?rev=836307r1=836306r2=836307view=diff
==
---
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ConnectionFactory.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ConnectionFactory.java
Sun Nov 15 01:25:19 2009
@@ -80,11 +80,7 @@
testEnded();
}
-/**
- * endTest cleans up the client
- *
- * @see junit.framework.TestListener#endTest(junit.framework.Test)
- */
+/** {...@inheritdoc} */
public synchronized void testEnded() {
ConnectionFactory.factory = null;//N.B. static reference
}
Modified:
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/MessageAdmin.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/MessageAdmin.java?rev=836307r1=836306r2=836307view=diff
==
---
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/MessageAdmin.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/MessageAdmin.java
Sun Nov 15 01:25:19 2009
@@ -33,7 +33,7 @@
public class MessageAdmin {
private static final MessageAdmin SINGLETON = new MessageAdmin();
-private MapString, PlaceHolder table = new HashtableString,
PlaceHolder();
+private final MapString, PlaceHolder table = new HashtableString,
PlaceHolder();
private static final Logger log = LoggingManager.getLoggerForClass();
Modified:
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/Receiver.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/Receiver.java?rev=836307r1=836306r2=836307view=diff
==
---
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/Receiver.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/Receiver.java
Sun Nov 15 01:25:19 2009
@@ -30,7 +30,7 @@
public class Receiver implements Runnable {
private static final Logger log = LoggingManager.getLoggerForClass();
-private boolean active;
+private volatile boolean active;
private final QueueSession session;
@@ -65,10 +65,10 @@
}
public void run() {
-activate();
+active = true;
Message reply;
-while (isActive()) {
+while (active) {
reply = null;
try {
reply = consumer.receive(5000);
@@ -111,16 +111,8 @@
}
}
-public synchronized void activate() {
-active = true;
-}
-
-public synchronized void deactivate() {
+public void deactivate() {
active = false;
}
-private synchronized boolean isActive() {
-return active;
-}
-
}
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r836310 - in /jakarta/jmeter/trunk: src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSConfigGui.java src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java xd
Author: sebb
Date: Sun Nov 15 01:49:25 2009
New Revision: 836310
URL: http://svn.apache.org/viewvc?rev=836310view=rev
Log:
Bug 47556 - JMS-PoinToPoint-Sampler Timout field should use Strings
Modified:
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSConfigGui.java
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
jakarta/jmeter/trunk/xdocs/changes.xml
Modified:
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSConfigGui.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSConfigGui.java?rev=836310r1=836309r2=836310view=diff
==
---
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSConfigGui.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSConfigGui.java
Sun Nov 15 01:49:25 2009
@@ -186,7 +186,7 @@
useNonPersistentDelivery.setSelected(sampler.isNonPersistent());
useReqMsgIdAsCorrelId.setSelected(sampler.isUseReqMsgIdAsCorrelId());
-timeout.setText(String.valueOf(sampler.getTimeout()));
+timeout.setText(sampler.getTimeout());
soapXml.setText(sampler.getContent());
initialContextFactory.setText(sampler.getInitialContextFactory());
providerUrl.setText(sampler.getContextProvider());
Modified:
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java?rev=836310r1=836309r2=836310view=diff
==
---
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
(original)
+++
jakarta/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
Sun Nov 15 01:49:25 2009
@@ -61,6 +61,7 @@
private static final long serialVersionUID = 233L;
private static final int DEFAULT_TIMEOUT = 2000;
+private static final String DEFAULT_TIMEOUT_STRING =
Integer.toString(DEFAULT_TIMEOUT);
//++ These are JMX names, and must not be changed
private static final String JNDI_INITIAL_CONTEXT_FACTORY =
JMSSampler.initialContextFactory; // $NON-NLS-1$
@@ -341,7 +342,7 @@
if (isNonPersistent()) {
producer.setDeliveryMode(DeliveryMode.NON_PERSISTENT);
}
-executor = new FixedQueueExecutor(producer, getTimeout(),
isUseReqMsgIdAsCorrelId());
+executor = new FixedQueueExecutor(producer,
getTimeoutAsInt(), isUseReqMsgIdAsCorrelId());
}
}
if (LOGGER.isDebugEnabled()) {
@@ -407,6 +408,7 @@
private void printEnvironment(Context context) throws NamingException {
Hashtable?,? env = context.getEnvironment();
LOGGER.debug(Initial Context Properties);
+@SuppressWarnings(unchecked)
EnumerationString keys = (EnumerationString) env.keys();
while (keys.hasMoreElements()) {
String key = keys.nextElement();
@@ -425,12 +427,16 @@
}
}
-public int getTimeout() {
+private int getTimeoutAsInt() {
if (getPropertyAsInt(TIMEOUT) 1) {
return DEFAULT_TIMEOUT;
}
return getPropertyAsInt(TIMEOUT);
}
+
+public String getTimeout() {
+return getPropertyAsString(TIMEOUT, DEFAULT_TIMEOUT_STRING);
+}
/*
* (non-Javadoc)
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=836310r1=836309r2=836310view=diff
==
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Sun Nov 15 01:49:25 2009
@@ -123,6 +123,7 @@
liJUnit sampler now supports JUnit4 tests (using annotations)/li
liBug 47900 - Allow JMS SubscriberSampler to be interrupted/li
liAdded JSR223 Sampler/li
+liBug 47556 - JMS-PoinToPoint-Sampler Timout field should use Strings/li
/ul
h3Controllers/h3
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
svn commit: r835924 - /jakarta/jmeter/trunk/build.xml
Author: sebb
Date: Fri Nov 13 17:12:07 2009
New Revision: 835924
URL: http://svn.apache.org/viewvc?rev=835924view=rev
Log:
Bug 48183 - need to ensure build dir is created before downloading files
Modified:
jakarta/jmeter/trunk/build.xml
Modified: jakarta/jmeter/trunk/build.xml
URL:
http://svn.apache.org/viewvc/jakarta/jmeter/trunk/build.xml?rev=835924r1=835923r2=835924view=diff
==
--- jakarta/jmeter/trunk/build.xml (original)
+++ jakarta/jmeter/trunk/build.xml Fri Nov 13 17:12:07 2009
@@ -2004,6 +2004,8 @@
!-- Download all missing jars.--
target name=download_jars description=Download any missing jar files
+ !-- build.dir may be needed as a temporary work area --
+ mkdir dir=${build.dir} /
antcall target=_process_all_jars
param name=_get_file value=true/
/antcall
-
To unsubscribe, e-mail: jmeter-dev-unsubscr...@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-h...@jakarta.apache.org
