You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2018/07/15 19:20:07 UTC
svn commit: r1835992 - in /jmeter/trunk/src:
components/org/apache/jmeter/extractor/gui/ core/org/apache/jmeter/control/
core/org/apache/jmeter/gui/util/
core/org/apache/jmeter/report/processor/graph/impl/
core/org/apache/jmeter/report/utils/ core/org/...
Author: pmouawad
Date: Sun Jul 15 19:20:07 2018
New Revision: 1835992
URL: http://svn.apache.org/viewvc?rev=1835992&view=rev
Log:
Fix sha1
Update since javadoc tag
Modified:
jmeter/trunk/src/components/org/apache/jmeter/extractor/gui/XPath2ExtractorGui.java
jmeter/trunk/src/core/org/apache/jmeter/control/IteratingController.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/JSyntaxSearchToolBar.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/CustomGraphConsumer.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseCustomGraphGraphConsumer.java
jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/TotalTPSGraphConsumer.java
jmeter/trunk/src/core/org/apache/jmeter/report/utils/MetricUtils.java
jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
jmeter/trunk/src/functions/org/apache/jmeter/functions/AbstractFunctionByKey.java
jmeter/trunk/src/functions/org/apache/jmeter/functions/ThreadGroupName.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/api/auth/DigestParameters.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/DynamicKerberosSchemeFactory.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/DynamicSPNegoSchemeFactory.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/RecorderDialog.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HttpClientDefaultParameters.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/hc/LaxDeflateInputStream.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/hc/LazyLayeredConnectionSocketFactory.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/SlowHCPlainConnectionSocketFactory.java
Modified: jmeter/trunk/src/components/org/apache/jmeter/extractor/gui/XPath2ExtractorGui.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/extractor/gui/XPath2ExtractorGui.java?rev=1835992&r1=1835991&r2=1835992&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/extractor/gui/XPath2ExtractorGui.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/extractor/gui/XPath2ExtractorGui.java Sun Jul 15 19:20:07 2018
@@ -38,7 +38,7 @@ import org.apache.jorphan.gui.JLabeledTe
/**
* GUI for XPath2Extractor class.
- * @since 4.1
+ * @since 5.0
*/
public class XPath2ExtractorGui extends AbstractPostProcessorGui{ // NOSONAR Ignore parents warning
Modified: jmeter/trunk/src/core/org/apache/jmeter/control/IteratingController.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/control/IteratingController.java?rev=1835992&r1=1835991&r2=1835992&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/control/IteratingController.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/control/IteratingController.java Sun Jul 15 19:20:07 2018
@@ -25,7 +25,7 @@ import org.apache.jmeter.util.JMeterUtil
/**
* Identify controller that does iterations
- * @since 4.1
+ * @since 5.0
*/
public interface IteratingController extends LoopIterationListener {
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/JSyntaxSearchToolBar.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/util/JSyntaxSearchToolBar.java?rev=1835992&r1=1835991&r2=1835992&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/gui/util/JSyntaxSearchToolBar.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/util/JSyntaxSearchToolBar.java Sun Jul 15 19:20:07 2018
@@ -36,7 +36,7 @@ import org.fife.ui.rtextarea.SearchEngin
/**
* Search toolbar associated to {@link JSyntaxTextArea}
- * @since 4.1
+ * @since 5.0
*/
public final class JSyntaxSearchToolBar implements ActionListener {
public static final Color LIGHT_RED = new Color(0xFF, 0x80, 0x80);
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/CustomGraphConsumer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/CustomGraphConsumer.java?rev=1835992&r1=1835991&r2=1835992&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/CustomGraphConsumer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/CustomGraphConsumer.java Sun Jul 15 19:20:07 2018
@@ -43,7 +43,7 @@ import org.apache.jmeter.save.CSVSaveSer
* The class CustomGraphConsumer is added by the custom Graphs plugin.
* It provides all the graphs the user defined in user.properties.
*
- * @since 4.1
+ * @since 5.0
*/
public class CustomGraphConsumer extends AbstractOverTimeGraphConsumer implements SampleConsumer{
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseCustomGraphGraphConsumer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseCustomGraphGraphConsumer.java?rev=1835992&r1=1835991&r2=1835992&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseCustomGraphGraphConsumer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/ResponseCustomGraphGraphConsumer.java Sun Jul 15 19:20:07 2018
@@ -32,7 +32,7 @@ import org.apache.jmeter.report.processo
* The class ResponseCustomGraphGraphConsumer provides a graph to visualize mean
* custom value per time period (defined by granularity)
*
- * @since 4.1
+ * @since 5.0
*/
public class ResponseCustomGraphGraphConsumer extends
AbstractOverTimeGraphConsumer {
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/TotalTPSGraphConsumer.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/TotalTPSGraphConsumer.java?rev=1835992&r1=1835991&r2=1835992&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/TotalTPSGraphConsumer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/processor/graph/impl/TotalTPSGraphConsumer.java Sun Jul 15 19:20:07 2018
@@ -37,7 +37,7 @@ import org.apache.jmeter.report.processo
* The class TotalTPSGraphConsumer provides a graph to visualize transactions
* rate per second.
*
- * @since 4.1
+ * @since 5.0
*/
public class TotalTPSGraphConsumer extends AbstractOverTimeGraphConsumer {
Modified: jmeter/trunk/src/core/org/apache/jmeter/report/utils/MetricUtils.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/utils/MetricUtils.java?rev=1835992&r1=1835991&r2=1835992&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/utils/MetricUtils.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/utils/MetricUtils.java Sun Jul 15 19:20:07 2018
@@ -20,7 +20,7 @@ package org.apache.jmeter.report.utils;
import org.apache.commons.lang3.StringUtils;
/**
- * @since 4.1
+ * @since 5.0
*/
public class MetricUtils {
public static final String ASSERTION_FAILED = "Assertion failed"; //$NON-NLS-1$
Modified: jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java?rev=1835992&r1=1835991&r2=1835992&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java Sun Jul 15 19:20:07 2018
@@ -156,7 +156,7 @@ public class SaveService {
private static String fileVersion = ""; // computed from saveservice.properties file// $NON-NLS-1$
// Must match the sha1 checksum of the file saveservice.properties (without newline character),
// used to ensure saveservice.properties and SaveService are updated simultaneously
- static final String FILEVERSION = "0c2f8af0f246d61a8288ad502a6d197a75d4d48a"; // Expected value $NON-NLS-1$
+ static final String FILEVERSION = "e922e4aa06ed9f253d68c13f445d5bfedaccd876"; // Expected value $NON-NLS-1$
private static String fileEncoding = ""; // read from properties file// $NON-NLS-1$
Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/AbstractFunctionByKey.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/AbstractFunctionByKey.java?rev=1835992&r1=1835991&r2=1835992&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/AbstractFunctionByKey.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/AbstractFunctionByKey.java Sun Jul 15 19:20:07 2018
@@ -26,7 +26,7 @@ import org.apache.jmeter.engine.util.Com
*
* Abstract Function initialized by key and parameters count
*
- * @since 4.1
+ * @since 5.0
*
*/
abstract class AbstractFunctionByKey extends AbstractFunction {
Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/ThreadGroupName.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/ThreadGroupName.java?rev=1835992&r1=1835991&r2=1835992&view=diff
==============================================================================
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/ThreadGroupName.java (original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/ThreadGroupName.java Sun Jul 15 19:20:07 2018
@@ -29,7 +29,7 @@ import org.apache.jmeter.threads.JMeterC
/**
* Returns Thread Group Name
*
- * @since 4.1
+ * @since 5.0
*/
public class ThreadGroupName extends AbstractFunctionByKey {
private static final String KEY = "__threadGroupName"; //$NON-NLS-1$
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/api/auth/DigestParameters.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/api/auth/DigestParameters.java?rev=1835992&r1=1835991&r2=1835992&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/api/auth/DigestParameters.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/api/auth/DigestParameters.java Sun Jul 15 19:20:07 2018
@@ -22,7 +22,7 @@ package org.apache.jmeter.protocol.http.
* Allows digest customization as per:
* https://en.wikipedia.org/wiki/Digest_access_authentication
*
- * @since 4.1
+ * @since 5.0
*/
public class DigestParameters {
public static final String VARIABLE_NAME = "__jmeter_DP__";
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/DynamicKerberosSchemeFactory.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/DynamicKerberosSchemeFactory.java?rev=1835992&r1=1835991&r2=1835992&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/DynamicKerberosSchemeFactory.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/DynamicKerberosSchemeFactory.java Sun Jul 15 19:20:07 2018
@@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory;
/**
* Extends {@link KerberosSchemeFactory} to provide ability to customize stripPort
* setting in {@link KerberosScheme} based on {@link HttpContext}
- * @since 4.1
+ * @since 5.0
*/
public class DynamicKerberosSchemeFactory extends KerberosSchemeFactory {
static final String CONTEXT_ATTRIBUTE_STRIP_PORT = "__jmeter.K_SP__";
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/DynamicSPNegoSchemeFactory.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/DynamicSPNegoSchemeFactory.java?rev=1835992&r1=1835991&r2=1835992&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/DynamicSPNegoSchemeFactory.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/DynamicSPNegoSchemeFactory.java Sun Jul 15 19:20:07 2018
@@ -29,7 +29,7 @@ import org.slf4j.LoggerFactory;
/**
* Extends {@link SPNegoSchemeFactory} to provide ability to customize stripPort
* setting in {@link SPNegoScheme} based on {@link HttpContext}
- * @since 4.1
+ * @since 5.0
*/
public class DynamicSPNegoSchemeFactory extends SPNegoSchemeFactory {
static final String CONTEXT_ATTRIBUTE_STRIP_PORT = "__jmeter.K_SP__";
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/RecorderDialog.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/RecorderDialog.java?rev=1835992&r1=1835991&r2=1835992&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/RecorderDialog.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/gui/RecorderDialog.java Sun Jul 15 19:20:07 2018
@@ -52,7 +52,7 @@ import org.apache.jmeter.util.JMeterUtil
/**
* Dialog for Recorder
- * @since 4.1
+ * @since 5.0
*/
public class RecorderDialog extends JDialog implements ItemListener, KeyListener, ActionListener { // NOSONAR
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HttpClientDefaultParameters.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HttpClientDefaultParameters.java?rev=1835992&r1=1835991&r2=1835992&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HttpClientDefaultParameters.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HttpClientDefaultParameters.java Sun Jul 15 19:20:07 2018
@@ -32,7 +32,7 @@ import org.slf4j.LoggerFactory;
* Utility class to set up default HttpClient parameters from a file.
*
* Supports Apache HttpClient.
- * @deprecated since 4.1
+ * @deprecated since 5.0
*/
@Deprecated
public class HttpClientDefaultParameters {
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/hc/LaxDeflateInputStream.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/hc/LaxDeflateInputStream.java?rev=1835992&r1=1835991&r2=1835992&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/hc/LaxDeflateInputStream.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/hc/LaxDeflateInputStream.java Sun Jul 15 19:20:07 2018
@@ -31,7 +31,7 @@ import org.apache.http.client.entity.Def
* which seems to be rather frequent
*
* @see <a href="https://bz.apache.org/bugzilla/show_bug.cgi?id=61058">Bugzilla 61058</a>
- * @since 4.1
+ * @since 5.0
*/
public class LaxDeflateInputStream extends DeflateInputStream {
private final boolean relax;
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/hc/LazyLayeredConnectionSocketFactory.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/hc/LazyLayeredConnectionSocketFactory.java?rev=1835992&r1=1835991&r2=1835992&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/hc/LazyLayeredConnectionSocketFactory.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/hc/LazyLayeredConnectionSocketFactory.java Sun Jul 15 19:20:07 2018
@@ -36,7 +36,7 @@ import org.slf4j.LoggerFactory;
/**
* LazyLayeredConnectionSocketFactory that lazily initializes HTTPS Socket Factory
- * @since 4.1
+ * @since 5.0
*/
public final class LazyLayeredConnectionSocketFactory implements LayeredConnectionSocketFactory{
private static final Logger LOG = LoggerFactory.getLogger(LazyLayeredConnectionSocketFactory.class);
Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/SlowHCPlainConnectionSocketFactory.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/SlowHCPlainConnectionSocketFactory.java?rev=1835992&r1=1835991&r2=1835992&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/SlowHCPlainConnectionSocketFactory.java (original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/SlowHCPlainConnectionSocketFactory.java Sun Jul 15 19:20:07 2018
@@ -27,7 +27,7 @@ import org.apache.jmeter.util.SlowSocket
/**
* Apache HttpClient protocol factory to generate "slow" sockets for emulating dial-up modems
- * @since 4.1
+ * @since 5.0
*/
public class SlowHCPlainConnectionSocketFactory extends PlainConnectionSocketFactory {