[jmeter] branch master updated: refine the log message from the state of in pregress to complete (#714)
This is an automated email from the ASF dual-hosted git repository.
pmouawad 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 ff7e8496c5 refine the log message from the state of in pregress to
complete (#714)
ff7e8496c5 is described below
commit ff7e8496c576c67984c7de443ccc4a4ecb793cb9
Author: Zishuo Ding
AuthorDate: Fri Jun 3 15:39:48 2022 -0400
refine the log message from the state of in pregress to complete (#714)
---
.../org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
index 1021160c20..752e98505b 100644
---
a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
+++
b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
@@ -417,7 +417,7 @@ public class DefaultSamplerCreator extends
AbstractSamplerCreator {
sampler.setPath(request.getPath(), null);
}
if (log.isDebugEnabled()) {
-log.debug("Proxy: setting path: {}", sampler.getPath());
+log.debug("Proxy: finished setting path: {}", sampler.getPath());
}
}
[jmeter] branch master updated: Revert Bugfix 65885 (#709)
This is an automated email from the ASF dual-hosted git repository.
pmouawad 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 a997ed23ce Revert Bugfix 65885 (#709)
a997ed23ce is described below
commit a997ed23ce0f9625f92f98314b22d09a6ac96dd6
Author: Philippe M
AuthorDate: Mon May 9 21:40:06 2022 +0200
Revert Bugfix 65885 (#709)
* Revert Bugfix 65885
* Update changes
* Fix style violation
---
.../java/org/apache/jmeter/report/processor/ErrorsSummaryConsumer.java | 3 ++-
.../org/apache/jmeter/report/processor/ErrorsSummaryConsumerTest.java | 3 ---
xdocs/changes.xml | 1 -
3 files changed, 2 insertions(+), 5 deletions(-)
diff --git
a/src/core/src/main/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumer.java
b/src/core/src/main/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumer.java
index 3b8d3b5ae9..982198b921 100644
---
a/src/core/src/main/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumer.java
+++
b/src/core/src/main/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumer.java
@@ -97,7 +97,8 @@ public class ErrorsSummaryConsumer extends
AbstractSummaryConsumer {
"/" + escapeJson(responseMessage) : "");
if (MetricUtils.isSuccessCode(responseCode) ||
-StringUtils.isNotBlank(sample.getFailureMessage())) {
+(StringUtils.isEmpty(responseCode) &&
+ StringUtils.isNotBlank(sample.getFailureMessage( {
key = MetricUtils.ASSERTION_FAILED;
if (ASSERTION_RESULTS_FAILURE_MESSAGE) {
String msg = sample.getFailureMessage();
diff --git
a/src/core/src/test/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumerTest.java
b/src/core/src/test/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumerTest.java
index 9a41be978e..d236771725 100644
---
a/src/core/src/test/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumerTest.java
+++
b/src/core/src/test/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumerTest.java
@@ -57,9 +57,6 @@ public class ErrorsSummaryConsumerTest {
sample = new Sample(0, metadata, new String[] { "false", "403", "", ""
});
assertEquals("403", ErrorsSummaryConsumer.getErrorKey(sample));
-sample = new Sample(0, metadata, new String[] { "false", "403", "",
"FailureMessage" });
-assertEquals("FailureMessage",
ErrorsSummaryConsumer.getErrorKey(sample));
-
sample = new Sample(0, metadata, new String[] { "false", "500",
"Server Error", "" });
assertEquals("500/Server Error",
ErrorsSummaryConsumer.getErrorKey(sample));
}
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 805216f8e2..11130ddc2b 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -147,7 +147,6 @@ however, the profile can't be updated while the test is
running.
Report / Dashboard
65353Make the estimator used for calculating percentiles on
the dashboard configurable
- 65885HTML Report: Error report displays wrong failure message
when Response Assertion checks Ignore Status and response code is not 200
General
[jmeter] branch master updated: update tika-parsers to 1.28.1 (from 1.28) and xstreams to 1.4.19 (from 1.4.18) (#698)
This is an automated email from the ASF dual-hosted git repository. pmouawad 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 efe50ca update tika-parsers to 1.28.1 (from 1.28) and xstreams to 1.4.19 (from 1.4.18) (#698) efe50ca is described below commit efe50ca5b150cdbdb578886f8b4d98d3f1ea264f Author: sseide AuthorDate: Wed Feb 16 13:39:36 2022 +0100 update tika-parsers to 1.28.1 (from 1.28) and xstreams to 1.4.19 (from 1.4.18) (#698) * update tika-parsers to 1.28.1 (from 1.28) and xstreams to 1.4.19 (from 1.4.18) * update xercesImpl to 2.12.2 (from 2.12.1) and add new gpg key from xerces maintainer (ref XERCESJ-1735) * add pr number to changes.xml * update expected_release_jars.csv --- checksum.xml| 1 + gradle.properties | 6 +++--- src/dist/src/dist/expected_release_jars.csv | 8 xdocs/changes.xml | 7 +++ 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/checksum.xml b/checksum.xml index c335c72..c860213 100644 --- a/checksum.xml +++ b/checksum.xml @@ -198,6 +198,7 @@ + diff --git a/gradle.properties b/gradle.properties index 23207fd..376c329 100644 --- a/gradle.properties +++ b/gradle.properties @@ -132,12 +132,12 @@ slf4j.version=1.7.32 spock-core.version=2.0-M2-groovy-3.0 springframework.version=4.3.17.RELEASE svgSalamander.version=1.1.2.4 -tika.version=1.28 +tika.version=1.28.1 xalan.version=2.7.2 -xercesImpl.version=2.12.1 +xercesImpl.version=2.12.2 xml-apis.version=1.4.01 xmlgraphics-commons.version=2.6 xmlpull.version=1.1.3.1 xpp3_min.version=1.1.4c -xstream.version=1.4.18 +xstream.version=1.4.19 wiremock-jre8.version=2.30.0 diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv index a43c8d3..9caa9b8 100644 --- a/src/dist/src/dist/expected_release_jars.csv +++ b/src/dist/src/dist/expected_release_jars.csv @@ -121,13 +121,13 @@ 301279,svgSalamander-1.1.2.4.jar 10192,swing-extensions-laf-support-0.1.3.jar 2539,swing-extensions-visual-padding-0.1.3.jar -735635,tika-core-1.28.jar -1585374,tika-parsers-1.28.jar +735645,tika-core-1.28.1.jar +1585382,tika-parsers-1.28.1.jar 174661,vis-svg-portable-jvm-2.2.1.jar 3154938,xalan-2.7.2.jar -1386502,xercesImpl-2.12.1.jar +1446149,xercesImpl-2.12.2.jar 220536,xml-apis-1.4.01.jar 85686,xml-apis-ext-1.3.04.jar 674607,xmlgraphics-commons-2.6.jar 7188,xmlpull-1.1.3.1.jar -629707,xstream-1.4.18.jar +633140,xstream-1.4.19.jar diff --git a/xdocs/changes.xml b/xdocs/changes.xml index ced05b1..44a09ce 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -152,7 +152,7 @@ however, the profile can't be updated while the test is running. Added Kotlin 1.6.0 for JMeter engine implementation (apiVersion=1.5). The set of JSR 223 languages is intact. 65128643Add missing documentation about Same user on each iteration for Thread Groups. Contributed by njkuzas. 648Updated xmlgraphics-commons to 2.6 (from 2.3). Contributed by Stefan Seide (stefan at trilobyte-se.de) - 655667675Updated x-stream to 1.4.18 (from 1.4.15). Contributed by Stefan Seide (stefan at trilobyte-se.de) + 655667675698Updated x-stream to 1.4.19 (from 1.4.15). Contributed by Stefan Seide (stefan at trilobyte-se.de) 656668Updated json-smart to 2.4.7 (from 2.3), accessors-smart to 2.4.7 (from 1.2) and asm 9.1 (from 9.0). Contributed by Stefan Seide (stefan at trilobyte-se.de) 64831Log truststore entries in debug level for logger org.apache.jmeter.util.keystore.JmeterKeyStore 65232Hide splash screen when an error is displayed because the test plan could not be parsed. @@ -185,7 +185,7 @@ however, the profile can't be updated while the test is running. Updated RSyntaxTextArea to 3.1.3 (from 3.1.1). Updated SLF4J to 1.7.32 (from 1.7.30). Updated SvgSalamander to 1.1.2.4 (from 1.1.2.1). - Updated Apache Tika to 1.28 (from 1.26). + 698Updated Apache Tika to 1.28.1 (from 1.26). Updated WireMock-JRE8 to 2.30.0 (from 2.24.1). Updated com.github.vlsi.vlsi-release-plugins 1.76 (from 1.74). Updated jackson to 2.13.1 (from 2.10.5) @@ -263,10 +263,9 @@ however, the profile can't be updated while the test is running. General 64318DNS Cache Manager - custom DNS resolver does not use system resolver by default - 641Updated xercesImpl to 2.12.1 (from 2.12.0). Based on patch by Stefan Seide (stefan at trilobyte-se.de). + 641698Updated xercesImpl to 2.12.2 (from 2.12.0). Based on patch by Stefan Seide (stefan at trilobyte-se.de). 645Add escaping for new lines in AbstractInfluxdbMetricsSender. Contributed by David Getzlaff (david.getzlaff at t-systems.com>) 65198Can't copy generated function from FunctionHelper - Updated Apache Tika to 1.26 (fro
[jmeter] branch master updated: Bug 65885 - HTML Report: Error report displays wrong failure message when Response Assertion checks Ignore Status and response code is not 200
This is an automated email from the ASF dual-hosted git repository.
pmouawad 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 8546e23 Bug 65885 - HTML Report: Error report displays wrong failure
message when Response Assertion checks Ignore Status and response code is not
200
8546e23 is described below
commit 8546e2372ac08eecc27f56a5bfc24a6c4ecc7135
Author: pmouawad
AuthorDate: Tue Feb 15 23:09:16 2022 +0100
Bug 65885 - HTML Report: Error report displays wrong failure message
when Response Assertion checks Ignore Status and response code is not
200
---
.../jmeter/report/processor/ErrorsSummaryConsumer.java | 9 ++---
.../jmeter/report/processor/ErrorsSummaryConsumerTest.java | 13 +++--
xdocs/changes.xml | 1 +
3 files changed, 18 insertions(+), 5 deletions(-)
diff --git
a/src/core/src/main/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumer.java
b/src/core/src/main/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumer.java
index f017573..3b8d3b5 100644
---
a/src/core/src/main/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumer.java
+++
b/src/core/src/main/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumer.java
@@ -88,17 +88,20 @@ public class ErrorsSummaryConsumer extends
AbstractSummaryConsumer {
* @return String Error key for sample
*/
static String getErrorKey(Sample sample) {
+if (sample.getSuccess()) {
+return "";
+}
String responseCode = sample.getResponseCode();
String responseMessage = sample.getResponseMessage();
String key = responseCode + (!StringUtils.isEmpty(responseMessage) ?
"/" + escapeJson(responseMessage) : "");
+
if (MetricUtils.isSuccessCode(responseCode) ||
-(StringUtils.isEmpty(responseCode) &&
-!StringUtils.isEmpty(sample.getFailureMessage( {
+StringUtils.isNotBlank(sample.getFailureMessage())) {
key = MetricUtils.ASSERTION_FAILED;
if (ASSERTION_RESULTS_FAILURE_MESSAGE) {
String msg = sample.getFailureMessage();
-if (!StringUtils.isEmpty(msg)) {
+if (StringUtils.isNotBlank(msg)) {
key = escapeJson(msg);
}
}
diff --git
a/src/core/src/test/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumerTest.java
b/src/core/src/test/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumerTest.java
index ab43b8e..9a41be9 100644
---
a/src/core/src/test/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumerTest.java
+++
b/src/core/src/test/java/org/apache/jmeter/report/processor/ErrorsSummaryConsumerTest.java
@@ -38,6 +38,9 @@ public class ErrorsSummaryConsumerTest {
sample = new Sample(0, metadata, new String[] { "false", "200", "",
"FailureMessage" });
assertEquals("FailureMessage",
ErrorsSummaryConsumer.getErrorKey(sample));
+sample = new Sample(0, metadata, new String[] { "false", "200", "", ""
});
+assertEquals(MetricUtils.ASSERTION_FAILED,
ErrorsSummaryConsumer.getErrorKey(sample));
+
sample = new Sample(0, metadata, new String[] { "false", "200", "",
"Test failed: text expected to contain /Some html
text/" });
assertEquals("Test failed: text expected to contain /<title>Some
html text</title>/",
@@ -49,9 +52,15 @@ public class ErrorsSummaryConsumerTest {
ErrorsSummaryConsumer.getErrorKey(sample));
sample = new Sample(0, metadata, new String[] { "true", "200", "", ""
});
-assertEquals(MetricUtils.ASSERTION_FAILED,
ErrorsSummaryConsumer.getErrorKey(sample));
+assertEquals("", ErrorsSummaryConsumer.getErrorKey(sample));
+
+sample = new Sample(0, metadata, new String[] { "false", "403", "", ""
});
+assertEquals("403", ErrorsSummaryConsumer.getErrorKey(sample));
+
+sample = new Sample(0, metadata, new String[] { "false", "403", "",
"FailureMessage" });
+assertEquals("FailureMessage",
ErrorsSummaryConsumer.getErrorKey(sample));
-sample = new Sample(0, metadata, new String[] { "false", "500",
"Server Error", "FailureMessage" });
+sample = new Sample(0, metadata, new String[] { "false", "500",
"Server Error", "" });
assertEquals("500/Serve
[jmeter] branch master updated: Update log4j2 to 2.17.1 (#685)
This is an automated email from the ASF dual-hosted git repository. pmouawad 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 08e350d Update log4j2 to 2.17.1 (#685) 08e350d is described below commit 08e350d8e58044655c2f6f58444e8b60798af93d Author: Piotr Smietana AuthorDate: Wed Dec 29 16:58:15 2021 +0100 Update log4j2 to 2.17.1 (#685) Co-authored-by: smiep --- gradle.properties | 2 +- src/dist/src/dist/expected_release_jars.csv | 8 xdocs/changes.xml | 5 +++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/gradle.properties b/gradle.properties index 154d602..df7baa1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -115,7 +115,7 @@ junit4.version=4.13.2 junit5.version=5.8.1 lets-plot-batik.version=2.2.1 lets-plot-kotlin-jvm.version=3.1.1 -log4j.version=2.17.0 +log4j.version=2.17.1 mail.version=1.5.0-b01 miglayout.version=5.3 mina-core.version=2.0.19 diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv index 27a5d84..3cd0910 100644 --- a/src/dist/src/dist/expected_release_jars.csv +++ b/src/dist/src/dist/expected_release_jars.csv @@ -94,10 +94,10 @@ 792176,kotlinx-html-jvm-0.7.3.jar 181223,lets-plot-batik-2.2.1.jar 4025480,lets-plot-common-2.2.1.jar -208235,log4j-1.2-api-2.17.0.jar -301776,log4j-api-2.17.0.jar -1789339,log4j-core-2.17.0.jar -24252,log4j-slf4j-impl-2.17.0.jar +208006,log4j-1.2-api-2.17.1.jar +301872,log4j-api-2.17.1.jar +1790452,log4j-core-2.17.1.jar +24279,log4j-slf4j-impl-2.17.1.jar 519087,mail-1.5.0-b01.jar 106949,miglayout-core-5.3.jar 22576,miglayout-swing-5.3.jar diff --git a/xdocs/changes.xml b/xdocs/changes.xml index e48dfb0..33606f2 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -61,7 +61,7 @@ Summary New and Noteworthy JMeter now supports Java 17 -JMeter 5.5 ships with log4j2 2.17 +JMeter 5.5 ships with log4j2 2.17.1 New component: Open Model Thread Group allows creating load profiles with variable load. @@ -175,7 +175,7 @@ however, the profile can't be updated while the test is running. Updated json-path to 2.6.0 (from 2.4.0). Updated jsoup to 1.14.1 (from 1.13.1). Updated JUnit to 4.13.2 and 5.8.1 (from 4.13.1 and 5.7.0). - Updated Apache log4j2 to 2.17.0 (from 2.13.3). + Updated Apache log4j2 to 2.17.1 (from 2.13.3). Updated Miglayout to 5.3 (from 5.2). Updated Neo4j Java driver to 4.3.3 (from 4.2.0). Updated Objenesis to 3.2 (from 2.6). @@ -290,6 +290,7 @@ however, the profile can't be updated while the test is running. Woonsan Ko (woonsan.ko at bloomreach.com) Chromico Rek (atech5122 at gmail.com) Magnus Spångdal (magnus.spangdal as avanza.se) + Piotr Smietana (piotrsmietana1998 at gmail.com) We also thank bug reporters who helped us improve JMeter.
[jmeter] branch master updated: Align ssl props / Enable setting cipher suite (#677)
This is an automated email from the ASF dual-hosted git repository.
pmouawad 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 c98be3f Align ssl props / Enable setting cipher suite (#677)
c98be3f is described below
commit c98be3f40009caffb8b66aded702356d975bb4d7
Author: Philippe M
AuthorDate: Sat Nov 20 21:11:45 2021 +0100
Align ssl props / Enable setting cipher suite (#677)
* Switch in LazyLayeredConnectionSocketFactory https.socket.ciphers to
https.cipherSuites as the latter is documented
* Use https.cipherSuites, https.socket.protocols in Proxy (HTTP(S) Test
Script Recorder)
* Introduce JMeterUtils.getArrayPropDefault
Rename based on Vladimir proposals
This resolves https://bz.apache.org/bugzilla/show_bug.cgi?id=65692
---
.../java/org/apache/jmeter/util/JMeterUtils.java | 23 ++
.../org/apache/jmeter/util/TestJMeterUtils.java| 18 +
.../apache/jmeter/protocol/http/proxy/Proxy.java | 12 +++
.../hc/LazyLayeredConnectionSocketFactory.java | 20 ---
xdocs/changes.xml | 1 +
5 files changed, 62 insertions(+), 12 deletions(-)
diff --git a/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
b/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
index 05980b3..a6b40c6 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/JMeterUtils.java
@@ -52,6 +52,7 @@ import javax.swing.JTable;
import javax.swing.JTextArea;
import javax.swing.SwingUtilities;
+import org.apache.commons.lang3.StringUtils;
import org.apache.jmeter.gui.GuiPackage;
import org.apache.jmeter.threads.JMeterContextService;
import org.apache.jorphan.gui.JFactory;
@@ -714,6 +715,28 @@ public class JMeterUtils implements UnitTestManager {
}
/**
+ * Get an array of String if present and not empty, defaultValue if not
present.
+ *
+ * @param propName
+ *the name of the property.
+ * @param defaultVal
+ *the default value.
+ * @return The PropDefault value
+ */
+public static String[] getArrayPropDefault(String propName, String[]
defaultVal) {
+try {
+String strVal = appProperties.getProperty(propName);
+if (StringUtils.isNotBlank(strVal)) {
+return strVal.trim().split("\\s+");
+}
+} catch (Exception e) {
+log.warn("Exception '{}' occurred when fetching Array
property:'{}', defaulting to: {}",
+e.getMessage(), propName, defaultVal != null ?
Arrays.toString(defaultVal) : null);
+}
+return defaultVal;
+}
+
+/**
* Get a long value with default if not present.
*
* @param propName
diff --git a/src/core/src/test/java/org/apache/jmeter/util/TestJMeterUtils.java
b/src/core/src/test/java/org/apache/jmeter/util/TestJMeterUtils.java
index 3642fd9..80f3cda 100644
--- a/src/core/src/test/java/org/apache/jmeter/util/TestJMeterUtils.java
+++ b/src/core/src/test/java/org/apache/jmeter/util/TestJMeterUtils.java
@@ -19,6 +19,10 @@ package org.apache.jmeter.util;
import static org.junit.Assert.assertEquals;
+import java.nio.file.Files;
+import java.nio.file.Path;
+
+import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
public class TestJMeterUtils {
@@ -38,4 +42,18 @@ public class TestJMeterUtils {
public void testGesResStringDefaultWithNonExistantKey() throws Exception {
assertEquals("[res_key=noValidKey]",
JMeterUtils.getResString("noValidKey"));
}
+
+@Test
+public void testGetArrayPropDefault() throws Exception {
+Path props = Files.createTempFile("testGetArrayPropDefault",
".properties");
+JMeterUtils.loadJMeterProperties(props.toString());
+
JMeterUtils.getJMeterProperties().setProperty("testGetArrayPropDefaultEmpty", "
");
+
JMeterUtils.getJMeterProperties().setProperty("testGetArrayPropDefault", "
Tolstoi DostoievskiPouchkine Gorki ");
+Assertions.assertArrayEquals(new String[]{"Tolstoi", "Dostoievski",
"Pouchkine", "Gorki"},
+JMeterUtils.getArrayPropDefault("testGetArrayPropDefault",
null));
+Assertions.assertArrayEquals(new String[]{"Gilels", "Richter"},
+
JMeterUtils.getArrayPropDefault("testGetArrayPropDefaultMissing", new
String[]{"Gilels", "Richter"}));
+Assertions.assertArrayEquals(null,
+
JMeterUtils.getArrayPropDefault("testGetArrayPropDefaultEmpty", null));
[jmeter] branch master updated: Fix get-started typo in JVM parameter (#653)
This is an automated email from the ASF dual-hosted git repository. pmouawad 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 bbd7bbe Fix get-started typo in JVM parameter (#653) bbd7bbe is described below commit bbd7bbe78b4a9c760287975a7626c19fed86744c Author: o-youwillsee <297872...@qq.com> AuthorDate: Sat Mar 27 23:37:10 2021 +0800 Fix get-started typo in JVM parameter (#653) Fix problem for 'export HEAP="-Xms1G -Xmx1G -XMaxMetaspaceSize=192m"' --- xdocs/usermanual/get-started.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xdocs/usermanual/get-started.xml b/xdocs/usermanual/get-started.xml index 1265d83..6cd1319 100644 --- a/xdocs/usermanual/get-started.xml +++ b/xdocs/usermanual/get-started.xml @@ -316,7 +316,7 @@ will override the HEAP settings in the script. # it will be sourced in by bin/jmeter # Use a bigger heap, but a smaller metaspace, than the default -export HEAP="-Xms1G -Xmx1G -XMaxMetaspaceSize=192m" +export HEAP="-Xms1G -Xmx1G -XX:MaxMetaspaceSize=192m" # Try to guess the locale from the OS. The space as value is on purpose! export JMETER_LANGUAGE=" "
[jmeter] branch master updated: Avoid breaking JMeter due to a broken plugin classpath
This is an automated email from the ASF dual-hosted git repository.
pmouawad 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 6ff05cc Avoid breaking JMeter due to a broken plugin classpath
6ff05cc is described below
commit 6ff05cc5468664398bb4c75bc67cdb320a6b61ca
Author: pmouawad
AuthorDate: Sat Jan 9 17:54:06 2021 +0100
Avoid breaking JMeter due to a broken plugin classpath
---
.../src/main/java/org/apache/jmeter/visualizers/RequestPanel.java | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git
a/src/components/src/main/java/org/apache/jmeter/visualizers/RequestPanel.java
b/src/components/src/main/java/org/apache/jmeter/visualizers/RequestPanel.java
index 54ccb5d..ac3a6a0 100644
---
a/src/components/src/main/java/org/apache/jmeter/visualizers/RequestPanel.java
+++
b/src/components/src/main/java/org/apache/jmeter/visualizers/RequestPanel.java
@@ -71,8 +71,13 @@ public class RequestPanel {
} else {
listRequestView.add(requestView);
}
+}
+catch (NoClassDefFoundError e) {
+log.error("Exception registering implementation: [{}] of
interface: [{}], a dependency used by the plugin class is missing",
+clazz, RequestView.class, e);
} catch (Exception e) {
-log.warn("Error in load result render: {}", clazz, e); //
$NON-NLS-1$
+log.error("Exception registering implementation: [{}] of
interface: [{}], a jar is probably missing",
+clazz, RequestView.class, e);
}
}
// place raw tab in first position (first tab)
[jmeter] branch master updated: Move XPath (1 & 2) extractors after JSON as it's a more frequent format.
This is an automated email from the ASF dual-hosted git repository. pmouawad 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 2e4b453 Move XPath (1 & 2) extractors after JSON as it's a more frequent format. 2e4b453 is described below commit 2e4b453f2a90073607c8f3b6d1f48ff8f754495d Author: pmouawad AuthorDate: Sat Jan 9 17:52:08 2021 +0100 Move XPath (1 & 2) extractors after JSON as it's a more frequent format. --- bin/jmeter.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/jmeter.properties b/bin/jmeter.properties index c774e53..4953cbd 100644 --- a/bin/jmeter.properties +++ b/bin/jmeter.properties @@ -1180,7 +1180,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,.RenderAsBoundaryExtractor,.RenderAsCssJQuery,.RenderAsXPath,.RenderAsXPath2,org.apache.jmeter.extractor.json.render.RenderAsJsonRenderer,org.apache.jmeter.extractor.json.render.RenderAsJmesPathRenderer,.RenderAsHTML,.RenderAsHTMLFormatted,.RenderAsHTMLWithEmbedded,.RenderAsDocument,.RenderAsJSON,.RenderAsXML +view.results.tree.renderers_order=.RenderAsText,.RenderAsRegexp,.RenderAsBoundaryExtractor,.RenderAsCssJQuery,org.apache.jmeter.extractor.json.render.RenderAsJsonRenderer,.RenderAsXPath2,org.apache.jmeter.extractor.json.render.RenderAsJmesPathRenderer,.RenderAsXPath,.RenderAsHTML,.RenderAsHTMLFormatted,.RenderAsHTMLWithEmbedded,.RenderAsDocument,.RenderAsJSON,.RenderAsXML # Maximum number of results in the results tree # Set to 0 to store all results (might consume a lot of memory)
[jmeter] branch master updated: Fix wrong throws
This is an automated email from the ASF dual-hosted git repository.
pmouawad 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 10acbc7 Fix wrong throws
10acbc7 is described below
commit 10acbc74ea1da66614eff68f2b76559d0bcb97d4
Author: pmouawad
AuthorDate: Sun Dec 20 21:17:28 2020 +0100
Fix wrong throws
---
.../org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
index dfbed0e..1021160 100644
---
a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
+++
b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
@@ -286,7 +286,7 @@ public class DefaultSamplerCreator extends
AbstractSamplerCreator {
* @param postData String
* @return boolean
*/
-public static boolean isPotentialJson(final String postData) throws
IOException {
+public static boolean isPotentialJson(final String postData) {
boolean valid = true;
try{
OBJECT_MAPPER.readTree(postData);
[jmeter] branch master updated: Daklaf LAF: Menu navigation not working with keyboard shortcuts
This is an automated email from the ASF dual-hosted git repository. pmouawad 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 b9cdab0 Daklaf LAF: Menu navigation not working with keyboard shortcuts b9cdab0 is described below commit b9cdab0b5dd92a39a9b7a375047744bb82fe3f4f Author: pmouawad AuthorDate: Sun Dec 20 21:02:16 2020 +0100 Daklaf LAF: Menu navigation not working with keyboard shortcuts --- gradle.properties | 2 +- src/dist/src/dist/expected_release_jars.csv | 16 xdocs/changes.xml | 1 + 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/gradle.properties b/gradle.properties index 490716b..516f214 100644 --- a/gradle.properties +++ b/gradle.properties @@ -74,7 +74,7 @@ commons-math3.version=3.6.1 commons-net.version=3.7.2 commons-pool2.version=2.9.0 commons-text.version=1.9 -darklaf.version=2.5.3 +darklaf.version=2.5.4 darklaf.extensions.version=0.3.4 dec.version=0.1.2 dnsjava.version=2.1.9 diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv index 10d75bf..099c7db 100644 --- a/src/dist/src/dist/expected_release_jars.csv +++ b/src/dist/src/dist/expected_release_jars.csv @@ -18,15 +18,15 @@ 307003,commons-net-3.7.2.jar 134858,commons-pool2-2.9.0.jar 216211,commons-text-1.9.jar -1549589,darklaf-core-2.5.3.jar +1556912,darklaf-core-2.5.4.jar 20650,darklaf-extensions-rsyntaxarea-0.3.4.jar -33715,darklaf-macos-2.5.3.jar -6278,darklaf-native-utils-2.5.3.jar -3245,darklaf-platform-base-2.5.3.jar -75184,darklaf-property-loader-2.5.3.jar -87293,darklaf-theme-2.5.3.jar -46070,darklaf-utils-2.5.3.jar -336171,darklaf-windows-2.5.3.jar +33687,darklaf-macos-2.5.4.jar +6204,darklaf-native-utils-2.5.4.jar +3243,darklaf-platform-base-2.5.4.jar +74932,darklaf-property-loader-2.5.4.jar +87738,darklaf-theme-2.5.4.jar +46878,darklaf-utils-2.5.4.jar +336136,darklaf-windows-2.5.4.jar 98115,dec-0.1.2.jar 320748,dnsjava-2.1.9.jar 13854,error_prone_annotations-2.4.0.jar diff --git a/xdocs/changes.xml b/xdocs/changes.xml index 2c4157c..6396c56 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -185,6 +185,7 @@ Summary 64969RemoteJMeterEngineImpl#rexit doesn't unexport RemoteJMeterEngineImpl on exit. Contributed by luo_isaiah at qq.com 64984Darklaf LAF: Selecting a Test element does not work under certain screen resolutions on Windows. With the help of Jannis Weis 65008SampleResult.setIgnore() called from PostProcessor is not considered + 64993Daklaf LAF: Menu navigation not working with keyboard shortcuts. With the help of Jannis Weis
[jmeter] branch master updated: Mention change
This is an automated email from the ASF dual-hosted git repository. pmouawad 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 54e820e Mention change 54e820e is described below commit 54e820e64207999aa8c018ba93807562ea60a881 Author: pmouawad AuthorDate: Sat Dec 19 16:41:13 2020 +0100 Mention change --- xdocs/changes.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/xdocs/changes.xml b/xdocs/changes.xml index feda12c..2c4157c 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -71,6 +71,7 @@ Summary Incompatible changes +Restart after LAF change has been reinstated, it had been removed in JMeter 5.3
[jmeter] branch master updated: Reinstate the restart after LAF change
This is an automated email from the ASF dual-hosted git repository.
pmouawad 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 39626d0 Reinstate the restart after LAF change
39626d0 is described below
commit 39626d03fed0375ab1c81e5fad4e000ebe11db2f
Author: pmouawad
AuthorDate: Sat Dec 19 16:41:00 2020 +0100
Reinstate the restart after LAF change
---
.../java/org/apache/jmeter/gui/action/LookAndFeelCommand.java | 8
1 file changed, 8 insertions(+)
diff --git
a/src/core/src/main/java/org/apache/jmeter/gui/action/LookAndFeelCommand.java
b/src/core/src/main/java/org/apache/jmeter/gui/action/LookAndFeelCommand.java
index 68221ee..864a3e5 100644
---
a/src/core/src/main/java/org/apache/jmeter/gui/action/LookAndFeelCommand.java
+++
b/src/core/src/main/java/org/apache/jmeter/gui/action/LookAndFeelCommand.java
@@ -29,6 +29,7 @@ import java.util.Map;
import java.util.Set;
import java.util.prefs.Preferences;
+import javax.swing.JOptionPane;
import javax.swing.UIManager;
import org.apache.jmeter.gui.GuiPackage;
@@ -224,6 +225,13 @@ public class LookAndFeelCommand extends AbstractAction {
public void doAction(ActionEvent ev) {
try {
activateLookAndFeel(ev.getActionCommand());
+int chosenOption =
JOptionPane.showConfirmDialog(GuiPackage.getInstance().getMainFrame(),
JMeterUtils
+.getResString("laf_quit_after_change"), // $NON-NLS-1$
+JMeterUtils.getResString("exit"), // $NON-NLS-1$
+JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE);
+if (chosenOption == JOptionPane.YES_OPTION) {
+ActionRouter.getInstance().doActionNow(new
ActionEvent(ev.getSource(), ev.getID(), ActionNames.RESTART));
+}
} catch (IllegalArgumentException e) {
JMeterUtils.reportErrorToUser(e.getMessage(), e);
}
[jmeter] branch master updated: Bug 64543 - On MacOSX, Darklaf- IntelliJ Theme throws NPE in javax.swing.ToolTipManager.initiateToolTip
This is an automated email from the ASF dual-hosted git repository.
pmouawad 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 37d7b5e Bug 64543 - On MacOSX, Darklaf- IntelliJ Theme throws NPE in
javax.swing.ToolTipManager.initiateToolTip
37d7b5e is described below
commit 37d7b5ee10065e718bf6e46c56e5aa5b14ce6ecf
Author: pmouawad
AuthorDate: Sat Dec 19 16:31:10 2020 +0100
Bug 64543 - On MacOSX, Darklaf- IntelliJ Theme throws NPE in
javax.swing.ToolTipManager.initiateToolTip
---
src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java | 8 +++-
xdocs/changes.xml | 1 +
xdocs/changes_history.xml | 1 -
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java
b/src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java
index 9e998eb..da3e027 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/MainFrame.java
@@ -83,6 +83,7 @@ import org.apache.jmeter.gui.action.ActionNames;
import org.apache.jmeter.gui.action.ActionRouter;
import org.apache.jmeter.gui.action.KeyStrokes;
import org.apache.jmeter.gui.action.LoadDraggedFile;
+import org.apache.jmeter.gui.action.LookAndFeelCommand;
import org.apache.jmeter.gui.logging.GuiLogEventListener;
import org.apache.jmeter.gui.logging.LogEventObject;
import org.apache.jmeter.gui.tree.JMeterCellRenderer;
@@ -674,7 +675,12 @@ public class MainFrame extends JFrame implements
TestStateListener, Remoteable,
}
}
}
-return null;
+if (LookAndFeelCommand.isDarklafTheme()) {
+// See
https://github.com/weisJ/darklaf/issues/226#issuecomment-748478418
+return "";
+} else {
+return null;
+}
}
};
treevar.setToolTipText("");
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 6d619de..feda12c 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -139,6 +139,7 @@ Summary
64955Keystore password not reset on reload
65002HTTP(S) Test Script recorder creates an invalid Basic
authentication URL. Contributed by Ubik Load Pack
(https://ubikloadpack.com)
65004HTTP(S) Test Script recorder computes wrong HTTP Request
breaking the application. Contributed by Ubik Load Pack
(https://ubikloadpack.com)
+ 64543On MacOSX, Darklaf- IntelliJ Theme throws NPE in
javax.swing.ToolTipManager.initiateToolTip
Other Samplers
diff --git a/xdocs/changes_history.xml b/xdocs/changes_history.xml
index ad0c768..5913567 100644
--- a/xdocs/changes_history.xml
+++ b/xdocs/changes_history.xml
@@ -225,7 +225,6 @@ applications when JMeter is starting up.
64448User Defined Variable Duplication in Right Click
Context Menu
64499Exiting JMeter when
jmeterengine.stopfail.system.exit=true takes too much time if
threads are not stopped
64510Darklaf- IntelliJ Theme throws NPE in DarkTreeUI on
MacOS
-64543On MacOSX, Darklaf- IntelliJ Theme throws NPE in
javax.swing.ToolTipManager.initiateToolTip
64594Unable to enter variable values instead of numeric
values in components using PowerTableModel (Impacts 3rd party plugins like
Throughput Shaping Timer)
64475Menu Generate HTML Report: When report generation
fails due to timeout, error message is not explicit. Contributed by Ubik Load
Pack (https://ubikloadpack.com)
64627Programmatic manipulation of the control flow via API
methods of JMeterContext is not working as it used to before 5.0. Contributed
by Till Neunast
[jmeter] branch master updated: update xstreams to 1.4.15 (from 1.4.14) (#639)
This is an automated email from the ASF dual-hosted git repository. pmouawad 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 f0490c4 update xstreams to 1.4.15 (from 1.4.14) (#639) f0490c4 is described below commit f0490c4d9b62e537cd46863ec03e3c882305e88e Author: sseide AuthorDate: Sat Dec 19 12:36:11 2020 +0100 update xstreams to 1.4.15 (from 1.4.14) (#639) --- gradle.properties | 2 +- src/dist/src/dist/expected_release_jars.csv | 2 +- xdocs/changes.xml | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index c601d49..490716b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -130,5 +130,5 @@ xml-apis.version=1.4.01 xmlgraphics-commons.version=2.3 xmlpull.version=1.1.3.1 xpp3_min.version=1.1.4c -xstream.version=1.4.14 +xstream.version=1.4.15 wiremock-jre8.version=2.24.1 diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv index 2ab8d24..10d75bf 100644 --- a/src/dist/src/dist/expected_release_jars.csv +++ b/src/dist/src/dist/expected_release_jars.csv @@ -95,4 +95,4 @@ 671727,xmlgraphics-commons-2.3.jar 7188,xmlpull-1.1.3.1.jar 24956,xpp3_min-1.1.4c.jar -627490,xstream-1.4.14.jar +627848,xstream-1.4.15.jar diff --git a/xdocs/changes.xml b/xdocs/changes.xml index f39009d..6d619de 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -127,6 +127,7 @@ Summary Updated ph-commons to 9.5.1 (from 9.4.1) Updated ph-css to 6.2.3 (from 6.2.1) Updated groovy to 3.0.7 (from 3.0.5) +Updated xstream to 1.4.15 (from 1.4.14)
[jmeter] branch master updated: Bug 65008 - SampleResult.setIgnore() called from PostProcessor is not considered
This is an automated email from the ASF dual-hosted git repository.
pmouawad 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 9841a2a Bug 65008 - SampleResult.setIgnore() called from
PostProcessor is not considered
9841a2a is described below
commit 9841a2a64f8f908bfa97967b46636735e09b0826
Author: pmouawad
AuthorDate: Sat Dec 19 00:23:46 2020 +0100
Bug 65008 - SampleResult.setIgnore() called from PostProcessor is not
considered
---
.../src/main/java/org/apache/jmeter/threads/JMeterThread.java| 9 ++---
xdocs/changes.xml| 1 +
2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java
b/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java
index dfe13e5..9084fd4 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java
@@ -572,9 +572,12 @@ public class JMeterThread implements Runnable,
Interruptible {
threadContext.setPreviousResult(result);
runPostProcessors(pack.getPostProcessors());
checkAssertions(pack.getAssertions(), result, threadContext);
-// Do not send subsamples to listeners which receive the
transaction sample
-List sampleListeners =
getSampleListeners(pack, transactionPack, transactionSampler);
-notifyListeners(sampleListeners, result);
+// PostProcessors can call setIgnore, so reevaluate here
+if (!result.isIgnore()) {
+// Do not send subsamples to listeners which receive the
transaction sample
+List sampleListeners =
getSampleListeners(pack, transactionPack, transactionSampler);
+notifyListeners(sampleListeners, result);
+}
compiler.done(pack);
// Add the result as subsample of transaction if we are in a
transaction
if (transactionSampler != null && !result.isIgnore()) {
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 836c80b..f39009d 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -181,6 +181,7 @@ Summary
64963Blank comment tooltip is visible
64969RemoteJMeterEngineImpl#rexit doesn't unexport
RemoteJMeterEngineImpl on exit. Contributed by luo_isaiah at qq.com
64984Darklaf LAF: Selecting a Test element does not work
under certain screen resolutions on Windows. With the help of Jannis Weis
+ 65008SampleResult.setIgnore() called from PostProcessor is
not considered
[jmeter] branch master updated: Bug 64984 - Darklaf LAF: Selecting a Test element does not work under certain screen resolutions on Windows
This is an automated email from the ASF dual-hosted git repository.
pmouawad 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 655de1a Bug 64984 - Darklaf LAF: Selecting a Test element does not
work under certain screen resolutions on Windows
655de1a is described below
commit 655de1a8aa60c560e214bde06e6ca694d8619d5f
Author: pmouawad
AuthorDate: Fri Dec 18 13:54:50 2020 +0100
Bug 64984 - Darklaf LAF: Selecting a Test element does not work under
certain screen resolutions on Windows
---
.../src/main/java/org/apache/jmeter/gui/action/LookAndFeelCommand.java | 3 +++
xdocs/changes.xml | 2 ++
2 files changed, 5 insertions(+)
diff --git
a/src/core/src/main/java/org/apache/jmeter/gui/action/LookAndFeelCommand.java
b/src/core/src/main/java/org/apache/jmeter/gui/action/LookAndFeelCommand.java
index 0c1cf10..68221ee 100644
---
a/src/core/src/main/java/org/apache/jmeter/gui/action/LookAndFeelCommand.java
+++
b/src/core/src/main/java/org/apache/jmeter/gui/action/LookAndFeelCommand.java
@@ -100,6 +100,9 @@ public class LookAndFeelCommand extends AbstractAction {
if (System.getProperty("darklaf.unifiedMenuBar") == null) {
System.setProperty("darklaf.unifiedMenuBar", "true");
}
+if (System.getProperty("darklaf.treeRowPopup") == null) {
+System.setProperty("darklaf.treeRowPopup", "false");
+}
UIManager.installLookAndFeel(JMeterMenuBar.DARCULA_LAF,
JMeterMenuBar.DARCULA_LAF_CLASS);
List items = new ArrayList<>();
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 6480a77..836c80b 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -180,6 +180,7 @@ Summary
64961Darklaf: On Windows 7, NPE in
BasicEditorPaneUI.cleanDisplayProperties with Darklaf Intellij
64963Blank comment tooltip is visible
64969RemoteJMeterEngineImpl#rexit doesn't unexport
RemoteJMeterEngineImpl on exit. Contributed by luo_isaiah at qq.com
+ 64984Darklaf LAF: Selecting a Test element does not work
under certain screen resolutions on Windows. With the help of Jannis Weis
@@ -191,6 +192,7 @@ Summary
Ori Marko (orimarko at gmail.com)
罗寅卓 (luo_isaiah at qq.com)
https://ubikloadpack.com"; >Ubik Load Pack
+ https://github.com/weisJ/darklaf";>Jannis Weis
We also thank bug reporters who helped us improve JMeter.
[jmeter] branch master updated: Fix style check failure due to space
This is an automated email from the ASF dual-hosted git repository.
pmouawad 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 2ce2a52 Fix style check failure due to space
2ce2a52 is described below
commit 2ce2a52c3c71d6111befa26da3a6583d96f21568
Author: pmouawad
AuthorDate: Thu Dec 17 21:42:30 2020 +0100
Fix style check failure due to space
---
.../org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
index 13c6503..dfbed0e 100644
---
a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
+++
b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
@@ -288,7 +288,7 @@ public class DefaultSamplerCreator extends
AbstractSamplerCreator {
*/
public static boolean isPotentialJson(final String postData) throws
IOException {
boolean valid = true;
-try{
+try{
OBJECT_MAPPER.readTree(postData);
} catch(JsonProcessingException e){
valid = false;
[jmeter] branch master updated: Bug 65004 - HTTP(S) Test Script recorder computes wrong HTTP Request breaking the application
This is an automated email from the ASF dual-hosted git repository.
pmouawad 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 acca046 Bug 65004 - HTTP(S) Test Script recorder computes wrong HTTP
Request breaking the application
acca046 is described below
commit acca046473657083e6b139402652d4b78c5229cb
Author: pmouawad
AuthorDate: Thu Dec 17 21:27:29 2020 +0100
Bug 65004 - HTTP(S) Test Script recorder computes wrong HTTP Request
breaking the application
---
.../protocol/http/proxy/DefaultSamplerCreator.java | 30 +++---
xdocs/changes.xml | 1 +
2 files changed, 28 insertions(+), 3 deletions(-)
diff --git
a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
index f91f01a..13c6503 100644
---
a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
+++
b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
@@ -55,6 +55,9 @@ import org.xml.sax.SAXParseException;
import org.xml.sax.XMLReader;
import org.xml.sax.helpers.DefaultHandler;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+
/**
* Default implementation that handles classical HTTP textual + Multipart
requests
*/
@@ -69,6 +72,7 @@ public class DefaultSamplerCreator extends
AbstractSamplerCreator {
private static final int SAMPLER_NAME_NAMING_MODE_SUFFIX = 2; //
$NON-NLS-1$
private static final int SAMPLER_NAME_NAMING_MODE_FORMATTER = 3; //
$NON_NLS-1$
+private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();
/**
*
*/
@@ -248,7 +252,8 @@ public class DefaultSamplerCreator extends
AbstractSamplerCreator {
// used when postData is pure xml (eg. an xml-rpc call) or for PUT
} else if (postData.trim().startsWith("
64955Keystore password not reset on reload
65002HTTP(S) Test Script recorder creates an invalid Basic
authentication URL. Contributed by Ubik Load Pack
(https://ubikloadpack.com)
+ 65004HTTP(S) Test Script recorder computes wrong HTTP Request
breaking the application. Contributed by Ubik Load Pack
(https://ubikloadpack.com)
Other Samplers
[jmeter] branch master updated: Remove unused variable
This is an automated email from the ASF dual-hosted git repository.
pmouawad 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 e58c557 Remove unused variable
e58c557 is described below
commit e58c557f9de052b67a354fbee175298b87eb452f
Author: pmouawad
AuthorDate: Thu Dec 17 20:50:30 2020 +0100
Remove unused variable
---
.../java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git
a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
index 16686c7..cda7ada 100644
---
a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
+++
b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
@@ -635,7 +635,7 @@ public class ProxyControl extends GenericController
implements NonTestElement {
sampler.setFollowRedirects(samplerFollowRedirects);
sampler.setUseKeepAlive(useKeepAlive);
sampler.setImageParser(samplerDownloadImages);
-Authorization authorization =
createAuthorization(testElements, sampler, result);
+Authorization authorization =
createAuthorization(testElements, result);
if (authorization != null) {
setAuthorization(authorization, myTarget);
}
@@ -667,11 +667,10 @@ public class ProxyControl extends GenericController
implements NonTestElement {
* Removes Authorization if present
*
* @param testElements {@link TestElement}[]
- * @param sampler {@link HTTPSamplerBase}
* @param result {@link HTTPSampleResult}
* @return {@link Authorization}
*/
-private Authorization createAuthorization(final TestElement[]
testElements, HTTPSamplerBase sampler, SampleResult result) {
+private Authorization createAuthorization(final TestElement[]
testElements, SampleResult result) {
Header authHeader;
Authorization authorization = null;
// Iterate over subconfig elements searching for HeaderManager
[jmeter] branch master updated: Bug 65002 - HTTP(S) Test Script recorder creates an invalid Basic authentication URL
This is an automated email from the ASF dual-hosted git repository.
pmouawad 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 f0869b6 Bug 65002 - HTTP(S) Test Script recorder creates an invalid
Basic authentication URL
f0869b6 is described below
commit f0869b6aef4ed865a9373f3ae2261d34a9c4b75c
Author: pmouawad
AuthorDate: Thu Dec 17 20:29:53 2020 +0100
Bug 65002 - HTTP(S) Test Script recorder creates an invalid Basic
authentication URL
---
.../jmeter/protocol/http/proxy/ProxyControl.java| 21 -
xdocs/changes.xml | 2 ++
2 files changed, 14 insertions(+), 9 deletions(-)
diff --git
a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
index 9055db4..16686c7 100644
---
a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
+++
b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
@@ -24,7 +24,6 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.Serializable;
-import java.net.MalformedURLException;
import java.nio.charset.StandardCharsets;
import java.security.GeneralSecurityException;
import java.security.KeyStore;
@@ -636,7 +635,7 @@ public class ProxyControl extends GenericController
implements NonTestElement {
sampler.setFollowRedirects(samplerFollowRedirects);
sampler.setUseKeepAlive(useKeepAlive);
sampler.setImageParser(samplerDownloadImages);
-Authorization authorization =
createAuthorization(testElements, sampler);
+Authorization authorization =
createAuthorization(testElements, sampler, result);
if (authorization != null) {
setAuthorization(authorization, myTarget);
}
@@ -669,9 +668,10 @@ public class ProxyControl extends GenericController
implements NonTestElement {
*
* @param testElements {@link TestElement}[]
* @param sampler {@link HTTPSamplerBase}
+ * @param result {@link HTTPSampleResult}
* @return {@link Authorization}
*/
-private Authorization createAuthorization(final TestElement[]
testElements, HTTPSamplerBase sampler) {
+private Authorization createAuthorization(final TestElement[]
testElements, HTTPSamplerBase sampler, SampleResult result) {
Header authHeader;
Authorization authorization = null;
// Iterate over subconfig elements searching for HeaderManager
@@ -710,12 +710,7 @@ public class ProxyControl extends GenericController
implements NonTestElement {
}
authCredentialsBase64 = authHeaderContent[1];
authorization=new Authorization();
-try {
-
authorization.setURL(sampler.getUrl().toExternalForm());
-} catch (MalformedURLException e) {
-log.error("Error filling url on authorization,
message: {}", e.getMessage(), e);
-
authorization.setURL("${AUTH_BASE_URL}");//$NON-NLS-1$
-}
+
authorization.setURL(computeAuthUrl(result.getUrlAsString()));
authorization.setMechanism(mechanism);
if(BASIC_AUTH.equals(authType)) {
String authCred = new
String(Base64.decodeBase64(authCredentialsBase64), StandardCharsets.UTF_8);
@@ -746,6 +741,14 @@ public class ProxyControl extends GenericController
implements NonTestElement {
return authorization;
}
+private String computeAuthUrl(String url) {
+int index = url.lastIndexOf('/');
+if (index >=0) {
+return url.substring(0, index+1);
+}
+return url;
+}
+
public void stopProxy() {
if (server != null) {
server.stopServer();
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index a044536..f77317a 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -136,6 +136,7 @@ Summary
HTTP Samplers and Test Script Recorder
64955Keystore password not reset on reload
+ 65002HTTP(S) Test Script recorder creates an invalid Basic
authentication URL. Contributed by Ubik Load Pack
(https://ubikloadpack.com)
Other Samplers
@@ -188,6 +189,7 @@ Summary
Ori Marko (orimarko at gmail.com)
罗寅卓 (luo_isaiah at qq.com)
+ https://ubikloadpack.com"; >Ubik Load Pack
We also thank bug reporters who helped us improve JMeter.
[jmeter] branch master updated: Revert dnsjava update from 3.3.1 to 2.1.9
This is an automated email from the ASF dual-hosted git repository.
pmouawad 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 53c6db8 Revert dnsjava update from 3.3.1 to 2.1.9
53c6db8 is described below
commit 53c6db8676b868db10d668e7ede2ef36cf8241b9
Author: pmouawad
AuthorDate: Sat Dec 12 19:08:55 2020 +0100
Revert dnsjava update from 3.3.1 to 2.1.9
---
gradle.properties | 2 +-
src/dist/src/dist/expected_release_jars.csv| 2 +-
.../java/org/apache/jmeter/protocol/http/control/DNSCacheManager.java | 3 +--
xdocs/changes.xml | 1 -
4 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/gradle.properties b/gradle.properties
index e93db59..c601d49 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -77,7 +77,7 @@ commons-text.version=1.9
darklaf.version=2.5.3
darklaf.extensions.version=0.3.4
dec.version=0.1.2
-dnsjava.version=3.3.1
+dnsjava.version=2.1.9
equalsverifier.version=3.4.2
freemarker.version=2.3.30
ftplet-api.version=1.1.1
diff --git a/src/dist/src/dist/expected_release_jars.csv
b/src/dist/src/dist/expected_release_jars.csv
index d24a37d..2ab8d24 100644
--- a/src/dist/src/dist/expected_release_jars.csv
+++ b/src/dist/src/dist/expected_release_jars.csv
@@ -28,7 +28,7 @@
46070,darklaf-utils-2.5.3.jar
336171,darklaf-windows-2.5.3.jar
98115,dec-0.1.2.jar
-429982,dnsjava-3.3.1.jar
+320748,dnsjava-2.1.9.jar
13854,error_prone_annotations-2.4.0.jar
1702975,freemarker-2.3.30.jar
32359,geronimo-jms_1.1_spec-1.1.1.jar
diff --git
a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DNSCacheManager.java
b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DNSCacheManager.java
index 087c83a..be4be22 100644
---
a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DNSCacheManager.java
+++
b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DNSCacheManager.java
@@ -20,7 +20,6 @@ package org.apache.jmeter.protocol.http.control;
import java.io.Serializable;
import java.net.InetAddress;
import java.net.UnknownHostException;
-import java.time.Duration;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.LinkedHashMap;
@@ -266,7 +265,7 @@ public class DNSCacheManager extends ConfigTestElement
implements TestIterationL
Lookup lookup = new Lookup(host, Type.A);
lookup.setCache(lookupCache);
if (timeoutMs > 0) {
-resolver.setTimeout(Duration.ofMillis(timeoutMs));
+resolver.setTimeout(timeoutMs / 1000, timeoutMs % 1000);
}
lookup.setResolver(resolver);
Record[] records = lookup.run();
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 5716963..a044536 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -126,7 +126,6 @@ Summary
Updated junit to 4.13.1 (from 4.13)
Updated ph-commons to 9.5.1 (from 9.4.1)
Updated ph-css to 6.2.3 (from 6.2.1)
-Updated dnsjava to 3.3.1 (from 2.1.9)
Updated groovy to 3.0.7 (from 3.0.5)
[jmeter] branch master updated: Updated groovy to 3.0.7 (from 3.0.5) fix expected_release_jars.csv
This is an automated email from the ASF dual-hosted git repository. pmouawad 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 e4ec28e Updated groovy to 3.0.7 (from 3.0.5) fix expected_release_jars.csv e4ec28e is described below commit e4ec28edeb04f2c2e2c0da24e2075241c856d637 Author: pmouawad AuthorDate: Sat Dec 12 18:50:18 2020 +0100 Updated groovy to 3.0.7 (from 3.0.5) fix expected_release_jars.csv --- src/dist/src/dist/expected_release_jars.csv | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv index 40fc31f..d24a37d 100644 --- a/src/dist/src/dist/expected_release_jars.csv +++ b/src/dist/src/dist/expected_release_jars.csv @@ -32,15 +32,15 @@ 13854,error_prone_annotations-2.4.0.jar 1702975,freemarker-2.3.30.jar 32359,geronimo-jms_1.1_spec-1.1.1.jar -7946113,groovy-3.0.5.jar -19458,groovy-datetime-3.0.5.jar -11685,groovy-dateutil-3.0.5.jar -137455,groovy-jmx-3.0.5.jar -133034,groovy-json-3.0.5.jar -21294,groovy-jsr223-3.0.5.jar -82930,groovy-sql-3.0.5.jar -97234,groovy-templates-3.0.5.jar -284611,groovy-xml-3.0.5.jar +7949743,groovy-3.0.7.jar +19457,groovy-datetime-3.0.7.jar +11684,groovy-dateutil-3.0.7.jar +137461,groovy-jmx-3.0.7.jar +133034,groovy-json-3.0.7.jar +21294,groovy-jsr223-3.0.7.jar +82930,groovy-sql-3.0.7.jar +97065,groovy-templates-3.0.7.jar +292540,groovy-xml-3.0.7.jar 123360,hamcrest-2.2.jar 1499,hamcrest-core-2.2.jar 104518,hamcrest-date-2.0.7.jar
[jmeter] branch master updated: Updated groovy to 3.0.7 (from 3.0.5
This is an automated email from the ASF dual-hosted git repository. pmouawad 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 92d6444 Updated groovy to 3.0.7 (from 3.0.5 92d6444 is described below commit 92d6444e079548398ccdf8e9ae34913e2dc0d68f Author: pmouawad AuthorDate: Sat Dec 12 18:30:42 2020 +0100 Updated groovy to 3.0.7 (from 3.0.5 --- gradle.properties | 2 +- xdocs/changes.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index b5b1331..e93db59 100644 --- a/gradle.properties +++ b/gradle.properties @@ -83,7 +83,7 @@ freemarker.version=2.3.30 ftplet-api.version=1.1.1 ftpserver-core.version=1.1.1 geronimo-jms_1.1_spec.version=1.1.1 -groovy.version=3.0.5 +groovy.version=3.0.7 hamcrest.version=2.2 hamcrest-date.version=2.0.7 hsqldb.version=2.5.0 diff --git a/xdocs/changes.xml b/xdocs/changes.xml index f8981d9..5716963 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -127,6 +127,7 @@ Summary Updated ph-commons to 9.5.1 (from 9.4.1) Updated ph-css to 6.2.3 (from 6.2.1) Updated dnsjava to 3.3.1 (from 2.1.9) +Updated groovy to 3.0.7 (from 3.0.5)
[jmeter] branch master updated: Updated dnsjava to 3.3.1 (from 2.1.9)
This is an automated email from the ASF dual-hosted git repository. pmouawad 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 f381771 Updated dnsjava to 3.3.1 (from 2.1.9) f381771 is described below commit f3817717c5e7340c6784f4f144721120a9118b40 Author: pmouawad AuthorDate: Sat Dec 12 17:47:49 2020 +0100 Updated dnsjava to 3.3.1 (from 2.1.9) --- src/dist/src/dist/expected_release_jars.csv | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv index 570d4b9..40fc31f 100644 --- a/src/dist/src/dist/expected_release_jars.csv +++ b/src/dist/src/dist/expected_release_jars.csv @@ -28,7 +28,7 @@ 46070,darklaf-utils-2.5.3.jar 336171,darklaf-windows-2.5.3.jar 98115,dec-0.1.2.jar -320748,dnsjava-2.1.9.jar +429982,dnsjava-3.3.1.jar 13854,error_prone_annotations-2.4.0.jar 1702975,freemarker-2.3.30.jar 32359,geronimo-jms_1.1_spec-1.1.1.jar
[jmeter] branch master updated: Updated dnsjava to 3.3.1 (from 2.1.9)
This is an automated email from the ASF dual-hosted git repository.
pmouawad 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 e54190b Updated dnsjava to 3.3.1 (from 2.1.9)
e54190b is described below
commit e54190b6809ec9779c9f7b5919bec6d99e3a5a07
Author: pmouawad
AuthorDate: Sat Dec 12 17:46:14 2020 +0100
Updated dnsjava to 3.3.1 (from 2.1.9)
---
checksum.xml | 1 +
gradle.properties | 2 +-
.../java/org/apache/jmeter/protocol/http/control/DNSCacheManager.java | 3 ++-
xdocs/changes.xml | 1 +
4 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/checksum.xml b/checksum.xml
index 1ff8af1..556ea1c 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -67,6 +67,7 @@
+
diff --git a/gradle.properties b/gradle.properties
index fb1b2f0..b5b1331 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -77,7 +77,7 @@ commons-text.version=1.9
darklaf.version=2.5.3
darklaf.extensions.version=0.3.4
dec.version=0.1.2
-dnsjava.version=2.1.9
+dnsjava.version=3.3.1
equalsverifier.version=3.4.2
freemarker.version=2.3.30
ftplet-api.version=1.1.1
diff --git
a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DNSCacheManager.java
b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DNSCacheManager.java
index be4be22..087c83a 100644
---
a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DNSCacheManager.java
+++
b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/control/DNSCacheManager.java
@@ -20,6 +20,7 @@ package org.apache.jmeter.protocol.http.control;
import java.io.Serializable;
import java.net.InetAddress;
import java.net.UnknownHostException;
+import java.time.Duration;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.LinkedHashMap;
@@ -265,7 +266,7 @@ public class DNSCacheManager extends ConfigTestElement
implements TestIterationL
Lookup lookup = new Lookup(host, Type.A);
lookup.setCache(lookupCache);
if (timeoutMs > 0) {
-resolver.setTimeout(timeoutMs / 1000, timeoutMs % 1000);
+resolver.setTimeout(Duration.ofMillis(timeoutMs));
}
lookup.setResolver(resolver);
Record[] records = lookup.run();
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 5038198..f8981d9 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -126,6 +126,7 @@ Summary
Updated junit to 4.13.1 (from 4.13)
Updated ph-commons to 9.5.1 (from 9.4.1)
Updated ph-css to 6.2.3 (from 6.2.1)
+Updated dnsjava to 3.3.1 (from 2.1.9)
[jmeter] branch master updated: Updated SaxonHE to 9.9.1-8 (from 9.9.1-7) Updated asm to 9.0 (from 7.3.1) Updated bouncycastle to 1.67 (from 1.66) Updated caffeine to 2.8.8 (from 2.8.0) Updated common
This is an automated email from the ASF dual-hosted git repository. pmouawad 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 a9b45ce Updated SaxonHE to 9.9.1-8 (from 9.9.1-7) Updated asm to 9.0 (from 7.3.1) Updated bouncycastle to 1.67 (from 1.66) Updated caffeine to 2.8.8 (from 2.8.0) Updated commons-codec to 1.15 (from 1.14) Updated commons-io to 2.8.0 (from 2.7) Updated commons-net to 3.7.2 (from 3.7) Updated jackson to 2.10.5 (from 2.10.3) Updated json-path to 2.5.0 (from 2.4.0) Updated junit to 4.13.1 (from 4.13) Updated ph-commons to 9.5.1 (from 9.4.1) Updated ph-css to 6.2.3 (from 6.2.1 a9b45ce is described below commit a9b45ce260adeb75dcadf7089dfa8752b05472fa Author: pmouawad AuthorDate: Sat Dec 12 17:19:49 2020 +0100 Updated SaxonHE to 9.9.1-8 (from 9.9.1-7) Updated asm to 9.0 (from 7.3.1) Updated bouncycastle to 1.67 (from 1.66) Updated caffeine to 2.8.8 (from 2.8.0) Updated commons-codec to 1.15 (from 1.14) Updated commons-io to 2.8.0 (from 2.7) Updated commons-net to 3.7.2 (from 3.7) Updated jackson to 2.10.5 (from 2.10.3) Updated json-path to 2.5.0 (from 2.4.0) Updated junit to 4.13.1 (from 4.13) Updated ph-commons to 9.5.1 (from 9.4.1) Updated ph-css to 6.2.3 (from 6.2.1 --- checksum.xml| 3 +++ gradle.md | 3 +++ gradle.properties | 26 - src/dist/src/dist/expected_release_jars.csv | 30 ++--- xdocs/changes.xml | 12 5 files changed, 46 insertions(+), 28 deletions(-) diff --git a/checksum.xml b/checksum.xml index d65508c..1ff8af1 100644 --- a/checksum.xml +++ b/checksum.xml @@ -10,6 +10,7 @@ + @@ -51,6 +52,7 @@ + @@ -63,6 +65,7 @@ + diff --git a/gradle.md b/gradle.md index 49455b5..69a2c1c 100644 --- a/gradle.md +++ b/gradle.md @@ -48,6 +48,9 @@ However it might be useful to perform a "clean" build: # Expected checksums are stored in /checksum.properties file # Actual checksums are stored in /build/checksum/computed.checksum.properties + # Update expected dependencies after updating a dependency version + gw -PupdateExpectedJars check + ## Static checks ### Release Audit Tool diff --git a/gradle.properties b/gradle.properties index 81fe0fa..fb1b2f0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -55,23 +55,23 @@ accessors-smart.version=1.2 activemq.version=5.16.0 apache-rat.version=0.13 apiguardian-api.version=1.1.0 -asm.version=7.3.1 -bouncycastle.version=1.66 +asm.version=9.0 +bouncycastle.version=1.67 bsf.version=2.4.0 bsh.version=2.0b6 -caffeine.version=2.8.0 +caffeine.version=2.8.8 cglib-nodep.version=3.2.12 -commons-codec.version=1.14 +commons-codec.version=1.15 commons-collections.version=3.2.2 commons-collections4.version=4.4 commons-dbcp2.version=2.8.0 -commons-io.version=2.7 +commons-io.version=2.8.0 commons-jexl.version=2.1.1 commons-jexl3.version=3.1 commons-lang.version=2.6 commons-lang3.version=3.11 commons-math3.version=3.6.1 -commons-net.version=3.7 +commons-net.version=3.7.2 commons-pool2.version=2.9.0 commons-text.version=1.9 darklaf.version=2.5.3 @@ -92,19 +92,19 @@ httpclient.version=4.5.12 httpcore-nio.version=4.4.13 httpcore.version=4.4.13 httpmime.version=4.5.12 -jackson.version=2.10.3 -jackson-databind.version=2.10.3 +jackson.version=2.10.5 +jackson-databind.version=2.10.5 javax.activation.version=1.2.0 jcharts.version=0.7.5 jdom.version=1.1.3 jmespath-core.version=0.5.0 jmespath-jackson.version=0.5.0 jodd.version=5.0.13 -json-path.version=2.4.0 +json-path.version=2.5.0 json-smart.version=2.3 jsoup.version=1.13.1 jtidy.version=r938 -junit4.version=4.13 +junit4.version=4.13.1 junit5.version=5.7.0 log4j.version=2.13.3 mail.version=1.5.0-b01 @@ -114,11 +114,11 @@ mongo-java-driver.version=2.11.3 neo4j-java-driver.version=4.2.0 objenesis.version=2.6 oro.version=2.0.8 -ph-commons.version=9.4.1 -ph-css.version=6.2.2 +ph-commons.version=9.5.1 +ph-css.version=6.2.3 rhino.version=1.7.13 rsyntaxtextarea.version=3.1.1 -Saxon-HE.version=9.9.1-7 +Saxon-HE.version=9.9.1-8 slf4j.version=1.7.30 spock-core.version=2.0-M2-groovy-3.0 springframework.version=4.3.17.RELEASE diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv index bd725ab..570d4b9 100644 --- a/src/dist/src/dist/expected_release_jars.csv +++ b/src/dist/src/dist/expected_release_jars.csv @@ -1,21 +1,21 @@ 30035,accessors-smart-1.2.jar 2387,apiguardian-api-1.1.0.jar -121836,asm-7.3.1.jar +121783,asm-9.0.jar 113369,bsf-2.4.0.jar 389033,bsh-2.0b6.jar -879660,caffeine-2.8.0.jar -201216,checker-qual-
[jmeter] branch master updated: Fix bug 64969, make RemoteJMeterEngineImpl instance release completely when RemoteJMeterEngineImpl#rexit() invoked
This is an automated email from the ASF dual-hosted git repository.
pmouawad 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 5bb4fbe Fix bug 64969, make RemoteJMeterEngineImpl instance release
completely when RemoteJMeterEngineImpl#rexit() invoked
5bb4fbe is described below
commit 5bb4fbe389204290c61afbd12bac66a8ca928755
Author: pmouawad
AuthorDate: Wed Dec 9 09:21:21 2020 +0100
Fix bug 64969, make RemoteJMeterEngineImpl instance release completely when
RemoteJMeterEngineImpl#rexit() invoked
---
.../java/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java | 8
xdocs/changes.xml | 2 ++
2 files changed, 10 insertions(+)
diff --git
a/src/core/src/main/java/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java
b/src/core/src/main/java/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java
index 2750b92..087130c 100644
---
a/src/core/src/main/java/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java
+++
b/src/core/src/main/java/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java
@@ -19,11 +19,13 @@ package org.apache.jmeter.engine;
import java.io.File;
import java.net.InetAddress;
+import java.rmi.NoSuchObjectException;
import java.rmi.NotBoundException;
import java.rmi.RemoteException;
import java.rmi.registry.LocateRegistry;
import java.rmi.registry.Registry;
import java.rmi.server.ServerNotActiveException;
+import java.rmi.server.UnicastRemoteObject;
import java.util.HashMap;
import java.util.Properties;
@@ -206,6 +208,12 @@ public final class RemoteJMeterEngineImpl extends
java.rmi.server.UnicastRemoteO
log.warn("{} is not bound", JMETER_ENGINE_RMI_NAME, e);
}
log.info("Unbound from registry");
+try {
+UnicastRemoteObject.unexportObject(this, false);
+} catch (NoSuchObjectException e) {
+log.warn("{} not longer exists", this, e);
+}
+log.info("Unexported RemoteJMeterEngineImpl");
// Help with garbage control
JMeterUtils.helpGC();
et.start();
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 538184a..a1de93d 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -164,6 +164,7 @@ Summary
64957When importing example test plan JMeter displays an
NullPointerException
64961Darklaf: On Windows 7, NPE in
BasicEditorPaneUI.cleanDisplayProperties with Darklaf Intellij
64963Blank comment tooltip is visible
+ 64969RemoteJMeterEngineImpl#rexit doesn't unexport
RemoteJMeterEngineImpl on exit. Contributed by luo_isaiah at qq.com
@@ -173,6 +174,7 @@ Summary
Ori Marko (orimarko at gmail.com)
+ 罗寅卓 (luo_isaiah at qq.com)
We also thank bug reporters who helped us improve JMeter.
[jmeter] branch master updated: Bug 64961 - Darklaf: On Windows 7, NPE in BasicEditorPaneUI.cleanDisplayProperties with Darklaf Intellij
This is an automated email from the ASF dual-hosted git repository. pmouawad 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 d438649 Bug 64961 - Darklaf: On Windows 7, NPE in BasicEditorPaneUI.cleanDisplayProperties with Darklaf Intellij d438649 is described below commit d438649f7702e5909bb3c147a9fff6d59b23d0f8 Author: pmouawad AuthorDate: Mon Dec 7 13:47:57 2020 +0100 Bug 64961 - Darklaf: On Windows 7, NPE in BasicEditorPaneUI.cleanDisplayProperties with Darklaf Intellij --- gradle.properties | 2 +- xdocs/changes.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 8042913..81fe0fa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -74,7 +74,7 @@ commons-math3.version=3.6.1 commons-net.version=3.7 commons-pool2.version=2.9.0 commons-text.version=1.9 -darklaf.version=2.4.10 +darklaf.version=2.5.3 darklaf.extensions.version=0.3.4 dec.version=0.1.2 dnsjava.version=2.1.9 diff --git a/xdocs/changes.xml b/xdocs/changes.xml index 59d103c..fe96cc0 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -162,6 +162,7 @@ Summary General 64957When importing example test plan JMeter displays an NullPointerException + 64961Darklaf: On Windows 7, NPE in BasicEditorPaneUI.cleanDisplayProperties with Darklaf Intellij
[jmeter] branch master updated: Bug 64936 - Increase generate_report_ui.generation_timeout to 5 minutes to handle large performance test
This is an automated email from the ASF dual-hosted git repository.
pmouawad 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 aacf090 Bug 64936 - Increase generate_report_ui.generation_timeout to
5 minutes to handle large performance test
aacf090 is described below
commit aacf090a64699532c2eac695b306af46f89bf517
Author: pmouawad
AuthorDate: Tue Nov 24 20:41:30 2020 +0100
Bug 64936 - Increase generate_report_ui.generation_timeout to 5 minutes to
handle large performance test
---
bin/jmeter.properties | 2 +-
.../src/main/java/org/apache/jmeter/gui/action/HtmlReportGenerator.java | 2 +-
xdocs/changes.xml | 1 +
xdocs/usermanual/properties_reference.xml | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/bin/jmeter.properties b/bin/jmeter.properties
index 4388b39..7683c28 100644
--- a/bin/jmeter.properties
+++ b/bin/jmeter.properties
@@ -1325,7 +1325,7 @@ jmeter.reportgenerator.apdex_satisfied_threshold=500
jmeter.reportgenerator.apdex_tolerated_threshold=1500
# Timeout in milliseconds for Report generation when using Tools > Generate
HTML report
-#generate_report_ui.generation_timeout=12
+#generate_report_ui.generation_timeout=30
#---
# Naming Policy configuration
#---
diff --git
a/src/core/src/main/java/org/apache/jmeter/gui/action/HtmlReportGenerator.java
b/src/core/src/main/java/org/apache/jmeter/gui/action/HtmlReportGenerator.java
index 2b3b5af..87803da 100644
---
a/src/core/src/main/java/org/apache/jmeter/gui/action/HtmlReportGenerator.java
+++
b/src/core/src/main/java/org/apache/jmeter/gui/action/HtmlReportGenerator.java
@@ -40,7 +40,7 @@ public class HtmlReportGenerator {
public static final String CANNOT_CREATE_DIRECTORY =
"generate_report_ui.cannot_create_directory";
private static final Logger LOGGER =
LoggerFactory.getLogger(HtmlReportGenerator.class);
-private static final long COMMAND_TIMEOUT =
JMeterUtils.getPropDefault("generate_report_ui.generation_timeout", 120_000L);
+private static final long COMMAND_TIMEOUT =
JMeterUtils.getPropDefault("generate_report_ui.generation_timeout", 300_000L);
private String csvFilePath;
private String userPropertiesFilePath;
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index b8828b4..a454b3b 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -115,6 +115,7 @@ applications when JMeter is starting up.
Report / Dashboard
64824Dashboard/HTML Report: Rename KO to
FAIL
+ 64936Increase generate_report_ui.generation_timeout to 5
minutes to handle large performance test
General
diff --git a/xdocs/usermanual/properties_reference.xml
b/xdocs/usermanual/properties_reference.xml
index a11ba55..d90f0c3 100644
--- a/xdocs/usermanual/properties_reference.xml
+++ b/xdocs/usermanual/properties_reference.xml
@@ -1779,7 +1779,7 @@ JMETER-SERVER
Timeout in milliseconds for Report generation when using Tools >
Generate HTML report.
-Defaults to: 12
+Defaults to: 30
[jmeter] branch master updated: Update expected_release_jars.csv following dependencies upgrade
This is an automated email from the ASF dual-hosted git repository. pmouawad 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 35e95b1 Update expected_release_jars.csv following dependencies upgrade 35e95b1 is described below commit 35e95b1d80baad9eb7eb276dbfc65622c4daf2aa Author: pmouawad AuthorDate: Tue Nov 24 16:08:05 2020 +0100 Update expected_release_jars.csv following dependencies upgrade --- src/dist/src/dist/expected_release_jars.csv | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv index f3bcb7a..14df478 100644 --- a/src/dist/src/dist/expected_release_jars.csv +++ b/src/dist/src/dist/expected_release_jars.csv @@ -8,7 +8,7 @@ 347669,commons-codec-1.14.jar 588337,commons-collections-3.2.2.jar 751914,commons-collections4-4.4.jar -208475,commons-dbcp2-2.7.0.jar +207774,commons-dbcp2-2.8.0.jar 276413,commons-io-2.7.jar 267634,commons-jexl-2.1.1.jar 397422,commons-jexl3-3.1.jar @@ -16,7 +16,7 @@ 61829,commons-logging-1.2.jar 2213560,commons-math3-3.6.1.jar 305844,commons-net-3.7.jar -133109,commons-pool2-2.8.1.jar +134858,commons-pool2-2.9.0.jar 216211,commons-text-1.9.jar 1447270,darklaf-core-2.4.10.jar 20650,darklaf-extensions-rsyntaxarea-0.3.4.jar @@ -76,12 +76,12 @@ 106939,miglayout-core-5.2.jar 22390,miglayout-swing-5.2.jar 419054,mongo-java-driver-2.11.3.jar -4474164,neo4j-java-driver-4.0.1.jar +4580832,neo4j-java-driver-4.2.0.jar 65261,oro-2.0.8.jar 1299088,ph-commons-9.4.1.jar 505816,ph-css-6.2.2.jar 11369,reactive-streams-1.0.3.jar -1298390,rhino-1.7.12.jar +1315838,rhino-1.7.13.jar 1196575,rsyntaxtextarea-3.1.1.jar 5498326,Saxon-HE-9.9.1-7.jar 276420,serializer-2.7.2.jar @@ -95,4 +95,4 @@ 671727,xmlgraphics-commons-2.3.jar 7188,xmlpull-1.1.3.1.jar 24956,xpp3_min-1.1.4c.jar -621071,xstream-1.4.11.1.jar +627490,xstream-1.4.14.jar
[jmeter] branch master updated: Bug 64935 - A broken plugin class should not prevent JMeter from starting
This is an automated email from the ASF dual-hosted git repository.
pmouawad 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 88be852 Bug 64935 - A broken plugin class should not prevent JMeter
from starting
88be852 is described below
commit 88be852762cd5db86ecd7d8b035549a9782a5cb9
Author: pmouawad
AuthorDate: Tue Nov 24 15:49:49 2020 +0100
Bug 64935 - A broken plugin class should not prevent JMeter from
starting
---
.../src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java | 6 +-
xdocs/changes.xml | 1 +
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git
a/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java
b/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java
index f05d262..0091776 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterMenuBar.java
@@ -232,8 +232,12 @@ public class JMeterMenuBar extends JMenuBar implements
LocaleChangeListener {
MenuCreator creator = (MenuCreator)
commandClass.getDeclaredConstructor().newInstance();
creators.add(creator);
}
+} catch (NoClassDefFoundError e) {
+log.error("Exception registering implementation:{} of
interface:{}, a dependency used by the plugin class is missing",
+strClassName, MenuCreator.class, e);
} catch (Exception e) {
-log.error("Exception registering {} with implementation:
{}", MenuCreator.class, strClassName, e);
+log.error("Exception registering implementation {} of
interface:{}, a jar is probably missing",
+strClassName, MenuCreator.class, e);
}
}
} catch (IOException e) {
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 05381dc..5ba3735 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -227,6 +227,7 @@ applications when JMeter is starting up.
64453Darklaf: Save Test Plan as New Folder failure
64625Darklaf: trying to select a folder in Browse leads to
an error popup and stacktrace
64711Textarea Colors are not good in dark modes.
Contributed by Jannis Weis
+64935A broken plugin class should not prevent JMeter from
starting
[jmeter] branch master updated (7b36b44 -> 166800a)
This is an automated email from the ASF dual-hosted git repository. pmouawad pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/jmeter.git. from 7b36b44 Markup changes. Mainly to test trigger on travis add 166800a Add BackendListener that sends "raw" results to InfluxDB (#544) No new revisions were added by this update. Summary of changes: .../backend/AbstractBackendListenerClient.java | 9 -- .../visualizers/backend/BackendListenerClient.java | 75 +-- .../backend/influxdb/HttpMetricsSender.java| 13 +- .../influxdb/InfluxDBRawBackendListenerClient.java | 144 + .../influxdb/InfluxdbBackendListenerClient.java| 12 +- .../backend/influxdb/InfluxdbMetricsSender.java| 23 +++- .../backend/influxdb/UdpMetricsSender.java | 19 ++- .../InfluxDBRawBackendListenerClientSpec.groovy| 97 ++ .../InfluxdbBackendListenerClientSpec.groovy | 2 +- xdocs/usermanual/component_reference.xml | 35 - xdocs/usermanual/realtime-results.xml | 9 +- 11 files changed, 361 insertions(+), 77 deletions(-) create mode 100644 src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/InfluxDBRawBackendListenerClient.java create mode 100644 src/components/src/test/groovy/org/apache/jmeter/visualizers/backend/influxdb/InfluxDBRawBackendListenerClientSpec.groovy
[jmeter] branch master updated (7b36b44 -> 166800a)
This is an automated email from the ASF dual-hosted git repository. pmouawad pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/jmeter.git. from 7b36b44 Markup changes. Mainly to test trigger on travis add 166800a Add BackendListener that sends "raw" results to InfluxDB (#544) No new revisions were added by this update. Summary of changes: .../backend/AbstractBackendListenerClient.java | 9 -- .../visualizers/backend/BackendListenerClient.java | 75 +-- .../backend/influxdb/HttpMetricsSender.java| 13 +- .../influxdb/InfluxDBRawBackendListenerClient.java | 144 + .../influxdb/InfluxdbBackendListenerClient.java| 12 +- .../backend/influxdb/InfluxdbMetricsSender.java| 23 +++- .../backend/influxdb/UdpMetricsSender.java | 19 ++- .../InfluxDBRawBackendListenerClientSpec.groovy| 97 ++ .../InfluxdbBackendListenerClientSpec.groovy | 2 +- xdocs/usermanual/component_reference.xml | 35 - xdocs/usermanual/realtime-results.xml | 9 +- 11 files changed, 361 insertions(+), 77 deletions(-) create mode 100644 src/components/src/main/java/org/apache/jmeter/visualizers/backend/influxdb/InfluxDBRawBackendListenerClient.java create mode 100644 src/components/src/test/groovy/org/apache/jmeter/visualizers/backend/influxdb/InfluxDBRawBackendListenerClientSpec.groovy
[jmeter] branch master updated: Bug 63527: Avoid empty element saved when embedded_url_exclude_re is not set to avoid too much change in source versionning
This is an automated email from the ASF dual-hosted git repository.
pmouawad 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 f4be397 Bug 63527: Avoid empty element saved when
embedded_url_exclude_re is not set to avoid too much change in source
versionning
f4be397 is described below
commit f4be39781292564d9c3e3de1a6dee68bfde678d2
Author: pmouawad
AuthorDate: Fri Nov 6 21:06:30 2020 +0100
Bug 63527: Avoid empty element saved when embedded_url_exclude_re is not
set to avoid too much change in source versionning
---
.../java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
index 66b68e9..dee4b47 100644
---
a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
+++
b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
@@ -1038,7 +1038,7 @@ public abstract class HTTPSamplerBase extends
AbstractSampler
}
public void setEmbeddedUrlExcludeRE(String regex) {
-setProperty(new StringProperty(EMBEDDED_URL_EXCLUDE_RE, regex));
+setProperty(EMBEDDED_URL_EXCLUDE_RE, regex, "");
}
/**
[jmeter] 01/03: Merge branch 'Bug64776' of https://github.com/FackelAB/jmeter into FackelAB-Bug64776
This is an automated email from the ASF dual-hosted git repository. pmouawad pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jmeter.git commit dcf584a042b799668e33e4f416562659a9f12f54 Merge: da95029 0cfa2bc Author: pmouawad AuthorDate: Sun Oct 25 09:27:17 2020 +0100 Merge branch 'Bug64776' of https://github.com/FackelAB/jmeter into FackelAB-Bug64776 .../src/main/java/org/apache/jmeter/JMeter.java| 3 + .../apache/jmeter/util/SecurityProviderLoader.java | 78 + .../jmeter/util/SecurityProviderLoaderTest.java| 184 + xdocs/usermanual/properties_reference.xml | 22 +++ 4 files changed, 287 insertions(+)
[jmeter] branch master updated (da95029 -> 9dcf9d0)
This is an automated email from the ASF dual-hosted git repository. pmouawad pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/jmeter.git. from da95029 Mention 64711 fix add 0cfa2bc Fix to Bug64776 new dcf584a Merge branch 'Bug64776' of https://github.com/FackelAB/jmeter into FackelAB-Bug64776 new eb03d31 Minor cleanup + mention contributor new 9dcf9d0 Merge branch 'FackelAB-Bug64776' The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../src/main/java/org/apache/jmeter/JMeter.java| 3 + .../apache/jmeter/util/SecurityProviderLoader.java | 78 + .../jmeter/util/SecurityProviderLoaderTest.java| 183 + xdocs/changes.xml | 2 + xdocs/usermanual/properties_reference.xml | 22 +++ 5 files changed, 288 insertions(+) create mode 100644 src/core/src/main/java/org/apache/jmeter/util/SecurityProviderLoader.java create mode 100644 src/core/src/test/java/org/apache/jmeter/util/SecurityProviderLoaderTest.java
[jmeter] 03/03: Merge branch 'FackelAB-Bug64776'
This is an automated email from the ASF dual-hosted git repository. pmouawad pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/jmeter.git commit 9dcf9d0d76a541d895153e5567b8a871a981dfcb Merge: da95029 eb03d31 Author: pmouawad AuthorDate: Sun Oct 25 09:35:41 2020 +0100 Merge branch 'FackelAB-Bug64776' .../src/main/java/org/apache/jmeter/JMeter.java| 3 + .../apache/jmeter/util/SecurityProviderLoader.java | 78 + .../jmeter/util/SecurityProviderLoaderTest.java| 183 + xdocs/changes.xml | 2 + xdocs/usermanual/properties_reference.xml | 22 +++ 5 files changed, 288 insertions(+)
[jmeter] 02/03: Minor cleanup + mention contributor
This is an automated email from the ASF dual-hosted git repository.
pmouawad pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit eb03d31a49ccae7781cea32df5da440894fec97e
Author: pmouawad
AuthorDate: Sun Oct 25 09:35:01 2020 +0100
Minor cleanup + mention contributor
---
.../org/apache/jmeter/util/SecurityProviderLoader.java| 4 ++--
.../apache/jmeter/util/SecurityProviderLoaderTest.java| 15 +++
xdocs/changes.xml | 2 ++
3 files changed, 11 insertions(+), 10 deletions(-)
diff --git
a/src/core/src/main/java/org/apache/jmeter/util/SecurityProviderLoader.java
b/src/core/src/main/java/org/apache/jmeter/util/SecurityProviderLoader.java
index 203dac7..656ee35 100644
--- a/src/core/src/main/java/org/apache/jmeter/util/SecurityProviderLoader.java
+++ b/src/core/src/main/java/org/apache/jmeter/util/SecurityProviderLoader.java
@@ -31,6 +31,7 @@ import org.slf4j.LoggerFactory;
public class SecurityProviderLoader {
private static final Logger log =
LoggerFactory.getLogger(SecurityProviderLoader.class);
+private static final Pattern CONFIGURATION_REGEX =
Pattern.compile("^(?[^:]+)(:(?\\d+)(:(?.+))?)?$");
public static void addSecurityProvider(Properties properties) {
properties.keySet().stream()
@@ -39,8 +40,7 @@ public class SecurityProviderLoader {
}
public static void addSecurityProvider(String securityProviderConfig) {
-Pattern regex =
Pattern.compile("^(?[^:]+)(:(?\\d+)(:(?.+))?)?$");
-Matcher matcher = regex.matcher(securityProviderConfig);
+Matcher matcher = CONFIGURATION_REGEX.matcher(securityProviderConfig);
if (matcher.matches()) {
final String classname = matcher.group("classname");
diff --git
a/src/core/src/test/java/org/apache/jmeter/util/SecurityProviderLoaderTest.java
b/src/core/src/test/java/org/apache/jmeter/util/SecurityProviderLoaderTest.java
index 38c9e45..8b9f110 100644
---
a/src/core/src/test/java/org/apache/jmeter/util/SecurityProviderLoaderTest.java
+++
b/src/core/src/test/java/org/apache/jmeter/util/SecurityProviderLoaderTest.java
@@ -32,7 +32,7 @@ import org.junit.jupiter.params.provider.ValueSource;
public class SecurityProviderLoaderTest {
@AfterEach
-public void removeAllDummProviders() {
+public void removeAllDummyProviders() {
Security.removeProvider(DummyProvider.PROVIDER_NAME);
Security.removeProvider(DummyProviderWithConfig.PROVIDER_NAME);
Assert.assertNull(Security.getProvider(DummyProvider.PROVIDER_NAME));
@@ -41,11 +41,10 @@ public class SecurityProviderLoaderTest {
@Test
public void addSecurityProviderTest() {
-removeAllDummProviders();
+removeAllDummyProviders();
Provider[] providers = Security.getProviders();
int providersCountBefore = providers.length;
-
SecurityProviderLoader.addSecurityProvider(DummyProvider.class.getName());
Provider[] providers_after = Security.getProviders();
@@ -63,7 +62,7 @@ public class SecurityProviderLoaderTest {
@Test
public void addSecurityProviderTestWithConfigForUnconfigurableProvider() {
-removeAllDummProviders();
+removeAllDummyProviders();
int providersCountBefore = Security.getProviders().length;
SecurityProviderLoader.addSecurityProvider(DummyProvider.class.getName()+":0:Configure");
@@ -79,7 +78,7 @@ public class SecurityProviderLoaderTest {
@Test
public void addUnknownSecurityProviderTest() {
-removeAllDummProviders();
+removeAllDummyProviders();
int providersCountBefore = Security.getProviders().length;
SecurityProviderLoader.addSecurityProvider("org.apache.jmeter.util.SecurityProviderLoaderTest.UnknownProvider");
@@ -93,7 +92,7 @@ public class SecurityProviderLoaderTest {
@ParameterizedTest
@ValueSource(ints = {0, 1, 2, 3})
public void addSecurityProviderWithPositionTest(int position) {
-removeAllDummProviders();
+removeAllDummyProviders();
int providersCountBefore = Security.getProviders().length;
SecurityProviderLoader.addSecurityProvider(DummyProvider.class.getName() + ":"
+ position);
@@ -110,7 +109,7 @@ public class SecurityProviderLoaderTest {
@ParameterizedTest
@CsvSource({":0:TestConfig,0", ":2:TEST,2", ":3:TEST,3"})
public void addSecurityProviderWithPositionAndConfigTest(String config,
int position) {
-removeAllDummProviders();
+removeAllDummyProviders();
int providersCountBefore = Security.getProviders().length;
SecurityProviderLoader.addSecurityProvider(DummyProviderWithConfig.class.getName()
+ config);
@@ -129,7 +128,7 @@ public class SecurityProviderLoaderTest {
@Test
public void addSecurityProv
[jmeter] branch master updated: Mention 64711 fix
This is an automated email from the ASF dual-hosted git repository. pmouawad 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 da95029 Mention 64711 fix da95029 is described below commit da950294fe627535524107d7cb18ab26eeb7a07e Author: pmouawad AuthorDate: Sat Oct 24 17:14:29 2020 +0200 Mention 64711 fix --- xdocs/changes.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xdocs/changes.xml b/xdocs/changes.xml index 46d9198..72da838 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -220,6 +220,7 @@ applications when JMeter is starting up. 64641Darklaf: NPE at com.github.weisj.darklaf.ui.tree.DarkTreeUI.isChildOfSelectionPath(DarkTreeUI.java:603) ~[darklaf-core-2.4.2-SNAPSHOT.jar:2.4.2-SNAPSHOT] 64453Darklaf: Save Test Plan as New Folder failure 64625Darklaf: trying to select a folder in Browse leads to an error popup and stacktrace +64711Textarea Colors are not good in dark modes. Contributed by Jannis Weis @@ -234,7 +235,6 @@ applications when JMeter is starting up. https://ubikloadpack.com"; >Ubik Load Pack https://github.com/weisJ/darklaf";>Jannis Weis https://github.com/topicus-pw-dvdouden";>Daniel van den Ouden - https://ubikloadpack.com"; >Ubik Load Pack Till Neunast (https://github.com/tilln) Pooja Chandak (poojachandak002 at gmail.com) Vincent Daburon (vdaburon at gmail.com)
[jmeter] branch master updated: Fix style
This is an automated email from the ASF dual-hosted git repository. pmouawad 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 bbc3a91 Fix style bbc3a91 is described below commit bbc3a9182a1af38f3868e382cf61a051dbc3cebb Author: pmouawad AuthorDate: Sat Oct 24 17:04:57 2020 +0200 Fix style --- xdocs/usermanual/component_reference.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xdocs/usermanual/component_reference.xml b/xdocs/usermanual/component_reference.xml index aaa5eaa..e2e2e40 100644 --- a/xdocs/usermanual/component_reference.xml +++ b/xdocs/usermanual/component_reference.xml @@ -3347,7 +3347,7 @@ Generates a summary of the test run so far to the log file and/or standard output. Both running and differential totals are shown. Output is generated every n seconds (default 30 seconds) on the appropriate time boundary, so that multiple test runs on the same time will be synchronised. -Since a summary/differential line is written only if there are samples emitted, the interval +Since a summary/differential line is written only if there are samples emitted, the interval for generation may not be respected if your test has no sample generated within the interval See jmeter.properties file for the summariser configuration items:
[jmeter] branch master updated: Bug 64795: Clarify documentation on Generate Summary Results
This is an automated email from the ASF dual-hosted git repository. pmouawad 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 22f038d Bug 64795: Clarify documentation on Generate Summary Results 22f038d is described below commit 22f038d09831f86bab8217140ecbdffa002059e7 Author: pmouawad AuthorDate: Sat Oct 24 16:55:48 2020 +0200 Bug 64795: Clarify documentation on Generate Summary Results --- xdocs/changes.xml| 1 + xdocs/usermanual/component_reference.xml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/xdocs/changes.xml b/xdocs/changes.xml index 7deb6ca..46d9198 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -172,6 +172,7 @@ applications when JMeter is starting up. Controllers +64795Generate summary report may not output a summary line in the configured interval (summariser.interval): Clarify documentation Listeners diff --git a/xdocs/usermanual/component_reference.xml b/xdocs/usermanual/component_reference.xml index b241ac5..aaa5eaa 100644 --- a/xdocs/usermanual/component_reference.xml +++ b/xdocs/usermanual/component_reference.xml @@ -3347,6 +3347,8 @@ Generates a summary of the test run so far to the log file and/or standard output. Both running and differential totals are shown. Output is generated every n seconds (default 30 seconds) on the appropriate time boundary, so that multiple test runs on the same time will be synchronised. +Since a summary/differential line is written only if there are samples emitted, the interval +for generation may not be respected if your test has no sample generated within the interval See jmeter.properties file for the summariser configuration items: # Define the following property to automatically start a summariser with that name
[jmeter] branch master updated: Bug 64843 - Tree: Don't propagate the state (enable/disabled) of current element to children
This is an automated email from the ASF dual-hosted git repository.
pmouawad 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 4de138c Bug 64843 - Tree: Don't propagate the state (enable/disabled)
of current element to children
4de138c is described below
commit 4de138c40f8102bbfdf89e614a8b52581f56431e
Author: pmouawad
AuthorDate: Fri Oct 23 14:42:58 2020 +0200
Bug 64843 - Tree: Don't propagate the state (enable/disabled) of current
element to children
---
.../apache/jmeter/gui/action/EnableComponent.java | 25 --
.../apache/jmeter/gui/tree/JMeterCellRenderer.java | 15 -
2 files changed, 40 deletions(-)
diff --git
a/src/core/src/main/java/org/apache/jmeter/gui/action/EnableComponent.java
b/src/core/src/main/java/org/apache/jmeter/gui/action/EnableComponent.java
index 34f39aa..fbf205c 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/action/EnableComponent.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/action/EnableComponent.java
@@ -18,13 +18,9 @@
package org.apache.jmeter.gui.action;
import java.awt.event.ActionEvent;
-import java.util.ArrayDeque;
-import java.util.Arrays;
import java.util.HashSet;
import java.util.Set;
-import javax.swing.tree.TreeNode;
-
import org.apache.jmeter.gui.GuiPackage;
import org.apache.jmeter.gui.tree.JMeterTreeNode;
import org.slf4j.Logger;
@@ -54,15 +50,12 @@ public class EnableComponent extends AbstractAction {
if (e.getActionCommand().equals(ActionNames.ENABLE)) {
log.debug("enabling currently selected gui objects");
enableComponents(nodes, true);
-triggerChildrenRender(nodes);
} else if (e.getActionCommand().equals(ActionNames.DISABLE)) {
log.debug("disabling currently selected gui objects");
enableComponents(nodes, false);
-triggerChildrenRender(nodes);
} else if (e.getActionCommand().equals(ActionNames.TOGGLE)) {
log.debug("toggling currently selected gui objects");
toggleComponents(nodes);
-triggerChildrenRender(nodes);
}
}
@@ -83,24 +76,6 @@ public class EnableComponent extends AbstractAction {
}
}
-private void triggerChildrenRender(JMeterTreeNode[] nodes) {
-Set visited = new HashSet<>();
-ArrayDeque queue = new ArrayDeque<>(Arrays.asList(nodes));
-while (!queue.isEmpty()) {
-final TreeNode next = queue.poll();
-if (!visited.add(next)) {
-continue;
-}
-if (next instanceof JMeterTreeNode) {
-// Trigger render
-((JMeterTreeNode) next).nameChanged();
-}
-for (int i = 0; i < next.getChildCount(); i++) {
-queue.add(next.getChildAt(i));
-}
-}
-}
-
/**
* @see org.apache.jmeter.gui.action.Command#getActionNames()
*/
diff --git
a/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterCellRenderer.java
b/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterCellRenderer.java
index 55b3cbe..c0f5f2c 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterCellRenderer.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/tree/JMeterCellRenderer.java
@@ -25,10 +25,8 @@ import javax.swing.ImageIcon;
import javax.swing.JTree;
import javax.swing.border.Border;
import javax.swing.tree.DefaultTreeCellRenderer;
-import javax.swing.tree.TreeNode;
import org.apache.commons.lang3.StringUtils;
-import org.apache.jmeter.control.TestFragmentController;
import org.apache.jorphan.util.JOrphanUtils;
/**
@@ -54,19 +52,6 @@ public class JMeterCellRenderer extends
DefaultTreeCellRenderer {
JOrphanUtils.isBlank(node.getName()) ? BLANK : node.getName(),
sel, expanded, leaf, row, p_hasFocus);
boolean enabled = node.isEnabled();
-// Even in case the node itself is not disabled, we render it as
disabled if
-// one of its parents is in fact disabled.
-for (TreeNode parent = node.getParent(); parent != null && enabled;
parent = parent.getParent()) {
-if (parent instanceof JMeterTreeNode) {
-JMeterTreeNode jMeterTreeNode = (JMeterTreeNode) parent;
-if (jMeterTreeNode.getTestElement() instanceof
TestFragmentController) {
-// TestFragment is always disabled, so we don't want to
mark everything below
-// with pale
-break;
-}
-enabled = jMeterTreeNode.isEnabled();
-}
-}
ImageIcon ic = node.getIcon(enabled);
if (ic != null) {
if (enabled) {
[jmeter] branch master updated: Bug 64824: Dashboard/HTML Report: Rename KO to FAIL
This is an automated email from the ASF dual-hosted git repository.
pmouawad 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 2289ac9 Bug 64824: Dashboard/HTML Report: Rename KO to FAIL
2289ac9 is described below
commit 2289ac9e4fd9812debb2111960cb3e9277e63ef5
Author: pmouawad
AuthorDate: Sun Oct 18 15:38:57 2020 +0200
Bug 64824: Dashboard/HTML Report: Rename KO to FAIL
---
bin/report-template/content/js/dashboard.js.fmkr | 4 ++--
.../main/resources/org/apache/jmeter/resources/messages.properties| 2 +-
xdocs/changes.xml | 1 +
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/bin/report-template/content/js/dashboard.js.fmkr
b/bin/report-template/content/js/dashboard.js.fmkr
index 31836ad..04a6255 100644
--- a/bin/report-template/content/js/dashboard.js.fmkr
+++ b/bin/report-template/content/js/dashboard.js.fmkr
@@ -136,12 +136,12 @@ $(document).ready(function() {
var data = ${requestsSummary!"{}"};
var dataset = [
{
-"label" : "KO",
+"label" : "FAIL",
"data" : data.KoPercent,
"color" : "#FF6347"
},
{
-"label" : "OK",
+"label" : "PASS",
"data" : data.OkPercent,
"color" : "#9ACD32"
}];
diff --git
a/src/core/src/main/resources/org/apache/jmeter/resources/messages.properties
b/src/core/src/main/resources/org/apache/jmeter/resources/messages.properties
index b91f1ee..53f57b1 100644
---
a/src/core/src/main/resources/org/apache/jmeter/resources/messages.properties
+++
b/src/core/src/main/resources/org/apache/jmeter/resources/messages.properties
@@ -976,7 +976,7 @@ reportgenerator_summary_errors_rate_all=% in all samples
reportgenerator_summary_errors_rate_error=% in errors
reportgenerator_summary_errors_type=Type of error
reportgenerator_summary_statistics_count=#Samples
-reportgenerator_summary_statistics_error_count=KO
+reportgenerator_summary_statistics_error_count=FAIL
reportgenerator_summary_statistics_error_percent=Error %
reportgenerator_summary_statistics_kbytes=Received
reportgenerator_summary_statistics_sent_kbytes=Sent
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index dd39a2a..7deb6ca 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -113,6 +113,7 @@ applications when JMeter is starting up.
Report / Dashboard
+ 64824Dashboard/HTML Report: Rename KO to FAIL
General
[jmeter] branch master updated (5d34a52 -> 041eb89)
This is an automated email from the ASF dual-hosted git repository. pmouawad pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/jmeter.git. from 5d34a52 Remove files that change often from Travis cache, remove broken files automatically add 041eb89 BZ-64800: correcting plugin action components' resource key usages (#631) No new revisions were added by this update. Summary of changes: .../jmeter/gui/action/ExportTransactionAndSamplerNames.java | 4 ++-- .../main/java/org/apache/jmeter/gui/HtmlReportAction.java| 3 ++- .../src/main/java/org/apache/jmeter/gui/HtmlReportUI.java| 2 +- .../apache/jmeter/gui/action/CompileJSR223TestElements.java | 4 ++-- .../java/org/apache/jmeter/gui/action/SchematicView.java | 4 ++-- .../org/apache/jmeter/resources/messages.properties | 8 .../org/apache/jmeter/resources/messages_fr.properties | 8 .../org/apache/jmeter/resources/messages_ko.properties | 12 ++-- .../protocol/http/gui/action/ParseCurlCommandAction.java | 3 ++- 9 files changed, 25 insertions(+), 23 deletions(-)
[jmeter] branch master updated: Ensure all used fonts support fallback fonts by using methods that preserve the underlying Font2D handle. (#618)
This is an automated email from the ASF dual-hosted git repository.
pmouawad 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 fc334b0 Ensure all used fonts support fallback fonts by using methods
that preserve the underlying Font2D handle. (#618)
fc334b0 is described below
commit fc334b0426b48a1ee86015a1fba52d274c479f54
Author: Jannis Weis <31143295+we...@users.noreply.github.com>
AuthorDate: Wed Oct 7 13:51:06 2020 +0200
Ensure all used fonts support fallback fonts by using methods that preserve
the underlying Font2D handle. (#618)
Ensure fallback enabled fonts are used
---
.../org/apache/jmeter/visualizers/AxisGraph.java | 3 +-
.../jmeter/visualizers/MailerVisualizer.java | 3 +-
.../visualizers/RespTimeGraphVisualizer.java | 8 +++--
.../jmeter/visualizers/StatGraphVisualizer.java| 12 +---
.../apache/jmeter/gui/util/JSyntaxTextArea.java| 2 +-
.../org/apache/jorphan/gui/JMeterUIDefaults.java | 34 --
.../protocol/http/config/gui/UrlConfigGui.java | 6
7 files changed, 50 insertions(+), 18 deletions(-)
diff --git
a/src/components/src/main/java/org/apache/jmeter/visualizers/AxisGraph.java
b/src/components/src/main/java/org/apache/jmeter/visualizers/AxisGraph.java
index 14ffcbc..3de8a94 100644
--- a/src/components/src/main/java/org/apache/jmeter/visualizers/AxisGraph.java
+++ b/src/components/src/main/java/org/apache/jmeter/visualizers/AxisGraph.java
@@ -30,6 +30,7 @@ import javax.swing.JPanel;
import javax.swing.UIManager;
import org.apache.jmeter.util.JMeterUtils;
+import org.apache.jorphan.gui.JMeterUIDefaults;
import org.jCharts.axisChart.AxisChart;
import
org.jCharts.axisChart.customRenderers.axisValue.renderers.ValueLabelPosition;
import
org.jCharts.axisChart.customRenderers.axisValue.renderers.ValueLabelRenderer;
@@ -82,7 +83,7 @@ public class AxisGraph extends JPanel {
private static final Font FONT_DEFAULT =
UIManager.getDefaults().getFont("TextField.font");
-protected Font valueFont = new Font("SansSerif", Font.PLAIN, (int)
Math.round(FONT_DEFAULT.getSize() * 0.6));
+protected Font valueFont = JMeterUIDefaults.createFont("SansSerif",
Font.PLAIN, (int) Math.round(FONT_DEFAULT.getSize() * 0.6));
protected Color[] color = { Color.YELLOW };
diff --git
a/src/components/src/main/java/org/apache/jmeter/visualizers/MailerVisualizer.java
b/src/components/src/main/java/org/apache/jmeter/visualizers/MailerVisualizer.java
index b24ea2b..058 100644
---
a/src/components/src/main/java/org/apache/jmeter/visualizers/MailerVisualizer.java
+++
b/src/components/src/main/java/org/apache/jmeter/visualizers/MailerVisualizer.java
@@ -49,6 +49,7 @@ import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jmeter.visualizers.gui.AbstractVisualizer;
+import org.apache.jorphan.gui.JMeterUIDefaults;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -283,7 +284,7 @@ public class MailerVisualizer extends AbstractVisualizer
implements ActionListen
MailerModel.MailAuthType.NONE.toString(),
MailerModel.MailAuthType.SSL.toString(),
MailerModel.MailAuthType.TLS.toString()});
-authTypeCombo.setFont(new Font("SansSerif", Font.PLAIN, 10)); //
$NON-NLS-1$
+authTypeCombo.setFont(JMeterUIDefaults.createFont("SansSerif",
Font.PLAIN, 10)); // $NON-NLS-1$
authTypePane.add(authTypeCombo, BorderLayout.CENTER);
JPanel credPane = new JPanel(new BorderLayout());
diff --git
a/src/components/src/main/java/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java
b/src/components/src/main/java/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java
index 234c96f..59ad93f 100644
---
a/src/components/src/main/java/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java
+++
b/src/components/src/main/java/org/apache/jmeter/visualizers/RespTimeGraphVisualizer.java
@@ -21,7 +21,6 @@ import java.awt.BorderLayout;
import java.awt.Color;
import java.awt.Dimension;
import java.awt.FlowLayout;
-import java.awt.Font;
import java.awt.event.ActionEvent;
import java.awt.event.ActionListener;
import java.text.SimpleDateFormat;
@@ -66,6 +65,7 @@ import org.apache.jmeter.visualizers.utils.Colors;
import org.apache.jorphan.gui.GuiUtils;
import org.apache.jorphan.gui.JFactory;
import org.apache.jorphan.gui.JLabeledTextField;
+import org.apache.jorphan.gui.JMeterUIDefaults;
import org.apache.jorphan.math.StatCalculatorLong;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -373,10 +373,12 @@ public class RespTimeGraphVisualizer extends
AbstractVisualizer implements Actio
graphPanel.
[jmeter] branch master updated: BZ 64752 - Add GraphQL/HTTP Request Sampler (#627)
This is an automated email from the ASF dual-hosted git repository. pmouawad 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 82e56be BZ 64752 - Add GraphQL/HTTP Request Sampler (#627) 82e56be is described below commit 82e56beb04505af96d1e9ce327f67aa8eba99e06 Author: Woonsan Ko AuthorDate: Sun Oct 4 05:06:56 2020 -0400 BZ 64752 - Add GraphQL/HTTP Request Sampler (#627) * BZ-64752: adding GraphQL HTTP Sampler GUI components * BZ-64752: javadocs * BZ-64752: fixing tab selection problem; disable tab validation in graphql ui * BZ-64752: (de)serializing test element with graphql query and vars * BZ-64752: (de)serializing using gson * BZ-64752: removing unnecessary GraphQLHTTPSampler * BZ-64752: adding operationName input field * BZ-64752: support GET method * BZ-64752: init operationName from test elem * BZ-64752: adding a simple graphql test plan demo * BZ-64752: show advanced pane * BZ-64752: add gson info to lib/aareadme.txt * BZ-64752: screenshot and default constructor * BZ-64752: documentation on GraphQLHTTPRequest * BZ-64752: record in changes.xml * BZ-64752: add gson.jar to expected_release_jars.csv * BZ-64752: removing unnecessary, untranslated messages * BZ-64752: utility for graphql param serialization and unit test * BZ-64752: replace gson with jackson for graphql (de)serialization * BZ-64752: remove gson jar from expected release jars * BZ-64752: correcting French translation, thanks to pmouawad * BZ-64752: graphql http recording support * BZ-64752: checkbox option to switch on/off auto graphql req detection, true by default * BZ-64752: precise json content type checking; encode in GET * BZ-64752: French translation for graphql recording option, thanks to @ubikloadpack Co-authored-by: Woonsan Ko --- bin/saveservice.properties | 1 + .../java/org/apache/jmeter/save/SaveService.java | 2 +- .../org/apache/jmeter/gui/util/textarea.properties | 1 + .../apache/jmeter/resources/messages.properties| 7 + .../apache/jmeter/resources/messages_fr.properties | 7 + src/protocol/build.gradle.kts | 2 + .../protocol/http/config/GraphQLRequestParams.java | 67 + .../config/gui/AbstractValidationTabbedPane.java | 86 +++ .../http/config/gui/GraphQLUrlConfigGui.java | 190 ++ .../http/config/gui/UrlConfigDefaults.java | 272 + .../protocol/http/config/gui/UrlConfigGui.java | 129 +- .../protocol/http/control/HeaderManager.java | 20 ++ .../http/control/gui/GraphQLHTTPSamplerGui.java| 75 ++ .../http/control/gui/HttpTestSampleGui.java| 62 +++-- .../protocol/http/proxy/DefaultSamplerCreator.java | 44 .../jmeter/protocol/http/proxy/HttpRequestHdr.java | 18 ++ .../apache/jmeter/protocol/http/proxy/Proxy.java | 2 + .../jmeter/protocol/http/proxy/ProxyControl.java | 12 + .../protocol/http/proxy/gui/ProxyControlGui.java | 22 ++ .../http/util/GraphQLRequestParamUtils.java| 254 +++ .../sampler/GraphQLHTTPSamplerResources.properties | 27 ++ .../http/util/TestGraphQLRequestParamUtils.java| 212 xdocs/changes.xml | 1 + xdocs/demos/SimpleGraphQLTestPlan.jmx | 135 ++ .../screenshots/graphql-http-request-vars.png | Bin 0 -> 110286 bytes xdocs/images/screenshots/graphql-http-request.png | Bin 0 -> 115587 bytes xdocs/usermanual/component_reference.xml | 28 ++- 27 files changed, 1596 insertions(+), 80 deletions(-) diff --git a/bin/saveservice.properties b/bin/saveservice.properties index 6f0b44b..b2ec167 100644 --- a/bin/saveservice.properties +++ b/bin/saveservice.properties @@ -150,6 +150,7 @@ GaussianRandomTimerGui=org.apache.jmeter.timers.gui.GaussianRandomTimerGui GenericController=org.apache.jmeter.control.GenericController GraphAccumVisualizer=org.apache.jmeter.visualizers.GraphAccumVisualizer GraphVisualizer=org.apache.jmeter.visualizers.GraphVisualizer +GraphQLHTTPSamplerGui=org.apache.jmeter.protocol.http.control.gui.GraphQLHTTPSamplerGui Header=org.apache.jmeter.protocol.http.control.Header HeaderManager=org.apache.jmeter.protocol.http.control.HeaderManager HeaderPanel=org.apache.jmeter.protocol.http.gui.HeaderPanel diff --git a/src/core/src/main/java/org/apache/jmeter/save/SaveService.java b/src/core/src/main/java/org/apache/jmeter/save/SaveService.java index 0d7cf07..2955c38 100644 --- a/src/core/src/main/java/org/apache/jmeter/save/SaveService.java +++ b/src/core/src/main/java/org/apache/jmeter/save/SaveService.java @@ -155,7
[jmeter] branch master updated: Removed the property from docs (#578)
This is an automated email from the ASF dual-hosted git repository. pmouawad 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 b17ac36 Removed the property from docs (#578) b17ac36 is described below commit b17ac36a8235b251b2d0e9d4367b35777386c72e Author: Konstantin Kalinin AuthorDate: Thu Oct 1 09:57:04 2020 +0300 Removed the property from docs (#578) --- bin/jmeter.properties | 4 xdocs/usermanual/properties_reference.xml | 5 - 2 files changed, 9 deletions(-) diff --git a/bin/jmeter.properties b/bin/jmeter.properties index 84f01e8..4388b39 100644 --- a/bin/jmeter.properties +++ b/bin/jmeter.properties @@ -443,10 +443,6 @@ remote_hosts=127.0.0.1 # No matter what, the connection will not be re-used beyond its TTL. #httpclient4.time_to_live=6 -# Max size in bytes of PUT body to retain in result sampler. -# Bigger results will be clipped. -#httpclient4.max_body_retain_size=32768 - # Ignore EOFException that some edgy application may emit to signal end of GZIP stream # Defaults to false #httpclient4.gzip_relax_mode=false diff --git a/xdocs/usermanual/properties_reference.xml b/xdocs/usermanual/properties_reference.xml index 25974c2..d004310 100644 --- a/xdocs/usermanual/properties_reference.xml +++ b/xdocs/usermanual/properties_reference.xml @@ -543,11 +543,6 @@ JMETER-SERVER No matter what, the connection will not be re-used beyond its TTL. Defaults to: 6 - -Max size in bytes of PUT body to retain in result sampler. -Bigger results will be clipped. -Defaults to: 327678 (bytes) - Ignore EOFException that some edgy application may emit to signal end of Deflated stream. Defaults to: false
[jmeter] branch master updated: Update darklaf to 2.4.10 from 2.4.8
This is an automated email from the ASF dual-hosted git repository. pmouawad 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 51e1853 Update darklaf to 2.4.10 from 2.4.8 51e1853 is described below commit 51e1853e900bda5794717f33b3030c09c6eaca47 Author: pmouawad AuthorDate: Wed Sep 30 21:56:15 2020 +0200 Update darklaf to 2.4.10 from 2.4.8 --- src/dist/src/dist/expected_release_jars.csv | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv index b9aaf6d..f3bcb7a 100644 --- a/src/dist/src/dist/expected_release_jars.csv +++ b/src/dist/src/dist/expected_release_jars.csv @@ -18,15 +18,15 @@ 305844,commons-net-3.7.jar 133109,commons-pool2-2.8.1.jar 216211,commons-text-1.9.jar -1440723,darklaf-core-2.4.8.jar +1447270,darklaf-core-2.4.10.jar 20650,darklaf-extensions-rsyntaxarea-0.3.4.jar -32010,darklaf-macos-2.4.8.jar -6277,darklaf-native-utils-2.4.8.jar -3246,darklaf-platform-base-2.4.8.jar -62676,darklaf-property-loader-2.4.8.jar -83382,darklaf-theme-2.4.8.jar -43966,darklaf-utils-2.4.8.jar -335946,darklaf-windows-2.4.8.jar +32009,darklaf-macos-2.4.10.jar +6277,darklaf-native-utils-2.4.10.jar +3245,darklaf-platform-base-2.4.10.jar +62676,darklaf-property-loader-2.4.10.jar +83381,darklaf-theme-2.4.10.jar +44186,darklaf-utils-2.4.10.jar +335848,darklaf-windows-2.4.10.jar 98115,dec-0.1.2.jar 320748,dnsjava-2.1.9.jar 13161,error_prone_annotations-2.3.3.jar
[jmeter] branch master updated: Update darklaf to 2.4.10 from 2.4.8
This is an automated email from the ASF dual-hosted git repository. pmouawad 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 222546c Update darklaf to 2.4.10 from 2.4.8 222546c is described below commit 222546caef3effb28e40906bc3a5e6d6104c16e8 Author: pmouawad AuthorDate: Wed Sep 30 21:37:01 2020 +0200 Update darklaf to 2.4.10 from 2.4.8 --- gradle.properties | 2 +- xdocs/changes.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 9d41784..ff3b488 100644 --- a/gradle.properties +++ b/gradle.properties @@ -71,7 +71,7 @@ commons-math3.version=3.6.1 commons-net.version=3.7 commons-pool2.version=2.8.1 commons-text.version=1.9 -darklaf.version=2.4.8 +darklaf.version=2.4.10 darklaf.extensions.version=0.3.4 dec.version=0.1.2 dnsjava.version=2.1.9 diff --git a/xdocs/changes.xml b/xdocs/changes.xml index adfc0ad..4fb8339 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -128,7 +128,7 @@ applications when JMeter is starting up. 64454More precise error message, when no datasource value can be found in JDBC sampler 64440Log exeptions reported via JMeterUtils#reportToUser even when in GUI mode 591Remove deprecated sudo flag from travis file. Deng Liming (liming.d.pro at gmail.com) -Updated Darklaf to 2.4.8 (from 2.1.1) +Updated Darklaf to 2.4.10 (from 2.1.1) Updated Groovy to 3.0.5 (from 3.0.3) 596Use neutral words in documentation 63809557Updated commons-collections to 4.4 (from 3.2.2) while keeping the jars for the old commons-collections 3.x for compatibility
[jmeter] branch master updated: Revert 2.4.9 as it breaks jmeter
This is an automated email from the ASF dual-hosted git repository. pmouawad 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 30b8f84 Revert 2.4.9 as it breaks jmeter 30b8f84 is described below commit 30b8f847cf72c46004b42ef322797f00f4524bac Author: pmouawad AuthorDate: Wed Sep 23 21:22:46 2020 +0200 Revert 2.4.9 as it breaks jmeter --- gradle.properties | 2 +- xdocs/changes.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index eca89d3..9d41784 100644 --- a/gradle.properties +++ b/gradle.properties @@ -71,7 +71,7 @@ commons-math3.version=3.6.1 commons-net.version=3.7 commons-pool2.version=2.8.1 commons-text.version=1.9 -darklaf.version=2.4.9 +darklaf.version=2.4.8 darklaf.extensions.version=0.3.4 dec.version=0.1.2 dnsjava.version=2.1.9 diff --git a/xdocs/changes.xml b/xdocs/changes.xml index 2570737..adfc0ad 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -128,7 +128,7 @@ applications when JMeter is starting up. 64454More precise error message, when no datasource value can be found in JDBC sampler 64440Log exeptions reported via JMeterUtils#reportToUser even when in GUI mode 591Remove deprecated sudo flag from travis file. Deng Liming (liming.d.pro at gmail.com) -Updated Darklaf to 2.4.9 (from 2.1.1) +Updated Darklaf to 2.4.8 (from 2.1.1) Updated Groovy to 3.0.5 (from 3.0.3) 596Use neutral words in documentation 63809557Updated commons-collections to 4.4 (from 3.2.2) while keeping the jars for the old commons-collections 3.x for compatibility
[jmeter] branch master updated: Update Darklaf to 2.4.9 from 2.4.8
This is an automated email from the ASF dual-hosted git repository. pmouawad 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 e50226b Update Darklaf to 2.4.9 from 2.4.8 e50226b is described below commit e50226b83392f79b7ab3506abc75214a03ba3c68 Author: pmouawad AuthorDate: Wed Sep 23 21:02:31 2020 +0200 Update Darklaf to 2.4.9 from 2.4.8 --- gradle.properties | 2 +- xdocs/changes.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 9d41784..eca89d3 100644 --- a/gradle.properties +++ b/gradle.properties @@ -71,7 +71,7 @@ commons-math3.version=3.6.1 commons-net.version=3.7 commons-pool2.version=2.8.1 commons-text.version=1.9 -darklaf.version=2.4.8 +darklaf.version=2.4.9 darklaf.extensions.version=0.3.4 dec.version=0.1.2 dnsjava.version=2.1.9 diff --git a/xdocs/changes.xml b/xdocs/changes.xml index adfc0ad..2570737 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -128,7 +128,7 @@ applications when JMeter is starting up. 64454More precise error message, when no datasource value can be found in JDBC sampler 64440Log exeptions reported via JMeterUtils#reportToUser even when in GUI mode 591Remove deprecated sudo flag from travis file. Deng Liming (liming.d.pro at gmail.com) -Updated Darklaf to 2.4.8 (from 2.1.1) +Updated Darklaf to 2.4.9 (from 2.1.1) Updated Groovy to 3.0.5 (from 3.0.3) 596Use neutral words in documentation 63809557Updated commons-collections to 4.4 (from 3.2.2) while keeping the jars for the old commons-collections 3.x for compatibility
[jmeter] branch master updated: fix failure due to jars check
This is an automated email from the ASF dual-hosted git repository. pmouawad 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 455e5da fix failure due to jars check 455e5da is described below commit 455e5da105c9562410ca968034f74566b4f757b3 Author: pmouawad AuthorDate: Tue Sep 22 23:25:20 2020 +0200 fix failure due to jars check --- src/dist/src/dist/expected_release_jars.csv | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/dist/src/dist/expected_release_jars.csv b/src/dist/src/dist/expected_release_jars.csv index a26b3f9..b9aaf6d 100644 --- a/src/dist/src/dist/expected_release_jars.csv +++ b/src/dist/src/dist/expected_release_jars.csv @@ -18,15 +18,15 @@ 305844,commons-net-3.7.jar 133109,commons-pool2-2.8.1.jar 216211,commons-text-1.9.jar -1387394,darklaf-core-2.4.7.jar +1440723,darklaf-core-2.4.8.jar 20650,darklaf-extensions-rsyntaxarea-0.3.4.jar -31982,darklaf-macos-2.4.7.jar -6209,darklaf-native-utils-2.4.7.jar -3244,darklaf-platform-base-2.4.7.jar -59949,darklaf-property-loader-2.4.7.jar -81834,darklaf-theme-2.4.7.jar -33836,darklaf-utils-2.4.7.jar -335440,darklaf-windows-2.4.7.jar +32010,darklaf-macos-2.4.8.jar +6277,darklaf-native-utils-2.4.8.jar +3246,darklaf-platform-base-2.4.8.jar +62676,darklaf-property-loader-2.4.8.jar +83382,darklaf-theme-2.4.8.jar +43966,darklaf-utils-2.4.8.jar +335946,darklaf-windows-2.4.8.jar 98115,dec-0.1.2.jar 320748,dnsjava-2.1.9.jar 13161,error_prone_annotations-2.3.3.jar
[jmeter] branch master updated: Update darklaf from 2.4.7 to 2.4.8
This is an automated email from the ASF dual-hosted git repository. pmouawad 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 5df9fb2 Update darklaf from 2.4.7 to 2.4.8 5df9fb2 is described below commit 5df9fb2b044b58424a1557ab915d09234d7051fe Author: pmouawad AuthorDate: Tue Sep 22 23:14:33 2020 +0200 Update darklaf from 2.4.7 to 2.4.8 --- gradle.properties | 2 +- xdocs/changes.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index be6dba8..9d41784 100644 --- a/gradle.properties +++ b/gradle.properties @@ -71,7 +71,7 @@ commons-math3.version=3.6.1 commons-net.version=3.7 commons-pool2.version=2.8.1 commons-text.version=1.9 -darklaf.version=2.4.7 +darklaf.version=2.4.8 darklaf.extensions.version=0.3.4 dec.version=0.1.2 dnsjava.version=2.1.9 diff --git a/xdocs/changes.xml b/xdocs/changes.xml index 67978e0..adfc0ad 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -128,7 +128,7 @@ applications when JMeter is starting up. 64454More precise error message, when no datasource value can be found in JDBC sampler 64440Log exeptions reported via JMeterUtils#reportToUser even when in GUI mode 591Remove deprecated sudo flag from travis file. Deng Liming (liming.d.pro at gmail.com) -Updated Darklaf to 2.4.5 (from 2.1.1) +Updated Darklaf to 2.4.8 (from 2.1.1) Updated Groovy to 3.0.5 (from 3.0.3) 596Use neutral words in documentation 63809557Updated commons-collections to 4.4 (from 3.2.2) while keeping the jars for the old commons-collections 3.x for compatibility
[jmeter] branch master updated: Use theme from darklaf extensions for RSyntaxTextArea. (#617)
This is an automated email from the ASF dual-hosted git repository.
pmouawad 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 1bc58f4 Use theme from darklaf extensions for RSyntaxTextArea. (#617)
1bc58f4 is described below
commit 1bc58f4c65b812751439d94ce4f31bbb4923d132
Author: Jannis Weis <31143295+we...@users.noreply.github.com>
AuthorDate: Wed Sep 9 18:01:27 2020 +0200
Use theme from darklaf extensions for RSyntaxTextArea. (#617)
---
gradle.properties | 3 +-
src/bom/build.gradle.kts | 1 +
src/core/build.gradle.kts | 1 +
.../jmeter/gui/action/LookAndFeelCommand.java | 10 ++---
.../apache/jmeter/gui/util/JSyntaxTextArea.java| 44 ++
5 files changed, 37 insertions(+), 22 deletions(-)
diff --git a/gradle.properties b/gradle.properties
index 4744760..a9b6c4f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -71,7 +71,8 @@ commons-math3.version=3.6.1
commons-net.version=3.7
commons-pool2.version=2.8.1
commons-text.version=1.9
-darklaf.version=2.4.5
+darklaf.version=2.4.7
+darklaf.extensions.version=0.3.4
dec.version=0.1.2
dnsjava.version=2.1.9
equalsverifier.version=3.4.2
diff --git a/src/bom/build.gradle.kts b/src/bom/build.gradle.kts
index 4c4fc13..ee209e7 100644
--- a/src/bom/build.gradle.kts
+++ b/src/bom/build.gradle.kts
@@ -74,6 +74,7 @@ dependencies {
apiv("com.github.weisj:darklaf-core", "darklaf")
apiv("com.github.weisj:darklaf-theme", "darklaf")
apiv("com.github.weisj:darklaf-property-loader", "darklaf")
+apiv("com.github.weisj:darklaf-extensions-rsyntaxarea",
"darklaf.extensions")
apiv("com.helger:ph-commons")
apiv("com.helger:ph-css")
apiv("com.jayway.jsonpath:json-path")
diff --git a/src/core/build.gradle.kts b/src/core/build.gradle.kts
index fdfec49..100eca7 100644
--- a/src/core/build.gradle.kts
+++ b/src/core/build.gradle.kts
@@ -74,6 +74,7 @@ dependencies {
implementation("com.github.weisj:darklaf-core")
implementation("com.github.weisj:darklaf-theme")
implementation("com.github.weisj:darklaf-property-loader")
+implementation("com.github.weisj:darklaf-extensions-rsyntaxarea")
implementation("com.miglayout:miglayout-swing")
implementation("commons-codec:commons-codec") {
because("DigestUtils")
diff --git
a/src/core/src/main/java/org/apache/jmeter/gui/action/LookAndFeelCommand.java
b/src/core/src/main/java/org/apache/jmeter/gui/action/LookAndFeelCommand.java
index 007f976..e30dc55 100644
---
a/src/core/src/main/java/org/apache/jmeter/gui/action/LookAndFeelCommand.java
+++
b/src/core/src/main/java/org/apache/jmeter/gui/action/LookAndFeelCommand.java
@@ -200,12 +200,12 @@ public class LookAndFeelCommand extends AbstractAction {
// NOOP
}
+public static boolean isDarklafTheme() {
+return "Darklaf".equals(UIManager.getLookAndFeel().getID()); //
$NON-NLS-1$
+}
+
public static boolean isDark() {
-String lookAndFeelID = UIManager.getLookAndFeel().getID();
-if (lookAndFeelID.equals("Darklaf")) { // $NON-NLS-1$
-return Theme.isDark(LafManager.getTheme());
-}
-return false;
+return isDarklafTheme() && Theme.isDark(LafManager.getTheme());
}
public static void activateLookAndFeel(String command) {
diff --git
a/src/core/src/main/java/org/apache/jmeter/gui/util/JSyntaxTextArea.java
b/src/core/src/main/java/org/apache/jmeter/gui/util/JSyntaxTextArea.java
index 0d8801d..775e7bb 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/JSyntaxTextArea.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/JSyntaxTextArea.java
@@ -20,9 +20,12 @@ package org.apache.jmeter.gui.util;
import java.awt.Color;
import java.awt.Font;
import java.awt.HeadlessException;
+import java.awt.event.HierarchyEvent;
+import java.awt.event.HierarchyListener;
import java.io.IOException;
import java.util.Properties;
+import javax.swing.SwingUtilities;
import javax.swing.UIManager;
import org.apache.jmeter.gui.action.LookAndFeelCommand;
@@ -36,6 +39,8 @@ import org.fife.ui.rtextarea.RUndoManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.github.weisj.darklaf.extensions.rsyntaxarea.DarklafRSyntaxTheme;
+
/**
* Utility class to handle RSyntaxTextArea code
* It's not currently possible to instantiate the RSyntaxTextArea class when
running headless.
@@ -44,20 +49,26 @@ import org.slf4j.LoggerFactory;
public class JSyntaxTextArea extends RSyntaxTextArea {
private static fin
[jmeter] branch master updated: Bug 64553 When using Transaction Controller, send Bytes and Received Bytes are displayed as 0 in the influxdb(BackendListener) (#608)
This is an automated email from the ASF dual-hosted git repository.
pmouawad 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 3617f49 Bug 64553 When using Transaction Controller, send Bytes and
Received Bytes are displayed as 0 in the influxdb(BackendListener) (#608)
3617f49 is described below
commit 3617f49087201c7d060be10cc3b4c95919c78956
Author: Philippe M
AuthorDate: Sun Aug 30 14:58:59 2020 +0200
Bug 64553 When using Transaction Controller, send Bytes and Received Bytes
are displayed as 0 in the influxdb(BackendListener) (#608)
* 64553 When using Transaction Controller, send Bytes and Received Bytes
are displayed as 0 in the influxdb(BackendListener)
* Fix typo of parameter name
* Give the cumulated add its own method
* Add test cases for new method addCumulated
* Method getSubResults constructs new arrays, so call only once inside
method
* Fix conflict
Co-authored-by: Felix Schumacher
---
.../jmeter/visualizers/backend/SamplerMetric.java | 51 +++-
.../graphite/GraphiteBackendListenerClient.java| 2 +-
.../backend/influxdb/HttpMetricsSender.java| 5 +-
.../influxdb/InfluxdbBackendListenerClient.java| 18 +++---
.../backend/SamplerMetricFixedModeTest.java| 62
.../backend/SamplerMetricTimedModeTest.java| 68 +-
xdocs/changes.xml | 1 +
7 files changed, 180 insertions(+), 27 deletions(-)
diff --git
a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/SamplerMetric.java
b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/SamplerMetric.java
index b41d41e..a279310 100644
---
a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/SamplerMetric.java
+++
b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/SamplerMetric.java
@@ -101,6 +101,23 @@ public class SamplerMetric {
* @param result {@link SampleResult} to be used
*/
public synchronized void add(SampleResult result) {
+add(result, false);
+}
+
+/**
+ * Add a {@link SampleResult} and its sub-results to be used in the
statistics
+ * @param result {@link SampleResult} to be used
+ */
+public synchronized void addCumulated(SampleResult result) {
+add(result, true);
+}
+
+/**
+ * Add a {@link SampleResult} to be used in the statistics
+ * @param result {@link SampleResult} to be used
+ * @param isCumulated is the overall Sampler Metric
+ */
+private synchronized void add(SampleResult result, boolean isCumulated) {
if(result.isSuccessful()) {
successes+=result.getSampleCount()-result.getErrorCount();
} else {
@@ -118,32 +135,40 @@ public class SamplerMetric {
}else {
koResponsesStats.addValue(time);
}
-addHits(result);
-addNetworkData(result);
+addHits(result, isCumulated);
+addNetworkData(result, isCumulated);
}
/**
* Increment traffic metrics. A Parent sampler cumulates its children
metrics.
* @param result SampleResult
+ * @param isCumulated related to the overall sampler metric
*/
-private void addNetworkData(SampleResult result) {
-if (!TransactionController.isFromTransactionController(result)) {
-sentBytes += result.getSentBytes();
-receivedBytes += result.getBytesAsLong();
+private void addNetworkData(SampleResult result, boolean isCumulated) {
+if (isCumulated &&
TransactionController.isFromTransactionController(result)
+&& result.getSubResults().length == 0) { // Transaction
controller without generate parent sampler
+return;
}
+sentBytes += result.getSentBytes();
+receivedBytes += result.getBytesAsLong();
}
/**
- * Compute hits from res
- * @param res {@link SampleResult}
+ * Compute hits from result
+ * @param result {@link SampleResult}
+ * @param isCumulated related to the overall sampler metric
*/
-private void addHits(SampleResult res) {
-SampleResult[] subResults = res.getSubResults();
-if (!TransactionController.isFromTransactionController(res)) {
-hits += 1;
+private void addHits(SampleResult result, boolean isCumulated) {
+SampleResult[] subResults = result.getSubResults();
+if (isCumulated &&
TransactionController.isFromTransactionController(result)
+&& subResults.length == 0) { // Transaction controller without
generate parent sampler
+return;
+}
+if (!(TransactionController.isFromTransactionController(result) &&
subResults.length > 0)) {
[jmeter] branch bug_64553 updated (6eef616 -> 459efe1)
This is an automated email from the ASF dual-hosted git repository. pmouawad pushed a change to branch bug_64553 in repository https://gitbox.apache.org/repos/asf/jmeter.git. from 6eef616 Fix conflict add 0592978 Implement a new setting to allow the exclusion of embedded URLs add 3a8c6e9 Typo. Meant bug of course. add 6ef792e Partly revert unwanted nightly build comment in 58bf600130feb646291fbc3e228a8f97c8220773 add 81a6d67 Exclude Javascript and JSON from parsing for charsets from forms by proxy add 6fa1735 Add ThreadGroup in the mix instead of duplicate condition add b64a68c Don't use toString here, as it is not needed and target could be null add cf32f8e Don't use toString on format parameters and correct number of placeholders add af3958b Use format message placeholder instead of string concatenation, to make code clearer add 216a649 Use ThreadLocal.remove instead of set(null). It is safer add 9df1bfe Make sonarqube a bit happier and trigger a new build add d3a09ce Use Map#computeIfAbsent to simplify code add 5671589 Change to new jenkins nodes and correct filename-structure of nightlies add 2238e7c No need to call toString on argument to message format add 8f13913 Try to make jars available for sonar scanner add eeb5258 Use correct path for jars add 4159674 Seems to be the wrong path for libs, so remove it again add f381cda Use badge for new jenkins instance add 9d21839 Update utility jars spotbugs and checksum add 80718ad Add missing key id for spotbugs add 906918b Add missing key id for org.json:json add a1bc13f Correct typo: ley -> key add 44c0c7e Log status on start up, when splash screen is displayed add 53873bc Correct possible thread wake-up problem and typo add 0070acb Make use of newer Darklaf API to create laf menu items. add f2e1750 Update to Darklaf version 2.4.4 add 445df9f Fix to: Implement a new setting to allow the exclusion of embedded URLs add 0b13f13 Update Gradle to 6.6 add ceddfe7 Configure Gradle local build cache, add build scans, and use gradle-cache-action for GitHub CI add 7fd938f Correct typos in README.me add 19a207d Update to darklaf 2.4.5 add 28e11b8 Mention available darklaf properties. Ensure that 'darklaf.allowNativeCode' is set to 'true' if 'darklaf.decorations' is 'true'. add a146f6b Add changelog entry and use Boolean#getBoolean add 75fdc09 Make the splash screen application-modal rather than system-modal add 5eff144 Update SpotBugs to 4.1.2 (from 4.1.1), upgrade spotbugs-gradle-plugin to 4.5.0 (from 2.0.0) add 98c3552 Remove dependency between checkstyle and compilation tasks add 90ddca3 Do not execute SpotBugs by default add 9acded5 Fix Gradle warnings: duplicate entries in processResources, compile configuration add 769a2a1 Fix Gradle deprecations: replace testCompile with testImplementation add a0ed3e0 Update org.sonarqube Gradle plugin to 3.0 (from 2.7.1) add 3109b8b Add a checksum for sonarqube-gradle-plugin add 20ba58d Fall back to JMETER_HOME on startup to detect JMeter's installation directory add ba27712 Remove useless braces for one-liner lambda expression add b2d487c Correct documented name of generated CA when using proxy script recorder add fd8b994 Fall back to JMETER_HOME on startup (even more fall-back) add 21128b5 Use less aggressive escaping for JSON Strings in reports error messages add b69ca04 Freestyle format for names in (Default)SamplerCreater add f6d4f52 Remove unsused private field add 414f0e2 Remove empty javadoc add c81d287 Add type argument add ead6b9c Add generic type info add ebb0492 Spacepolice add 9a900cb Correct test cases for new behaviour of report generation add ba2c8ba Update Apache ActiveMQ dependencies to 5.16.0 add 8a7da19 Update Bouncycastle to 1.66 add f9445e8 Update Apache commons-io to 2.7 (from 2.6) add 19ff94a Update Apache commons-lang3 to 3.11 add 1f62fa7 Update Apache commons-net to 3.7 add 11d5bbd Update Apache commons-pool2 to 2.8.1 add acaacb3 Update Apache commons-text to 1.9 add 1ab3021 Update equalsverifier to 3.4.2 add 736d4c2 Update junit5 to 5.6.2 add 79d99fc Update Apache log4j2 to 2.13.3 add dc5360a Update rsyntaxtextarea to 3.1.1 add 06949d1 Try to get more info on flaky test add 459efe1 Merge branch 'master' into bug_64553 No new revisions were added by this update. Summary of changes: .github/workflows/main.yml | 19 ++- README.md | 14 +- bin/jmeter.properties | 8 + build.gradle.kts | 73
[jmeter] branch bug_64553 updated (cdb0451 -> 6eef616)
This is an automated email from the ASF dual-hosted git repository. pmouawad pushed a change to branch bug_64553 in repository https://gitbox.apache.org/repos/asf/jmeter.git. from cdb0451 Merge branch 'master' into bug_64553 add 6eef616 Fix conflict No new revisions were added by this update. Summary of changes: xdocs/changes.xml | 1 + 1 file changed, 1 insertion(+)
[jmeter] branch bug_64553 updated (84cf510 -> cdb0451)
This is an automated email from the ASF dual-hosted git repository. pmouawad pushed a change to branch bug_64553 in repository https://gitbox.apache.org/repos/asf/jmeter.git. from 84cf510 Method getSubResults constructs new arrays, so call only once inside method add 08d22fb Update Darklaf from 2.4.1 to 2.4.2 to fix bugs 64640, 64641, 64453, 64625 add cdb0451 Merge branch 'master' into bug_64553 No new revisions were added by this update. Summary of changes: gradle.properties | 2 +- xdocs/changes.xml | 6 +- 2 files changed, 6 insertions(+), 2 deletions(-)
[jmeter] branch master updated: Update Darklaf from 2.4.1 to 2.4.2 to fix bugs 64640, 64641, 64453, 64625
This is an automated email from the ASF dual-hosted git repository. pmouawad 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 08d22fb Update Darklaf from 2.4.1 to 2.4.2 to fix bugs 64640, 64641, 64453, 64625 08d22fb is described below commit 08d22fbf175ecbc8c3ecb0fc839bd92a9dd5cdc2 Author: pmouawad AuthorDate: Thu Aug 6 22:19:12 2020 +0200 Update Darklaf from 2.4.1 to 2.4.2 to fix bugs 64640, 64641, 64453, 64625 --- gradle.properties | 2 +- xdocs/changes.xml | 6 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 3742573..39a5394 100644 --- a/gradle.properties +++ b/gradle.properties @@ -67,7 +67,7 @@ commons-math3.version=3.6.1 commons-net.version=3.6 commons-pool2.version=2.8.0 commons-text.version=1.8 -darklaf.version=2.4.1 +darklaf.version=2.4.2 #darklaf.version=latest.integration dec.version=0.1.2 dnsjava.version=2.1.9 diff --git a/xdocs/changes.xml b/xdocs/changes.xml index 6d13466..c8adf33 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -121,7 +121,7 @@ Summary 64454More precise error message, when no datasource value can be found in JDBC sampler 64440Log exeptions reported via JMeterUtils#reportToUser even when in GUI mode 591Remove deprecated sudo flag from travis file. Deng Liming (liming.d.pro at gmail.com) -Updated Darklaf to 2.4.1 (from 2.1.1) +Updated Darklaf to 2.4.2 (from 2.1.1) Updated Groovy to 3.0.5 (from 3.0.3) 596Use neutral words in documentation 63809557Updated commons-collections to 4.4 (from 3.2.2) while keeping the jars for the old commons-collections 3.x for compatibility @@ -182,6 +182,10 @@ Summary 64475Menu Generate HTML Report: When report generation fails due to timeout, error message is not explicit. Contributed by Ubik Load Pack (https://ubikloadpack.com) 64627Programmatic manipulation of the control flow via API methods of JMeterContext is not working as it used to before 5.0. Contributed by Till Neunast 64647groovy-dateutil is missing in distribution +64640Darklaf: NPE at com.github.weisj.darklaf.ui.DarkPopupFactory.getPopupType(DarkPopupFactory.java:96) +64641Darklaf: NPE at com.github.weisj.darklaf.ui.tree.DarkTreeUI.isChildOfSelectionPath(DarkTreeUI.java:603) ~[darklaf-core-2.4.2-SNAPSHOT.jar:2.4.2-SNAPSHOT] +64453Darklaf: Save Test Plan as New Folder failure +64625Darklaf: trying to select a folder in Browse leads to an error popup and stacktrace
[jmeter] branch bug_64553 updated (847a9ce -> 2923c32)
This is an automated email from the ASF dual-hosted git repository. pmouawad pushed a change to branch bug_64553 in repository https://gitbox.apache.org/repos/asf/jmeter.git. from 847a9ce 64553 When using Transaction Controller, send Bytes and Received Bytes are displayed as 0 in the influxdb(BackendListener) add 637701e Add allowed pgp key for org.apache.ant add 2923c32 Merge branch 'master' into bug_64553 No new revisions were added by this update. Summary of changes: checksum.xml | 1 + 1 file changed, 1 insertion(+)
[jmeter] branch bug_64553 created (now 847a9ce)
This is an automated email from the ASF dual-hosted git repository. pmouawad pushed a change to branch bug_64553 in repository https://gitbox.apache.org/repos/asf/jmeter.git. at 847a9ce 64553 When using Transaction Controller, send Bytes and Received Bytes are displayed as 0 in the influxdb(BackendListener) This branch includes the following new commits: new 847a9ce 64553 When using Transaction Controller, send Bytes and Received Bytes are displayed as 0 in the influxdb(BackendListener) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[jmeter] 01/01: 64553 When using Transaction Controller, send Bytes and Received Bytes are displayed as 0 in the influxdb(BackendListener)
This is an automated email from the ASF dual-hosted git repository.
pmouawad pushed a commit to branch bug_64553
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit 847a9cecd1f426106b9b5c6d8d13601ca2a202ad
Author: pmouawad
AuthorDate: Thu Aug 6 08:28:13 2020 +0200
64553 When using Transaction Controller, send Bytes and Received Bytes
are displayed as 0 in the influxdb(BackendListener)
---
.../jmeter/visualizers/backend/SamplerMetric.java | 37 ++
.../graphite/GraphiteBackendListenerClient.java| 4 +--
.../backend/influxdb/HttpMetricsSender.java| 5 +--
.../influxdb/InfluxdbBackendListenerClient.java| 18 ++-
.../backend/SamplerMetricFixedModeTest.java| 10 +++---
.../backend/SamplerMetricTimedModeTest.java| 4 +--
xdocs/changes.xml | 1 +
7 files changed, 46 insertions(+), 33 deletions(-)
diff --git
a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/SamplerMetric.java
b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/SamplerMetric.java
index b41d41e..e6ad2f0 100644
---
a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/SamplerMetric.java
+++
b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/SamplerMetric.java
@@ -99,8 +99,9 @@ public class SamplerMetric {
/**
* Add a {@link SampleResult} to be used in the statistics
* @param result {@link SampleResult} to be used
+ * @param isCumulated is the overall Sampler Metric
*/
-public synchronized void add(SampleResult result) {
+public synchronized void add(SampleResult result, boolean isCumulated) {
if(result.isSuccessful()) {
successes+=result.getSampleCount()-result.getErrorCount();
} else {
@@ -118,32 +119,40 @@ public class SamplerMetric {
}else {
koResponsesStats.addValue(time);
}
-addHits(result);
-addNetworkData(result);
+addHits(result, isCumulated);
+addNetworkData(result, isCumulated);
}
/**
* Increment traffic metrics. A Parent sampler cumulates its children
metrics.
* @param result SampleResult
+ * @param isCumulated related to the overall sampler metric
*/
-private void addNetworkData(SampleResult result) {
-if (!TransactionController.isFromTransactionController(result)) {
-sentBytes += result.getSentBytes();
-receivedBytes += result.getBytesAsLong();
+private void addNetworkData(SampleResult result, boolean isCumulated) {
+if (isCumulated &&
TransactionController.isFromTransactionController(result)
+&& result.getSubResults().length == 0) { // Transaction
controller without generate parent sampler
+return;
}
+sentBytes += result.getSentBytes();
+receivedBytes += result.getBytesAsLong();
}
/**
- * Compute hits from res
- * @param res {@link SampleResult}
+ * Compute hits from result
+ * @param result {@link SampleResult}
+ * @param isCumulated related to the overall sampler metric
*/
-private void addHits(SampleResult res) {
-SampleResult[] subResults = res.getSubResults();
-if (!TransactionController.isFromTransactionController(res)) {
-hits += 1;
+private void addHits(SampleResult result, boolean isCumulated) {
+if (isCumulated &&
TransactionController.isFromTransactionController(result)
+&& result.getSubResults().length == 0) { // Transaction
controller without generate parent sampler
+return;
+}
+SampleResult[] subResults = result.getSubResults();
+if (!(TransactionController.isFromTransactionController(result) &&
subResults.length > 0)) {
+hits += result.getSampleCount();
}
for (SampleResult subResult : subResults) {
-addHits(subResult);
+addHits(subResult, isCumulated);
}
}
diff --git
a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java
b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java
index 50abbe0..f6bb597 100644
---
a/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java
+++
b/src/components/src/main/java/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java
@@ -285,10 +285,10 @@ public class GraphiteBackendListenerClient extends
AbstractBackendListenerClient
}
if (samplersToFilterMatch) {
SamplerMetric samplerMetric =
getSamplerMetric(sampleResult.getSampleLabel());
-samplerMetric.add(sampleResult);
+
[jmeter] branch master updated: Updated Groovy to 3.0.5 (from 3.0.3)
This is an automated email from the ASF dual-hosted git repository. pmouawad 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 58bf600 Updated Groovy to 3.0.5 (from 3.0.3) 58bf600 is described below commit 58bf600130feb646291fbc3e228a8f97c8220773 Author: pmouawad AuthorDate: Wed Aug 5 21:56:15 2020 +0200 Updated Groovy to 3.0.5 (from 3.0.3) --- gradle.properties | 3 ++- xdocs/changes.xml | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 2be785c..3742573 100644 --- a/gradle.properties +++ b/gradle.properties @@ -68,6 +68,7 @@ commons-net.version=3.6 commons-pool2.version=2.8.0 commons-text.version=1.8 darklaf.version=2.4.1 +#darklaf.version=latest.integration dec.version=0.1.2 dnsjava.version=2.1.9 equalsverifier.version=3.1.13 @@ -75,7 +76,7 @@ freemarker.version=2.3.30 ftplet-api.version=1.1.1 ftpserver-core.version=1.1.1 geronimo-jms_1.1_spec.version=1.1.1 -groovy.version=3.0.3 +groovy.version=3.0.5 hamcrest.version=2.2 hamcrest-date.version=2.0.7 hsqldb.version=2.5.0 diff --git a/xdocs/changes.xml b/xdocs/changes.xml index d51c0aa..6d13466 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -122,6 +122,7 @@ Summary 64440Log exeptions reported via JMeterUtils#reportToUser even when in GUI mode 591Remove deprecated sudo flag from travis file. Deng Liming (liming.d.pro at gmail.com) Updated Darklaf to 2.4.1 (from 2.1.1) +Updated Groovy to 3.0.5 (from 3.0.3) 596Use neutral words in documentation 63809557Updated commons-collections to 4.4 (from 3.2.2) while keeping the jars for the old commons-collections 3.x for compatibility 598Add another option for creating diffs to the building page. Contributed by jmetertea (github.com/jmetertea)
[jmeter] branch master updated: [Bug 64647] New: groovy-dateutil is missing in distribution
This is an automated email from the ASF dual-hosted git repository.
pmouawad 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 91e1c7f [Bug 64647] New: groovy-dateutil is missing in distribution
91e1c7f is described below
commit 91e1c7ff6df91aee09190c19309838dfeefd1fd8
Author: pmouawad
AuthorDate: Wed Aug 5 21:52:45 2020 +0200
[Bug 64647] New: groovy-dateutil is missing in distribution
---
src/core/build.gradle.kts | 2 +-
xdocs/changes.xml | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/core/build.gradle.kts b/src/core/build.gradle.kts
index f253785..35b6e3a 100644
--- a/src/core/build.gradle.kts
+++ b/src/core/build.gradle.kts
@@ -60,7 +60,7 @@ dependencies {
runtimeOnly("org.codehaus.groovy:groovy") {
because("Groovy is a default JSR232 engine")
}
-arrayOf("datetime", "jmx", "json", "jsr223", "sql", "templates").forEach {
+arrayOf("dateutil", "datetime", "jmx", "json", "jsr223", "sql",
"templates").forEach {
runtimeOnly("org.codehaus.groovy:groovy-$it") {
because("Groovy is a default JSR232 engine")
}
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index e06248c..d51c0aa 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -180,6 +180,7 @@ Summary
64594Unable to enter variable values instead of numeric
values in components using PowerTableModel (Impacts 3rd party plugins like
Throughput Shaping Timer)
64475Menu Generate HTML Report: When report generation
fails due to timeout, error message is not explicit. Contributed by Ubik Load
Pack (https://ubikloadpack.com)
64627Programmatic manipulation of the control flow via API
methods of JMeterContext is not working as it used to before 5.0. Contributed
by Till Neunast
+64647groovy-dateutil is missing in distribution
[jmeter] branch master updated: style
This is an automated email from the ASF dual-hosted git repository.
pmouawad 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 a171057 style
a171057 is described below
commit a1710570b660b50ef889fbb97080304e730797bd
Author: pmouawad
AuthorDate: Sun Aug 2 19:10:49 2020 +0200
style
---
.../java/org/apache/jmeter/assertions/gui/JSONPathAssertionGui.java | 2 +-
.../org/apache/jmeter/assertions/jmespath/gui/JMESPathAssertionGui.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git
a/src/components/src/main/java/org/apache/jmeter/assertions/gui/JSONPathAssertionGui.java
b/src/components/src/main/java/org/apache/jmeter/assertions/gui/JSONPathAssertionGui.java
index 3c9efeb..d482c75 100644
---
a/src/components/src/main/java/org/apache/jmeter/assertions/gui/JSONPathAssertionGui.java
+++
b/src/components/src/main/java/org/apache/jmeter/assertions/gui/JSONPathAssertionGui.java
@@ -97,7 +97,7 @@ public class JSONPathAssertionGui extends
AbstractAssertionGui implements Change
expectNull = new JCheckBox();
panel.add(JMeterUtils.labelFor(expectNull, JSON_ASSERTION_NULL));
panel.add(expectNull, "span");
-
+
invert = new JCheckBox();
panel.add(JMeterUtils.labelFor(invert, JSON_ASSERTION_INVERT));
panel.add(invert, "span");
diff --git
a/src/components/src/main/java/org/apache/jmeter/assertions/jmespath/gui/JMESPathAssertionGui.java
b/src/components/src/main/java/org/apache/jmeter/assertions/jmespath/gui/JMESPathAssertionGui.java
index dfdefea..af8e520 100644
---
a/src/components/src/main/java/org/apache/jmeter/assertions/jmespath/gui/JMESPathAssertionGui.java
+++
b/src/components/src/main/java/org/apache/jmeter/assertions/jmespath/gui/JMESPathAssertionGui.java
@@ -82,7 +82,7 @@ public class JMESPathAssertionGui extends
JSONPathAssertionGui {
expectNull = new JCheckBox();
panel.add(JMeterUtils.labelFor(expectNull, JMES_ASSERTION_NULL));
panel.add(expectNull, "span");
-
+
invert = new JCheckBox();
panel.add(JMeterUtils.labelFor(invert, JMES_ASSERTION_INVERT));
panel.add(invert, "span");
[jmeter] branch master updated: Bug 64638 - JSON JMESPath Assertion / JSON Assertion: Opening GUI shows a horizontal scrollbar that keeps sliding
This is an automated email from the ASF dual-hosted git repository.
pmouawad 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 c037ee5 Bug 64638 - JSON JMESPath Assertion / JSON Assertion: Opening
GUI shows a horizontal scrollbar that keeps sliding
c037ee5 is described below
commit c037ee577a03a895de1b5e0163b34db01e6eb4ac
Author: pmouawad
AuthorDate: Sun Aug 2 19:09:41 2020 +0200
Bug 64638 - JSON JMESPath Assertion / JSON Assertion: Opening GUI shows
a horizontal scrollbar that keeps sliding
Fix issue and rework UI
---
.../assertions/gui/JSONPathAssertionGui.java | 63 +-
.../jmespath/gui/JMESPathAssertionGui.java | 43 +++
xdocs/changes.xml | 1 +
3 files changed, 71 insertions(+), 36 deletions(-)
diff --git
a/src/components/src/main/java/org/apache/jmeter/assertions/gui/JSONPathAssertionGui.java
b/src/components/src/main/java/org/apache/jmeter/assertions/gui/JSONPathAssertionGui.java
index e3b0b3e..3c9efeb 100644
---
a/src/components/src/main/java/org/apache/jmeter/assertions/gui/JSONPathAssertionGui.java
+++
b/src/components/src/main/java/org/apache/jmeter/assertions/gui/JSONPathAssertionGui.java
@@ -19,19 +19,21 @@ package org.apache.jmeter.assertions.gui;
import java.awt.BorderLayout;
-import javax.swing.BorderFactory;
import javax.swing.JCheckBox;
+import javax.swing.JPanel;
+import javax.swing.JTextField;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
import org.apache.jmeter.assertions.JSONPathAssertion;
import org.apache.jmeter.gui.GUIMenuSortOrder;
import org.apache.jmeter.gui.TestElementMetadata;
-import org.apache.jmeter.gui.util.VerticalPanel;
+import org.apache.jmeter.gui.util.JSyntaxTextArea;
+import org.apache.jmeter.gui.util.JTextScrollPane;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jorphan.gui.JLabeledTextArea;
-import org.apache.jorphan.gui.JLabeledTextField;
+
+import net.miginfocom.swing.MigLayout;
/**
* Java class representing GUI for the {@link JSONPathAssertion} component in
JMeter
@@ -50,8 +52,8 @@ public class JSONPathAssertionGui extends
AbstractAssertionGui implements Change
private static final String JSON_ASSERTION_INVERT =
"json_assertion_invert";
private static final String JSON_ASSERTION_TITLE = "json_assertion_title";
-protected JLabeledTextField jsonPath = null;
-protected JLabeledTextArea jsonValue = null;
+protected JTextField jsonPath = null;
+protected JSyntaxTextArea jsonValue = null;
protected JCheckBox jsonValidation = null;
protected JCheckBox expectNull = null;
protected JCheckBox invert = null;
@@ -66,31 +68,40 @@ public class JSONPathAssertionGui extends
AbstractAssertionGui implements Change
setBorder(makeBorder());
add(makeTitlePanel(), BorderLayout.NORTH);
-VerticalPanel panel = new VerticalPanel();
-panel.setBorder(BorderFactory.createEmptyBorder(5, 0, 5, 0));
-
-initFields();
+JPanel panel = buildPanel();
+add(panel, BorderLayout.CENTER);
jsonValidation.addChangeListener(this);
expectNull.addChangeListener(this);
-
-panel.add(jsonPath);
-panel.add(jsonValidation);
-panel.add(isRegex);
-panel.add(jsonValue);
-panel.add(expectNull);
-panel.add(invert);
-
-add(panel, BorderLayout.CENTER);
}
-protected void initFields() {
-jsonPath = new
JLabeledTextField(JMeterUtils.getResString(JSON_ASSERTION_PATH));
-jsonValue = new
JLabeledTextArea(JMeterUtils.getResString(JSON_ASSERTION_EXPECTED_VALUE));
-jsonValidation = new
JCheckBox(JMeterUtils.getResString(JSON_ASSERTION_VALIDATION));
-expectNull = new
JCheckBox(JMeterUtils.getResString(JSON_ASSERTION_NULL));
-invert = new
JCheckBox(JMeterUtils.getResString(JSON_ASSERTION_INVERT));
-isRegex = new
JCheckBox(JMeterUtils.getResString(JSON_ASSERTION_REGEX));
+protected JPanel buildPanel() {
+JPanel panel = new JPanel(new MigLayout("fillx, wrap 2, insets 0",
"[][fill,grow]"));
+
+jsonPath = new JTextField();
+panel.add(JMeterUtils.labelFor(jsonPath, JSON_ASSERTION_PATH));
+panel.add(jsonPath, "span, growx");
+
+jsonValidation = new JCheckBox();
+panel.add(JMeterUtils.labelFor(jsonValidation,
JSON_ASSERTION_VALIDATION));
+panel.add(jsonValidation, "span");
+
+isRegex = new JCheckBox();
+panel.add(JMeterUtils.labelFor(isRegex, JSON_ASSERTION_REGEX));
+panel.add(isRegex, "span");
+
+jsonValue = JSyntaxTextArea.getInstance(5, 60);
+panel.add(JMeterUtils.la
[jmeter] branch master updated: Add Thanks to Till Neunast
This is an automated email from the ASF dual-hosted git repository. pmouawad 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 8a856d6 Add Thanks to Till Neunast 8a856d6 is described below commit 8a856d69ac89c5510b7256c18ae82c0401625cf8 Author: pmouawad AuthorDate: Sat Jul 25 22:28:55 2020 +0200 Add Thanks to Till Neunast --- xdocs/changes.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xdocs/changes.xml b/xdocs/changes.xml index 6c1f936..e2cf4e6 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -178,6 +178,7 @@ Summary 64543On MacOSX, Darklaf- IntelliJ Theme throws NPE in javax.swing.ToolTipManager.initiateToolTip 64594Unable to enter variable values instead of numeric values in components using PowerTableModel (Impacts 3rd party plugins like Throughput Shaping Timer) 64475Menu Generate HTML Report: When report generation fails due to timeout, error message is not explicit. Contributed by Ubik Load Pack (https://ubikloadpack.com) +64627Programmatic manipulation of the control flow via API methods of JMeterContext is not working as it used to before 5.0. Contributed by Till Neunast @@ -193,6 +194,7 @@ Summary https://github.com/weisJ/darklaf";>Jannis Weis https://github.com/topicus-pw-dvdouden";>Daniel van den Ouden https://ubikloadpack.com"; >Ubik Load Pack + Till Neunast (https://github.com/tilln) We also thank bug reporters who helped us improve JMeter.
[jmeter] branch master updated: Fix for bug fix 62238 (#606)
This is an automated email from the ASF dual-hosted git repository.
pmouawad 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 c0289a2 Fix for bug fix 62238 (#606)
c0289a2 is described below
commit c0289a2a76082036341e3f8f8602627b4a7fad60
Author: Till Neunast
AuthorDate: Sun Jul 26 08:24:18 2020 +1200
Fix for bug fix 62238 (#606)
---
src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java
b/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java
index 0276b5e..b643f8f 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java
@@ -595,7 +595,9 @@ public class JMeterThread implements Runnable,
Interruptible {
if (result.isStopTestNow() || (!result.isSuccessful() &&
onErrorStopTestNow)) {
stopTestNow();
}
-threadContext.setTestLogicalAction(result.getTestLogicalAction());
+if (result.getTestLogicalAction() != TestLogicalAction.CONTINUE) {
+
threadContext.setTestLogicalAction(result.getTestLogicalAction());
+}
} else {
compiler.done(pack); // Finish up
}
[jmeter] branch master updated: Bug 64617 - HTML report: In graph Response Time Percentiles Over Time 90, 95, 99th percentile correspond in reality to 0.90, 0.95 and 0.99 percentiles
This is an automated email from the ASF dual-hosted git repository.
pmouawad 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 5d47043 Bug 64617 - HTML report: In graph Response Time Percentiles
Over Time 90,95,99th percentile correspond in reality to 0.90, 0.95 and 0.99
percentiles
5d47043 is described below
commit 5d470437c87f2807af317284a2d9372d03db987a
Author: pmouawad
AuthorDate: Sat Jul 25 22:14:55 2020 +0200
Bug 64617 - HTML report: In graph Response Time Percentiles Over Time
90,95,99th percentile correspond in reality to 0.90, 0.95 and 0.99
percentiles
---
.../graph/impl/ResponseTimePercentilesOverTimeGraphConsumer.java | 5 +
xdocs/changes.xml| 2 ++
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git
a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesOverTimeGraphConsumer.java
b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesOverTimeGraphConsumer.java
index 2598292..7c636b6 100644
---
a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesOverTimeGraphConsumer.java
+++
b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/impl/ResponseTimePercentilesOverTimeGraphConsumer.java
@@ -100,10 +100,7 @@ public class ResponseTimePercentilesOverTimeGraphConsumer
private GroupInfo createPercentileGroupInfo(String propKey, String label) {
String seriesName = formatPercentile(label);
-double defaultValue = new BigDecimal(label)
-.divide(new BigDecimal("100"), 6, RoundingMode.CEILING)
-.doubleValue();
-
+double defaultValue = new BigDecimal(label).setScale(2,
RoundingMode.CEILING).doubleValue();
double property = JMeterUtils.getPropDefault(propKey, defaultValue);
PercentileAggregatorFactory factory = new
PercentileAggregatorFactory();
factory.setPercentileIndex(property);
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index c7df4ed..6c1f936 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -163,6 +163,7 @@ Summary
Report / Dashboard
64547Report/Dashboard: Ensure graphs Response codes per
second is not broken by empty response code in SampleResult. Contributed by
Ubik Load Pack (https://ubikloadpack.com)
+64617HTML report: In graph Response Time Percentiles Over
Time 90,95,99th percentile correspond in reality to 0.90, 0.95 and 0.99
percentiles
Documentation
@@ -195,6 +196,7 @@ Summary
We also thank bug reporters who helped us improve JMeter.
+ Hiroyoshi Mitsumori (mitsumori at mis.dev)
Apologies if we have omitted anyone else.
[jmeter] branch master updated: Bug 64547 - Report/Dashboard: Ensure graphs Response codes per second is not broken by empty response code in SampleResult
This is an automated email from the ASF dual-hosted git repository.
pmouawad 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 12bb68c Bug 64547 - Report/Dashboard: Ensure graphs Response codes
per second is not broken by empty response code in SampleResult
12bb68c is described below
commit 12bb68cb6f83f378fee37af61499c64a4e2a266d
Author: pmouawad
AuthorDate: Sat Jul 25 16:06:01 2020 +0200
Bug 64547 - Report/Dashboard: Ensure graphs Response codes per second is
not broken by empty response code in SampleResult
Fix regression in Response Time Percentiles Over Time (successful
responses)
---
.../org/apache/jmeter/report/processor/graph/StaticSeriesSelector.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/StaticSeriesSelector.java
b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/StaticSeriesSelector.java
index 1f94150..0e6a6f4 100644
---
a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/StaticSeriesSelector.java
+++
b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/StaticSeriesSelector.java
@@ -56,7 +56,7 @@ public class StaticSeriesSelector extends
AbstractSeriesSelector {
*/
@Override
public Iterable select(Sample sample) {
-return withDefaultIfEmpty(sample.getName(), "EMPTY_SERIE_NAME");
//$NON-NLS-1$
+return withDefaultIfEmpty(seriesName, "EMPTY_SERIE_NAME");
//$NON-NLS-1$
}
}
[jmeter] branch master updated: Bug 64475 - Menu Generate HTML Report: When report generation fails due to timeout, error message is not explicit
This is an automated email from the ASF dual-hosted git repository.
pmouawad 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 fb40439 Bug 64475 - Menu Generate HTML Report: When report generation
fails due to timeout, error message is not explicit
fb40439 is described below
commit fb404396cc96139c2b94207478a73da23ad04144
Author: pmouawad
AuthorDate: Sat Jul 25 15:25:55 2020 +0200
Bug 64475 - Menu Generate HTML Report: When report generation fails due
to timeout, error message is not explicit
---
.../org/apache/jmeter/gui/action/HtmlReportGenerator.java| 12 +---
.../org/apache/jmeter/resources/messages.properties | 3 ++-
.../org/apache/jmeter/resources/messages_fr.properties | 3 ++-
xdocs/changes.xml| 2 ++
4 files changed, 15 insertions(+), 5 deletions(-)
diff --git
a/src/core/src/main/java/org/apache/jmeter/gui/action/HtmlReportGenerator.java
b/src/core/src/main/java/org/apache/jmeter/gui/action/HtmlReportGenerator.java
index a4c1e8f..41cf95f 100644
---
a/src/core/src/main/java/org/apache/jmeter/gui/action/HtmlReportGenerator.java
+++
b/src/core/src/main/java/org/apache/jmeter/gui/action/HtmlReportGenerator.java
@@ -87,9 +87,15 @@ public class HtmlReportGenerator {
LOGGER.info("The HTML report generation failed and returned:
{}", commandExecutionOutput);
return errorMessageList;
}
-} catch (InterruptedException | TimeoutException | IOException e) {
-errorMessageList.add(commandExecutionOutput.toString());
-LOGGER.error("Error during HTML report generation:", e);
+} catch (TimeoutException e) {
+
errorMessageList.add(MessageFormat.format(JMeterUtils.getResString("generate_report_ui.html_report_timeout_error"),
+COMMAND_TIMEOUT, e.getMessage(),
commandExecutionOutput.toString()));
+LOGGER.error("Report generation took more time than configured
timeout(Property {}={})",
+"generate_report_ui.generation_timeout", COMMAND_TIMEOUT,
commandExecutionOutput.toString(), e);
+} catch (InterruptedException | IOException e) {
+
errorMessageList.add(MessageFormat.format(JMeterUtils.getResString("generate_report_ui.html_report_unknown_error"),
+e.getMessage(), commandExecutionOutput.toString()));
+LOGGER.error("Error during HTML report generation, executing {}",
commandExecutionOutput.toString(), e);
if (e instanceof InterruptedException) {
Thread.currentThread().interrupt();
}
diff --git
a/src/core/src/main/resources/org/apache/jmeter/resources/messages.properties
b/src/core/src/main/resources/org/apache/jmeter/resources/messages.properties
index 1489b45..f598f6f 100644
---
a/src/core/src/main/resources/org/apache/jmeter/resources/messages.properties
+++
b/src/core/src/main/resources/org/apache/jmeter/resources/messages.properties
@@ -414,7 +414,8 @@ generate_report_ui.html_report_menu=Generate HTML report
generate_report_ui.html_report_processing=Generating report
generate_report_ui.html_report_request=Generate report
generate_report_ui.html_report_success=Report created !
-generate_report_ui.html_report_unknown_error=Error \: {0}
+generate_report_ui.html_report_timeout_error=Generation of report took more
time than configured timeout (Property
generate_report_ui.generation_timeout={0}), error\:{1}, command output\:{2}
+generate_report_ui.html_report_unknown_error=Error generating report \: {0},
command output\:{1}
generate_report_ui.no_such_file=The specified file {0} doesn't exist
generate_report_ui.output_directory=Output directory \:
generator_cnf_msg=Could not find the generator class. Please make sure you
place your jar file in the /lib directory.
diff --git
a/src/core/src/main/resources/org/apache/jmeter/resources/messages_fr.properties
b/src/core/src/main/resources/org/apache/jmeter/resources/messages_fr.properties
index 9e04a2d..c43d7d7 100644
---
a/src/core/src/main/resources/org/apache/jmeter/resources/messages_fr.properties
+++
b/src/core/src/main/resources/org/apache/jmeter/resources/messages_fr.properties
@@ -408,7 +408,8 @@ generate_report_ui.html_report_menu=Générer le rapport HTML
generate_report_ui.html_report_processing=Génération en cours
generate_report_ui.html_report_request=Générer le rapport
generate_report_ui.html_report_success=Rapport créé !
-generate_report_ui.html_report_unknown_error=Erreur \: {0}
+generate_report_ui.html_report_timeout_error=La génération du rapport a pris
plus de temps que le timeout configuré(Propriété
generate_report_ui.generation_timeout={0}), erreur\:{1}, sortie standard\:{2}
+generate_report_ui.html_r
[jmeter] branch master updated: Improved README. (#605)
This is an automated email from the ASF dual-hosted git repository. pmouawad 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 99d8946 Improved README. (#605) 99d8946 is described below commit 99d8946e884f10c2954b435f1d4c90f70f7e3529 Author: Graham Russell AuthorDate: Fri Jul 17 17:28:53 2020 +0100 Improved README. (#605) Changed structure, formatting and wording. Fixed broken link. HTTP->HTTPs --- README.md | 120 +- 1 file changed, 72 insertions(+), 48 deletions(-) diff --git a/README.md b/README.md index c6292fb..cce7bfa 100644 --- a/README.md +++ b/README.md @@ -1,25 +1,36 @@ https://jmeter.apache.org/images/logo.svg"; alt="Apache JMeter logo" /> -Open Source application designed to load test applications and measure performance. By The Apache Software Foundation - + +An Open Source Java application designed to measure performance and load test applications. + +By The Apache Software Foundation [](https://travis-ci.org/apache/jmeter/) [](https://codecov.io/gh/apache/jmeter) -[](http://www.apache.org/licenses/LICENSE-2.0.html) +[](https://www.apache.org/licenses/LICENSE-2.0.html) [](https://stackoverflow.com/questions/tagged/jmeter) [](https://maven-badges.herokuapp.com/maven-central/org.apache.jmeter/ApacheJMeter) [](https://www.javadoc.io/doc/org.apache.jmeter/ApacheJMeter_core) [](https://twitter.com/intent/tweet?text=Powerful%20load%20testing%20with%20Apache%20JMeter:&url=https://jmeter.apache.org) -## What is it +## What Is It? + +Apache JMeter can measure performance and load test static and dynamic web applications. + +It can be used to simulate a heavy load on a server, group of servers, +network or object to test its strength or to analyze overall performance under different load types. -Apache JMeter may be used to test performance both on static and dynamic resources, Web dynamic applications. -It can be used to simulate a heavy load on a server, group of servers, network or object to test its strength or to analyze overall performance under different load types. + -https://raw.githubusercontent.com/apache/jmeter/master/xdocs/images/screenshots/jmeter_screen.png";> +## Features -Apache JMeter features include: +Complete portability and 100% Java. -Ability to load and performance test many different applications/server/protocol types: +Multi-threading allows concurrent sampling by many threads and +simultaneous sampling of different functions by separate thread groups. + +### Protocols + +Ability to load and performance test many applications/server/protocol types: - Web - HTTP, HTTPS (Java, NodeJS, PHP, ASP.NET,...) - SOAP / REST Webservices @@ -32,40 +43,48 @@ Ability to load and performance test many different applications/server/protocol - TCP - Java Objects -Full featured Test IDE that allows fast Test Plan **recording (from Browsers or native applications), building and debugging.** +### IDE -[**Command-line mode (Non GUI / headless mode)**](http://jmeter.apache.org/usermanual/get-started.html#non_gui) to load test from any Java compatible OS (Linux, Windows, Mac OSX, ...) +Fully featured Test IDE that allows fast Test Plan **recording** + (from Browsers or native applications), **building** and **debugging**. -A complete and [**ready to present dynamic HTML report**](http://jmeter.apache.org/usermanual/generating-dashboard.html) +### Command Line - +[Command-line mode (Non GUI / headless mode)](https://jmeter.apache.org/usermanual/get-started.html#non_gui) +to load test from any Java compatible OS (Linux, Windows, Mac OSX, ...) -[**Live reporting**](http://jmeter.apache.org/usermanual/realtime-results.html) into 3rd party databases like InfluxDB or Graphite +### Reporting - were added to refs/heads/master by this push: new 105a1eb Upgrade darklaf to 2.4.1 to fix Bug 64594Unable to enter variable values instead of numeric values in components using PowerTableModel (Impacts 3rd party plugins like Throughput Shaping Timer) 105a1eb is described below commit 105a1eba63d0b0fc680d1f21a95dda2c7f5dc7fe Author: pmouawad AuthorDate: Fri Jul 17 18:23:58 2020 +0200 Upgrade darklaf to 2.4.1 to fix Bug 64594Unable to enter variable values instead of numeric values in components using PowerTableModel (Impacts 3rd party plugins like Throughput Shaping Timer) --- gradle.properties | 2 +- xdocs/changes.xml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 8a2c541..2be785c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -67,7 +67,7 @@ commons-math3.version=3.6.1 commons-net.version=3.6 commons-pool2.version=2.8.0 commons-text.version=1.8 -darklaf.version=2.4.0 +darklaf.version=2.4.1 dec.version=0.1.2 dnsjava.version=2.1.9 equalsverifier.version=3.1.13 diff --git a/xdocs/changes.xml b/xdocs/changes.xml index 999558b..022d540 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -121,7 +121,7 @@ Summary 64454More precise error message, when no datasource value can be found in JDBC sampler 64440Log exeptions reported via JMeterUtils#reportToUser even when in GUI mode 591Remove deprecated sudo flag from travis file. Deng Liming (liming.d.pro at gmail.com) -Updated Darklaf to 2.4.0 (from 2.1.1) +Updated Darklaf to 2.4.1 (from 2.1.1) 596Use neutral words in documentation 63809557Updated commons-collections to 4.4 (from 3.2.2) while keeping the jars for the old commons-collections 3.x for compatibility 598Add another option for creating diffs to the building page. Contributed by jmetertea (github.com/jmetertea) @@ -175,6 +175,7 @@ Summary 64499Exiting JMeter when jmeterengine.stopfail.system.exit=true takes too much time if threads are not stopped 64510Darklaf- IntelliJ Theme throws NPE in DarkTreeUI on MacOS 64543On MacOSX, Darklaf- IntelliJ Theme throws NPE in javax.swing.ToolTipManager.initiateToolTip +64594Unable to enter variable values instead of numeric values in components using PowerTableModel (Impacts 3rd party plugins like Throughput Shaping Timer)
[jmeter] branch master updated: Delete unused class
This is an automated email from the ASF dual-hosted git repository.
pmouawad 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 3dc3814 Delete unused class
3dc3814 is described below
commit 3dc38149479ba0de9853a6e0f97e3f81e3353faf
Author: pmouawad
AuthorDate: Tue Jul 14 22:39:05 2020 +0200
Delete unused class
---
.../json/jmespath/JMESPathCacheLoader.java | 44 --
1 file changed, 44 deletions(-)
diff --git
a/src/components/src/main/java/org/apache/jmeter/extractor/json/jmespath/JMESPathCacheLoader.java
b/src/components/src/main/java/org/apache/jmeter/extractor/json/jmespath/JMESPathCacheLoader.java
deleted file mode 100644
index 83a4bad..000
---
a/src/components/src/main/java/org/apache/jmeter/extractor/json/jmespath/JMESPathCacheLoader.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * 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.extractor.json.jmespath;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import com.github.benmanes.caffeine.cache.CacheLoader;
-
-import io.burt.jmespath.Expression;
-import io.burt.jmespath.JmesPath;
-import io.burt.jmespath.RuntimeConfiguration;
-import io.burt.jmespath.function.FunctionRegistry;
-import io.burt.jmespath.jackson.JacksonRuntime;
-
-/**
- * @since 5.2
- */
-public class JMESPathCacheLoader implements CacheLoader> {
-final JmesPath runtime;
-
-public JMESPathCacheLoader() {
-runtime = new JacksonRuntime(
-new
RuntimeConfiguration.Builder().withFunctionRegistry(FunctionRegistry.defaultRegistry()).build());
-}
-
-@Override
-public Expression load(String jmesPathExpression) throws
Exception {
-return runtime.compile(jmesPathExpression);
-}
-}
[jmeter] branch master updated: Trigger new build following fix of https://github.com/weisJ/darklaf/issues/192
This is an automated email from the ASF dual-hosted git repository. pmouawad 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 fb66ca9 Trigger new build following fix of https://github.com/weisJ/darklaf/issues/192 fb66ca9 is described below commit fb66ca90547856d39b59e98b978cb551e53f5a04 Author: pmouawad AuthorDate: Thu Jul 9 13:12:37 2020 +0200 Trigger new build following fix of https://github.com/weisJ/darklaf/issues/192 --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index a6eeb8a..c6292fb 100644 --- a/README.md +++ b/README.md @@ -238,4 +238,5 @@ Java Cryptography Extension (JCE) API to provide Apache JMeter does not include any implementation of JSSE or JCE. + **Thank you for using Apache JMeter.**
[jmeter] branch master updated: Upgrade Darklaf to 2.4.0 from 2.3.0
This is an automated email from the ASF dual-hosted git repository. pmouawad 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 def282e Upgrade Darklaf to 2.4.0 from 2.3.0 def282e is described below commit def282ef34d4631a9c857ad32b748e30c7d8a90b Author: pmouawad AuthorDate: Thu Jul 9 09:16:53 2020 +0200 Upgrade Darklaf to 2.4.0 from 2.3.0 --- gradle.properties | 2 +- xdocs/changes.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 91b3973..8a2c541 100644 --- a/gradle.properties +++ b/gradle.properties @@ -67,7 +67,7 @@ commons-math3.version=3.6.1 commons-net.version=3.6 commons-pool2.version=2.8.0 commons-text.version=1.8 -darklaf.version=2.3.0 +darklaf.version=2.4.0 dec.version=0.1.2 dnsjava.version=2.1.9 equalsverifier.version=3.1.13 diff --git a/xdocs/changes.xml b/xdocs/changes.xml index 5d0ffae..999558b 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -121,7 +121,7 @@ Summary 64454More precise error message, when no datasource value can be found in JDBC sampler 64440Log exeptions reported via JMeterUtils#reportToUser even when in GUI mode 591Remove deprecated sudo flag from travis file. Deng Liming (liming.d.pro at gmail.com) -Updated Darklaf to 2.3.0 (from 2.1.1) +Updated Darklaf to 2.4.0 (from 2.1.1) 596Use neutral words in documentation 63809557Updated commons-collections to 4.4 (from 3.2.2) while keeping the jars for the old commons-collections 3.x for compatibility 598Add another option for creating diffs to the building page. Contributed by jmetertea (github.com/jmetertea)
[jmeter] branch master updated: Upgrade Darklaf to 2.4.0 from 2.3.0
This is an automated email from the ASF dual-hosted git repository. pmouawad 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 def282e Upgrade Darklaf to 2.4.0 from 2.3.0 def282e is described below commit def282ef34d4631a9c857ad32b748e30c7d8a90b Author: pmouawad AuthorDate: Thu Jul 9 09:16:53 2020 +0200 Upgrade Darklaf to 2.4.0 from 2.3.0 --- gradle.properties | 2 +- xdocs/changes.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/gradle.properties b/gradle.properties index 91b3973..8a2c541 100644 --- a/gradle.properties +++ b/gradle.properties @@ -67,7 +67,7 @@ commons-math3.version=3.6.1 commons-net.version=3.6 commons-pool2.version=2.8.0 commons-text.version=1.8 -darklaf.version=2.3.0 +darklaf.version=2.4.0 dec.version=0.1.2 dnsjava.version=2.1.9 equalsverifier.version=3.1.13 diff --git a/xdocs/changes.xml b/xdocs/changes.xml index 5d0ffae..999558b 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -121,7 +121,7 @@ Summary 64454More precise error message, when no datasource value can be found in JDBC sampler 64440Log exeptions reported via JMeterUtils#reportToUser even when in GUI mode 591Remove deprecated sudo flag from travis file. Deng Liming (liming.d.pro at gmail.com) -Updated Darklaf to 2.3.0 (from 2.1.1) +Updated Darklaf to 2.4.0 (from 2.1.1) 596Use neutral words in documentation 63809557Updated commons-collections to 4.4 (from 3.2.2) while keeping the jars for the old commons-collections 3.x for compatibility 598Add another option for creating diffs to the building page. Contributed by jmetertea (github.com/jmetertea)
[jmeter] branch master updated: Bug 64581 - Allow SampleResult#setIgnore to influence behaviour on (#604)
This is an automated email from the ASF dual-hosted git repository.
pmouawad 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 77e80e8 Bug 64581 - Allow SampleResult#setIgnore to influence
behaviour on (#604)
77e80e8 is described below
commit 77e80e8a0c3d3ef6f408f6fefecc622a286b5ce5
Author: Philippe M
AuthorDate: Wed Jul 8 08:59:50 2020 +0200
Bug 64581 - Allow SampleResult#setIgnore to influence behaviour on (#604)
Sampler Error
Fix also misnamed lastSampleInError to lastSampleOk
When SampleResult#isIgnore() is true, use is for impacting algorithmic
execution, it will be taken into account to:
- Decide what to do on Error ("Action to be taken after a Sampler error"
in Thread Group)
- set JMeterThread.last_sample_ok
---
.../org/apache/jmeter/threads/JMeterThread.java| 60 +-
xdocs/changes.xml | 1 +
xdocs/usermanual/component_reference.xml | 7 +++
3 files changed, 43 insertions(+), 25 deletions(-)
diff --git a/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java
b/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java
index af8e8bf..0276b5e 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java
@@ -256,17 +256,17 @@ public class JMeterThread implements Runnable,
Interruptible {
processSampler(sam, null, threadContext);
threadContext.cleanAfterSample();
-boolean lastSampleInError =
TRUE.equals(threadContext.getVariables().get(LAST_SAMPLE_OK));
+boolean lastSampleOk =
TRUE.equals(threadContext.getVariables().get(LAST_SAMPLE_OK));
// restart of the next loop
// - was requested through threadContext
// - or the last sample failed AND the
onErrorStartNextLoop option is enabled
if (threadContext.getTestLogicalAction() !=
TestLogicalAction.CONTINUE
-|| (onErrorStartNextLoop && !lastSampleInError)) {
+|| (onErrorStartNextLoop && !lastSampleOk)) {
if (log.isDebugEnabled() && onErrorStartNextLoop
&& threadContext.getTestLogicalAction() !=
TestLogicalAction.CONTINUE) {
log.debug("Start Next Thread Loop option is on,
Last sample failed, starting next thread loop");
}
-if(onErrorStartNextLoop && !lastSampleInError){
+if(onErrorStartNextLoop && !lastSampleOk){
triggerLoopLogicalActionOnParentControllers(sam,
threadContext, JMeterThread::continueOnThreadLoop);
} else {
switch (threadContext.getTestLogicalAction()) {
@@ -285,7 +285,7 @@ public class JMeterThread implements Runnable,
Interruptible {
}
threadContext.setTestLogicalAction(TestLogicalAction.CONTINUE);
sam = null;
-threadContext.getVariables().put(LAST_SAMPLE_OK, TRUE);
+setLastSampleOk(threadContext.getVariables(), true);
}
else {
sam = threadGroupLoopController.next();
@@ -558,30 +558,33 @@ public class JMeterThread implements Runnable,
Interruptible {
result = doSampling(threadContext, sampler);
}
// If we got any results, then perform processing on the result
-if (result != null && !result.isIgnore()) {
-int nbActiveThreadsInThreadGroup =
threadGroup.getNumberOfThreads();
-int nbTotalActiveThreads =
JMeterContextService.getNumberOfThreads();
-fillThreadInformation(result, nbActiveThreadsInThreadGroup,
nbTotalActiveThreads);
-SampleResult[] subResults = result.getSubResults();
-if (subResults != null) {
-for (SampleResult subResult : subResults) {
-fillThreadInformation(subResult,
nbActiveThreadsInThreadGroup, nbTotalActiveThreads);
-}
-}
-threadContext.setPreviousResult(result);
-runPostProcessors(pack.getPostProcessors());
-checkAssertions(pack.getAssertions(), result, threadContext);
+if (result != null) {
if (!result.isIgnore()) {
+int nbActiveThreadsInThreadGroup =
threadGroup.getNumberOfThreads();
+int nbTotalActiveThreads =
JMeterContextService.getNumberOfThreads();
+fillT
[jmeter] 01/01: Bug 64581 - Allow SampleResult#setIgnore to influence behaviour on Sampler Error
This is an automated email from the ASF dual-hosted git repository.
pmouawad pushed a commit to branch fix_64581
in repository https://gitbox.apache.org/repos/asf/jmeter.git
commit 65b75c0e7471a62c388c4212e3a3a731efb877fe
Author: pmouawad
AuthorDate: Mon Jul 6 13:19:27 2020 +0200
Bug 64581 - Allow SampleResult#setIgnore to influence behaviour on
Sampler Error
Fix also misnamed lastSampleInError to lastSampleOk
When SampleResult#isIgnore() is true, use is for impacting algorithmic
execution, it will be taken into account to:
- Decide what to do on Error ("Action to be taken after a Sampler error"
in Thread Group)
- set JMeterThread.last_sample_ok
---
.../org/apache/jmeter/threads/JMeterThread.java| 60 +-
xdocs/changes.xml | 1 +
xdocs/usermanual/component_reference.xml | 7 +++
3 files changed, 43 insertions(+), 25 deletions(-)
diff --git a/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java
b/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java
index af8e8bf..0276b5e 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/JMeterThread.java
@@ -256,17 +256,17 @@ public class JMeterThread implements Runnable,
Interruptible {
processSampler(sam, null, threadContext);
threadContext.cleanAfterSample();
-boolean lastSampleInError =
TRUE.equals(threadContext.getVariables().get(LAST_SAMPLE_OK));
+boolean lastSampleOk =
TRUE.equals(threadContext.getVariables().get(LAST_SAMPLE_OK));
// restart of the next loop
// - was requested through threadContext
// - or the last sample failed AND the
onErrorStartNextLoop option is enabled
if (threadContext.getTestLogicalAction() !=
TestLogicalAction.CONTINUE
-|| (onErrorStartNextLoop && !lastSampleInError)) {
+|| (onErrorStartNextLoop && !lastSampleOk)) {
if (log.isDebugEnabled() && onErrorStartNextLoop
&& threadContext.getTestLogicalAction() !=
TestLogicalAction.CONTINUE) {
log.debug("Start Next Thread Loop option is on,
Last sample failed, starting next thread loop");
}
-if(onErrorStartNextLoop && !lastSampleInError){
+if(onErrorStartNextLoop && !lastSampleOk){
triggerLoopLogicalActionOnParentControllers(sam,
threadContext, JMeterThread::continueOnThreadLoop);
} else {
switch (threadContext.getTestLogicalAction()) {
@@ -285,7 +285,7 @@ public class JMeterThread implements Runnable,
Interruptible {
}
threadContext.setTestLogicalAction(TestLogicalAction.CONTINUE);
sam = null;
-threadContext.getVariables().put(LAST_SAMPLE_OK, TRUE);
+setLastSampleOk(threadContext.getVariables(), true);
}
else {
sam = threadGroupLoopController.next();
@@ -558,30 +558,33 @@ public class JMeterThread implements Runnable,
Interruptible {
result = doSampling(threadContext, sampler);
}
// If we got any results, then perform processing on the result
-if (result != null && !result.isIgnore()) {
-int nbActiveThreadsInThreadGroup =
threadGroup.getNumberOfThreads();
-int nbTotalActiveThreads =
JMeterContextService.getNumberOfThreads();
-fillThreadInformation(result, nbActiveThreadsInThreadGroup,
nbTotalActiveThreads);
-SampleResult[] subResults = result.getSubResults();
-if (subResults != null) {
-for (SampleResult subResult : subResults) {
-fillThreadInformation(subResult,
nbActiveThreadsInThreadGroup, nbTotalActiveThreads);
-}
-}
-threadContext.setPreviousResult(result);
-runPostProcessors(pack.getPostProcessors());
-checkAssertions(pack.getAssertions(), result, threadContext);
+if (result != null) {
if (!result.isIgnore()) {
+int nbActiveThreadsInThreadGroup =
threadGroup.getNumberOfThreads();
+int nbTotalActiveThreads =
JMeterContextService.getNumberOfThreads();
+fillThreadInformation(result, nbActiveThreadsInThreadGroup,
nbTotalActiveThreads);
+SampleResult[] subResults = result.getSubResults();
+if (subResu
[jmeter] branch fix_64581 created (now 65b75c0)
This is an automated email from the ASF dual-hosted git repository. pmouawad pushed a change to branch fix_64581 in repository https://gitbox.apache.org/repos/asf/jmeter.git. at 65b75c0 Bug 64581 - Allow SampleResult#setIgnore to influence behaviour on Sampler Error This branch includes the following new commits: new 65b75c0 Bug 64581 - Allow SampleResult#setIgnore to influence behaviour on Sampler Error The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[jmeter] branch master updated: Mention real name
This is an automated email from the ASF dual-hosted git repository. pmouawad 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 fadf375 Mention real name fadf375 is described below commit fadf375b0049d17d8eae25dd9b22ac52c1df27a5 Author: pmouawad AuthorDate: Wed Jun 24 08:51:16 2020 +0200 Mention real name --- xdocs/changes.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xdocs/changes.xml b/xdocs/changes.xml index 9517f23..a7a1a81 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -81,7 +81,7 @@ Summary Other samplers -64555Set JMSType header field through JMSProperties. Contributed by topicus-pw-dvdouden +64555Set JMSType header field through JMSProperties. Contributed by Daniel van den Ouden Controllers @@ -187,7 +187,7 @@ Summary jmetertea (https://github.com/jmetertea) https://ubikloadpack.com"; >Ubik Load Pack https://github.com/weisJ/darklaf";>Jannis Weis - https://github.com/topicus-pw-dvdouden";>topicus-pw-dvdouden + https://github.com/topicus-pw-dvdouden";>Daniel van den Ouden We also thank bug reporters who helped us improve JMeter.
[jmeter] branch master updated: Mention contributor
This is an automated email from the ASF dual-hosted git repository. pmouawad 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 020b109 Mention contributor 020b109 is described below commit 020b10930fc76b0bedb07f1b27d08914a5e66143 Author: pmouawad AuthorDate: Wed Jun 24 08:46:09 2020 +0200 Mention contributor --- xdocs/changes.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/xdocs/changes.xml b/xdocs/changes.xml index df19810..9517f23 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -81,6 +81,7 @@ Summary Other samplers +64555Set JMSType header field through JMSProperties. Contributed by topicus-pw-dvdouden Controllers @@ -186,6 +187,7 @@ Summary jmetertea (https://github.com/jmetertea) https://ubikloadpack.com"; >Ubik Load Pack https://github.com/weisJ/darklaf";>Jannis Weis + https://github.com/topicus-pw-dvdouden";>topicus-pw-dvdouden We also thank bug reporters who helped us improve JMeter.
[jmeter] branch master updated: Set JMSType header field through JMSProperties. (#600)
This is an automated email from the ASF dual-hosted git repository.
pmouawad 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 8b43d6a Set JMSType header field through JMSProperties. (#600)
8b43d6a is described below
commit 8b43d6a7f6f675a3c629d372052c66ab0005cd17
Author: topicus-pw-dvdouden
<67269601+topicus-pw-dvdou...@users.noreply.github.com>
AuthorDate: Wed Jun 24 08:45:43 2020 +0200
Set JMSType header field through JMSProperties. (#600)
* Set JMSType header field through JMSProperties.
* Fixed indenting
This fixes https://bz.apache.org/bugzilla/show_bug.cgi?id=64555
---
.../jms/src/main/java/org/apache/jmeter/protocol/jms/Utils.java | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git
a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/Utils.java
b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/Utils.java
index 8b2917b..9b8971f 100644
--- a/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/Utils.java
+++ b/src/protocol/jms/src/main/java/org/apache/jmeter/protocol/jms/Utils.java
@@ -229,9 +229,12 @@ public final class Utils {
log.debug("Adding property [" + name + "=" + value + "]");
}
-// WebsphereMQ does not allow corr. id. to be set using
setStringProperty()
+// Some JMS implemenations do not allow certain header fields to
be set using properties
+// e.g.: WebsphereMQ does not allow corr. id. to be set using
setStringProperty()
if ("JMSCorrelationID".equalsIgnoreCase(name)) { // $NON-NLS-1$
msg.setJMSCorrelationID((String)value);
+} else if ("JMSType".equalsIgnoreCase(name)) { // $NON-NLS-1$
+msg.setJMSType((String)value);
} else {
msg.setObjectProperty(name, value);
}
[jmeter] branch master updated (0c9606a -> 507ae37)
This is an automated email from the ASF dual-hosted git repository. pmouawad pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/jmeter.git. from 0c9606a Ensure all buttons added to the toolbar behave/look consistently. (#599) add 507ae37 Updates with latest bug fixes and mention Weisj No new revisions were added by this update. Summary of changes: xdocs/changes.xml | 4 1 file changed, 4 insertions(+)
[jmeter] branch master updated (0c9606a -> 507ae37)
This is an automated email from the ASF dual-hosted git repository. pmouawad pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/jmeter.git. from 0c9606a Ensure all buttons added to the toolbar behave/look consistently. (#599) add 507ae37 Updates with latest bug fixes and mention Weisj No new revisions were added by this update. Summary of changes: xdocs/changes.xml | 4 1 file changed, 4 insertions(+)
[jmeter] branch master updated: Ensure all buttons added to the toolbar behave/look consistently. (#599)
This is an automated email from the ASF dual-hosted git repository.
pmouawad 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 0c9606a Ensure all buttons added to the toolbar behave/look
consistently. (#599)
0c9606a is described below
commit 0c9606ad52fcfb259bfa4345c8f4e8cf6792f596
Author: Jannis Weis <31143295+we...@users.noreply.github.com>
AuthorDate: Wed Jun 24 08:38:08 2020 +0200
Ensure all buttons added to the toolbar behave/look consistently. (#599)
---
.../org/apache/jmeter/gui/util/JMeterToolBar.java | 29 +-
1 file changed, 17 insertions(+), 12 deletions(-)
diff --git
a/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterToolBar.java
b/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterToolBar.java
index af0e494..73a59b3 100644
--- a/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterToolBar.java
+++ b/src/core/src/main/java/org/apache/jmeter/gui/util/JMeterToolBar.java
@@ -91,6 +91,22 @@ public class JMeterToolBar extends JToolBar implements
LocaleChangeListener {
return toolBar;
}
+@Override
+protected void addImpl(Component comp, Object constraints, int index) {
+super.addImpl(comp, constraints, index);
+if (comp instanceof JButton) {
+// Ensure buttons added to the toolbar have the same style.
+JButton b = (JButton) comp;
+b.setFocusable(false);
+if (b.isBorderPainted() && (b.getText() == null ||
b.getText().isEmpty())) {
+b.setRolloverEnabled(true);
+b.putClientProperty(DarkButtonUI.KEY_VARIANT,
DarkButtonUI.VARIANT_BORDERLESS);
+b.putClientProperty(DarkButtonUI.KEY_THIN, true);
+b.putClientProperty(DarkButtonUI.KEY_SQUARE, true);
+}
+}
+}
+
/**
* Setup toolbar content
* @param toolBar {@link JMeterToolBar}
@@ -128,18 +144,7 @@ public class JMeterToolBar extends JToolBar implements
LocaleChangeListener {
* @return a button for toolbar
*/
private static JButton makeButtonItemRes(IconToolbarBean iconBean) throws
Exception {
-JButton button = new JButton(loadIcon(iconBean,
iconBean.getIconPath())) {
-@Override
-public void updateUI() {
-super.updateUI();
-// Certain LaFs might alter button configuration, so we revert
it to the way we want
-// For instance, https://github.com/weisJ/darklaf/issues/84
-setFocusable(false);
-setRolloverEnabled(true);
-putClientProperty(DarkButtonUI.KEY_VARIANT,
DarkButtonUI.VARIANT_BORDERLESS);
-putClientProperty(DarkButtonUI.KEY_THIN, true);
-}
-};
+JButton button = new JButton(loadIcon(iconBean,
iconBean.getIconPath()));
button.setToolTipText(JMeterUtils.getResString(iconBean.getI18nKey()));
if (!iconBean.getIconPathPressed().equals(iconBean.getIconPath())) {
button.setPressedIcon(loadIcon(iconBean,
iconBean.getIconPathPressed()));
[jmeter] branch master updated: Bug 64547 - Report/Dashboard: Ensure graphs Response codes per second is not broken by empty response code in SampleResult
This is an automated email from the ASF dual-hosted git repository.
pmouawad 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 69ecfde Bug 64547 - Report/Dashboard: Ensure graphs Response codes
per second is not broken by empty response code in SampleResult
69ecfde is described below
commit 69ecfde59a12fcf1e333419af9958e935107b329
Author: pmouawad
AuthorDate: Tue Jun 23 12:09:31 2020 +0200
Bug 64547 - Report/Dashboard: Ensure graphs Response codes per second is
not broken by empty response code in SampleResult
Contributed by UbikLoadPack
---
.../report/processor/graph/AbstractSeriesSelector.java| 15 +++
.../jmeter/report/processor/graph/CodeSeriesSelector.java | 5 +
.../jmeter/report/processor/graph/NameSeriesSelector.java | 4 +---
.../report/processor/graph/StaticSeriesSelector.java | 4 +---
xdocs/changes.xml | 2 ++
5 files changed, 20 insertions(+), 10 deletions(-)
diff --git
a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractSeriesSelector.java
b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractSeriesSelector.java
index 52a4ffd..cbd991f 100644
---
a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractSeriesSelector.java
+++
b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/AbstractSeriesSelector.java
@@ -17,6 +17,10 @@
package org.apache.jmeter.report.processor.graph;
+import java.util.Arrays;
+
+import org.apache.commons.lang3.StringUtils;
+
/**
* The class AbstractSeriesSelector provide an abstract base class for
* GraphSeriesSelector.
@@ -56,4 +60,15 @@ public abstract class AbstractSeriesSelector implements
GraphSeriesSelector {
return allowsControllerDiscrimination;
}
+/**
+ * @param value String value
+ * @param defaultValue Default value to use if value is empty or null
+ * @return Iterable
+ */
+protected Iterable withDefaultIfEmpty(String value, String
defaultValue) {
+if (StringUtils.isEmpty(value)) {
+value = defaultValue;
+}
+return Arrays.asList(value);
+}
}
diff --git
a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/CodeSeriesSelector.java
b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/CodeSeriesSelector.java
index fbc706a..a959a3c 100644
---
a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/CodeSeriesSelector.java
+++
b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/CodeSeriesSelector.java
@@ -17,8 +17,6 @@
package org.apache.jmeter.report.processor.graph;
-import java.util.Arrays;
-
import org.apache.jmeter.report.core.Sample;
/**
@@ -38,7 +36,6 @@ public class CodeSeriesSelector extends
AbstractSeriesSelector {
*/
@Override
public Iterable select(Sample sample) {
-return Arrays.asList(sample.getResponseCode());
+return withDefaultIfEmpty(sample.getResponseCode(), "EMPTY_RES_CODE");
//$NON-NLS-1$
}
-
}
diff --git
a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/NameSeriesSelector.java
b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/NameSeriesSelector.java
index 63de5e5..490c95b 100644
---
a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/NameSeriesSelector.java
+++
b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/NameSeriesSelector.java
@@ -17,8 +17,6 @@
package org.apache.jmeter.report.processor.graph;
-import java.util.Arrays;
-
import org.apache.jmeter.report.core.Sample;
/**
@@ -44,7 +42,7 @@ public class NameSeriesSelector extends
AbstractSeriesSelector {
*/
@Override
public Iterable select(Sample sample) {
-return Arrays.asList(sample.getName());
+return withDefaultIfEmpty(sample.getName(), "EMPTY_SERIE_NAME");
//$NON-NLS-1$
}
}
diff --git
a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/StaticSeriesSelector.java
b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/StaticSeriesSelector.java
index 89f3360..1f94150 100644
---
a/src/core/src/main/java/org/apache/jmeter/report/processor/graph/StaticSeriesSelector.java
+++
b/src/core/src/main/java/org/apache/jmeter/report/processor/graph/StaticSeriesSelector.java
@@ -17,8 +17,6 @@
package org.apache.jmeter.report.processor.graph;
-import java.util.Arrays;
-
import org.apache.jmeter.report.core.Sample;
/**
@@ -58,7 +56,7 @@ public class StaticSeriesSelector extends
AbstractSeriesSelector {
*/
@Override
public Iterable select(Sample sample) {
-return Arrays.asList(seriesName);
+return withDefaultIfEmpty(sample.getName(), "EMPTY_SERIE_NAME");
//$NON-NLS-1$
}
}
diff --git a/xdocs/c
[jmeter] branch master updated: Upgrade darklaf to fix bug 64510, 64543
This is an automated email from the ASF dual-hosted git repository. pmouawad 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 1cba228 Upgrade darklaf to fix bug 64510, 64543 1cba228 is described below commit 1cba22842196d30df5d554d5a6bb846404f327ce Author: pmouawad AuthorDate: Mon Jun 22 08:51:04 2020 +0200 Upgrade darklaf to fix bug 64510, 64543 --- gradle.properties | 2 +- xdocs/changes.xml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 19068da..91b3973 100644 --- a/gradle.properties +++ b/gradle.properties @@ -67,7 +67,7 @@ commons-math3.version=3.6.1 commons-net.version=3.6 commons-pool2.version=2.8.0 commons-text.version=1.8 -darklaf.version=2.1.1 +darklaf.version=2.3.0 dec.version=0.1.2 dnsjava.version=2.1.9 equalsverifier.version=3.1.13 diff --git a/xdocs/changes.xml b/xdocs/changes.xml index 2e31684..4e331fd 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -118,6 +118,8 @@ Summary 64454More precise error message, when no datasource value can be found in JDBC sampler 64440Log exeptions reported via JMeterUtils#reportToUser even when in GUI mode 591Remove deprecated sudo flag from travis file. Deng Liming (liming.d.pro at gmail.com) +591Remove deprecated sudo flag from travis file. .Deng Liming (liming.d.pro at gmail.com) +Updated Darklaf to 2.3.0 (from 2.1.1) 596Use neutral words in documentation 63809557Updated commons-collections to 4.4 (from 3.2.2) while keeping the jars for the old commons-collections 3.x for compatibility 598Add another option for creating diffs to the building page. Contributed by jmetertea (github.com/jmetertea)
[jmeter] branch master updated: Upgrade darklaf to fix bug 64510, 64543
This is an automated email from the ASF dual-hosted git repository. pmouawad 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 1cba228 Upgrade darklaf to fix bug 64510, 64543 1cba228 is described below commit 1cba22842196d30df5d554d5a6bb846404f327ce Author: pmouawad AuthorDate: Mon Jun 22 08:51:04 2020 +0200 Upgrade darklaf to fix bug 64510, 64543 --- gradle.properties | 2 +- xdocs/changes.xml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 19068da..91b3973 100644 --- a/gradle.properties +++ b/gradle.properties @@ -67,7 +67,7 @@ commons-math3.version=3.6.1 commons-net.version=3.6 commons-pool2.version=2.8.0 commons-text.version=1.8 -darklaf.version=2.1.1 +darklaf.version=2.3.0 dec.version=0.1.2 dnsjava.version=2.1.9 equalsverifier.version=3.1.13 diff --git a/xdocs/changes.xml b/xdocs/changes.xml index 2e31684..4e331fd 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -118,6 +118,8 @@ Summary 64454More precise error message, when no datasource value can be found in JDBC sampler 64440Log exeptions reported via JMeterUtils#reportToUser even when in GUI mode 591Remove deprecated sudo flag from travis file. Deng Liming (liming.d.pro at gmail.com) +591Remove deprecated sudo flag from travis file. .Deng Liming (liming.d.pro at gmail.com) +Updated Darklaf to 2.3.0 (from 2.1.1) 596Use neutral words in documentation 63809557Updated commons-collections to 4.4 (from 3.2.2) while keeping the jars for the old commons-collections 3.x for compatibility 598Add another option for creating diffs to the building page. Contributed by jmetertea (github.com/jmetertea)
[jmeter] branch master updated: Upgrade darklaf to fix bug 64510, 64543
This is an automated email from the ASF dual-hosted git repository. pmouawad 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 1cba228 Upgrade darklaf to fix bug 64510, 64543 1cba228 is described below commit 1cba22842196d30df5d554d5a6bb846404f327ce Author: pmouawad AuthorDate: Mon Jun 22 08:51:04 2020 +0200 Upgrade darklaf to fix bug 64510, 64543 --- gradle.properties | 2 +- xdocs/changes.xml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 19068da..91b3973 100644 --- a/gradle.properties +++ b/gradle.properties @@ -67,7 +67,7 @@ commons-math3.version=3.6.1 commons-net.version=3.6 commons-pool2.version=2.8.0 commons-text.version=1.8 -darklaf.version=2.1.1 +darklaf.version=2.3.0 dec.version=0.1.2 dnsjava.version=2.1.9 equalsverifier.version=3.1.13 diff --git a/xdocs/changes.xml b/xdocs/changes.xml index 2e31684..4e331fd 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -118,6 +118,8 @@ Summary 64454More precise error message, when no datasource value can be found in JDBC sampler 64440Log exeptions reported via JMeterUtils#reportToUser even when in GUI mode 591Remove deprecated sudo flag from travis file. Deng Liming (liming.d.pro at gmail.com) +591Remove deprecated sudo flag from travis file. .Deng Liming (liming.d.pro at gmail.com) +Updated Darklaf to 2.3.0 (from 2.1.1) 596Use neutral words in documentation 63809557Updated commons-collections to 4.4 (from 3.2.2) while keeping the jars for the old commons-collections 3.x for compatibility 598Add another option for creating diffs to the building page. Contributed by jmetertea (github.com/jmetertea)
[jmeter] branch master updated: Upgrade darklaf to fix bug 64510, 64543
This is an automated email from the ASF dual-hosted git repository. pmouawad 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 1cba228 Upgrade darklaf to fix bug 64510, 64543 1cba228 is described below commit 1cba22842196d30df5d554d5a6bb846404f327ce Author: pmouawad AuthorDate: Mon Jun 22 08:51:04 2020 +0200 Upgrade darklaf to fix bug 64510, 64543 --- gradle.properties | 2 +- xdocs/changes.xml | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 19068da..91b3973 100644 --- a/gradle.properties +++ b/gradle.properties @@ -67,7 +67,7 @@ commons-math3.version=3.6.1 commons-net.version=3.6 commons-pool2.version=2.8.0 commons-text.version=1.8 -darklaf.version=2.1.1 +darklaf.version=2.3.0 dec.version=0.1.2 dnsjava.version=2.1.9 equalsverifier.version=3.1.13 diff --git a/xdocs/changes.xml b/xdocs/changes.xml index 2e31684..4e331fd 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -118,6 +118,8 @@ Summary 64454More precise error message, when no datasource value can be found in JDBC sampler 64440Log exeptions reported via JMeterUtils#reportToUser even when in GUI mode 591Remove deprecated sudo flag from travis file. Deng Liming (liming.d.pro at gmail.com) +591Remove deprecated sudo flag from travis file. .Deng Liming (liming.d.pro at gmail.com) +Updated Darklaf to 2.3.0 (from 2.1.1) 596Use neutral words in documentation 63809557Updated commons-collections to 4.4 (from 3.2.2) while keeping the jars for the old commons-collections 3.x for compatibility 598Add another option for creating diffs to the building page. Contributed by jmetertea (github.com/jmetertea)
[jmeter] branch master updated: Revert to darklaf 2.1.1 as 2.2.x break Guis that use GroupLayout
This is an automated email from the ASF dual-hosted git repository. pmouawad 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 23776e4 Revert to darklaf 2.1.1 as 2.2.x break Guis that use GroupLayout 23776e4 is described below commit 23776e4e87302681e4ac79b4e71b0844cdd54ca1 Author: pmouawad AuthorDate: Sat Jun 13 18:50:30 2020 +0200 Revert to darklaf 2.1.1 as 2.2.x break Guis that use GroupLayout --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 94ac714..7ce1683 100644 --- a/gradle.properties +++ b/gradle.properties @@ -66,7 +66,7 @@ commons-math3.version=3.6.1 commons-net.version=3.6 commons-pool2.version=2.8.0 commons-text.version=1.8 -darklaf.version=2.2.1 +darklaf.version=2.1.1 dec.version=0.1.2 dnsjava.version=2.1.9 equalsverifier.version=3.1.13
[jmeter] branch master updated: Updated Darklaf to 2.2.1 (from 2.1.1)
This is an automated email from the ASF dual-hosted git repository. pmouawad 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 44a634d Updated Darklaf to 2.2.1 (from 2.1.1) 44a634d is described below commit 44a634ddbb217a167d5570ad2d535987c20ff965 Author: pmouawad AuthorDate: Sun Jun 7 11:01:41 2020 +0200 Updated Darklaf to 2.2.1 (from 2.1.1) --- gradle.properties | 2 +- xdocs/changes.xml | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 7ce1683..94ac714 100644 --- a/gradle.properties +++ b/gradle.properties @@ -66,7 +66,7 @@ commons-math3.version=3.6.1 commons-net.version=3.6 commons-pool2.version=2.8.0 commons-text.version=1.8 -darklaf.version=2.1.1 +darklaf.version=2.2.1 dec.version=0.1.2 dnsjava.version=2.1.9 equalsverifier.version=3.1.13 diff --git a/xdocs/changes.xml b/xdocs/changes.xml index 1ea0a7d..f2c8db3 100644 --- a/xdocs/changes.xml +++ b/xdocs/changes.xml @@ -117,6 +117,7 @@ Summary 64454More precise error message, when no datasource value can be found in JDBC sampler 64440Log exeptions reported via JMeterUtils#reportToUser even when in GUI mode 591Remove deprecated sudo flag from travis file. .Deng Liming (liming.d.pro at gmail.com) +Updated Darklaf to 2.2.1 (from 2.1.1)
[jmeter] branch master updated: Fix documentation: sampleresult.timestamp.start is false by default
This is an automated email from the ASF dual-hosted git repository. pmouawad 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 9f3cc5f Fix documentation: sampleresult.timestamp.start is false by default 9f3cc5f is described below commit 9f3cc5f15c495f3867f2c1f68ce85ebd87b40b57 Author: pmouawad AuthorDate: Sat Jun 6 22:06:55 2020 +0200 Fix documentation: sampleresult.timestamp.start is false by default --- xdocs/usermanual/properties_reference.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xdocs/usermanual/properties_reference.xml b/xdocs/usermanual/properties_reference.xml index d830737..2674bbb 100644 --- a/xdocs/usermanual/properties_reference.xml +++ b/xdocs/usermanual/properties_reference.xml @@ -727,7 +727,7 @@ JMETER-SERVER Save the start time stamp instead of the end. This also affects the timestamp stored in result files. -Defaults to: true +Defaults to: false Whether to use System.nanoTime() - otherwise only use System.currentTimeMillis().
[jmeter] branch master updated: Show how to setup rotating logs
This is an automated email from the ASF dual-hosted git repository.
pmouawad 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 c06f730 Show how to setup rotating logs
c06f730 is described below
commit c06f73088924b45cf7fc54b5e27c8483a2f9c58a
Author: pmouawad
AuthorDate: Sat Jun 6 22:00:20 2020 +0200
Show how to setup rotating logs
---
bin/log4j2.xml | 20
1 file changed, 16 insertions(+), 4 deletions(-)
diff --git a/bin/log4j2.xml b/bin/log4j2.xml
index e0a1adb..47b012f 100644
--- a/bin/log4j2.xml
+++ b/bin/log4j2.xml
@@ -19,11 +19,23 @@
-
+
+
-
-%d %p %c{1.}: %m%n
-
+
+%d %p %c{1.}: %m%n
+
[jmeter] branch master updated: Bug 64499 - Exiting JMeter when "jmeterengine.stopfail.system.exit=true" takes too much time if threads are not stopped
This is an automated email from the ASF dual-hosted git repository.
pmouawad 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 0318c50 Bug 64499 - Exiting JMeter when
"jmeterengine.stopfail.system.exit=true" takes too much time if threads are not
stopped
0318c50 is described below
commit 0318c50a8a55d5be533a9150885e2facf04358a7
Author: pmouawad
AuthorDate: Sat Jun 6 21:57:52 2020 +0200
Bug 64499 - Exiting JMeter when "jmeterengine.stopfail.system.exit=true"
takes too much time if threads are not stopped
---
.../java/org/apache/jmeter/engine/StandardJMeterEngine.java | 7 ---
.../src/main/java/org/apache/jmeter/threads/ThreadGroup.java | 12 +---
xdocs/changes.xml| 1 +
3 files changed, 14 insertions(+), 6 deletions(-)
diff --git
a/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java
b/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java
index 8883f73..62ed775 100644
--- a/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java
+++ b/src/core/src/main/java/org/apache/jmeter/engine/StandardJMeterEngine.java
@@ -289,12 +289,13 @@ public class StandardJMeterEngine implements
JMeterEngine, Runnable {
* @return boolean true if all threads of all Thread Groups stopped
*/
private boolean verifyThreadsStopped() {
-boolean stoppedAll = true;
// ConcurrentHashMap does not need synch. here
for (AbstractThreadGroup threadGroup : groups) {
-stoppedAll = stoppedAll && threadGroup.verifyThreadsStopped();
+if(!threadGroup.verifyThreadsStopped()) {
+return false;
+}
}
-return stoppedAll;
+return true;
}
/**
diff --git a/src/core/src/main/java/org/apache/jmeter/threads/ThreadGroup.java
b/src/core/src/main/java/org/apache/jmeter/threads/ThreadGroup.java
index 5c5f56e..8a376c7 100644
--- a/src/core/src/main/java/org/apache/jmeter/threads/ThreadGroup.java
+++ b/src/core/src/main/java/org/apache/jmeter/threads/ThreadGroup.java
@@ -452,10 +452,16 @@ public class ThreadGroup extends AbstractThreadGroup {
if (delayedStartup) {
stoppedAll = verifyThreadStopped(threadStarter);
}
-for (Thread t : allThreads.values()) {
-stoppedAll = stoppedAll && verifyThreadStopped(t);
+if(stoppedAll) {
+for (Thread t : allThreads.values()) {
+if(!verifyThreadStopped(t)) {
+return false;
+}
+}
+return true;
+} else {
+return false;
}
-return stoppedAll;
}
/**
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 6154970..1ea0a7d 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -162,6 +162,7 @@ Summary
General
64448User Defined Variable Duplication in Right Click
Context Menu
+64499Exiting JMeter when
jmeterengine.stopfail.system.exit=true takes too much time if
threads are not stopped
[jmeter] branch master updated: Bug 64448 - User Defined Variable Duplication in Right Click Context Menu
This is an automated email from the ASF dual-hosted git repository.
pmouawad 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 a0e132e Bug 64448 - User Defined Variable Duplication in Right Click
Context Menu
a0e132e is described below
commit a0e132e59c820858225e58a5e6f1f091c60f100d
Author: pmouawad
AuthorDate: Sat Jun 6 11:27:35 2020 +0200
Bug 64448 - User Defined Variable Duplication in Right Click Context
Menu
---
src/core/src/main/java/org/apache/jmeter/config/gui/ArgumentsPanel.java | 2 ++
.../java/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java| 2 --
xdocs/changes.xml | 1 +
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git
a/src/core/src/main/java/org/apache/jmeter/config/gui/ArgumentsPanel.java
b/src/core/src/main/java/org/apache/jmeter/config/gui/ArgumentsPanel.java
index d3a0dcd..f71a812 100644
--- a/src/core/src/main/java/org/apache/jmeter/config/gui/ArgumentsPanel.java
+++ b/src/core/src/main/java/org/apache/jmeter/config/gui/ArgumentsPanel.java
@@ -44,6 +44,7 @@ import javax.swing.ListSelectionModel;
import org.apache.commons.lang3.StringUtils;
import org.apache.jmeter.config.Argument;
import org.apache.jmeter.config.Arguments;
+import org.apache.jmeter.gui.TestElementMetadata;
import org.apache.jmeter.gui.util.HeaderAsPropertyRenderer;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.testelement.property.JMeterProperty;
@@ -58,6 +59,7 @@ import org.apache.jorphan.reflect.Functor;
* for some other component.
*
*/
+@TestElementMetadata(labelResource = "user_defined_variables")
public class ArgumentsPanel extends AbstractConfigGui implements
ActionListener {
private static final long serialVersionUID = 240L;
diff --git
a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java
b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java
index 5451860..f087afe 100644
---
a/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java
+++
b/src/protocol/http/src/main/java/org/apache/jmeter/protocol/http/gui/HTTPArgumentsPanel.java
@@ -28,7 +28,6 @@ import org.apache.commons.lang3.StringUtils;
import org.apache.jmeter.config.Argument;
import org.apache.jmeter.config.Arguments;
import org.apache.jmeter.config.gui.ArgumentsPanel;
-import org.apache.jmeter.gui.TestElementMetadata;
import org.apache.jmeter.protocol.http.util.HTTPArgument;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.testelement.property.JMeterProperty;
@@ -42,7 +41,6 @@ import org.apache.jorphan.reflect.Functor;
* These have names and values, as well as check-boxes to determine whether or
not to
* include the "=" sign in the output and whether or not to encode the output.
*/
-@TestElementMetadata(labelResource = "user_defined_variables")
public class HTTPArgumentsPanel extends ArgumentsPanel {
private static final long serialVersionUID = 240L;
diff --git a/xdocs/changes.xml b/xdocs/changes.xml
index 5019d59..6154970 100644
--- a/xdocs/changes.xml
+++ b/xdocs/changes.xml
@@ -161,6 +161,7 @@ Summary
General
+64448User Defined Variable Duplication in Right Click
Context Menu
[jmeter] branch master updated: Update neo4j-java-driver from 1.7.5 to 4.0.1 (#594)
This is an automated email from the ASF dual-hosted git repository.
pmouawad 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 cc499d7 Update neo4j-java-driver from 1.7.5 to 4.0.1 (#594)
cc499d7 is described below
commit cc499d7aa16e07ca4eb8976d14985cdbb7193110
Author: Michael Weidmann <37302540+michaelweidm...@users.noreply.github.com>
AuthorDate: Tue May 26 14:47:58 2020 +0200
Update neo4j-java-driver from 1.7.5 to 4.0.1 (#594)
---
checksum.xml | 1 +
gradle.properties | 2 +-
src/licenses/licenses/reactive-streams/LICENSE | 8
.../protocol/bolt/config/BoltConnectionElement.java| 6 +++---
.../jmeter/protocol/bolt/sampler/BoltSampler.java | 18 +-
.../protocol/bolt/sampler/BoltSamplerSpec.groovy | 16
xdocs/changes.xml | 1 +
7 files changed, 31 insertions(+), 21 deletions(-)
diff --git a/checksum.xml b/checksum.xml
index a713c08..e2b2a15 100644
--- a/checksum.xml
+++ b/checksum.xml
@@ -137,6 +137,7 @@
+
diff --git a/gradle.properties b/gradle.properties
index 27532dd..5909169 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -102,7 +102,7 @@ mail.version=1.5.0-b01
miglayout.version=5.2
mina-core.version=2.0.19
mongo-java-driver.version=2.11.3
-neo4j-java-driver.version=1.7.5
+neo4j-java-driver.version=4.0.1
objenesis.version=2.6
oro.version=2.0.8
ph-commons.version=9.4.1
diff --git a/src/licenses/licenses/reactive-streams/LICENSE
b/src/licenses/licenses/reactive-streams/LICENSE
new file mode 100644
index 000..eadae05
--- /dev/null
+++ b/src/licenses/licenses/reactive-streams/LICENSE
@@ -0,0 +1,8 @@
+Licensed under Public Domain (CC0)
+
+To the extent possible under law, the person who associated CC0 with
+this code has waived all copyright and related or neighboring
+rights to this code.
+
+You should have received a copy of the CC0 legalcode along with this
+work. If not, see <http://creativecommons.org/publicdomain/zero/1.0/>.
\ No newline at end of file
diff --git
a/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/config/BoltConnectionElement.java
b/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/config/BoltConnectionElement.java
index 8d3722e..c3211dc 100644
---
a/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/config/BoltConnectionElement.java
+++
b/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/config/BoltConnectionElement.java
@@ -25,9 +25,9 @@ import org.apache.jmeter.testelement.AbstractTestElement;
import org.apache.jmeter.testelement.TestStateListener;
import org.apache.jmeter.threads.JMeterContextService;
import org.apache.jmeter.threads.JMeterVariables;
-import org.neo4j.driver.v1.AuthTokens;
-import org.neo4j.driver.v1.Driver;
-import org.neo4j.driver.v1.GraphDatabase;
+import org.neo4j.driver.AuthTokens;
+import org.neo4j.driver.Driver;
+import org.neo4j.driver.GraphDatabase;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/BoltSampler.java
b/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/BoltSampler.java
index 8bae5b5..1eb2b9c 100644
---
a/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/BoltSampler.java
+++
b/src/protocol/bolt/src/main/java/org/apache/jmeter/protocol/bolt/sampler/BoltSampler.java
@@ -35,12 +35,12 @@ import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.samplers.Sampler;
import org.apache.jmeter.testbeans.TestBean;
import org.apache.jmeter.testelement.TestElement;
-import org.neo4j.driver.v1.Driver;
-import org.neo4j.driver.v1.Record;
-import org.neo4j.driver.v1.Session;
-import org.neo4j.driver.v1.StatementResult;
-import org.neo4j.driver.v1.exceptions.Neo4jException;
-import org.neo4j.driver.v1.summary.ResultSummary;
+import org.neo4j.driver.Driver;
+import org.neo4j.driver.Record;
+import org.neo4j.driver.Result;
+import org.neo4j.driver.Session;
+import org.neo4j.driver.exceptions.Neo4jException;
+import org.neo4j.driver.summary.ResultSummary;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -102,7 +102,7 @@ public class BoltSampler extends AbstractBoltTestElement
implements Sampler, Tes
private String execute(Driver driver, String cypher, Map
params) {
try (Session session = driver.session()) {
-StatementResult statementResult = session.run(cypher, params);
+Result statementResult = session.run(cypher, params);
return response(statementResult);
}
}
@@ -137,10 +137,10 @@ public class BoltSam
[jmeter] branch master updated: docs: clarify how to configure InfluxDB v1 and InfluxDB v2 (#592)
This is an automated email from the ASF dual-hosted git repository. pmouawad 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 3fb8bf1 docs: clarify how to configure InfluxDB v1 and InfluxDB v2 (#592) 3fb8bf1 is described below commit 3fb8bf1546cb286441e541e85b002c04f5a8c5c4 Author: Jakub Bednář AuthorDate: Tue May 26 14:46:41 2020 +0200 docs: clarify how to configure InfluxDB v1 and InfluxDB v2 (#592) --- xdocs/usermanual/realtime-results.xml | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/xdocs/usermanual/realtime-results.xml b/xdocs/usermanual/realtime-results.xml index 6033285..593a808 100644 --- a/xdocs/usermanual/realtime-results.xml +++ b/xdocs/usermanual/realtime-results.xml @@ -143,12 +143,12 @@ In this document we will present the configuration setup to graph and historize InfluxDB configuration - -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: + +Do one of the following to store data sent by the Backend Listener: -jmeter : Used by InfluxDB to store the data sent by the Backend Listener +For InfluxDB 2 setup, create a jmeter https://v2.docs.influxdata.com/v2.0/organizations/buckets/create-bucket/"; target="_blank">bucket +For InfluxDB 1.x setup, create a jmeter database using the https://docs.influxdata.com/influxdb/v1.8/introduction/get-started/"; target="_blank">Influx CLI -You can do it too by using the HTTP API.
