Re: svn commit: r1762082 - in /jmeter/trunk: src/core/org/apache/jmeter/util/JSR223TestElement.java src/core/org/apache/jmeter/util/ScriptingTestElement.java xdocs/changes.xml

[sebb]

On 23 September 2016 at 20:28,   wrote:
> Author: agomes
> Date: Fri Sep 23 19:28:58 2016
> New Revision: 1762082
>
> URL: http://svn.apache.org/viewvc?rev=1762082=rev
> Log:
> This closes #223

Bugzilla Id?

> Modified:
> jmeter/trunk/src/core/org/apache/jmeter/util/JSR223TestElement.java
> jmeter/trunk/src/core/org/apache/jmeter/util/ScriptingTestElement.java
> jmeter/trunk/xdocs/changes.xml
>
> Modified: jmeter/trunk/src/core/org/apache/jmeter/util/JSR223TestElement.java
> URL: 
> http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/JSR223TestElement.java?rev=1762082=1762081=1762082=diff
> ==
> --- jmeter/trunk/src/core/org/apache/jmeter/util/JSR223TestElement.java 
> (original)
> +++ jmeter/trunk/src/core/org/apache/jmeter/util/JSR223TestElement.java Fri 
> Sep 23 19:28:58 2016
> @@ -66,6 +66,8 @@ public abstract class JSR223TestElement
>  }
>
>  private static final long serialVersionUID = 233L;
> +
> +private static final Logger log = LoggingManager.getLoggerForClass();
>
>  /** If not empty then script in ScriptText will be compiled and cached */
>  private String cacheKey = "";
> @@ -86,11 +88,16 @@ public abstract class JSR223TestElement
>  }
>
>  protected ScriptEngine getScriptEngine() throws ScriptException {
> -final String lang = getScriptLanguage();
> +String lang = getScriptLanguage();
> +
> +if (StringUtils.isEmpty(lang)) {
> +lang = DEFAULT_SCRIPT_LANGUAGE;
> +setScriptLanguage(lang);
> +}
>
>  ScriptEngine scriptEngine = getInstance().getEngineByName(lang);
>  if (scriptEngine == null) {
> -throw new ScriptException("Cannot find engine named: '"+lang+"', 
> ensure you set language field in JSR223 Test Element:"+getName());
> +throw new ScriptException("Cannot find engine named: '"+lang+"', 
> ensure you set language field in JSR223 Test Element: "+getName());
>  }
>
>  return scriptEngine;
>
> Modified: 
> jmeter/trunk/src/core/org/apache/jmeter/util/ScriptingTestElement.java
> URL: 
> http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/ScriptingTestElement.java?rev=1762082=1762081=1762082=diff
> ==
> --- jmeter/trunk/src/core/org/apache/jmeter/util/ScriptingTestElement.java 
> (original)
> +++ jmeter/trunk/src/core/org/apache/jmeter/util/ScriptingTestElement.java 
> Fri Sep 23 19:28:58 2016
> @@ -36,6 +36,8 @@ public abstract class ScriptingTestEleme
>  private String script = ""; // script (if file not provided)
>
>  protected String scriptLanguage = ""; // BSF/JSR223 language to use
> +
> +protected final static String DEFAULT_SCRIPT_LANGUAGE = "groovy"; // if 
> no language is chosen in GUI
>  //-- For TestBean implementations only
>
>  public ScriptingTestElement() {
>
> Modified: jmeter/trunk/xdocs/changes.xml
> URL: 
> http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1762082=1762081=1762082=diff
> ==
> --- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
> +++ jmeter/trunk/xdocs/changes.xml [utf-8] Fri Sep 23 19:28:58 2016
> @@ -161,6 +161,7 @@ Summary
>  60137In Distributed testing when using Stripped modes 
> strip response also on error
>  60106Settings defaults : Switch 
> "jmeter.save.saveservice.connect_time" to true (after 3.0)
>  229 tiny memory allocation improvements. Contributed by 
> Benoit Wiart (b.wiart at ubik-ingenierie.com)
> +59945For all JSR223 elements, if script language has not 
> been chosen on the UI, the script will be interpreted as a groovy script.
>  
>
>  Non-functional changes
>
>

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

[sebb]

On 16 September 2016 at 22:06,   wrote:
> 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

Bugzilla Ids?

> 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
>
>

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

[sebb]

On 16 September 2016 at 21:53,   wrote:
> 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

Bugzilla Id?

> 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()){
>
>

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

[sebb]

On 16 September 2016 at 21:48,   wrote:
> 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

Bug Id?

> 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, 

Re: 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.xm

[sebb]

On 14 September 2016 at 15:55,   wrote:
> 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

Please add the Bugzilla Id to the commit log message.

> 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  href="https://jsoup.org/;>Jsoup.
> +
>  JSON
>  The JSON view will show the response in tree style (also handles 
> JSON embedded in JavaScript).
>  
>
>

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

[sebb]

On 15 September 2016 at 18:26, Felix Schumacher
 wrote:
> Am 14.09.2016 um 22:18 schrieb ago...@apache.org:
>>
>> 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
>
> I think we should correct ...[Ff]ormated to ...[Ff]ormatted and normally we
> add the header from the commit messages to the corresponding bugzilla
> entries.

Also please add the Bugzilla id to the SVN log message.

> Regards,
>  Felix
>
>
>>
>> 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$
>> +}
>> +
>> +}
>>
>>
>

Re: Start the next release 3.1 into 1-2 weeks?

[Antonio Gomes Rodrigues]

Hi,

I have commited all my PR

bz still open in the Felix list:
 * bz 60092 (BODY empty for PUT) (patch would be similar to 60066)
 * bz 55258 remove CLOSE icon (PR available)
 * bz 59441 drop generated docs from svn (sebb points out, that the release
process would have to be adapted)


About PR 72 (https://github.com/apache/jmeter/pull/72) : MQTT plugin for
Jmeter
Someone have check if Eclipse Paho MQTT client v1.0.2 is the best choice?

Antonio



2016-09-15 20:35 GMT+02:00 Felix Schumacher <
felix.schumac...@internetallee.de>:

> Am 13.09.2016 um 16:20 schrieb Milamber:
>
>> Hello,
>>
>> Are you willing to start the next release process withing 1 to 2 weeks? I
>> can act as RM.
>>
> Great news. Thanks.
>
>>
>> The next release will keep the Java 7 support (probably this release will
>> be the last with Java 7 support).
>>
>> What are the bugs which will must be fixed before the next release?
>>
>  * bz 60092 (BODY empty for PUT) (patch would be similar to 60066)
>  * bz 60121 (CSS parser warnings) (waiting for release of backport ph-css
> (should be available soon))
>
>>
>> If you want add an improvement before the next release, please indicate
>> now.
>>
> I would like to address
>  * bz 60066 (CLOB/BLOB) (patch is ready, doc is missing)
>  * bz 60125 (TAB for delimiter in reports CSV) (patch is ready, doc is
> missing)
>  * doc for usage of SLF4J with maven
>
> Things that could/should be handled?
>  * bz 55258 remove CLOSE icon (PR available)
>  * bz 59441 drop generated docs from svn (sebb points out, that the
> release process would have to be adapted)
>
>
> Felix
>
>>
>> Milamber
>>
>
>
>

[GitHub] jmeter pull request #223: Bug59945_DefaultGroovyEngineToJSR223ElementsV2

[ra0077]

Github user ra0077 closed the pull request at:

https://github.com/apache/jmeter/pull/223


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---

[GitHub] jmeter issue #223: Bug59945_DefaultGroovyEngineToJSR223ElementsV2

[ra0077]

Github user ra0077 commented on the issue:

https://github.com/apache/jmeter/pull/223
  
PR commited


---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---