svn commit: r1835312 - in /jmeter/trunk/src/core/org/apache/jmeter: gui/util/HeaderAsPropertyRendererWrapper.java util/XPathUtil.java
Author: fschumacher
Date: Sat Jul 7 14:14:43 2018
New Revision: 1835312
URL: http://svn.apache.org/viewvc?rev=1835312&view=rev
Log:
javadoc fixes. Add description to throws tag and really use code tag
Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/util/HeaderAsPropertyRendererWrapper.java
jmeter/trunk/src/core/org/apache/jmeter/util/XPathUtil.java
Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/util/HeaderAsPropertyRendererWrapper.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/HeaderAsPropertyRendererWrapper.java?rev=1835312&r1=1835311&r2=1835312&view=diff
==
---
jmeter/trunk/src/core/org/apache/jmeter/gui/util/HeaderAsPropertyRendererWrapper.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/gui/util/HeaderAsPropertyRendererWrapper.java
Sat Jul 7 14:14:43 2018
@@ -84,7 +84,7 @@ public class HeaderAsPropertyRendererWra
/**
* @param table {@link JTable}
* @param columnsMsgParameters ignored
- * @deprecated don't use {@columnsMsgParameters} as they are not moved
when the columns
+ * @deprecated don't use {@code columnsMsgParameters} as they are not
moved when the columns
* of the corresponding tables object model are moved
*/
@Deprecated
Modified: jmeter/trunk/src/core/org/apache/jmeter/util/XPathUtil.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/XPathUtil.java?rev=1835312&r1=1835311&r2=1835312&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/util/XPathUtil.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/XPathUtil.java Sat Jul 7
14:14:43 2018
@@ -522,8 +522,8 @@ public class XPathUtil {
* Compute namespaces for XML
* @param xml XML content
* @return List of Namespaces
- * @throws XMLStreamException
- * @throws FactoryConfigurationError
+ * @throws XMLStreamException on problematic xml
+ * @throws FactoryConfigurationError when no xml input factory can be
established
*/
public static List getNamespaces(String xml)
throws XMLStreamException, FactoryConfigurationError{
svn commit: r1835311 - in /jmeter/trunk: src/core/org/apache/jmeter/samplers/RemoteSampleListenerImpl.java src/core/org/apache/jmeter/threads/RemoteThreadsListenerImpl.java xdocs/changes.xml xdocs/use
Author: fschumacher
Date: Sat Jul 7 13:27:20 2018
New Revision: 1835311
URL: http://svn.apache.org/viewvc?rev=1835311&view=rev
Log:
Fix usage of ports, when client.rmi.localport is set for distributed runs.
This is not a complete fix, as there can be more than one Listener and
they can be initialized more than once. That will lead to exceptions.
Bugzilla Id: 62463
Modified:
jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteSampleListenerImpl.java
jmeter/trunk/src/core/org/apache/jmeter/threads/RemoteThreadsListenerImpl.java
jmeter/trunk/xdocs/changes.xml
jmeter/trunk/xdocs/usermanual/remote-test.xml
Modified:
jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteSampleListenerImpl.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteSampleListenerImpl.java?rev=1835311&r1=1835310&r2=1835311&view=diff
==
---
jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteSampleListenerImpl.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteSampleListenerImpl.java
Sat Jul 7 13:27:20 2018
@@ -37,8 +37,8 @@ public class RemoteSampleListenerImpl ex
private final SampleListener sampleListener;
-private static final int DEFAULT_LOCAL_PORT =
-JMeterUtils.getPropDefault("client.rmi.localport", 0); // $NON-NLS-1$
+private static final int DEFAULT_LOCAL_PORT = addOffset(
+JMeterUtils.getPropDefault("client.rmi.localport", 0), 2); //
$NON-NLS-1$
public RemoteSampleListenerImpl(Object listener) throws RemoteException {
super(DEFAULT_LOCAL_PORT, RmiUtils.createClientSocketFactory(),
RmiUtils.createServerSocketFactory());
@@ -54,6 +54,13 @@ public class RemoteSampleListenerImpl ex
}
}
+private static int addOffset(int port, int offset) {
+if (port == 0) {
+return 0;
+}
+return port + offset;
+}
+
@Override
public void testStarted() {
if (testListener != null) {
Modified:
jmeter/trunk/src/core/org/apache/jmeter/threads/RemoteThreadsListenerImpl.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/threads/RemoteThreadsListenerImpl.java?rev=1835311&r1=1835310&r2=1835311&view=diff
==
---
jmeter/trunk/src/core/org/apache/jmeter/threads/RemoteThreadsListenerImpl.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/threads/RemoteThreadsListenerImpl.java
Sat Jul 7 13:27:20 2018
@@ -49,8 +49,8 @@ public class RemoteThreadsListenerImpl e
/**
*
*/
-private static final int DEFAULT_LOCAL_PORT =
-JMeterUtils.getPropDefault("client.rmi.localport", 0); //
$NON-NLS-1$
+private static final int DEFAULT_LOCAL_PORT = addOffset(
+JMeterUtils.getPropDefault("client.rmi.localport", 0), 1); //
$NON-NLS-1$
/**
* @throws RemoteException if failed to export object
@@ -80,6 +80,13 @@ public class RemoteThreadsListenerImpl e
}
}
+private static int addOffset(int port, int offset) {
+if (port == 0) {
+return 0;
+}
+return port + offset;
+}
+
/**
*
* @see RemoteThreadsListener#threadStarted()
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1835311&r1=1835310&r2=1835311&view=diff
==
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sat Jul 7 13:27:20 2018
@@ -241,6 +241,7 @@ this behaviour, set httpclient.res
62281Prevent NPE in MapProperty. Patch by belugabehr (dam6923
at gmail.com)
62457In usermanual, the UUID Function's example is wrong.
Contributed by helppass (onegaicimasu at hotmail.com)
62478Escape commata in parameters when constructing function
strings in the GUI function helper. Reported by blue414 (blue414 at
163.com)
+ 62463Fix usage of ports, when
client.rmi.localport is set for distributed runs.
Modified: jmeter/trunk/xdocs/usermanual/remote-test.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/remote-test.xml?rev=1835311&r1=1835310&r2=1835311&view=diff
==
--- jmeter/trunk/xdocs/usermanual/remote-test.xml (original)
+++ jmeter/trunk/xdocs/usermanual/remote-test.xml Sat Jul 7 13:27:20 2018
@@ -92,10 +92,10 @@ there is no need to start RMI registry s
To revert to the previous behaviour, define the JMeter property
server.rmi.create=false on the server host systems.
-By default, RMI uses a dynamic port for the JMeter server engine. This can
cause problems for firewalls,
+By default, RMI uses dynamic ports for the JMeter server engine. This can
cause problems for firewalls,
so
svn commit: r1835310 - in /jmeter/trunk: src/core/org/apache/jmeter/resources/messages.properties src/core/org/apache/jmeter/resources/messages_fr.properties xdocs/usermanual/component_reference.xml
Author: pmouawad Date: Sat Jul 7 13:25:49 2018 New Revision: 1835310 URL: http://svn.apache.org/viewvc?rev=1835310&view=rev Log: Make field name clearer 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/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=1835310&r1=1835309&r2=1835310&view=diff == --- jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties (original) +++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages.properties Sat Jul 7 13:25:49 2018 @@ -1424,7 +1424,7 @@ xpath_assertion_whitespace=Ignore whites xpath_expression=XPath expression to match against xpath_extractor_fragment=Return entire XPath fragment instead of text content? xpath_extractor_query=XPath query: -xpath_extractor_user_namespaces=Namespaces list : +xpath_extractor_user_namespaces=Namespaces aliases list (prefix=full namespace, 1 per line) : xpath_extractor_title=XPath Extractor xpath_file_file_name=XML file to get values from xpath_tester=XPath Tester 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=1835310&r1=1835309&r2=1835310&view=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 Jul 7 13:25:49 2018 @@ -1413,7 +1413,7 @@ xpath_assertion_whitespace=Ignorer les e xpath_expression=Expression XPath de correspondance xpath_extractor_fragment=Retourner le fragment XPath entier au lieu du contenu xpath_extractor_query=Requ\u00EAte XPath \: -xpath_extractor_user_namespaces=Liste des namespaces \: +xpath_extractor_user_namespaces=Liste des alias de namespaces \: xpath_extractor_title=Extracteur XPath xpath_file_file_name=Fichier XML contenant les valeurs xpath_tester=Testeur XPath Modified: jmeter/trunk/xdocs/usermanual/component_reference.xml URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=1835310&r1=1835309&r2=1835310&view=diff == --- jmeter/trunk/xdocs/usermanual/component_reference.xml (original) +++ jmeter/trunk/xdocs/usermanual/component_reference.xml Sat Jul 7 13:25:49 2018 @@ -5794,7 +5794,7 @@ extracting the node as text or attribute Default value returned when no match found. It is also returned if the node has no value and the fragment option is not selected. -List of namespaces aliases you want to use to parse the document, one line per declaration. +List of namespaces aliases you want to use to parse the document, one line per declaration. You must specify them as follow : prefix=namespace. This implementation makes it easier to use namespaces than with the old XPathExtractor version.
svn commit: r1835306 - in /jmeter/trunk/xdocs: changes.xml stylesheets/site_printable.vsl stylesheets/website-style.xsl usermanual/properties_reference.xml
Author: fschumacher
Date: Sat Jul 7 12:51:29 2018
New Revision: 1835306
URL: http://svn.apache.org/viewvc?rev=1835306&view=rev
Log:
Add a rfc-tag to the site docs
Modified:
jmeter/trunk/xdocs/changes.xml
jmeter/trunk/xdocs/stylesheets/site_printable.vsl
jmeter/trunk/xdocs/stylesheets/website-style.xsl
jmeter/trunk/xdocs/usermanual/properties_reference.xml
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1835306&r1=1835305&r2=1835306&view=diff
==
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sat Jul 7 12:51:29 2018
@@ -202,7 +202,7 @@ this behaviour, set httpclient.res
Timers, Assertions, Config, Pre- & Post-Processors
-61664HTTP Authorization Manager : Digest works only with
legacy RFC 2069, RFC 2617 is not implemented. Contributed by Ubik Load Pack
(support at ubikloadpack.com)
+61664HTTP Authorization Manager : Digest works only with
legacy , is not implemented. Contributed
by Ubik Load Pack (support at ubikloadpack.com)
62252HTTP header merging logic does not correspond to the
documentation
Modified: jmeter/trunk/xdocs/stylesheets/site_printable.vsl
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/stylesheets/site_printable.vsl?rev=1835306&r1=1835305&r2=1835306&view=diff
==
--- jmeter/trunk/xdocs/stylesheets/site_printable.vsl (original)
+++ jmeter/trunk/xdocs/stylesheets/site_printable.vsl Sat Jul 7 12:51:29 2018
@@ -238,6 +238,14 @@ No
https://github.com/apache/jmeter/pull/$id.getText()">Pull request
#$id.getText()##
#end
+#macro ( rfc $id)
+#if($id.getText())
+https://tools.ietf.org/html/rfc$id.getAttributeValue('link')">$id.getText()##
+#else
+https://tools.ietf.org/html/rfc$id.getAttributeValue('link')">RFC
$id.getAttributeValue('link')##
+#end
+#end
+
## Shorthand - automatically adds " - " before remaining text
#macro ( bug $id)
#bugzilla($id) - ##
@@ -299,6 +307,8 @@ Contributed by $id.getAttributeValue("na
#bug ($node)
#elseif ($node.getName().equals("pr"))
#pr ($node)
+#elseif ($node.getName().equals("rfc"))
+#rfc ($node)
#elseif ($node.getName().equals("contributor"))
#contributor ($node)
#elseif ($node.getName().equals("ch_section"))
Modified: jmeter/trunk/xdocs/stylesheets/website-style.xsl
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/stylesheets/website-style.xsl?rev=1835306&r1=1835305&r2=1835306&view=diff
==
--- jmeter/trunk/xdocs/stylesheets/website-style.xsl (original)
+++ jmeter/trunk/xdocs/stylesheets/website-style.xsl Sat Jul 7 12:51:29 2018
@@ -533,6 +533,17 @@
-
+
+
+
+https://tools.ietf.org/html/{@link}";>
+
+
+https://tools.ietf.org/html/{@link}";>RFC
+
+
+
+
https://github.com/apache/jmeter/pull/{./text()}">
Pull request #
Modified: jmeter/trunk/xdocs/usermanual/properties_reference.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/properties_reference.xml?rev=1835306&r1=1835305&r2=1835306&view=diff
==
--- jmeter/trunk/xdocs/usermanual/properties_reference.xml (original)
+++ jmeter/trunk/xdocs/usermanual/properties_reference.xml Sat Jul 7 12:51:29
2018
@@ -767,7 +767,7 @@ JMETER-SERVER
redirects and allows relative paths.
If you want to test strict conformance, set this value to
true.
When the property is true, JMeter follows
-http://tools.ietf.org/html/rfc3986#section-5.2";>RFC 3986 section
5.2.
+RFC 3986 section 5.2.
Defaults to: false
svn commit: r1835304 - /jmeter/trunk/xdocs/changes.xml
Author: fschumacher Date: Sat Jul 7 12:23:28 2018 New Revision: 1835304 URL: http://svn.apache.org/viewvc?rev=1835304&view=rev Log: Markup changes Modified: jmeter/trunk/xdocs/changes.xml Modified: jmeter/trunk/xdocs/changes.xml URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1835304&r1=1835303&r2=1835304&view=diff == --- jmeter/trunk/xdocs/changes.xml [utf-8] (original) +++ jmeter/trunk/xdocs/changes.xml [utf-8] Sat Jul 7 12:23:28 2018 @@ -88,7 +88,7 @@ this behaviour, set httpclient.res 58757HTTP Request : Updated deprecated methods of HttpComponents to last APIs of httpclient-4.5.X. Contributed by Ubik Load Pack (support at ubikloadpack.com) 62212Recorder : Improve UX by providing a popup above all windows to be able to change Transaction names and pauses while using Browser. Contributed by Ubik Load Pack (support at ubikloadpack.com) 62248HTTP Request : Parameters entered in Parameters Tab should be used in body instead of being ignored. Partly based on a patch by Artem Fedorov contributed by Blazemeter. -60015Multipart/form-data works only for POST using HTTPClient4 while it should for PUT, DELETE... Contributed by Ubik Load Pack (support at ubikloadpack.com) +60015Multipart/form-data works only for POST using HTTPClient4 while it should for PUT, DELETE, … Contributed by Ubik Load Pack (support at ubikloadpack.com) 62317HTTP(S) Test Script Recorder: allow to add ResultSaver to created sampler @@ -144,7 +144,7 @@ this behaviour, set httpclient.res 62238Add ability to Switch to next iteration of Current Loop. Contributed by Ubik Load Pack (support at ubikloadpack.com) 62239Add ability to Break Current Loop 62470CSV Output : Enable logging of sub results when jmeter.save.saveservice.subresults=true. Contributed by Ubik Load Pack (support at ubikloadpack.com) - 62473Setting "saveservice_properties" has counter intuitive behaviour + 62473Setting "saveservice_properties" has counter intuitive behaviour 62065Use Maven artifact for JAF Module instead of embedded module 379 Improve chinese translations. Contributed by XmeterNet 61714Update Real-time results documentation @@ -176,7 +176,7 @@ this behaviour, set httpclient.res 62114HTTP(S) Test Script Recorder : Client certificate authentication uses the first SSLManager created. Contributed by Ubik Load Pack (support at ubikloadpack.com) 61058HTTP Request : Add option httpclient4.deflate_relax_mode to avoid "Unexpected end of ZLIB input stream" when deflating what seems to be invalid streams. Contributed by Ubik Load Pack (support at ubikloadpack.com) 43612HTTP PUT does not honor request parameters. Implemented by Artem Fedorov (artem.fedorov at blazemeter.com) and contributed by BlazeMeter Ltd. -60190Content-Type is added for POST unconditionally. Contributed by Ubik Load Pack (support at ubikloadpack.com) +60190Content-Type is added for POST unconditionally. Contributed by Ubik Load Pack (support at ubikloadpack.com) 62462387Make delegation of credentials in SPNEGO possible again. @@ -202,7 +202,7 @@ this behaviour, set httpclient.res Timers, Assertions, Config, Pre- & Post-Processors -61664HTTP Authorization Manager : Digest works only with legacy RFC 2069 , RFC 2617 is not implemented. Contributed by Ubik Load Pack (support at ubikloadpack.com) +61664HTTP Authorization Manager : Digest works only with legacy RFC 2069, RFC 2617 is not implemented. Contributed by Ubik Load Pack (support at ubikloadpack.com) 62252HTTP header merging logic does not correspond to the documentation
svn commit: r1835297 - in /jmeter/trunk/xdocs: changes.xml usermanual/functions.xml
Author: fschumacher
Date: Sat Jul 7 08:00:04 2018
New Revision: 1835297
URL: http://svn.apache.org/viewvc?rev=1835297&view=rev
Log:
Correct typo in documentation.
Reported by Aaron Levin. Closes #392 on github
Modified:
jmeter/trunk/xdocs/changes.xml
jmeter/trunk/xdocs/usermanual/functions.xml
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1835297&r1=1835296&r2=1835297&view=diff
==
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sat Jul 7 08:00:04 2018
@@ -151,6 +151,7 @@ this behaviour, set httpclient.res
62354Correct calculation and usage of units for second per
user (reported by jffagot05 at gmail.com)
382Correct typo in documentation. Reported by Perze Ababa
(perze.ababa at gmail.com>)
386Add parameter support for RMI keystore creation scripts.
Contributed by Logan Mauzaize (t524467 at airfrance.fr)
+ 392Correct typo in documentation. Reported by Aaron Levin
Non-functional changes
@@ -266,6 +267,7 @@ this behaviour, set httpclient.res
Giancarlo Romeo (giancarloromeo at gmail.com)
helppass (onegaicimasu at hotmail.com)
blue414 (blue414 at 163.com)
+Aaron Levin
We also thank bug reporters who helped us improve JMeter.
Modified: jmeter/trunk/xdocs/usermanual/functions.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/functions.xml?rev=1835297&r1=1835296&r2=1835297&view=diff
==
--- jmeter/trunk/xdocs/usermanual/functions.xml (original)
+++ jmeter/trunk/xdocs/usermanual/functions.xml Sat Jul 7 08:00:04 2018
@@ -1438,7 +1438,7 @@ For example, the string ${__urld
Function to encode a string to a
application/x-www-form-urlencoded string.
-For example, the string ${__urldecode(Word "school" is "école" in
french)} returns
+For example, the string ${__urlencode(Word "school" is "école" in
french)} returns
Word+%22school%22+is+%22%C3%A9cole%22+in+french.
