You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by ag...@apache.org on 2017/09/16 22:04:53 UTC
svn commit: r1808598 - in /jmeter/trunk: bin/jmeter.properties
src/components/org/apache/jmeter/config/CSVDataSetBeanInfo.java
xdocs/usermanual/properties_reference.xml
Author: agomes
Date: Sat Sep 16 22:04:53 2017
New Revision: 1808598
URL: http://svn.apache.org/viewvc?rev=1808598&view=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&r1=1808597&r2=1808598&view=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=<EOF>
#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&r1=1808597&r2=1808598&view=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&r1=1808597&r2=1808598&view=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</source>
<section name="§-num;.33 CSV DataSet configuration" anchor="csv_dataset">
<properties>
<property name="csvdataset.eofstring">
- List of file encoding values<br/>
- Defaults to: <code>platform default</code>
-</property>
-<property name="csvdataset.file.encoding">
String to return at <abbr title="end of file"><code>EOF</code></abbr> (if recycle not used).<br/>
Defaults to: <code><EOF></code>
</property>
+<property name="csvdataset.file.encoding_list">
+ List of file encoding values<br/>
+ Defaults to: <code>platform default</code>
+</property>
</properties>
</section>
<section name="§-num;.34 LDAP Sampler configuration" anchor="ldap">