[jmeter] branch master updated: Add default values in user.properties file Useful to have the default value and unit without looking at the documentation

[agomes]

This is an automated email from the ASF dual-hosted git repository.

agomes pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git


The following commit(s) were added to refs/heads/master by this push:
 new 642893b  Add default values in user.properties file Useful to have the 
default value and unit without looking at the documentation
 new 64718d4  Merge remote-tracking branch 'origin/master'
642893b is described below

commit 642893b00e9ec0f41ccdae7833922ac2bd20f799
Author: Antonio 
AuthorDate: Sun May 3 23:56:48 2020 +0200

Add default values in user.properties file
Useful to have the default value and unit without looking at the 
documentation
---
 bin/user.properties | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/bin/user.properties b/bin/user.properties
index c065393..8ba89f1 100644
--- a/bin/user.properties
+++ b/bin/user.properties
@@ -72,6 +72,7 @@
 #jmeter.reportgenerator.end_date=
 
 # Change this parameter if you want to change the granularity of over time 
graphs.
+# Set to 6 ms by default
 #jmeter.reportgenerator.overall_granularity=6
 
 # Change this parameter if you want to change the granularity of Response time 
distribution
@@ -84,9 +85,11 @@
 #jmeter.reportgenerator.sample_filter=
 
 # Change this parameter if you want to override the APDEX satisfaction 
threshold.
+# Set to 500 ms by default
 #jmeter.reportgenerator.apdex_satisfied_threshold=500
 
 # Change this parameter if you want to override the APDEX tolerance threshold.
+# Set to 1500 ms by default
 #jmeter.reportgenerator.apdex_tolerated_threshold=1500
 
 # Indicates which graph series are filtered (regular expression)

svn commit: r1846267 - in /jmeter/trunk: bin/report-template/content/js/dashboard.js.fmkr src/core/org/apache/jmeter/resources/messages.properties

[agomes]

Author: agomes
Date: Fri Nov  9 22:18:37 2018
New Revision: 1846267

URL: http://svn.apache.org/viewvc?rev=1846267=rev
Log:
Bug 62894 : Report / Dashboard : Throughput is in wrong column which is 
confusing as unit is milliseconds : better labels

Modified:
jmeter/trunk/bin/report-template/content/js/dashboard.js.fmkr
jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties

