From dev-return-9940-apmail-jmeter-dev-archive=jmeter.apache.org@jmeter.apache.org Sat Sep 16 21:53:09 2017 Return-Path: X-Original-To: apmail-jmeter-dev-archive@minotaur.apache.org Delivered-To: apmail-jmeter-dev-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 674161AE49 for ; Sat, 16 Sep 2017 21:53:09 +0000 (UTC) Received: (qmail 16233 invoked by uid 500); 16 Sep 2017 21:53:09 -0000 Delivered-To: apmail-jmeter-dev-archive@jmeter.apache.org Received: (qmail 16193 invoked by uid 500); 16 Sep 2017 21:53:09 -0000 Mailing-List: contact dev-help@jmeter.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jmeter.apache.org Delivered-To: mailing list dev@jmeter.apache.org Received: (qmail 16177 invoked by uid 99); 16 Sep 2017 21:53:08 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 16 Sep 2017 21:53:08 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 77EB6C324A for ; Sat, 16 Sep 2017 21:53:08 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.679 X-Spam-Level: * X-Spam-Status: No, score=1.679 tagged_above=-999 required=6.31 tests=[DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, HTML_MESSAGE=2, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RCVD_IN_SORBS_SPAM=0.5, SPF_PASS=-0.001] autolearn=disabled Authentication-Results: spamd1-us-west.apache.org (amavisd-new); dkim=pass (2048-bit key) header.d=gmail.com Received: from mx1-lw-us.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id PXzoSf2kJd0V for ; Sat, 16 Sep 2017 21:53:06 +0000 (UTC) Received: from mail-qt0-f182.google.com (mail-qt0-f182.google.com [209.85.216.182]) by mx1-lw-us.apache.org (ASF Mail Server at mx1-lw-us.apache.org) with ESMTPS id 5087C5F642 for ; Sat, 16 Sep 2017 21:53:06 +0000 (UTC) Received: by mail-qt0-f182.google.com with SMTP id f15so4803943qtf.7 for ; Sat, 16 Sep 2017 14:53:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:in-reply-to:references:from:date:message-id:subject:to; bh=UhDe2LhcvNWyDFGVnlwsblFTDBbg+lYkSgglxj+DssY=; b=ahacgfQne8xkxcdOHUu+mZ0YoDp33iCW1avyLJWyvRHUdt/DkqKGkFbrxoUe1FSs5s ockUHoELpeG37fcYFD3Tc9AhNf9P0quyN9jyNXN6ZIz6y8S++dlbCN8OdNLktHvrwhnx TcO73WT7eANPG5oCY+Errjy0mUFgNlVt/lAr98ftSSR0JmiifYBB4K8xxuOK0aRYrevS 3W7WV1Iu8YzAq8+3LhDvDPETsEmRQXtf9CACP7l6oEQ+2HiHxllp3GXR+1YEqmHPWp0B 85g3+bF0SDmzjquuig2QdwhevQr5sjf8Aw+ELqNPXvOtHuXD1dHaNbVxD7UG999b4IHO S+Rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to; bh=UhDe2LhcvNWyDFGVnlwsblFTDBbg+lYkSgglxj+DssY=; b=MqAOplmepZGP3oqVngQ8oNpuZpLVI2fuDYrlkgdHwDNkDiJ5rsPJ0+QchKDey19CHB cIiCFjfrrE9L+kL8yWwPiijHxSC5S1qJjwLALdMY7McCJn2uOGwmjrbyxGSzmH8mCSda RJs6largLvmR1VWJwpIL/kKtEgQJwCWnJqE1zO8BivhvNxRC8MwV3Ggs/4gyoTZso3JN X+mGh/5zQpELcPMf4xJviIgGBhLvA6d9wHfIsJuQRY++qlrqH04TuusaJ2XeVonW8JTe 2VBGO3sLqt5gjnwVVhHi7DJhIJLLmVvlxXDcKuj6Rkhkjf/1pzpARYduYPLzZx2tWWaD 1Wfw== X-Gm-Message-State: AHPjjUhixT8dFjR+4yef/y5nsaWB3Gz5gvXPGDnRC4ejYlwvMep8BbLZ XgWsSDsUL+/DVpK5rzVDwg7bAKotAg2rHiUf9pzJTg== X-Google-Smtp-Source: AOwi7QC4QGIRNP4P2lcBGJXZhNzfP20VoGyVZm0sAYpr5tlqoCgniQlBh/3mctTjSMz1OOSTV8ngsr91wEHAc+z6sgc= X-Received: by 10.200.47.173 with SMTP id l42mr44799942qta.298.1505598779384; Sat, 16 Sep 2017 14:52:59 -0700 (PDT) MIME-Version: 1.0 Received: by 10.12.153.59 with HTTP; Sat, 16 Sep 2017 14:52:58 -0700 (PDT) In-Reply-To: <20170916214810.D24783A00B7@svn01-us-west.apache.org> References: <20170916214810.D24783A00B7@svn01-us-west.apache.org> From: Philippe Mouawad Date: Sat, 16 Sep 2017 23:52:58 +0200 Message-ID: Subject: Re: 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/usermanual/properties_reference.xml To: "dev@jmeter.apache.org" Content-Type: multipart/alternative; boundary="001a113c50326b67330559558839" --001a113c50326b67330559558839 Content-Type: text/plain; charset="UTF-8" Hello, Thanks I would name property: - csvdataset.file.encoding_list Thanks On Sat, Sep 16, 2017 at 11:48 PM, wrote: > Author: agomes > Date: Sat Sep 16 21:48:06 2017 > New Revision: 1808595 > > URL: http://svn.apache.org/viewvc?rev=1808595&view=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&r1=1808594&r2=1808595&view=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&r1=1808594&r2=1808595&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 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&r1=1808594&r2=1808595&view=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&r1=1808594&r2= > 1808595&view=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&r1=1808594&r2=1808595&view=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 >
    anchor="csv_dataset"> > > > + List of file encoding values
    > + Defaults to: platform default > +     > + > String to return at EOF > (if recycle not used).
    > Defaults to: <EOF> >     > > > -- Cordialement. Philippe Mouawad. --001a113c50326b67330559558839--