Modified: jmeter/trunk/bin/report-template/content/js/dashboard.js.fmkr
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/bin/report-template/content/js/dashboard.js.fmkr?rev=1846267=1846266=1846267=diff
==
--- jmeter/trunk/bin/report-template/content/js/dashboard.js.fmkr (original)
+++ jmeter/trunk/bin/report-template/content/js/dashboard.js.fmkr Fri Nov  9 
22:18:37 2018
@@ -47,7 +47,7 @@ function summaryTableHeader(header) {
 cell = document.createElement('th');
 cell.setAttribute("data-sorter", false);
 cell.colSpan = 1;
-cell.innerHTML = "Throughput (Trans or Req/s)";
+cell.innerHTML = "Throughput";
 newRow.appendChild(cell);
 
 cell = document.createElement('th');

Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=1846267=1846266=1846267=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Fri 
Nov  9 22:18:37 2018
@@ -930,7 +930,7 @@ reportgenerator_summary_statistics_max=M
 reportgenerator_summary_statistics_mean=Average
 reportgenerator_summary_statistics_min=Min
 reportgenerator_summary_statistics_percentile_fmt=%dth pct
-reportgenerator_summary_statistics_throughput=Throughput
+reportgenerator_summary_statistics_throughput=Transactions/s
 reportgenerator_summary_total=Total
 request_data=Request Data
 reset=Reset

svn commit: r1833483 - /jmeter/trunk/xdocs/images/screenshots/csvdatasetconfig.png

[agomes]

Author: agomes
Date: Wed Jun 13 22:13:10 2018
New Revision: 1833483

URL: http://svn.apache.org/viewvc?rev=1833483=rev
Log:
Fix https://jmeter.apache.org/images/screenshots/csvdatasetconfig.png image

Modified:
jmeter/trunk/xdocs/images/screenshots/csvdatasetconfig.png

Modified: jmeter/trunk/xdocs/images/screenshots/csvdatasetconfig.png
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/images/screenshots/csvdatasetconfig.png?rev=1833483=1833482=1833483=diff
==
Binary files - no diff available.

svn commit: r1829749 - in /jmeter/trunk: docs/images/screenshots/ xdocs/ xdocs/images/screenshots/ xdocs/usermanual/

[agomes]

Author: agomes
Date: Sat Apr 21 21:15:50 2018
New Revision: 1829749

URL: http://svn.apache.org/viewvc?rev=1829749=rev
Log:
Bug 61714 - Grafana config example obsolete - update the doc of Real-time 
results

Removed:
jmeter/trunk/docs/images/screenshots/if_controller_expression.png
jmeter/trunk/docs/images/screenshots/if_controller_javascript.png
jmeter/trunk/docs/images/screenshots/if_controller_variable.png
Modified:
jmeter/trunk/xdocs/changes.xml
jmeter/trunk/xdocs/images/screenshots/backend_listener.png
jmeter/trunk/xdocs/usermanual/realtime-results.xml

Modified: jmeter/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1829749=1829748=1829749=diff
==
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sat Apr 21 21:15:50 2018
@@ -142,6 +142,7 @@ this behaviour, set httpclient.res
   62239Add ability to Break Current Loop
   62065Use Maven artifact for JAF Module instead of embedded 
module
   379 Improve chinese translations. Contributed by XmeterNet
+  61714Update Real-time results documentation
 
 
 Non-functional changes

Modified: jmeter/trunk/xdocs/images/screenshots/backend_listener.png
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/images/screenshots/backend_listener.png?rev=1829749=1829748=1829749=diff
==
Binary files - no diff available.

Modified: jmeter/trunk/xdocs/usermanual/realtime-results.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/realtime-results.xml?rev=1829749=1829748=1829749=diff
==
--- jmeter/trunk/xdocs/usermanual/realtime-results.xml (original)
+++ jmeter/trunk/xdocs/usermanual/realtime-results.xml Sat Apr 21 21:15:50 2018
@@ -138,71 +138,34 @@ In this document we will present the con
 
 
 
-To make JMeter send metrics to backend add a BackendListener using 
the GraphiteBackendListenerClient.
+To make JMeter send metrics to backend add a BackendListener using 
the InfluxDBBackendListenerClient.
 
-Graphite 
configuration
+InfluxDB 
configuration
 
 
 
-Connect to InfluxDB using https://docs.influxdata.com/influxdb/v1.1/introduction/getting_started/; 
>influx shell and https://docs.influxdata.com/influxdb/v1.1/query_language/database_management/;
 >create two databases:
+Connect to InfluxDB using https://docs.influxdata.com/influxdb/latest/introduction/getting_started/;
 >InfluxDB’s Command Line Interface (CLI). and https://docs.influxdata.com/influxdb/latest/query_language/database_management/;
 >create JMeter database:
 
-grafana : Used by Grafana to store the dashboards we will 
create
-jmeter : Used by InfluxDB to store the data sent to Graphite 
Listener as per database="jmeter" config
-element in influxdb.conf or config.toml
+jmeter : Used by InfluxDB to store the data sent by the Backend 
Listener
 
+You can do it too by using the HTTP API.
 
 
 
 InfluxDB is an open-source, distributed, time-series database that allows 
to 
 easily store metrics.
-Installation and configuration is very easy, read this for more details https://docs.influxdata.com/influxdb/v1.1/introduction/installation/; 
target="_blank" >InfluxDB documentation.
-InfluxDB data can be easily viewed in a browser through either https://github.com/hakobera/influga;  target="_blank">Influga or http://grafana.org/;  target="_blank">Grafana.
-We will use Grafana in this case.
-There is no particular configuration to setup when using 
InfluxDBBackendListenerClient
+Installation and configuration is very easy, read this for more details https://docs.influxdata.com/influxdb/latest/introduction/installation/; 
target="_blank" >InfluxDB documentation.
+InfluxDB data can be easily viewed in a browser through http://grafana.org/;  target="_blank">Grafana.
 
 
-
-
-To enable Graphite listener in InfluxDB for 
GraphiteBackendListenerClient, edit files 
/opt/influxdb/shared/config.toml or 
/usr/local/etc/influxdb.conf,
-find "[[graphite]]" and set this:
-
-
-# Configure the graphite api
-[[graphite]]
-enabled = true
-bind-address = ":2003" # If not set, is actually set to bind-address.
-database = "jmeter"  # store graphite data in this database
-
-
 
 
 
 
-Installing grafana is just a matter of putting the unzipped bundle behind 
an Apache HTTP server.
-Read http://grafana.org/docs/; target="_blank">documentation 
for more details.
-Open config.js file and find datasources 
element, and edit it like this:
+Installing grafana
+Read http://docs.grafana.org/; target="_blank">documentati

svn commit: r1817580 - in /jmeter/trunk: bin/report-template/sbadmin2-1.0.7/bower_components/bootstrap-social/ bin/report-template/sbadmin2-1.0.7/bower_components/bootstrap/ bin/report-template/sbadmi

[agomes]

Author: agomes
Date: Fri Dec  8 22:00:44 2017
New Revision: 1817580

URL: http://svn.apache.org/viewvc?rev=1817580=rev
Log:
Bug 61879 - Remove useless files in HTML report template

Removed:

jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/bootstrap-social/

jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/bootstrap/Gruntfile.js

jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/bootstrap/bower.json

jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/bootstrap/dist/css/bootstrap-theme.css

jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/bootstrap/dist/css/bootstrap-theme.css.map

jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/bootstrap/dist/css/bootstrap-theme.min.css

jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/bootstrap/dist/css/bootstrap.css

jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/bootstrap/dist/css/bootstrap.css.map

jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/bootstrap/dist/fonts/glyphicons-halflings-regular.eot

jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/bootstrap/dist/fonts/glyphicons-halflings-regular.svg

jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/bootstrap/dist/js/bootstrap.js

jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/bootstrap/dist/js/npm.js

jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/bootstrap/fonts/

jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/bootstrap/grunt/

jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/bootstrap/js/

jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/bootstrap/less/

jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/bootstrap/package.js

jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/bootstrap/package.json
jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/datatables/

jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/datatables-plugins/

jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/datatables-responsive/
jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/holderjs/
jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/jquery/src/

jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/metisMenu/Gruntfile.js

jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/metisMenu/bower.json

jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/metisMenu/dist/metisMenu.css

jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/metisMenu/dist/metisMenu.js

jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/metisMenu/package.json

jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/metisMenu/src/
jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/mocha/
jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/morrisjs/
jmeter/trunk/bin/report-template/sbadmin2-1.0.7/bower_components/raphael/
Modified:
jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1817580=1817579=1817580=diff
==
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Fri Dec  8 22:00:44 2017
@@ -157,6 +157,7 @@ Summary
 Report / Dashboard
 
 61871Reduce 
jmeter.reportgenerator.graph.responseTimeDistribution.property.set_granularity 
default value from 500ms to 100ms
+61879Remove useless files in HTML report template
 
 
 General

svn commit: r1817434 - in /jmeter/trunk/src/core/org/apache/jmeter: gui/util/JMeterMenuBar.java resources/messages.properties resources/messages_fr.properties

[agomes]

Author: agomes
Date: Thu Dec  7 22:45:08 2017
New Revision: 1817434

URL: http://svn.apache.org/viewvc?rev=1817434=rev
Log:
Bug 61785 - add release notes in useful links

Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java
jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java?rev=1817434=1817433=1817434=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java Thu Dec 
 7 22:45:08 2017
@@ -246,6 +246,7 @@ public class JMeterMenuBar extends JMenu
 JMenuItem threadDump = makeMenuItemRes("thread_dump", 
ActionNames.THREAD_DUMP);//$NON-NLS-1$
 
 JMenu usefulLinks = makeMenuRes("useful_links");//$NON-NLS-1$
+usefulLinks.add(makeMenuItemRes("link_release_notes", 
ActionNames.LINK_RELEASE_NOTES));
 usefulLinks.add(makeMenuItemRes("link_bug_tracker", 
ActionNames.LINK_BUG_TRACKER));
 usefulLinks.add(makeMenuItemRes("link_comp_ref", 
ActionNames.LINK_COMP_REF));
 usefulLinks.add(makeMenuItemRes("link_nightly_build", 
ActionNames.LINK_NIGHTLY_BUILD));

Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=1817434=1817433=1817434=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Thu 
Dec  7 22:45:08 2017
@@ -620,6 +620,7 @@ library=Library
 link_bug_tracker=Create an issue
 link_comp_ref=Component Reference Documentation
 link_nightly_build=Nightly builds
+link_release_notes=Release notes
 load=Load
 locale_format=String format of a locale (ex\: fr_FR , en_EN) (optional)
 log_errors_only=Errors

Modified: 
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties?rev=1817434=1817433=1817434=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties 
Thu Dec  7 22:45:08 2017
@@ -614,6 +614,7 @@ library=Librairie
 link_bug_tracker=Cr\u00E9er un ticket
 link_comp_ref=R\u00e9f\u00e9rence des composants 
 link_nightly_build=Versions de d\u00E9veloppement
+link_release_notes=Notes de version
 load=Charger
 locale_format=Text representant la langue et le pays (ex\: fr_FR , en_EN) 
(optionnel)
 log_errors_only=Erreurs

svn commit: r1817432 - /jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java

[agomes]

Author: agomes
Date: Thu Dec  7 22:28:56 2017
New Revision: 1817432

URL: http://svn.apache.org/viewvc?rev=1817432=rev
Log:
Bug 61785 - fix comments

Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java?rev=1817432=1817431=1817432=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java Thu Dec 
 7 22:28:56 2017
@@ -61,7 +61,7 @@ public final class ActionNames {
 public static final String HEAP_DUMP= "heap_dump"; // $NON-NLS-1$
 public static final String LAF_PREFIX   = "laf:"; // Look and Feel 
prefix
 public static final String LINK_BUG_TRACKER = "link_bug_tracker:"; // URI 
of bug tracker
-public static final String LINK_COMP_REF= "link_component_reference:"; 
// URI of nightly build
+public static final String LINK_COMP_REF= "link_component_reference:"; 
// URI of component reference
 public static final String LINK_NIGHTLY_BUILD = "link_nightly_build:"; // 
URI of nightly build
 public static final String LINK_RELEASE_NOTES = "link_release_notes"; // 
URI of the release note
 public static final String LOGGER_PANEL_ENABLE_DISABLE = 
"logger_panel_enable_disable"; // $NON-NLS-1$

svn commit: r1817431 - in /jmeter/trunk: bin/report-template/content/js/graph.js.fmkr bin/report-template/index.html.fmkr xdocs/changes.xml

[agomes]

Author: agomes
Date: Thu Dec  7 22:23:35 2017
New Revision: 1817431

URL: http://svn.apache.org/viewvc?rev=1817431=rev
Log:
Bug 61872 - Better labels in dynamic HTML report

Modified:
jmeter/trunk/bin/report-template/content/js/graph.js.fmkr
jmeter/trunk/bin/report-template/index.html.fmkr
jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/bin/report-template/content/js/graph.js.fmkr
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/bin/report-template/content/js/graph.js.fmkr?rev=1817431=1817430=1817431=diff
==
--- jmeter/trunk/bin/report-template/content/js/graph.js.fmkr (original)
+++ jmeter/trunk/bin/report-template/content/js/graph.js.fmkr Thu Dec  7 
22:23:35 2017
@@ -594,7 +594,7 @@ var bytesThroughputOverTimeInfos = {
 axisLabelPadding: 20,
 },
 yaxis: {
-axisLabel: "Bytes/sec",
+axisLabel: "Bytes / sec",
 axisLabelUseCanvas: true,
 axisLabelFontSizePixels: 12,
 axisLabelFontFamily: 'Verdana, Arial',
@@ -671,7 +671,7 @@ var responseTimesOverTimeInfos = {
 axisLabelPadding: 20,
 },
 yaxis: {
-axisLabel: "Response time in ms",
+axisLabel: "Average response time in ms",
 axisLabelUseCanvas: true,
 axisLabelFontSizePixels: 12,
 axisLabelFontFamily: 'Verdana, Arial',
@@ -748,7 +748,7 @@ var latenciesOverTimeInfos = {
 axisLabelPadding: 20,
 },
 yaxis: {
-axisLabel: "Response latencies in ms",
+axisLabel: "Average response latencies in ms",
 axisLabelUseCanvas: true,
 axisLabelFontSizePixels: 12,
 axisLabelFontFamily: 'Verdana, Arial',
@@ -979,7 +979,7 @@ var responseTimeVsRequestInfos = {
 axisLabelPadding: 20,
 },
 yaxis: {
-axisLabel: "Median Response Time (ms)",
+axisLabel: "Median Response Time in ms",
 axisLabelUseCanvas: true,
 axisLabelFontSizePixels: 12,
 axisLabelFontFamily: 'Verdana, Arial',
@@ -1053,7 +1053,7 @@ var latenciesVsRequestInfos = {
 axisLabelPadding: 20,
 },
 yaxis: {
-axisLabel: "Median Latency (ms)",
+axisLabel: "Median Latency in ms",
 axisLabelUseCanvas: true,
 axisLabelFontSizePixels: 12,
 axisLabelFontFamily: 'Verdana, Arial',
@@ -1200,7 +1200,7 @@ var codesPerSecondInfos = {
 axisLabelPadding: 20,
 },
 yaxis: {
-axisLabel: "Number of responses/sec",
+axisLabel: "Number of responses / sec",
 axisLabelUseCanvas: true,
 axisLabelFontSizePixels: 12,
 axisLabelFontFamily: 'Verdana, Arial',

Modified: jmeter/trunk/bin/report-template/index.html.fmkr
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/bin/report-template/index.html.fmkr?rev=1817431=1817430=1817431=diff
==
--- jmeter/trunk/bin/report-template/index.html.fmkr (original)
+++ jmeter/trunk/bin/report-template/index.html.fmkr Thu Dec  7 22:23:35 2017
@@ -80,26 +80,26 @@
 
 
 
-File:
+Source file
 ${testFile!""}
 
 
-Start Time:
+Start Time
 ${beginDate!""}
 
 
-End Time:
+End Time
 ${endDate!""}
 
 <#if overallFilter?has_content>
 
-Filter for computing:
+Filter for computing
 ${overallFilter}
 
 
 <#if seriesFilter?has_content>
 
-Filter for display:
+Filter for display
 ${seriesFilte

svn commit: r1817324 - in /jmeter/trunk/docs/images/screenshots: ./ webtest/

[agomes]

Author: agomes
Date: Wed Dec  6 23:05:45 2017
New Revision: 1817324

URL: http://svn.apache.org/viewvc?rev=1817324=rev
Log:
revert png files commited in r1817321

Modified:
jmeter/trunk/docs/images/screenshots/template_menu.png
jmeter/trunk/docs/images/screenshots/webtest/http-defaults1.png
jmeter/trunk/docs/images/screenshots/webtest/http-defaults2.png
jmeter/trunk/docs/images/screenshots/webtest/http-request1.png
jmeter/trunk/docs/images/screenshots/webtest/http-request2.png
jmeter/trunk/docs/images/screenshots/webtest/http_login.png
jmeter/trunk/docs/images/screenshots/webtest/threadgroup.png
jmeter/trunk/docs/images/screenshots/webtest/threadgroup2.png

Modified: jmeter/trunk/docs/images/screenshots/template_menu.png
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/template_menu.png?rev=1817324=1817323=1817324=diff
==
Binary files - no diff available.

Modified: jmeter/trunk/docs/images/screenshots/webtest/http-defaults1.png
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/webtest/http-defaults1.png?rev=1817324=1817323=1817324=diff
==
Binary files - no diff available.

Modified: jmeter/trunk/docs/images/screenshots/webtest/http-defaults2.png
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/webtest/http-defaults2.png?rev=1817324=1817323=1817324=diff
==
Binary files - no diff available.

Modified: jmeter/trunk/docs/images/screenshots/webtest/http-request1.png
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/webtest/http-request1.png?rev=1817324=1817323=1817324=diff
==
Binary files - no diff available.

Modified: jmeter/trunk/docs/images/screenshots/webtest/http-request2.png
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/webtest/http-request2.png?rev=1817324=1817323=1817324=diff
==
Binary files - no diff available.

Modified: jmeter/trunk/docs/images/screenshots/webtest/http_login.png
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/webtest/http_login.png?rev=1817324=1817323=1817324=diff
==
Binary files - no diff available.

Modified: jmeter/trunk/docs/images/screenshots/webtest/threadgroup.png
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/webtest/threadgroup.png?rev=1817324=1817323=1817324=diff
==
Binary files - no diff available.

Modified: jmeter/trunk/docs/images/screenshots/webtest/threadgroup2.png
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/webtest/threadgroup2.png?rev=1817324=1817323=1817324=diff
==
Binary files - no diff available.

svn commit: r1817322 - /jmeter/trunk/xdocs/changes.xml

[agomes]

Author: agomes
Date: Wed Dec  6 22:26:39 2017
New Revision: 1817322

URL: http://svn.apache.org/viewvc?rev=1817322=rev
Log:
PR345,61867 - Updated to latest checkstyle (v8.5), add bug number

Modified:
jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1817322=1817321=1817322=diff
==
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Wed Dec  6 22:26:39 2017
@@ -180,7 +180,7 @@ Summary
 61785Add 
HelpUseful 
links to create issues and download nightly 
build
 61808Fix main frame position. Implemented by Artem Fedorov 
(artem at blazemeter.com) and contributed by BlazeMeter Ltd.
 61802Loop / ForEach Controller should expose a variable for 
current iteration. Contributed by Ubik Load Pack (support at 
ubikloadpack.com)
-349 add i18n resouces(zh_CN). Contributed by Helly Guo 
(https://github.com/hellyguo)
+349Add i18n resouces(zh_CN). Contributed by Helly Guo 
(https://github.com/hellyguo)
 
 
 Non-functional changes
@@ -200,7 +200,7 @@ Summary
 332Add the spock framework for groovy unit tests. Contributed 
by Graham Russell (graham at ham1.co.uk)
 334Enable running of JUnit tests from within IntelliJ with 
default config. Contributed by Graham Russell (graham at ham1.co.uk)
 335Removed functions.util.* as they don't seem 
to be used (for many years). Contributed by Graham Russell (graham at 
ham1.co.uk)
-345Updated to latest checkstyle (v8.5), Added many more rules 
to checkstyle, Included checking of test files and more file types. Contributed 
by Graham Russell (graham at ham1.co.uk)
+61867345Updated to latest checkstyle (v8.5), Added 
many more rules to checkstyle, Included checking of test files and more file 
types. Contributed by Graham Russell (graham at ham1.co.uk)
 
 
  

svn commit: r1817321 [2/3] - in /jmeter/trunk: ./ docs/images/screenshots/ docs/images/screenshots/http-config/ docs/images/screenshots/webtest/ src/components/org/apache/jmeter/assertions/ src/compon

[agomes]

Modified: 
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties?rev=1817321=1817320=1817321=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties 
Wed Dec  6 22:21:19 2017
@@ -860,7 +860,7 @@ remove=Supprimer
 remove_confirm_msg=Etes-vous s\u00FBr de vouloir supprimer ce(s) 
\u00E9l\u00E9ment(s) ?
 remove_confirm_title=Confirmer la suppression ?
 rename=Renommer une entr\u00E9e
-replace_file=Remplacer le fichier existant 
+replace_file=Remplacer le fichier existant
 report=Rapport
 report_bar_chart=Graphique \u221A\u2020 barres
 report_bar_graph_url=URL

Modified: 
jmeter/trunk/src/core/org/apache/jmeter/samplers/AsynchSampleSender.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/AsynchSampleSender.java?rev=1817321=1817320=1817321=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/AsynchSampleSender.java 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/AsynchSampleSender.java 
Wed Dec  6 22:21:19 2017
@@ -146,7 +146,8 @@ public class AsynchSampleSender extends
 while (!eof) {
 List l = new ArrayList<>();
 SampleEvent e = queue.take();
-while (!(eof = (e == FINAL_EVENT)) && e != null) { // try 
to process as many as possible
+// try to process as many as possible
+while (!(eof = FINAL_EVENT.equals(e)) && e != null) {
 l.add(e);
 e = queue.poll(); // returns null if nothing on queue 
currently
 }

Modified: 
jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSenderFactory.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSenderFactory.java?rev=1817321=1817320=1817321=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSenderFactory.java 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSenderFactory.java 
Wed Dec  6 22:21:19 2017
@@ -29,70 +29,62 @@ public class SampleSenderFactory {
 private static final Logger log = 
LoggerFactory.getLogger(SampleSenderFactory.class);
 
 private static final String MODE_STANDARD = "Standard"; // $NON-NLS-1$
-
 private static final String MODE_BATCH = "Batch"; // $NON-NLS-1$
-
 private static final String MODE_STATISTICAL = "Statistical"; // 
$NON-NLS-1$
-
 private static final String MODE_STRIPPED = "Stripped"; // $NON-NLS-1$
-
 private static final String MODE_STRIPPED_BATCH = "StrippedBatch"; // 
$NON-NLS-1$
-
 private static final String MODE_ASYNCH = "Asynch"; // $NON-NLS-1$
-
 private static final String MODE_STRIPPED_ASYNCH = "StrippedAsynch"; // 
$NON-NLS-1$
-
 private static final String MODE_DISKSTORE = "DiskStore"; // $NON-NLS-1$
-
 private static final String MODE_STRIPPED_DISKSTORE = "StrippedDiskStore"; 
// $NON-NLS-1$
 
 /**
  * Checks for the JMeter property mode and returns the required class.
  *
- * @param listener
  * @return the appropriate class. Standard JMeter functionality,
- * hold_samples until end of test or batch samples.
+ * hold_samples until end of test or batch samples.
  */
 static SampleSender getInstance(RemoteSampleListener listener) {
 // Extended property name
 final String type = JMeterUtils.getPropDefault("mode", 
MODE_STRIPPED_BATCH); // $NON-NLS-1$
-
+
+SampleSender s;
 if (type.equalsIgnoreCase(MODE_BATCH)) {
-return new BatchSampleSender(listener);
-}  else if(type.equalsIgnoreCase(MODE_STRIPPED_BATCH)) {
-return new DataStrippingSampleSender(new 
BatchSampleSender(listener));
+s = new BatchSampleSender(listener);
+} else if (type.equalsIgnoreCase(MODE_STRIPPED_BATCH)) {
+s = new DataStrippingSampleSender(new BatchSampleSender(listener));
 } else if (type.equalsIgnoreCase(MODE_STATISTICAL)) {
-return new StatisticalSampleSender(listener);
+s = new StatisticalSampleSender(listener);
 } else if (type.equalsIgnoreCase(MODE_STANDARD)) {
-return new StandardSampleSender(listener);
-} else if(type.equalsIgnoreCase(MODE_STRIPPED)){
-return new DataStrippingSampleSender(listener);
-} else if(type.equalsIgnoreCase(MODE_ASYNCH)){
-return new AsynchSampleSender(listener);
-} else if(type.equalsIgnoreCase(MODE_STRIPPED_ASYNCH)) {
-return new 

svn commit: r1817321 [1/3] - in /jmeter/trunk: ./ docs/images/screenshots/ docs/images/screenshots/http-config/ docs/images/screenshots/webtest/ src/components/org/apache/jmeter/assertions/ src/compon

[agomes]

Author: agomes
Date: Wed Dec  6 22:21:19 2017
New Revision: 1817321

URL: http://svn.apache.org/viewvc?rev=1817321=rev
Log:
This closes #345 - Updated to latest checkstyle (v8.5), Added many more rules 
to checkstyle, Included checking of test files and more file types. Contributed 
by Graham Russell

Modified:
jmeter/trunk/build.properties
jmeter/trunk/build.xml
jmeter/trunk/checkstyle-suppressions.xml
jmeter/trunk/checkstyle.xml
jmeter/trunk/docs/images/screenshots/Proxy_Run.png
jmeter/trunk/docs/images/screenshots/Select-Templates-Icon.png
jmeter/trunk/docs/images/screenshots/Test_Generated.png
jmeter/trunk/docs/images/screenshots/Validate-Test-Plan.png
jmeter/trunk/docs/images/screenshots/example-recording.png
jmeter/trunk/docs/images/screenshots/example-thread-group.png
jmeter/trunk/docs/images/screenshots/http-config/http-request-defaults.png
jmeter/trunk/docs/images/screenshots/template_menu.png
jmeter/trunk/docs/images/screenshots/webtest/http-defaults1.png
jmeter/trunk/docs/images/screenshots/webtest/http-defaults2.png
jmeter/trunk/docs/images/screenshots/webtest/http-request1.png
jmeter/trunk/docs/images/screenshots/webtest/http-request2.png
jmeter/trunk/docs/images/screenshots/webtest/http_login.png
jmeter/trunk/docs/images/screenshots/webtest/threadgroup.png
jmeter/trunk/docs/images/screenshots/webtest/threadgroup2.png

jmeter/trunk/src/components/org/apache/jmeter/assertions/JSONPathAssertion.java

jmeter/trunk/src/components/org/apache/jmeter/assertions/ResponseAssertion.java

jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java

jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/JSONPathAssertionGui.java

jmeter/trunk/src/components/org/apache/jmeter/control/ThroughputController.java

jmeter/trunk/src/components/org/apache/jmeter/extractor/gui/HtmlExtractorGui.java

jmeter/trunk/src/components/org/apache/jmeter/extractor/json/jsonpath/JSONManager.java
jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java

jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimerBeanInfo.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/Graph.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsXML.java

jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderInBrowser.java

jmeter/trunk/src/components/org/apache/jmeter/visualizers/ViewResultsFullVisualizer.java

jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListener.java
jmeter/trunk/src/core/org/apache/jmeter/NewDriver.java

jmeter/trunk/src/core/org/apache/jmeter/assertions/gui/AbstractAssertionGui.java
jmeter/trunk/src/core/org/apache/jmeter/config/gui/SimpleConfigGui.java
jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java
jmeter/trunk/src/core/org/apache/jmeter/gui/GlobalUndoableEdit.java
jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistoryItem.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/RemoteStart.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/HorizontalPanel.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/PowerTableModel.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/VerticalPanel.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/theme/darcula_theme.xml
jmeter/trunk/src/core/org/apache/jmeter/report/core/SampleBuilder.java

jmeter/trunk/src/core/org/apache/jmeter/report/core/SampleMetaDataParser.java
jmeter/trunk/src/core/org/apache/jmeter/report/core/SampleWriter.java

jmeter/trunk/src/core/org/apache/jmeter/report/dashboard/TemplateVisitor.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/FilterConsumer.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/TaggerConsumer.java
jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollectorHelper.java
jmeter/trunk/src/core/org/apache/jmeter/reporters/gui/ResultActionGui.java
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
jmeter/trunk/src/core/org/apache/jmeter/samplers/AsynchSampleSender.java
jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSenderFactory.java

jmeter/trunk/src/core/org/apache/jmeter/samplers/StatisticalSampleSender.java
jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java
jmeter/trunk/src/core/org/apache/jmeter/save/ScriptWrapperConverter.java

jmeter/trunk/src/core/org/apache/jmeter/save/converters/HashTreeConverter.java

jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java

jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TableEditor.java
jmeter/trunk/src/core/org

svn commit: r1817321 [3/3] - in /jmeter/trunk: ./ docs/images/screenshots/ docs/images/screenshots/http-config/ docs/images/screenshots/webtest/ src/components/org/apache/jmeter/assertions/ src/compon

[agomes]

Modified: 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java?rev=1817321=1817320=1817321=diff
==
--- 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java
 (original)
+++ 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/JTidyHTMLParser.java
 Wed Dec  6 22:21:19 2017
@@ -26,8 +26,8 @@ import java.util.Iterator;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.protocol.http.util.ConversionUtils;
-import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.w3c.dom.Document;
 import org.w3c.dom.NamedNodeMap;
 import org.w3c.dom.Node;
@@ -37,7 +37,6 @@ import org.xml.sax.SAXException;
 
 /**
  * HtmlParser implementation using JTidy.
- *
  */
 class JTidyHTMLParser extends HTMLParser {
 private static final Logger log = 
LoggerFactory.getLogger(JTidyHTMLParser.class);
@@ -51,7 +50,7 @@ class JTidyHTMLParser extends HTMLParser
  */
 @Override
 public Iterator getEmbeddedResourceURLs(String userAgent, byte[] 
html, URL baseUrl, URLCollection urls, String encoding) throws 
HTMLParseException {
-Document dom = null;
+Document dom;
 try {
 dom = (Document) getDOM(html, encoding);
 } catch (SAXException se) {

Modified: 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLCollection.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLCollection.java?rev=1817321=1817320=1817321=diff
==
--- 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLCollection.java
 (original)
+++ 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLCollection.java
 Wed Dec  6 22:21:19 2017
@@ -26,8 +26,8 @@ import java.util.Iterator;
 import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.Validate;
 import org.apache.jmeter.protocol.http.util.ConversionUtils;
-import org.slf4j.LoggerFactory;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Collection class designed for handling URLs
@@ -37,7 +37,6 @@ import org.slf4j.Logger;
  * 
  * N.B. Designed for use by HTMLParser, so is not a full implementation - e.g.
  * does not support remove()
- *
  */
 public class URLCollection implements Iterable {
 private static final Logger log = 
LoggerFactory.getLogger(URLCollection.class);
@@ -105,7 +104,6 @@ public class URLCollection implements It
 
 /*
  * Private iterator used to unwrap the URL from the URLString class
- *
  */
 private static class UrlIterator implements Iterator {
 private final Iterator iter;

Modified: 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Daemon.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Daemon.java?rev=1817321=1817320=1817321=diff
==
--- 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Daemon.java
 (original)
+++ 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Daemon.java
 Wed Dec  6 22:21:19 2017
@@ -28,15 +28,13 @@ import java.util.HashMap;
 import java.util.Map;
 
 import org.apache.jmeter.gui.Stoppable;
-import org.slf4j.LoggerFactory;
 import org.apache.jorphan.util.JOrphanUtils;
 import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * Web daemon thread. Creates main socket on port configured port ( by 
default) and listens on it
- * forever. For each client request, creates a Proxy thread to handle the
- * request.
- *
+ * forever. For each client request, creates a Proxy thread to handle the 
request.
  */
 public class Daemon extends Thread implements Stoppable {
 

Modified: 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/FormCharSetFinder.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/FormCharSetFinder.java?rev=1817321=1817320=1817321=diff
==
--- 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/FormCharSetFinder.java
 (original)
+++ 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/FormCharSetFinder.java
 Wed Dec  6 22:21:19 2017
@@ -22,13 +22,13 @@ import java.util.Map;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.protocol.http.parser.HTMLParseException;
-import org.slf4j.LoggerFactory;
 import org.apache.jorphan.util.JOrphanUtils;
-import org.slf4j.Logger;
 

svn commit: r1817055 - in /jmeter/trunk: src/components/org/apache/jmeter/extractor/ src/components/org/apache/jmeter/visualizers/ src/core/org/apache/jmeter/resources/ xdocs/ xdocs/usermanual/

[agomes]

Author: agomes
Date: Sun Dec  3 21:56:48 2017
New Revision: 1817055

URL: http://svn.apache.org/viewvc?rev=1817055=rev
Log:
Bug 61852 - Add a Boundary Extractor Tester in View Results Tree

Added:

jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsBoundaryExtractor.java
   (with props)
Modified:

jmeter/trunk/src/components/org/apache/jmeter/extractor/BoundaryExtractor.java
jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
jmeter/trunk/xdocs/changes.xml
jmeter/trunk/xdocs/usermanual/component_reference.xml

Modified: 
jmeter/trunk/src/components/org/apache/jmeter/extractor/BoundaryExtractor.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/extractor/BoundaryExtractor.java?rev=1817055=1817054=1817055=diff
==
--- 
jmeter/trunk/src/components/org/apache/jmeter/extractor/BoundaryExtractor.java 
(original)
+++ 
jmeter/trunk/src/components/org/apache/jmeter/extractor/BoundaryExtractor.java 
Sun Dec  3 21:56:48 2017
@@ -239,7 +239,7 @@ public class BoundaryExtractor extends A
  * @param found
  * @return int found updated
  */
-private int extract(String leftBoundary, String rightBoundary, int 
matchNumber, String inputString,
+public int extract(String leftBoundary, String rightBoundary, int 
matchNumber, String inputString,
 List result, int found) {
 int startIndex = -1;
 int endIndex;

Added: 
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsBoundaryExtractor.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsBoundaryExtractor.java?rev=1817055=auto
==
--- 
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsBoundaryExtractor.java
 (added)
+++ 
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsBoundaryExtractor.java
 Sun Dec  3 21:56:48 2017
@@ -0,0 +1,240 @@
+/*
+ * 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"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *   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.
+ *
+ * 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.Dimension;
+import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.swing.BoxLayout;
+import javax.swing.JButton;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JSplitPane;
+import javax.swing.JTabbedPane;
+import javax.swing.JTextArea;
+import javax.swing.border.Border;
+import javax.swing.border.EmptyBorder;
+
+import org.apache.jmeter.extractor.BoundaryExtractor;
+import org.apache.jmeter.samplers.SampleResult;
+import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.gui.GuiUtils;
+import org.apache.jorphan.gui.JLabeledTextField;
+
+
+/**
+ * Implement ResultsRender for Boundary Extractor tester
+ */
+public class RenderAsBoundaryExtractor implements ResultRenderer, 
ActionListener {
+
+private static final String BOUNDARY_EXTRACTOR_TESTER_COMMAND = 
"boundary_extractor_tester"; // $NON-NLS-1$
+
+private JPanel boundaryExtractorPane;
+
+private JTextArea boundaryExtractorDataField;
+
+private JLabeledTextField boundaryExtractorFieldLeft;
+
+private JLabeledTextField boundaryExtractorFieldRight;
+
+private JTextArea boundaryExtractorResultField;
+
+private JTabbedPane rightSide;
+
+private SampleResult sampleResult = null;
+
+/**
+ * Display the response as text or as rendered HTML. Change the text on the
+ * button appropriate to the current display.
+ *
+ * @param e the ActionEvent being processed
+ */
+@Override
+public void actionPerformed(ActionEvent e) {
+String command = e.getActionCommand();
+if ((sampleResult != null) && 
(BOUNDARY_EXTRACTOR_TESTER_COMMAND.equals(command))) {
+String response = 
ViewResultsFullVisualizer.getResponseAsString(sampleResult);
+executeA

svn commit: r1815993 - in /jmeter/trunk/bin/templates: recording-with-think-time.jmx recording.jmx

[agomes]

Author: agomes
Date: Tue Nov 21 21:54:44 2017
New Revision: 1815993

URL: http://svn.apache.org/viewvc?rev=1815993=rev
Log:
[Bug 61591] Update templates : recording-with-think-time and recording

Modified:
jmeter/trunk/bin/templates/recording-with-think-time.jmx
jmeter/trunk/bin/templates/recording.jmx

Modified: jmeter/trunk/bin/templates/recording-with-think-time.jmx
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/bin/templates/recording-with-think-time.jmx?rev=1815993=1815992=1815993=diff
==
--- jmeter/trunk/bin/templates/recording-with-think-time.jmx (original)
+++ jmeter/trunk/bin/templates/recording-with-think-time.jmx Tue Nov 21 
21:54:44 2017
@@ -1,5 +1,5 @@
 
-
+
   
 
   
@@ -21,19 +21,17 @@
 
 
 
-
-
 
 
 
 6
+
+
   
   
   
 
 false
-standard
-org.apache.jmeter.protocol.http.control.HC4CookieHandler
   
   
   
@@ -89,17 +87,12 @@
 
   
   
-
-
-  true
-
-
   
 
 
-  (?i).*\.(bmp|css|js|gif|ico|jpe?g|png|swf|eot|otf|ttf|mp4|woff|woff2)
-  (?i).*\.(bmp|css|js|gif|ico|jpe?g|png|swf|eot|otf|ttf|mp4|woff|woff2)[\?;].*
-  .*detectportal.firefox.com.*
+  (?i).*\.(bmp|css|js|gif|ico|jpe?g|png|swf|eot|otf|ttf|mp4|woff|woff2)[\?;].*
+  (?i).*\.(bmp|css|js|gif|ico|jpe?g|png|swf|eot|otf|ttf|mp4|woff|woff2)
+  .*detectportal.firefox.com.*
 
 
 true
@@ -115,8 +108,15 @@
 
 false
 
+0
+
   
   
+
+  ${T}
+  100.0
+
+
 
   false
   
@@ -156,11 +156,6 @@
   recording.xml
 
 
-
-  ${T}
-  100.0
-
-
   
 
   

Modified: jmeter/trunk/bin/templates/recording.jmx
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/bin/templates/recording.jmx?rev=1815993=1815992=1815993=diff
==
--- jmeter/trunk/bin/templates/recording.jmx (original)
+++ jmeter/trunk/bin/templates/recording.jmx Tue Nov 21 21:54:44 2017
@@ -1,5 +1,5 @@
 
-
+
   
 
   
@@ -21,19 +21,17 @@
 
 
 
-
-
 
 
 
 6
+
+
   
   
   
 
 false
-standard
-org.apache.jmeter.protocol.http.control.HC4CookieHandler
   
   
   
@@ -89,17 +87,12 @@
 
   
   
-
-
-  true
-
-
   
 
 
-  (?i).*\.(bmp|css|js|gif|ico|jpe?g|png|swf|eot|otf|ttf|mp4|woff|woff2)
-  (?i).*\.(bmp|css|js|gif|ico|jpe?g|png|swf|eot|otf|ttf|mp4|woff|woff2)[\?;].*
-  .*detectportal.firefox.com.*
+  (?i).*\.(bmp|css|js|gif|ico|jpe?g|png|swf|eot|otf|ttf|mp4|woff|woff2)[\?;].*
+  (?i).*\.(bmp|css|js|gif|ico|jpe?g|png|swf|eot|otf|ttf|mp4|woff|woff2)
+  .*detectportal.firefox.com.*
 
 
 true
@@ -115,6 +108,8 @@
 
 false
 
+0
+
   
   
 

svn commit: r1815865 - in /jmeter/trunk/xdocs: images/screenshots/webtest/ usermanual/

[agomes]

Author: agomes
Date: Mon Nov 20 22:36:22 2017
New Revision: 1815865

URL: http://svn.apache.org/viewvc?rev=1815865=rev
Log:
[Bug 61591] Update build-web-test-plan documentation (image and text)

Modified:
jmeter/trunk/xdocs/images/screenshots/webtest/http-defaults1.png
jmeter/trunk/xdocs/images/screenshots/webtest/http-defaults2.png
jmeter/trunk/xdocs/images/screenshots/webtest/http-request1.png
jmeter/trunk/xdocs/images/screenshots/webtest/http-request2.png
jmeter/trunk/xdocs/images/screenshots/webtest/http_login.png
jmeter/trunk/xdocs/images/screenshots/webtest/threadgroup.png
jmeter/trunk/xdocs/images/screenshots/webtest/threadgroup2.png
jmeter/trunk/xdocs/usermanual/build-web-test-plan.xml

Modified: jmeter/trunk/xdocs/images/screenshots/webtest/http-defaults1.png
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/images/screenshots/webtest/http-defaults1.png?rev=1815865=1815864=1815865=diff
==
Binary files - no diff available.

Modified: jmeter/trunk/xdocs/images/screenshots/webtest/http-defaults2.png
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/images/screenshots/webtest/http-defaults2.png?rev=1815865=1815864=1815865=diff
==
Binary files - no diff available.

Modified: jmeter/trunk/xdocs/images/screenshots/webtest/http-request1.png
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/images/screenshots/webtest/http-request1.png?rev=1815865=1815864=1815865=diff
==
Binary files - no diff available.

Modified: jmeter/trunk/xdocs/images/screenshots/webtest/http-request2.png
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/images/screenshots/webtest/http-request2.png?rev=1815865=1815864=1815865=diff
==
Binary files - no diff available.

Modified: jmeter/trunk/xdocs/images/screenshots/webtest/http_login.png
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/images/screenshots/webtest/http_login.png?rev=1815865=1815864=1815865=diff
==
Binary files - no diff available.

Modified: jmeter/trunk/xdocs/images/screenshots/webtest/threadgroup.png
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/images/screenshots/webtest/threadgroup.png?rev=1815865=1815864=1815865=diff
==
Binary files - no diff available.

Modified: jmeter/trunk/xdocs/images/screenshots/webtest/threadgroup2.png
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/images/screenshots/webtest/threadgroup2.png?rev=1815865=1815864=1815865=diff
==
Binary files - no diff available.

Modified: jmeter/trunk/xdocs/usermanual/build-web-test-plan.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/build-web-test-plan.xml?rev=1815865=1815864=1815865=diff
==
--- jmeter/trunk/xdocs/usermanual/build-web-test-plan.xml (original)
+++ jmeter/trunk/xdocs/usermanual/build-web-test-plan.xml Mon Nov 20 22:36:22 
2017
@@ -70,7 +70,7 @@ in the tree, if you have not already sel
 Group Control Panel in the right section of the JMeter window (see Figure 
.1
 below)
 
-
+
 Figure .1. Thread Group with Default Values
 
 Start by providing a more descriptive name for our Thread Group. In the name
@@ -100,7 +100,7 @@ leave the Control Panel (for example, wh
 
 See Figure .2 for the completed JMeter Users Thread Group.
 
-
+
 Figure .2. JMeter Users Thread Group
 
 
@@ -116,7 +116,7 @@ to get the Add menu, and then select Add
 Defaults. Then select this new element to view its Control Panel (see Figure 
.3).
 
 
-
+
 Figure .3. HTTP Request Defaults
 
 
@@ -136,7 +136,7 @@ HTTP Request elements use.
 
 See Figure .4 for the completed HTTP Request Defaults element
 
-
+
 Figure .4. HTTP Defaults for our Test Plan
 
 
@@ -148,6 +148,9 @@ specifically doesn't use cookies.  To ad
 Group in your test plan.  This will ensure that each thread gets its own
 cookies, but shared across all  objects.
 
+
+Figure .5. HTTP Cookie Manager
+
 To add the , simply select the
 Thread Group, and choose Add 
 Config Element  HTTP
@@ -166,7 +169,7 @@ Changes page (http://jmeter.apache.org/c
 Start by adding the first 
 to the JMeter Users element (Add  Sampler  HTTP Request).
 Then, select the HTTP Request element in the tree and edit the following 
properties
-(see Figure .5):
+(see Figure .6):
 
 Change the Name field to "Home Page".
 Set the Path field to "/".  Remember that you do not have to set the Server
@@ -175,19 +178,19 @@ element.
 
 
 
-
-Figure .5. HTTP Request for JMeter Home Page
+
+Fig

svn commit: r1815862 - /jmeter/trunk/xdocs/images/screenshots/template_menu.png

[agomes]

Author: agomes
Date: Mon Nov 20 21:52:55 2017
New Revision: 1815862

URL: http://svn.apache.org/viewvc?rev=1815862=rev
Log:
[Bug 61591] Replace template_menu.png from get-started.html

Modified:
jmeter/trunk/xdocs/images/screenshots/template_menu.png

Modified: jmeter/trunk/xdocs/images/screenshots/template_menu.png
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/images/screenshots/template_menu.png?rev=1815862=1815861=1815862=diff
==
Binary files - no diff available.

svn commit: r1815859 - /jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java

[agomes]

Author: agomes
Date: Mon Nov 20 21:18:39 2017
New Revision: 1815859

URL: http://svn.apache.org/viewvc?rev=1815859=rev
Log:
[Bug 61775] Add a link to help menu to download nighty builds (it open the 
browser with the correct link) - Felix remarks

Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java?rev=1815859=1815858=1815859=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java Mon Nov 
20 21:18:39 2017
@@ -303,17 +303,10 @@ public class JMeterMenuBar extends JMenu
 JMenuItem threadDump = makeMenuItemRes("thread_dump", 
ActionNames.THREAD_DUMP);//$NON-NLS-1$
 
 JMenu usefulLinks = makeMenuRes("useful_links");//$NON-NLS-1$
-JMenuItem menuItem;
-menuItem = new 
JMenuItem(JMeterUtils.getLocaleString("link_bug_tracker"));
-menuItem.addActionListener(ActionRouter.getInstance());
-menuItem.setActionCommand(ActionNames.LINK_BUG_TRACKER);
-menuItem.setName("link_bug_tracker");
-usefulLinks.add(menuItem);
-menuItem = new 
JMenuItem(JMeterUtils.getLocaleString("link_nightly_build"));
-menuItem.addActionListener(ActionRouter.getInstance());
-menuItem.setActionCommand(ActionNames.LINK_NIGHTLY_BUILD);
-menuItem.setName("link_nightly_build");
-usefulLinks.add(menuItem);
+JMenuItem subMenuLinkBugTraker = makeMenuItemRes("link_bug_tracker", 
ActionNames.LINK_BUG_TRACKER);//$NON-NLS-1$
+usefulLinks.add(subMenuLinkBugTraker);
+JMenuItem subMenuLinkNightlyBuild = 
makeMenuItemRes("link_nightly_build", 
ActionNames.LINK_NIGHTLY_BUILD);//$NON-NLS-1$
+usefulLinks.add(subMenuLinkNightlyBuild);
 
 helpAbout = makeMenuItemRes("about", 'A', ActionNames.ABOUT); 
//$NON-NLS-1$
 

svn commit: r1815857 - /jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java

[agomes]

Author: agomes
Date: Mon Nov 20 20:56:56 2017
New Revision: 1815857

URL: http://svn.apache.org/viewvc?rev=1815857=rev
Log:
Fix comment in src/core/org/apache/jmeter/gui/action/ActionNames.java

Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java?rev=1815857=1815856=1815857=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java Mon Nov 
20 20:56:56 2017
@@ -62,7 +62,7 @@ public final class ActionNames {
 public static final String LAF_PREFIX   = "laf:"; // Look and Feel 
prefix
 public static final String LINK_BUG_TRACKER = "link_bug_tracker:"; // URI 
of bug tracker
 public static final String LINK_NIGHTLY_BUILD = "link_nightly_build:"; // 
URI of nightly build
-public static final String LINK_RELEASE_NOTES = "link_release_notes"; // 
URI of nightly build
+public static final String LINK_RELEASE_NOTES = "link_release_notes"; // 
URI of the release note
 public static final String LOGGER_PANEL_ENABLE_DISABLE = 
"logger_panel_enable_disable"; // $NON-NLS-1$
 public static final String LOG_LEVEL_PREFIX = "loglevel:"; // Logger level 
prefix
 public static final String MERGE= "merge"; // $NON-NLS-1$

svn commit: r1815703 - in /jmeter/trunk: src/core/org/apache/jmeter/gui/action/ src/core/org/apache/jmeter/gui/util/ src/core/org/apache/jmeter/resources/ xdocs/

[agomes]

Author: agomes
Date: Sat Nov 18 22:45:15 2017
New Revision: 1815703

URL: http://svn.apache.org/viewvc?rev=1815703=rev
Log:
Bug 61785 - Group nighty builds and create an issue menu in a useful links menu

Added:
jmeter/trunk/src/core/org/apache/jmeter/gui/action/OpenLinkAction.java
Removed:
jmeter/trunk/src/core/org/apache/jmeter/gui/action/LinkBugTracker.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/LinkNightlyBuild.java
Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java
jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
jmeter/trunk/xdocs/changes.xml

Added: jmeter/trunk/src/core/org/apache/jmeter/gui/action/OpenLinkAction.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/OpenLinkAction.java?rev=1815703=auto
==
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/OpenLinkAction.java 
(added)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/OpenLinkAction.java Sat 
Nov 18 22:45:15 2017
@@ -0,0 +1,52 @@
+package org.apache.jmeter.gui.action;
+
+import java.awt.event.ActionEvent;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class OpenLinkAction extends AbstractAction {
+
+private static final Logger log = 
LoggerFactory.getLogger(OpenLinkAction.class);
+
+private static final Set commands = new HashSet<>();
+
+static {
+commands.add(ActionNames.LINK_BUG_TRACKER);
+commands.add(ActionNames.LINK_NIGHTLY_BUILD);
+}
+
+
+/**
+ * @see org.apache.jmeter.gui.action.Command#doAction(ActionEvent)
+ */
+@Override
+public void doAction(ActionEvent e) {
+String url = null;
+if (e.getActionCommand().equals(ActionNames.LINK_BUG_TRACKER)) {
+url = "https://jmeter.apache.org/issues.html;;
+} else if 
(e.getActionCommand().equals(ActionNames.LINK_NIGHTLY_BUILD)) {
+url = "https://jmeter.apache.org/nightly.html;;
+}
+try {
+java.awt.Desktop.getDesktop().browse(java.net.URI.create(url));
+} catch (IOException err) {
+log.error("OpenLinkAction: User default browser is not found, or 
it fails to be launched, or the default handler application failed to be 
launched on {}", err);
+} catch (UnsupportedOperationException err) {
+log.error("OpenLinkAction: Current platform does not support the 
Desktop.Action.BROWSE actionon {}", err);
+} catch (SecurityException err) {
+log.error("OpenLinkAction: Security problem on {}", err);
+} catch (Exception err) {
+log.error("OpenLinkAction on {}", err);
+}
+}
+
+@Override
+public Set getActionNames() {
+return commands;
+}
+
+}

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java?rev=1815703=1815702=1815703=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java Sat Nov 
18 22:45:15 2017
@@ -302,9 +302,18 @@ public class JMeterMenuBar extends JMenu
 
 JMenuItem threadDump = makeMenuItemRes("thread_dump", 
ActionNames.THREAD_DUMP);//$NON-NLS-1$
 
-JMenuItem linkBugTracker = makeMenuItemRes("link_bug_tracker", 
ActionNames.LINK_BUG_TRACKER);//$NON-NLS-1$
-
-JMenuItem linkNightlyBuild = makeMenuItemRes("link_nightly_build", 
ActionNames.LINK_NIGHTLY_BUILD);//$NON-NLS-1$
+JMenu usefulLinks = makeMenuRes("useful_links");//$NON-NLS-1$
+JMenuItem menuItem;
+menuItem = new 
JMenuItem(JMeterUtils.getLocaleString("link_bug_tracker"));
+menuItem.addActionListener(ActionRouter.getInstance());
+menuItem.setActionCommand(ActionNames.LINK_BUG_TRACKER);
+menuItem.setName("link_bug_tracker");
+usefulLinks.add(menuItem);
+menuItem = new 
JMenuItem(JMeterUtils.getLocaleString("link_nightly_build"));
+menuItem.addActionListener(ActionRouter.getInstance());
+menuItem.setActionCommand(ActionNames.LINK_NIGHTLY_BUILD);
+menuItem.setName("link_nightly_build");
+usefulLinks.add(menuItem);
 
 helpAbout = makeMenuItemRes("about", 'A', ActionNames.ABOUT); 
//$NON-NLS-1$
 
@@ -319,8 +328,7 @@ public class JMeterMenuBar extends JMenu
 addPluginsMenuItems(helpMenu, menuCreato

svn commit: r1815693 - /jmeter/trunk/src/core/org/apache/jmeter/gui/action/LinkNightlyBuild.java

[agomes]

Author: agomes
Date: Sat Nov 18 20:47:53 2017
New Revision: 1815693

URL: http://svn.apache.org/viewvc?rev=1815693=rev
Log:
[Bug 61775] Add a link to help menu to download nighty builds (it open the 
browser with the correct link) - add missing new line

Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/action/LinkNightlyBuild.java

Modified: 
jmeter/trunk/src/core/org/apache/jmeter/gui/action/LinkNightlyBuild.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/LinkNightlyBuild.java?rev=1815693=1815692=1815693=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/LinkNightlyBuild.java 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/LinkNightlyBuild.java 
Sat Nov 18 20:47:53 2017
@@ -62,3 +62,4 @@ public class LinkNightlyBuild extends Ab
 
 
 }
+

svn commit: r1815689 - /jmeter/trunk/src/core/org/apache/jmeter/gui/action/LinkNightlyBuild.java

[agomes]

Author: agomes
Date: Sat Nov 18 19:32:23 2017
New Revision: 1815689

URL: http://svn.apache.org/viewvc?rev=1815689=rev
Log:
[Bug 61775] Add a link to help menu to download nighty builds (it open the 
browser with the correct link) - add missing file

Added:
jmeter/trunk/src/core/org/apache/jmeter/gui/action/LinkNightlyBuild.java

Added: jmeter/trunk/src/core/org/apache/jmeter/gui/action/LinkNightlyBuild.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/LinkNightlyBuild.java?rev=1815689=auto
==
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/LinkNightlyBuild.java 
(added)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/LinkNightlyBuild.java 
Sat Nov 18 19:32:23 2017
@@ -0,0 +1,64 @@
+/*
+ * 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"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *   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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.jmeter.gui.action;
+
+import java.awt.event.ActionEvent;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class LinkNightlyBuild extends AbstractAction {
+
+private static final Logger log = 
LoggerFactory.getLogger(LinkNightlyBuild.class);
+
+private static final Set commands = new HashSet<>();
+
+static {
+commands.add(ActionNames.LINK_NIGHTLY_BUILD);
+}
+
+/**
+ * @see org.apache.jmeter.gui.action.Command#doAction(ActionEvent)
+ */
+@Override
+public void doAction(ActionEvent e) {
+String url = "http://jmeter.apache.org/nightly.html;;
+try {
+java.awt.Desktop.getDesktop().browse(java.net.URI.create(url));
+} catch (IOException err) {
+log.error("LinkNightlyBuild: User default browser is not found, or 
it fails to be launched, or the default handler application failed to be 
launched on {}", err);
+} catch (UnsupportedOperationException err) {
+log.error("LinkNightlyBuild: Current platform does not support the 
Desktop.Action.BROWSE actionon {}", err);
+} catch (SecurityException err) {
+log.error("LinkNightlyBuild: Security problem on {}", err);
+} catch (Exception err) {
+log.error("LinkNightlyBuild on {}", err);
+}
+}
+
+@Override
+public Set getActionNames() {
+return commands;
+}
+
+
+}

svn commit: r1815649 - in /jmeter/trunk: src/core/org/apache/jmeter/gui/action/ src/core/org/apache/jmeter/gui/util/ src/core/org/apache/jmeter/resources/ xdocs/

[agomes]

Author: agomes
Date: Sat Nov 18 10:04:00 2017
New Revision: 1815649

URL: http://svn.apache.org/viewvc?rev=1815649=rev
Log:
[Bug 61775] New: Add a link to help menu to download nighty builds (it open the 
browser with the correct link)

Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java
jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java?rev=1815649=1815648=1815649=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java Sat Nov 
18 10:04:00 2017
@@ -61,6 +61,7 @@ public final class ActionNames {
 public static final String HEAP_DUMP= "heap_dump"; // $NON-NLS-1$
 public static final String LAF_PREFIX   = "laf:"; // Look and Feel 
prefix
 public static final String LINK_BUG_TRACKER = "link_bug_tracker:"; // URI 
of bug tracker
+public static final String LINK_NIGHTLY_BUILD = "link_nightly_build:"; // 
URI of nightly build
 public static final String LOGGER_PANEL_ENABLE_DISABLE = 
"logger_panel_enable_disable"; // $NON-NLS-1$
 public static final String LOG_LEVEL_PREFIX = "loglevel:"; // Logger level 
prefix
 public static final String MERGE= "merge"; // $NON-NLS-1$

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java?rev=1815649=1815648=1815649=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java Sat Nov 
18 10:04:00 2017
@@ -303,6 +303,8 @@ public class JMeterMenuBar extends JMenu
 JMenuItem threadDump = makeMenuItemRes("thread_dump", 
ActionNames.THREAD_DUMP);//$NON-NLS-1$
 
 JMenuItem linkBugTracker = makeMenuItemRes("link_bug_tracker", 
ActionNames.LINK_BUG_TRACKER);//$NON-NLS-1$
+
+JMenuItem linkNightlyBuild = makeMenuItemRes("link_nightly_build", 
ActionNames.LINK_NIGHTLY_BUILD);//$NON-NLS-1$
 
 helpAbout = makeMenuItemRes("about", 'A', ActionNames.ABOUT); 
//$NON-NLS-1$
 
@@ -318,6 +320,7 @@ public class JMeterMenuBar extends JMenu
 
 helpMenu.addSeparator();
 helpMenu.add(linkBugTracker);
+helpMenu.add(linkNightlyBuild);
 helpMenu.addSeparator();
 helpMenu.add(helpAbout);
 }

Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=1815649=1815648=1815649=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Sat 
Nov 18 10:04:00 2017
@@ -606,6 +606,7 @@ ldapext_sample_title=LDAP Extended Reque
 ldapext_testing_title=LDAP Extended Request
 library=Library
 link_bug_tracker=Create an issue
+link_nightly_build=Nightly builds
 load=Load
 locale_format=String format of a locale (ex\: fr_FR , en_EN) (optional)
 log_errors_only=Errors

Modified: 
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties?rev=1815649=1815648=1815649=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties 
Sat Nov 18 10:04:00 2017
@@ -596,6 +596,7 @@ ldapext_sample_title=Requ\u00EAte LDAP \
 ldapext_testing_title=Requ\u00EAte LDAP \u00E9tendue
 library=Librairie
 link_bug_tracker=Cr\u00E9er un ticket
+link_nightly_build=Versions de d\u00E9veloppement
 load=Charger
 locale_format=Text representant la langue et le pays (ex\: fr_FR , en_EN) 
(optionnel)
 log_errors_only=Erreurs

Modified: jmeter/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1815649=1815648=1815649=diff
==
--- jmeter/trunk/xdocs/changes.xml [utf

svn commit: r1815635 - in /jmeter/trunk: src/core/org/apache/jmeter/gui/action/ src/core/org/apache/jmeter/gui/util/ src/core/org/apache/jmeter/resources/ xdocs/

[agomes]

Author: agomes
Date: Fri Nov 17 22:30:29 2017
New Revision: 1815635

URL: http://svn.apache.org/viewvc?rev=1815635=rev
Log:
Bug 61774 - Add a link to help menu to create an issue (it open the browser 
with the link to issues)

Added:
jmeter/trunk/src/core/org/apache/jmeter/gui/action/LinkBugTracker.java
Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java
jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java?rev=1815635=1815634=1815635=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionNames.java Fri Nov 
17 22:30:29 2017
@@ -60,6 +60,7 @@ public final class ActionNames {
 public static final String HELP = "help"; // $NON-NLS-1$
 public static final String HEAP_DUMP= "heap_dump"; // $NON-NLS-1$
 public static final String LAF_PREFIX   = "laf:"; // Look and Feel 
prefix
+public static final String LINK_BUG_TRACKER = "link_bug_tracker:"; // URI 
of bug tracker
 public static final String LOGGER_PANEL_ENABLE_DISABLE = 
"logger_panel_enable_disable"; // $NON-NLS-1$
 public static final String LOG_LEVEL_PREFIX = "loglevel:"; // Logger level 
prefix
 public static final String MERGE= "merge"; // $NON-NLS-1$

Added: jmeter/trunk/src/core/org/apache/jmeter/gui/action/LinkBugTracker.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/LinkBugTracker.java?rev=1815635=auto
==
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/LinkBugTracker.java 
(added)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/LinkBugTracker.java Fri 
Nov 17 22:30:29 2017
@@ -0,0 +1,61 @@
+/*
+ * 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"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *   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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.jmeter.gui.action;
+
+import java.awt.event.ActionEvent;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Set;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class LinkBugTracker extends AbstractAction {
+private static final Logger log = 
LoggerFactory.getLogger(LinkBugTracker.class);
+
+private static final Set commands = new HashSet<>();
+
+static {
+commands.add(ActionNames.LINK_BUG_TRACKER);
+}
+
+@Override
+public Set getActionNames() {
+return commands;
+}
+
+/**
+ * @see org.apache.jmeter.gui.action.Command#doAction(ActionEvent)
+ */
+@Override
+public void doAction(ActionEvent e) {
+String url = "http://jmeter.apache.org/issues.html;;
+try {
+java.awt.Desktop.getDesktop().browse(java.net.URI.create(url));
+} catch (IOException err) {
+log.error("LinkBugTracker: User default browser is not found, or 
it fails to be launched, or the default handler application failed to be 
launched on {}", err);
+} catch (UnsupportedOperationException err) {
+log.error("LinkBugTracker: Current platform does not support the 
Desktop.Action.BROWSE actionon {}", err);
+} catch (SecurityException err) {
+log.error("LinkBugTracker: Security problem on {}", err);
+} catch (Exception err) {
+log.error("LinkBugTracker on {}", err);
+}
+}
+}

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java?rev=1815635=1815634=1815635=diff
===

svn commit: r1815627 - /jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellBeanInfoSupport.java

[agomes]

Author: agomes
Date: Fri Nov 17 21:04:45 2017
New Revision: 1815627

URL: http://svn.apache.org/viewvc?rev=1815627=rev
Log:
Bug 61607 : Fix Beanshel GUI bug

Modified:
jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellBeanInfoSupport.java

Modified: 
jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellBeanInfoSupport.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellBeanInfoSupport.java?rev=1815627=1815626=1815627=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellBeanInfoSupport.java 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellBeanInfoSupport.java 
Fri Nov 17 21:04:45 2017
@@ -51,13 +51,14 @@ public abstract class BeanShellBeanInfoS
 p = property("filename");
 p.setValue(NOT_UNDEFINED, Boolean.TRUE);
 p.setValue(DEFAULT, "");
+p.setPropertyEditorClass(FileEditor.class);
 
 createPropertyGroup("filenameGroup", new String[] { "filename" });
 
 p = property("script");
 p.setValue(NOT_UNDEFINED, Boolean.TRUE);
 p.setValue(DEFAULT, "");
-p.setPropertyEditorClass(FileEditor.class);
+p.setPropertyEditorClass(TextAreaEditor.class);
 
 createPropertyGroup("scripting", new String[] { "script" });
 }

svn commit: r1814992 - in /jmeter/trunk: docs/images/screenshots/ src/protocol/http/org/apache/jmeter/protocol/http/proxy/ src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/

[agomes]

Author: agomes
Date: Sat Nov 11 22:21:09 2017
New Revision: 1814992

URL: http://svn.apache.org/viewvc?rev=1814992=rev
Log:
Bug 61672 - add tht choice between prefix and transaction name to name sampler 
during recording : Philippe catch

Modified:
jmeter/trunk/docs/images/screenshots/proxy_control.png

jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java

jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java

jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java

Modified: jmeter/trunk/docs/images/screenshots/proxy_control.png
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/docs/images/screenshots/proxy_control.png?rev=1814992=1814991=1814992=diff
==
Binary files - no diff available.

Modified: 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java?rev=1814992=1814991=1814992=diff
==
--- 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
 (original)
+++ 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
 Sat Nov 11 22:21:09 2017
@@ -281,12 +281,12 @@ public class DefaultSamplerCreator exten
 protected void computeSamplerName(HTTPSamplerBase sampler,
 HttpRequestHdr request) {
 String prefix = request.getPrefix();
-int HttpSampleNameMode = request.getHttpSampleNameMode();
+int httpSampleNameMode = request.getHttpSampleNameMode();
 if (!HTTPConstants.CONNECT.equals(request.getMethod()) && 
isNumberRequests()) {
 if(!StringUtils.isEmpty(prefix)) {
-if (HttpSampleNameMode==SAMPLER_NAME_NAMING_MODE_PREFIX) {
+if (httpSampleNameMode==SAMPLER_NAME_NAMING_MODE_PREFIX) {
 sampler.setName(prefix + incrementRequestNumberAndGet() + " " 
+ sampler.getPath());
-} else if 
(HttpSampleNameMode==SAMPLER_NAME_NAMING_MODE_COMPLETE) {
+} else if 
(httpSampleNameMode==SAMPLER_NAME_NAMING_MODE_COMPLETE) {
 sampler.setName(incrementRequestNumberAndGet() + " " + 
prefix);
 } else {
 log.debug("Sampler name naming mode not recognized");
@@ -296,9 +296,9 @@ public class DefaultSamplerCreator exten
 }
 } else {
 if(!StringUtils.isEmpty(prefix)) {
-if (HttpSampleNameMode==SAMPLER_NAME_NAMING_MODE_PREFIX) {
+if (httpSampleNameMode==SAMPLER_NAME_NAMING_MODE_PREFIX) {
 sampler.setName(prefix+sampler.getPath());
-} else if 
(HttpSampleNameMode==SAMPLER_NAME_NAMING_MODE_COMPLETE) {
+} else if 
(httpSampleNameMode==SAMPLER_NAME_NAMING_MODE_COMPLETE) {
 sampler.setName(prefix);
 } else {
 log.debug("Sampler name naming mode not recognized");

Modified: 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java?rev=1814992=1814991=1814992=diff
==
--- 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
 (original)
+++ 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
 Sat Nov 11 22:21:09 2017
@@ -392,8 +392,8 @@ public class ProxyControl extends Generi
 setProperty(new BooleanProperty(SAMPLER_DOWNLOAD_IMAGES, b));
 }
 
-public void setHTTPSampleNamingMode(int HTTPNamingMode) {
-setProperty(new IntegerProperty(HTTP_SAMPLER_NAMING_MODE, 
HTTPNamingMode));
+public void setHTTPSampleNamingMode(int httpNamingMode) {
+setProperty(new IntegerProperty(HTTP_SAMPLER_NAMING_MODE, 
httpNamingMode));
 }
 
 public void setPrefixHTTPSampleName(String prefixHTTPSampleName) {

Modified: 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java?rev=1814992=1814991=1814992=diff
==
--- 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
 (original)
+++ 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
 Sat Nov 11 22:21:09 2017
@@ -159,7 +1

svn commit: r1814986 - in /jmeter/trunk/xdocs: changes.xml usermanual/component_reference.xml

[agomes]

Author: agomes
Date: Sat Nov 11 21:07:52 2017
New Revision: 1814986

URL: http://svn.apache.org/viewvc?rev=1814986=rev
Log:
Bug 61747 - HTTP(S) Test Script Recorder : add the missing doc to Create 
transaction after request (ms)

Modified:
jmeter/trunk/xdocs/changes.xml
jmeter/trunk/xdocs/usermanual/component_reference.xml

Modified: jmeter/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1814986=1814985=1814986=diff
==
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sat Nov 11 21:07:52 2017
@@ -130,6 +130,7 @@ Summary
 
 61559Better label/translation/documentation for label 
ignoreFirstLine.displayName for CSV Data Set Config
 61606Translate button Browse... in some 
elements (which use FileEditor class)
+61747HTTP(S) Test Script Recorder : add the missing doc to 
"Create transaction after request (ms)"
 
 
 Report / Dashboard

Modified: jmeter/trunk/xdocs/usermanual/component_reference.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=1814986=1814985=1814986=diff
==
--- jmeter/trunk/xdocs/usermanual/component_reference.xml (original)
+++ jmeter/trunk/xdocs/usermanual/component_reference.xml Sat Nov 11 21:07:52 
2017
@@ -6634,7 +6634,6 @@ Both Chrome and Internet Explorer use th
to treat them as separate "clicks". The default is 
5000 (milliseconds) i.e. 5 seconds.
If you are using grouping, please ensure that you leave the 
required gap between clicks.
 
-
 Should headers be 
added to the plan?
 If specified, a Header Manager will be added to each HTTP Sampler.
 The Proxy server always removes Cookie and Authorization headers from 
the generated Header Managers.
@@ -6647,6 +6646,7 @@ Both Chrome and Internet Explorer use th
 Add a blank assertion 
to each sampler?
 Use Regex Matching when 
replacing variables? If checked replacement will use word boundaries, i.e. it 
will only replace word matching values of variable, not part of a word. A word 
boundary follows Perl5 definition and is equivalent to \b. More 
information below in the paragraph about "User Defined Variable 
replacement".
 Add a prefix to 
sampler name during recording (Prefix mode). Or replace sampler name by user 
choosen name (Transaction name)
+Inactivity 
time between two requests needed to consider them in two separate 
groups.
 Which type of sampler to generate 
(the HTTPClient default or Java)
 Set Redirect 
Automatically in the generated samplers?
 Set Follow Redirects 
in the generated samplers?

svn commit: r1814979 - in /jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy: HttpRequestHdr.java gui/ProxyControlGui.java

[agomes]

Author: agomes
Date: Sat Nov 11 21:02:30 2017
New Revision: 1814979

URL: http://svn.apache.org/viewvc?rev=1814979=rev
Log:
Bug 61672 - add tht choice between prefix and transaction name to name sampler 
during recording : fix tab

Modified:

jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java

jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java

Modified: 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java?rev=1814979=1814978=1814979=diff
==
--- 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
 (original)
+++ 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
 Sat Nov 11 21:02:30 2017
@@ -107,7 +107,7 @@ public class HttpRequestHdr {
  * @param httpSamplerName the http sampler name
  */
 public HttpRequestHdr(String prefix, String httpSamplerName) {
-   this(prefix, httpSamplerName,0);
+this(prefix, httpSamplerName,0);
 }
 
 /**
@@ -116,13 +116,13 @@ public class HttpRequestHdr {
  * @param httpSampleNameMode the naming mode of sampler name
  */
 public HttpRequestHdr(String prefix, String httpSamplerName, int 
httpSampleNameMode) {
-   this.prefix = prefix;
+this.prefix = prefix;
 this.httpSamplerName = httpSamplerName;
 this.firstLine = "" ; // $NON-NLS-1$
 this.httpSampleNameMode = httpSampleNameMode;
-   }
+}
 
-   /**
+/**
  * Parses a http header from a stream.
  *
  * @param in
@@ -341,7 +341,7 @@ public class HttpRequestHdr {
  */
 public int serverPort() {
 String str = url;
-// chop to "server.name:x/thing"
+// chop to "server.name:xhing"
 int i = str.indexOf("//");
 if (i > 0) {
 str = str.substring(i + 2);

Modified: 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java?rev=1814979=1814978=1814979=diff
==
--- 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
 (original)
+++ 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
 Sat Nov 11 21:02:30 2017
@@ -384,18 +384,18 @@ public class ProxyControlGui extends Log
  * Also handles samplerTypeName
  */
 /** {@inheritDoc} */
-   @Override
-   public void itemStateChanged(ItemEvent e) {
-   if (e.getSource() instanceof JComboBox) {
- JComboBox combo = (JComboBox) e.getSource();
-  if(HTTP_SAMPLER_NAMING_MODE.equals(combo.getName())){
-   
model.setHTTPSampleNamingMode(HTTPSampleNamingMode.getSelectedIndex());
-  }
-   }
-   else {
-   enableRestart();
-   }
-   }
+@Override
+public void itemStateChanged(ItemEvent e) {
+if (e.getSource() instanceof JComboBox) {
+JComboBox combo = (JComboBox) e.getSource();
+if(HTTP_SAMPLER_NAMING_MODE.equals(combo.getName())){
+
model.setHTTPSampleNamingMode(HTTPSampleNamingMode.getSelectedIndex());
+}
+}
+else {
+enableRestart();
+}
+}
 
 /** {@inheritDoc} */
 @Override

svn commit: r1814971 - in /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/gui/ xdo

[agomes]

Author: agomes
Date: Sat Nov 11 20:49:03 2017
New Revision: 1814971

URL: http://svn.apache.org/viewvc?rev=1814971=rev
Log:
Bug 61672 - add tht choice between prefix and transaction name to name sampler 
during recording

Modified:
jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties

jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java

jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java

jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java

jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java

jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
jmeter/trunk/xdocs/changes.xml
jmeter/trunk/xdocs/images/screenshots/proxy_control.png
jmeter/trunk/xdocs/usermanual/component_reference.xml

Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=1814971=1814970=1814971=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Sat 
Nov 11 20:49:03 2017
@@ -787,7 +787,6 @@ proxy_general_lifecycle=State
 proxy_general_settings=Global Settings
 proxy_headers=Capture HTTP Headers
 proxy_pause_http_sampler=Create new transaction after request (ms)\:
-proxy_prefix_http_sampler_name=Prefix\:
 proxy_regex=Regex matching
 proxy_sampler_settings=HTTP Sampler settings
 proxy_sampler_type=Type\:
@@ -936,6 +935,8 @@ run_threadgroup_no_timers=Start no pause
 running_test=Running test
 runtime_controller_title=Runtime Controller
 runtime_seconds=Runtime (seconds)
+sample_name_prefix=Prefix
+sample_name_transaction=Transaction name
 salt_string=Salt to be used for hashing (optional)
 sample_result_save_configuration=Sample Result Save Configuration
 sample_scope=Apply to:

Modified: 
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties?rev=1814971=1814970=1814971=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties 
Sat Nov 11 20:49:03 2017
@@ -777,7 +777,6 @@ proxy_general_lifecycle=Etat
 proxy_general_settings=Param\u00E8tres g\u00E9n\u00E9raux
 proxy_headers=Capturer les ent\u00EAtes HTTP
 proxy_pause_http_sampler=Cr\u00E9er une nouvelle transaction apr\u00E8s la 
requ\u00EAte (ms) \:
-proxy_prefix_http_sampler_name=Pr\u00E9fixe \:
 proxy_regex=Correspondance des variables par regex ?
 proxy_sampler_settings=Param\u00E8tres Echantillon HTTP
 proxy_sampler_type=Type \:
@@ -926,6 +925,8 @@ run_threadgroup_no_timers=Lancer sans pa
 running_test=Lancer test
 runtime_controller_title=Contr\u00F4leur Dur\u00E9e d'ex\u00E9cution
 runtime_seconds=Temps d'ex\u00E9cution (secondes) \:
+sample_name_prefix=Pr\u00E9fixe
+sample_name_transaction=Nom de la transaction
 salt_string=Sel \u00e0 utiliser pour le hash
 sample_result_save_configuration=Sauvegarder la configuration de la sauvegarde 
des \u00E9chantillons
 sample_scope=Appliquer sur

Modified: 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java?rev=1814971=1814970=1814971=diff
==
--- 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
 (original)
+++ 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
 Sat Nov 11 20:49:03 2017
@@ -54,6 +54,12 @@ import org.xml.sax.helpers.DefaultHandle
  */
 public class DefaultSamplerCreator extends AbstractSamplerCreator {
 private static final Logger log = 
LoggerFactory.getLogger(DefaultSamplerCreator.class);
+
+/*
+* Must be the same order than in 
org.apache.jmeter.protocol.http.proxy.gui.ProxyControlGui class in 
createHTTPSamplerPanel method
+*/
+private static final int SAMPLER_NAME_NAMING_MODE_PREFIX = 0;  // 
$NON-NLS-1$
+private static final int SAMPLER_NAME_NAMING_MODE_COMPLETE = 1;  // 
$NON-NLS-1$
  
 /**
  * 
@@ -275,15 +281,28 @@ public class DefaultSamplerCreator exten
 protected void computeSamplerName(HTTPSamplerBase sampler,
 HttpRequestHdr request) {
 String prefix = request.getPrefix

svn commit: r1814969 - /jmeter/trunk/xdocs/changes.xml

[agomes]

Author: agomes
Date: Sat Nov 11 19:27:59 2017
New Revision: 1814969

URL: http://svn.apache.org/viewvc?rev=1814969=rev
Log:
Remove useless sapces in xdocs/changes.xml

Modified:
jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1814969=1814968=1814969=diff
==
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sat Nov 11 19:27:59 2017
@@ -88,7 +88,7 @@ Summary
 
 HTTP Samplers and Test Script Recorder
 
-316 - Warn about empty truststore loading. Contributed by 
Vincent Herilier (https://github.com/vherilier)
+316Warn about empty truststore loading. Contributed by 
Vincent Herilier (https://github.com/vherilier)
 61639HTTP(S) Test Script Recorder : In request filtering 
tab, uncheck by default "Notify Child Listeners of filtered samplers"
 61672HTTP(S) Test Script Recorder : When a prefix is set 
don't use path in Sampler Name
 53957HTTP Request : In Parameters tab, allow pasting of 
content coming from Firefox and Chrome (unparsed)
@@ -163,9 +163,9 @@ Summary
 61641Improve JMS test coverage
 61651Improve TCP test coverage
 61651Improve OS test coverage. Partly contributed by 
Aleksei Balan (abalanonline at gmail.com) 
-319 Removed commented out code. Contributed by Graham Russell 
(graham at ham1.co.uk)
-322 General JavaDoc cleanup. Contributed by Graham Russell 
(graham at ham1.co.uk)
-323 Extracted method and used streams to improve readability. 
Contributed by Graham Russell (graham at ham1.co.uk)
+319Removed commented out code. Contributed by Graham Russell 
(graham at ham1.co.uk)
+322General JavaDoc cleanup. Contributed by Graham Russell 
(graham at ham1.co.uk)
+323Extracted method and used streams to improve readability. 
Contributed by Graham Russell (graham at ham1.co.uk)
 
 
  

svn commit: r1813727 - /jmeter/trunk/bin/jmeter.bat

[agomes]

Author: agomes
Date: Mon Oct 30 06:34:41 2017
New Revision: 1813727

URL: http://svn.apache.org/viewvc?rev=1813727=rev
Log:
Bug 61694 : add -server option to jmeter.bat, fix (thank to Pascal Schumacher)

Modified:
jmeter/trunk/bin/jmeter.bat

Modified: jmeter/trunk/bin/jmeter.bat
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.bat?rev=1813727=1813726=1813727=diff
==
--- jmeter/trunk/bin/jmeter.bat (original)
+++ jmeter/trunk/bin/jmeter.bat Mon Oct 30 06:34:41 2017
@@ -127,7 +127,7 @@ rem Server mode
 set SERVER=-server
 
 rem Collect the settings defined above
-set ARGS=%DUMP% %DUMP% %HEAP% %VERBOSE_GC% %GC_ALGO% %DDRAW% %SYSTEM_PROPS% 
%RUN_IN_DOCKER%
+set ARGS=%SERVER% %DUMP% %HEAP% %VERBOSE_GC% %GC_ALGO% %DDRAW% %SYSTEM_PROPS% 
%RUN_IN_DOCKER%
 
 %JM_START% %JM_LAUNCH% %ARGS% %JVM_ARGS% -jar "%JMETER_BIN%ApacheJMeter.jar" 
%JMETER_CMD_LINE_ARGS%
 

svn commit: r1813713 - in /jmeter/trunk: bin/jmeter.bat xdocs/changes.xml

[agomes]

Author: agomes
Date: Sun Oct 29 22:55:56 2017
New Revision: 1813713

URL: http://svn.apache.org/viewvc?rev=1813713=rev
Log:
Bug 61694 : add -server option to jmeter.bat

Modified:
jmeter/trunk/bin/jmeter.bat
jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/bin/jmeter.bat
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.bat?rev=1813713=1813712=1813713=diff
==
--- jmeter/trunk/bin/jmeter.bat (original)
+++ jmeter/trunk/bin/jmeter.bat Sun Oct 29 22:55:56 2017
@@ -124,8 +124,10 @@ rem Setting this flag to true enables ha
 rem set DDRAW=%DDRAW% -Dsun.java2d.ddscale=true
 
 rem Server mode
+set SERVER=-server
+
 rem Collect the settings defined above
-set ARGS=%DUMP% %HEAP% %VERBOSE_GC% %GC_ALGO% %DDRAW% %SYSTEM_PROPS% 
%RUN_IN_DOCKER%
+set ARGS=%DUMP% %DUMP% %HEAP% %VERBOSE_GC% %GC_ALGO% %DDRAW% %SYSTEM_PROPS% 
%RUN_IN_DOCKER%
 
 %JM_START% %JM_LAUNCH% %ARGS% %JVM_ARGS% -jar "%JMETER_BIN%ApacheJMeter.jar" 
%JMETER_CMD_LINE_ARGS%
 

Modified: jmeter/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1813713=1813712=1813713=diff
==
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sun Oct 29 22:55:56 2017
@@ -141,6 +141,7 @@ Summary
 61659JMeterVariables#get() should apply toString() on non 
string objects
 61555Metaspace should be restricted as default
 61693JMeter aware of Docker 
(-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap)
+61694Add -server option in jmeter.bat
 
 
 Non-functional changes

svn commit: r1813712 - in /jmeter/trunk: bin/jmeter bin/jmeter.bat xdocs/changes.xml

[agomes]

Author: agomes
Date: Sun Oct 29 22:46:51 2017
New Revision: 1813712

URL: http://svn.apache.org/viewvc?rev=1813712=rev
Log:
Bug61693 : JMeter aware of Docker

Modified:
jmeter/trunk/bin/jmeter
jmeter/trunk/bin/jmeter.bat
jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/bin/jmeter
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter?rev=1813712=1813711=1813712=diff
==
--- jmeter/trunk/bin/jmeter (original)
+++ jmeter/trunk/bin/jmeter Sun Oct 29 22:46:51 2017
@@ -131,6 +131,10 @@ HEAP="-Xms512m -Xmx512m -XX:MaxMetaspace
 # Uncomment this to generate GC verbose file with Java 9 and above
 # VERBOSE_GC="-Xlog:gc*,gc+age=trace,gc+heap=debug:file=gc_jmeter_%p.log"
 
+# Uncomment this if you run JMeter in DOCKER (need Java SE 8u131 or JDK 9)
+# see 
https://blogs.oracle.com/java-platform-group/java-se-support-for-docker-cpu-and-memory-limits
+# RUN_IN_DOCKER="-XX:+UnlockExperimentalVMOptions 
-XX:+UseCGroupMemoryLimitForHeap"
+
 # Finally, some tracing to help in case things go astray:
 GC_ALGO="-XX:+UseG1GC -XX:MaxGCPauseMillis=250 -XX:G1ReservePercent=20"
 
@@ -140,6 +144,6 @@ DUMP="-XX:+HeapDumpOnOutOfMemoryError"
 SYSTEM_PROPS="-Djava.security.egd=file:/dev/urandom"
 SERVER="-server"
 
-ARGS="$SERVER $DUMP $HEAP $VERBOSE_GC $GC_ALGO $SYSTEM_PROPS"
+ARGS="$SERVER $DUMP $HEAP $VERBOSE_GC $GC_ALGO $SYSTEM_PROPS $RUN_IN_DOCKER"
 
 $JAVA_HOME/bin/java $ADD_MODS $ARGS $JVM_ARGS $JMETER_OPTS -jar 
"$PRGDIR/ApacheJMeter.jar" "$@"

Modified: jmeter/trunk/bin/jmeter.bat
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.bat?rev=1813712=1813711=1813712=diff
==
--- jmeter/trunk/bin/jmeter.bat (original)
+++ jmeter/trunk/bin/jmeter.bat Sun Oct 29 22:46:51 2017
@@ -99,13 +99,17 @@ rem set VERBOSE_GC=-verbose:gc -Xloggc:g
 rem Uncomment this to generate GC verbose file with Java 9 and above
 rem set VERBOSE_GC=-Xlog:gc*,gc+age=trace,gc+heap=debug:file=gc_jmeter_%%p.log
 
-
 set GC_ALGO=-XX:+UseG1GC -XX:MaxGCPauseMillis=250 -XX:G1ReservePercent=20
 
 set SYSTEM_PROPS=-Djava.security.egd=file:/dev/urandom
+
 rem Always dump on OOM (does not cost anything unless triggered)
 set DUMP=-XX:+HeapDumpOnOutOfMemoryError
 
+rem Uncomment this if you run JMeter in DOCKER (need Java SE 8u131 or JDK 9)
+rem see 
https://blogs.oracle.com/java-platform-group/java-se-support-for-docker-cpu-and-memory-limits
+rem set RUN_IN_DOCKER=-XX:+UnlockExperimentalVMOptions 
-XX:+UseCGroupMemoryLimitForHeap
+
 rem Additional settings that might help improve GUI performance on some 
platforms
 rem See: http://www.oracle.com/technetwork/java/perf-graphics-135933.html
 
@@ -121,7 +125,7 @@ rem set DDRAW=%DDRAW% -Dsun.java2d.ddsca
 
 rem Server mode
 rem Collect the settings defined above
-set ARGS=%DUMP% %HEAP% %VERBOSE_GC% %GC_ALGO% %DDRAW% %SYSTEM_PROPS%
+set ARGS=%DUMP% %HEAP% %VERBOSE_GC% %GC_ALGO% %DDRAW% %SYSTEM_PROPS% 
%RUN_IN_DOCKER%
 
 %JM_START% %JM_LAUNCH% %ARGS% %JVM_ARGS% -jar "%JMETER_BIN%ApacheJMeter.jar" 
%JMETER_CMD_LINE_ARGS%
 

Modified: jmeter/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1813712=1813711=1813712=diff
==
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sun Oct 29 22:46:51 2017
@@ -140,6 +140,7 @@ Summary
 61656tearDown Thread Group should run by 
default at stop or shutdown of test
 61659JMeterVariables#get() should apply toString() on non 
string objects
 61555Metaspace should be restricted as default
+61693JMeter aware of Docker 
(-XX:+UnlockExperimentalVMOptions -XX:+UseCGroupMemoryLimitForHeap)
 
 
 Non-functional changes

svn commit: r1813711 - in /jmeter/trunk/bin: jmeter jmeter.bat

[agomes]

Author: agomes
Date: Sun Oct 29 22:34:35 2017
New Revision: 1813711

URL: http://svn.apache.org/viewvc?rev=1813711=rev
Log:
Bug 61529 - Migration to Java 9 : New syntax for GC log

Modified:
jmeter/trunk/bin/jmeter
jmeter/trunk/bin/jmeter.bat

Modified: jmeter/trunk/bin/jmeter
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter?rev=1813711=1813710=1813711=diff
==
--- jmeter/trunk/bin/jmeter (original)
+++ jmeter/trunk/bin/jmeter Sun Oct 29 22:34:35 2017
@@ -125,7 +125,11 @@ PRGDIR=`dirname "$PRG"`
 # system's memory availability:
 HEAP="-Xms512m -Xmx512m -XX:MaxMetaspaceSize=256m"
 
-#VERBOSE_GC="-verbose:gc -Xloggc:gc_jmeter_%p.log -XX:+PrintGCDetails 
-XX:+PrintGCCause -XX:+PrintTenuringDistribution -XX:+PrintHeapAtGC 
-XX:+PrintGCApplicationConcurrentTime -XX:+PrintGCApplicationStoppedTime 
-XX:+PrintGCDateStamps"
+# Uncomment this to generate GC verbose file with Java prior to 9 
+# VERBOSE_GC="-verbose:gc -Xloggc:gc_jmeter_%p.log -XX:+PrintGCDetails 
-XX:+PrintGCCause -XX:+PrintTenuringDistribution -XX:+PrintHeapAtGC 
-XX:+PrintGCApplicationConcurrentTime -XX:+PrintGCApplicationStoppedTime 
-XX:+PrintGCDateStamps"
+
+# Uncomment this to generate GC verbose file with Java 9 and above
+# VERBOSE_GC="-Xlog:gc*,gc+age=trace,gc+heap=debug:file=gc_jmeter_%p.log"
 
 # Finally, some tracing to help in case things go astray:
 GC_ALGO="-XX:+UseG1GC -XX:MaxGCPauseMillis=250 -XX:G1ReservePercent=20"

Modified: jmeter/trunk/bin/jmeter.bat
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.bat?rev=1813711=1813710=1813711=diff
==
--- jmeter/trunk/bin/jmeter.bat (original)
+++ jmeter/trunk/bin/jmeter.bat Sun Oct 29 22:34:35 2017
@@ -93,9 +93,13 @@ rem See the unix startup file for the ra
 rem including some tuning recommendations
 set HEAP=-Xms512m -Xmx512m -XX:MaxMetaspaceSize=256m
 
-rem Uncomment this to generate GC verbose file
+rem Uncomment this to generate GC verbose file with Java prior to 9 
 rem set VERBOSE_GC=-verbose:gc -Xloggc:gc_jmeter_%%p.log -XX:+PrintGCDetails 
-XX:+PrintGCCause -XX:+PrintTenuringDistribution -XX:+PrintHeapAtGC 
-XX:+PrintGCApplicationConcurrentTime -XX:+PrintGCApplicationStoppedTime 
-XX:+PrintGCDateStamps
 
+rem Uncomment this to generate GC verbose file with Java 9 and above
+rem set VERBOSE_GC=-Xlog:gc*,gc+age=trace,gc+heap=debug:file=gc_jmeter_%%p.log
+
+
 set GC_ALGO=-XX:+UseG1GC -XX:MaxGCPauseMillis=250 -XX:G1ReservePercent=20
 
 set SYSTEM_PROPS=-Djava.security.egd=file:/dev/urandom

svn commit: r1813710 - /jmeter/trunk/bin/jmeter.bat

[agomes]

Author: agomes
Date: Sun Oct 29 21:33:52 2017
New Revision: 1813710

URL: http://svn.apache.org/viewvc?rev=1813710=rev
Log:
Bug 61529 - Migration to Java 9 : jmeter.bat Windows file Java 9 detection

Modified:
jmeter/trunk/bin/jmeter.bat

Modified: jmeter/trunk/bin/jmeter.bat
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.bat?rev=1813710=1813709=1813710=diff
==
--- jmeter/trunk/bin/jmeter.bat (original)
+++ jmeter/trunk/bin/jmeter.bat Sun Oct 29 21:33:52 2017
@@ -31,6 +31,11 @@ setlocal
 rem Minimal version to run JMeter
 set MINIMAL_VERSION=1.8.0
 
+
+rem --add-modules java.activation if JAVA 9
+set ADD_MODS=
+
+
 for /f "tokens=3" %%g in ('java -version 2^>^&1 ^| findstr /i "version"') do (
 rem @echo Debug Output: %%g
 set JAVAVER=%%g
@@ -40,11 +45,22 @@ if not defined JAVAVER (
 set ERRORLEVEL=2
 goto pause
 )
-set JAVAVER=%JAVAVER:"=%
-for /f "delims=. tokens=1-3" %%v in ("%JAVAVER%") do (
-set current_minor=%%w
+
+
+
+rem Check if version is from OpenJDK or Oracle Hotspot JVM prior to 9 
containing 1.${version}.x
+IF "%variable:~0,2%"=="1." (
+set JAVAVER=%JAVAVER:"=%
+for /f "delims=. tokens=1-3" %%v in ("%JAVAVER%") do (
+set current_minor=%%w
+)
+) else (
+rem Java 9 at least
+set current_minor=9
+set ADD_MODS=--add-modules java.activation
 )
 
+
 for /f "delims=. tokens=1-3" %%v in ("%MINIMAL_VERSION%") do (
 set minimal_minor=%%w
 )

svn commit: r1813548 - /jmeter/trunk/bin/jmeter

[agomes]

Author: agomes
Date: Fri Oct 27 16:42:13 2017
New Revision: 1813548

URL: http://svn.apache.org/viewvc?rev=1813548=rev
Log:
Bug 61667 - Bad detection of Java home in bin/jmeter

Modified:
jmeter/trunk/bin/jmeter

Modified: jmeter/trunk/bin/jmeter
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter?rev=1813548=1813547=1813548=diff
==
--- jmeter/trunk/bin/jmeter (original)
+++ jmeter/trunk/bin/jmeter Fri Oct 27 16:42:13 2017
@@ -25,7 +25,7 @@
 ##   ==
 # Make sure prerequisite environment variables are set
 if [ -z "$JAVA_HOME" -a -z "$JRE_HOME" ]; then
-  if $darwin; then
+  if [ "$(uname)" == "Darwin" ]; then
 # 
 if [ -x '/usr/libexec/java_home' ] ; then
   export JAVA_HOME=`/usr/libexec/java_home`
@@ -68,7 +68,7 @@ MINIMAL_VERSION=1.8.0
 
 _java=`type java | awk '{ print $ NF }'`
 CURRENT_VERSION=`"$_java" -version 2>&1 | awk -F'"' '/version/ {print $2}'`
-# Check if version is from OpenJDK, containing 1.${version}.x
+# Check if version is from OpenJDK or Oracle Hotspot JVM prior to 9 containing 
1.${version}.x
 if [ ${#CURRENT_VERSION} -lt 1 ]; then
CURRENT_VERSION=`echo $CURRENT_VERSION | awk -F'.' '{ print $2 }'`
 else

svn commit: r1812680 - /jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties

[agomes]

Author: agomes
Date: Thu Oct 19 20:03:46 2017
New Revision: 1812680

URL: http://svn.apache.org/viewvc?rev=1812680=rev
Log:
Standardisation of Boundary Extractor labels

Modified:
jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties

Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=1812680=1812679=1812680=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Thu 
Oct 19 20:03:46 2017
@@ -146,8 +146,8 @@ backend_listener_queue_size=Async Queue
 bind=Thread Bind
 bouncy_castle_unavailable_message=The jars for bouncy castle are unavailable, 
please add them to your classpath.
 boundaryextractor_empty_default_value=Use empty default value
-boundaryextractor_leftboundary_field=Left boundary
-boundaryextractor_rightboundary_field=Right boundary
+boundaryextractor_leftboundary_field=Left Boundary: 
+boundaryextractor_rightboundary_field=Right Boundary: 
 boundaryextractor_title=Boundary Extractor
 browse=Browse...
 bsf_sampler_title=BSF Sampler

svn commit: r1811895 - in /jmeter/trunk: src/components/org/apache/jmeter/assertions/gui/ src/core/org/apache/jmeter/util/ src/protocol/java/org/apache/jmeter/protocol/java/control/gui/ xdocs/

[agomes]

Author: agomes
Date: Wed Oct 11 21:50:34 2017
New Revision: 1811895

URL: http://svn.apache.org/viewvc?rev=1811895=rev
Log:
Bug61607 Add browse button in all beanshell elements to select beanshell script

Modified:

jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java
jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellBeanInfoSupport.java

jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/control/gui/BeanShellSamplerGui.java
jmeter/trunk/xdocs/changes.xml

Modified: 
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java?rev=1811895=1811894=1811895=diff
==
--- 
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java
 (original)
+++ 
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/BeanShellAssertionGui.java
 Wed Oct 11 21:50:34 2017
@@ -33,6 +33,7 @@ import org.apache.jmeter.gui.util.JTextS
 import org.apache.jmeter.testelement.TestElement;
 import org.apache.jmeter.testelement.property.BooleanProperty;
 import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jmeter.gui.util.FilePanelEntry;
 
 public class BeanShellAssertionGui extends AbstractAssertionGui {
 
@@ -40,7 +41,7 @@ public class BeanShellAssertionGui exten
 
 private JCheckBox resetInterpreter;// reset the bsh.Interpreter before 
each execution
 
-private JTextField filename;// script file name (if present)
+private final FilePanelEntry filename = new 
FilePanelEntry(JMeterUtils.getResString("bsh_script_file"),".bsh"); // script 
file name (if present)
 
 private JTextField parameters;// parameters to pass to script file (or 
script)
 
@@ -54,7 +55,7 @@ public class BeanShellAssertionGui exten
 public void configure(TestElement element) {
 
scriptField.setInitialText(element.getPropertyAsString(BeanShellAssertion.SCRIPT));
 scriptField.setCaretPosition(0);
-
filename.setText(element.getPropertyAsString(BeanShellAssertion.FILENAME));
+
filename.setFilename(element.getPropertyAsString(BeanShellAssertion.FILENAME));
 
parameters.setText(element.getPropertyAsString(BeanShellAssertion.PARAMETERS));
 
resetInterpreter.setSelected(element.getPropertyAsBoolean(BeanShellAssertion.RESET_INTERPRETER));
 super.configure(element);
@@ -77,7 +78,7 @@ public class BeanShellAssertionGui exten
 te.clear();
 super.configureTestElement(te);
 te.setProperty(BeanShellAssertion.SCRIPT, scriptField.getText());
-te.setProperty(BeanShellAssertion.FILENAME, filename.getText());
+te.setProperty(BeanShellAssertion.FILENAME, filename.getFilename());
 te.setProperty(BeanShellAssertion.PARAMETERS, parameters.getText());
 te.setProperty(new 
BooleanProperty(BeanShellAssertion.RESET_INTERPRETER, 
resetInterpreter.isSelected()));
 }
@@ -87,17 +88,12 @@ public class BeanShellAssertionGui exten
 return "bsh_assertion_title"; // $NON-NLS-1$
 }
 
-private JPanel createFilenamePanel()// TODO ought to be a FileChooser ...
+private JPanel createFilenamePanel()
 {
-JLabel label = new 
JLabel(JMeterUtils.getResString("bsh_script_file")); //$NON-NLS-1$
 
-filename = new JTextField(10);
-filename.setName(BeanShellAssertion.FILENAME);
-label.setLabelFor(filename);
-
-JPanel filenamePanel = new JPanel(new BorderLayout(5, 0));
-filenamePanel.add(label, BorderLayout.WEST);
+JPanel filenamePanel = new JPanel(new BorderLayout());
 filenamePanel.add(filename, BorderLayout.CENTER);
+
 return filenamePanel;
 }
 
@@ -162,7 +158,7 @@ public class BeanShellAssertionGui exten
 @Override
 public void clearGui() {
 super.clearGui();
-filename.setText(""); // $NON-NLS-1$
+filename.setFilename(""); // $NON-NLS-1$
 parameters.setText(""); // $NON-NLS-1$
 scriptField.setInitialText(""); // $NON-NLS-1$
 resetInterpreter.setSelected(false);

Modified: 
jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellBeanInfoSupport.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellBeanInfoSupport.java?rev=1811895=1811894=1811895=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellBeanInfoSupport.java 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellBeanInfoSupport.java 
Wed Oct 11 21:50:34 2017
@@ -23,6 +23,7 @@ import java.beans.PropertyDescriptor;
 import org.apache.jmeter.testbeans.BeanInfoSupport;
 import org.apache.jmeter.tes

svn commit: r1811888 - in /jmeter/trunk: src/core/org/apache/jmeter/testbeans/gui/FileEditor.java xdocs/changes.xml

[agomes]

Author: agomes
Date: Wed Oct 11 20:46:05 2017
New Revision: 1811888

URL: http://svn.apache.org/viewvc?rev=1811888=rev
Log:
Bug61606 - Translate Browse... button in some element (FileEditor)

Modified:
jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/FileEditor.java
jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/FileEditor.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/FileEditor.java?rev=1811888=1811887=1811888=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/FileEditor.java 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/FileEditor.java Wed 
Oct 11 20:46:05 2017
@@ -34,6 +34,7 @@ import javax.swing.JFileChooser;
 import javax.swing.JPanel;
 
 import org.apache.jmeter.gui.util.FileDialoger;
+import org.apache.jmeter.util.JMeterUtils;
 
 /**
  * A property editor for File properties.
@@ -81,7 +82,7 @@ public class FileEditor implements Prope
 }
 
 // Create a button to trigger the file chooser:
-JButton button = new JButton("Browse...");
+JButton button = new JButton(JMeterUtils.getResString("browse"));
 button.addActionListener(this);
 
 // Get a WrapperEditor to provide the field or combo -- we'll delegate

Modified: jmeter/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1811888=1811887=1811888=diff
==
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Wed Oct 11 20:46:05 2017
@@ -108,6 +108,7 @@ Summary
 I18N
 
 61559Better label/translation/documentation for label 
ignoreFirstLine.displayName for CSV Data Set Config
+61606 Translate button "Browse..." in some elements (those 
who use FileEditor class
 
 
 Report / Dashboard

svn commit: r1811755 - in /jmeter/trunk: src/components/org/apache/jmeter/modifiers/ src/components/org/apache/jmeter/modifiers/gui/ src/components/org/apache/jmeter/visualizers/backend/ src/core/org/

[agomes]

Author: agomes
Date: Tue Oct 10 18:28:45 2017
New Revision: 1811755

URL: http://svn.apache.org/viewvc?rev=1811755=rev
Log:
Reverse Bug 61602, Bug 61595, Bug 61593

Added:

jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java
  - copied unchanged from r1811618, 
jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java
Removed:

jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigBeanInfo.java

jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigResources.properties

jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigResources_es.properties

jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigResources_fr.properties

jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigResources_pt_BR.properties
Modified:
jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java

jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListenerGui.java
jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_es.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pt_BR.properties

jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java
jmeter/trunk/test/src/org/apache/jmeter/control/TestIfController.java
jmeter/trunk/xdocs/changes.xml
jmeter/trunk/xdocs/images/screenshots/backend_listener.png
jmeter/trunk/xdocs/images/screenshots/counter.png
jmeter/trunk/xdocs/images/screenshots/java_defaults.png
jmeter/trunk/xdocs/images/screenshots/java_request.png

Modified: 
jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java?rev=1811755=1811754=1811755=diff
==
--- jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java 
(original)
+++ jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java 
Tue Oct 10 18:28:45 2017
@@ -21,12 +21,12 @@ package org.apache.jmeter.modifiers;
 import java.io.Serializable;
 import java.text.DecimalFormat;
 
-import org.apache.commons.lang3.math.NumberUtils;
-import org.apache.jmeter.config.ConfigTestElement;
 import org.apache.jmeter.engine.event.LoopIterationEvent;
 import org.apache.jmeter.engine.event.LoopIterationListener;
 import org.apache.jmeter.engine.util.NoThreadClone;
-import org.apache.jmeter.testbeans.TestBean;
+import org.apache.jmeter.testelement.AbstractTestElement;
+import org.apache.jmeter.testelement.property.BooleanProperty;
+import org.apache.jmeter.testelement.property.LongProperty;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;
 import org.slf4j.Logger;
@@ -35,24 +35,26 @@ import org.slf4j.LoggerFactory;
 /**
  * Provides a counter per-thread(user) or per-thread group.
  */
-public class CounterConfig extends ConfigTestElement
-implements TestBean, Serializable, LoopIterationListener, NoThreadClone {
+public class CounterConfig extends AbstractTestElement
+implements Serializable, LoopIterationListener, NoThreadClone {
 
 private static final long serialVersionUID = 234L;
-
-private String startValue;
 
-private String maxValue;
+private static final String START = "CounterConfig.start"; // $NON-NLS-1$
 
-private String varName;
+private static final String END = "CounterConfig.end"; // $NON-NLS-1$
 
-private String format;
+private static final String INCREMENT = "CounterConfig.incr"; // 
$NON-NLS-1$
 
-private String increment;
+private static final String FORMAT = "CounterConfig.format"; // $NON-NLS-1$
 
-private boolean perUser;
+private static final String PER_USER = "CounterConfig.per_user"; // 
$NON-NLS-1$
 
-private boolean resetPerTGIteration;
+private static final String VAR_NAME = "CounterConfig.name"; // $NON-NLS-1$
+
+private static final String RESET_ON_THREAD_GROUP_ITERATION = 
"CounterConfig.reset_on_tg_iteration"; // $NON-NLS-1$
+
+private static final boolean RESET_ON_THREAD_GROUP_ITERATION_DEFAULT = 
false;
 
 // This class is not cloned per thread, so this is shared
 //@GuardedBy("this")
@@ -67,14 +69,10 @@ public class CounterConfig extends Confi
 private static final Logger log = 
LoggerFactory.getLogger(CounterConfig.class);
 
 private void init() { // WARNING: called from ctor so must not be 
overridden (i.e. must be private or final)
-if (NumberUtils.toLong(getStartValue()) > 
NumberUtils.toLong(getMaxValue())){
- 

svn commit: r1811623 - in /jmeter/trunk: src/components/org/apache/jmeter/modifiers/CounterConfigResources_fr.properties src/core/org/apache/jmeter/resources/messages_fr.properties test/src/org/apache

[agomes]

Author: agomes
Date: Mon Oct  9 22:53:09 2017
New Revision: 1811623

URL: http://svn.apache.org/viewvc?rev=1811623=rev
Log:
Bug 61602 - Fix broken tests - part1

Modified:

jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigResources_fr.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
jmeter/trunk/test/src/org/apache/jmeter/control/TestIfController.java

Modified: 
jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigResources_fr.properties
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigResources_fr.properties?rev=1811623=1811622=1811623=diff
==
--- 
jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigResources_fr.properties
 (original)
+++ 
jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigResources_fr.properties
 Mon Oct  9 22:53:09 2017
@@ -20,16 +20,16 @@ parameters.displayName=Param\u00E9trer l
 options.displayName=Options
 # fields
 startValue.displayName=Valeur initiale
-#startValue.shortDescription=The starting value for the counter. The counter 
will equal this value during the first iteration.
+startValue.shortDescription=Valeur initiale
 maxValue.displayName=Valeur maximum
-#maxValue.shortDescription=If the counter exceeds the maximum, then it is 
reset to the Starting value. Default is Long.MAX_VALUE (2^63-1)
+maxValue.shortDescription=Si le compteur d\u00e9passe la valeur maximale, 
alors r\u00E9initialise le compteur avec la valeur initiale. La valeur par 
d\u00e9faut est Long.MAX_VALUE (2^63-1)
 varName.displayName=Nom de r\u00E9f\u00E9rence
-#varName.shortDescription=This controls how you refer to this value in other 
elements
+varName.shortDescription=Nom de r\u00E9f\u00E9rence utilis\u00e9 dans les 
autres composants
 format.displayName=Format du nombre
-#format.shortDescription=Optional format, e.g. 000 will format as 001, 002, 
etc.
+format.shortDescription=Optionnel. Ex: 000 pour 001, 002, etc.
 increment.displayName=Incr\u00E9ment
-#increment.shortDescription=How much to increment the counter by after each 
iteration.
+increment.shortDescription=Valeur d'incr\u00e9mentation pour chaque 
it\u00e9ration
 perUser.displayName=Suivre le compteur ind\u00E9pendamment pour chaque 
unit\u00E9 de test
-#perUser.shortDescription=Is this a global counter, or does each user get 
their own counter? If unchecked, the counter is global (i.e., user #1 will get 
value "1", and user #2 will get value "2" on the first iteration).
+perUser.shortDescription=Si la valeur est false, le compteur est global
 resetPerTGIteration.displayName=R\u00E9initialiser le compteur \u00E0 chaque 
it\u00E9ration du groupe d'unit\u00E9s
-#resetPerTGIteration.shortDescription=This option is only available when 
counter is tracked per User, if checked, counter will be reset to Start value 
on each Thread Group iteration.
\ No newline at end of file
+resetPerTGIteration.shortDescription=Option disponible si Suivre le compteur 
ind\u00E9pendamment pour chaque unit\u00E9 de test est selectionn\u00e9

Modified: 
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties?rev=1811623=1811622=1811623=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties 
Mon Oct  9 22:53:09 2017
@@ -209,6 +209,7 @@ cookie_manager_policy=Politique des cook
 cookie_manager_title=Gestionnaire de cookies HTTP
 cookie_options=Options
 cookies_stored=Cookies stock\u00E9s
+copy=Copier
 countlim=Limiter le nombre d'\u00E9l\u00E9ments retourn\u00E9s \u00E0
 critical_section_controller_label=Nom du verrou
 critical_section_controller_title=Contr\u00F4leur Section critique

Modified: jmeter/trunk/test/src/org/apache/jmeter/control/TestIfController.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/control/TestIfController.java?rev=1811623=1811622=1811623=diff
==
--- jmeter/trunk/test/src/org/apache/jmeter/control/TestIfController.java 
(original)
+++ jmeter/trunk/test/src/org/apache/jmeter/control/TestIfController.java Mon 
Oct  9 22:53:09 2017
@@ -102,8 +102,8 @@ public class TestIfController extends JM
 ifCont2.setEvaluateAll(false);
 
 CounterConfig counterConfig = new CounterConfig();
-counterConfig.setStart(1);
-counterConfig.setIncrement(1);
+counterConfig.setStartValue("1");
+counterConfig.setIncrement("1");
 counterConfig.setVarName("VAR1");
 
 DebugSampler debugSampler2 = new DebugSampler();

svn commit: r1811619 - in /jmeter/trunk: src/components/org/apache/jmeter/modifiers/ src/components/org/apache/jmeter/modifiers/gui/ src/core/org/apache/jmeter/resources/ xdocs/ xdocs/images/screensho

[agomes]

Author: agomes
Date: Mon Oct  9 22:15:17 2017
New Revision: 1811619

URL: http://svn.apache.org/viewvc?rev=1811619=rev
Log:
Bug 61602 - BeanInfoSupport-based generated UI for Counter element

Added:

jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigBeanInfo.java

jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigResources.properties

jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigResources_es.properties

jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigResources_fr.properties

jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfigResources_pt_BR.properties
Removed:

jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java
Modified:
jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java
jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_es.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pt_BR.properties
jmeter/trunk/xdocs/changes.xml
jmeter/trunk/xdocs/images/screenshots/counter.png

Modified: 
jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java?rev=1811619=1811618=1811619=diff
==
--- jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java 
(original)
+++ jmeter/trunk/src/components/org/apache/jmeter/modifiers/CounterConfig.java 
Mon Oct  9 22:15:17 2017
@@ -21,12 +21,12 @@ package org.apache.jmeter.modifiers;
 import java.io.Serializable;
 import java.text.DecimalFormat;
 
+import org.apache.commons.lang3.math.NumberUtils;
+import org.apache.jmeter.config.ConfigTestElement;
 import org.apache.jmeter.engine.event.LoopIterationEvent;
 import org.apache.jmeter.engine.event.LoopIterationListener;
 import org.apache.jmeter.engine.util.NoThreadClone;
-import org.apache.jmeter.testelement.AbstractTestElement;
-import org.apache.jmeter.testelement.property.BooleanProperty;
-import org.apache.jmeter.testelement.property.LongProperty;
+import org.apache.jmeter.testbeans.TestBean;
 import org.apache.jmeter.threads.JMeterContextService;
 import org.apache.jmeter.threads.JMeterVariables;
 import org.slf4j.Logger;
@@ -35,26 +35,24 @@ import org.slf4j.LoggerFactory;
 /**
  * Provides a counter per-thread(user) or per-thread group.
  */
-public class CounterConfig extends AbstractTestElement
-implements Serializable, LoopIterationListener, NoThreadClone {
+public class CounterConfig extends ConfigTestElement
+implements TestBean, Serializable, LoopIterationListener, NoThreadClone {
 
 private static final long serialVersionUID = 234L;
+
+private String startValue;
 
-private static final String START = "CounterConfig.start"; // $NON-NLS-1$
+private String maxValue;
 
-private static final String END = "CounterConfig.end"; // $NON-NLS-1$
+private String varName;
 
-private static final String INCREMENT = "CounterConfig.incr"; // 
$NON-NLS-1$
+private String format;
 
-private static final String FORMAT = "CounterConfig.format"; // $NON-NLS-1$
+private String increment;
 
-private static final String PER_USER = "CounterConfig.per_user"; // 
$NON-NLS-1$
+private boolean perUser;
 
-private static final String VAR_NAME = "CounterConfig.name"; // $NON-NLS-1$
-
-private static final String RESET_ON_THREAD_GROUP_ITERATION = 
"CounterConfig.reset_on_tg_iteration"; // $NON-NLS-1$
-
-private static final boolean RESET_ON_THREAD_GROUP_ITERATION_DEFAULT = 
false;
+private boolean resetPerTGIteration;
 
 // This class is not cloned per thread, so this is shared
 //@GuardedBy("this")
@@ -69,10 +67,14 @@ public class CounterConfig extends Abstr
 private static final Logger log = 
LoggerFactory.getLogger(CounterConfig.class);
 
 private void init() { // WARNING: called from ctor so must not be 
overridden (i.e. must be private or final)
+if (NumberUtils.toLong(getStartValue()) > 
NumberUtils.toLong(getMaxValue())){
+log.error("maximum({}) must be > minimum({})", getMaxValue(), 
getStartValue());
+return;
+}
 perTheadNumber = new ThreadLocal() {
 @Override
 protected Long initialValue() {
-return Long.valueOf(getStart());
+return Long.valueOf(getStartValue());
 }
 };
 perTheadLastIterationNumber = new ThreadLocal() {
@@ -100,9 +102,9 @@ public class CounterConfig extends Abstr
 public void iterationStart(LoopIterationEvent event) {
 

svn commit: r1811454 - in /jmeter/trunk: src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java xdocs/changes.xml xdocs/images/screenshots/java_defaults.png xdocs/images/scree

[agomes]

Author: agomes
Date: Sat Oct  7 22:08:42 2017
New Revision: 1811454

URL: http://svn.apache.org/viewvc?rev=1811454=rev
Log:
Bug 61595 Remove Detail, Add, Add from Clipboard, Delete buttons in Java 
Request Defaults & Java Request GUI

Modified:

jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java
jmeter/trunk/xdocs/changes.xml
jmeter/trunk/xdocs/images/screenshots/java_defaults.png
jmeter/trunk/xdocs/images/screenshots/java_request.png

Modified: 
jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java?rev=1811454=1811453=1811454=diff
==
--- 
jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java
 (original)
+++ 
jmeter/trunk/src/protocol/java/org/apache/jmeter/protocol/java/config/gui/JavaConfigGui.java
 Sat Oct  7 22:08:42 2017
@@ -238,7 +238,7 @@ public class JavaConfigGui extends Abstr
  * @return a panel containing the relevant components
  */
 private JPanel createParameterPanel() {
-argsPanel = new 
ArgumentsPanel(JMeterUtils.getResString("paramtable")); // $NON-NLS-1$
+argsPanel = new 
ArgumentsPanel(true,JMeterUtils.getResString("paramtable")); // $NON-NLS-1$
 return argsPanel;
 }
 

Modified: jmeter/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1811454=1811453=1811454=diff
==
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sat Oct  7 22:08:42 2017
@@ -84,6 +84,7 @@ Summary
 
 Other samplers
 
+61595Remove Detail, Add, Add from Clipboard, Delete buttons 
in Java Request Defaults and Java Request GUI
 
 
 Controllers

Modified: jmeter/trunk/xdocs/images/screenshots/java_defaults.png
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/images/screenshots/java_defaults.png?rev=1811454=1811453=1811454=diff
==
Binary files - no diff available.

Modified: jmeter/trunk/xdocs/images/screenshots/java_request.png
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/images/screenshots/java_request.png?rev=1811454=1811453=1811454=diff
==
Binary files - no diff available.

svn commit: r1811450 - in /jmeter/trunk: src/components/org/apache/jmeter/visualizers/backend/BackendListenerGui.java xdocs/changes.xml xdocs/images/screenshots/backend_listener.png

[agomes]

Author: agomes
Date: Sat Oct  7 21:49:52 2017
New Revision: 1811450

URL: http://svn.apache.org/viewvc?rev=1811450=rev
Log:
Bug 61593 Remove Detail, Add, Add from Clipboard, Delete buttons in Backend 
listener GUI

Modified:

jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListenerGui.java
jmeter/trunk/xdocs/changes.xml
jmeter/trunk/xdocs/images/screenshots/backend_listener.png

Modified: 
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListenerGui.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListenerGui.java?rev=1811450=1811449=1811450=diff
==
--- 
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListenerGui.java
 (original)
+++ 
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListenerGui.java
 Sat Oct  7 21:49:52 2017
@@ -214,7 +214,7 @@ public class BackendListenerGui extends
  * @return a panel containing the relevant components
  */
 private JPanel createParameterPanel() {
-argsPanel = new 
ArgumentsPanel(JMeterUtils.getResString("backend_listener_paramtable")); // 
$NON-NLS-1$
+argsPanel = new 
ArgumentsPanel(true,JMeterUtils.getResString("backend_listener_paramtable")); 
// $NON-NLS-1$
 return argsPanel;
 }
 

Modified: jmeter/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1811450=1811449=1811450=diff
==
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sat Oct  7 21:49:52 2017
@@ -92,6 +92,7 @@ Summary
 
 Listeners
 
+61594Remove Detail, Add, Add from Clipboard, Delete buttons 
in Backend listener GUI
 
 
 Timers, Assertions, Config, Pre-  Post-Processors

Modified: jmeter/trunk/xdocs/images/screenshots/backend_listener.png
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/images/screenshots/backend_listener.png?rev=1811450=1811449=1811450=diff
==
Binary files - no diff available.

svn commit: r1811449 - in /jmeter/trunk: src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java src/core/org/apache/jmeter/functions/gui/FunctionHelper.java xdocs/changes.xml xdocs/images/screensho

[agomes]

Author: agomes
Date: Sat Oct  7 21:26:54 2017
New Revision: 1811449

URL: http://svn.apache.org/viewvc?rev=1811449=rev
Log:
Bug 61593 - Remove Detail, Add, Add from Clipboard, Delete buttons in Function 
Helper GUI 

Modified:
jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java
jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java
jmeter/trunk/xdocs/changes.xml
jmeter/trunk/xdocs/images/screenshots/function_helper_dialog.png

Modified: jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java?rev=1811449=1811448=1811449=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/config/gui/ArgumentsPanel.java Sat 
Oct  7 21:26:54 2017
@@ -97,7 +97,11 @@ public class ArgumentsPanel extends Abst
 /** Button to show the detail of an argument*/
 private JButton showDetail;
 
+/** Enable Up & Down buttons */
 private final boolean enableUpDown;
+
+/** Disable buttons :Detail, Add, Add from Clipboard, Delete, Up & Down*/
+private final boolean disableButtons;
 
 /** Command for adding a row to the table. */
 private static final String ADD = "add"; // $NON-NLS-1$
@@ -152,6 +156,17 @@ public class ArgumentsPanel extends Abst
 public ArgumentsPanel(String label, boolean enableUpDown) {
 this(label, null, enableUpDown, false);
 }
+
+/**
+ * Create a new ArgumentsPanel as an embedded component, using the 
specified
+ * title.
+ * 
+ * @param disableButtons Remove Edit all buttons 
+ * @param label the title for the component.
+ */
+public ArgumentsPanel(boolean disableButtons, String label) {
+this(label, null, false, false, null, disableButtons);
+}
 
 /**
  * Create a new ArgumentsPanel with a border and color background
@@ -170,9 +185,9 @@ public class ArgumentsPanel extends Abst
  * @param standalone is standalone
  */
 public ArgumentsPanel(String label, Color bkg, boolean enableUpDown, 
boolean standalone) {
-this(label, bkg, enableUpDown, standalone, null);
+this(label, bkg, enableUpDown, standalone, null, false);
 }
-   
+
 /**
  * Create a new ArgumentsPanel with a border and color background
  * @param label text for label
@@ -182,8 +197,22 @@ public class ArgumentsPanel extends Abst
  * @param model the table model to use
  */
 public ArgumentsPanel(String label, Color bkg, boolean enableUpDown, 
boolean standalone, ObjectTableModel model) {
+this(label, bkg, enableUpDown, standalone, model, false);
+}
+
+/**
+ * Create a new ArgumentsPanel with a border and color background
+ * @param label text for label
+ * @param bkg background colour
+ * @param enableUpDown Add up/down buttons
+ * @param standalone is standalone
+ * @param model the table model to use
+ * @param disableButtons Remove all buttons 
+ */
+public ArgumentsPanel(String label, Color bkg, boolean enableUpDown, 
boolean standalone, ObjectTableModel model, boolean disableButtons) {
 tableLabel = new JLabel(label);
 this.enableUpDown = enableUpDown;
+this.disableButtons = disableButtons;
 this.background = bkg;
 this.standalone = standalone;
 this.tableModel = model;
@@ -297,25 +326,27 @@ public class ArgumentsPanel extends Abst
 }
 
 protected void checkButtonsStatus() {
-// Disable DELETE if there are no rows in the table to delete.
-if (tableModel.getRowCount() == 0) {
-delete.setEnabled(false);
-showDetail.setEnabled(false);
-} else {
-delete.setEnabled(true);
-showDetail.setEnabled(true);
-}
-
-if(enableUpDown) {
-if(tableModel.getRowCount()>1) {
-up.setEnabled(true);
-down.setEnabled(true);
-}
-else {
-up.setEnabled(false);
-down.setEnabled(false);
+if (!disableButtons) {
+// Disable DELETE if there are no rows in the table to delete.
+if (tableModel.getRowCount() == 0) {
+delete.setEnabled(false);
+showDetail.setEnabled(false);
+} else {
+delete.setEnabled(true);
+showDetail.setEnabled(true);
+}
+if(enableUpDown) {
+if(tableModel.getRowCount()>1) {
+up.setEnabled(true);
+down.setEnabled(true);
+}
+else {
+up.setEnabled(false);
+ 

svn commit: r1811260 - in /jmeter/trunk: src/functions/org/apache/jmeter/functions/RandomDate.java xdocs/changes.xml

[agomes]

Author: agomes
Date: Thu Oct  5 21:01:25 2017
New Revision: 1811260

URL: http://svn.apache.org/viewvc?rev=1811260=rev
Log:
Bug61588 - Better log message for RandomDate function

Modified:
jmeter/trunk/src/functions/org/apache/jmeter/functions/RandomDate.java
jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/RandomDate.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/RandomDate.java?rev=1811260=1811259=1811260=diff
==
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/RandomDate.java 
(original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/RandomDate.java Thu 
Oct  5 21:01:25 2017
@@ -153,7 +153,7 @@ public class RandomDate extends Abstract
 formatter = dateRandomFormatterCache.get(lfo, key -> 
createFormatter((LocaleFormatObject) key));
 } catch (IllegalArgumentException ex) {
 log.error(
-"Format date pattern '{}' is invalid (see 
https://docs.oracle.com/javase/8/docs/api/java
ime/format/DateTimeFormatter.html)",
+"Format date pattern '{}' is invalid (see 
https://docs.oracle.com/javase/8/docs/api/java/time/format/DateTimeFormatter.html)",
 format, ex); // $NON-NLS-1$
 return "";
 }
@@ -163,7 +163,7 @@ public class RandomDate extends Abstract
 formatter = dateRandomFormatterCache.get(lfo, key -> 
createFormatter((LocaleFormatObject) key));
 } catch (IllegalArgumentException ex) {
 log.error(
-"Format date pattern '{}' is invalid (see 
https://docs.oracle.com/javase/8/docs/api/java
ime/format/DateTimeFormatter.html)",
+"Format date pattern '{}' is invalid (see 
https://docs.oracle.com/javase/8/docs/api/java/time/format/DateTimeFormatter.html)",
 format, ex); // $NON-NLS-1$
 return "";
 }
@@ -174,13 +174,13 @@ public class RandomDate extends Abstract
 try {
 localStartDate = LocalDate.parse(dateStart, 
formatter).toEpochDay();
 } catch (DateTimeParseException | NumberFormatException ex) {
-log.error("Failed to parse the date '{}' to shift with 
formatter '{}'", dateStart, formatter, ex); // $NON-NLS-1$
+log.error("Failed to parse Start Date '{}'", dateStart, ex); 
// $NON-NLS-1$
 }
 } else {
 try {
 localStartDate = 
LocalDate.now(systemDefaultZoneID).toEpochDay();
 } catch (DateTimeParseException | NumberFormatException ex) {
-log.error("Failed to parse the date '{}' to shift with 
formatter '{}'", dateStart, formatter, ex); // $NON-NLS-1$
+log.error("Failed to create current date '{}'", dateStart, 
ex); // $NON-NLS-1$
 }
 }
 
@@ -188,23 +188,27 @@ public class RandomDate extends Abstract
 try {
 localEndDate = LocalDate.parse(dateEnd, formatter).toEpochDay();
 } catch (DateTimeParseException | NumberFormatException ex) {
-log.error("Failed to parse the date '{}' to shift with formatter 
'{}'", dateEnd, formatter, ex); // $NON-NLS-1$
+log.error("Failed to parse End date '{}'", dateEnd, ex); // 
$NON-NLS-1$
 }
 
 // Generate the random date
 String dateString = "";
-long randomDay = ThreadLocalRandom.current().nextLong(localStartDate, 
localEndDate);
-try {
-dateString = LocalDate.ofEpochDay(randomDay).format(formatter);
-} catch (DateTimeParseException | NumberFormatException ex) {
-log.error("Failed to parse the date '{}' to shift with formatter 
'{}'", randomDay, formatter, ex); // $NON-NLS-1$
-}
+if (localEndDate < localStartDate) {
+log.error("End Date '{}' must be greater than Start Date '{}'", 
dateEnd, dateStart); // $NON-NLS-1$
+} else {
+long randomDay = 
ThreadLocalRandom.current().nextLong(localStartDate, localEndDate);
+try {
+dateString = LocalDate.ofEpochDay(randomDay).format(formatter);
+} catch (DateTimeParseException | NumberFormatException ex) {
+log.error("Failed to generate random date '{}'", randomDay, 
ex); // $NON-NLS-1$
+}
 
-variableName = ((CompoundVariable) values[4]).execute().trim();
-if (!StringUtils.isEmpty(variableName)) {
-JMeterVariables vars = getVariables();
-if (vars != null) {// vars will be null on TestPlan
-vars.put(variableName, dateString);

svn commit: r1809347 - /jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetResources_es.properties

[agomes]

Author: agomes
Date: Fri Sep 22 19:59:16 2017
New Revision: 1809347

URL: http://svn.apache.org/viewvc?rev=1809347=rev
Log:
Bug 61559 : Better label/translation/documentation for label 
ignoreFirstLine.displayName for CSV Data Set Config : fix typo in spanish

Modified:

jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetResources_es.properties

Modified: 
jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetResources_es.properties
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetResources_es.properties?rev=1809347=1809346=1809347=diff
==
--- 
jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetResources_es.properties
 (original)
+++ 
jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetResources_es.properties
 Fri Sep 22 19:59:16 2017
@@ -22,7 +22,7 @@ fileEncoding.displayName=Codificaci\u00F
 fileEncoding.shortDescription=El conjunto de caracteres usado en el fichero
 filename.displayName=Nombre de Archivo
 filename.shortDescription=Nombre del archivo (dentro de su directorio de 
archivos) que mantiene los datos CVS
-ignoreFirstLine.displayName=Utilice la primera línea como Nombres de Variable
+ignoreFirstLine.displayName=Utilice la primera l\u00ednea como Nombres de 
Variable
 quotedData.displayName=\u00BFPermitir datos entrecomillados?
 quotedData.shortDescription=\u00BFPermitir que  valores de datos CSV sean 
entrecomillados?
 recycle.displayName=\u00BFReciclar en el fin de fichero (EOF)?

svn commit: r1809346 - in /jmeter/trunk: src/components/org/apache/jmeter/config/ xdocs/ xdocs/images/screenshots/ xdocs/usermanual/

[agomes]

Author: agomes
Date: Fri Sep 22 19:44:38 2017
New Revision: 1809346

URL: http://svn.apache.org/viewvc?rev=1809346=rev
Log:
Bug 61559 : Better label/translation/documentation for label 
ignoreFirstLine.displayName for CSV Data Set Config

Modified:

jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetResources.properties

jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetResources_es.properties

jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetResources_fr.properties

jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetResources_pt_BR.properties
jmeter/trunk/xdocs/changes.xml
jmeter/trunk/xdocs/images/screenshots/csvdatasetconfig.png
jmeter/trunk/xdocs/usermanual/component_reference.xml

Modified: 
jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetResources.properties
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetResources.properties?rev=1809346=1809345=1809346=diff
==
--- 
jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetResources.properties
 (original)
+++ 
jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetResources.properties
 Fri Sep 22 19:44:38 2017
@@ -19,7 +19,7 @@ filename.displayName=Filename
 filename.shortDescription=Name of the file that holds the cvs data (relative 
or absolute filename)
 fileEncoding.displayName=File encoding
 fileEncoding.shortDescription=The character set encoding used in the file
-ignoreFirstLine.displayName=Ignore first line (only used if Variable Names is 
not empty)
+ignoreFirstLine.displayName=Use first line as Variable Names
 ignoreFirstLine.shortDescription=Ignore first line of CSV file, it will only 
be used used if Variable Names is not empty, if Variable Names is empty the 
first line must contain the headers.
 variableNames.displayName=Variable Names (comma-delimited)
 variableNames.shortDescription=List your variable names in order to match the 
order of columns in your csv data. Keep it empty to use the first line of the 
file for variable names.

Modified: 
jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetResources_es.properties
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetResources_es.properties?rev=1809346=1809345=1809346=diff
==
--- 
jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetResources_es.properties
 (original)
+++ 
jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetResources_es.properties
 Fri Sep 22 19:44:38 2017
@@ -22,6 +22,7 @@ fileEncoding.displayName=Codificaci\u00F
 fileEncoding.shortDescription=El conjunto de caracteres usado en el fichero
 filename.displayName=Nombre de Archivo
 filename.shortDescription=Nombre del archivo (dentro de su directorio de 
archivos) que mantiene los datos CVS
+ignoreFirstLine.displayName=Utilice la primera línea como Nombres de Variable
 quotedData.displayName=\u00BFPermitir datos entrecomillados?
 quotedData.shortDescription=\u00BFPermitir que  valores de datos CSV sean 
entrecomillados?
 recycle.displayName=\u00BFReciclar en el fin de fichero (EOF)?

Modified: 
jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetResources_fr.properties
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetResources_fr.properties?rev=1809346=1809345=1809346=diff
==
--- 
jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetResources_fr.properties
 (original)
+++ 
jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetResources_fr.properties
 Fri Sep 22 19:44:38 2017
@@ -22,7 +22,7 @@ fileEncoding.displayName=Encodage du fic
 fileEncoding.shortDescription=Encodage des caract\u00E8res utilis\u00E9s dans 
le fichier
 filename.displayName=Nom de fichier 
 filename.shortDescription=Nom du fichier qui contient des donn\u00E9es CSV 
(chemin relatif ou absolu)
-ignoreFirstLine.displayName=Ignorer la premi\u00E8re ligne (utilis\u00E9 
uniquement si Noms des Variables n'est pas vide)
+ignoreFirstLine.displayName=Utiliser la premi\u00E8re ligne pour les Noms des 
Variables
 ignoreFirstLine.shortDescription=Ignorer la premi\u00E8re ligne du fichier 
CSV, utilis\u00E9 uniquement si Noms des Variables n'est pas vide, si si Noms 
des Variables est vide la premi\u00E8re doit contenir les ent\u00E8tes.
 quotedData.displayName=Autoriser les donn\u00E9es avec des quotes ? 
 quotedData.shortDescription=Permettre aux valeurs des donn\u00E9es CSV 
d'\u00EAtre quot\u00E9es ?

Modified: 
jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetResources_pt_BR.properties
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetResources_pt_BR.properties

svn commit: r1808598 - in /jmeter/trunk: bin/jmeter.properties src/components/org/apache/jmeter/config/CSVDataSetBeanInfo.java xdocs/usermanual/properties_reference.xml

[agomes]

Author: agomes
Date: Sat Sep 16 22:04:53 2017
New Revision: 1808598

URL: http://svn.apache.org/viewvc?rev=1808598=rev
Log:
BUG61527 - CSV data set config : change the name of property and fix doc

Modified:
jmeter/trunk/bin/jmeter.properties
jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetBeanInfo.java
jmeter/trunk/xdocs/usermanual/properties_reference.xml

Modified: jmeter/trunk/bin/jmeter.properties
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.properties?rev=1808598=1808597=1808598=diff
==
--- jmeter/trunk/bin/jmeter.properties (original)
+++ jmeter/trunk/bin/jmeter.properties Sat Sep 16 22:04:53 2017
@@ -907,7 +907,7 @@ beanshell.server.file=../extras/startup.
 # String to return at EOF (if recycle not used)
 #csvdataset.eofstring=
 #list in 
https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html
-csvdataset.file.encoding=UTF-8|UTF-16|ISO-8859-15|US-ASCII
+csvdataset.file.encoding_list=UTF-8|UTF-16|ISO-8859-15|US-ASCII
 
 
 #---

Modified: 
jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetBeanInfo.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetBeanInfo.java?rev=1808598=1808597=1808598=diff
==
--- 
jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetBeanInfo.java 
(original)
+++ 
jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetBeanInfo.java 
Sat Sep 16 22:04:53 2017
@@ -133,6 +133,6 @@ public class CSVDataSetBeanInfo extends
  * @return a String[] with the list of file encoding
  */
 private String[] getListFileEncoding() {
-return 
JOrphanUtils.split(JMeterUtils.getPropDefault("csvdataset.file.encoding", ""), 
"|"); //$NON-NLS-1$
+return 
JOrphanUtils.split(JMeterUtils.getPropDefault("csvdataset.file.encoding_list", 
""), "|"); //$NON-NLS-1$
 }
 }

Modified: jmeter/trunk/xdocs/usermanual/properties_reference.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/properties_reference.xml?rev=1808598=1808597=1808598=diff
==
--- jmeter/trunk/xdocs/usermanual/properties_reference.xml (original)
+++ jmeter/trunk/xdocs/usermanual/properties_reference.xml Sat Sep 16 22:04:53 
2017
@@ -1172,13 +1172,13 @@ JMETER-SERVER
 
 
 
-List of file encoding values
-Defaults to: platform default
-
-
 String to return at EOF (if 
recycle not used).
 Defaults to: EOF
 
+
+List of file encoding values
+Defaults to: platform default
+
 
 
 

svn commit: r1808596 - /jmeter/trunk/bin/templates/jdbc.jmx

[agomes]

Author: agomes
Date: Sat Sep 16 21:57:26 2017
New Revision: 1808596

URL: http://svn.apache.org/viewvc?rev=1808596=rev
Log:
Set "Validation Query" to empty in JDBC Load Test template

Modified:
jmeter/trunk/bin/templates/jdbc.jmx

Modified: jmeter/trunk/bin/templates/jdbc.jmx
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/bin/templates/jdbc.jmx?rev=1808596=1808595=1808596=diff
==
--- jmeter/trunk/bin/templates/jdbc.jmx (original)
+++ jmeter/trunk/bin/templates/jdbc.jmx Sat Sep 16 21:57:26 2017
@@ -13,7 +13,7 @@
 
   
 true
-Select 1
+
 5000
 jdbcConfig
 jdbc:postgresql://hostname:port/dbname

svn commit: r1808595 - in /jmeter/trunk: bin/jmeter.properties src/components/org/apache/jmeter/config/CSVDataSetBeanInfo.java xdocs/changes.xml xdocs/images/screenshots/csvdatasetconfig.png xdocs/use

[agomes]

Author: agomes
Date: Sat Sep 16 21:48:06 2017
New Revision: 1808595

URL: http://svn.apache.org/viewvc?rev=1808595=rev
Log:
BUG61527 - CSV data set config : Add a list for main file encoding values for 
File encoding attribute

Modified:
jmeter/trunk/bin/jmeter.properties
jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetBeanInfo.java
jmeter/trunk/xdocs/changes.xml
jmeter/trunk/xdocs/images/screenshots/csvdatasetconfig.png
jmeter/trunk/xdocs/usermanual/properties_reference.xml

Modified: jmeter/trunk/bin/jmeter.properties
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.properties?rev=1808595=1808594=1808595=diff
==
--- jmeter/trunk/bin/jmeter.properties (original)
+++ jmeter/trunk/bin/jmeter.properties Sat Sep 16 21:48:06 2017
@@ -906,6 +906,9 @@ beanshell.server.file=../extras/startup.
 
 # String to return at EOF (if recycle not used)
 #csvdataset.eofstring=
+#list in 
https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html
+csvdataset.file.encoding=UTF-8|UTF-16|ISO-8859-15|US-ASCII
+
 
 #---
 # LDAP Sampler configuration

Modified: 
jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetBeanInfo.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetBeanInfo.java?rev=1808595=1808594=1808595=diff
==
--- 
jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetBeanInfo.java 
(original)
+++ 
jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetBeanInfo.java 
Sat Sep 16 21:48:06 2017
@@ -23,6 +23,8 @@ import java.beans.PropertyDescriptor;
 import org.apache.jmeter.testbeans.BeanInfoSupport;
 import org.apache.jmeter.testbeans.gui.FileEditor;
 import org.apache.jmeter.testbeans.gui.TypeEditor;
+import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.JOrphanUtils;
 
 public class CSVDataSetBeanInfo extends BeanInfoSupport {
 
@@ -64,10 +66,10 @@ public class CSVDataSetBeanInfo extends
 p.setValue(NOT_EXPRESSION, Boolean.TRUE);
 p.setPropertyEditorClass(FileEditor.class);
 
-p = property(FILE_ENCODING);
+p = property(FILE_ENCODING, TypeEditor.ComboStringEditor);
 p.setValue(NOT_UNDEFINED, Boolean.TRUE);
 p.setValue(DEFAULT, "");//$NON-NLS-1$
-p.setValue(NOT_EXPRESSION, Boolean.TRUE);
+p.setValue(TAGS, getListFileEncoding());
 
 p = property(VARIABLE_NAMES);
 p.setValue(NOT_UNDEFINED, Boolean.TRUE);
@@ -124,4 +126,13 @@ public class CSVDataSetBeanInfo extends
 System.arraycopy(SHARE_TAGS, 0, copy, 0, SHARE_TAGS.length);
 return copy;
 }
+
+/**
+ * Get the mains file encoding
+ * list from 
https://docs.oracle.com/javase/8/docs/technotes/guides/intl/encoding.doc.html
+ * @return a String[] with the list of file encoding
+ */
+private String[] getListFileEncoding() {
+return 
JOrphanUtils.split(JMeterUtils.getPropDefault("csvdataset.file.encoding", ""), 
"|"); //$NON-NLS-1$
+}
 }

Modified: jmeter/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1808595=1808594=1808595=diff
==
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sat Sep 16 21:48:06 2017
@@ -114,6 +114,7 @@ Incorporated feed back about unclear doc
 61525OS Process Sampler : Add browser button to Command and 
Working directory fields
 60156 - TCPSampler : Latency is not measured for TCP 
Sampler. Contributed by Ubik Load Pack (support at ubikloadpack.com)
 61039CSV data set config : Add browser button to Filename 
field
+61527CSV data set config : Add a list for main file 
encoding values for File encoding attribute
 
 
 Controllers

Modified: jmeter/trunk/xdocs/images/screenshots/csvdatasetconfig.png
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/images/screenshots/csvdatasetconfig.png?rev=1808595=1808594=1808595=diff
==
Binary files - no diff available.

Modified: jmeter/trunk/xdocs/usermanual/properties_reference.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/properties_reference.xml?rev=1808595=1808594=1808595=diff
==
--- jmeter/trunk/xdocs/usermanual/properties_reference.xml (original)
+++ jmeter/trunk/xdocs/usermanual/properties_reference.xml Sat Sep 16 21:48:06 
2017
@@ -1172,6 +1172,10 @@ JMETER-SERVER
 
 
 
+List of file encoding values
+Defaults to: platform default
+
+
 String to return at EOF (if 
recycle not used).
 Defaults to: EOF
 

svn commit: r1808587 - in /jmeter/trunk: src/components/org/apache/jmeter/config/CSVDataSetBeanInfo.java xdocs/changes.xml xdocs/images/screenshots/csvdatasetconfig.png

[agomes]

Author: agomes
Date: Sat Sep 16 20:51:26 2017
New Revision: 1808587

URL: http://svn.apache.org/viewvc?rev=1808587=rev
Log:
This closes #309 - CSV data set config : Add browser button to Filename field

Modified:
jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetBeanInfo.java
jmeter/trunk/xdocs/changes.xml
jmeter/trunk/xdocs/images/screenshots/csvdatasetconfig.png

Modified: 
jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetBeanInfo.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetBeanInfo.java?rev=1808587=1808586=1808587=diff
==
--- 
jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetBeanInfo.java 
(original)
+++ 
jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSetBeanInfo.java 
Sat Sep 16 20:51:26 2017
@@ -21,6 +21,7 @@ package org.apache.jmeter.config;
 import java.beans.PropertyDescriptor;
 
 import org.apache.jmeter.testbeans.BeanInfoSupport;
+import org.apache.jmeter.testbeans.gui.FileEditor;
 import org.apache.jmeter.testbeans.gui.TypeEditor;
 
 public class CSVDataSetBeanInfo extends BeanInfoSupport {
@@ -61,6 +62,7 @@ public class CSVDataSetBeanInfo extends
 p.setValue(NOT_UNDEFINED, Boolean.TRUE);
 p.setValue(DEFAULT, "");//$NON-NLS-1$
 p.setValue(NOT_EXPRESSION, Boolean.TRUE);
+p.setPropertyEditorClass(FileEditor.class);
 
 p = property(FILE_ENCODING);
 p.setValue(NOT_UNDEFINED, Boolean.TRUE);

Modified: jmeter/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1808587=1808586=1808587=diff
==
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sat Sep 16 20:51:26 2017
@@ -113,6 +113,7 @@ Incorporated feed back about unclear doc
 61507JDBC Connection Configuration : Add a list for main 
databases JDBC driver class name for "JDBC Driver class" attribute
 61525OS Process Sampler : Add browser button to Command and 
Working directory fields
 60156 - TCPSampler : Latency is not measured for TCP 
Sampler. Contributed by Ubik Load Pack (support at ubikloadpack.com)
+61039CSV data set config : Add browser button to Filename 
field
 
 
 Controllers

Modified: jmeter/trunk/xdocs/images/screenshots/csvdatasetconfig.png
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/images/screenshots/csvdatasetconfig.png?rev=1808587=1808586=1808587=diff
==
Binary files - no diff available.

svn commit: r1808479 - in /jmeter/trunk: src/protocol/native/org/apache/jmeter/protocol/system/gui/SystemSamplerGui.java xdocs/changes.xml xdocs/images/screenshots/os_process_sampler.png

[agomes]

Author: agomes
Date: Fri Sep 15 19:03:49 2017
New Revision: 1808479

URL: http://svn.apache.org/viewvc?rev=1808479=rev
Log:
This closes #307 : OS Process Sampler : Add browser button to Command and 
Working directory fields

Modified:

jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/gui/SystemSamplerGui.java
jmeter/trunk/xdocs/changes.xml
jmeter/trunk/xdocs/images/screenshots/os_process_sampler.png

Modified: 
jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/gui/SystemSamplerGui.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/gui/SystemSamplerGui.java?rev=1808479=1808478=1808479=diff
==
--- 
jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/gui/SystemSamplerGui.java
 (original)
+++ 
jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/gui/SystemSamplerGui.java
 Fri Sep 15 19:03:49 2017
@@ -60,8 +60,8 @@ public class SystemSamplerGui extends Ab
 private final FilePanelEntry stdin = new 
FilePanelEntry(JMeterUtils.getResString("system_sampler_stdin")); // $NON-NLS-1$
 private final FilePanelEntry stdout = new 
FilePanelEntry(JMeterUtils.getResString("system_sampler_stdout")); // 
$NON-NLS-1$
 private final FilePanelEntry stderr = new 
FilePanelEntry(JMeterUtils.getResString("system_sampler_stderr")); // 
$NON-NLS-1$
-private JLabeledTextField directory;
-private JLabeledTextField command;
+private final FilePanelEntry directory = new 
FilePanelEntry(JMeterUtils.getResString("directory_field_title"), true); // 
$NON-NLS-1$
+private final FilePanelEntry command = new 
FilePanelEntry(JMeterUtils.getResString("command_field_title")); // $NON-NLS-1$
 private JLabeledTextField timeout;
 private ArgumentsPanel argsPanel;
 private ArgumentsPanel envPanel;
@@ -123,10 +123,10 @@ public class SystemSamplerGui extends Ab
 } else {
 
systemSampler.setExpectedReturnCode(SystemSampler.DEFAULT_RETURN_CODE);
 }
-systemSampler.setCommand(command.getText());
+systemSampler.setCommand(command.getFilename());
 systemSampler.setArguments((Arguments)argsPanel.createTestElement());
 
systemSampler.setEnvironmentVariables((Arguments)envPanel.createTestElement());
-systemSampler.setDirectory(directory.getText());
+systemSampler.setDirectory(directory.getFilename());
 systemSampler.setStdin(stdin.getFilename());
 systemSampler.setStdout(stdout.getFilename());
 systemSampler.setStderr(stderr.getFilename());
@@ -147,10 +147,10 @@ public class SystemSamplerGui extends Ab
 checkReturnCode.setSelected(systemSampler.getCheckReturnCode());
 
desiredReturnCode.setText(Integer.toString(systemSampler.getExpectedReturnCode()));
 desiredReturnCode.setEnabled(checkReturnCode.isSelected());
-command.setText(systemSampler.getCommand());
+command.setFilename(systemSampler.getCommand());
 argsPanel.configure(systemSampler.getArguments());
 envPanel.configure(systemSampler.getEnvironmentVariables());
-directory.setText(systemSampler.getDirectory());
+directory.setFilename(systemSampler.getDirectory());
 stdin.setFilename(systemSampler.getStdin());
 stdout.setFilename(systemSampler.getStdout());
 stderr.setFilename(systemSampler.getStderr());
@@ -201,12 +201,10 @@ public class SystemSamplerGui extends Ab
 cmdPanel.setLayout(new BoxLayout(cmdPanel, BoxLayout.X_AXIS));
 
 JPanel cmdWkDirPane = new JPanel(new BorderLayout());
-command = new 
JLabeledTextField(JMeterUtils.getResString("command_field_title")); // 
$NON-NLS-1$
-cmdWkDirPane.add(command, BorderLayout.CENTER);
-directory = new 
JLabeledTextField(JMeterUtils.getResString("directory_field_title")); // 
$NON-NLS-1$
-cmdWkDirPane.add(directory, BorderLayout.EAST);
+cmdWkDirPane.add(command, BorderLayout.NORTH);
+cmdWkDirPane.add(directory, BorderLayout.SOUTH);
 cmdPanel.add(cmdWkDirPane);
-
+
 JPanel panel = new VerticalPanel();
 panel.setBorder(BorderFactory.createTitledBorder(
 BorderFactory.createEtchedBorder(),
@@ -216,6 +214,7 @@ public class SystemSamplerGui extends Ab
 panel.add(makeEnvironmentPanel(), BorderLayout.SOUTH);
 return panel;
 }
+
 
 /**
  * @return JPanel Arguments Panel
@@ -260,8 +259,8 @@ public class SystemSamplerGui extends Ab
 @Override
 public void clearGui() {
 super.clearGui();
-directory.setText(""); // $NON-NLS-1$
-command.setText(""); // $NON-NLS-1$
+directory.clearGui();
+command.clearGui();
 argsPanel.clearGui();
 envPanel.clearG

svn commit: r1807785 - /jmeter/trunk/src/components/org/apache/jmeter/gui/action/ExportTransactionAndSamplerNames.java

[agomes]

Author: agomes
Date: Fri Sep  8 17:00:55 2017
New Revision: 1807785

URL: http://svn.apache.org/viewvc?rev=1807785=rev
Log:
Fix bad label in org.apache.jmeter.gui.action.ExportTransactionAndSamplerNames

Modified:

jmeter/trunk/src/components/org/apache/jmeter/gui/action/ExportTransactionAndSamplerNames.java

Modified: 
jmeter/trunk/src/components/org/apache/jmeter/gui/action/ExportTransactionAndSamplerNames.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/gui/action/ExportTransactionAndSamplerNames.java?rev=1807785=1807784=1807785=diff
==
--- 
jmeter/trunk/src/components/org/apache/jmeter/gui/action/ExportTransactionAndSamplerNames.java
 (original)
+++ 
jmeter/trunk/src/components/org/apache/jmeter/gui/action/ExportTransactionAndSamplerNames.java
 Fri Sep  8 17:00:55 2017
@@ -69,7 +69,7 @@ public class ExportTransactionAndSampler
 
 private static final Set commands = new HashSet<>();
 
-private static final String EXPORT_NAMES = "export_trans_names";
+private static final String EXPORT_NAMES = "export_transactions_menu";
 
 
 static {

svn commit: r1807766 - /jmeter/trunk/xdocs/changes.xml

[agomes]

Author: agomes
Date: Fri Sep  8 14:17:42 2017
New Revision: 1807766

URL: http://svn.apache.org/viewvc?rev=1807766=rev
Log:
agomes : Add bug id in changes.xml for all my commit

Modified:
jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1807766=1807765=1807766=diff
==
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Fri Sep  8 14:17:42 2017
@@ -103,10 +103,10 @@ Incorporated feed back about unclear doc
 Other samplers
 
 61320Test Action : Set duration to 0 by 
default
-JDBC Connection Configuration : Set Max Number of Connections to 
0 by default
-JDBC Connection Configuration : Set "Validation Query" to 
empty by default to use isValid method of JDBC driver
-JDBC Connection Configuration : Add a list for main databases 
validation queries for "Validation Query" attribute
-JDBC Connection Configuration : Add a list for main databases JDBC 
driver class name for "JDBC Driver class" attribute
+61504JDBC Connection Configuration : Set Max Number of 
Connections to 0 by default
+61505JDBC Connection Configuration : Set "Validation Query" 
to empty by default to use isValid method of JDBC driver
+61506JDBC Connection Configuration : Add a list for main 
databases validation queries for "Validation Query" attribute
+61507JDBC Connection Configuration : Add a list for main 
databases JDBC driver class name for "JDBC Driver class" attribute
 60156 - TCPSampler : Latency is not measured for TCP 
Sampler. Contributed by Ubik Load Pack (support at ubikloadpack.com)
 
 
@@ -131,12 +131,12 @@ Incorporated feed back about unclear doc
 
 61040Add a time shifting function
 61126Function Helper Dialog : Add a field that shows 
execution result
-Add a random date within a specific date range function
+61508Add a random date within a specific date range 
function
 
 
 I18N
 
-Better label/translation/documentation for labels start and max for 
Counter element
+61509Better label/translation/documentation for labels 
start and max for Counter element
 
 
 Report / Dashboard
@@ -148,7 +148,7 @@ Incorporated feed back about unclear doc
 
 When looking for classes in ActionRouter, fall back to 
location of the jar,
where ActionRouter is loaded from. Provided by Emilian 
Bold (emi at apache.org)
-Set 'Max Number of Connections' to 0 into 'JDBC Connection 
Configuration' for the 'JDBC Load Test template'
+61510Set 'Max Number of Connections' to 0 into 'JDBC 
Connection Configuration' for the 'JDBC Load Test template'
 61399Make some bin and extras scripts Shellcheck 
compatible. Contributed by Wolfgang Wagner (internetwolf2000 at 
hotmail.com)
 
 

svn commit: r1807583 - in /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/gui/ xdo

[agomes]

Author: agomes
Date: Thu Sep  7 10:33:30 2017
New Revision: 1807583

URL: http://svn.apache.org/viewvc?rev=1807583=rev
Log:
This closes #61492 : Add the possibility to change the value of proxy.pause in 
the HTTP(S) Test Script Recorder GUI

Modified:
jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties

jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java

jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
jmeter/trunk/xdocs/changes.xml
jmeter/trunk/xdocs/images/screenshots/proxy_control.png

Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=1807583=1807582=1807583=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Thu 
Sep  7 10:33:30 2017
@@ -777,11 +777,14 @@ proxy_domains_dynamic_mode_tooltip_java6
 proxy_general_lifecycle=State
 proxy_general_settings=Global Settings
 proxy_headers=Capture HTTP Headers
+proxy_pause_http_sampler=Create new transaction after request (ms)\:
 proxy_prefix_http_sampler_name=Prefix\:
 proxy_regex=Regex matching
 proxy_sampler_settings=HTTP Sampler settings
 proxy_sampler_type=Type\:
 proxy_separators=Add Separators
+proxy_settings_pause_error_digits=Only digits allowed
+proxy_settings_pause_error_invalid_data=Invalid data
 proxy_settings_port_error_digits=Only digits allowed
 proxy_settings_port_error_invalid_data=Invalid data
 proxy_target=Target Controller\:

Modified: 
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties?rev=1807583=1807582=1807583=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties 
Thu Sep  7 10:33:30 2017
@@ -767,11 +767,14 @@ proxy_domains_dynamic_mode_tooltip_java6
 proxy_general_lifecycle=Etat
 proxy_general_settings=Param\u00E8tres g\u00E9n\u00E9raux
 proxy_headers=Capturer les ent\u00EAtes HTTP
+proxy_pause_http_sampler=Cr\u00E9er une nouvelle transaction apr\u00E8s la 
requ\u00EAte (ms) \:
 proxy_prefix_http_sampler_name=Pr\u00E9fixe \:
 proxy_regex=Correspondance des variables par regex ?
 proxy_sampler_settings=Param\u00E8tres Echantillon HTTP
 proxy_sampler_type=Type \:
 proxy_separators=Ajouter des s\u00E9parateurs
+proxy_settings_pause_error_digits=Seuls les chiffres sont autoris\u00E9s.
+proxy_settings_pause_error_invalid_data=Donn\u00E9es invalides
 proxy_settings_port_error_digits=Seuls les chiffres sont autoris\u00E9s.
 proxy_settings_port_error_invalid_data=Donn\u00E9es invalides
 proxy_target=Contr\u00F4leur Cible \:

Modified: 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java?rev=1807583=1807582=1807583=diff
==
--- 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
 (original)
+++ 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
 Thu Sep  7 10:33:30 2017
@@ -158,6 +158,8 @@ public class ProxyControl extends Generi
 private static final String SAMPLER_DOWNLOAD_IMAGES = 
"ProxyControlGui.sampler_download_images"; // $NON-NLS-1$
 
 private static final String PREFIX_HTTP_SAMPLER_NAME = 
"ProxyControlGui.proxy_prefix_http_sampler_name"; // $NON-NLS-1$
+
+private static final String PROXY_PAUSE_HTTP_SAMPLER = 
"ProxyControlGui.proxy_pause_http_sampler"; // $NON-NLS-1$
 
 private static final String REGEX_MATCH = "ProxyControlGui.regex_match"; 
// $NON-NLS-1$
 
@@ -185,8 +187,7 @@ public class ProxyControl extends Generi
 private static final String SAMPLER_TYPE_HTTP_SAMPLER_HC3_1 = "1";
 private static final String SAMPLER_TYPE_HTTP_SAMPLER_HC4 = "2";
 
-private static final long SAMPLE_GAP =
-JMeterUtils.getPropDefault("proxy.pause", 5000); // $NON-NLS-1$
+private long sampleGap; // $NON-NLS-1$
 // Detect if user has pressed a new link
 
 // for ssl connection
@@ -392,6 +393,10 @@ public class ProxyControl extends Generi
 public void setPrefixHTTPSampleName(String prefixHTTPSampleName) {
 setProperty(PREFIX_HTTP_SAMPLER_NAME, prefixHTTPSampleName);
 }
+   

svn commit: r1807399 - in /jmeter/trunk: src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java xdocs/changes.xml

[agomes]

Author: agomes
Date: Tue Sep  5 20:35:45 2017
New Revision: 1807399

URL: http://svn.apache.org/viewvc?rev=1807399=rev
Log:
Revert my commit : Enable restart when prefix is modified in proxy recorder

Modified:

jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
jmeter/trunk/xdocs/changes.xml

Modified: 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java?rev=1807399=1807398=1807399=diff
==
--- 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
 (original)
+++ 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
 Tue Sep  5 20:35:45 2017
@@ -631,7 +631,6 @@ public class ProxyControlGui extends Log
 enableRestart();
 } else if(fieldName.equals(PREFIX_HTTP_SAMPLER_NAME)) {
 model.setPrefixHTTPSampleName(prefixHTTPSampleName.getText());
-enableRestart();
 }
 }
 

Modified: jmeter/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1807399=1807398=1807399=diff
==
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Tue Sep  5 20:35:45 2017
@@ -97,7 +97,6 @@ Incorporated feed back about unclear doc
 
 61056HTTP : Support brotli decoding
 61135CookieManager : Drop Implementation select box and 
cleanup class
-Test Script Recorder : enable proxy restart when prefix is 
modified
 
 
 Other samplers

svn commit: r1807374 - in /jmeter/trunk: src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java xdocs/changes.xml

[agomes]

Author: agomes
Date: Tue Sep  5 17:26:11 2017
New Revision: 1807374

URL: http://svn.apache.org/viewvc?rev=1807374=rev
Log:
Enable restart when prefix is modified in proxy recorder

Modified:

jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
jmeter/trunk/xdocs/changes.xml

Modified: 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java?rev=1807374=1807373=1807374=diff
==
--- 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
 (original)
+++ 
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.java
 Tue Sep  5 17:26:11 2017
@@ -631,6 +631,7 @@ public class ProxyControlGui extends Log
 enableRestart();
 } else if(fieldName.equals(PREFIX_HTTP_SAMPLER_NAME)) {
 model.setPrefixHTTPSampleName(prefixHTTPSampleName.getText());
+enableRestart();
 }
 }
 
@@ -817,7 +818,6 @@ public class ProxyControlGui extends Log
 prefixHTTPSampleName = new JTextField(4);
 prefixHTTPSampleName.addKeyListener(this);
 prefixHTTPSampleName.setName(PREFIX_HTTP_SAMPLER_NAME);
-// TODO Not sure this is needed
 prefixHTTPSampleName.setActionCommand(ENABLE_RESTART);
 JLabel labelPrefix = new 
JLabel(JMeterUtils.getResString("proxy_prefix_http_sampler_name")); // 
$NON-NLS-1$
 labelPrefix.setLabelFor(prefixHTTPSampleName);

Modified: jmeter/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1807374=1807373=1807374=diff
==
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Tue Sep  5 17:26:11 2017
@@ -97,6 +97,7 @@ Incorporated feed back about unclear doc
 
 61056HTTP : Support brotli decoding
 61135CookieManager : Drop Implementation select box and 
cleanup class
+Test Script Recorder : enable proxy restart when prefix is 
modified
 
 
 Other samplers

svn commit: r1807165 - in /jmeter/trunk: src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java xdocs/usermanual/properties_reference.xml

[agomes]

Author: agomes
Date: Sun Sep  3 19:41:04 2017
New Revision: 1807165

URL: http://svn.apache.org/viewvc?rev=1807165=rev
Log:
Add jdbc.config.jdbc.driver.class & jdbc.config.check.query properties in the 
documentation

Modified:

jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
jmeter/trunk/xdocs/usermanual/properties_reference.xml

Modified: 
jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java?rev=1807165=1807164=1807165=diff
==
--- 
jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
 (original)
+++ 
jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
 Sun Sep  3 19:41:04 2017
@@ -146,7 +146,7 @@ public class DataSourceElementBeanInfo e
 }
 
 /**
- * Get the check queris for the main databases
+ * Get the check queries for the main databases
  * Based in 
https://stackoverflow.com/questions/10684244/dbcp-validationquery-for-different-databases
  * @return a String[] with the list of check queries
  */

Modified: jmeter/trunk/xdocs/usermanual/properties_reference.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/properties_reference.xml?rev=1807165=1807164=1807165=diff
==
--- jmeter/trunk/xdocs/usermanual/properties_reference.xml (original)
+++ jmeter/trunk/xdocs/usermanual/properties_reference.xml Sun Sep  3 19:41:04 
2017
@@ -932,6 +932,14 @@ JMETER-SERVER
 Max bytes to store from a CLOB or BLOB in the 
sampler.
 Defaults to: 65536 (bytes)
 
+
+List of queries used to determine if the database is still responding.
+Defaults to: select 1 from INFORMATION_SCHEMA.SYSTEM_USERS|select 1 
from dual|select 1 from sysibm.sysdummy1|select 1|select 1 from 
rdb$database
+
+
+List of JDBC driver class name
+Defaults to: 
com.mysql.jdbc.Driver|org.postgresql.Driver|oracle.jdbc.OracleDriver|com.ingres.jdbc.IngresDriver|com.microsoft.sqlserver.jdbc.SQLServerDriver|com.microsoft.jdbc.sqlserver.SQLServerDriver|org.apache.derby.jdbc.ClientDriver|org.hsqldb.jdbc.JDBCDriver|com.ibm.db2.jcc.DB2Driver|org.apache.derby.jdbc.ClientDriver|org.h2.Driver|org.firebirdsql.jdbc.FBDrivery|org.mariadb.jdbc.Driver|org.sqlite.JDBC|net.sourceforge.jtds.jdbc.Driver
+
 
 
 

svn commit: r1807163 - in /jmeter/trunk: src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java xdocs/usermanual/component_reference.xml

[agomes]

Author: agomes
Date: Sun Sep  3 19:30:56 2017
New Revision: 1807163

URL: http://svn.apache.org/viewvc?rev=1807163=rev
Log:
Add a list for "JDBC Connection Configuration" "Validation Query" attribut. 
Felix remarks 2 implemented

Modified:

jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
jmeter/trunk/xdocs/usermanual/component_reference.xml

Modified: 
jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java?rev=1807163=1807162=1807163=diff
==
--- 
jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
 (original)
+++ 
jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
 Sun Sep  3 19:30:56 2017
@@ -91,7 +91,7 @@ public class DataSourceElementBeanInfo e
 p = property("checkQuery", TypeEditor.ComboStringEditor);
 p.setValue(NOT_UNDEFINED, Boolean.TRUE);
 p.setValue(DEFAULT, "");
-p.setValue(TAGS, 
JOrphanUtils.split(JMeterUtils.getPropDefault("jdbc.config.check.query", ""), 
"|"));
+p.setValue(TAGS, getListCheckQuery());
 p = property("dbUrl");
 p.setValue(NOT_UNDEFINED, Boolean.TRUE);
 p.setValue(DEFAULT, "");
@@ -145,4 +145,13 @@ public class DataSourceElementBeanInfo e
 return 
JOrphanUtils.split(JMeterUtils.getPropDefault("jdbc.config.jdbc.driver.class", 
""), "|"); //$NON-NLS-1$
 }
 
+/**
+ * Get the check queris for the main databases
+ * Based in 
https://stackoverflow.com/questions/10684244/dbcp-validationquery-for-different-databases
+ * @return a String[] with the list of check queries
+ */
+private String[] getListCheckQuery() {
+return 
JOrphanUtils.split(JMeterUtils.getPropDefault("jdbc.config.check.query", ""), 
"|"); //$NON-NLS-1$
+}
+
 }

Modified: jmeter/trunk/xdocs/usermanual/component_reference.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=1807163=1807162=1807163=diff
==
--- jmeter/trunk/xdocs/usermanual/component_reference.xml (original)
+++ jmeter/trunk/xdocs/usermanual/component_reference.xml Sun Sep  3 19:30:56 
2017
@@ -4033,11 +4033,11 @@ instead. (see figures 12 and 13).
   hsqldbselect 1 from 
INFORMATION_SCHEMA.SYSTEM_USERS
   Oracleselect 1 from dual
   DB2select 1 from sysibm.sysdummy1
-  mysqlselect 1
-  microsoft SQL Serverselect 1
-  postgresqlselect 1
-  ingresselect 1
-  derbyvalues 1
+  MySQLselect 1
+  Microsoft SQL Server (MS JDBC driver)select 1
+  PostgreSQLselect 1
+  Ingresselect 1
+  Derbyvalues 1
   H2select 1
   Firebirdselect 1 from rdb$database
 

svn commit: r1807161 - in /jmeter/trunk: bin/ src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/ xdocs/ xdocs/images/screenshots/jdbc-config/ xdocs/usermanual/

[agomes]

Author: agomes
Date: Sun Sep  3 19:23:34 2017
New Revision: 1807161

URL: http://svn.apache.org/viewvc?rev=1807161=rev
Log:
Add a list for "JDBC Connection Configuration" "JDBC Driver class" attribut.

Modified:
jmeter/trunk/bin/jmeter.properties

jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
jmeter/trunk/xdocs/changes.xml
jmeter/trunk/xdocs/images/screenshots/jdbc-config/jdbc-conn-config.png
jmeter/trunk/xdocs/usermanual/component_reference.xml

Modified: jmeter/trunk/bin/jmeter.properties
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.properties?rev=1807161=1807160=1807161=diff
==
--- jmeter/trunk/bin/jmeter.properties (original)
+++ jmeter/trunk/bin/jmeter.properties Sun Sep  3 19:23:34 2017
@@ -717,6 +717,7 @@ wmlParser.types=text/vnd.wap.wml
 # Database validation query
 # based in 
https://stackoverflow.com/questions/10684244/dbcp-validationquery-for-different-databases
 list
 jdbc.config.check.query=select 1 from INFORMATION_SCHEMA.SYSTEM_USERS|select 1 
from dual|select 1 from sysibm.sysdummy1|select 1|select 1 from rdb$database
+jdbc.config.jdbc.driver.class=com.mysql.jdbc.Driver|org.postgresql.Driver|oracle.jdbc.OracleDriver|com.ingres.jdbc.IngresDriver|com.microsoft.sqlserver.jdbc.SQLServerDriver|com.microsoft.jdbc.sqlserver.SQLServerDriver|org.apache.derby.jdbc.ClientDriver|org.hsqldb.jdbc.JDBCDriver|com.ibm.db2.jcc.DB2Driver|org.apache.derby.jdbc.ClientDriver|org.h2.Driver|org.firebirdsql.jdbc.FBDrivery|org.mariadb.jdbc.Driver|org.sqlite.JDBC|net.sourceforge.jtds.jdbc.Driver
 
 #---
 # OS Process Sampler configuration

Modified: 
jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java?rev=1807161=1807160=1807161=diff
==
--- 
jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
 (original)
+++ 
jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
 Sun Sep  3 19:23:34 2017
@@ -95,9 +95,10 @@ public class DataSourceElementBeanInfo e
 p = property("dbUrl");
 p.setValue(NOT_UNDEFINED, Boolean.TRUE);
 p.setValue(DEFAULT, "");
-p = property("driver");
+p = property("driver", TypeEditor.ComboStringEditor);
 p.setValue(NOT_UNDEFINED, Boolean.TRUE);
 p.setValue(DEFAULT, "");
+p.setValue(TAGS, getListJDBCDriverClass());
 p = property("username");
 p.setValue(NOT_UNDEFINED, Boolean.TRUE);
 p.setValue(DEFAULT, "");
@@ -135,4 +136,13 @@ public class DataSourceElementBeanInfo e
 }
 return -1;
 }
+
+/**
+ * Get the list of JDBC driver classname for the main databases
+ * @return a String[] with the list of JDBC driver classname
+ */
+private String[] getListJDBCDriverClass() {
+return 
JOrphanUtils.split(JMeterUtils.getPropDefault("jdbc.config.jdbc.driver.class", 
""), "|"); //$NON-NLS-1$
+}
+
 }

Modified: jmeter/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1807161=1807160=1807161=diff
==
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sun Sep  3 19:23:34 2017
@@ -105,6 +105,7 @@ Incorporated feed back about unclear doc
 JDBC Connection Configuration : Set Max Number of Connections to 
0 by default
 JDBC Connection Configuration : Set "Validation Query" to 
empty by default to use isValid method of JDBC driver
 JDBC Connection Configuration : Add a list for main databases 
validation queries for "Validation Query" attribute
+JDBC Connection Configuration : Add a list for main databases JDBC 
driver class name for "JDBC Driver class" attribute
 
 
 Controllers

Modified: jmeter/trunk/xdocs/images/screenshots/jdbc-config/jdbc-conn-config.png
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/images/screenshots/jdbc-config/jdbc-conn-config.png?rev=1807161=1807160=1807161=diff
==
Binary files - no diff available.

Modified: jmeter/trunk/xdocs/usermanual/component_reference.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=1807161=1807160=1807161=diff
==
--

svn commit: r1807159 - in /jmeter/trunk: src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java xdocs/changes.xml xdocs/usermanual/component_reference.xml

[agomes]

Author: agomes
Date: Sun Sep  3 18:40:36 2017
New Revision: 1807159

URL: http://svn.apache.org/viewvc?rev=1807159=rev
Log:
Add a list for "JDBC Connection Configuration" "Validation Query" attribut. 
Felix remarks implemented

Modified:

jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
jmeter/trunk/xdocs/changes.xml
jmeter/trunk/xdocs/usermanual/component_reference.xml

Modified: 
jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java?rev=1807159=1807158=1807159=diff
==
--- 
jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
 (original)
+++ 
jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
 Sun Sep  3 18:40:36 2017
@@ -90,9 +90,8 @@ public class DataSourceElementBeanInfo e
 p.setValue(DEFAULT, "5000");
 p = property("checkQuery", TypeEditor.ComboStringEditor);
 p.setValue(NOT_UNDEFINED, Boolean.TRUE);
-p.setValue(DEFAULT, "Select 1");
-String[] CHECK_QUERY = getCheckQuery();
-p.setValue(TAGS, CHECK_QUERY);
+p.setValue(DEFAULT, "");
+p.setValue(TAGS, 
JOrphanUtils.split(JMeterUtils.getPropDefault("jdbc.config.check.query", ""), 
"|"));
 p = property("dbUrl");
 p.setValue(NOT_UNDEFINED, Boolean.TRUE);
 p.setValue(DEFAULT, "");
@@ -136,13 +135,4 @@ public class DataSourceElementBeanInfo e
 }
 return -1;
 }
-
-/**
- * Get the check queris for the main databases
- * Based in 
https://stackoverflow.com/questions/10684244/dbcp-validationquery-for-different-databases
- * @return a String[] with the list of check queries
- */
-private String[] getCheckQuery() {
-return 
JOrphanUtils.split(JMeterUtils.getPropDefault("jdbc.config.check.query", ""), 
"|"); //$NON-NLS-1$
-}
 }

Modified: jmeter/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1807159=1807158=1807159=diff
==
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sun Sep  3 18:40:36 2017
@@ -103,6 +103,7 @@ Incorporated feed back about unclear doc
 
 61320Test Action : Set duration to 0 by 
default
 JDBC Connection Configuration : Set Max Number of Connections to 
0 by default
+JDBC Connection Configuration : Set "Validation Query" to 
empty by default to use isValid method of JDBC driver
 JDBC Connection Configuration : Add a list for main databases 
validation queries for "Validation Query" attribute
 
 

Modified: jmeter/trunk/xdocs/usermanual/component_reference.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=1807159=1807158=1807159=diff
==
--- jmeter/trunk/xdocs/usermanual/component_reference.xml (original)
+++ jmeter/trunk/xdocs/usermanual/component_reference.xml Sun Sep  3 18:40:36 
2017
@@ -4029,19 +4029,19 @@ instead. (see figures 12 and 13).
 This defaults to the 'isValid()' method of the jdbc 
driver, which is suitable for many databases.
 However some may require a different query; for example Oracle 
something like 'SELECT 1 FROM DUAL' could be used.
 The list of the validation queries can be configured with 
jdbc.config.check.query property and are by default:
-
-  hsqldb - select 1 from INFORMATION_SCHEMA.SYSTEM_USERS
-  Oracle - select 1 from dual
-  DB2 - select 1 from sysibm.sysdummy1
-  mysql - select 1
-  microsoft SQL Server - select 1
-  postgresql - select 1
-  ingres - select 1
-  derby - values 1
-  H2 - select 1
-  Firebird - select 1 from rdb$database
-
-The list come from https://stackoverflow.com/questions/10684244/dbcp-validationquery-for-different-databases;>https://stackoverflow.com/questions/10684244/dbcp-validationquery-for-different-databases
 and it can be incorrect
+
+  hsqldbselect 1 from 
INFORMATION_SCHEMA.SYSTEM_USERS
+  Oracleselect 1 from dual
+  DB2select 1 from sysibm.sysdummy1
+  mysqlselect 1
+  microsoft SQL Serverselect 1
+  postgresqlselect 1
+  ingresselect 1
+  derbyvalues 1
+  H2sel

svn commit: r1807103 - in /jmeter/trunk: bin/jmeter.properties src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java xdocs/changes.xml xdocs/usermanual/component_refe

[agomes]

Author: agomes
Date: Sat Sep  2 22:15:28 2017
New Revision: 1807103

URL: http://svn.apache.org/viewvc?rev=1807103=rev
Log:
Add a list for "JDBC Connection Configuration" "Validation Query" attribut. 
Screenshot later after I modified another attribute

Modified:
jmeter/trunk/bin/jmeter.properties

jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
jmeter/trunk/xdocs/changes.xml
jmeter/trunk/xdocs/usermanual/component_reference.xml

Modified: jmeter/trunk/bin/jmeter.properties
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.properties?rev=1807103=1807102=1807103=diff
==
--- jmeter/trunk/bin/jmeter.properties (original)
+++ jmeter/trunk/bin/jmeter.properties Sat Sep  2 22:15:28 2017
@@ -714,6 +714,10 @@ wmlParser.types=text/vnd.wap.wml
 # Max size of BLOBs and CLOBs to store in JDBC sampler. Result will be cut off
 #jdbcsampler.max_retain_result_size=65536
 
+# Database validation query
+# based in 
https://stackoverflow.com/questions/10684244/dbcp-validationquery-for-different-databases
 list
+jdbc.config.check.query=select 1 from INFORMATION_SCHEMA.SYSTEM_USERS|select 1 
from dual|select 1 from sysibm.sysdummy1|select 1|select 1 from rdb$database
+
 #---
 # OS Process Sampler configuration
 #---

Modified: 
jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java?rev=1807103=1807102=1807103=diff
==
--- 
jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
 (original)
+++ 
jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
 Sat Sep  2 22:15:28 2017
@@ -30,6 +30,8 @@ import java.util.Set;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.jmeter.testbeans.BeanInfoSupport;
 import org.apache.jmeter.testbeans.gui.TypeEditor;
+import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.util.JOrphanUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -86,9 +88,11 @@ public class DataSourceElementBeanInfo e
 p = property("connectionAge");
 p.setValue(NOT_UNDEFINED, Boolean.TRUE);
 p.setValue(DEFAULT, "5000");
-p = property("checkQuery");
+p = property("checkQuery", TypeEditor.ComboStringEditor);
 p.setValue(NOT_UNDEFINED, Boolean.TRUE);
 p.setValue(DEFAULT, "Select 1");
+String[] CHECK_QUERY = getCheckQuery();
+p.setValue(TAGS, CHECK_QUERY);
 p = property("dbUrl");
 p.setValue(NOT_UNDEFINED, Boolean.TRUE);
 p.setValue(DEFAULT, "");
@@ -132,4 +136,13 @@ public class DataSourceElementBeanInfo e
 }
 return -1;
 }
+
+/**
+ * Get the check queris for the main databases
+ * Based in 
https://stackoverflow.com/questions/10684244/dbcp-validationquery-for-different-databases
+ * @return a String[] with the list of check queries
+ */
+private String[] getCheckQuery() {
+return 
JOrphanUtils.split(JMeterUtils.getPropDefault("jdbc.config.check.query", ""), 
"|"); //$NON-NLS-1$
+}
 }

Modified: jmeter/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1807103=1807102=1807103=diff
==
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sat Sep  2 22:15:28 2017
@@ -103,6 +103,7 @@ Incorporated feed back about unclear doc
 
 61320Test Action : Set duration to 0 by 
default
 JDBC Connection Configuration : Set Max Number of Connections to 
0 by default
+JDBC Connection Configuration : Add a list for main databases 
validation queries for "Validation Query" attribute
 
 
 Controllers

Modified: jmeter/trunk/xdocs/usermanual/component_reference.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=1807103=1807102=1807103=diff
==
--- jmeter/trunk/xdocs/usermanual/component_reference.xml (original)
+++ jmeter/trunk/xdocs/usermanual/component_reference.xml Sat Sep  2 22:15:28 
2017
@@ -4028,6 +4028,20 @@ instead. (see figures 12 and 13).
 A simple query used to 
determine if the database is still responding.
 This defaults to the 'isValid()' method of the jdbc 
driver, whi

svn commit: r1807052 - /jmeter/trunk/test/src/org/apache/jmeter/functions/TestSimpleFunctions.java

[agomes]

Author: agomes
Date: Sat Sep  2 14:44:25 2017
New Revision: 1807052

URL: http://svn.apache.org/viewvc?rev=1807052=rev
Log:
Add 2 unitary test to UnEscapeHtml function

Modified:
jmeter/trunk/test/src/org/apache/jmeter/functions/TestSimpleFunctions.java

Modified: 
jmeter/trunk/test/src/org/apache/jmeter/functions/TestSimpleFunctions.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/functions/TestSimpleFunctions.java?rev=1807052=1807051=1807052=diff
==
--- jmeter/trunk/test/src/org/apache/jmeter/functions/TestSimpleFunctions.java 
(original)
+++ jmeter/trunk/test/src/org/apache/jmeter/functions/TestSimpleFunctions.java 
Sat Sep  2 14:44:25 2017
@@ -132,6 +132,24 @@ public class TestSimpleFunctions extends
 }
 
 @Test
+public void testUnEscapeHtml2() throws Exception {
+AbstractFunction function = new UnEscapeHtml();
+params.add(new CompoundVariable("Franais"));
+function.setParameters(params);
+String ret = function.execute(result, null);
+assertEquals("<Français>", ret);
+}
+
+@Test
+public void testUnEscapeHtml3() throws Exception {
+AbstractFunction function = new UnEscapeHtml();
+params.add(new CompoundVariable("x"));
+function.setParameters(params);
+String ret = function.execute(result, null);
+assertEquals(">x", ret);
+}
+
+@Test
 public void testEscapeXml() throws Exception {
 AbstractFunction function = new EscapeXml();
 params.add(new CompoundVariable("\"bread\" & <'butter'>"));

svn commit: r1806927 - /jmeter/trunk/src/functions/org/apache/jmeter/functions/RandomDate.java

[agomes]

Author: agomes
Date: Fri Sep  1 10:32:54 2017
New Revision: 1806927

URL: http://svn.apache.org/viewvc?rev=1806927=rev
Log:
Add a random date within a specific date range function : Fix checkstyle File 
does not end with a newline

Modified:
jmeter/trunk/src/functions/org/apache/jmeter/functions/RandomDate.java

Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/RandomDate.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/RandomDate.java?rev=1806927=1806926=1806927=diff
==
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/RandomDate.java 
(original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/RandomDate.java Fri 
Sep  1 10:32:54 2017
@@ -241,3 +241,4 @@ public class RandomDate extends Abstract
 }
 
 }
+

svn commit: r1806912 - /jmeter/trunk/test/src/org/apache/jmeter/functions/TestTimeRandomDateFunction.java

[agomes]

Author: agomes
Date: Fri Sep  1 09:33:03 2017
New Revision: 1806912

URL: http://svn.apache.org/viewvc?rev=1806912=rev
Log:
Add a random date within a specific date range function : Add the ASF header

Modified:

jmeter/trunk/test/src/org/apache/jmeter/functions/TestTimeRandomDateFunction.java

Modified: 
jmeter/trunk/test/src/org/apache/jmeter/functions/TestTimeRandomDateFunction.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/functions/TestTimeRandomDateFunction.java?rev=1806912=1806911=1806912=diff
==
--- 
jmeter/trunk/test/src/org/apache/jmeter/functions/TestTimeRandomDateFunction.java
 (original)
+++ 
jmeter/trunk/test/src/org/apache/jmeter/functions/TestTimeRandomDateFunction.java
 Fri Sep  1 09:33:03 2017
@@ -1,3 +1,21 @@
+/*
+ * 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"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *   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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ */
+
 package org.apache.jmeter.functions;
 
 import static org.apache.jmeter.functions.FunctionTestHelper.makeParams;

svn commit: r1806899 - in /jmeter/trunk: src/functions/org/apache/jmeter/functions/RandomDate.java test/src/org/apache/jmeter/functions/TestTimeRandomDateFunction.java

[agomes]

Author: agomes
Date: Fri Sep  1 08:49:46 2017
New Revision: 1806899

URL: http://svn.apache.org/viewvc?rev=1806899=rev
Log:
Add a random date within a specific date range function : forget to commit some 
files

Added:
jmeter/trunk/src/functions/org/apache/jmeter/functions/RandomDate.java

jmeter/trunk/test/src/org/apache/jmeter/functions/TestTimeRandomDateFunction.java

Added: jmeter/trunk/src/functions/org/apache/jmeter/functions/RandomDate.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/RandomDate.java?rev=1806899=auto
==
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/RandomDate.java 
(added)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/RandomDate.java Fri 
Sep  1 08:49:46 2017
@@ -0,0 +1,243 @@
+/*
+ * 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"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *   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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+
+package org.apache.jmeter.functions;
+
+import java.time.LocalDate;
+import java.time.Year;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeFormatterBuilder;
+import java.time.format.DateTimeParseException;
+import java.time.temporal.ChronoField;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Locale;
+import java.util.concurrent.ThreadLocalRandom;
+
+import org.apache.commons.lang3.LocaleUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.jmeter.engine.util.CompoundVariable;
+import org.apache.jmeter.samplers.SampleResult;
+import org.apache.jmeter.samplers.Sampler;
+import org.apache.jmeter.threads.JMeterVariables;
+import org.apache.jmeter.util.JMeterUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.github.benmanes.caffeine.cache.Cache;
+import com.github.benmanes.caffeine.cache.Caffeine;
+
+/**
+ * RandomDate Function permit to generate a date in a specific range
+ *
+ * Parameters: - Time format @see 
https://docs.oracle.com/javase/8/docs/api/java
+ * ime/format/DateTimeFormatter.html (optional - default -MM-dd) - Start
+ * date formated as first param (optional - defaults now) - End date - a string
+ * of the locale for the format ( optional ) - variable name ( optional )
+ *
+ * Returns: a formatted date with the specified number of (days, month, year) -
+ * value is also saved in the variable for later re-use.
+ * 
+ * @since 3.3
+ */
+
+public class RandomDate extends AbstractFunction {
+
+private static final Logger log = 
LoggerFactory.getLogger(RandomDate.class);
+
+private static final String KEY = "__RandomDate"; // $NON-NLS-1$
+
+private static final int MIN_PARAMETER_COUNT = 1;
+
+private static final int MAX_PARAMETER_COUNT = 5;
+
+private static final List desc = 
Arrays.asList(JMeterUtils.getResString("time_format_random"),
+JMeterUtils.getResString("date_start"), 
JMeterUtils.getResString("date_end"),
+JMeterUtils.getResString("locale_format"), 
JMeterUtils.getResString("function_name_paropt"));
+
+// Ensure that these are set, even if no parameters are provided
+private String format = ""; //$NON-NLS-1$
+private Locale locale = JMeterUtils.getLocale(); // $NON-NLS-1$
+private String variableName = ""; //$NON-NLS-1$
+private ZoneId systemDefaultZoneID = ZoneId.systemDefault(); // $NON-NLS-1$
+private String dateStart; // $NON-NLS-1$
+private String dateEnd; // $NON-NLS-1$
+private Object[] values;
+
+private static final class LocaleFormatObject {
+
+private String format;
+private Locale locale;
+
+public LocaleFormatObject(String format, Locale locale) {
+this.format = format;
+this.locale = locale;
+}
+
+public String getFormat() {
+return format;
+}
+
+public Locale getLocale() {
+return locale;
+}
+
+@Override
+public int hashCode() {
+return format.hashCode() + locale.hashCode();
+}
+
+@Override
+public boolean equals(Obje

svn commit: r1806898 - in /jmeter/trunk: src/core/org/apache/jmeter/resources/messages.properties src/core/org/apache/jmeter/resources/messages_fr.properties xdocs/changes.xml xdocs/usermanual/functio

[agomes]

Author: agomes
Date: Fri Sep  1 08:48:32 2017
New Revision: 1806898

URL: http://svn.apache.org/viewvc?rev=1806898=rev
Log:
This closes #303 : Add a random date within a specific date range function

Modified:
jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
jmeter/trunk/xdocs/changes.xml
jmeter/trunk/xdocs/usermanual/functions.xml

Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=1806898=1806897=1806898=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Fri 
Sep  1 08:48:32 2017
@@ -243,6 +243,8 @@ database_sql_query_title=JDBC SQL Query
 database_testing_title=JDBC Request
 database_url=JDBC URL\:
 database_url_jdbc_props=Database URL and JDBC Driver
+date_end=End date
+date_start=Start date (optional) (default: now)
 date_to_shift=Date to shift (optional) (default \: now )
 ddn=DN
 de=German
@@ -1185,6 +1187,7 @@ throughput_control_perthread_label=Per U
 throughput_control_title=Throughput Controller
 throughput_control_tplabel=Throughput
 time_format=Format string for SimpleDateFormat (optional)
+time_format_random=Format string for DateTimeFormatter (optional) (default 
-MM-dd)
 time_format_shift=Format string for DateTimeFormatter (optional) ( default 
unix timestamp in millisecond )
 timelim=Time limit
 timeout_config_box_title=Timeout configuration

Modified: 
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties?rev=1806898=1806897=1806898=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties 
Fri Sep  1 08:48:32 2017
@@ -238,6 +238,8 @@ database_sql_query_title=Requ\u00EAte SQ
 database_testing_title=Requ\u221A\u2122te JDBC
 database_url=URL JDBC\:
 database_url_jdbc_props=URL et driver JDBC de la base de donn\u221A\u00A9es
+date_end=Date de fin
+date_start=Date de d\u00E9but (d\u00E9faut \: maintenant) (optionnel)
 date_to_shift=Date sur laquelle on applique le d\u00E9callage (optionnel) 
(d\u00E9faut \: maintenant )
 ddn=DN \:
 de=Allemand
@@ -1175,6 +1177,7 @@ throughput_control_perthread_label=Par u
 throughput_control_title=Contr\u00F4leur D\u00E9bit
 throughput_control_tplabel=D\u00E9bit \:
 time_format=Cha\u00EEne de formatage sur le mod\u00E8le SimpleDateFormat 
(optionnel)
+time_format_random=Cha\u00EEne de formatage sur le mod\u00E8le 
DateTimeFormatter (optionnel) ( d\u00E9faut \: -MM-dd )
 time_format_shift=Cha\u00EEne de formatage sur le mod\u00E8le 
DateTimeFormatter (optionnel) ( d\u00E9faut \: unix timestamp en millisecondes )
 timelim=Limiter le temps de r\u00E9ponses \u00E0 (ms)
 timeout_config_box_title=Configuration du d\u00E9lai d'expiration

Modified: jmeter/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1806898=1806897=1806898=diff
==
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Fri Sep  1 08:48:32 2017
@@ -126,6 +126,7 @@ Incorporated feed back about unclear doc
 
 61040Add a time shifting function
 61126Function Helper Dialog : Add a field that shows 
execution result
+Add a random date within a specific date range function
 
 
 I18N

Modified: jmeter/trunk/xdocs/usermanual/functions.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/functions.xml?rev=1806898=1806897=1806898=diff
==
--- jmeter/trunk/xdocs/usermanual/functions.xml (original)
+++ jmeter/trunk/xdocs/usermanual/functions.xml Fri Sep  1 08:48:32 2017
@@ -123,6 +123,7 @@ Alternatively, just use / i
 Calculation intSumadd int numbers1.8.1
 Calculation longSumadd long numbers2.3.2
 Calculation Randomgenerate a random 
number1.9
+Calculation RandomDategenerate random date within a 
specific date range3.3
 Calculation RandomFromMultipleVarsextracts an 
element from the values of a set of variables separated by 
|3.1
 Calculation RandomStringgenerate a random 
string2.6
 Calculation UUIDgenerate a random type 4 
UUID2.9
@@ -638,6 +639,27 @@ the comma after 7 is escape
 
 
 
+
+The randomDate function returns a random date that lies 
between the given start date and end date values.
+
+
+Format string

svn commit: r1804654 - /jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties

[agomes]

Author: agomes
Date: Thu Aug 10 10:05:44 2017
New Revision: 1804654

URL: http://svn.apache.org/viewvc?rev=1804654=rev
Log:
Fix French typo in time_format

Modified:
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties

Modified: 
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties?rev=1804654=1804653=1804654=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties 
Thu Aug 10 10:05:44 2017
@@ -1174,7 +1174,7 @@ throughput_control_bypercent_label=Pourc
 throughput_control_perthread_label=Par utilisateur
 throughput_control_title=Contr\u00F4leur D\u00E9bit
 throughput_control_tplabel=D\u00E9bit \:
-time_format=Cha00EEne de formatage sur le mod\u00E8le SimpleDateFormat 
(optionnel)
+time_format=Cha\u00EEne de formatage sur le mod\u00E8le SimpleDateFormat 
(optionnel)
 time_format_shift=Cha\u00EEne de formatage sur le mod\u00E8le 
DateTimeFormatter (optionnel) ( d\u00E9faut \: unix timestamp en millisecondes )
 timelim=Limiter le temps de r\u00E9ponses \u00E0 (ms)
 timeout_config_box_title=Configuration du d\u00E9lai d'expiration

svn commit: r1804400 - in /jmeter/trunk: src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java xdocs/changes.xml

[agomes]

Author: agomes
Date: Tue Aug  8 11:18:37 2017
New Revision: 1804400

URL: http://svn.apache.org/viewvc?rev=1804400=rev
Log:
JDBC Connection Configuration : Set Max Number of Connections to 0 by default

Modified:

jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
jmeter/trunk/xdocs/changes.xml

Modified: 
jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java?rev=1804400=1804399=1804400=diff
==
--- 
jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
 (original)
+++ 
jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
 Tue Aug  8 11:18:37 2017
@@ -63,7 +63,7 @@ public class DataSourceElementBeanInfo e
 p.setValue(DEFAULT, "");
 p = property("poolMax");
 p.setValue(NOT_UNDEFINED, Boolean.TRUE);
-p.setValue(DEFAULT, "10");
+p.setValue(DEFAULT, "0");
 p = property("timeout");
 p.setValue(NOT_UNDEFINED, Boolean.TRUE);
 p.setValue(DEFAULT, "1");

Modified: jmeter/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1804400=1804399=1804400=diff
==
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Tue Aug  8 11:18:37 2017
@@ -102,6 +102,7 @@ Incorporated feed back about unclear doc
 Other samplers
 
 61320Test Action : Set duration to 0 by 
default
+JDBC Connection Configuration : Set Max Number of Connections to 
0 by default
 
 
 Controllers

svn commit: r1804380 - in /jmeter/trunk: src/components/org/apache/jmeter/modifiers/gui/ src/core/org/apache/jmeter/resources/ xdocs/ xdocs/images/screenshots/ xdocs/usermanual/

[agomes]

Author: agomes
Date: Tue Aug  8 08:17:54 2017
New Revision: 1804380

URL: http://svn.apache.org/viewvc?rev=1804380=rev
Log:
Better label/translation/documentation for labels start and max for Counter 
element

Modified:

jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java
jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_es.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_pt_BR.properties
jmeter/trunk/xdocs/changes.xml
jmeter/trunk/xdocs/images/screenshots/counter.png
jmeter/trunk/xdocs/usermanual/component_reference.xml

Modified: 
jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java?rev=1804380=1804379=1804380=diff
==
--- 
jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java
 (original)
+++ 
jmeter/trunk/src/components/org/apache/jmeter/modifiers/gui/CounterConfigGui.java
 Tue Aug  8 08:17:54 2017
@@ -122,9 +122,9 @@ public class CounterConfigGui extends Ab
 setBorder(makeBorder());
 setLayout(new VerticalLayout(5, VerticalLayout.BOTH));
 
-startField = new 
JLabeledTextField(JMeterUtils.getResString("start"));//$NON-NLS-1$
+startField = new 
JLabeledTextField(JMeterUtils.getResString("start_value"));//$NON-NLS-1$
 incrField = new 
JLabeledTextField(JMeterUtils.getResString("increment"));//$NON-NLS-1$
-endField = new 
JLabeledTextField(JMeterUtils.getResString("max"));//$NON-NLS-1$
+endField = new 
JLabeledTextField(JMeterUtils.getResString("max_value"));//$NON-NLS-1$
 varNameField = new 
JLabeledTextField(JMeterUtils.getResString("var_name"));//$NON-NLS-1$
 formatField = new 
JLabeledTextField(JMeterUtils.getResString("format"));//$NON-NLS-1$
 perUserField = new 
JCheckBox(JMeterUtils.getResString("counter_per_user"));//$NON-NLS-1$

Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=1804380=1804379=1804380=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Tue 
Aug  8 08:17:54 2017
@@ -650,6 +650,7 @@ mailer_title_smtpserver=SMTP server
 mailer_visualizer_title=Mailer Visualizer
 match_num_field=Match No. (0 for Random)\: 
 max=Maximum
+max_value=Maximum value
 maximum_param=The maximum value allowed for a range of values
 md5hex_assertion_failure=Error asserting MD5 sum : got {0} but should have 
been {1}
 md5hex_assertion_label=MD5Hex
@@ -1101,6 +1102,7 @@ ssl_port=SSL Port
 sslmanager=SSL Manager
 start=Start
 start_no_timers=Start no pauses
+start_value=Starting value
 starttime=Start Time
 stop=Stop
 stopping_test=Shutting down all test threads. You can see number of active 
threads in the upper right corner of GUI. Please be patient. 

Modified: 
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_es.properties
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_es.properties?rev=1804380=1804379=1804380=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_es.properties 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_es.properties 
Tue Aug  8 08:17:54 2017
@@ -452,6 +452,7 @@ mailer_error=No pude enviar mail. Por fa
 mailer_visualizer_title=Visualizador de Mailer
 match_num_field=Coincidencia No. (0 para Aleatorio)\:
 max=M\u00E1ximo
+max_value=Valor m\u00E1ximo
 maximum_param=El valor m\u00E1ximo permitido para un rango de valores
 md5hex_assertion_failure=Error validando MD5\: obtuve {0} pero deber\u00EDa 
haber obtenido {1}
 md5hex_assertion_label=MD5Hex
@@ -794,6 +795,7 @@ ssl_port=Puerto SSL
 sslmanager=Gestor SSL
 start=Arrancar
 start_no_timers=Inicio no se detiene
+start_value=Valor inicial
 starttime=Tiempo de Arranque
 stop=Parar
 stopping_test=Parando todos los hilos. Por favor, sea paciente.

Modified: 
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties?rev=1804380=1804379=1804380=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages

svn commit: r1804134 - in /jmeter/trunk: bin/templates/jdbc.jmx xdocs/changes.xml

[agomes]

Author: agomes
Date: Fri Aug  4 15:07:56 2017
New Revision: 1804134

URL: http://svn.apache.org/viewvc?rev=1804134=rev
Log:
Set Max Number of Connections to 0 into JDBC Connection Configuration for the 
JDBC Load Test template

Modified:
jmeter/trunk/bin/templates/jdbc.jmx
jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/bin/templates/jdbc.jmx
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/bin/templates/jdbc.jmx?rev=1804134=1804133=1804134=diff
==
--- jmeter/trunk/bin/templates/jdbc.jmx (original)
+++ jmeter/trunk/bin/templates/jdbc.jmx Fri Aug  4 15:07:56 2017
@@ -20,7 +20,7 @@
 org.postgresql.Driver
 true
 password
-10
+0
 1
 DEFAULT
 6

Modified: jmeter/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1804134=1804133=1804134=diff
==
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Fri Aug  4 15:07:56 2017
@@ -138,6 +138,7 @@ Incorporated feed back about unclear doc
 
 When looking for classes in ActionRouter, fall back to 
location of the jar,
where ActionRouter is loaded from. Provided by Emilian 
Bold (emi at apache.org)
+Set 'Max Number of Connections' to 0 into 'JDBC Connection 
Configuration' for the 'JDBC Load Test template'
 
 
 Non-functional changes

svn commit: r1804082 - /jmeter/trunk/xdocs/images/screenshots/csvdatasetconfig.png

[agomes]

Author: agomes
Date: Fri Aug  4 09:20:13 2017
New Revision: 1804082

URL: http://svn.apache.org/viewvc?rev=1804082=rev
Log:
Update CSV Data Set Config screenshot

Modified:
jmeter/trunk/xdocs/images/screenshots/csvdatasetconfig.png

Modified: jmeter/trunk/xdocs/images/screenshots/csvdatasetconfig.png
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/images/screenshots/csvdatasetconfig.png?rev=1804082=1804081=1804082=diff
==
Binary files - no diff available.

svn commit: r1787269 - /jmeter/trunk/xdocs/usermanual/jmeter_accesslog_sampler_step_by_step.xml

[agomes]

Author: agomes
Date: Thu Mar 16 23:01:29 2017
New Revision: 1787269

URL: http://svn.apache.org/viewvc?rev=1787269=rev
Log:
Fix update of jmeter_accesslog_sampler_step_by_step doc

Modified:
jmeter/trunk/xdocs/usermanual/jmeter_accesslog_sampler_step_by_step.xml

Modified: 
jmeter/trunk/xdocs/usermanual/jmeter_accesslog_sampler_step_by_step.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/jmeter_accesslog_sampler_step_by_step.xml?rev=1787269=1787268=1787269=diff
==
--- jmeter/trunk/xdocs/usermanual/jmeter_accesslog_sampler_step_by_step.xml 
(original)
+++ jmeter/trunk/xdocs/usermanual/jmeter_accesslog_sampler_step_by_step.xml Thu 
Mar 16 23:01:29 2017
@@ -55,7 +55,7 @@ general cases where access logs might be
 
   Security sensitive applications where the data is encrypted
   The application does not allow fine grain control of which request 
parameters are written to the access logs
-  The application does not need correlation between requests
+  The application needs correlation between requests
   The webserver cannot be configured to append the post data to the access 
log
   The webserver is hosting multiple applications, but doesn't provide a 
way to log the requests of one application to a separate file
 

svn commit: r1787265 - in /jmeter/trunk/xdocs: changes.xml usermanual/jmeter_accesslog_sampler_step_by_step.xml

[agomes]

Author: agomes
Date: Thu Mar 16 22:39:57 2017
New Revision: 1787265

URL: http://svn.apache.org/viewvc?rev=1787265=rev
Log:
Update jmeter_accesslog_sampler_step_by_step

Modified:
jmeter/trunk/xdocs/changes.xml
jmeter/trunk/xdocs/usermanual/jmeter_accesslog_sampler_step_by_step.xml

Modified: jmeter/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1787265=1787264=1787265=diff
==
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Thu Mar 16 22:39:57 2017
@@ -124,7 +124,7 @@ listeners hold and a rework of the way G
 
 Documentation improvements
 
-PDF Documentations have been migrated to HTML user manual
+PDF Documentations have been migrated and updated to HTML user manual
 
 
 

Modified: 
jmeter/trunk/xdocs/usermanual/jmeter_accesslog_sampler_step_by_step.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/jmeter_accesslog_sampler_step_by_step.xml?rev=1787265=1787264=1787265=diff
==
--- jmeter/trunk/xdocs/usermanual/jmeter_accesslog_sampler_step_by_step.xml 
(original)
+++ jmeter/trunk/xdocs/usermanual/jmeter_accesslog_sampler_step_by_step.xml Thu 
Mar 16 22:39:57 2017
@@ -55,6 +55,7 @@ general cases where access logs might be
 
   Security sensitive applications where the data is encrypted
   The application does not allow fine grain control of which request 
parameters are written to the access logs
+  The application does not need correlation between requests
   The webserver cannot be configured to append the post data to the access 
log
   The webserver is hosting multiple applications, but doesn't provide a 
way to log the requests of one application to a separate file
 

svn commit: r1786081 - in /jmeter/trunk/xdocs: images/screenshots/ images/screenshots/http-config/ usermanual/

[agomes]

Author: agomes
Date: Wed Mar  8 21:30:23 2017
New Revision: 1786081

URL: http://svn.apache.org/viewvc?rev=1786081=rev
Log:
Modify jmeter proxy step by step documentation to be aware of all the news 
fetaures. This closes #279

Added:
jmeter/trunk/xdocs/images/screenshots/Proxy_Run.png   (with props)
jmeter/trunk/xdocs/images/screenshots/Search-Correlation.png   (with props)
jmeter/trunk/xdocs/images/screenshots/Select-Recording-Template.png   (with 
props)
jmeter/trunk/xdocs/images/screenshots/Select-Templates-Icon.png   (with 
props)
jmeter/trunk/xdocs/images/screenshots/Test_Generated.png   (with props)
jmeter/trunk/xdocs/images/screenshots/Validate-Test-Plan.png   (with props)
jmeter/trunk/xdocs/images/screenshots/http-config/http-request-defaults.png 
  (with props)
Modified:
jmeter/trunk/xdocs/usermanual/jmeter_proxy_step_by_step.xml

Added: jmeter/trunk/xdocs/images/screenshots/Proxy_Run.png
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/images/screenshots/Proxy_Run.png?rev=1786081=auto
==
Binary file - no diff available.

Propchange: jmeter/trunk/xdocs/images/screenshots/Proxy_Run.png
--
svn:mime-type = application/octet-stream

Added: jmeter/trunk/xdocs/images/screenshots/Search-Correlation.png
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/images/screenshots/Search-Correlation.png?rev=1786081=auto
==
Binary file - no diff available.

Propchange: jmeter/trunk/xdocs/images/screenshots/Search-Correlation.png
--
svn:mime-type = application/octet-stream

Added: jmeter/trunk/xdocs/images/screenshots/Select-Recording-Template.png
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/images/screenshots/Select-Recording-Template.png?rev=1786081=auto
==
Binary file - no diff available.

Propchange: jmeter/trunk/xdocs/images/screenshots/Select-Recording-Template.png
--
svn:mime-type = application/octet-stream

Added: jmeter/trunk/xdocs/images/screenshots/Select-Templates-Icon.png
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/images/screenshots/Select-Templates-Icon.png?rev=1786081=auto
==
Binary file - no diff available.

Propchange: jmeter/trunk/xdocs/images/screenshots/Select-Templates-Icon.png
--
svn:mime-type = application/octet-stream

Added: jmeter/trunk/xdocs/images/screenshots/Test_Generated.png
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/images/screenshots/Test_Generated.png?rev=1786081=auto
==
Binary file - no diff available.

Propchange: jmeter/trunk/xdocs/images/screenshots/Test_Generated.png
--
svn:mime-type = application/octet-stream

Added: jmeter/trunk/xdocs/images/screenshots/Validate-Test-Plan.png
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/images/screenshots/Validate-Test-Plan.png?rev=1786081=auto
==
Binary file - no diff available.

Propchange: jmeter/trunk/xdocs/images/screenshots/Validate-Test-Plan.png
--
svn:mime-type = application/octet-stream

Added: 
jmeter/trunk/xdocs/images/screenshots/http-config/http-request-defaults.png
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/images/screenshots/http-config/http-request-defaults.png?rev=1786081=auto
==
Binary file - no diff available.

Propchange: 
jmeter/trunk/xdocs/images/screenshots/http-config/http-request-defaults.png
--
svn:mime-type = application/octet-stream

Modified: jmeter/trunk/xdocs/usermanual/jmeter_proxy_step_by_step.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/jmeter_proxy_step_by_step.xml?rev=1786081=1786080=1786081=diff
==
--- jmeter/trunk/xdocs/usermanual/jmeter_proxy_step_by_step.xml (original)
+++ jmeter/trunk/xdocs/usermanual/jmeter_proxy_step_by_step.xml Wed Mar  8 
21:30:23 2017
@@ -51,61 +51,21 @@ configuration is correct, read Add Thread 
Group
-  
-  Select the Thread Group
-  Right click 
-  
-Add
-Config Element
-HTTP Request

svn commit: r1785059 - /jmeter/trunk/xdocs/usermanual/jmeter_tutorial.xml

[agomes]

Author: agomes
Date: Wed Mar  1 22:33:56 2017
New Revision: 1785059

URL: http://svn.apache.org/viewvc?rev=1785059=rev
Log:
Clean usermanual/jmeter_tutorial.xml file

Modified:
jmeter/trunk/xdocs/usermanual/jmeter_tutorial.xml

Modified: jmeter/trunk/xdocs/usermanual/jmeter_tutorial.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/jmeter_tutorial.xml?rev=1785059=1785058=1785059=diff
==
--- jmeter/trunk/xdocs/usermanual/jmeter_tutorial.xml (original)
+++ jmeter/trunk/xdocs/usermanual/jmeter_tutorial.xml Wed Mar  1 22:33:56 2017
@@ -102,7 +102,7 @@ The folders inside of apache-jmete
 
 
 As the tutorial progresses, an explanation of the subdirectories will be 
provided. For now, lets
-focus on src directory. From the screen capture, we see the 
following directories.
+focus on src directory.
 
 
 
@@ -114,9 +114,7 @@ The folders inside of src
   corethe core code of JMeter including all core 
interfaces and abstract classes.
   examplesexample sampler demonstrating how to use 
the new bean framework
   functionsstandard functions used by all 
components
-  htmlparsera snapshot of HtmlParser, donated by 
HtmlParser project on sourceforge
   jorphanutility classes providing common utility 
functions
-  monitortomcat 5 monitor components
   protocolcontains the different protocols JMeter 
supports
 
 

svn commit: r1781932 - in /jmeter/trunk: docs/css/new-style.css src/core/org/apache/jmeter/JMeter.java

[agomes]

Author: agomes
Date: Mon Feb  6 19:15:43 2017
New Revision: 1781932

URL: http://svn.apache.org/viewvc?rev=1781932=rev
Log:
Fix typo in More detailed warning message when JMeter is run in GUI mode

Modified:
jmeter/trunk/docs/css/new-style.css
jmeter/trunk/src/core/org/apache/jmeter/JMeter.java

Modified: jmeter/trunk/docs/css/new-style.css
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/docs/css/new-style.css?rev=1781932=1781931=1781932=diff
==
--- jmeter/trunk/docs/css/new-style.css (original)
+++ jmeter/trunk/docs/css/new-style.css Mon Feb  6 19:15:43 2017
@@ -126,7 +126,6 @@ h1, h2, h3, h4, h5, .title {
 
 .menu {
   border: 1px solid lightgray;
-  box-shadow: 5px 5px 10px rgba(20, 20, 20, 0.3);
   list-style: none;
   margin: 0.5em;
   padding: 0.5em;
@@ -222,8 +221,12 @@ figure {
   margin: 1em 2em;
 }
 
+figcaption {
+  font-family: "Merriweather";
+  font-style: italic;
+}
+
 figure>a>img, .screenshot>a>img {
-  box-shadow: 10px 10px 10px 0 rgba(50, 50, 50, 0.25);
   overflow: auto;
   width: auto;
   max-width: 100%;
@@ -341,9 +344,9 @@ table {
   display: table;
   margin-bottom: 1rem;
   width: 100%;
-  box-shadow: 0px 5px 33px 0px rgba(0, 0, 0, 0.2);
+  box-shadow: 0px 5px 33px 0px rgba(0, 0, 0, 0.1);
   padding: 0.1rem 0em 0.2rem 0em;
-  border-bottom: 1px solid gray;
+  border-bottom: 1px solid lightgray;
 }
 
 .header>div {
@@ -376,8 +379,7 @@ table {
 }
 
 .pagelinks>li {
-  border: 1px solid #bbb;
-  box-shadow: 5px 5px 5px rgba(20, 20, 20, 0.2);
+  border: 1px solid lightgray;
   padding: 0.5em 1em;
 }
 
@@ -396,8 +398,7 @@ table {
 .section-index>li {
   margin: 1em;
   padding: 1em;
-  border: 1px solid #bbb;
-  box-shadow: 5px 5px 5px rgba(20, 20, 20, 0.2);
+  border: 1px solid lightgray;
 }
 
 .hidden {
@@ -411,7 +412,7 @@ table {
 
 .keysym {
   background-color: #f0f0f0;
-  border: 1px solid #bbb;
+  border: 1px solid lightgray;
   border-radius: 0.3rem;
   padding: 0.1rem;
   font-style: normal;
@@ -426,8 +427,8 @@ table {
   .nav {
   width: 100%;
   max-width: 100%;
-  border-bottom: 1px solid #808080;
-  box-shadow: 0px 20px 15px -15px rgba(20,20,20,0.2);
+  border-bottom: 1px solid lightgray;
+  box-shadow: 0px 20px 15px -15px rgba(20,20,20,0.1);
 }
 .header {
   box-shadow: none;
@@ -507,8 +508,8 @@ table {
 display: block;
 width: 100%;
 max-width: 100%;
-border-bottom: 1px solid #808080;
-box-shadow: 0px 15px 10px -10px rgba(20,20,20,0.2);
+border-bottom: 1px solid lightgray;
+box-shadow: 0px 15px 10px -10px rgba(20,20,20,0.1);
   }
   .menu {
 box-shadow: none;

Modified: jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java?rev=1781932=1781931=1781932=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Mon Feb  6 19:15:43 2017
@@ -336,7 +336,7 @@ public class JMeter implements JMeterPlu
 
System.out.println("");//NOSONAR
 System.out.println("Don't use GUI mode for load testing, only for Test 
creation and Test debugging !");//NOSONAR
 System.out.println("For load testing, use NON GUI Mode:");//NOSONAR
-System.out.println("   jmeter -n -t [jmx file] -l [results file] -e -o 
[Path to output folder])");//NOSONAR
+System.out.println("   jmeter -n -t [jmx file] -l [results file] -e -o 
[Path to output folder]");//NOSONAR
 System.out.println("& adapt Java Heap to your test 
requirements:");//NOSONAR
 System.out.println("   Modify HEAP=\"-Xms512m -Xmx512m\" in the JMeter 
batch file");//NOSONAR
 
System.out.println("");//NOSONAR

svn commit: r1781813 - /jmeter/trunk/src/core/org/apache/jmeter/JMeter.java

[agomes]

Author: agomes
Date: Sun Feb  5 21:36:45 2017
New Revision: 1781813

URL: http://svn.apache.org/viewvc?rev=1781813=rev
Log:
Fix tab in More detailed warning message when JMeter is run in GUI mode

Modified:
jmeter/trunk/src/core/org/apache/jmeter/JMeter.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java?rev=1781813=1781812=1781813=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Sun Feb  5 21:36:45 2017
@@ -336,7 +336,7 @@ public class JMeter implements JMeterPlu
 
System.out.println("");//NOSONAR
 System.out.println("Don't use GUI mode for load testing, only for Test 
creation and Test debugging !");//NOSONAR
 System.out.println("For load testing, use NON GUI Mode:");//NOSONAR
-   System.out.println("   jmeter -n -t [jmx file] -l [results file] -e -o 
[Path to output folder])");//NOSONAR
+System.out.println("   jmeter -n -t [jmx file] -l [results file] -e -o 
[Path to output folder])");//NOSONAR
 System.out.println("& adapt Java Heap to your test 
requirements:");//NOSONAR
 System.out.println("   Modify HEAP=\"-Xms512m -Xmx512m\" in the JMeter 
batch file");//NOSONAR
 
System.out.println("");//NOSONAR

svn commit: r1781810 - /jmeter/trunk/src/core/org/apache/jmeter/JMeter.java

[agomes]

Author: agomes
Date: Sun Feb  5 21:27:17 2017
New Revision: 1781810

URL: http://svn.apache.org/viewvc?rev=1781810=rev
Log:
More detailed warning message when JMeter is run in GUI mode

Modified:
jmeter/trunk/src/core/org/apache/jmeter/JMeter.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java?rev=1781810=1781809=1781810=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Sun Feb  5 21:27:17 2017
@@ -335,8 +335,10 @@ public class JMeter implements JMeterPlu
 private void startGui(String testFile) {
 
System.out.println("");//NOSONAR
 System.out.println("Don't use GUI mode for load testing, only for Test 
creation and Test debugging !");//NOSONAR
-System.out.println("For load testing, use NON GUI Mode (jmeter -n -t 
[jmx file] -l [results file] -e -o [Path to output folder])");//NOSONAR
-System.out.println("& adapt Java Heap to your test 
requirements");//NOSONAR
+System.out.println("For load testing, use NON GUI Mode:");//NOSONAR
+   System.out.println("   jmeter -n -t [jmx file] -l [results file] -e -o 
[Path to output folder])");//NOSONAR
+System.out.println("& adapt Java Heap to your test 
requirements:");//NOSONAR
+System.out.println("   Modify HEAP=\"-Xms512m -Xmx512m\" in the JMeter 
batch file");//NOSONAR
 
System.out.println("");//NOSONAR
 
 SplashScreen splash = new SplashScreen();

svn commit: r1781804 - /jmeter/trunk/README.md

[agomes]

Author: agomes
Date: Sun Feb  5 20:50:04 2017
New Revision: 1781804

URL: http://svn.apache.org/viewvc?rev=1781804=rev
Log:
This closes #262: Updated README.md(formatting,grammar,wording)

Modified:
jmeter/trunk/README.md

Modified: jmeter/trunk/README.md
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/README.md?rev=1781804=1781803=1781804=diff
==
--- jmeter/trunk/README.md (original)
+++ jmeter/trunk/README.md Sun Feb  5 20:50:04 2017
@@ -5,7 +5,7 @@
 
 Apache JMeter is a 100% pure Java application designed to test
 and measure performance.  It may be used as a highly portable 
-server benchmark as well as multiclient load generator.
+server benchmark as well as multi-client load generator.
 
 Apache JMeter features include:
 
@@ -20,17 +20,17 @@ Ability to load and performance test man
  -  Native commands or shell scripts
  -  TCP
 
-Full multithreading framework allows concurrent sampling by many threads
+Full multi-threading framework allows concurrent sampling by many threads
 and simultaneous sampling of different functions by separate thread groups.
 Careful GUI design allows faster Test Plan building and debugging.
 Caching and offline analysis/replaying of test results.
 
 Highly Extensible core:
  -  Pluggable Samplers allow unlimited testing capabilities.
- -  Several load statistics may be chosen with pluggable timers .
- -  Data analysis and visualization plugins allow great extensibility as well 
as personalization.
+ -  Several load statistics may be chosen with pluggable timers.
+ -  Data analysis and visualization plugins allow great extensibility and 
personalization.
  -  Functions can be used to provide dynamic input to a test or provide data 
manipulation.
- -  Scriptable Samplers (BeanShell, BSF- and JSR223- compatible languages)
+ -  Scriptable Samplers (Groovy, BeanShell, BSF- and JSR223- compatible 
languages)
 
 
 ## The Latest Version
@@ -42,49 +42,48 @@ Project web site (http://jmeter.apache.o
 
 The following requirements exist for running Apache JMeter:
 
- -  Java Interpreter:
+*  Java Interpreter:
 
 A fully compliant Java 8 (or later) Runtime Environment is required 
 for Apache JMeter to execute.
 
- -  Optional jars:
+*  Optional jars:
 
 Some jars are not included with JMeter.
 If required, these should be downloaded and placed in the lib directory
 
-+ JDBC - available from database supplier
-+ JMS - available from the JMS provider
-+ Bouncy Castle - available from 
http://www.bouncycastle.org/latest_releases.html
+* JDBC - available from the database supplier
+* JMS - available from the JMS provider
+* [Bouncy Castle](http://www.bouncycastle.org/latest_releases.html) - 
+only needed for SMIME Assertion
 
-  (currently only needed for SMIME Assertion)
-
- -  Java Compiler [OPTIONAL]:
+*  Java Compiler (OPTIONAL):
 
 A Java compiler is not needed since the distribution includes a
 precompiled Java binary archive. _Note that a compiler is required
-if you plan to build plugins for Apache JMeter._
+to build plugins for Apache JMeter._
 
 ## Installation Instructions
 
 _Note that spaces in directory names can cause problems._
 
- - Release builds
+ * Release builds
 
Unpack the binary archive into a suitable directory structure.
 
 ## Running JMeter
 
-Change to the bin directory
-Run the jmeter (Un\*x) or jmeter.bat (Windows) file.
-
-For Windows there are also some other scripts.
-Drag-drop a JMX file onto one of them:
+1. Change to the `bin` directory
+2. Run the `jmeter` (Un\*x) or `jmeter.bat` (Windows) file.
 
-`jmeter-n.cmd` - runs the file as a non-GUI test
+### Windows
 
-`jmeter-n-r.cmd` - runs the file as a non-GUI remote (client-server) test
+For Windows there are also some other scripts which you can drag-and-drop
+a JMX file onto:
 
-`jmeter-t.cmd` - loads the file ready to run it as a GUI test
+* `jmeter-n.cmd` - runs the file as a non-GUI test
+* `jmeter-n-r.cmd` - runs the file as a non-GUI remote (client-server) test
+* `jmeter-t.cmd` - loads the file ready to run it as a GUI test
 
 ## Documentation
 
@@ -94,12 +93,12 @@ and it may be browsed starting from the
 
 ## Build instructions
 
- - Release builds
+### Release builds
 
-   Unpack the source archive into a suitable directory structure.
-   Most of the 3rd party library files can be extracted from the binary archive
-   by unpacking it into the same directory structure.
-   You can also use Ant to download the required library files:
+Unpack the source archive into a suitable directory structure.
+Most of the 3rd party library files can be extracted from the binary archive
+by unpacking it into the same directory structure.
+You can also use Ant to download the required library files:
 
 ```sh
 ant download_jars
@@ -107,12 +106,14 @@ ant download_jars
 
 Any optional jars (see above) should be placed in `lib/opt` and/or `lib`.
 
-Jars in `lib/opt

svn commit: r1780269 - in /jmeter/trunk: bin/report-template/content/js/ src/core/org/apache/jmeter/report/processor/ src/core/org/apache/jmeter/resources/ xdocs/ xdocs/images/screenshots/changes/3.2/

[agomes]

Author: agomes
Date: Wed Jan 25 21:09:31 2017
New Revision: 1780269

URL: http://svn.apache.org/viewvc?rev=1780269=rev
Log:
This closes #256 : Improve Statistics Table in HTML report

Added:
jmeter/trunk/xdocs/images/screenshots/changes/3.2/
jmeter/trunk/xdocs/images/screenshots/changes/3.2/report_statistics.png   
(with props)
Modified:
jmeter/trunk/bin/report-template/content/js/dashboard.js.fmkr

jmeter/trunk/src/core/org/apache/jmeter/report/processor/StatisticsSummaryConsumer.java
jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
jmeter/trunk/xdocs/changes.xml
jmeter/trunk/xdocs/images/screenshots/dashboard/report_statistics.png

Modified: jmeter/trunk/bin/report-template/content/js/dashboard.js.fmkr
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/bin/report-template/content/js/dashboard.js.fmkr?rev=1780269=1780268=1780269=diff
==
--- jmeter/trunk/bin/report-template/content/js/dashboard.js.fmkr (original)
+++ jmeter/trunk/bin/report-template/content/js/dashboard.js.fmkr Wed Jan 25 
21:09:31 2017
@@ -19,15 +19,54 @@ var seriesFilter = ${seriesFilter!"undef
 var filtersOnlySampleSeries = ${filtersOnlySampleSeries?c!"false"};
 
 /*
+ * Add header in statistics table to group metrics by category
+ * format
+ *
+ */
+function summaryTableHeader(header) {
+var newRow = header.insertRow(-1);
+newRow.className = "tablesorter-no-sort";
+var cell = document.createElement('th');
+cell.setAttribute("data-sorter", false);
+cell.colSpan = 1;
+cell.innerHTML = "Requests";
+newRow.appendChild(cell);
+   
+cell = document.createElement('th');
+cell.setAttribute("data-sorter", false);
+cell.colSpan = 3;
+cell.innerHTML = "Executions";
+newRow.appendChild(cell);
+   
+cell = document.createElement('th');
+cell.setAttribute("data-sorter", false);
+cell.colSpan = 7;
+cell.innerHTML = "Response Times (ms)";
+newRow.appendChild(cell);
+
+cell = document.createElement('th');
+cell.setAttribute("data-sorter", false);
+cell.colSpan = 2;
+cell.innerHTML = "Network (KB/sec)";
+newRow.appendChild(cell);
+}
+
+/*
  * Populates the table identified by id parameter with the specified data and
  * format
  *
  */
-function createTable(table, info, formatter, defaultSorts, seriesIndex) {
+function createTable(table, info, formatter, defaultSorts, seriesIndex, 
headerCreator) {
 var tableRef = table[0];
 
 // Create header and populate it with data.titles array
 var header = tableRef.createTHead();
+
+// Call callback is available
+if(headerCreator) {
+headerCreator(header);
+}
+
 var newRow = header.insertRow(-1);
 for (var index = 0; index < info.titles.length; index++) {
 var cell = document.createElement('th');
@@ -150,23 +189,24 @@ $(document).ready(function() {
 break;
 // Mean
 case 4:
+// Mean
+case 7:
 // Percentile 1
-case 5:
+case 8:
 // Percentile 2
-case 6:
+case 9:
 // Percentile 3
-case 7:
+case 10:
 // Throughput
-case 8:
+case 11:
 // Kbytes/s
-case 9:
+case 12:
 // Sent Kbytes/s
-case 10:
 item = item.toFixed(2);
 break;
 }
 return item;
-}, [[0, 0]], 0);
+}, [[0, 0]], 0, summaryTableHeader);
 
 // Create error table
 createTable($("#errorsTable"), ${errorsSummary!"{}"}, function(index, 
item){

Modified: 
jmeter/trunk/src/core/org/apache/jmeter/report/processor/StatisticsSummaryConsumer.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/StatisticsSummaryConsumer.java?rev=1780269=1780268=1780269=diff
==
--- 
jmeter/trunk/src/core/org/apache/jmeter/report/processor/StatisticsSummaryConsumer.java
 (original)
+++ 
jmeter/trunk/src/core/org/apache/jmeter/report/processor/StatisticsSummaryConsumer.java
 Wed Jan 25 21:09:31 2017
@@ -137,14 +137,14 @@ public class StatisticsSummaryConsumer e
 result.addResult(new ValueResultData(Long.valueOf(errors)));
 result.addResult(new ValueResultData(Double.valueOf((double) errors * 
100 / total)));
 result.addResult(new 
ValueResultData(Double.valueOf(data.getMean().getResult(;
+result.addResult(new ValueResultData(Long.valueOf(data.getMin(;
+result.addResult(new ValueResultData(Long.valueOf(data.getMax(;
 

svn commit: r1780119 - /jmeter/trunk/bin/jmeter.bat

[agomes]

Author: agomes
Date: Tue Jan 24 21:09:46 2017
New Revision: 1780119

URL: http://svn.apache.org/viewvc?rev=1780119=rev
Log:
Fix what I hav broken in jmeter.bat, now we have only the fix to the comment in 
bash format replaced by comment in windows format

Modified:
jmeter/trunk/bin/jmeter.bat

Modified: jmeter/trunk/bin/jmeter.bat
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.bat?rev=1780119=1780118=1780119=diff
==
--- jmeter/trunk/bin/jmeter.bat (original)
+++ jmeter/trunk/bin/jmeter.bat Tue Jan 24 21:09:46 2017
@@ -101,7 +101,9 @@ rem set DDRAW=%DDRAW% -Dsun.java2d.ddsca
 
 rem Server mode
 rem Collect the settings defined above
-set ARGS=%DUMP% %HEAP% %VERBOSE_GC% %GC_ALGO% %DDRAW% %SYSTEM_PROPS% 
%JM_START% %JM_LAUNCH% %ARGS% %JVM_ARGS% -jar "%JMETER_BIN%ApacheJMeter.jar" 
%JMETER_CMD_LINE_ARGS%
+set ARGS=%DUMP% %HEAP% %VERBOSE_GC% %GC_ALGO% %DDRAW% %SYSTEM_PROPS%
+
+%JM_START% %JM_LAUNCH% %ARGS% %JVM_ARGS% -jar "%JMETER_BIN%ApacheJMeter.jar" 
%JMETER_CMD_LINE_ARGS%
 
 rem If the errorlevel is not zero, then display it and pause
 

svn commit: r1780118 - /jmeter/trunk/bin/jmeter.bat

[agomes]

Author: agomes
Date: Tue Jan 24 21:00:37 2017
New Revision: 1780118

URL: http://svn.apache.org/viewvc?rev=1780118=rev
Log:
Fix typos in jmeter.bat

Modified:
jmeter/trunk/bin/jmeter.bat

Modified: jmeter/trunk/bin/jmeter.bat
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.bat?rev=1780118=1780117=1780118=diff
==
--- jmeter/trunk/bin/jmeter.bat (original)
+++ jmeter/trunk/bin/jmeter.bat Tue Jan 24 21:00:37 2017
@@ -77,7 +77,7 @@ rem See the unix startup file for the ra
 rem including some tuning recommendations
 set HEAP=-Xms512m -Xmx512m
 
-#Uncomment this to generate GC verbose file
+rem Uncomment this to generate GC verbose file
 rem set VERBOSE_GC=-verbose:gc -Xloggc:gc_jmeter_%p.log -XX:+PrintGCDetails 
-XX:+PrintGCCause -XX:+PrintTenuringDistribution -XX:+PrintHeapAtGC 
-XX:+PrintGCApplicationConcurrentTime -XX:+PrintGCApplicationStoppedTime 
-XX:+PrintGCDateStamps
 
 set GC_ALGO=-XX:+UseG1GC -XX:MaxGCPauseMillis=250 -XX:G1ReservePercent=20
@@ -101,9 +101,7 @@ rem set DDRAW=%DDRAW% -Dsun.java2d.ddsca
 
 rem Server mode
 rem Collect the settings defined above
-set ARGS=%DUMP% %HEAP% %VERBOSE_GC% %GC_ALGO% %DDRAW% %SYSTEM_PROPS%
-
-%JM_START% %JM_LAUNCH% %ARGS% %JVM_ARGS% -jar "%JMETER_BIN%ApacheJMeter.jar" 
%JMETER_CMD_LINE_ARGS%
+set ARGS=%DUMP% %HEAP% %VERBOSE_GC% %GC_ALGO% %DDRAW% %SYSTEM_PROPS% 
%JM_START% %JM_LAUNCH% %ARGS% %JVM_ARGS% -jar "%JMETER_BIN%ApacheJMeter.jar" 
%JMETER_CMD_LINE_ARGS%
 
 rem If the errorlevel is not zero, then display it and pause
 

svn commit: r1779529 - in /jmeter/trunk: src/core/org/apache/jmeter/resources/messages_fr.properties xdocs/changes.xml

[agomes]

Author: agomes
Date: Thu Jan 19 21:17:21 2017
New Revision: 1779529

URL: http://svn.apache.org/viewvc?rev=1779529=rev
Log:
This closes #252 : Improve translation "save_as" in French

Modified:
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
jmeter/trunk/xdocs/changes.xml

Modified: 
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties?rev=1779529=1779528=1779529=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties 
Thu Jan 19 21:17:21 2017
@@ -907,7 +907,7 @@ sampler_on_error_stop_thread=Arr\u00EAte
 save=Enregistrer le plan de test
 save?=Enregistrer ?
 save_all_as=Enregistrer le plan de test sous...
-save_as=Enregistrer sous...
+save_as=Enregistrer la s\u00E9lection sous...
 save_as_error=Au moins un \u00E9l\u00E9ment doit \u00EAtre 
s\u00E9lectionn\u00E9 \!
 save_as_image=Enregistrer en tant qu'image sous...
 save_as_image_all=Enregistrer l'\u00E9cran en tant qu'image...

Modified: jmeter/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1779529=1779528=1779529=diff
==
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Thu Jan 19 21:17:21 2017
@@ -143,6 +143,7 @@ JMeter now requires Java 8. Ensure you u
 
 I18N
 
+Improve translation "save_as" in French. Based on a 252 by 
Maxime Chassagneux (maxime.chassagneux at gmail.com).
 
 
 Report / Dashboard

svn commit: r1779269 - /jmeter/trunk/src/core/org/apache/jmeter/report/processor/Top5ErrorsSummaryData.java

[agomes]

Author: agomes
Date: Tue Jan 17 21:30:17 2017
New Revision: 1779269

URL: http://svn.apache.org/viewvc?rev=1779269=rev
Log:
This closes #244 : Fix warning prone BoxedPrimitiveConstructor in 
Top5ErrorsSummaryData.java

Modified:

jmeter/trunk/src/core/org/apache/jmeter/report/processor/Top5ErrorsSummaryData.java

Modified: 
jmeter/trunk/src/core/org/apache/jmeter/report/processor/Top5ErrorsSummaryData.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/Top5ErrorsSummaryData.java?rev=1779269=1779268=1779269=diff
==
--- 
jmeter/trunk/src/core/org/apache/jmeter/report/processor/Top5ErrorsSummaryData.java
 (original)
+++ 
jmeter/trunk/src/core/org/apache/jmeter/report/processor/Top5ErrorsSummaryData.java
 Tue Jan 17 21:30:17 2017
@@ -29,7 +29,7 @@ import java.util.TreeSet;
  */
 public class Top5ErrorsSummaryData {
 
-private static final Long ONE = new Long(1);
+private static final Long ONE = Long.valueOf(1L);
 private Map<String, Long> countPerError;
 private long total;
 private long errors;

svn commit: r1779267 - /jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java

[agomes]

Author: agomes
Date: Tue Jan 17 21:14:44 2017
New Revision: 1779267

URL: http://svn.apache.org/viewvc?rev=1779267=rev
Log:
This closes #243 : Fix warning prone default charset in SampleResult.java 

Modified:
jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java?rev=1779267=1779266=1779267=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java Tue Jan 
17 21:14:44 2017
@@ -711,7 +711,7 @@ public class SampleResult implements Ser
 responseData = response.getBytes(getDataEncodingWithDefault());
 } catch (UnsupportedEncodingException e) {
 log.warn("Could not convert string, using default encoding. 
"+e.getLocalizedMessage());
-responseData = response.getBytes(); // N.B. default charset is 
used deliberately here
+responseData = response.getBytes(Charset.defaultCharset()); // 
N.B. default charset is used deliberately here
 }
 }
 
@@ -731,7 +731,7 @@ public class SampleResult implements Ser
 } catch (UnsupportedEncodingException e) {
 log.warn("Could not convert string using '"+encodeUsing+
 "', using default encoding: "+DEFAULT_CHARSET,e);
-responseData = response.getBytes(); // N.B. default charset is 
used deliberately here
+responseData = response.getBytes(Charset.defaultCharset()); // 
N.B. default charset is used deliberately here
 setDataEncoding(DEFAULT_CHARSET);
 }
 }
@@ -763,7 +763,7 @@ public class SampleResult implements Ser
 return responseDataAsString;
 } catch (UnsupportedEncodingException e) {
 log.warn("Using platform default as 
"+getDataEncodingWithDefault()+" caused "+e);
-return new String(responseData); // N.B. default charset is used 
deliberately here
+return new String(responseData,Charset.defaultCharset()); // N.B. 
default charset is used deliberately here
 }
 }
 

svn commit: r1779114 - in /jmeter/trunk/src/core/org/apache/jmeter: report/processor/StatisticsSummaryConsumer.java resources/messages.properties resources/messages_fr.properties

[agomes]

Author: agomes
Date: Mon Jan 16 21:51:20 2017
New Revision: 1779114

URL: http://svn.apache.org/viewvc?rev=1779114=rev
Log:
Add unity in statistics report and move min, max colum from the end to near 
average time 

Modified:

jmeter/trunk/src/core/org/apache/jmeter/report/processor/StatisticsSummaryConsumer.java
jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties

Modified: 
jmeter/trunk/src/core/org/apache/jmeter/report/processor/StatisticsSummaryConsumer.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/StatisticsSummaryConsumer.java?rev=1779114=1779113=1779114=diff
==
--- 
jmeter/trunk/src/core/org/apache/jmeter/report/processor/StatisticsSummaryConsumer.java
 (original)
+++ 
jmeter/trunk/src/core/org/apache/jmeter/report/processor/StatisticsSummaryConsumer.java
 Mon Jan 16 21:51:20 2017
@@ -180,6 +180,8 @@ public class StatisticsSummaryConsumer e
 
JMeterUtils.getResString("reportgenerator_summary_statistics_error_percent")));
 titles.addResult(new ValueResultData(
 
JMeterUtils.getResString("reportgenerator_summary_statistics_mean")));
+titles.addResult(new 
ValueResultData(JMeterUtils.getResString("reportgenerator_summary_statistics_min")));
+titles.addResult(new 
ValueResultData(JMeterUtils.getResString("reportgenerator_summary_statistics_max")));
 titles.addResult(new ValueResultData(
 String.format(
 
JMeterUtils.getResString("reportgenerator_summary_statistics_percentile_fmt"),
@@ -195,8 +197,6 @@ public class StatisticsSummaryConsumer e
 titles.addResult(new 
ValueResultData(JMeterUtils.getResString("reportgenerator_summary_statistics_throughput")));
 titles.addResult(new 
ValueResultData(JMeterUtils.getResString("reportgenerator_summary_statistics_kbytes")));
 titles.addResult(new 
ValueResultData(JMeterUtils.getResString("reportgenerator_summary_statistics_sent_kbytes")));
-titles.addResult(new 
ValueResultData(JMeterUtils.getResString("reportgenerator_summary_statistics_min")));
-titles.addResult(new 
ValueResultData(JMeterUtils.getResString("reportgenerator_summary_statistics_max")));
 return titles;
 }
 

Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=1779114=1779113=1779114=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Mon 
Jan 16 21:51:20 2017
@@ -860,10 +860,10 @@ reportgenerator_summary_statistics_error
 reportgenerator_summary_statistics_kbytes=Received KB/sec
 reportgenerator_summary_statistics_sent_kbytes=Sent KB/sec
 reportgenerator_summary_statistics_label=Label
-reportgenerator_summary_statistics_max=Max
-reportgenerator_summary_statistics_mean=Average response time
-reportgenerator_summary_statistics_min=Min
-reportgenerator_summary_statistics_percentile_fmt=%dth pct
+reportgenerator_summary_statistics_max=Max (ms)
+reportgenerator_summary_statistics_mean=Average response time (ms)
+reportgenerator_summary_statistics_min=Min (ms)
+reportgenerator_summary_statistics_percentile_fmt=%dth pct (ms)
 reportgenerator_summary_statistics_throughput=Throughput
 reportgenerator_summary_total=Total
 request_data=Request Data

Modified: 
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties?rev=1779114=1779113=1779114=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties 
Mon Jan 16 21:51:20 2017
@@ -850,10 +850,10 @@ reportgenerator_summary_statistics_error
 reportgenerator_summary_statistics_kbytes=Ko re\u00e7ues / sec
 reportgenerator_summary_statistics_sent_kbytes=Ko envoy\u00e9s / sec
 reportgenerator_summary_statistics_label=Libell\u00E9
-reportgenerator_summary_statistics_max=Max
-reportgenerator_summary_statistics_mean=Temps moyen
-reportgenerator_summary_statistics_min=Min
-reportgenerator_summary_statistics_percentile_fmt=%d%% centile
+reportgenerator_summary_statistics_max=Max (ms)
+reportgenerator_summary_statistics_mean=Temps moyen (ms)
+reportgenerator_summary_statistics_min=Min (ms)
+reportgenerator_summary_statistics_percentile_fmt=%d%% centile (ms)
 reportgenera

svn commit: r1779113 - /jmeter/trunk/src/core/org/apache/jmeter/JMeter.java

[agomes]

Author: agomes
Date: Mon Jan 16 21:50:03 2017
New Revision: 1779113

URL: http://svn.apache.org/viewvc?rev=1779113=rev
Log:
Add JMeter command line example in warning message when run JMeter in GUI mode 

Modified:
jmeter/trunk/src/core/org/apache/jmeter/JMeter.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java?rev=1779113=1779112=1779113=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Mon Jan 16 21:50:03 2017
@@ -326,7 +326,8 @@ public class JMeter implements JMeterPlu
 private void startGui(String testFile) {
 
System.out.println("");//NOSONAR
 System.out.println("Don't use GUI mode for load testing, only for Test 
creation and Test debugging !");//NOSONAR
-System.out.println("For load testing, use NON GUI Mode & adapt Java 
Heap to your test requirements");//NOSONAR
+System.out.println("For load testing, use NON GUI Mode (jmeter -n -t 
my_test.jmx -l log.jtl)");//NOSONAR
+System.out.println("& adapt Java Heap to your test 
requirements");//NOSONAR
 
System.out.println("");//NOSONAR
 String jMeterLaf = LookAndFeelCommand.getJMeterLaf();
 try {

svn commit: r1779112 - /jmeter/trunk/xdocs/usermanual/properties_reference.xml

[agomes]

Author: agomes
Date: Mon Jan 16 21:48:02 2017
New Revision: 1779112

URL: http://svn.apache.org/viewvc?rev=1779112=rev
Log:
Add jmeter.reportgenerator.date_format, jmeter.reportgenerator.start_date and 
jmeter.reportgenerator.end_date in properties documentation

Modified:
jmeter/trunk/xdocs/usermanual/properties_reference.xml

Modified: jmeter/trunk/xdocs/usermanual/properties_reference.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/properties_reference.xml?rev=1779112=1779111=1779112=diff
==
--- jmeter/trunk/xdocs/usermanual/properties_reference.xml (original)
+++ jmeter/trunk/xdocs/usermanual/properties_reference.xml Mon Jan 16 21:48:02 
2017
@@ -1729,6 +1729,18 @@ log_level.org.apache.http.client=DEBUG
 Indicates whether only controller samples are displayed on graphs that 
support it.
 Defaults to: false
 
+
+Date format of report using by start_date and end_date properties.
+Defaults to: MMddHHmmss
+
+
+Start date of report using date_format property.
+Defaults to: nothing
+
+
+End date of report using date_format property.
+Defaults to: nothing
+
 
 
 

svn propchange: r1761088 - svn:log

[agomes]

Author: agomes
Revision: 1761088
Modified property: svn:log

Modified: svn:log at Mon Sep 26 21:06:28 2016
--
--- svn:log (original)
+++ svn:log Mon Sep 26 21:06:28 2016
@@ -1 +1 @@
-Add missing reference in changes.xml to PR 196,200,209
+Bug 59349,59329,59620 - Add missing reference in changes.xml to PR 196,200,209

svn propchange: r1761085 - svn:log

[agomes]

Author: agomes
Revision: 1761085
Modified property: svn:log

Modified: svn:log at Mon Sep 26 21:04:48 2016
--
--- svn:log (original)
+++ svn:log Mon Sep 26 21:04:48 2016
@@ -1 +1 @@
-This closes #200
+Bug 59349 - Include Controller input filename trim. This closes #200

svn propchange: r1760716 - svn:log

[agomes]

Author: agomes
Revision: 1760716
Modified property: svn:log

Modified: svn:log at Mon Sep 26 20:58:21 2016
--
--- svn:log (original)
+++ svn:log Mon Sep 26 20:58:21 2016
@@ -1 +1 @@
-This closes #224
+Bug 59948 - add a html source formated render. This closes #224

svn propchange: r1760749 - svn:log

[agomes]

Author: agomes
Revision: 1760749
Modified property: svn:log

Modified: svn:log at Mon Sep 26 20:57:15 2016
--
--- svn:log (original)
+++ svn:log Mon Sep 26 20:57:15 2016
@@ -1 +1 @@
-Add RenderAsHTMLFormated.java file
+Bug 59948 - Add RenderAsHTMLFormated.java file

svn commit: r1761088 - /jmeter/trunk/xdocs/changes.xml

[agomes]

Author: agomes
Date: Fri Sep 16 21:06:05 2016
New Revision: 1761088

URL: http://svn.apache.org/viewvc?rev=1761088=rev
Log:
Add missing reference in changes.xml to PR 196,200,209

Modified:
jmeter/trunk/xdocs/changes.xml

Modified: jmeter/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1761088=1761087=1761088=diff
==
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Fri Sep 16 21:06:05 2016
@@ -90,6 +90,7 @@ Summary
 Other samplers
 
 211Differentiate the timing for JDBC Sampler. Use latency and 
connect time. Contributed by Thomas Peyrard (thomas.peyrard at murex.com)
+59620Fix button action in "JMS Publisher -> Random File 
from folder specified below" to allow to select a directory
 
 
 Controllers
@@ -97,6 +98,8 @@ Summary
 59351Improve log/error/message for IncludeController. 
Partly contributed by Antonio Gomes Rodrigues (ra0077 at gmail.com)
 60023ThroughputController : Make "Percent Executions" and 
global the default values. Contributed by Ubik Load Pack (support at 
ubikloadpack.com)
 60082Validation mode : Be able to force Throughput 
Controller to run as if it was set to 100%
+59329Trim spaces in input filename in CSVDataSet.
+59349Trim spaces in input filename in 
IncludeController.
 
 
 Listeners

svn commit: r1761085 - /jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java

[agomes]

Author: agomes
Date: Fri Sep 16 20:53:44 2016
New Revision: 1761085

URL: http://svn.apache.org/viewvc?rev=1761085=rev
Log:
This closes #200

Modified:
jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java

Modified: 
jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java?rev=1761085=1761084=1761085=diff
==
--- 
jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java 
(original)
+++ 
jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java 
Fri Sep 16 20:53:44 2016
@@ -123,7 +123,7 @@ public class IncludeController extends G
 if (includePath != null && includePath.length() > 0) {
 String fileName=prefix+includePath;
 try {
-File file = new File(fileName);
+File file = new File(fileName.trim());
 final String absolutePath = file.getAbsolutePath();
 log.info("loadIncludedElements -- try to load included module: 
"+absolutePath);
 if(!file.exists() && !file.isAbsolute()){

svn commit: r1761081 - in /jmeter/trunk/src: core/org/apache/jmeter/gui/util/ protocol/jms/org/apache/jmeter/protocol/jms/control/gui/

[agomes]

Author: agomes
Date: Fri Sep 16 20:48:32 2016
New Revision: 1761081

URL: http://svn.apache.org/viewvc?rev=1761081=rev
Log:
This closes #209

Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileDialoger.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/FilePanel.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/FilePanelEntry.java

jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPublisherGui.java

Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileDialoger.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileDialoger.java?rev=1761081=1761080=1761081=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileDialoger.java 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileDialoger.java Fri Sep 
16 20:48:32 2016
@@ -45,7 +45,7 @@ public final class FileDialoger {
 }
 
 /**
- * Prompts the user to choose a file from their filesystems for our own
+ * Prompts the user to choose a file or a directory from their filesystems 
for our own
  * devious uses. This method maintains the last directory the user visited
  * before dismissing the dialog. This does NOT imply they actually chose a
  * file from that directory, only that they closed the dialog there. It is
@@ -60,7 +60,7 @@ public final class FileDialoger {
 }
 
 /**
- * Prompts the user to choose a file from their filesystems for our own
+ * Prompts the user to choose a file or a directory from their filesystems 
for our own
  * devious uses. This method maintains the last directory the user visited
  * before dismissing the dialog. This does NOT imply they actually chose a
  * file from that directory, only that they closed the dialog there. It is
@@ -78,7 +78,27 @@ public final class FileDialoger {
 }
 
 /**
- * Prompts the user to choose a file from their filesystems for our own
+ * Prompts the user to choose a file or a directory from their filesystems 
for our own
+ * devious uses. This method maintains the last directory the user visited
+ * before dismissing the dialog. This does NOT imply they actually chose a
+ * file from that directory, only that they closed the dialog there. It is
+ * the caller's responsibility to check to see if the selected file is
+ * non-null.
+ * @param existingFileName The name of a file with path. If the filename 
points
+ * to an existing file, the directory in which it lies, will 
be used
+ * as the starting point for the returned JFileChooser.
+ * @param onlyDirectories If true, only directories are displayed in the 
FileChooser
+ *
+ * @return the JFileChooser that interacted with the user, after they are
+ * finished using it - null if no file was chosen
+ */
+public static JFileChooser promptToOpenFile(String existingFileName, 
boolean onlyDirectories) {
+return promptToOpenFile(new String[0], existingFileName, 
onlyDirectories);
+}
+
+
+/**
+ * Prompts the user to choose a file or a directory from their filesystems 
for our own
  * devious uses. This method maintains the last directory the user visited
  * before dismissing the dialog. This does NOT imply they actually chose a
  * file from that directory, only that they closed the dialog there. It is
@@ -95,7 +115,7 @@ public final class FileDialoger {
 }
 
 /**
- * Prompts the user to choose a file from their filesystems for our own
+ * Prompts the user to choose a file or a directory from their filesystems 
for our own
  * devious uses. This method maintains the last directory the user visited
  * before dismissing the dialog. This does NOT imply they actually chose a
  * file from that directory, only that they closed the dialog there. It is
@@ -111,38 +131,64 @@ public final class FileDialoger {
  * finished using it - null if no file was chosen
  */
 public static JFileChooser promptToOpenFile(String[] exts, String 
existingFileName) {
-if(!StringUtils.isEmpty(existingFileName)) {
-File existingFileStart = new File(existingFileName);
-if(existingFileStart.exists() && existingFileStart.canRead()) {
-jfc.setCurrentDirectory(new File(existingFileName));
-}
-}
-else if (lastJFCDirectory == null) {
-String start = System.getProperty("user.dir", ""); 
//$NON-NLS-1$//$NON-NLS-2$
+return promptToOpenFile(exts, null, false);
+}
+  
+/**
+* Prompts the user to choose a file or a directory from their filesystems 
for our own
+* devious uses. This method maintains the last directory the user visited
+* before dismissing the dialog. This does NOT imply they actua

svn commit: r1761078 - /jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSet.java

[agomes]

Author: agomes
Date: Fri Sep 16 20:33:56 2016
New Revision: 1761078

URL: http://svn.apache.org/viewvc?rev=1761078=rev
Log:
This closes #196

Modified:
jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSet.java

Modified: jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSet.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSet.java?rev=1761078=1761077=1761078=diff
==
--- jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSet.java 
(original)
+++ jmeter/trunk/src/components/org/apache/jmeter/config/CSVDataSet.java Fri 
Sep 16 20:33:56 2016
@@ -156,7 +156,7 @@ public class CSVDataSet extends ConfigTe
 delim=",";
 }
 if (vars == null) {
-String _fileName = getFilename();
+String _fileName = getFilename().trim();
 String mode = getShareMode();
 int modeInt = CSVDataSetBeanInfo.getShareModeAsInt(mode);
 switch(modeInt){

svn commit: r1760749 - /jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsHTMLFormated.java

[agomes]

Author: agomes
Date: Wed Sep 14 20:18:03 2016
New Revision: 1760749

URL: http://svn.apache.org/viewvc?rev=1760749=rev
Log:
Add RenderAsHTMLFormated.java file

Added:

jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsHTMLFormated.java

Added: 
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsHTMLFormated.java
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsHTMLFormated.java?rev=1760749=auto
==
--- 
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsHTMLFormated.java
 (added)
+++ 
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RenderAsHTMLFormated.java
 Wed Sep 14 20:18:03 2016
@@ -0,0 +1,51 @@
+/*
+ * 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"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *   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.
+ *
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jmeter.visualizers;
+
+import org.apache.jmeter.samplers.SampleResult;
+import org.apache.jmeter.util.JMeterUtils;
+import org.jsoup.Jsoup;
+
+public class RenderAsHTMLFormated extends SamplerResultTab implements 
ResultRenderer {
+
+/** {@inheritDoc} */
+@Override
+public void renderResult(SampleResult sampleResult) {
+String response = 
ViewResultsFullVisualizer.getResponseAsString(sampleResult);
+showHTMLFormatedResponse(response);
+}
+
+private void showHTMLFormatedResponse(String response) {
+results.setContentType("text/plain"); // $NON-NLS-1$
+results.setText(response == null ? "" : Jsoup.parse(response).html()); 
// $NON-NLS-1$
+results.setCaretPosition(0);
+resultsScrollPane.setViewportView(results);
+// Bug 55111 - Refresh JEditor pane size depending on the presence or 
absence of scrollbars
+resultsScrollPane.setPreferredSize(resultsScrollPane.getMinimumSize());
+results.revalidate();
+}
+
+/** {@inheritDoc} */
+@Override
+public String toString() {
+return JMeterUtils.getResString("view_results_render_html_formated"); 
// $NON-NLS-1$
+}
+
+}

svn commit: r1760716 - in /jmeter/trunk: bin/jmeter.properties src/core/org/apache/jmeter/resources/messages.properties src/core/org/apache/jmeter/resources/messages_fr.properties xdocs/changes.xml xd

[agomes]

Author: agomes
Date: Wed Sep 14 14:55:29 2016
New Revision: 1760716

URL: http://svn.apache.org/viewvc?rev=1760716=rev
Log:
This closes #224

Modified:
jmeter/trunk/bin/jmeter.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
jmeter/trunk/xdocs/changes.xml
jmeter/trunk/xdocs/usermanual/component_reference.xml

Modified: jmeter/trunk/bin/jmeter.properties
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.properties?rev=1760716=1760715=1760716=diff
==
--- jmeter/trunk/bin/jmeter.properties (original)
+++ jmeter/trunk/bin/jmeter.properties Wed Sep 14 14:55:29 2016
@@ -1142,7 +1142,7 @@ cookies=cookies
 # Note full class names should be used for non jmeter core renderers
 # For JMeter core renderers, class names start with . and are automatically
 # prefixed with org.apache.jmeter.visualizers
-view.results.tree.renderers_order=.RenderAsText,.RenderAsRegexp,.RenderAsCssJQuery,.RenderAsXPath,.RenderAsHTML,.RenderAsHTMLWithEmbedded,.RenderAsDocument,.RenderAsJSON,.RenderAsXML
+view.results.tree.renderers_order=.RenderAsText,.RenderAsRegexp,.RenderAsCssJQuery,.RenderAsXPath,.RenderAsHTML,.RenderAsHTMLWithEmbedded,.RenderAsHTMLFormated,.RenderAsDocument,.RenderAsJSON,.RenderAsXML
 
 # Maximum size of Document that can be parsed by Tika engine; defaut=10 * 1024 
* 1024 (10MB)
 # Set to 0 to disable the size check

Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties?rev=1760716=1760715=1760716=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Wed 
Sep 14 14:55:29 2016
@@ -1250,6 +1250,7 @@ view_results_render=Render:
 view_results_render_document=Document
 view_results_render_html=HTML
 view_results_render_html_embedded=HTML (download resources)
+view_results_render_html_formated=HTML Source Formated
 view_results_render_json=JSON
 view_results_render_text=Text
 view_results_render_xml=XML

Modified: 
jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties?rev=1760716=1760715=1760716=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties 
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties 
Wed Sep 14 14:55:29 2016
@@ -1235,6 +1235,7 @@ view_results_render=Rendu \:
 view_results_render_document=Document
 view_results_render_html=HTML
 view_results_render_html_embedded=HTML et ressources
+view_results_render_html_formated=Code source HTML Format\u00E9
 view_results_render_json=JSON
 view_results_render_text=Texte brut
 view_results_render_xml=XML

Modified: jmeter/trunk/xdocs/changes.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1760716=1760715=1760716=diff
==
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Wed Sep 14 14:55:29 2016
@@ -180,6 +180,7 @@ Summary
 
 Controllers
 
+59948Add a formated and sane HTML source code render to View 
Results Tree
 
 
 Listeners

Modified: jmeter/trunk/xdocs/usermanual/component_reference.xml
URL: 
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=1760716=1760715=1760716=diff
==
--- jmeter/trunk/xdocs/usermanual/component_reference.xml (original)
+++ jmeter/trunk/xdocs/usermanual/component_reference.xml Wed Sep 14 14:55:29 
2016
@@ -2886,6 +2886,9 @@ Images, style-sheets, etc. aren't downlo
 If the HTML (download resources) view option is selected, the 
renderer
 may download images, style-sheets, etc. referenced by the HTML code. 
 
+HTML Source formated
+If the HTML Source formated view option is selected, the renderer 
will display the HTML source code formated and cleaned by https://jsoup.org/;>Jsoup. 
+
 JSON
 The JSON view will show the response in tree style (also handles 
JSON embedded in JavaScript).