(jmeter) branch master updated: Fixed grammar
This is an automated email from the ASF dual-hosted git repository.
fschumacher 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 174ba3178f Fixed grammar
174ba3178f is described below
commit 174ba3178f287d2984b1e53004e2c2cee116
Author: David Coomber <47242934+dcoom...@users.noreply.github.com>
AuthorDate: Sun Jun 23 12:53:21 2024 +0200
Fixed grammar
---
src/jorphan/src/main/java/org/apache/jorphan/exec/KeyToolUtils.java | 4 ++--
xdocs/usermanual/component_reference.xml| 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git
a/src/jorphan/src/main/java/org/apache/jorphan/exec/KeyToolUtils.java
b/src/jorphan/src/main/java/org/apache/jorphan/exec/KeyToolUtils.java
index e09387dfeb..cf184c04a1 100644
--- a/src/jorphan/src/main/java/org/apache/jorphan/exec/KeyToolUtils.java
+++ b/src/jorphan/src/main/java/org/apache/jorphan/exec/KeyToolUtils.java
@@ -53,7 +53,7 @@ public class KeyToolUtils {
/** Name of property that can be used to override the default keytool
location */
private static final String KEYTOOL_DIRECTORY = "keytool.directory"; //
$NON-NLS-1$
-private static final String DNAME_INTERMEDIATE_CA_KEY = "cn=JMeter
Intermediate CA for recording (INSTALL ONLY IF ITS YOURS)"; // $NON-NLS-1$
+private static final String DNAME_INTERMEDIATE_CA_KEY = "cn=JMeter
Intermediate CA for recording (INSTALL ONLY IF IT IS YOURS)"; // $NON-NLS-1$
public static final String ROOT_CACERT_CRT_PFX =
"ApacheJMeterTemporaryRootCA"; // $NON-NLS-1$ (do not change)
private static final String ROOT_CACERT_CRT = ROOT_CACERT_CRT_PFX +
".crt"; // $NON-NLS-1$ (Firefox and Windows)
@@ -73,7 +73,7 @@ public class KeyToolUtils {
static {
StringBuilder sb = new StringBuilder();
-sb.append("CN=_ JMeter Root CA for recording (INSTALL ONLY IF ITS
YOURS)"); // $NON-NLS-1$
+sb.append("CN=_ JMeter Root CA for recording (INSTALL ONLY IF IT IS
YOURS)"); // $NON-NLS-1$
String userName = System.getProperty("user.name"); // $NON-NLS-1$
userName = userName.replace('\\','/'); // Backslash is special
(Bugzilla 56178)
addElement(sb, "OU=Username: ", userName); // $NON-NLS-1$
diff --git a/xdocs/usermanual/component_reference.xml
b/xdocs/usermanual/component_reference.xml
index bafe02dbd2..5733903554 100644
--- a/xdocs/usermanual/component_reference.xml
+++ b/xdocs/usermanual/component_reference.xml
@@ -6832,9 +6832,9 @@ As a consequence:
The browser should display a dialogue asking if you want to accept the
certificate or not. For example:
1) The server's name "www.example.com" does not match the
certificate's name
- "_ JMeter Root CA for recording (INSTALL ONLY IF ITS YOURS)".
Somebody may be trying to eavesdrop on you.
-2) The certificate for "_ JMeter Root CA for recording (INSTALL ONLY IF
ITS YOURS)" is signed by the unknown Certificate Authority
- "_ JMeter Root CA for recording (INSTALL ONLY IF ITS YOURS)".
It is not possible to verify that this is a valid certificate.
+ "_ JMeter Root CA for recording (INSTALL ONLY IF IT IS
YOURS)". Somebody may be trying to eavesdrop on you.
+2) The certificate for "_ JMeter Root CA for recording (INSTALL ONLY IF
IT IS YOURS)" is signed by the unknown Certificate Authority
+ "_ JMeter Root CA for recording (INSTALL ONLY IF IT IS
YOURS)". It is not possible to verify that this is a valid certificate.
You will need to accept the certificate in order to allow the JMeter Proxy to
intercept the SSL traffic in order to
record it.
svn commit: r1629926 - in /jmeter/trunk: src/core/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java test/src/org/apache/jmeter/engine/util/TestValueReplacer.java xdocs/changes.xml xdocs/u
Author: fschumacher
Date: Tue Oct 7 16:54:46 2014
New Revision: 1629926
URL: http://svn.apache.org/r1629926
Log:
Bug 57032 - Make regexes in HTTP Script Recorder more useful.
When a regex starts and ends with a paren, it will not be surrounded
by boundary matchers anymore. That way boundary characters can be
included in the match.
Bugzilla Id: 57032
Modified:
jmeter/trunk/src/core/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java
jmeter/trunk/test/src/org/apache/jmeter/engine/util/TestValueReplacer.java
jmeter/trunk/xdocs/changes.xml
jmeter/trunk/xdocs/usermanual/component_reference.xml
Modified:
jmeter/trunk/src/core/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java?rev=1629926&r1=1629925&r2=1629926&view=diff
==
---
jmeter/trunk/src/core/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java
Tue Oct 7 16:54:46 2014
@@ -79,7 +79,7 @@ public class ReplaceFunctionsWithStrings
String value = entry.getValue();
if (regexMatch) {
try {
-pattern = compiler.compile("\\b("+value+")\\b");
+pattern = compiler.compile(constructPattern(value));
input = Util.substitute(pm, pattern,
new StringSubstitution(FUNCTION_REF_PREFIX + key +
FUNCTION_REF_SUFFIX),
input, Util.SUBSTITUTE_ALL);
@@ -92,4 +92,12 @@ public class ReplaceFunctionsWithStrings
}
return new StringProperty(prop.getName(), input);
}
+
+private String constructPattern(String value) {
+if (value.startsWith("(") && value.endsWith(")")) {
+return value;
+}
+ return "\\b(" + value + ")\\b";
+}
+
}
Modified:
jmeter/trunk/test/src/org/apache/jmeter/engine/util/TestValueReplacer.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/engine/util/TestValueReplacer.java?rev=1629926&r1=1629925&r2=1629926&view=diff
==
--- jmeter/trunk/test/src/org/apache/jmeter/engine/util/TestValueReplacer.java
(original)
+++ jmeter/trunk/test/src/org/apache/jmeter/engine/util/TestValueReplacer.java
Tue Oct 7 16:54:46 2014
@@ -47,7 +47,8 @@ public class TestValueReplacer extends J
// The following used to be jacks_password, but the Arguments
class uses
// HashMap for which the order is not defined.
variables.addParameter("password", "his_password");
-variables.addParameter("regex", ".*");
+variables.addParameter("normal_regex", "Hello .*");
+variables.addParameter("bounded_regex", "(<.*>)");
JMeterVariables vars = new JMeterVariables();
vars.put("server", "jakarta.apache.org");
JMeterContextService.getContext().setVariables(vars);
@@ -72,6 +73,25 @@ public class TestValueReplacer extends J
assertEquals("${password}", args.get(1).getStringValue());
}
+public void testReverseReplacementXml() throws Exception {
+ValueReplacer replacer = new ValueReplacer(variables);
+
assertTrue(variables.getUserDefinedVariables().containsKey("bounded_regex"));
+
assertTrue(variables.getUserDefinedVariables().containsKey("normal_regex"));
+assertTrue(replacer.containsKey("bounded_regex"));
+assertTrue(replacer.containsKey("normal_regex"));
+TestElement element = new TestPlan();
+element.setProperty(new StringProperty("domain",
"xml"));
+List argsin = new ArrayList();
+argsin.add("xml");
+argsin.add("And I say: Hello World.");
+element.setProperty(new CollectionProperty("args", argsin));
+replacer.reverseReplace(element, true);
+@SuppressWarnings("unchecked")
+List args = (List)
element.getProperty("args").getObjectValue();
+assertEquals("${bounded_regex}",
element.getPropertyAsString("domain"));
+assertEquals("${bounded_regex}", args.get(0).getStringValue());
+}
+
public void testReplace() throws Exception {
ValueReplacer replacer = new ValueReplacer();
replacer.setUserDefinedVariables(variables.getUserD
svn commit: r1629959 - /jmeter/trunk/src/core/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java
Author: fschumacher
Date: Tue Oct 7 19:21:17 2014
New Revision: 1629959
URL: http://svn.apache.org/r1629959
Log:
Add a bit more javadoc to constructPattern
Modified:
jmeter/trunk/src/core/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java
Modified:
jmeter/trunk/src/core/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java?rev=1629959&r1=1629958&r2=1629959&view=diff
==
---
jmeter/trunk/src/core/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/engine/util/ReplaceFunctionsWithStrings.java
Tue Oct 7 19:21:17 2014
@@ -94,9 +94,12 @@ public class ReplaceFunctionsWithStrings
}
/**
+ * Normal regexes will be surrounded by boundary character matches to make
life easier for users.
+ * If a user doesn't want that behaviour, he can prevent the modification
by giving a regex, that
+ * starts and ends with a parenthesis.
*
- * @param value
- * @return regexp if value is not already one
+ * @param value given by user
+ * @return regex surrounded by boundary character matches, if value is not
included in parens
*/
private String constructPattern(String value) {
if (value.startsWith("(") && value.endsWith(")")) {
svn commit: r1629969 - in /jmeter/trunk: test/src/org/apache/jmeter/engine/util/TestValueReplacer.java xdocs/usermanual/component_reference.xml
Author: fschumacher
Date: Tue Oct 7 19:48:04 2014
New Revision: 1629969
URL: http://svn.apache.org/r1629969
Log:
Bug 57032 - Make regexes in HTTP Script Recorder more useful.
Add a note and a testcase about overlapping matches
Bugzilla Id: 57032
Modified:
jmeter/trunk/test/src/org/apache/jmeter/engine/util/TestValueReplacer.java
jmeter/trunk/xdocs/usermanual/component_reference.xml
Modified:
jmeter/trunk/test/src/org/apache/jmeter/engine/util/TestValueReplacer.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/engine/util/TestValueReplacer.java?rev=1629969&r1=1629968&r2=1629969&view=diff
==
--- jmeter/trunk/test/src/org/apache/jmeter/engine/util/TestValueReplacer.java
(original)
+++ jmeter/trunk/test/src/org/apache/jmeter/engine/util/TestValueReplacer.java
Tue Oct 7 19:48:04 2014
@@ -92,6 +92,18 @@ public class TestValueReplacer extends J
assertEquals("${bounded_regex}", args.get(0).getStringValue());
}
+public void testOverlappingMatches() throws Exception {
+TestPlan plan = new TestPlan();
+plan.addParameter("longMatch", "servername");
+plan.addParameter("shortMatch", ".*");
+ValueReplacer replacer = new ValueReplacer(plan);
+TestElement element = new TestPlan();
+element.setProperty(new StringProperty("domain",
"servername.domain"));
+replacer.reverseReplace(element, true);
+String replacedDomain = element.getPropertyAsString("domain");
+assertEquals("${${shortMatch}", replacedDomain);
+}
+
public void testReplace() throws Exception {
ValueReplacer replacer = new ValueReplacer();
replacer.setUserDefinedVariables(variables.getUserDefinedVariables());
Modified: jmeter/trunk/xdocs/usermanual/component_reference.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=1629969&r1=1629968&r2=1629969&view=diff
==
--- jmeter/trunk/xdocs/usermanual/component_reference.xml (original)
+++ jmeter/trunk/xdocs/usermanual/component_reference.xml Tue Oct 7 19:48:04
2014
@@ -6196,6 +6196,10 @@ but retain the trailing / i
Note that the current version of Jakara ORO does not support look-behind -
i.e. (?<=...) or (?<!...).
+Look out for overlapping matchers. For example the value .* as
a regex in a variable named
+regex will partly match a previous replaced variable, which will
result in something like
+${{regex}, which is most probably not the desired result.
+
If there are any problems interpreting any variables as patterns, these are
reported in jmeter.log,
so be sure to check this if UDVs are not working as expected.
svn commit: r1631670 - /jmeter/trunk/src/jorphan/org/apache/jorphan/exec/KeyToolUtils.java
Author: fschumacher
Date: Tue Oct 14 08:17:53 2014
New Revision: 1631670
URL: http://svn.apache.org/r1631670
Log:
Bug 56178 - Return value of String#replace has to be used.
Bugzilla Id: 56178
Modified:
jmeter/trunk/src/jorphan/org/apache/jorphan/exec/KeyToolUtils.java
Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/exec/KeyToolUtils.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/exec/KeyToolUtils.java?rev=1631670&r1=1631669&r2=1631670&view=diff
==
--- jmeter/trunk/src/jorphan/org/apache/jorphan/exec/KeyToolUtils.java
(original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/exec/KeyToolUtils.java Tue Oct
14 08:17:53 2014
@@ -70,7 +70,7 @@ public class KeyToolUtils {
StringBuilder sb = new StringBuilder();
sb.append("CN=_ DO NOT INSTALL unless this is your certificate (JMeter
root CA)"); // $NON-NLS-1$
String userName = System.getProperty("user.name"); // $NON-NLS-1$
-userName.replace('\\','/'); // Backslash is special (Bugzilla 56178)
+userName = userName.replace('\\','/'); // Backslash is special
(Bugzilla 56178)
addElement(sb, "OU=Username: ", userName); // $NON-NLS-1$
addElement(sb, "C=", System.getProperty("user.country")); //
$NON-NLS-1$ $NON-NLS-2$
DNAME_ROOT_CA_KEY = sb.toString();
svn commit: r1631689 - /jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellClient.java
Author: fschumacher
Date: Tue Oct 14 09:09:29 2014
New Revision: 1631689
URL: http://svn.apache.org/r1631689
Log:
Bug 57084 - BeanShellClient: Close socket after usage.
Bugzilla Id: 57084
Modified:
jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellClient.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellClient.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellClient.java?rev=1631689&r1=1631688&r2=1631689&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellClient.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellClient.java Tue Oct
14 09:09:29 2014
@@ -77,6 +77,7 @@ public class BeanShellClient {
sockRead.join(); // wait for script to finish
is.close();
os.close();
+sock.close();
}
private static void sendLine( String line, OutputStream outPipe )
svn commit: r1631695 - /jmeter/trunk/xdocs/changes.xml
Author: fschumacher Date: Tue Oct 14 09:28:54 2014 New Revision: 1631695 URL: http://svn.apache.org/r1631695 Log: Mention fixes for bugzilla ids 57084 and 56178 Modified: jmeter/trunk/xdocs/changes.xml Modified: jmeter/trunk/xdocs/changes.xml URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1631695&r1=1631694&r2=1631695&view=diff == --- jmeter/trunk/xdocs/changes.xml (original) +++ jmeter/trunk/xdocs/changes.xml Tue Oct 14 09:28:54 2014 @@ -333,6 +333,8 @@ for details on configuring this componen 57083 - simplified the CachedResourceMode enum. Contributed by Graham Russel (graham at ham1.co.uk) 57082 - ComboStringEditor : Added hashCode to an inner class which overwrote equals. Contributed by Graham Russel (graham at ham1.co.uk) 57081 - Updating checkstyle to only check for tabs in java files (and not images!). Contributed by Graham Russel (graham at ham1.co.uk) +56178 - Really replace backslashes in user name before generating proxy certificate. Contributed by Graham Russel (graham at ham1.co.uk) +57084 - Close socket after usage in BeahShellClient. Contributed by Graham Russel (graham at ham1.co.uk) Non-functional changes
svn commit: r1639424 - /jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimer.java
Author: fschumacher
Date: Thu Nov 13 18:11:02 2014
New Revision: 1639424
URL: http://svn.apache.org/r1639424
Log:
Bug 57193: CyclicBarrier#await will not throw TimeOutException, so
don't say so in javadocs.
Bugzilla Id: 57193
Modified:
jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimer.java
Modified: jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimer.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimer.java?rev=1639424&r1=1639423&r2=1639424&view=diff
==
--- jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimer.java
(original)
+++ jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimer.java Thu Nov
13 18:11:02 2014
@@ -77,7 +77,6 @@ public class SyncTimer extends AbstractT
* @return int
* @throws InterruptedException
* @throws BrokenBarrierException
- * @throws TimeoutException
* @see java.util.concurrent.CyclicBarrier#await()
*/
public int await() throws InterruptedException, BrokenBarrierException{
svn commit: r1639462 - /jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
Author: fschumacher Date: Thu Nov 13 19:10:39 2014 New Revision: 1639462 URL: http://svn.apache.org/r1639462 Log: Bug 57193: Use unordered list in javadoc instead of handcoded one. Removes wrong "br" tags Bugzilla Id: 57193 Modified: jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java Modified: jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java?rev=1639462&r1=1639461&r2=1639462&view=diff == --- jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java (original) +++ jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java Thu Nov 13 19:10:39 2014 @@ -213,10 +213,12 @@ public class ResultCollector extends Abs } /** - * Decides whether or not to a sample is wanted based on: - * - errorOnly - * - successOnly - * - sample success + * Decides whether or not to a sample is wanted based on: + * + * errorOnly + * successOnly + * sample success + * * Should only be called for single samples. * * @param success is sample successful @@ -229,10 +231,12 @@ public class ResultCollector extends Abs } /** - * Decides whether or not to a sample is wanted based on: - * - errorOnly - * - successOnly - * - sample success + * Decides whether or not to a sample is wanted based on: + * + * errorOnly + * successOnly + * sample success + * * This version is intended to be called by code that loops over many samples; * it is cheaper than fetching the settings each time. * @param success status of sample
svn commit: r1639461 - /jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java
Author: fschumacher
Date: Thu Nov 13 19:09:14 2014
New Revision: 1639461
URL: http://svn.apache.org/r1639461
Log:
Bug 57193: A few javadoc fixes
* Remove self-closing br-tags by replacing them with a
unordered list
* Add links to URL in javadaocs
* Add a return description in javadocs
Bugzilla Id: 57193
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java?rev=1639461&r1=1639460&r2=1639461&view=diff
==
---
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java
(original)
+++
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java
Thu Nov 13 19:09:14 2014
@@ -277,9 +277,11 @@ public class CacheManager extends Config
}
/**
- * Check the cache, and if there is a match, set the headers:
- * If-Modified-Since
- * If-None-Match
+ * Check the cache, and if there is a match, set the headers:
+ *
+ * If-Modified-Since
+ * If-None-Match
+ *
* Commons HttpClient version
* @param url URL to look up in cache
* @param method where to set the headers
@@ -302,11 +304,13 @@ public class CacheManager extends Config
}
/**
- * Check the cache, and if there is a match, set the headers:
- * If-Modified-Since
- * If-None-Match
+ * Check the cache, and if there is a match, set the headers:
+ *
+ * If-Modified-Since
+ * If-None-Match
+ *
* Apache HttpClient version.
- * @param url URL to look up in cache
+ * @param url {@link URL} to look up in cache
* @param request where to set the headers
*/
public void setHeaders(URL url, HttpRequestBase request) {
@@ -327,10 +331,12 @@ public class CacheManager extends Config
}
/**
- * Check the cache, and if there is a match, set the headers:
- * If-Modified-Since
- * If-None-Match
- * @param url URL to look up in cache
+ * Check the cache, and if there is a match, set the headers:
+ *
+ * If-Modified-Since
+ * If-None-Match
+ *
+ * @param url {@link URL} to look up in cache
* @param conn where to set the headers
*/
public void setHeaders(HttpURLConnection conn, URL url) {
@@ -351,8 +357,9 @@ public class CacheManager extends Config
}
/**
- * Check the cache, if the entry has an expires header and the entry has
not expired, return true
- * @param url URL to look up in cache
+ * Check the cache, if the entry has an expires header and the entry has
not expired, return true
+ * @param url {@link URL} to look up in cache
+ * @return true if entry has an expires header and the entry
has not expired, else false
*/
public boolean inCache(URL url) {
CacheEntry entry = getCache().get(url.toString());
svn commit: r1639463 - /jmeter/trunk/src/core/org/apache/jmeter/functions/AbstractFunction.java
Author: fschumacher Date: Thu Nov 13 19:12:07 2014 New Revision: 1639463 URL: http://svn.apache.org/r1639463 Log: Bug 57193: Place @see below the note and remove the break. If @see is above the note, the note will not be shown in javadocs. Removes a broken "br" tag Bugzilla Id: 57193 Modified: jmeter/trunk/src/core/org/apache/jmeter/functions/AbstractFunction.java Modified: jmeter/trunk/src/core/org/apache/jmeter/functions/AbstractFunction.java URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/functions/AbstractFunction.java?rev=1639463&r1=1639462&r2=1639463&view=diff == --- jmeter/trunk/src/core/org/apache/jmeter/functions/AbstractFunction.java (original) +++ jmeter/trunk/src/core/org/apache/jmeter/functions/AbstractFunction.java Thu Nov 13 19:12:07 2014 @@ -51,12 +51,11 @@ public abstract class AbstractFunction i return execute(previousResult, currentSampler); } -/** - * - * @see Function#setParameters(Collection) - * +/** * Note: This is always called even if no parameters are provided * (versions of JMeter after 2.3.1) + * + * @see Function#setParameters(Collection) */ @Override abstract public void setParameters(Collection parameters) throws InvalidVariableException;
svn commit: r1639464 - in /jmeter/trunk/src/core/org/apache/jmeter: gui/UndoHistory.java samplers/StatisticalSampleResult.java threads/SamplePackage.java
Author: fschumacher Date: Thu Nov 13 19:13:43 2014 New Revision: 1639464 URL: http://svn.apache.org/r1639464 Log: Bug 57193: Remove self-closing elements like or . Bugzilla Id: 57193 Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistory.java jmeter/trunk/src/core/org/apache/jmeter/samplers/StatisticalSampleResult.java jmeter/trunk/src/core/org/apache/jmeter/threads/SamplePackage.java Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistory.java URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistory.java?rev=1639464&r1=1639463&r2=1639464&view=diff == --- jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistory.java (original) +++ jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistory.java Thu Nov 13 19:13:43 2014 @@ -125,7 +125,7 @@ public class UndoHistory implements Tree /** * Add tree model copy to the history - * + * * This method relies on the rule that the record in history made AFTER * change has been made to test plan * Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/StatisticalSampleResult.java URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/StatisticalSampleResult.java?rev=1639464&r1=1639463&r2=1639464&view=diff == --- jmeter/trunk/src/core/org/apache/jmeter/samplers/StatisticalSampleResult.java (original) +++ jmeter/trunk/src/core/org/apache/jmeter/samplers/StatisticalSampleResult.java Thu Nov 13 19:13:43 2014 @@ -126,7 +126,7 @@ public class StatisticalSampleResult ext } /** - * Generates the key to be used for aggregating samples as follows: + * Generates the key to be used for aggregating samples as follows: * sampleLabel "-" [threadName|threadGroup] * * N.B. the key should agree with the fixed items that are saved in the sample. Modified: jmeter/trunk/src/core/org/apache/jmeter/threads/SamplePackage.java URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/threads/SamplePackage.java?rev=1639464&r1=1639463&r2=1639464&view=diff == --- jmeter/trunk/src/core/org/apache/jmeter/threads/SamplePackage.java (original) +++ jmeter/trunk/src/core/org/apache/jmeter/threads/SamplePackage.java Thu Nov 13 19:13:43 2014 @@ -31,7 +31,7 @@ import org.apache.jmeter.testelement.Tes import org.apache.jmeter.timers.Timer; /** - * Packages methods related to sample handling. + * Packages methods related to sample handling. * A SamplePackage contains all elements associated to a Sampler: * * SampleListener(s)
svn commit: r1639469 - in /jmeter/trunk/src: components/org/apache/jmeter/visualizers/ core/org/apache/jmeter/control/ core/org/apache/jmeter/util/ functions/org/apache/jmeter/functions/ jorphan/org/a
Author: fschumacher
Date: Thu Nov 13 19:17:21 2014
New Revision: 1639469
URL: http://svn.apache.org/r1639469
Log:
Bug 57193: Escape entities like &, < and >, as they are not
allowed in javadocs. Place code tag around code-fragments in javadoc.
Bugzilla Id: 57193
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/Spline3.java
jmeter/trunk/src/core/org/apache/jmeter/control/Controller.java
jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java
jmeter/trunk/src/core/org/apache/jmeter/control/IfController.java
jmeter/trunk/src/core/org/apache/jmeter/util/SlowSocket.java
jmeter/trunk/src/functions/org/apache/jmeter/functions/EscapeHtml.java
jmeter/trunk/src/jorphan/org/apache/jorphan/io/TextFile.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParser.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSampleResult.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/Utils.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/Spline3.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/Spline3.java?rev=1639469&r1=1639468&r2=1639469&view=diff
==
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/Spline3.java
(original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/Spline3.java Thu
Nov 13 19:17:21 2014
@@ -68,9 +68,9 @@ import org.apache.log.Logger;
*
* Here is a little piece of code showing how to use this class :
*
- * // ... float[] nodes = {3F, 2F, 4F, 1F, 2.5F, 5F, 3F}; Spline3 curve =
+ * // ... float[] nodes = {3F, 2F, 4F, 1F, 2.5F, 5F, 3F}; Spline3 curve =
* new Spline3(nodes); // ... public void paint(Graphics g) { int[] plot =
- * curve.getPlots(); for (int i = 1; i < n; i++) { g.drawLine(i - 1, plot[i -
+ * curve.getPlots(); for (int i = 1; i < n; i++) { g.drawLine(i - 1, plot[i
-
* 1], i, plot[i]); } } // ...
*
*
Modified: jmeter/trunk/src/core/org/apache/jmeter/control/Controller.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/control/Controller.java?rev=1639469&r1=1639468&r2=1639469&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/control/Controller.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/control/Controller.java Thu Nov 13
19:17:21 2014
@@ -24,8 +24,8 @@ import org.apache.jmeter.testelement.Tes
/**
* This interface is used by JMeterThread in the following manner:
- *
- * while (running && (sampler = controller.next()) != null)
+ *
+ * while (running && (sampler = controller.next()) !=
null)
*/
public interface Controller extends TestElement {
/**
Modified: jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java?rev=1639469&r1=1639468&r2=1639469&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java Thu
Nov 13 19:17:21 2014
@@ -45,7 +45,7 @@ import org.apache.log.Logger;
* The main entry point is next(), which is called by by JMeterThread as
follows:
*
*
- * while (running && (sampler = controller.next()) != null)
+ * while (running && (sampler = controller.next()) !=
null)
*
*/
public class GenericController extends AbstractTestElement implements
Controller, Serializable, TestCompilerHelper {
Modified: jmeter/trunk/src/core/org/apache/jmeter/control/IfController.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/control/IfController.java?rev=1639469&r1=1639468&r2=1639469&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/control/IfController.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/control/IfController.java Thu Nov
13 19:17:21 2014
@@ -44,7 +44,7 @@ import org.mozilla.javascript.Scriptable
* Thread-Group (set to loop a number of times or indefinitely,
*... Samplers ... (e.g. Counter )
*... Other Controllers
- *... IfController ( condition set to something like - ${counter}<10)
+ *... IfController ( condition set to something like - ${counter} < 1
svn commit: r1639471 - /jmeter/trunk/src/components/org/apache/jmeter/visualizers/Spline3.java
Author: fschumacher
Date: Thu Nov 13 19:19:43 2014
New Revision: 1639471
URL: http://svn.apache.org/r1639471
Log:
Code-Fragment in javadoc was probably formatted wrongly once upon a time.
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/Spline3.java
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/Spline3.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/Spline3.java?rev=1639471&r1=1639470&r2=1639471&view=diff
==
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/Spline3.java
(original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/Spline3.java Thu
Nov 13 19:19:43 2014
@@ -68,11 +68,18 @@ import org.apache.log.Logger;
*
* Here is a little piece of code showing how to use this class :
*
- * // ... float[] nodes = {3F, 2F, 4F, 1F, 2.5F, 5F, 3F}; Spline3 curve =
- * new Spline3(nodes); // ... public void paint(Graphics g) { int[] plot =
- * curve.getPlots(); for (int i = 1; i < n; i++) { g.drawLine(i - 1, plot[i
-
- * 1], i, plot[i]); } } // ...
- *
+ *
+ * // ...
+ * float[] nodes = {3F, 2F, 4F, 1F, 2.5F, 5F, 3F};
+ * Spline3 curve = new Spline3(nodes);
+ * // ...
+ * public void paint(Graphics g) {
+ *int[] plot = curve.getPlots();
+ *for (int i = 1; i < n; i++) {
+ * g.drawLine(i - 1, plot[i - 1], i, plot[i]);
+ *}
+ * }
+ * // ...
*
*
*/
svn commit: r1639472 - /jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLSchemaAssertion.java
Author: fschumacher
Date: Thu Nov 13 19:20:36 2014
New Revision: 1639472
URL: http://svn.apache.org/r1639472
Log:
Bug 57193: Put on one line, as it will confuse javadoc
otherwise.
Bugzilla Id: 57193
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLSchemaAssertion.java
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLSchemaAssertion.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLSchemaAssertion.java?rev=1639472&r1=1639471&r2=1639472&view=diff
==
---
jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLSchemaAssertion.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/assertions/XMLSchemaAssertion.java
Thu Nov 13 19:20:36 2014
@@ -37,8 +37,8 @@ import org.xml.sax.SAXParseException;
// See Bug 34383
/**
- * XMLSchemaAssertion.java Validate response against an XML Schema author mailto:d.ma...@mdl.com";>Dave Maung
+ * XMLSchemaAssertion.java Validate response against an XML Schema author
+ * mailto:d.ma...@mdl.com";>Dave Maung
*
*/
public class XMLSchemaAssertion extends AbstractTestElement implements
Serializable, Assertion {
svn commit: r1639476 - in /jmeter/trunk/src: core/org/apache/jmeter/testelement/ functions/org/apache/jmeter/functions/
Author: fschumacher
Date: Thu Nov 13 19:23:21 2014
New Revision: 1639476
URL: http://svn.apache.org/r1639476
Log:
Bug 57193: Remove unexpected tags in javadoc
Bugzilla Id: 57193
Modified:
jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedAssertion.java
jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedTestElement.java
jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction.java
jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction2.java
jmeter/trunk/src/functions/org/apache/jmeter/functions/SplitFunction.java
Modified:
jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedAssertion.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedAssertion.java?rev=1639476&r1=1639475&r2=1639476&view=diff
==
---
jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedAssertion.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedAssertion.java
Thu Nov 13 19:23:21 2014
@@ -32,7 +32,6 @@ package org.apache.jmeter.testelement;
* saveScopeSettings()
* showScopeSettings()
*
- *
*/
public abstract class AbstractScopedAssertion extends
AbstractScopedTestElement {
Modified:
jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedTestElement.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedTestElement.java?rev=1639476&r1=1639475&r2=1639476&view=diff
==
---
jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedTestElement.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedTestElement.java
Thu Nov 13 19:23:21 2014
@@ -37,7 +37,6 @@ import org.apache.jmeter.samplers.Sample
* saveScopeSettings()
* showScopeSettings()
*
- *
*/
public abstract class AbstractScopedTestElement extends AbstractTestElement {
Modified:
jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction.java?rev=1639476&r1=1639475&r2=1639476&view=diff
==
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction.java
(original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction.java Thu
Nov 13 19:23:21 2014
@@ -43,7 +43,6 @@ import org.apache.log.Priority;
* throwable message (optional)
* comment (optional)
*
- *
* Returns: - the input string
* @since 2.2
*/
Modified:
jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction2.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction2.java?rev=1639476&r1=1639475&r2=1639476&view=diff
==
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction2.java
(original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/LogFunction2.java
Thu Nov 13 19:23:21 2014
@@ -41,7 +41,6 @@ import org.apache.log.Logger;
* log level (optional; defaults to INFO; or DEBUG if unrecognised; or can
use OUT or ERR)
* throwable message (optional)
*
- *
* Returns: - Empty String (so can be used where return value would be a
nuisance)
* @since 2.2
*/
Modified:
jmeter/trunk/src/functions/org/apache/jmeter/functions/SplitFunction.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter/functions/SplitFunction.java?rev=1639476&r1=1639475&r2=1639476&view=diff
==
--- jmeter/trunk/src/functions/org/apache/jmeter/functions/SplitFunction.java
(original)
+++ jmeter/trunk/src/functions/org/apache/jmeter/functions/SplitFunction.java
Thu Nov 13 19:23:21 2014
@@ -43,7 +43,6 @@ import org.apache.log.Logger;
* Variable name prefix
* String to split on (optional, default is comma)
*
- *
*
* Returns: the input string
*
svn commit: r1639474 - in /jmeter/trunk/src: core/org/apache/jmeter/control/ core/org/apache/jmeter/testelement/property/ core/org/apache/jmeter/threads/ jorphan/org/apache/jorphan/util/
Author: fschumacher
Date: Thu Nov 13 19:22:00 2014
New Revision: 1639474
URL: http://svn.apache.org/r1639474
Log:
Bug 57193: Replace a few more &, < and > with html escaped version for
javadoc
Bugzilla Id: 57193
Modified:
jmeter/trunk/src/core/org/apache/jmeter/control/IfController.java
jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterContextService.java
jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/control/IfController.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/control/IfController.java?rev=1639474&r1=1639473&r2=1639474&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/control/IfController.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/control/IfController.java Thu Nov
13 19:22:00 2014
@@ -44,7 +44,7 @@ import org.mozilla.javascript.Scriptable
* Thread-Group (set to loop a number of times or indefinitely,
*... Samplers ... (e.g. Counter )
*... Other Controllers
- *... IfController ( condition set to something like - ${counter} < 10)
+ *... IfController ( condition set to something like - ${counter} < 10)
* ... statements to perform if condition is true
* ...
*... Other Controllers /Samplers }
Modified:
jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java?rev=1639474&r1=1639473&r2=1639474&view=diff
==
---
jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
Thu Nov 13 19:22:00 2014
@@ -362,8 +362,8 @@ public abstract class AbstractProperty i
* The object can be one of:
*
* JMeterProperty - returned unchanged
- * TestElement => TestElementProperty with the same name
- * Map|Collection => Map|CollectionProperty with the name =
item.hashCode
+ * TestElement => TestElementProperty with the same name
+ * Map|Collection => Map|CollectionProperty with the name =
item.hashCode
*
* @param item object to be turned into a propery
* @return the JMeterProperty
Modified:
jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterContextService.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterContextService.java?rev=1639474&r1=1639473&r2=1639474&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterContextService.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterContextService.java
Thu Nov 13 19:22:00 2014
@@ -135,7 +135,7 @@ public final class JMeterContextService
}
/**
- * Get the total number of threads (>= active)
+ * Get the total number of threads (>= active)
* @return total thread count
*/
public static synchronized int getTotalThreads() {
Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java?rev=1639474&r1=1639473&r2=1639474&view=diff
==
--- jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java
(original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java Thu Nov
13 19:22:00 2014
@@ -379,7 +379,7 @@ public final class JOrphanUtils {
*
* @param target array to scan
* @param search array to search for
- * @param offset starting offset (>=0)
+ * @param offset starting offset (>=0)
* @return true if the search array matches the target at the current
offset
*/
public static boolean startsWith(byte [] target, byte [] search, int
offset){
svn commit: r1639480 - /jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
Author: fschumacher
Date: Thu Nov 13 19:24:20 2014
New Revision: 1639480
URL: http://svn.apache.org/r1639480
Log:
Bug 57193: Correct dt/dd tags in javadoc
Bugzilla Id: 57193
Modified:
jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
Modified:
jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java?rev=1639480&r1=1639479&r2=1639480&view=diff
==
---
jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/GenericTestBeanCustomizer.java
Thu Nov 13 19:24:20 2014
@@ -69,12 +69,12 @@ import org.apache.log.Logger;
* notUndefined: Boolean
* If true, the property should not be left undefined. A default
* attribute must be provided if this is set.
- * notExpression: Boolean
+ * notExpression: Boolean
* If true, the property content should always be constant: JMeter
- * 'expressions' (strings using ${var}, etc...) can't be used.
- * notOther: Boolean
+ * 'expressions' (strings using ${var}, etc...) can't be used.
+ * notOther: Boolean
* If true, the property content must always be one of the tags values or
- * null.
+ * null.
* default: Object
* Initial value for the property's GUI. Must be provided and be non-null
* if notUndefined is set. Must be one of the provided tags (or null) if
svn commit: r1639481 - in /jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms: client/ReceiveSubscriber.java sampler/SubscriberSampler.java
Author: fschumacher
Date: Thu Nov 13 19:25:12 2014
New Revision: 1639481
URL: http://svn.apache.org/r1639481
Log:
Bug 57193: Self-closing br element is not allowed in javadoc
Bugzilla Id: 57193
Modified:
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
Modified:
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java?rev=1639481&r1=1639480&r2=1639481&view=diff
==
---
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java
(original)
+++
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java
Thu Nov 13 19:25:12 2014
@@ -70,7 +70,7 @@ public class ReceiveSubscriber implement
/**
* Constructor takes the necessary JNDI related parameters to create a
* connection and prepare to begin receiving messages.
- *
+ *
* The caller must then invoke {@link #start()} to enable message
reception.
*
* @param useProps if true, use jndi.properties instead of
@@ -101,7 +101,7 @@ public class ReceiveSubscriber implement
/**
* Constructor takes the necessary JNDI related parameters to create a
* connection and create an onMessageListener to prepare to begin
receiving messages.
- *
+ *
* The caller must then invoke {@link #start()} to enable message
reception.
*
* @param queueSize maximum queue size, where a queueSize <=0 means no
limit
Modified:
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java?rev=1639481&r1=1639480&r2=1639481&view=diff
==
---
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
(original)
+++
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
Thu Nov 13 19:25:12 2014
@@ -277,7 +277,7 @@ public class SubscriberSampler extends B
/**
* Initialise the thread-local variables.
- *
+ *
* {@inheritDoc}
*/
@Override
@@ -327,7 +327,7 @@ public class SubscriberSampler extends B
/**
* Close subscriber.
- *
+ *
* {@inheritDoc}
*/
@Override
svn commit: r1639482 - /jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPFileArg.java
Author: fschumacher
Date: Thu Nov 13 19:26:01 2014
New Revision: 1639482
URL: http://svn.apache.org/r1639482
Log:
Bug: 57193: Escape &, < and >, as they are not allowed inside
javadoc
Bugzilla Id: 57193
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPFileArg.java
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPFileArg.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPFileArg.java?rev=1639482&r1=1639481&r2=1639482&view=diff
==
---
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPFileArg.java
(original)
+++
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPFileArg.java
Thu Nov 13 19:26:01 2014
@@ -181,7 +181,7 @@ public class HTTPFileArg extends Abstrac
*
* @return the string demonstration of HTTPFileArg object in this
* format:
- *"path:''|param:''|mimetype:''"
+ *"path:'<PATH>'|param:'<PARAM NAME>'|mimetype:'<MIME
TYPE>'"
*/
@Override
public String toString() {
svn commit: r1639483 - /jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/ParamMask.java
Author: fschumacher
Date: Thu Nov 13 19:27:00 2014
New Revision: 1639483
URL: http://svn.apache.org/r1639483
Log:
Bug 57193: Close code block correctly.
Bugzilla Id: 57193
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/ParamMask.java
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/ParamMask.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/ParamMask.java?rev=1639483&r1=1639482&r2=1639483&view=diff
==
---
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/ParamMask.java
(original)
+++
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/ParamMask.java
Thu Nov 13 19:27:00 2014
@@ -72,7 +72,7 @@ public class ParamMask extends AbstractT
}
/**
- * Set the current value of the long portion of the parameter
+ * Set the current value of the long portion of the parameter
* value to replace. This is usually not used, as the method
* {@link #resetValue} is used to define a policy for the starting value.
*
svn commit: r1639484 - /jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
Author: fschumacher Date: Thu Nov 13 19:27:58 2014 New Revision: 1639484 URL: http://svn.apache.org/r1639484 Log: Bug 57193: Escape &, < and > in javadoc Bugzilla Id: 57193 Modified: jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java Modified: jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java?rev=1639484&r1=1639483&r2=1639484&view=diff == --- jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java (original) +++ jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java Thu Nov 13 19:27:58 2014 @@ -562,7 +562,7 @@ public class JMeterUtils implements Unit /** * This looks for the requested image in the classpath under - * org.apache.jmeter.images. + * org.apache.jmeter.images.<name> * * @param name *Description of Parameter
svn commit: r1639486 - /jmeter/trunk/src/core/org/apache/jmeter/threads/ThreadGroup.java
Author: fschumacher Date: Thu Nov 13 19:28:42 2014 New Revision: 1639486 URL: http://svn.apache.org/r1639486 Log: Bug 57193: Correctly close ol tag in javadoc Bugzilla Id: 57193 Modified: jmeter/trunk/src/core/org/apache/jmeter/threads/ThreadGroup.java Modified: jmeter/trunk/src/core/org/apache/jmeter/threads/ThreadGroup.java URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/threads/ThreadGroup.java?rev=1639486&r1=1639485&r2=1639486&view=diff == --- jmeter/trunk/src/core/org/apache/jmeter/threads/ThreadGroup.java (original) +++ jmeter/trunk/src/core/org/apache/jmeter/threads/ThreadGroup.java Thu Nov 13 19:28:42 2014 @@ -335,7 +335,7 @@ public class ThreadGroup extends Abstrac * stop JMeter thread * interrupt JMeter thread * interrupt underlying thread - * + * * @param threadName String thread name * @param now boolean for stop * @return true if thread stopped
svn commit: r1639491 - /jmeter/trunk/src/jorphan/org/apache/jorphan/exec/SystemCommand.java
Author: fschumacher
Date: Thu Nov 13 19:30:59 2014
New Revision: 1639491
URL: http://svn.apache.org/r1639491
Log:
Bug 57193: Generics can't be used inside of javadoc, so omit them
and describe it textually.
Bugzilla Id: 57193
Modified:
jmeter/trunk/src/jorphan/org/apache/jorphan/exec/SystemCommand.java
Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/exec/SystemCommand.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/exec/SystemCommand.java?rev=1639491&r1=1639490&r2=1639491&view=diff
==
--- jmeter/trunk/src/jorphan/org/apache/jorphan/exec/SystemCommand.java
(original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/exec/SystemCommand.java Thu Nov
13 19:30:59 2014
@@ -116,7 +116,7 @@ public class SystemCommand {
}
/**
- * @param arguments List, not null
+ * @param arguments List of strings, not null
* @return return code
* @throws InterruptedException
* @throws IOException
svn commit: r1639490 - in /jmeter/trunk/src/core/org/apache/jmeter/engine/util: ValueReplacer.java ValueTransformer.java
Author: fschumacher
Date: Thu Nov 13 19:30:02 2014
New Revision: 1639490
URL: http://svn.apache.org/r1639490
Log:
Bug 57193: Add description for @param and @throws in javadoc
Bugzilla Id: 57193
Modified:
jmeter/trunk/src/core/org/apache/jmeter/engine/util/ValueReplacer.java
jmeter/trunk/src/core/org/apache/jmeter/engine/util/ValueTransformer.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/engine/util/ValueReplacer.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/engine/util/ValueReplacer.java?rev=1639490&r1=1639489&r2=1639490&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/engine/util/ValueReplacer.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/engine/util/ValueReplacer.java Thu
Nov 13 19:30:02 2014
@@ -48,6 +48,10 @@ public class ValueReplacer {
public ValueReplacer() {
}
+/**
+ * Constructor which couples the given {@link TestPlan} to this by means
of the user defined variables
+ * @param tp {@link TestPlan} from which we will take the user defined
variables as variables map
+ */
public ValueReplacer(TestPlan tp) {
setUserDefinedVariables(tp.getUserDefinedVariables());
}
@@ -56,6 +60,10 @@ public class ValueReplacer {
return variables.containsKey(k);
}
+/**
+ * Set this {@link ValueReplacer}'s variable map
+ * @param variables Map which stores the variables
+ */
public void setUserDefinedVariables(Map variables) {
this.variables = variables;
}
@@ -64,8 +72,9 @@ public class ValueReplacer {
* Replaces TestElement StringProperties containing functions with their
Function properties equivalent, example:
* ${__time()}_${__threadNum()}_${__machineName()} will become a
FunctionProperty of
* a CompoundVariable containing 3 functions
- * @param el
- * @throws InvalidVariableException
+ * @param el {@link TestElement} in which the values should be replaced
+ * @throws InvalidVariableException when transforming of the variables
goes awry and
+ * the used transformer throws an {@link InvalidVariableException}
*/
public void replaceValues(TestElement el) throws InvalidVariableException {
Collection newProps =
replaceValues(el.propertyIterator(), new
ReplaceStringWithFunctions(masterFunction,
@@ -82,8 +91,9 @@ public class ValueReplacer {
/**
* Transforms strings into variable references
- * @param el
- * @throws InvalidVariableException
+ * @param el {@link TestElement} in which the we will look for strings,
that can be replaced by variable references
+ * @throws InvalidVariableException when transforming of the strings goes
awry and
+ * the used transformer throws an {@link InvalidVariableException}
*/
public void reverseReplace(TestElement el) throws InvalidVariableException
{
Collection newProps =
replaceValues(el.propertyIterator(), new
ReplaceFunctionsWithStrings(masterFunction,
@@ -92,10 +102,11 @@ public class ValueReplacer {
}
/**
- * Transforms strings into variable references using regexp matching if
regexMatch is true
- * @param el
- * @param regexMatch
- * @throws InvalidVariableException
+ * Transforms strings into variable references using regexp matching if
regexMatch is true
+ * @param el {@link TestElement} in which the we will look for strings,
that can be replaced by variable references
+ * @param regexMatch when true variable substitution will be
done in regexp matching mode
+ * @throws InvalidVariableException when transforming of the strings goes
awry and
+ * the used transformer throws an {@link InvalidVariableException}
*/
public void reverseReplace(TestElement el, boolean regexMatch) throws
InvalidVariableException {
Collection newProps =
replaceValues(el.propertyIterator(), new
ReplaceFunctionsWithStrings(masterFunction,
@@ -105,8 +116,9 @@ public class ValueReplacer {
/**
* Replaces ${key} by value extracted from variables if any
- * @param el
- * @throws InvalidVariableException
+ * @param el {@link TestElement} in which values should be replaced
+ * @throws InvalidVariableException when transforming of the variables
goes awry and
+ * the used transformer throws an {@link InvalidVariableException}
*/
public void undoReverseReplace(TestElement el) throws
InvalidVariableException {
Collection newProps =
replaceValues(el.propertyIterator(), new UndoVariableReplacement(masterFunction,
@@ -114,6 +126,11 @@ public class ValueReplacer {
setProperties(el, newProps);
}
+/**
+ * Add a variable to this replacer's variables map
+ * @param name Name of the variable
+ * @param value Value of the variable
+ */
public void addVariable(Str
svn commit: r1639494 - /jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
Author: fschumacher
Date: Thu Nov 13 19:32:13 2014
New Revision: 1639494
URL: http://svn.apache.org/r1639494
Log:
Bug 57193: Add javadoc @param, @return and @throws tags, or fill
them.
Bugzilla Id: 57193
Modified:
jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java?rev=1639494&r1=1639493&r2=1639494&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java Thu Nov 13
19:32:13 2014
@@ -112,6 +112,7 @@ public class JMeterUtils implements Unit
/**
* Gets Perl5Matcher for this thread.
+ * @return the {@link Perl5Matcher} for this thread
*/
public static Perl5Matcher getMatcher() {
return localMatcher.get();
@@ -173,7 +174,7 @@ public class JMeterUtils implements Unit
* default to "org/apache/jmeter/jmeter.properties" from the classpath
*
* c.f. loadProperties
- *
+ * @param file Name of the file from which the JMeter properties should be
loaded
*/
public static void loadJMeterProperties(String file) {
Properties p = new Properties(System.getProperties());
@@ -298,6 +299,7 @@ public class JMeterUtils implements Unit
*
* @param superClass - single class to search for
* @return List of Strings containing discovered class names.
+ * @throws IOException when the used {@link ClassFinder} throws one while
searching for the class
*/
public static List findClassesThatExtend(Class superClass)
throws IOException {
@@ -330,6 +332,7 @@ public class JMeterUtils implements Unit
*
* @param r -
*the upper bound (exclusive)
+ * @return a random int
*/
public static int getRandomInt(int r) {
return rand.nextInt(r);
@@ -589,7 +592,7 @@ public class JMeterUtils implements Unit
/**
* This looks for the requested image in the classpath under
- * org.apache.jmeter.images. , and also sets the description
+ * org.apache.jmeter.images.<name>, and also sets the
description
* of the image, which is useful if the icon is going to be placed
* on the clipboard.
*
@@ -889,6 +892,10 @@ public class JMeterUtils implements Unit
* Sets the selection of the JComboBox to the Object 'name' from the list
in
* namVec.
* NOTUSED?
+ * @param properties not used at the moment
+ * @param combo {@link JComboBox} to work on
+ * @param namVec List of names, which are displayed in combo
+ * @param name Name, that is to be selected. It has to be in
namVec
*/
public static void selJComboBoxItem(Properties properties, JComboBox
combo, Vector namVec, String name) {
int idx = namVec.indexOf(name);
svn commit: r1639495 - /jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/Utils.java
Author: fschumacher
Date: Thu Nov 13 19:34:07 2014
New Revision: 1639495
URL: http://svn.apache.org/r1639495
Log:
Bug 57193: A bit more description of the parameters in javadoc
Bugzilla Id: 57193
Modified:
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/Utils.java
Modified:
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/Utils.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/Utils.java?rev=1639495&r1=1639494&r2=1639495&view=diff
==
--- jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/Utils.java
(original)
+++ jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/Utils.java Thu
Nov 13 19:34:07 2014
@@ -168,6 +168,7 @@ public final class Utils {
return null;
}
}
+
/**
* Obtain the queue connection from the context and factory name.
*
@@ -199,9 +200,9 @@ public final class Utils {
/**
* Set JMS Properties to msg
- * @param msg Message
- * @param map Map
- * @throws JMSException
+ * @param msg Message to operate on
+ * @param map Map of Properties to be set on the message
+ * @throws JMSException when msg throws a {@link
JMSException} while the properties get set
*/
public static void addJMSProperties(Message msg, Map map)
throws JMSException {
if(map == null) {
@@ -227,8 +228,8 @@ public final class Utils {
/**
* Converts {@link Arguments} to {@link JMSProperties} defaulting to
String type
* Used to convert version <= 2.10 test plans
- * @param args {@link Arguments}
- * @return jmsProperties {@link JMSProperties}
+ * @param args {@link Arguments} to be converted
+ * @return jmsProperties The converted {@link JMSProperties}
*/
public static final JMSProperties
convertArgumentsToJmsProperties(Arguments args) {
JMSProperties jmsProperties = new JMSProperties();
svn commit: r1639778 - in /jmeter/trunk/src: components/org/apache/jmeter/extractor/ core/org/apache/jmeter/gui/ core/org/apache/jmeter/gui/action/ core/org/apache/jmeter/gui/tree/ core/org/apache/jme
Author: fschumacher
Date: Fri Nov 14 20:30:33 2014
New Revision: 1639778
URL: http://svn.apache.org/r1639778
Log:
Bug 57193: * Generics won't work in javadoc, so describe the type
textually. * add missing return and throws javadoc statements
Bugzilla Id: 57193
Modified:
jmeter/trunk/src/components/org/apache/jmeter/extractor/Extractor.java
jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java
jmeter/trunk/src/core/org/apache/jmeter/gui/Searchable.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/Searcher.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/UndoCommand.java
jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java
jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TableEditor.java
jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractTestElement.java
jmeter/trunk/src/core/org/apache/jmeter/threads/FindTestElementsUpToRootTraverser.java
jmeter/trunk/src/core/org/apache/jmeter/threads/SamplePackage.java
jmeter/trunk/src/core/org/apache/jmeter/util/XPathUtil.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/SamplerCreator.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/SamplerCreatorFactory.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java
jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/SendMailCommand.java
Modified: jmeter/trunk/src/components/org/apache/jmeter/extractor/Extractor.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/extractor/Extractor.java?rev=1639778&r1=1639777&r2=1639778&view=diff
==
--- jmeter/trunk/src/components/org/apache/jmeter/extractor/Extractor.java
(original)
+++ jmeter/trunk/src/components/org/apache/jmeter/extractor/Extractor.java Fri
Nov 14 20:30:33 2014
@@ -32,7 +32,7 @@ public interface Extractor extends Seria
* @param attribute Attribute name to return
* @param matchNumber Match number
* @param inputString Page or excerpt
- * @param result List results
+ * @param result List of results
* @param found current matches found
* @param cacheKey If not null, the implementation is encouraged to cache
parsing result and use this key as part of cache key
* @return match found updated
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java?rev=1639778&r1=1639777&r2=1639778&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java Fri Nov 14
20:30:33 2014
@@ -766,7 +766,7 @@ public final class GuiPackage implements
/**
*
- * @return List Copy of IStoppable
+ * @return copy of list of {@link Stoppable}s
*/
public List getStoppables() {
ArrayList list = new ArrayList();
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/Searchable.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/Searchable.java?rev=1639778&r1=1639777&r2=1639778&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/gui/Searchable.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/Searchable.java Fri Nov 14
20:30:33 2014
@@ -25,7 +25,7 @@ import java.util.List;
*/
public interface Searchable {
/**
- * @return List of searchable tokens
+ * @return List of searchable tokens
* @throws Exception
*/
List getSearchableTokens()
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/Searcher.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/Searcher.java?rev=1639778&r1=1639777&r2=1639778&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/Searcher.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/Searcher.java Fri Nov 14
20:30:33 2014
@@ -27,7 +27,7 @@ public interface Searcher {
/**
* Implements the search
- * @param textTokens List content to be searched
+ * @param textTokens List of content to be searched
* @return true if search on textTokens is successful
*/
boolean search(List textTokens);
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/UndoCommand.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/UndoCom
svn commit: r1639793 - in /jmeter/trunk/src: core/org/apache/jmeter/gui/UndoHistory.java core/org/apache/jmeter/gui/action/RawTextSearcher.java protocol/http/org/apache/jmeter/protocol/http/util/acces
Author: fschumacher
Date: Fri Nov 14 21:38:50 2014
New Revision: 1639793
URL: http://svn.apache.org/r1639793
Log:
Bug 57193: Add description for param and return attributes in
javadoc.
Bugzilla Id: 57193
Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistory.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/RawTextSearcher.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistory.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistory.java?rev=1639793&r1=1639792&r2=1639793&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistory.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistory.java Fri Nov 14
21:38:50 2014
@@ -257,7 +257,7 @@ public class UndoHistory implements Tree
/**
* Record the changes in the node as the undo step
*
- * @param tme
+ * @param tme {@link TreeModelEvent} with event details
*/
@Override
public void treeNodesChanged(TreeModelEvent tme) {
@@ -270,7 +270,7 @@ public class UndoHistory implements Tree
/**
* Record adding nodes as the undo step
*
- * @param tme
+ * @param tme {@link TreeModelEvent} with event details
*/
@Override
public void treeNodesInserted(TreeModelEvent tme) {
@@ -283,7 +283,7 @@ public class UndoHistory implements Tree
/**
* Record deleting nodes as the undo step
*
- * @param tme
+ * @param tme {@link TreeModelEvent} with event details
*/
@Override
public void treeNodesRemoved(TreeModelEvent tme) {
@@ -295,7 +295,7 @@ public class UndoHistory implements Tree
/**
* Record some other change
*
- * @param tme
+ * @param tme {@link TreeModelEvent} with event details
*/
@Override
public void treeStructureChanged(TreeModelEvent tme) {
@@ -352,7 +352,7 @@ public class UndoHistory implements Tree
/**
* Register HistoryListener
- * @param listener
+ * @param listener to add to our listeners
*/
public void registerHistoryListener(HistoryListener listener) {
listeners.add(listener);
Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/action/RawTextSearcher.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/RawTextSearcher.java?rev=1639793&r1=1639792&r2=1639793&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/RawTextSearcher.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/RawTextSearcher.java Fri
Nov 14 21:38:50 2014
@@ -68,8 +68,8 @@ public class RawTextSearcher implements
/**
* Returns true if searchedTextLowerCase is in value
- * @param value
- * @param searchedTextLowerCase
+ * @param value string in which the search will be done
+ * @param searchedTextLowerCase string which will be searched for
* @return true if searchedTextLowerCase is in value
*/
protected boolean testField(String value, String searchedTextLowerCase) {
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java?rev=1639793&r1=1639792&r2=1639793&view=diff
==
---
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java
(original)
+++
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java
Fri Nov 14 21:38:50 2014
@@ -139,7 +139,7 @@ public class TCLogParser implements LogP
/**
* by default decode is set to true. if the parameters shouldn't be
* decoded, call the method with false
- * @param decodeparams
+ * @param decodeparams flag whether parameters should be decoded
*/
public void setDecodeParameterValues(boolean decodeparams) {
this.decode = decodeparams;
@@ -147,7 +147,7 @@ public class TCLogParser implements LogP
/**
* decode the parameter values is to true by default
- * @return if paramter values should be decoded
+ * @return true if parameter values should be decoded,
false otherwise
*/
public boolean decodeParameterValue() {
return this.decode;
@@ -166,10 +166,10 @@ public class TCLogParser implements LogP
/**
* Use the filter to include/exclude files in the access logs. This is
- * provided as a convienance and reduce the need to spend hours cleaning up
+ * provided as a convenience and reduce the need to
svn commit: r1640423 - in /jmeter/trunk/src: core/org/apache/jmeter/functions/ core/org/apache/jmeter/gui/ core/org/apache/jmeter/gui/action/ core/org/apache/jmeter/gui/util/ reports/org/apache/jmeter
Author: fschumacher
Date: Tue Nov 18 20:49:24 2014
New Revision: 1640423
URL: http://svn.apache.org/r1640423
Log:
Bug 57193: Add param and return tags to javadoc
Bugzilla Id: 57193
Modified:
jmeter/trunk/src/core/org/apache/jmeter/functions/Function.java
jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/LoadRecentProject.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileDialoger.java
jmeter/trunk/src/reports/org/apache/jmeter/gui/util/DirectoryPanel.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/functions/Function.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/functions/Function.java?rev=1640423&r1=1640422&r2=1640423&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/functions/Function.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/functions/Function.java Tue Nov 18
20:49:24 2014
@@ -36,6 +36,10 @@ public interface Function {
*
* This method must be threadsafe - multiple threads will be using the same
* object.
+ * @param previousResult The previous {@link SampleResult}
+ * @param currentSampler The current {@link Sampler}
+ * @return The replacement value, which was generated by the function
+ * @throws InvalidVariableException - when the variables for the function
call can't be evaluated
*/
String execute(SampleResult previousResult, Sampler currentSampler) throws
InvalidVariableException;
@@ -45,14 +49,15 @@ public interface Function {
* execute() method of the CompoundVariable (which should be done at
* execution.)
*
- * @param parameters
- * @throws InvalidVariableException
+ * @param parameters The parameters for the function call
+ * @throws InvalidVariableException - when the variables for the function
call can't be evaluated
*/
void setParameters(Collection parameters) throws
InvalidVariableException;
/**
* Return the name of your function. Convention is to prepend "__" to the
* name (ie "__regexFunction")
+ * @return The name of the funtion
*/
String getReferenceKey();
@@ -65,6 +70,7 @@ public interface Function {
* This list is not optional. If you don't wish to write help, you must at
* least return a List containing the correct number of blank strings, one
* for each argument.
+ * @return List with brief descriptions for each parameter the function
takes
*/
List getArgumentDesc();
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java?rev=1640423&r1=1640422&r2=1640423&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/SavePropertyDialog.java Tue Nov
18 20:49:24 2014
@@ -68,10 +68,11 @@ public class SavePropertyDialog extends
log.warn("Constructor only intended for use in testing"); //
$NON-NLS-1$
}
/**
- * @param owner
- * @param title
- * @param modal
- * @throws java.awt.HeadlessException
+ * @param owner The {@link Frame} from which the dialog is displayed
+ * @param title The string to be used as a title of this dialog
+ * @param modal specifies whether the dialog should be modal
+ * @param s The details, which sample attributes are to be saved
+ * @throws java.awt.HeadlessException - when run headless
*/
public SavePropertyDialog(Frame owner, String title, boolean modal,
SampleSaveConfiguration s)
// throws HeadlessException
Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/action/LoadRecentProject.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/LoadRecentProject.java?rev=1640423&r1=1640422&r2=1640423&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/LoadRecentProject.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/LoadRecentProject.java
Tue Nov 18 20:49:24 2014
@@ -244,6 +244,8 @@ public class LoadRecentProject extends L
/**
* Get the full path to the recent file where index 0 is the most recent
+ * @param index the index of the recent file
+ * @return full path to the recent file at index
*/
public static String getRecentFile(int index) {
return prefs.get(USER_PREFS_KEY + index, null);
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileDialoger.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apa
svn commit: r1641063 - in /jmeter/trunk/src: components/org/apache/jmeter/assertions/ core/org/apache/jmeter/control/ core/org/apache/jmeter/gui/tree/ core/org/apache/jmeter/gui/util/
Author: fschumacher
Date: Sat Nov 22 13:45:15 2014
New Revision: 1641063
URL: http://svn.apache.org/r1641063
Log:
Bug 57193: Add param and return tags to javadoc
Bugzilla Id: 57193
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/HTMLAssertion.java
jmeter/trunk/src/components/org/apache/jmeter/assertions/SizeAssertion.java
jmeter/trunk/src/components/org/apache/jmeter/assertions/XPathAssertion.java
jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java
jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeModel.java
jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeNode.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/FileListPanel.java
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/HTMLAssertion.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/HTMLAssertion.java?rev=1641063&r1=1641062&r2=1641063&view=diff
==
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/HTMLAssertion.java
(original)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/HTMLAssertion.java
Sat Nov 22 13:45:15 2014
@@ -258,6 +258,9 @@ public class HTMLAssertion extends Abstr
* Sets the doctype setting
*
* @param inDoctype
+ *The doctype to be set. If doctype is
+ *null or a blank string, {@link
HTMLAssertion#DEFAULT_DOCTYPE} will be
+ *used
*/
public void setDoctype(String inDoctype) {
if ((inDoctype == null) || (inDoctype.trim().equals(""))) {
@@ -268,9 +271,9 @@ public class HTMLAssertion extends Abstr
}
/**
- * Sets if errors shoud be tracked only
+ * Sets if errors should be tracked only
*
- * @param inErrorsOnly
+ * @param inErrorsOnly Flag whether only errors should be tracked
*/
public void setErrorsOnly(boolean inErrorsOnly) {
setProperty(new BooleanProperty(ERRORS_ONLY_KEY, inErrorsOnly));
@@ -280,6 +283,9 @@ public class HTMLAssertion extends Abstr
* Sets the threshold on error level
*
* @param inErrorThreshold
+ *The max number of parse errors which are to be tolerated
+ * @throws IllegalArgumentException
+ * if inErrorThreshold is less or equals zero
*/
public void setErrorThreshold(long inErrorThreshold) {
if (inErrorThreshold < 0L) {
@@ -296,6 +302,9 @@ public class HTMLAssertion extends Abstr
* Sets the threshold on warning level
*
* @param inWarningThreshold
+ *The max number of warnings which are to be tolerated
+ * @throws IllegalArgumentException
+ * if inWarningThreshold is less or equal zero
*/
public void setWarningThreshold(long inWarningThreshold) {
if (inWarningThreshold < 0L) {
@@ -368,7 +377,7 @@ public class HTMLAssertion extends Abstr
/**
* Sets the name of the tidy output file
*
- * @param inName
+ * @param inName The name of the file tidy will put its output to
*/
public void setFilename(String inName) {
setProperty(FILENAME_KEY, inName);
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/SizeAssertion.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/SizeAssertion.java?rev=1641063&r1=1641062&r2=1641063&view=diff
==
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/SizeAssertion.java
(original)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/SizeAssertion.java
Sat Nov 22 13:45:15 2014
@@ -109,22 +109,40 @@ public class SizeAssertion extends Abstr
/**
* Returns the size in bytes to be asserted.
+ * @return The allowed size
*/
public String getAllowedSize() {
return getPropertyAsString(SIZE_KEY);
}
-
/***
- * set the Operator
-
**/
+/**
+ Set the operator used for the assertion. Has to be one of
+
+ * EQUAL1
+ * NOTEQUAL2
+ * GREATERTHAN3
+ * LESSTHAN4
+ * GREATERTHANEQUAL5
+ * LESSTHANEQUAL6
+ *
+ * @param operator The operator to be used in the assertion
+ */
public void setCompOper(int operator) {
setProperty(new IntegerProperty(OPERATOR_KEY, operator));
}
/**
- * Returns the operator to be asserted. EQUAL = 1, NOTEQUAL = 2
GREATERTHAN =
- * 3,LESSTHAN = 4,GREATERTHANEQUAL = 5,LESSTHANEQUAL = 6
+ * Returns the operator to be asserted.
+ *
+ * EQUAL1
+ * NOTEQUAL2
+ * GREATERTHAN3
+ * LESSTHAN4
+ *
svn commit: r1641171 - in /jmeter/trunk/src/components/org/apache/jmeter: assertions/gui/ control/ extractor/
Author: fschumacher
Date: Sun Nov 23 10:33:16 2014
New Revision: 1641171
URL: http://svn.apache.org/r1641171
Log:
Bug 57193: Add param and return tags to javadoc
Bugzilla Id: 57193
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/SizeAssertionGui.java
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathPanel.java
jmeter/trunk/src/components/org/apache/jmeter/control/CriticalSectionController.java
jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java
jmeter/trunk/src/components/org/apache/jmeter/control/ModuleController.java
jmeter/trunk/src/components/org/apache/jmeter/extractor/HtmlExtractor.java
jmeter/trunk/src/components/org/apache/jmeter/extractor/RegexExtractor.java
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java?rev=1641171&r1=1641170&r2=1641171&view=diff
==
---
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java
Sun Nov 23 10:33:16 2014
@@ -149,6 +149,7 @@ public class HTMLAssertionGui extends Ab
/**
* Implements JMeterGUIComponent.clearGui
+ * {@inheritDoc}
*/
@Override
public void clearGui() {
@@ -166,8 +167,7 @@ public class HTMLAssertionGui extends Ab
/**
* Configures the associated test element.
- *
- * @param inElement
+ * {@inheritDoc}
*/
@Override
public void configure(TestElement inElement) {
@@ -265,7 +265,7 @@ public class HTMLAssertionGui extends Ab
/**
* This method is called if one of the threshold field looses the focus
*
- * @param inEvent
+ * @param inEvent The {@link FocusEvent} with detailed information about
the focus loss
*/
public void focusLost(FocusEvent inEvent) {
log.debug("HTMLAssertionGui.focusLost() called");
@@ -308,6 +308,9 @@ public class HTMLAssertionGui extends Ab
}
/**
+ * Method gets called when one of the threshold fields gains focus
+ *
+ * @param e The {@link FocusEvent} with detailed information about the
focus gain
* @see java.awt.event.FocusListener#focusGained(java.awt.event.FocusEvent)
*/
public void focusGained(FocusEvent e) {
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/SizeAssertionGui.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/SizeAssertionGui.java?rev=1641171&r1=1641170&r2=1641171&view=diff
==
---
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/SizeAssertionGui.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/SizeAssertionGui.java
Sun Nov 23 10:33:16 2014
@@ -63,6 +63,9 @@ public class SizeAssertionGui extends Ab
private int execState; // store the operator
+/**
+ * Simple Constructor which initializes the gui component
+ */
public SizeAssertionGui() {
init();
}
@@ -150,7 +153,18 @@ public class SizeAssertionGui extends Ab
}
/**
- * Set the state of the radio Button
+ * Set the state of the radio Button.
+ *
+ * Allowed states are
+ *
+ * {@link SizeAssertion#EQUAL}
+ * {@link SizeAssertion#NOTEQUAL}
+ * {@link SizeAssertion#GREATERTHAN}
+ * {@link SizeAssertion#LESSTHAN}
+ * {@link SizeAssertion#GREATERTHANEQUAL}
+ * {@link SizeAssertion#LESSTHANEQUAL}
+ *
+ * @param state One of the allowed states
*/
public void setState(int state) {
if (state == SizeAssertion.EQUAL) {
@@ -176,6 +190,17 @@ public class SizeAssertionGui extends Ab
/**
* Get the state of the radio Button
+ *
+ * Possible states are
+ *
+ * {@link SizeAssertion#EQUAL}
+ * {@link SizeAssertion#NOTEQUAL}
+ * {@link SizeAssertion#GREATERTHAN}
+ * {@link SizeAssertion#LESSTHAN}
+ * {@link SizeAssertion#GREATERTHANEQUAL}
+ * {@link SizeAssertion#LESSTHANEQUAL}
+ *
+ * @return The current state of the radio Button
*/
public int getState() {
return execState;
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathPanel.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/XPathPanel.java?rev=1641171&r1=1641170&r2=1641171&view=diff
==
---
jmeter/trunk/src/components/org/apache/jm
svn commit: r1641172 - /jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java
Author: fschumacher
Date: Sun Nov 23 10:34:09 2014
New Revision: 1641172
URL: http://svn.apache.org/r1641172
Log:
Add generics information to JComboBox. We know there are
only strings in this JComboBox.
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java
Modified:
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java?rev=1641172&r1=1641171&r2=1641172&view=diff
==
---
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/assertions/gui/HTMLAssertionGui.java
Sun Nov 23 10:34:09 2014
@@ -65,7 +65,7 @@ public class HTMLAssertionGui extends Ab
private JCheckBox errorsOnly = null;
-private JComboBox docTypeBox = null;
+private JComboBox docTypeBox = null;
private JRadioButton htmlRadioButton = null;
@@ -213,7 +213,7 @@ public class HTMLAssertionGui extends Ab
// doctype
HorizontalPanel docTypePanel = new HorizontalPanel();
-docTypeBox = new JComboBox(new Object[] { "omit", "auto", "strict",
"loose" });
+docTypeBox = new JComboBox(new String[] { "omit", "auto",
"strict", "loose" });
// docTypePanel.add(new
// JLabel(JMeterUtils.getResString("duration_assertion_label")));
//$NON-NLS-1$
docTypePanel.add(new JLabel("Doctype:"));
svn commit: r1641242 - in /jmeter/trunk/src/components/org/apache/jmeter: modifiers/ reporters/ timers/ visualizers/
Author: fschumacher
Date: Sun Nov 23 19:04:35 2014
New Revision: 1641242
URL: http://svn.apache.org/r1641242
Log:
Bug 57193: Add param and return tags to javadoc
Bugzilla Id: 57193
Modified:
jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java
jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java
jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantTimer.java
jmeter/trunk/src/components/org/apache/jmeter/timers/SyncTimer.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/AxisGraph.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/BarGraph.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/DistributionGraph.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/Graph.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/LineGraph.java
Modified:
jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java?rev=1641242&r1=1641241&r2=1641242&view=diff
==
--- jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java
(original)
+++ jmeter/trunk/src/components/org/apache/jmeter/modifiers/UserParameters.java
Sun Nov 23 19:04:35 2014
@@ -72,6 +72,9 @@ public class UserParameters extends Abst
* The list of names of the variables to hold values. This list must come
in
* the same order as the sub lists that are given to
* {@link #setThreadLists(Collection)}.
+ *
+ * @param list
+ *The ordered list of names
*/
public void setNames(Collection list) {
setProperty(new CollectionProperty(NAMES, list));
@@ -81,6 +84,9 @@ public class UserParameters extends Abst
* The list of names of the variables to hold values. This list must come
in
* the same order as the sub lists that are given to
* {@link #setThreadLists(CollectionProperty)}.
+ *
+ * @param list
+ *The ordered list of names
*/
public void setNames(CollectionProperty list) {
setProperty(list);
@@ -91,6 +97,9 @@ public class UserParameters extends Abst
* collection of values for a simulated user. As many different sets of
* values can be supplied in this fashion to cause JMeter to set different
* values to variables for different test threads.
+ *
+ * @param threadLists
+ *The list of lists of values for each user thread
*/
public void setThreadLists(Collection threadLists) {
setProperty(new CollectionProperty(THREAD_VALUES, threadLists));
@@ -101,6 +110,9 @@ public class UserParameters extends Abst
* collection of values for a simulated user. As many different sets of
* values can be supplied in this fashion to cause JMeter to set different
* values to variables for different test threads.
+ *
+ * @param threadLists
+ *The list of lists of values for each user thread
*/
public void setThreadLists(CollectionProperty threadLists) {
setProperty(threadLists);
Modified:
jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java?rev=1641242&r1=1641241&r2=1641242&view=diff
==
--- jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java
(original)
+++ jmeter/trunk/src/components/org/apache/jmeter/reporters/MailerModel.java
Sun Nov 23 19:04:35 2014
@@ -296,7 +296,9 @@ public class MailerModel extends Abstrac
* @param smtpHost
*the smtp-server used to send the mail.
* @throws MessagingException
+ * if the building of the message fails
* @throws AddressException
+ * if any of the addresses is wrong
*/
public void sendMail(String from, List vEmails, String subject,
String attText, String smtpHost)
throws AddressException, MessagingException {
@@ -321,6 +323,7 @@ public class MailerModel extends Abstrac
* @param user the login used to authenticate
* @param password the password used to authenticate
* @param mailAuthType {@link MailAuthType} Security policy
+ * @param debug Flag whether debug messages for the mail session should be
generated
* @throws AddressException If mail address is wrong
* @throws MessagingException If building MimeMessage fails
*/
Modified:
jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantTimer.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantTimer.java?rev=1641242&r1=
svn commit: r1641439 - in /jmeter/trunk/src/core/org/apache/jmeter: JMeter.java NewDriver.java control/Controller.java control/IfController.java control/TransactionController.java engine/TreeCloner.ja
Author: fschumacher
Date: Mon Nov 24 18:36:36 2014
New Revision: 1641439
URL: http://svn.apache.org/r1641439
Log:
Bug 57193: Add param and return tags to javadoc
Bugzilla Id: 57193
Modified:
jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
jmeter/trunk/src/core/org/apache/jmeter/NewDriver.java
jmeter/trunk/src/core/org/apache/jmeter/control/Controller.java
jmeter/trunk/src/core/org/apache/jmeter/control/IfController.java
jmeter/trunk/src/core/org/apache/jmeter/control/TransactionController.java
jmeter/trunk/src/core/org/apache/jmeter/engine/TreeCloner.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/JMeter.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/JMeter.java?rev=1641439&r1=1641438&r2=1641439&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/JMeter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/JMeter.java Mon Nov 24 18:36:36 2014
@@ -270,6 +270,7 @@ public class JMeter implements JMeterPlu
* startup JMeter.
*
* Called reflectively by {@link NewDriver#main(String[])}
+ * @param args The arguments for JMeter
*/
public void start(String[] args) {
@@ -844,7 +845,7 @@ public class JMeter implements JMeterPlu
/**
* Refactored from AbstractAction.java
*
- * @param tree
+ * @param tree The {@link HashTree} to convert
*/
public static void convertSubTree(HashTree tree) {
LinkedList copyList = new LinkedList(tree.list());
Modified: jmeter/trunk/src/core/org/apache/jmeter/NewDriver.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/NewDriver.java?rev=1641439&r1=1641438&r2=1641439&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/NewDriver.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/NewDriver.java Mon Nov 24 18:36:36
2014
@@ -185,9 +185,11 @@ public final class NewDriver {
}
/**
- * Add a URL to the loader classpath only; does not update the system
classpath.
+ * Add a URL to the loader classpath only; does not update the system
+ * classpath.
*
* @param url
+ *The {@link URL} to add to the classpath
*/
public static void addURL(URL url) {
loader.addURL(url);
@@ -196,8 +198,11 @@ public final class NewDriver {
/**
* Add a directory or jar to the loader and system classpaths.
*
- * @param path to add to the loader and system classpath
+ * @param path
+ *to add to the loader and system classpath
* @throws MalformedURLException
+ * if path can not be transformed to a valid
+ * {@link URL}
*/
public static void addPath(String path) throws MalformedURLException {
File file = new File(path);
Modified: jmeter/trunk/src/core/org/apache/jmeter/control/Controller.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/control/Controller.java?rev=1641439&r1=1641438&r2=1641439&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/control/Controller.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/control/Controller.java Mon Nov 24
18:36:36 2014
@@ -49,6 +49,7 @@ public interface Controller extends Test
/**
* Controllers have to notify listeners of when they begin an iteration
* through their sub-elements.
+ * @param listener The {@link LoopIterationListener} to add
*/
void addIterationListener(LoopIterationListener listener);
Modified: jmeter/trunk/src/core/org/apache/jmeter/control/IfController.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/control/IfController.java?rev=1641439&r1=1641438&r2=1641439&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/control/IfController.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/control/IfController.java Mon Nov
24 18:36:36 2014
@@ -33,7 +33,7 @@ import org.mozilla.javascript.Scriptable
* This is a Conditional Controller; it will execute the set of statements
* (samplers/controllers, etc) while the 'condition' is true.
*
- * In a programming world - this is equivalant of :
+ * In a programming world - this is equivalent of :
*
* if (condition) {
* statements
@@ -74,6 +74,7 @@ public class IfController extends Generi
/**
* constructor
+ * @param condition The condition for this controller
*/
public IfController(String condition) {
super();
@@ -82,6 +83,7 @@ public class IfController extends Generi
/**
* Condition Accessor - this i
svn commit: r1642223 - in /jmeter/trunk/src/core/org/apache/jmeter: control/ReplaceableController.java engine/util/ValueTransformer.java gui/AbstractJMeterGuiComponent.java
Author: fschumacher
Date: Thu Nov 27 19:52:11 2014
New Revision: 1642223
URL: http://svn.apache.org/r1642223
Log:
Bug 57193: Add param and return tags to javadoc
Bugzilla Id: 57193
Modified:
jmeter/trunk/src/core/org/apache/jmeter/control/ReplaceableController.java
jmeter/trunk/src/core/org/apache/jmeter/engine/util/ValueTransformer.java
jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java
Modified:
jmeter/trunk/src/core/org/apache/jmeter/control/ReplaceableController.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/control/ReplaceableController.java?rev=1642223&r1=164&r2=1642223&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/control/ReplaceableController.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/control/ReplaceableController.java
Thu Nov 27 19:52:11 2014
@@ -32,6 +32,8 @@ public interface ReplaceableController {
* Used to replace the test execution tree (usually by adding the
* subelements of the TestElement that is replacing the
* ReplaceableController.
+ *
+ * @return The replaced sub tree
*
* @see org.apache.jorphan.collections.HashTree
*/
Modified:
jmeter/trunk/src/core/org/apache/jmeter/engine/util/ValueTransformer.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/engine/util/ValueTransformer.java?rev=1642223&r1=164&r2=1642223&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/engine/util/ValueTransformer.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/engine/util/ValueTransformer.java
Thu Nov 27 19:52:11 2014
@@ -30,8 +30,12 @@ interface ValueTransformer {
/**
* Transform the given property and return the new version.
*
- * @param property Property to be transformed
+ * @param property
+ *Property to be transformed
* @return the transformed property
+ * @throws InvalidVariableException
+ * if something went wrong while computing variables or
+ * functions
*/
JMeterProperty transformValue(JMeterProperty property) throws
InvalidVariableException;
Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java?rev=1642223&r1=164&r2=1642223&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractJMeterGuiComponent.java
Thu Nov 27 19:52:11 2014
@@ -90,8 +90,11 @@ public abstract class AbstractJMeterGuiC
}
/**
- * Provides a default implementation for setting the comment property.
It's unlikely
- * developers will need to override.
+ * Provides a default implementation for setting the comment property. It's
+ * unlikely developers will need to override.
+ *
+ * @param comment
+ *The comment for the property
*/
public void setComment(String comment) {
commentPanel.setText(comment);
@@ -131,6 +134,8 @@ public abstract class AbstractJMeterGuiC
/**
* Provides a default implementation for the comment property. It's
unlikely
* developers will need to override.
+ *
+ * @return The comment for the property
*/
public String getComment() {
if (getCommentPanel() != null) {
svn commit: r1642224 - /jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java
Author: fschumacher Date: Thu Nov 27 19:52:57 2014 New Revision: 1642224 URL: http://svn.apache.org/r1642224 Log: Correct spelling of javadoc Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java?rev=1642224&r1=1642223&r2=1642224&view=diff == --- jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java (original) +++ jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java Thu Nov 27 19:52:57 2014 @@ -228,10 +228,10 @@ public final class GuiPackage implements * @param node *the test element which this GUI is being created for * @param guiClass - *the fully qualifed class name of the GUI component which will + *the fully qualified class name of the GUI component which will *be created if it doesn't already exist * @param testClass - *the fully qualifed class name of the test elements which have + *the fully qualified class name of the test elements which have *to be edited by the returned GUI component * * @return the GUI component corresponding to the specified test element
svn commit: r1642225 - in /jmeter/trunk/src/core/org/apache/jmeter/gui: ./ action/ tree/ util/
Author: fschumacher
Date: Thu Nov 27 19:53:36 2014
New Revision: 1642225
URL: http://svn.apache.org/r1642225
Log:
Bug 57193: Add param and return tags to javadoc
Bugzilla Id: 57193
Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java
jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java
jmeter/trunk/src/core/org/apache/jmeter/gui/tree/JMeterTreeListener.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/FilePanelEntry.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/JDateField.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/JLabeledRadioI18N.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterMenuBar.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/JMeterToolBar.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/JSyntaxTextArea.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/MenuFactory.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/TextAreaTableCellEditor.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java?rev=1642225&r1=1642224&r2=1642225&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/GuiPackage.java Thu Nov 27
19:53:36 2014
@@ -674,6 +674,7 @@ public final class GuiPackage implements
* title and used on saving.
*
* @param f
+ *The filepath of the current test plan
*/
public void setTestPlanFile(String f) {
testPlanFile = f;
@@ -758,7 +759,9 @@ public final class GuiPackage implements
/**
* Register process to stop on reload
+ *
* @param stoppable
+ *The {@link Stoppable} to be registered
*/
public void register(Stoppable stoppable) {
stoppables.add(stoppable);
@@ -776,7 +779,7 @@ public final class GuiPackage implements
/**
* Set the menu item LoggerPanel.
- * @param menuItemLoggerPanel
+ * @param menuItemLoggerPanel The menu item LoggerPanel
*/
public void setMenuItemLoggerPanel(JCheckBoxMenuItem menuItemLoggerPanel) {
this.menuItemLoggerPanel = menuItemLoggerPanel;
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java?rev=1642225&r1=1642224&r2=1642225&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java Thu Nov 27
19:53:36 2014
@@ -816,8 +816,11 @@ public class MainFrame extends JFrame im
/**
* Update Undo/Redo icons state
+ *
* @param canUndo
+ *Flag whether the undo button should be enabled
* @param canRedo
+ *Flag whether the redo button should be enabled
*/
public void updateUndoRedoIcons(boolean canUndo, boolean canRedo) {
toolbar.updateUndoRedoIcons(canUndo, canRedo);
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java?rev=1642225&r1=1642224&r2=1642225&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java Thu
Nov 27 19:53:36 2014
@@ -114,6 +114,15 @@ public final class ActionRouter implemen
performAction(e);
}
+/**
+ * Get the set of {@link Command}s registered under the name
+ * actionName
+ *
+ * @param actionName
+ *The name the {@link Command}s were registered
+ * @return a set with all registered {@link Command}s for
+ * actionName
+ */
public Set getAction(String actionName) {
Set set = new HashSet();
for (Command c : commands.get(actionName)) {
@@ -126,6 +135,17 @@ public final class ActionRouter implemen
return set;
}
+/**
+ * Get the {@link Command} registered under the name
actionName,
+ * that is of {@link Class} actionClass
+ *
+ * @param actionName
+ *The name the {@link Command}s were registered
+ * @param actionClass
+ *The class the {@link Command}s should be equal to
+ * @return The registered {@link Command} for actionName, or
+ * null if none could be found
+ */
public Command getAction(String actionName, Class actionClass) {
for (C
svn commit: r1642416 - in /jmeter/trunk/src/components/org/apache/jmeter/visualizers: ./ backend/
Author: fschumacher
Date: Sat Nov 29 11:04:14 2014
New Revision: 1642416
URL: http://svn.apache.org/r1642416
Log:
Bug 57193: Add param and return tags to javadoc
Bugzilla Id: 57193
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/ModelListener.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RequestPanel.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RespTimeGraphChart.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RespTimeGraphDataBean.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RespTimeGraphLineBean.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/SummaryReport.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/SamplerMetric.java
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/ModelListener.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/ModelListener.java?rev=1642416&r1=1642415&r2=1642416&view=diff
==
---
jmeter/trunk/src/components/org/apache/jmeter/visualizers/ModelListener.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/visualizers/ModelListener.java
Sat Nov 29 11:04:14 2014
@@ -32,6 +32,11 @@ public interface ModelListener {
/**
* Informs the Visualizer that a message should be displayed.
+ *
+ * @param messageString
+ *The text to be displayed
+ * @param isError
+ *Flag whether this message represents an error
*/
void displayMessage(String messageString, boolean isError);
}
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RequestPanel.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RequestPanel.java?rev=1642416&r1=1642415&r2=1642416&view=diff
==
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/RequestPanel.java
(original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/RequestPanel.java
Sat Nov 29 11:04:14 2014
@@ -102,7 +102,7 @@ public class RequestPanel {
/**
* Put SamplerResult in all request view
*
- * @param samplerResult
+ * @param samplerResult The {@link SampleResult} to be put in all {@link
RequestView}s
*/
public void setSamplerResult(SampleResult samplerResult) {
for (RequestView requestView : listRequestView) {
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RespTimeGraphChart.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RespTimeGraphChart.java?rev=1642416&r1=1642415&r2=1642416&view=diff
==
---
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RespTimeGraphChart.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RespTimeGraphChart.java
Sat Nov 29 11:04:14 2014
@@ -95,23 +95,30 @@ public class RespTimeGraphChart extends
protected float strokeWidth = 3.5f;
/**
-*
+* Constructor
*/
public RespTimeGraphChart() {
super();
}
- /**
-* @param layout
-*/
+/**
+ * Constructor
+ *
+ * @param layout
+ *The {@link LayoutManager} to be used
+ */
public RespTimeGraphChart(LayoutManager layout) {
super(layout);
}
- /**
-* @param layout
-* @param isDoubleBuffered
-*/
+/**
+ * Constructor
+ *
+ * @param layout
+ *The {@link LayoutManager} to be used
+ * @param isDoubleBuffered
+ *Flag whether double buffering should be used
+ */
public RespTimeGraphChart(LayoutManager layout, boolean isDoubleBuffered) {
super(layout, isDoubleBuffered);
}
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RespTimeGraphDataBean.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/RespTimeGraphDataBean.java?rev=1642416&r1=1642415&r2=1642416&view=diff
==
---
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RespTimeGraphDataBean.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/visualizers/RespTimeGraphDataBean.java
Sat Nov 29 11:04:14 2014
@@ -19,6 +19,10 @@
package org.apache.jmeter.visualizers;
+/**
+ * Bean to hold timing information about samples
+ *
+ */
public class RespTimeGraphDataBean {
private long startTime;
@@ -28,9 +32,14 @@ public class RespTimeGraphDataBean {
private String samplerLabel;
/**
+
svn commit: r1642447 - in /jmeter/trunk/src/core/org/apache/jmeter: reporters/FileReporter.java reporters/ResultCollector.java samplers/Entry.java samplers/RemoteSampleListener.java save/SaveService.j
Author: fschumacher
Date: Sat Nov 29 16:19:51 2014
New Revision: 1642447
URL: http://svn.apache.org/r1642447
Log:
Bug 57193: Add param and return tags to javadoc
Bugzilla Id: 57193
Modified:
jmeter/trunk/src/core/org/apache/jmeter/reporters/FileReporter.java
jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
jmeter/trunk/src/core/org/apache/jmeter/samplers/Entry.java
jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteSampleListener.java
jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/reporters/FileReporter.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/reporters/FileReporter.java?rev=1642447&r1=1642446&r2=1642447&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/reporters/FileReporter.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/reporters/FileReporter.java Sat Nov
29 16:19:51 2014
@@ -57,7 +57,14 @@ public class FileReporter extends JPanel
private final Map> data = new
ConcurrentHashMap>();
-/** initalize a file reporter from a file */
+/**
+ * Initialize a file reporter from a file
+ *
+ * @param file
+ *The name of the file to read from
+ * @throws IOException
+ * when the corresponding file can not be opened or be read
from
+ */
public void init(String file) throws IOException {
File datafile = new File(file);
BufferedReader reader = null;
@@ -107,6 +114,13 @@ public class FileReporter extends JPanel
showPanel();
}
+/**
+ * Get the data currently assigned to a given key
+ *
+ * @param key
+ *The key for which the data should be given
+ * @return list of data for the given key
+ */
public List getData(String key) {
return data.get(key);
}
@@ -159,6 +173,9 @@ private static class GraphPanel extends
/**
* Get the maximum for all the data.
+ *
+ * @return the maximum of all data for all keys, or 0 if no
+ * data is present
*/
public float getMax() {
float maxValue = 0;
@@ -178,6 +195,8 @@ private static class GraphPanel extends
/**
* Get the minimum for all the data.
+ * @return the maximum of all data for all keys, or 999
if no
+ * data is present
*/
public float getMin() {
float minValue = 999;
@@ -197,6 +216,8 @@ private static class GraphPanel extends
/**
* Get the legend panel.
+ *
+ * @return the newly created legend panel
*/
public JPanel getLegend() {
JPanel main = new JPanel();
@@ -231,6 +252,8 @@ private static class GraphPanel extends
/**
* Get the stats panel.
+ *
+ * @return a newly created stats panel
*/
public JPanel getStats() {
int total = 0;
@@ -292,6 +315,8 @@ private static class GraphPanel extends
/**
* Gets the size of the biggest List.
+ *
+ * @return the max size of all lists for all key
*/
public int getDataWidth() {
int size = 0;
Modified: jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java?rev=1642447&r1=1642446&r2=1642447&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java Sat
Nov 29 16:19:51 2014
@@ -166,6 +166,10 @@ public class ResultCollector extends Abs
this(null);
}
+/**
+ * Constructor which sets the used {@link Summariser}
+ * @param summer The {@link Summariser} to use
+ */
public ResultCollector(Summariser summer) {
setErrorLogging(false);
setSuccessOnlyLogging(false);
@@ -188,18 +192,40 @@ public class ResultCollector extends Abs
setProperty(FILENAME, f);
}
+/**
+ * Get the filename of the file this collector uses
+ *
+ * @return The name of the file
+ */
public String getFilename() {
return getPropertyAsString(FILENAME);
}
+/**
+ * Get the state of error logging
+ *
+ * @return Flag whether errors should be logged
+ */
public boolean isErrorLogging() {
return getPropertyAsBoolean(ERROR_LOGGING);
}
+/**
+ * Sets error logging flag
+ *
+ * @param errorLogging
+ *The flag whether errors should be logged
+ */
public final void setErrorLogging(boolean errorLogging) {
setProperty(new BooleanProperty(ERROR_LOGGING, errorLogging));
}
+/**
+ * Sets the flag w
svn commit: r1646044 - /jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPostProcessorResources.properties
Author: fschumacher Date: Tue Dec 16 18:56:43 2014 New Revision: 1646044 URL: http://svn.apache.org/r1646044 Log: Bug 57322 - JDBC: add methods to deal with ResultSets(cursors) returned by callable statements Remove duplicate translation entries in properties file Bugzilla Id: 57322 Modified: jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPostProcessorResources.properties Modified: jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPostProcessorResources.properties URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPostProcessorResources.properties?rev=1646044&r1=1646043&r2=1646044&view=diff == --- jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPostProcessorResources.properties (original) +++ jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/processor/JDBCPostProcessorResources.properties Tue Dec 16 18:56:43 2014 @@ -28,11 +28,9 @@ queryArgumentsTypes.displayName=Paramete queryArgumentsTypes.shortDescription=JDBC Type names from java.sql.Types. VARCHAR, INTEGER, etc. (comma separated) variableNames.displayName=Variable names variableNames.shortDescription=Output variable names for each column (comma separated) -resultSetHandler.displayName=Gestion ResultSet -resultSetHandler.shortDescription=Comment les valeurs de type ResultSet sont renvoy\u00E9es resultSetHandler.displayName=Handle ResultSet resultSetHandler.shortDescription=How should return values of type ResultSet be handled resultVariable.displayName=Result variable name resultVariable.shortDescription=Name of the JMeter variable that stores the result set objects in a list of maps for looking up results by column name. queryTimeout.displayName=Query timeout -queryTimeout.shortDescription=The timeout of statement measured in seconds \ No newline at end of file +queryTimeout.shortDescription=The timeout of statement measured in seconds
svn commit: r1646059 - /jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties
Author: fschumacher Date: Tue Dec 16 19:42:20 2014 New Revision: 1646059 URL: http://svn.apache.org/r1646059 Log: Add trivial but missing message translation Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties Modified: jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties?rev=1646059&r1=1646058&r2=1646059&view=diff == --- jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties (original) +++ jmeter/trunk/src/core/org/apache/jmeter/resources/messages_fr.properties Tue Dec 16 19:42:20 2014 @@ -84,6 +84,7 @@ aggregate_report_min=Min aggregate_report_rate=D\u00E9bit aggregate_report_stddev=Ecart type aggregate_report_total_label=TOTAL +aggregate_report_90=90% ajp_sampler_title=Requ\u00EAte AJP/1.3 als_message=Note \: Le parseur de log d'acc\u00E8s est g\u00E9n\u00E9rique et vous permet de se brancher \u00E0 als_message2=votre propre parseur. Pour se faire, impl\u00E9menter le LogParser, ajouter le jar au
svn commit: r1647187 - in /jmeter/trunk/src/core/org/apache/jmeter/samplers: SampleListener.java StatisticalSampleSender.java
Author: fschumacher
Date: Sun Dec 21 18:57:33 2014
New Revision: 1647187
URL: http://svn.apache.org/r1647187
Log:
Correct a few typos in javadoc comments
Modified:
jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleListener.java
jmeter/trunk/src/core/org/apache/jmeter/samplers/StatisticalSampleSender.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleListener.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleListener.java?rev=1647187&r1=1647186&r2=1647187&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleListener.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleListener.java Sun
Dec 21 18:57:33 2014
@@ -19,7 +19,7 @@
package org.apache.jmeter.samplers;
/**
- * Allows notification on events occuring during the sampling process.
+ * Allows notification on events occurring during the sampling process.
* Specifically, when sampling is started, when a specific sample is obtained,
* and when sampling is stopped.
*
Modified:
jmeter/trunk/src/core/org/apache/jmeter/samplers/StatisticalSampleSender.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/StatisticalSampleSender.java?rev=1647187&r1=1647186&r2=1647187&view=diff
==
---
jmeter/trunk/src/core/org/apache/jmeter/samplers/StatisticalSampleSender.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/samplers/StatisticalSampleSender.java
Sun Dec 21 18:57:33 2014
@@ -116,7 +116,7 @@ public class StatisticalSampleSender ext
/**
* Checks if any sample events are still present in the sampleStore and
- * sends them to the listener. Informs the listener of the testended.
+ * sends them to the listener. Informs the listener that the test ended.
*
* @param host the hostname that the test has ended on.
*/
@@ -134,9 +134,9 @@ public class StatisticalSampleSender ext
}
/**
- * Stores sample events untill either a time or sample threshold is
+ * Stores sample events until either a time or sample threshold is
* breached. Both thresholds are reset if one fires. If only one threshold
- * is set it becomes the only value checked against. When a threhold is
+ * is set it becomes the only value checked against. When a threshold is
* breached the list of sample events is sent to a listener where the event
* are fired locally.
*
@@ -145,14 +145,14 @@ public class StatisticalSampleSender ext
@Override
public void sampleOccurred(SampleEvent e) {
synchronized (sampleStore) {
-// Locate the statistical sample colector
+// Locate the statistical sample collector
String key = StatisticalSampleResult.getKey(e, keyOnThreadName);
StatisticalSampleResult statResult = sampleTable.get(key);
if (statResult == null) {
statResult = new StatisticalSampleResult(e.getResult());
// store the new statistical result collector
sampleTable.put(key, statResult);
-// add a new wrapper samplevent
+// add a new wrapper sampleevent
sampleStore
.add(new SampleEvent(statResult, e.getThreadGroup()));
}
svn commit: r1647188 - in /jmeter/trunk/src/core/org/apache/jmeter: samplers/SampleEvent.java samplers/SampleResult.java save/CSVSaveService.java
Author: fschumacher
Date: Sun Dec 21 18:58:47 2014
New Revision: 1647188
URL: http://svn.apache.org/r1647188
Log:
Bug 57193: Add param and return tags to javadoc
Bugzilla Id: 57193
Modified:
jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleEvent.java
jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
jmeter/trunk/src/core/org/apache/jmeter/save/CSVSaveService.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleEvent.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleEvent.java?rev=1647188&r1=1647187&r2=1647188&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleEvent.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleEvent.java Sun Dec
21 18:58:47 2014
@@ -21,6 +21,7 @@ package org.apache.jmeter.samplers;
import java.io.Serializable;
import java.util.Arrays;
+import org.apache.jmeter.protocol.http.proxy.ProxyControl;
import org.apache.jmeter.threads.JMeterVariables;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.logging.LoggingManager;
@@ -71,8 +72,9 @@ public class SampleEvent implements Seri
private final boolean isTransactionSampleEvent;
-/*
- * Only for Unit tests
+/**
+ * Constructor used for Unit tests only. Uses null for the
+ * associated {@link SampleResult} and the threadGroup-name.
*/
public SampleEvent() {
this(null, null);
@@ -80,22 +82,29 @@ public class SampleEvent implements Seri
/**
* Creates SampleEvent without saving any variables.
+ *
+ * Use by {@link ProxyControl} and {@link StatisticalSampleSender}.
*
- * Use by Proxy and StatisticalSampleSender.
- *
- * @param result SampleResult
- * @param threadGroup name
+ * @param result
+ *The SampleResult to be associated with this event
+ * @param threadGroup
+ *The name of the thread, the {@link SampleResult} was recorded
*/
public SampleEvent(SampleResult result, String threadGroup) {
this(result, threadGroup, HOSTNAME, false);
}
/**
- * Contructor used for normal samples, saves variable values if any are
defined.
+ * Constructor used for normal samples, saves variable values if any are
+ * defined.
*
* @param result
- * @param threadGroup name
- * @param jmvars Jmeter variables
+ *The SampleResult to be associated with this event
+ * @param threadGroup
+ *The name of the thread, the {@link SampleResult} was recorded
+ * @param jmvars
+ *the {@link JMeterVariables} of the thread, the
+ *{@link SampleResult} was recorded
*/
public SampleEvent(SampleResult result, String threadGroup,
JMeterVariables jmvars) {
this(result, threadGroup, jmvars, false);
@@ -105,8 +114,12 @@ public class SampleEvent implements Seri
* Only intended for use when loading results from a file.
*
* @param result
+ *The SampleResult to be associated with this event
* @param threadGroup
+ *The name of the thread, the {@link SampleResult} was recorded
* @param hostname
+ *The name of the host, for which the {@link SampleResult} was
+ *recorded
*/
public SampleEvent(SampleResult result, String threadGroup, String
hostname) {
this(result, threadGroup, hostname, false);
@@ -122,9 +135,14 @@ public class SampleEvent implements Seri
/**
* @param result
+ *The SampleResult to be associated with this event
* @param threadGroup
+ *The name of the thread, the {@link SampleResult} was recorded
* @param jmvars
+ *the {@link JMeterVariables} of the thread, the
+ *{@link SampleResult} was recorded
* @param isTransactionSampleEvent
+ *Flag whether this event is an transaction sample event
*/
public SampleEvent(SampleResult result, String threadGroup,
JMeterVariables jmvars, boolean isTransactionSampleEvent) {
this(result, threadGroup, HOSTNAME, isTransactionSampleEvent);
@@ -137,17 +155,35 @@ public class SampleEvent implements Seri
}
}
-/** Return the number of variables defined */
+/**
+ * Get the number of defined variables
+ *
+ * @return the number of variables defined
+ */
public static int getVarCount(){
return variableNames.length;
}
-/** Get the nth variable name (zero-based) */
+/**
+ * Get the nth variable name (zero-based)
+ *
+ * @param i
+ *specifies which variable name should be returned (zero-based)
+ * @return the variable name of the nth variable
+ */
public static String ge
svn commit: r1647209 - /jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleEvent.java
Author: fschumacher
Date: Sun Dec 21 20:53:23 2014
New Revision: 1647209
URL: http://svn.apache.org/r1647209
Log:
Bug 57193: Add param and return tags to javadoc
Don't add import just for javadoc.
Bugzilla Id: 57193
Modified:
jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleEvent.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleEvent.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleEvent.java?rev=1647209&r1=1647208&r2=1647209&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleEvent.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleEvent.java Sun Dec
21 20:53:23 2014
@@ -20,8 +20,7 @@ package org.apache.jmeter.samplers;
import java.io.Serializable;
import java.util.Arrays;
-
-import org.apache.jmeter.protocol.http.proxy.ProxyControl;
+
import org.apache.jmeter.threads.JMeterVariables;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.logging.LoggingManager;
@@ -83,7 +82,8 @@ public class SampleEvent implements Seri
/**
* Creates SampleEvent without saving any variables.
*
- * Use by {@link ProxyControl} and {@link StatisticalSampleSender}.
+ * Use by {@link org.apache.jmeter.protocol.http.proxy.ProxyControl
+ * ProxyControl} and {@link StatisticalSampleSender}.
*
* @param result
*The SampleResult to be associated with this event
svn commit: r1647215 - in /jmeter/trunk/src/core/org/apache/jmeter: samplers/ save/
Author: fschumacher
Date: Sun Dec 21 21:26:14 2014
New Revision: 1647215
URL: http://svn.apache.org/r1647215
Log:
Bug 57193: Add param and return tags to javadoc
Bugzilla Id: 57193
Modified:
jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleListener.java
jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java
jmeter/trunk/src/core/org/apache/jmeter/samplers/Sampler.java
jmeter/trunk/src/core/org/apache/jmeter/samplers/StatisticalSampleResult.java
jmeter/trunk/src/core/org/apache/jmeter/save/SaveGraphicsService.java
jmeter/trunk/src/core/org/apache/jmeter/save/ScriptWrapperConverter.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleListener.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleListener.java?rev=1647215&r1=1647214&r2=1647215&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleListener.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleListener.java Sun
Dec 21 21:26:14 2014
@@ -28,16 +28,25 @@ package org.apache.jmeter.samplers;
public interface SampleListener {
/**
* A sample has started and stopped.
+ *
+ * @param e
+ *the {@link SampleEvent} that has occurred
*/
void sampleOccurred(SampleEvent e);
/**
* A sample has started.
+ *
+ * @param e
+ *the {@link SampleEvent} that has started
*/
void sampleStarted(SampleEvent e);
/**
* A sample has stopped.
+ *
+ * @param e
+ *the {@link SampleEvent} that has stopped
*/
void sampleStopped(SampleEvent e);
}
Modified:
jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java?rev=1647215&r1=1647214&r2=1647215&view=diff
==
---
jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java
Sun Dec 21 21:26:14 2014
@@ -55,12 +55,13 @@ import org.apache.log.Logger;
* Holds details of which sample attributes to save.
*
* The pop-up dialogue for this is created by the class SavePropertyDialog,
which assumes:
- * For each field XXX
- * - methods have the signature "boolean saveXXX()"
- * - a corresponding "void setXXX(boolean)" method
- * - messages.properties contains the key save_XXX
- *
- *
+ *
+ * For each field XXX
+ *
+ * methods have the signature "boolean saveXXX()"
+ * a corresponding "void setXXX(boolean)" method
+ * messages.properties contains the key save_XXX
+ *
*/
public class SampleSaveConfiguration implements Cloneable, Serializable {
private static final long serialVersionUID = 7L;
@@ -777,6 +778,10 @@ public class SampleSaveConfiguration imp
/**
* Only intended for use by OldSaveService (and test cases)
+ *
+ * @param fmt
+ *format of the date to be saved. If null
+ *milliseconds since epoch will be printed
*/
public void setFormatter(DateFormat fmt){
printMilliseconds = (fmt == null); // maintain relationship
Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/Sampler.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/Sampler.java?rev=1647215&r1=1647214&r2=1647215&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/Sampler.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/Sampler.java Sun Dec 21
21:26:14 2014
@@ -32,6 +32,10 @@ public interface Sampler extends Seriali
/**
* Obtains statistics about the given Entry, and packages the information
* into a SampleResult.
+ *
+ * @param e
+ *the Entry (TODO seems to be unused)
+ * @return information about the sample
*/
SampleResult sample(Entry e);
}
Modified:
jmeter/trunk/src/core/org/apache/jmeter/samplers/StatisticalSampleResult.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/StatisticalSampleResult.java?rev=1647215&r1=1647214&r2=1647215&view=diff
==
---
jmeter/trunk/src/core/org/apache/jmeter/samplers/StatisticalSampleResult.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/samplers/StatisticalSampleResult.java
Sun Dec 21 21:26:14 2014
@@ -43,8 +43,8 @@ public class StatisticalSampleResult ext
*
* @deprecated Needs to be replaced when multiple sample results
svn commit: r1647347 - in /jmeter/trunk/src/core/org/apache/jmeter: save/converters/ services/ testbeans/
Author: fschumacher
Date: Mon Dec 22 16:25:38 2014
New Revision: 1647347
URL: http://svn.apache.org/r1647347
Log:
Bug 57193: Add param and return tags to javadoc
Bugzilla Id: 57193
Modified:
jmeter/trunk/src/core/org/apache/jmeter/save/converters/BooleanPropertyConverter.java
jmeter/trunk/src/core/org/apache/jmeter/save/converters/ConversionHelp.java
jmeter/trunk/src/core/org/apache/jmeter/save/converters/HashTreeConverter.java
jmeter/trunk/src/core/org/apache/jmeter/save/converters/IntegerPropertyConverter.java
jmeter/trunk/src/core/org/apache/jmeter/save/converters/LongPropertyConverter.java
jmeter/trunk/src/core/org/apache/jmeter/save/converters/MultiPropertyConverter.java
jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleEventConverter.java
jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java
jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java
jmeter/trunk/src/core/org/apache/jmeter/save/converters/StringPropertyConverter.java
jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementConverter.java
jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java
jmeter/trunk/src/core/org/apache/jmeter/services/FileServer.java
jmeter/trunk/src/core/org/apache/jmeter/testbeans/TestBeanHelper.java
Modified:
jmeter/trunk/src/core/org/apache/jmeter/save/converters/BooleanPropertyConverter.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/converters/BooleanPropertyConverter.java?rev=1647347&r1=1647346&r2=1647347&view=diff
==
---
jmeter/trunk/src/core/org/apache/jmeter/save/converters/BooleanPropertyConverter.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/save/converters/BooleanPropertyConverter.java
Mon Dec 22 16:25:38 2014
@@ -31,6 +31,8 @@ public class BooleanPropertyConverter im
/**
* Returns the converter version; used to check for possible
* incompatibilities
+ *
+ * @return the version of this converter
*/
public static String getVersion() {
return "$Revision$"; // $NON-NLS-1$
Modified:
jmeter/trunk/src/core/org/apache/jmeter/save/converters/ConversionHelp.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/converters/ConversionHelp.java?rev=1647347&r1=1647346&r2=1647347&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/save/converters/ConversionHelp.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/converters/ConversionHelp.java
Mon Dec 22 16:25:38 2014
@@ -102,6 +102,13 @@ public class ConversionHelp {
}
}
+/**
+ * Decode a string if {@link #inVersion} equals 1.0
+ *
+ * @param p
+ *the string to be decoded
+ * @return the newly decoded string
+ */
public static String decode(String p) {
if (!"1.0".equals(inVersion)) {//$NON-NLS-1$
return p;
@@ -118,6 +125,18 @@ public class ConversionHelp {
}
}
+/**
+ * Embed an array of bytes as a string with encoding in a
+ * xml-cdata section
+ *
+ * @param chars
+ *bytes to be encoded and embedded
+ * @param encoding
+ *the encoding to be used
+ * @return the encoded string embedded in a xml-cdata section
+ * @throws UnsupportedEncodingException
+ * when the bytes can not be encoded using
encoding
+ */
public static String cdata(byte[] chars, String encoding) throws
UnsupportedEncodingException {
StringBuilder buf = new StringBuilder("
svn commit: r1647367 - in /jmeter/trunk: src/core/org/apache/jmeter/save/converters/ xdocs/
Author: fschumacher
Date: Mon Dec 22 18:33:59 2014
New Revision: 1647367
URL: http://svn.apache.org/r1647367
Log:
Bug 57389: Fix potential NPE in org.apache.jmeter.save.converters
Bugzilla Id: 57389
Modified:
jmeter/trunk/src/core/org/apache/jmeter/save/converters/BooleanPropertyConverter.java
jmeter/trunk/src/core/org/apache/jmeter/save/converters/IntegerPropertyConverter.java
jmeter/trunk/src/core/org/apache/jmeter/save/converters/LongPropertyConverter.java
jmeter/trunk/src/core/org/apache/jmeter/save/converters/MultiPropertyConverter.java
jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java
jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java
jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestResultWrapperConverter.java
jmeter/trunk/xdocs/changes.xml
Modified:
jmeter/trunk/src/core/org/apache/jmeter/save/converters/BooleanPropertyConverter.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/converters/BooleanPropertyConverter.java?rev=1647367&r1=1647366&r2=1647367&view=diff
==
---
jmeter/trunk/src/core/org/apache/jmeter/save/converters/BooleanPropertyConverter.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/save/converters/BooleanPropertyConverter.java
Mon Dec 22 18:33:59 2014
@@ -41,7 +41,7 @@ public class BooleanPropertyConverter im
/** {@inheritDoc} */
@Override
public boolean canConvert(@SuppressWarnings("rawtypes") Class arg0) {//
superclass does not use types
-return arg0.equals(BooleanProperty.class);
+return BooleanProperty.class.equals(arg0);
}
/** {@inheritDoc} */
Modified:
jmeter/trunk/src/core/org/apache/jmeter/save/converters/IntegerPropertyConverter.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/converters/IntegerPropertyConverter.java?rev=1647367&r1=1647366&r2=1647367&view=diff
==
---
jmeter/trunk/src/core/org/apache/jmeter/save/converters/IntegerPropertyConverter.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/save/converters/IntegerPropertyConverter.java
Mon Dec 22 18:33:59 2014
@@ -41,7 +41,7 @@ public class IntegerPropertyConverter im
/** {@inheritDoc} */
@Override
public boolean canConvert(@SuppressWarnings("rawtypes") Class arg0) { //
superclass does not use types
-return arg0.equals(IntegerProperty.class);
+return IntegerProperty.class.equals(arg0);
}
/** {@inheritDoc} */
Modified:
jmeter/trunk/src/core/org/apache/jmeter/save/converters/LongPropertyConverter.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/converters/LongPropertyConverter.java?rev=1647367&r1=1647366&r2=1647367&view=diff
==
---
jmeter/trunk/src/core/org/apache/jmeter/save/converters/LongPropertyConverter.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/save/converters/LongPropertyConverter.java
Mon Dec 22 18:33:59 2014
@@ -41,7 +41,7 @@ public class LongPropertyConverter imple
/** {@inheritDoc} */
@Override
public boolean canConvert(@SuppressWarnings("rawtypes") Class arg0) { //
superclass does not use types
-return arg0.equals(LongProperty.class);
+return LongProperty.class.equals(arg0);
}
/** {@inheritDoc} */
Modified:
jmeter/trunk/src/core/org/apache/jmeter/save/converters/MultiPropertyConverter.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/converters/MultiPropertyConverter.java?rev=1647367&r1=1647366&r2=1647367&view=diff
==
---
jmeter/trunk/src/core/org/apache/jmeter/save/converters/MultiPropertyConverter.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/save/converters/MultiPropertyConverter.java
Mon Dec 22 18:33:59 2014
@@ -46,7 +46,7 @@ public class MultiPropertyConverter exte
/** {@inheritDoc} */
@Override
public boolean canConvert(@SuppressWarnings("rawtypes") Class arg0) { //
superclass does not use types
-return arg0.equals(CollectionProperty.class) ||
arg0.equals(MapProperty.class);
+return CollectionProperty.class.equals(arg0) ||
MapProperty.class.equals(arg0);
}
/** {@inheritDoc} */
Modified:
jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleSaveConfigurationConverter.java?rev=1647367&r1=1647366&r2=1647367&view=diff
svn commit: r1647378 - in /jmeter/trunk/src/core/org/apache/jmeter: save/converters/TestResultWrapperConverter.java testbeans/gui/ComboStringEditor.java testbeans/gui/FileEditor.java testbeans/gui/Tex
Author: fschumacher
Date: Mon Dec 22 19:03:37 2014
New Revision: 1647378
URL: http://svn.apache.org/r1647378
Log:
Bug 57193: Add param and return tags to javadoc
Bugzilla Id: 57193
Modified:
jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestResultWrapperConverter.java
jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/ComboStringEditor.java
jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/FileEditor.java
jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/TextAreaEditor.java
Modified:
jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestResultWrapperConverter.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestResultWrapperConverter.java?rev=1647378&r1=1647377&r2=1647378&view=diff
==
---
jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestResultWrapperConverter.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestResultWrapperConverter.java
Mon Dec 22 19:03:37 2014
@@ -45,13 +45,15 @@ public class TestResultWrapperConverter
/**
* Returns the converter version; used to check for possible
* incompatibilities
+ *
+ * @return the version of this converter
*/
public static String getVersion() {
return "$Revision$"; //$NON-NLS-1$
}
/**
- * @param arg0
+ * @param arg0 the {@link Mapper} to be used
*/
public TestResultWrapperConverter(Mapper arg0) {
super(arg0);
Modified:
jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/ComboStringEditor.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/ComboStringEditor.java?rev=1647378&r1=1647377&r2=1647378&view=diff
==
---
jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/ComboStringEditor.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/ComboStringEditor.java
Mon Dec 22 19:03:37 2014
@@ -262,7 +262,7 @@ class ComboStringEditor extends Property
}
/**
- * @param object
+ * @param object the initial edit value
*/
public void setInitialEditValue(String object) {
initialEditValue = object;
Modified: jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/FileEditor.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/FileEditor.java?rev=1647378&r1=1647377&r2=1647378&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/FileEditor.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testbeans/gui/FileEditor.java Mon
Dec 22 19:03:37 2014
@@ -56,7 +56,9 @@ public class FileEditor implements Prope
private final PropertyEditor editor;
/**
- * @throws IntrospectionException
+ * @throws IntrospectionException
+ * when introspection fails while creating a dummy
+ * PropertyDescriptor
* @deprecated Only for use by test cases
*/
@Deprecated
@@ -64,6 +66,15 @@ public class FileEditor implements Prope
this(new PropertyDescriptor("dummy", null, null));
}
+/**
+ * Construct a {@link FileEditor} using the properties of the given
+ * {@link PropertyDescriptor}
+ *
+ * @param descriptor
+ *the {@link PropertyDescriptor} to be used. Must not be
null
+ * @throws IllegalArgumentException
+ * when descriptor is null
+ */
public FileEditor(PropertyDescriptor descriptor) {
if (descriptor == null) {
throw new IllegalArgumentException("Descriptor must not be null");
@@ -107,7 +118,7 @@ public class FileEditor implements Prope
}
/**
- * @param listener
+ * {@inheritDoc}
*/
@Override
public void addPropertyChangeListener(PropertyChangeListener listener) {
@@ -163,8 +174,7 @@ public class FileEditor implements Prope
}
/**
- * @param gfx
- * @param box
+ * {@inheritDoc}
*/
@Override
public void paintValue(Graphics gfx, Rectangle box) {
@@ -172,7 +182,7 @@ public class FileEditor implements Prope
}
/**
- * @param listener
+ * {@inheritDoc}
*/
@Override
public void removePropertyChangeListener(PropertyChangeListener listener) {
@@ -180,8 +190,7 @@ public class FileEditor implements Prope
}
/**
- * @param text
- * @throws java.lang.IllegalArgumentException
+ * {@inheritDoc}
*/
@Override
public void setAsText(String text) throws IllegalArgumentException {
@@ -189,7 +198,7 @@ public class FileEditor implements Prope
}
/**
- * @param value
+ * {@inheritDoc}
*/
@Override
svn commit: r1647589 - in /jmeter/trunk/src: core/org/apache/jmeter/testelement/ jorphan/org/apache/jorphan/gui/ jorphan/org/apache/jorphan/reflect/ protocol/http/org/apache/jmeter/protocol/http/modif
Author: fschumacher
Date: Tue Dec 23 15:09:47 2014
New Revision: 1647589
URL: http://svn.apache.org/r1647589
Log:
Bug 57193: Add param and return tags to javadoc
Bugzilla Id: 57193
Modified:
jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedTestElement.java
jmeter/trunk/src/jorphan/org/apache/jorphan/gui/AbstractTreeTableModel.java
jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassTools.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterXMLParser.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/BaseJMSSampler.java
jmeter/trunk/src/reports/org/apache/jmeter/testelement/AbstractChart.java
Modified:
jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedTestElement.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedTestElement.java?rev=1647589&r1=1647588&r2=1647589&view=diff
==
---
jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedTestElement.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/testelement/AbstractScopedTestElement.java
Tue Dec 23 15:09:47 2014
@@ -68,7 +68,9 @@ public abstract class AbstractScopedTest
* Is the assertion to be applied to the main (parent) sample?
*
* @param scope
- * @return if the assertion is to be applied to the parent sample.
+ *name of the scope to be checked
+ * @return true if the assertion is to be applied to the
parent
+ * sample.
*/
public boolean isScopeParent(String scope) {
return scope.equals(SCOPE_PARENT);
@@ -78,7 +80,9 @@ public abstract class AbstractScopedTest
* Is the assertion to be applied to the sub-samples (children)?
*
* @param scope
- * @return if the assertion is to be applied to the children.
+ *name of the scope to be checked
+ * @return true if the assertion is to be applied to the
+ * children.
*/
public boolean isScopeChildren(String scope) {
return scope.equals(SCOPE_CHILDREN);
@@ -88,7 +92,9 @@ public abstract class AbstractScopedTest
* Is the assertion to be applied to the all samples?
*
* @param scope
- * @return if the assertion is to be applied to the all samples.
+ *name of the scope to be checked
+ * @return true if the assertion is to be applied to the all
+ * samples.
*/
public boolean isScopeAll(String scope) {
return scope.equals(SCOPE_ALL);
@@ -98,7 +104,9 @@ public abstract class AbstractScopedTest
* Is the assertion to be applied to the all samples?
*
* @param scope
- * @return if the assertion is to be applied to the all samples.
+ *name of the scope to be checked
+ * @return true if the assertion is to be applied to the all
+ * samples.
*/
public boolean isScopeVariable(String scope) {
return scope.equals(SCOPE_VARIABLE);
@@ -107,7 +115,7 @@ public abstract class AbstractScopedTest
/**
* Is the assertion to be applied to the all samples?
*
- * @return if the assertion is to be applied to the all samples.
+ * @return true if the assertion is to be applied to the all
samples.
*/
protected boolean isScopeVariable() {
return isScopeVariable(fetchScope());
Modified:
jmeter/trunk/src/jorphan/org/apache/jorphan/gui/AbstractTreeTableModel.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/gui/AbstractTreeTableModel.java?rev=1647589&r1=1647588&r2=1647589&view=diff
==
--- jmeter/trunk/src/jorphan/org/apache/jorphan/gui/AbstractTreeTableModel.java
(original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/gui/AbstractTreeTableModel.java
Tue Dec 23 15:09:47 2014
@@ -172,10 +172,14 @@ public abstract class AbstractTreeTableM
}
/**
- * the implementation checks if the Object is a treenode. If it is,
- * it returns isLeaf(), otherwise it returns false.
+ * the implementation checks if the Object is a treenode. If it is, it
+ * returns {@link TreeNode#isLeaf() isLeaf()}, otherwise it returns
+ * false.
+ *
* @param node
- * @return whether object is a leaf node or not
+ *object to be checked for {@link TreeNode#isLeaf() isLeaf()}
+ * @return true if object is a leaf node, false
+ * otherwise
*/
public boolean isLeaf(Object node) {
if (node instanceof TreeNode) {
Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassTools.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassTools.java?rev=1647589&r1=
svn commit: r1647607 - in /jmeter/trunk: src/jorphan/org/apache/jorphan/reflect/ClassTools.java test/src/org/apache/jorphan/reflect/TestClassTools.java xdocs/changes.xml
Author: fschumacher
Date: Tue Dec 23 16:23:16 2014
New Revision: 1647607
URL: http://svn.apache.org/r1647607
Log:
Bug 57394: When constructing an instance using ClassTools#construct(String,
int),
the int parameter was not used, but the default constructor was used instead.
Added a few test cases to test the methods of ClassTools and correct the unused
parameter.
The only place in jmeter, where this method was called is in the JMeter class
itself and
is used, when the property "mirror.server.port" is set to a value greater than
zero.
Without this patch that value would be ignored.
Bugzilla Id: 57394
Added:
jmeter/trunk/test/src/org/apache/jorphan/reflect/TestClassTools.java
Modified:
jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassTools.java
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassTools.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassTools.java?rev=1647607&r1=1647606&r2=1647607&view=diff
==
--- jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassTools.java
(original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassTools.java Tue Dec
23 16:23:16 2014
@@ -55,7 +55,7 @@ public class ClassTools {
/**
* Call a class constructor with an integer parameter
* @param className name of the class to be constructed
- * @param parameter (integer)
+ * @param parameter the value to be used in the constructor
* @return an instance of the class
* @throws JMeterException if class cannot be created
*/
@@ -64,8 +64,8 @@ public class ClassTools {
Object instance = null;
try {
Class clazz = ClassUtils.getClass(className);
-clazz.getConstructor(new Class [] {Integer.TYPE});
-instance = ClassUtils.getClass(className).newInstance();
+Constructor constructor = clazz.getConstructor(Integer.TYPE);
+instance = constructor.newInstance(parameter);
} catch (ClassNotFoundException e) {
throw new JMeterException(e);
} catch (InstantiationException e) {
@@ -76,6 +76,10 @@ public class ClassTools {
throw new JMeterException(e);
} catch (NoSuchMethodException e) {
throw new JMeterException(e);
+} catch (IllegalArgumentException e) {
+throw new JMeterException(e);
+} catch (InvocationTargetException e) {
+throw new JMeterException(e);
}
return instance;
}
Added: jmeter/trunk/test/src/org/apache/jorphan/reflect/TestClassTools.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jorphan/reflect/TestClassTools.java?rev=1647607&view=auto
==
--- jmeter/trunk/test/src/org/apache/jorphan/reflect/TestClassTools.java (added)
+++ jmeter/trunk/test/src/org/apache/jorphan/reflect/TestClassTools.java Tue
Dec 23 16:23:16 2014
@@ -0,0 +1,96 @@
+package org.apache.jorphan.reflect;
+
+import junit.framework.TestCase;
+
+import org.apache.jorphan.util.JMeterException;
+import org.junit.Test;
+
+/**
+ * Test various aspects of the {@link ClassTools} class
+ */
+public class TestClassTools extends TestCase {
+
+/**
+ * Test that a class can be constructed using the default constructor
+ *
+ * @throws JMeterException
+ * when something fails during object construction
+ */
+@Test
+public void testConstructString() throws JMeterException {
+String dummy = (String) ClassTools.construct("java.lang.String");
+assertNotNull(dummy);
+assertEquals("", dummy);
+}
+
+/**
+ * Test that a class can be constructed using an constructor with an
integer
+ * parameter
+ *
+ * @throws JMeterException
+ * when something fails during object construction
+ */
+@Test
+public void testConstructStringInt() throws JMeterException {
+Integer dummy = (Integer) ClassTools.construct("java.lang.Integer",
23);
+assertNotNull(dummy);
+assertEquals(Integer.valueOf(23), dummy);
+}
+
+/**
+ * Test that a class can be constructed using an constructor with an string
+ * parameter
+ *
+ * @throws JMeterException
+ * when something fails during object construction
+ */
+@Test
+public void testConstructStringString() throws JMeterException {
+String dummy = (String) ClassTools.construct("java.lang.String",
+"hello");
+assertNotNull(dummy);
+assertEquals("hello", dummy);
+}
+
+/**
+ * Test that a simple method can be invoked on an object
+ *
+ * @throws SecurityException
+ *
svn commit: r1647786 - in /jmeter/trunk/src/core/org/apache/jmeter: testelement/ testelement/property/ threads/
Author: fschumacher Date: Wed Dec 24 13:58:11 2014 New Revision: 1647786 URL: http://svn.apache.org/r1647786 Log: Bug 57193: Add param and return tags to javadoc Bugzilla Id: 57193 Modified: jmeter/trunk/src/core/org/apache/jmeter/testelement/TestElement.java jmeter/trunk/src/core/org/apache/jmeter/testelement/TestPlan.java jmeter/trunk/src/core/org/apache/jmeter/testelement/WorkBench.java jmeter/trunk/src/core/org/apache/jmeter/testelement/property/JMeterProperty.java jmeter/trunk/src/core/org/apache/jmeter/testelement/property/MultiProperty.java jmeter/trunk/src/core/org/apache/jmeter/testelement/property/NullProperty.java jmeter/trunk/src/core/org/apache/jmeter/testelement/property/ObjectProperty.java jmeter/trunk/src/core/org/apache/jmeter/threads/AbstractThreadGroup.java jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterContext.java jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterThread.java jmeter/trunk/src/core/org/apache/jmeter/threads/RemoteThreadsListener.java jmeter/trunk/src/core/org/apache/jmeter/threads/RemoteThreadsListenerImpl.java jmeter/trunk/src/core/org/apache/jmeter/threads/TestCompiler.java Modified: jmeter/trunk/src/core/org/apache/jmeter/testelement/TestElement.java URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testelement/TestElement.java?rev=1647786&r1=1647785&r2=1647786&view=diff == --- jmeter/trunk/src/core/org/apache/jmeter/testelement/TestElement.java (original) +++ jmeter/trunk/src/core/org/apache/jmeter/testelement/TestElement.java Wed Dec 24 13:58:11 2014 @@ -19,6 +19,7 @@ package org.apache.jmeter.testelement; import org.apache.jmeter.testelement.property.JMeterProperty; +import org.apache.jmeter.testelement.property.NullProperty; import org.apache.jmeter.testelement.property.PropertyIterator; import org.apache.jmeter.threads.JMeterContext; @@ -75,6 +76,8 @@ public interface TestElement extends Clo /** * Returns true or false whether the element is the running version. + * + * @return true if the element is the running version */ boolean isRunningVersion(); @@ -98,21 +101,86 @@ public interface TestElement extends Clo /** * Return a property as a boolean value. + * + * @param key + *the name of the property to get + * @return the value of the property */ boolean getPropertyAsBoolean(String key); +/** + * Return a property as a boolean value or a default value if no property + * could be found. + * + * @param key + *the name of the property to get + * @param defaultValue + *the default value to use + * @return the value of the property, or defaultValue if no + * property could be found + */ boolean getPropertyAsBoolean(String key, boolean defaultValue); +/** + * Return a property as a long value. + * + * @param key + *the name of the property to get + * @return the value of the property + */ long getPropertyAsLong(String key); +/** + * Return a property as a long value or a default value if no property + * could be found. + * + * @param key + *the name of the property to get + * @param defaultValue + *the default value to use + * @return the value of the property, or defaultValue if no + * property could be found + */ long getPropertyAsLong(String key, long defaultValue); +/** + * Return a property as an int value. + * + * @param key + *the name of the property to get + * @return the value of the property + */ int getPropertyAsInt(String key); - + +/** + * Return a property as an int value or a default value if no property + * could be found. + * + * @param key + *the name of the property to get + * @param defaultValue + *the default value to use + * @return the value of the property, or defaultValue if no + * property could be found + */ int getPropertyAsInt(String key, int defaultValue); +/** + * Return a property as a float value. + * + * @param key + *the name of the property to get + * @return the value of the property + */ float getPropertyAsFloat(String key); +/** + * Return a property as a double value. + * + * @param key + *the name of the property to get + * @return the value of the property + */ double getPropertyAsDouble(String key); /** @@ -122,6 +190,9 @@ public interface TestElement extends Clo * making the TestElement Read- Only, but not as strict. Changes can be made * and the element can be modified, but the state of the el
svn commit: r1648193 - in /jmeter/trunk/src: core/org/apache/jmeter/util/ core/org/apache/jmeter/util/keystore/ core/org/apache/jmeter/visualizers/ functions/org/apache/jmeter/functions/
Author: fschumacher
Date: Sun Dec 28 12:47:46 2014
New Revision: 1648193
URL: http://svn.apache.org/r1648193
Log:
Bug 57193: Add param and return tags to javadoc
Bugzilla Id: 57193
Modified:
jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellInterpreter.java
jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellServer.java
jmeter/trunk/src/core/org/apache/jmeter/util/Calculator.java
jmeter/trunk/src/core/org/apache/jmeter/util/ColorHelper.java
jmeter/trunk/src/core/org/apache/jmeter/util/Document.java
jmeter/trunk/src/core/org/apache/jmeter/util/JMeterUtils.java
jmeter/trunk/src/core/org/apache/jmeter/util/JsseSSLManager.java
jmeter/trunk/src/core/org/apache/jmeter/util/NameUpdater.java
jmeter/trunk/src/core/org/apache/jmeter/util/SSLManager.java
jmeter/trunk/src/core/org/apache/jmeter/util/SlowSocket.java
jmeter/trunk/src/core/org/apache/jmeter/util/XPathUtil.java
jmeter/trunk/src/core/org/apache/jmeter/util/keystore/JmeterKeyStore.java
jmeter/trunk/src/core/org/apache/jmeter/visualizers/Sample.java
jmeter/trunk/src/core/org/apache/jmeter/visualizers/TableSample.java
jmeter/trunk/src/core/org/apache/jmeter/visualizers/Visualizer.java
jmeter/trunk/src/functions/org/apache/jmeter/functions/FileWrapper.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellInterpreter.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellInterpreter.java?rev=1648193&r1=1648192&r2=1648193&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellInterpreter.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellInterpreter.java Sun
Dec 28 12:47:46 2014
@@ -101,6 +101,7 @@ public class BeanShellInterpreter {
*
* @param init initialisation file
* @param _log logger to pass to interpreter
+ * @throws ClassNotFoundException when beanshell can not be instantiated
*/
public BeanShellInterpreter(String init, Logger _log) throws
ClassNotFoundException {
initFile = init;
Modified: jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellServer.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellServer.java?rev=1648193&r1=1648192&r2=1648193&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellServer.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellServer.java Sun Dec
28 12:47:46 2014
@@ -41,7 +41,14 @@ public class BeanShellServer implements
private final String serverfile;
/**
- *
+ * Constructor which sets the port for this server and the path to an
+ * optional init file
+ *
+ * @param port
+ *the port for the server to use
+ * @param file
+ *the path to an init file, or an empty string, if no init file
+ *should be used
*/
public BeanShellServer(int port, String file) {
super();
Modified: jmeter/trunk/src/core/org/apache/jmeter/util/Calculator.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/Calculator.java?rev=1648193&r1=1648192&r2=1648193&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/util/Calculator.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/Calculator.java Sun Dec 28
12:47:46 2014
@@ -22,10 +22,12 @@ import org.apache.jmeter.samplers.Sample
/**
* Class to calculate various items that don't require all previous results to
be saved:
- * - mean = average
- * - standard deviation
- * - minimum
- * - maximum
+ *
+ * mean = average
+ * standard deviation
+ * minimum
+ * maximum
+ *
*/
public class Calculator {
@@ -70,7 +72,7 @@ public class Calculator {
/**
* Add the value for a single sample.
*
- * @param newValue
+ * @param newValue the value for the new sample
*
* @see #addValue(long, int)
* @deprecated Use {@link #addSample(SampleResult)} instead
@@ -189,6 +191,8 @@ public class Calculator {
* May be slightly skewed because it takes the timestamps of the first and
* last samples as the total time passed, and the test may actually have
* started before that start time and ended after that end time.
+ *
+ * @return throughput associated to this sampler in requests per second
*/
public double getRate() {
if (elapsedTime == 0) {
Modified: jmeter/trunk/src/core/org/apache/jmeter/util/ColorHelper.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/ColorHelper.java?rev=1648193&r1=1648192&r2=1648193&view=diff
===
svn commit: r1648229 - in /jmeter/trunk/src/jorphan/org/apache/jorphan: collections/Data.java collections/HashTree.java collections/SearchByClass.java exec/KeyToolUtils.java exec/SystemCommand.java lo
Author: fschumacher
Date: Sun Dec 28 17:31:20 2014
New Revision: 1648229
URL: http://svn.apache.org/r1648229
Log:
Bug 57193: Add param and return tags to javadoc
Bugzilla Id: 57193
Modified:
jmeter/trunk/src/jorphan/org/apache/jorphan/collections/Data.java
jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java
jmeter/trunk/src/jorphan/org/apache/jorphan/collections/SearchByClass.java
jmeter/trunk/src/jorphan/org/apache/jorphan/exec/KeyToolUtils.java
jmeter/trunk/src/jorphan/org/apache/jorphan/exec/SystemCommand.java
jmeter/trunk/src/jorphan/org/apache/jorphan/logging/LoggingManager.java
jmeter/trunk/src/jorphan/org/apache/jorphan/util/Converter.java
Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/collections/Data.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/Data.java?rev=1648229&r1=1648228&r2=1648229&view=diff
==
--- jmeter/trunk/src/jorphan/org/apache/jorphan/collections/Data.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/collections/Data.java Sun Dec
28 17:31:20 2014
@@ -364,7 +364,7 @@ public class Data implements Serializabl
* @param rs
*ResultSet passed in from a database query
* @return a Data object
- * @throws java.sql.SQLException
+ * @throws java.sql.SQLException when database access errors occur
*/
public static Data getDataFromResultSet(ResultSet rs) throws SQLException {
ResultSetMetaData meta = rs.getMetaData();
@@ -566,6 +566,11 @@ public class Data implements Serializabl
/**
* Sets the data for every row in the column.
+ *
+ * @param colName
+ *name of the column
+ * @param value
+ *value to be set
*/
public void setColumnData(String colName, Object value) {
List list = this.getColumnAsObjectArray(colName);
Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java?rev=1648229&r1=1648228&r2=1648229&view=diff
==
--- jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java
(original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java Sun
Dec 28 17:31:20 2014
@@ -76,6 +76,7 @@ public class HashTree implements Seriali
* Creates a new HashTree and adds the given object as a top-level node.
*
* @param key
+ *name of the new top-level node
*/
public HashTree(Object key) {
this(new HashMap(), key);
@@ -191,7 +192,7 @@ public class HashTree implements Seriali
* Adds all the nodes and branches of the given tree to this tree. Is like
* merging two trees. Duplicates are ignored.
*
- * @param newTree
+ * @param newTree the tree to be added
*/
public void add(HashTree newTree) {
for (Object item : newTree.list()) {
@@ -216,6 +217,9 @@ public class HashTree implements Seriali
/**
* Creates a new HashTree and adds all the objects in the given array as
* top-level nodes in the tree.
+ *
+ * @param keys
+ *array with names for the new top-level nodes
*/
public HashTree(Object[] keys) {
data = new HashMap();
@@ -397,10 +401,13 @@ public class HashTree implements Seriali
}
/**
- * Adds an key into the HashTree at the current level.
+ * Adds an key into the HashTree at the current level. If a HashTree exists
+ * for the key already, no new tree will be added
*
* @param key
*key to be added to HashTree
+ * @return newly generated tree, if no tree was found for the given key;
+ * existing key otherwise
*/
public HashTree add(Object key) {
if (!data.containsKey(key)) {
@@ -443,6 +450,7 @@ public class HashTree implements Seriali
*key to be added
* @param value
*value to be added as a key in the secondary node
+ * @return HashTree for which value is the key
*/
public HashTree add(Object key, Object value) {
return add(key).add(value);
@@ -544,6 +552,7 @@ public class HashTree implements Seriali
*a list of objects representing a path
* @param value
*Object to add as a node to bottom-most node
+ * @return HashTree for which value is the key
*/
public HashTree add(Collection treePath, Object value) {
HashTree tree = addTreePath(treePath);
@@ -580,6 +589,7 @@ public class HashTree implements Seriali
*
* @param key
*Key used to find appropriate HashTree()
+ * @return the HashTree for key
*/
public Has
svn commit: r1648232 - /jmeter/trunk/test/src/org/apache/jorphan/util/TestConverter.java
Author: fschumacher
Date: Sun Dec 28 17:37:29 2014
New Revision: 1648232
URL: http://svn.apache.org/r1648232
Log:
Test cases for getCalendar(Object, Calendar) and getDate(Object, Date) in
Converter
Added:
jmeter/trunk/test/src/org/apache/jorphan/util/TestConverter.java
Added: jmeter/trunk/test/src/org/apache/jorphan/util/TestConverter.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jorphan/util/TestConverter.java?rev=1648232&view=auto
==
--- jmeter/trunk/test/src/org/apache/jorphan/util/TestConverter.java (added)
+++ jmeter/trunk/test/src/org/apache/jorphan/util/TestConverter.java Sun Dec 28
17:37:29 2014
@@ -0,0 +1,136 @@
+/*
+ * 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.jorphan.util;
+
+import java.text.DateFormat;
+import java.util.Arrays;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+
+import junit.framework.TestCase;
+
+import org.junit.Test;
+
+/**
+ * Tests for {@link Converter}
+ *
+ */
+public class TestConverter extends TestCase {
+
+/**
+ * Test {@link Converter#getCalendar(Object, Calendar)} with a given Date
+ * and null as default value
+ */
+@Test
+public void testGetCalendarObjectCalendarWithTimeAndNullDefault() {
+Calendar cal = new GregorianCalendar();
+Date time = cal.getTime();
+assertEquals(cal, Converter.getCalendar(time, null));
+}
+
+/**
+ * Test {@link Converter#getCalendar(Object, Calendar)} with null as Date
+ * and a sensible default value
+ */
+@Test
+public void testGetCalendarObjectCalendarWithNullAndCalendarAsDefault() {
+Calendar cal = new GregorianCalendar();
+assertEquals(cal, Converter.getCalendar(null, cal));
+}
+
+/**
+ * Test {@link Converter#getCalendar(Object, Calendar)} with correctly
+ * formatted strings and null as default value
+ */
+@Test
+public void testGetCalendarObjectCalendarWithValidStringAndNullDefault() {
+Calendar cal = new GregorianCalendar();
+cal.set(Calendar.HOUR_OF_DAY, 0);
+cal.set(Calendar.MINUTE, 0);
+cal.set(Calendar.SECOND, 0);
+cal.set(Calendar.MILLISECOND, 0);
+Date time = cal.getTime();
+for (int formatId : Arrays.asList(DateFormat.SHORT, DateFormat.MEDIUM,
+DateFormat.LONG, DateFormat.FULL)) {
+DateFormat formatter = DateFormat.getDateInstance(formatId);
+assertEquals(cal,
+Converter.getCalendar(formatter.format(time), null));
+}
+}
+
+/**
+ * Test {@link Converter#getCalendar(Object, Calendar)} with an invalid
+ * string and null as default value
+ */
+@Test
+public void testGetCalendarObjectCalendarWithInvalidStringAndNullDefault()
{
+assertEquals(null, Converter.getCalendar("invalid date", null));
+}
+
+/**
+ * Test {@link Converter#getDate(Object, Date)} with a given Date
+ * and null as default value
+ */
+@Test
+public void testGetDateObjectDateWithTimeAndNullDefault() {
+Date time = new Date();
+assertEquals(time, Converter.getDate(time, null));
+}
+
+/**
+ * Test {@link Converter#getDate(Object, Date)} with null as Date
+ * and a sensible default value
+ */
+@Test
+public void testGetDateObjectDateWithNullAndDateAsDefault() {
+Date date = new Date();
+assertEquals(date, Converter.getDate(null, date));
+}
+
+/**
+ * Test {@link Converter#getDate(Object, Date)} with correctly
+ * formatted strings and null as default value
+ */
+@Test
+public void testGetDateObjectDateWithValidStringAndNullDefault() {
+Calendar cal = new GregorianCalendar();
+cal.set(Calendar.HOUR_OF_DAY, 0);
+cal.set(Calendar.MINUTE, 0);
+cal.set(Calendar.SECOND, 0);
+cal.set(Calendar.MILLISECOND, 0);
+Date time = cal.getTime();
+for (int formatId : Arrays.asList(DateFormat.SHORT, DateFormat.MEDIUM,
+DateFormat.LONG, DateFormat.FULL)) {
svn commit: r1648235 - /jmeter/trunk/test/src/org/apache/jorphan/reflect/TestClassTools.java
Author: fschumacher Date: Sun Dec 28 17:44:10 2014 New Revision: 1648235 URL: http://svn.apache.org/r1648235 Log: Add missing license header Modified: jmeter/trunk/test/src/org/apache/jorphan/reflect/TestClassTools.java Modified: jmeter/trunk/test/src/org/apache/jorphan/reflect/TestClassTools.java URL: http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jorphan/reflect/TestClassTools.java?rev=1648235&r1=1648234&r2=1648235&view=diff == --- jmeter/trunk/test/src/org/apache/jorphan/reflect/TestClassTools.java (original) +++ jmeter/trunk/test/src/org/apache/jorphan/reflect/TestClassTools.java Sun Dec 28 17:44:10 2014 @@ -1,3 +1,20 @@ +/* + * 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.jorphan.reflect; import junit.framework.TestCase;
svn commit: r1648239 - in /jmeter/trunk/src/jorphan/org/apache/jorphan: reflect/Functor.java util/JOrphanUtils.java util/XMLBuffer.java
Author: fschumacher
Date: Sun Dec 28 18:26:25 2014
New Revision: 1648239
URL: http://svn.apache.org/r1648239
Log:
Bug 57193: Add param and return tags to javadoc
Bugzilla Id: 57193
Modified:
jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/Functor.java
jmeter/trunk/src/jorphan/org/apache/jorphan/util/JOrphanUtils.java
jmeter/trunk/src/jorphan/org/apache/jorphan/util/XMLBuffer.java
Modified: jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/Functor.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/Functor.java?rev=1648239&r1=1648238&r2=1648239&view=diff
==
--- jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/Functor.java (original)
+++ jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/Functor.java Sun Dec 28
18:26:25 2014
@@ -27,35 +27,41 @@ import org.apache.log.Logger;
/**
* Implements function call-backs.
- *
+ *
* Functors may be defined for instance objects or classes.
- *
+ *
* The method is created on first use, which allows the invokee (class or
instance)
* to be omitted from the constructor.
- *
+ *
* The class name takes precedence over the instance.
- *
+ *
* If a functor is created with a particular instance, then that is used for
all future calls;
* if an object is provided, it is ignored.
* This allows easy override of the table model behaviour.
- *
+ *
* If an argument list is provided in the constructor, then that is ignored in
subsequent invoke() calls.
- *
+ *
* Usage:
- * f = new Functor("methodName")
- * o = f.invoke(object) - OR -
- * o = f.invoke(object,params)
- *
- * f2 = new Functor(object,"methodName");
- * o = f2.invoke() - OR -
- * o = f2.invoke(params)
*
- * f3 = new Functor(class,"methodName");
- * o = f3.invoke(object) - will be ignored
- * o = f3.invoke() - OR -
- * o = f3.invoke(params)
- * o = f3.invoke(object,params) - object will be ignored
+ *
+ * f = new Functor("methodName");
+ * o = f.invoke(object); // - OR -
+ * o = f.invoke(object, params);
+ *
+ *
+ *
+ * f2 = new Functor(object, "methodName");
+ * o = f2.invoke(); // - OR -
+ * o = f2.invoke(params);
+ *
*
+ *
+ * f3 = new Functor(class, "methodName");
+ * o = f3.invoke(object); // - will be ignored
+ * o = f3.invoke(); // - OR -
+ * o = f3.invoke(params);
+ * o = f3.invoke(object, params); // - object will be ignored
+ *
*/
public class Functor {
private static final Logger log = LoggingManager.getLoggerForClass();
@@ -130,7 +136,7 @@ public class Functor {
*
* @param _invokee object on which to invoke the method
* @param _methodName method name
- * @param _types
+ * @param _types types of arguments to be used
*/
public Functor(Object _invokee, String _methodName, Class[] _types) {
this(null, _invokee, _methodName, null, _types);
@@ -143,7 +149,7 @@ public class Functor {
*
* @param _clazz the class in which to find the method
* @param _methodName method name
- * @param _types
+ * @param _types types of arguments to be used
*/
public Functor(Class _clazz, String _methodName, Class[] _types) {
this(_clazz, null, _methodName, null, _types);
@@ -193,7 +199,7 @@ public class Functor {
* which must be of the same type as the initial invokee.
*
* @param _methodName method name
- * @param _args
+ * @param _args arguments to be used
*/
public Functor(String _methodName, Object[] _args) {
this(null, null, _methodName, _args, null);
@@ -308,12 +314,15 @@ public class Functor {
*
* If the invokee was provided at construction time, then this invokee
will be ignored.
* If actual arguments were provided at construction time, then arguments
will be ignored.
+ * @param p_invokee invokee to use, if no class or invokee was provided at
construction time
+ * @param p_args arguments to use
+ * @return result of invocation
*
*/
public Object invoke(Object p_invokee, Object[] p_args) {
return doInvoke(clazz != null ? clazz : p_invokee.getClass(), // Use
constructor class if present
invokee != null ? invokee : p_invokee, // use invokee
if provided
-args != null? args : p_args);// use argumenrs if
provided
+args != null? args : p_args);// use arguments if
provided
}
/*
@@ -361,10 +370,13 @@ public class Functor {
/**
* Check if a read Functor method is valid.
+ *
+ * @param _invokee
+ *instance on which the method should be tested
*
* @deprecated ** for use by Unit test code only **
*
- * @return true if method exists
+ * @return true if method exists
*/
@Deprecated
public boolean checkMethod(Object _invokee){
@@
svn commit: r1648709 - in /jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http: control/AuthManager.java control/Cookie.java util/ConversionUtils.java util/DOMPool.java
Author: fschumacher
Date: Wed Dec 31 14:48:21 2014
New Revision: 1648709
URL: http://svn.apache.org/r1648709
Log:
Bug 57193: Add param and return tags to javadoc
Bugzilla Id: 57193
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/Cookie.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/ConversionUtils.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/DOMPool.java
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java?rev=1648709&r1=1648708&r2=1648709&view=diff
==
---
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java
(original)
+++
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/AuthManager.java
Wed Dec 31 14:48:21 2014
@@ -134,6 +134,21 @@ public class AuthManager extends ConfigT
/**
* Update an authentication record.
+ *
+ * @param index
+ *index at which position the record should be set
+ * @param url
+ *url for which the authentication record should be used
+ * @param user
+ *name of the user
+ * @param pass
+ *password of the user
+ * @param domain
+ *domain of the user
+ * @param realm
+ *realm of the site
+ * @param mechanism
+ *authentication {@link Mechanism} to use
*/
public void set(int index, String url, String user, String pass, String
domain, String realm, Mechanism mechanism) {
Authorization auth = new Authorization(url, user, pass, domain, realm,
mechanism);
@@ -170,6 +185,10 @@ public class AuthManager extends ConfigT
/**
* Return the record at index i
+ *
+ * @param i
+ *index of the record to get
+ * @return authorization record at index i
*/
public Authorization get(int i) {
return (Authorization) getAuthObjects().get(i).getObjectValue();
@@ -233,14 +252,25 @@ public class AuthManager extends ConfigT
}
/**
- * @return boolean true if an authorization is setup for url
+ * Tests whether an authorization record is available for a given URL
+ *
+ * @param url
+ *{@link URL} for which an authorization record should be
+ *available
+ * @return true if an authorization is setup for url,
+ * false otherwise
*/
public boolean hasAuthForURL(URL url) {
return getAuthForURL(url) != null;
}
/**
- * @return Subject if Auth Scheme uses Subject and an authorization is
setup for url
+ * Get a {@link Subject} for a given URL, if available
+ *
+ * @param url
+ *{@link URL} for which the subject was asked
+ * @return Subject if Auth Scheme uses Subject and an authorization is
setup
+ * for url, null otherwise
*/
public Subject getSubjectForUrl(URL url) {
Authorization authorization = getAuthForURL(url);
@@ -258,7 +288,7 @@ public class AuthManager extends ConfigT
/**
* Add newAuthorization if it does not already exist
- * @param newAuthorization
+ * @param newAuthorization authorization to be added
*/
public void addAuth(Authorization newAuthorization) {
boolean alreadyExists=false;
@@ -296,6 +326,11 @@ public class AuthManager extends ConfigT
/**
* Save the authentication data to a file.
+ *
+ * @param authFile
+ *path of the file to save the authentication data to
+ * @throws IOException
+ * when writing to the file fails
*/
public void save(String authFile) throws IOException {
File file = new File(authFile);
@@ -319,6 +354,11 @@ public class AuthManager extends ConfigT
/**
* Add authentication data from a file.
+ *
+ * @param authFile
+ *path to the file to read the authentication data from
+ * @throws IOException
+ * when reading the data fails
*/
public void addFile(String authFile) throws IOException {
File file = new File(authFile);
@@ -370,6 +410,9 @@ public class AuthManager extends ConfigT
/**
* Remove an authentication record.
+ *
+ * @param index
+ *index of the authentication record to remove
*/
public void remove(int index) {
getAuthObjects().remove(index);
@@ -389,6 +432,8 @@ public class AuthManager extends ConfigT
/**
* Return the number of records.
+ *
+ * @return the number of records
*/
svn commit: r1648732 - in /jmeter/trunk/src: junit/org/apache/jmeter/protocol/java/sampler/ monitor/components/org/apache/jmeter/monitor/util/ monitor/components/org/apache/jmeter/visualizers/ monitor
Author: fschumacher
Date: Wed Dec 31 17:04:58 2014
New Revision: 1648732
URL: http://svn.apache.org/r1648732
Log:
Bug 57193: Add param and return tags to javadoc
Bugzilla Id: 57193
Modified:
jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/sampler/JUnitSampler.java
jmeter/trunk/src/monitor/components/org/apache/jmeter/monitor/util/Stats.java
jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorAccumModel.java
jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorStats.java
jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/parser/MonitorHandler.java
jmeter/trunk/src/monitor/model/org/apache/jmeter/monitor/parser/ParserImpl.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/NVPair.java
jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/mail/sampler/MailReaderSampler.java
Modified:
jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/sampler/JUnitSampler.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/sampler/JUnitSampler.java?rev=1648732&r1=1648731&r2=1648732&view=diff
==
---
jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/sampler/JUnitSampler.java
(original)
+++
jmeter/trunk/src/junit/org/apache/jmeter/protocol/java/sampler/JUnitSampler.java
Wed Dec 31 17:04:58 2014
@@ -142,7 +142,7 @@ public class JUnitSampler extends Abstra
/**
* Set the string label used to create an instance of the
* test with the string constructor.
- * @param constr
+ * @param constr the string passed to the constructor
*/
public void setConstructorString(String constr)
{
@@ -150,7 +150,7 @@ public class JUnitSampler extends Abstra
}
/**
- * get the string passed to the string constructor
+ * @return the string passed to the string constructor
*/
public String getConstructorString()
{
@@ -158,23 +158,23 @@ public class JUnitSampler extends Abstra
}
/**
- * Return the name of the method to test
+ * @return the name of the method to test
*/
public String getMethod(){
return getPropertyAsString(METHOD);
}
/**
- * Method should add the JUnit testXXX method to the list at
+ * Method should add the JUnit testXXX method to the list at
* the end, since the sequence matters.
- * @param methodName
+ * @param methodName name of the method to test
*/
public void setMethod(String methodName){
setProperty(METHOD,methodName);
}
/**
- * get the success message
+ * @return the success message
*/
public String getSuccess(){
return getPropertyAsString(SUCCESS);
@@ -182,30 +182,30 @@ public class JUnitSampler extends Abstra
/**
* set the success message
- * @param success
+ * @param success message to be used for success
*/
public void setSuccess(String success){
setProperty(SUCCESS,success);
}
/**
- * get the success code defined by the user
+ * @return the success code defined by the user
*/
public String getSuccessCode(){
return getPropertyAsString(SUCCESSCODE);
}
/**
- * set the succes code. the success code should
+ * Set the success code. The success code should
* be unique.
- * @param code
+ * @param code unique success code
*/
public void setSuccessCode(String code){
setProperty(SUCCESSCODE,code);
}
/**
- * get the failure message
+ * @return the failure message
*/
public String getFailure(){
return getPropertyAsString(FAILURE);
@@ -213,14 +213,14 @@ public class JUnitSampler extends Abstra
/**
* set the failure message
- * @param fail
+ * @param fail the failure message
*/
public void setFailure(String fail){
setProperty(FAILURE,fail);
}
/**
- * The failure code is used by other components
+ * @return The failure code that is used by other components
*/
public String getFailureCode(){
return getPropertyAsString(FAILURECODE);
@@ -228,14 +228,14 @@ public class JUnitSampler extends Abstra
/**
* Provide some unique code to denote a type of failure
- * @param code
+ * @param code unique code to denote the type of failure
*/
public void setFailureCode(String code){
setProperty(FAILURECODE,code);
}
/**
- * return the descriptive error for the test
+ * @return the descriptive error for the test
*/
public String getError(){
return getPropertyAs
svn commit: r1649078 - in /jmeter/trunk/src: monitor/components/org/apache/jmeter/visualizers/ protocol/http/org/apache/jmeter/protocol/http/config/ protocol/jdbc/org/apache/jmeter/protocol/jdbc/ prot
Author: fschumacher
Date: Fri Jan 2 17:06:11 2015
New Revision: 1649078
URL: http://svn.apache.org/r1649078
Log:
Bug 57193: Add param and return tags to javadoc
Bugzilla Id: 57193
Modified:
jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthPanel.java
jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorPerformancePanel.java
jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/ServerPanel.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/MultipartUrlConfig.java
jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/JDBCTestElementBeanInfoSupport.java
jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/Utils.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ClientPool.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/InitialContextFactory.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/Publisher.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/client/ReceiveSubscriber.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSPropertiesPanel.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/control/gui/JMSSamplerGui.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/JMSSampler.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/MessageAdmin.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/PublisherSampler.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/Receiver.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/TemporaryQueueExecutor.java
jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArgument.java
jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LDAPArguments.java
jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPExtSampler.java
jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LdapClient.java
jmeter/trunk/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LdapExtClient.java
jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/gui/SmtpPanel.java
jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/SendMailCommand.java
jmeter/trunk/src/protocol/mail/org/apache/jmeter/protocol/smtp/sampler/protocol/SynchronousTransportListener.java
jmeter/trunk/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/config/MongoDBHolder.java
jmeter/trunk/src/protocol/mongodb/org/apache/jmeter/protocol/mongodb/sampler/MongoScriptRunner.java
jmeter/trunk/src/protocol/native/org/apache/jmeter/protocol/system/SystemSampler.java
jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/BinaryTCPClientImpl.java
jmeter/trunk/src/protocol/tcp/org/apache/jmeter/protocol/tcp/sampler/TCPClient.java
Modified:
jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthPanel.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthPanel.java?rev=1649078&r1=1649077&r2=1649078&view=diff
==
---
jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthPanel.java
(original)
+++
jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorHealthPanel.java
Fri Jan 2 17:06:11 2015
@@ -69,6 +69,7 @@ public class MonitorHealthPanel extends
}
/**
+ * @param model model to use
*
*/
public MonitorHealthPanel(MonitorAccumModel model) {
@@ -111,7 +112,7 @@ public class MonitorHealthPanel extends
/**
*
- * @param model
+ * @param model information about monitored server
*/
@Override
public void addSample(MonitorModel model) {
Modified:
jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorPerformancePanel.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorPerformancePanel.java?rev=1649078&r1=1649077&r2=1649078&view=diff
==
---
jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorPerformancePanel.java
(original)
+++
jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorPerformancePanel.java
Fri Jan 2 17:06:11 2015
@@ -112,6 +112,8 @@ public class MonitorPerformancePanel ext
}
/**
+ * @param model mod
svn commit: r1649126 [2/2] - in /jmeter/trunk: src/functions/org/apache/jmeter/functions/ src/jorphan/org/apache/jorphan/gui/ src/jorphan/org/apache/jorphan/math/ src/jorphan/org/apache/jorphan/reflec
Modified:
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestHTTPMirrorThread.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestHTTPMirrorThread.java?rev=1649126&r1=1649125&r2=1649126&view=diff
==
---
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestHTTPMirrorThread.java
(original)
+++
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestHTTPMirrorThread.java
Fri Jan 2 21:13:05 2015
@@ -72,8 +72,14 @@ public class TestHTTPMirrorThread extend
}
/**
- * Utility method to handle starting the HttpMirrorServer for testing.
- * Also used by TestHTTPSamplersAgainstHttpMirrorServer
+ * Utility method to handle starting the HttpMirrorServer for testing. Also
+ * used by TestHTTPSamplersAgainstHttpMirrorServer
+ *
+ * @param port
+ *port on which the mirror should be started
+ * @return newly created http mirror server
+ * @throws Exception
+ * if something fails
*/
public static HttpMirrorServer startHttpMirror(int port) throws Exception {
HttpMirrorServer server = null;
Modified: jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java?rev=1649126&r1=1649125&r2=1649126&view=diff
==
--- jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java
(original)
+++ jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java Fri Jan
2 21:13:05 2015
@@ -234,7 +234,7 @@ public class PackageTest extends TestCas
/**
* Find I18N resources in classpath
- * @param srcFiledir
+ * @param srcFiledir directory in which the files reside
* @return list of properties files subject to I18N
*/
public static final String[] getResources(File srcFiledir) {
@@ -253,10 +253,16 @@ public class PackageTest extends TestCas
}
/**
- * Find resources matching filenamefiler and adds them to set removing
everything before "/org"
+ * Find resources matching filenamefiler and adds them to set removing
+ * everything before "/org"
+ *
* @param file
+ *directory in which the files reside
* @param set
+ *container into which the names of the files should be added
* @param filenameFilter
+ *filter that the files must satisfy to be included into
+ *set
*/
private static void findFile(File file, Set set,
FilenameFilter filenameFilter) {
@@ -327,7 +333,7 @@ public class PackageTest extends TestCas
/**
* Check all messages are available in one language
- * @throws Exception
+ * @throws Exception if something fails
*/
public void checkI18n() throws Exception {
Map> missingLabelsPerBundle = new
HashMap>();
Modified: jmeter/trunk/test/src/org/apache/jmeter/testelement/BarChartTest.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/testelement/BarChartTest.java?rev=1649126&r1=1649125&r2=1649126&view=diff
==
--- jmeter/trunk/test/src/org/apache/jmeter/testelement/BarChartTest.java
(original)
+++ jmeter/trunk/test/src/org/apache/jmeter/testelement/BarChartTest.java Fri
Jan 2 21:13:05 2015
@@ -34,7 +34,7 @@ public class BarChartTest extends JMeter
private static final Logger log = LoggingManager.getLoggerForClass();
/**
- * @param arg0
+ * @param arg0 name of the test case
*/
public BarChartTest(String arg0) {
super(arg0);
Modified: jmeter/trunk/test/src/org/apache/jmeter/testelement/LineGraphTest.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/testelement/LineGraphTest.java?rev=1649126&r1=1649125&r2=1649126&view=diff
==
--- jmeter/trunk/test/src/org/apache/jmeter/testelement/LineGraphTest.java
(original)
+++ jmeter/trunk/test/src/org/apache/jmeter/testelement/LineGraphTest.java Fri
Jan 2 21:13:05 2015
@@ -34,7 +34,7 @@ public class LineGraphTest extends JMete
private static final Logger log = LoggingManager.getLoggerForClass();
/**
- * @param arg0
+ * @param arg0 name of the test case
*/
public LineGraphTest(String arg0) {
super(arg0);
svn commit: r1649126 [1/2] - in /jmeter/trunk: src/functions/org/apache/jmeter/functions/ src/jorphan/org/apache/jorphan/gui/ src/jorphan/org/apache/jorphan/math/ src/jorphan/org/apache/jorphan/reflec
Author: fschumacher Date: Fri Jan 2 21:13:05 2015 New Revision: 1649126 URL: http://svn.apache.org/r1649126 Log: Bug 57193: Add param and return tags to javadoc Bugzilla Id: 57193 Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/XPathWrapper.java jmeter/trunk/src/jorphan/org/apache/jorphan/gui/DefaultTreeTableModel.java jmeter/trunk/src/jorphan/org/apache/jorphan/gui/GuiUtils.java jmeter/trunk/src/jorphan/org/apache/jorphan/gui/JTreeTable.java jmeter/trunk/src/jorphan/org/apache/jorphan/math/StatCalculator.java jmeter/trunk/src/jorphan/org/apache/jorphan/reflect/ClassFinder.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CacheManager.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieHandler.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/CookieManager.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/DNSCacheManager.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HC3CookieHandler.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/Header.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HeaderManager.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/gui/WebServiceSamplerGui.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/gui/HTTPFileArgsPanel.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserSequence.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HTMLParser.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParsingUtils.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/JsoupBasedHtmlParser.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/RegexpHTMLParser.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/URLCollection.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Daemon.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/FormCharSetFinder.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HttpWebdav.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/PostWriter.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/SoapSampler.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/WebServiceSampler.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPArgument.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPFileArg.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPResultConverter.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/WSDLException.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/WSDLHelper.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/Filter.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/Generator.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogParser.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/OrderPreservingLogParser.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/StandardGenerator.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/visualizers/RequestViewHTTP.java jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java jmeter/trunk/test/src/org/apache/jmeter/control/TestIfController.java jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestCookieManager.java jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestHTTPMirrorThread.java jmeter/trunk/test/src/org/apache/jmeter/resources/PackageTest.java jmeter/trunk/test/src/org/apache/jmeter/testelement/BarChartTest.java jmeter/trunk/test/src/org/apache/jmeter/testelement/LineGraphTest.java Modified: jmeter/trunk/src/functions/org/apache/jmeter/functions/XPathWrapper.java URL: http://svn.apache.org/viewvc/jmeter/trunk/src/functions/org/apache/jmeter
svn commit: r1649318 - in /jmeter/trunk/src: components/org/apache/jmeter/visualizers/backend/ components/org/apache/jmeter/visualizers/backend/graphite/ core/org/apache/jmeter/reporters/ core/org/apa
Author: fschumacher
Date: Sun Jan 4 12:14:41 2015
New Revision: 1649318
URL: http://svn.apache.org/r1649318
Log:
Bug 57193: Add param and return tags to javadoc
Bugzilla Id: 57193
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListener.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListenerClient.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListenerGui.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/GraphiteMetricsSender.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/SocketConnectionInfos.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/SocketOutputStream.java
jmeter/trunk/src/core/org/apache/jmeter/reporters/SummariserRunningSample.java
jmeter/trunk/src/core/org/apache/jmeter/testelement/TestElementTraverser.java
jmeter/trunk/src/core/org/apache/jmeter/visualizers/RunningSample.java
jmeter/trunk/src/core/org/apache/jmeter/visualizers/SamplingStatCalculator.java
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListener.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListener.java?rev=1649318&r1=1649317&r2=1649318&view=diff
==
---
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListener.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListener.java
Sun Jan 4 12:14:41 2015
@@ -466,7 +466,7 @@ public class BackendListener extends Abs
/**
* Sets the queue size
*
- * @param queueSize
+ * @param queueSize the size of the queue
*
*/
public void setQueueSize(String queueSize) {
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListenerClient.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListenerClient.java?rev=1649318&r1=1649317&r2=1649318&view=diff
==
---
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListenerClient.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListenerClient.java
Sun Jan 4 12:14:41 2015
@@ -70,6 +70,7 @@ public interface BackendListenerClient {
* @param context
*the context to run with. This provides access to
*initialization parameters.
+ * @throws Exception when setup fails
*/
void setupTest(BackendListenerContext context) throws Exception;
@@ -100,6 +101,7 @@ public interface BackendListenerClient {
* @param context
*the context to run with. This provides access to
*initialization parameters.
+ * @throws Exception when tear down fails
*/
void teardownTest(BackendListenerContext context) throws Exception;
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListenerGui.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListenerGui.java?rev=1649318&r1=1649317&r2=1649318&view=diff
==
---
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListenerGui.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListenerGui.java
Sun Jan 4 12:14:41 2015
@@ -154,7 +154,7 @@ public class BackendListenerGui extends
* Handle action events for this component. This method currently handles
* events for the classname combo box.
*
- * @param evt
+ * @param event
*the ActionEvent to be handled
*/
@Override
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java?rev=1649318&r1=1649317&r2=1649318&view=diff
==
---
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/graphite/GraphiteBackendListenerClient.java
Sun Jan 4 12:14:41 2015
@@ -40,7 +40,7 @@ import org.apache.log.Logger;
/**
* Graphite based Listener using Pickle Protocol
-
svn commit: r1649407 - /jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java
Author: fschumacher Date: Sun Jan 4 20:21:55 2015 New Revision: 1649407 URL: http://svn.apache.org/r1649407 Log: Replace invalid character with corresponding html entity in javadoc Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java?rev=1649407&r1=1649406&r2=1649407&view=diff == --- jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java (original) +++ jmeter/trunk/src/core/org/apache/jmeter/gui/action/LookAndFeelCommand.java Sun Jan 4 20:21:55 2015 @@ -78,8 +78,8 @@ public class LookAndFeelCommand implemen * Get LookAndFeel classname from the following properties: * * User preferences key: "laf" - * jmeter.laf.<os.name> - lowercased; spaces replaced by '_' - * jmeter.laf.<os.family> - lowercased. + * jmeter.laf.<os.name> - lowercased; spaces replaced by '_' + * jmeter.laf.<os.family> - lowercased. * jmeter.laf * UIManager.getCrossPlatformLookAndFeelClassName() *
svn commit: r1649423 - in /jmeter/trunk/src: core/org/apache/jmeter/testelement/property/ protocol/http/org/apache/jmeter/protocol/http/sampler/ reports/org/apache/jmeter/testelement/
Author: fschumacher
Date: Sun Jan 4 21:13:50 2015
New Revision: 1649423
URL: http://svn.apache.org/r1649423
Log:
Bug 57193: Add param and return tags to javadoc
Bugzilla Id: 57193
Modified:
jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
jmeter/trunk/src/core/org/apache/jmeter/testelement/property/JMeterProperty.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
jmeter/trunk/src/reports/org/apache/jmeter/testelement/LineChart.java
Modified:
jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java?rev=1649423&r1=1649422&r2=1649423&view=diff
==
---
jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
Sun Jan 4 21:13:50 2015
@@ -252,6 +252,8 @@ public abstract class AbstractProperty i
/**
* Get the property type for this property. Used to convert raw values into
* JMeterProperties.
+ *
+ * @return property type of this property
*/
protected Class getPropertyType() {
return getClass();
@@ -318,6 +320,10 @@ public abstract class AbstractProperty i
/**
* Given a Map, it converts the Map into a collection of JMeterProperty
* objects, appropriate for a MapProperty object.
+ *
+ * @param coll
+ *Map to convert
+ * @return converted Map
*/
protected Map normalizeMap(Map coll) {
if (coll.isEmpty()) {
Modified:
jmeter/trunk/src/core/org/apache/jmeter/testelement/property/JMeterProperty.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/JMeterProperty.java?rev=1649423&r1=1649422&r2=1649423&view=diff
==
---
jmeter/trunk/src/core/org/apache/jmeter/testelement/property/JMeterProperty.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/testelement/property/JMeterProperty.java
Sun Jan 4 21:13:50 2015
@@ -26,7 +26,7 @@ public interface JMeterProperty extends
/**
* Returns whether the property is a running version.
*
- * @return boolean
+ * @return flag whether this property is a running version
*/
boolean isRunningVersion();
@@ -34,14 +34,14 @@ public interface JMeterProperty extends
* The name of the property. Typically this should match the name that keys
* the property's location in the test elements Map.
*
- * @return String
+ * @return the name of the property
*/
String getName();
/**
* Set the property name.
*
- * @param name
+ * @param name the name of the property
*/
void setName(String name);
@@ -54,7 +54,7 @@ public interface JMeterProperty extends
* value. A non-running version property will return functions as their
* uncompiled string representation.
*
- * @param runningVersion
+ * @param runningVersion flag whether this property is a running version
*/
void setRunningVersion(boolean runningVersion);
@@ -72,7 +72,7 @@ public interface JMeterProperty extends
* But for collection properties and test element properties, more complex
* behavior is required.
*
- * @param prop
+ * @param prop the property object to merge into this property
*/
void mergeIn(JMeterProperty prop);
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java?rev=1649423&r1=1649422&r2=1649423&view=diff
==
---
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
(original)
+++
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBase.java
Sun Jan 4 21:13:50 2015
@@ -1546,9 +1546,9 @@ public abstract class HTTPSamplerBase ex
* an HTTPSamplerResult container parameter instead of a
* boolean:areFollowingRedirect.
*
- * @param areFollowingRedirect
- * @param frameDepth
- * @param res
+ * @param areFollowingRedirect flag whether we are getting a redirect
target
+ * @param frameDepth Depth of this target in the frame structure. Used
only to prevent infinite recursion.
+ * @param res sample result to process
* @return the sample result
*/
protected HTTPSampleResult resultProcessing(boolean areFollowingRedirect,
int frameDepth, HTTPSampleResult res
svn commit: r1649516 - in /jmeter/trunk: src/components/org/apache/jmeter/timers/ src/core/org/apache/jmeter/control/ src/core/org/apache/jmeter/save/converters/ src/core/org/apache/jmeter/util/ src/c
Author: fschumacher
Date: Mon Jan 5 12:33:41 2015
New Revision: 1649516
URL: http://svn.apache.org/r1649516
Log:
Bug 57193: Add param and return tags to javadoc
Bugzilla Id: 57193
Modified:
jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java
jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java
jmeter/trunk/src/core/org/apache/jmeter/save/converters/SampleResultConverter.java
jmeter/trunk/src/core/org/apache/jmeter/util/BeanShellTestElement.java
jmeter/trunk/src/core/org/apache/jmeter/visualizers/gui/AbstractVisualizer.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/DefaultSamplerCreator.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPAbstractImpl.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPHC4Impl.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/Filter.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogParser.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/SharedTCLogParser.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java
jmeter/trunk/src/reports/org/apache/jmeter/testelement/BarChart.java
jmeter/trunk/test/src/org/apache/jorphan/test/AllTests.java
Modified:
jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java?rev=1649516&r1=1649515&r2=1649516&view=diff
==
---
jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/timers/ConstantThroughputTimer.java
Mon Jan 5 12:33:41 2015
@@ -158,7 +158,11 @@ public class ConstantThroughputTimer ext
}
/**
+ * Calculate the target time by adding the result of private method
+ * calculateDelay() to the given currentTime
+ *
* @param currentTime
+ *time in ms
* @return new Target time
*/
// TODO - is this used? (apart from test code)
Modified: jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java?rev=1649516&r1=1649515&r2=1649516&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/control/GenericController.java Mon
Jan 5 12:33:41 2015
@@ -137,25 +137,25 @@ public class GenericController extends A
*
*
*
- * If isDone, returns null.
+ * If {@link #isDone()} is true, returns null.
*
*
*
* Gets the list element using current pointer.
- * If this is null, calls {@link #nextIsNull()}.
+ * If this is null, calls {@link #nextIsNull()}.
*
*
*
- * If the list element is a sampler, calls {@link
#nextIsASampler(Sampler)},
+ * If the list element is a {@link Sampler}, calls {@link
#nextIsASampler(Sampler)},
* otherwise calls {@link #nextIsAController(Controller)}
*
*
*
- * If any of the called methods throws NextIsNullException, returns null,
+ * If any of the called methods throws {@link NextIsNullException},
returns null,
* otherwise the value obtained above is returned.
*
*
- * @return the next sampler or null
+ * @return the next sampler or null
*/
@Override
public Sampler next() {
@@ -214,12 +214,13 @@ public class GenericController extends A
}
/**
- * Called by next() if the element is a Controller,
- * and returns the next sampler from the controller.
- * If this is null, then updates the current pointer and makes recursive
call to next().
- * @param controller
+ * Called by {@link #next()} if the element is a Controller, and returns
the
+ * next sampler from the controller. If this is null, then
+ * updates the current pointer and makes recursive call to {@link #next()}.
+ *
+ * @param controller the current next element
* @return the next sampler
- * @throws NextIsNullException
+ * @throws NextIsNullException when the end of the list has already been
reached
*/
protected Sampler nextIsAController(Controller controller) throws
NextIsNullException {
Sampler sampler = controller.next();
@@ -231,13 +232,14 @@ public class GenericController extends A
}
/**
- * Increment
svn commit: r1649517 - in /jmeter/trunk/src: core/org/apache/jmeter/visualizers/gui/ monitor/components/org/apache/jmeter/visualizers/ protocol/http/org/apache/jmeter/protocol/http/sampler/ protocol/h
Author: fschumacher
Date: Mon Jan 5 12:34:41 2015
New Revision: 1649517
URL: http://svn.apache.org/r1649517
Log:
Javadoc does not like empty paragraphs, so remove them
Modified:
jmeter/trunk/src/core/org/apache/jmeter/visualizers/gui/AbstractVisualizer.java
jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorGraph.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/StandardGenerator.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java
Modified:
jmeter/trunk/src/core/org/apache/jmeter/visualizers/gui/AbstractVisualizer.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/visualizers/gui/AbstractVisualizer.java?rev=1649517&r1=1649516&r2=1649517&view=diff
==
---
jmeter/trunk/src/core/org/apache/jmeter/visualizers/gui/AbstractVisualizer.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/visualizers/gui/AbstractVisualizer.java
Mon Jan 5 12:34:41 2015
@@ -97,8 +97,6 @@ import org.apache.log.Logger;
* methods to create and modify your alternate ResultCollector. For an example
* of this, see the
* {@link org.apache.jmeter.visualizers.MailerVisualizer MailerVisualizer}.
- *
- *
*/
public abstract class AbstractVisualizer
extends AbstractListenerGui
Modified:
jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorGraph.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorGraph.java?rev=1649517&r1=1649516&r2=1649517&view=diff
==
---
jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorGraph.java
(original)
+++
jmeter/trunk/src/monitor/components/org/apache/jmeter/visualizers/MonitorGraph.java
Mon Jan 5 12:34:41 2015
@@ -28,7 +28,6 @@ import org.apache.jmeter.samplers.Cleara
/**
* MonitorGraph will draw the performance history of a given server. It
displays
* 4 lines:
- *
*/
public class MonitorGraph extends JComponent implements MonitorGuiListener,
Clearable {
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java?rev=1649517&r1=1649516&r2=1649517&view=diff
==
---
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java
(original)
+++
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java
Mon Jan 5 12:34:41 2015
@@ -35,7 +35,6 @@ import org.apache.log.Logger;
* Description:
*
* AccessLogSampler is responsible for a couple of things:
- *
*
* creating instances of Generator
* creating instances of Parser
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/StandardGenerator.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/StandardGenerator.java?rev=1649517&r1=1649516&r2=1649517&view=diff
==
---
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/StandardGenerator.java
(original)
+++
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/StandardGenerator.java
Mon Jan 5 12:34:41 2015
@@ -50,8 +50,6 @@ import org.apache.log.Logger;
* Then the samplers should be added to the thread group. Listeners shouldn't
be
* added and should be left up to the user. One option is to provide
parameters,
* so the user can pass the desired listener to the tool.
- *
- *
*/
public class StandardGenerator implements Generator, Serializable {
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java?rev=1649517&r1=1649516&r2=1649517&view=diff
==
---
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java
(original)
+++
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/TCLogParser.java
Mon Jan 5 12:34:41 2015
@@ -51,7 +51,6 @@ import org.apache.log.Logger;
* BufferedReader. The implementation uses StringTokenizer to create tokens.
*
* The parse algorithm is the following:
- *
*
* cleans the entry by looking for backs
svn commit: r1649531 - in /jmeter/trunk/src: components/org/apache/jmeter/control/ components/org/apache/jmeter/visualizers/ core/org/apache/jmeter/engine/util/ core/org/apache/jmeter/gui/util/ jorpha
Author: fschumacher
Date: Mon Jan 5 14:18:13 2015
New Revision: 1649531
URL: http://svn.apache.org/r1649531
Log:
Bug 57193: Add param and return tags to javadoc
Bugzilla Id: 57193
Modified:
jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/Spline3.java
jmeter/trunk/src/core/org/apache/jmeter/engine/util/FunctionParser.java
jmeter/trunk/src/core/org/apache/jmeter/gui/util/HeaderAsPropertyRenderer.java
jmeter/trunk/src/jorphan/org/apache/commons/cli/avalon/Token.java
jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java
jmeter/trunk/src/jorphan/org/apache/jorphan/exec/StreamCopier.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/config/gui/UrlConfigGui.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/Authorization.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/HC4CookieHandler.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/Proxy.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPJavaImpl.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/WSDLHelper.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/Generator.java
jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/AbstractJDBCTestElement.java
jmeter/trunk/src/protocol/jms/org/apache/jmeter/protocol/jms/sampler/QueueExecutor.java
Modified:
jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java?rev=1649531&r1=1649530&r2=1649531&view=diff
==
---
jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/control/IncludeController.java
Mon Jan 5 14:18:13 2015
@@ -118,6 +118,8 @@ public class IncludeController extends G
/**
* load the included elements using SaveService
+ *
+ * @return tree with loaded elements
*/
protected HashTree loadIncludedElements() {
// only try to load the JMX test plan if there is one
Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/Spline3.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/Spline3.java?rev=1649531&r1=1649530&r2=1649531&view=diff
==
--- jmeter/trunk/src/components/org/apache/jmeter/visualizers/Spline3.java
(original)
+++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/Spline3.java Mon
Jan 5 14:18:13 2015
@@ -263,6 +263,8 @@ public class Spline3 {
/**
* Test if the Jacobi resolution of the equation system converges. It's OK
* if A has a strong diagonal.
+ *
+ * @return true if equation system converges
*/
protected boolean converge() {
boolean converge = true;
@@ -287,6 +289,13 @@ public class Spline3 {
/**
* Computes the current precision reached.
+ *
+ * @param oldX
+ *old values
+ * @param newX
+ *new values
+ * @return indicator of how different the old and new values are (always
+ * zero or greater, the nearer to zero the more similar)
*/
protected float precision(float[] oldX, float[] newX) {
float N = 0F, D = 0F, erreur = 0F;
Modified:
jmeter/trunk/src/core/org/apache/jmeter/engine/util/FunctionParser.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/engine/util/FunctionParser.java?rev=1649531&r1=1649530&r2=1649531&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/engine/util/FunctionParser.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/engine/util/FunctionParser.java Mon
Jan 5 14:18:13 2015
@@ -51,6 +51,7 @@ class FunctionParser {
* @param value string containing the function / variable references (if
any)
*
* @return list of Strings or Objects representing functions
+ * @throws InvalidVariableException when evaluation of variables fail
*/
LinkedList compileString(String value) throws
InvalidVariableException {
StringReader reader = new StringReader(value);
@@ -111,6 +112,7 @@ class FunctionParser {
*
* @param reader points to input after the "${"
* @return the function or variable object (or a String)
+ * @throws InvalidVariableException when evaluation of variables fail
*/
svn commit: r1649775 - in /jmeter/trunk/src: core/org/apache/jmeter/config/gui/ core/org/apache/jmeter/control/ core/org/apache/jmeter/gui/ core/org/apache/jmeter/gui/action/ core/org/apache/jmeter/sa
Author: fschumacher
Date: Tue Jan 6 11:02:22 2015
New Revision: 1649775
URL: http://svn.apache.org/r1649775
Log:
Bug 57193: Add param and return tags to javadoc
Bugzilla Id: 57193
Modified:
jmeter/trunk/src/core/org/apache/jmeter/config/gui/RowDetailDialog.java
jmeter/trunk/src/core/org/apache/jmeter/control/ReplaceableController.java
jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractScopedJMeterGuiComponent.java
jmeter/trunk/src/core/org/apache/jmeter/gui/Searchable.java
jmeter/trunk/src/core/org/apache/jmeter/gui/UndoHistory.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/AbstractAction.java
jmeter/trunk/src/core/org/apache/jmeter/samplers/AsynchSampleSender.java
jmeter/trunk/src/core/org/apache/jmeter/samplers/BatchSampleSender.java
jmeter/trunk/src/core/org/apache/jmeter/samplers/DataStrippingSampleSender.java
jmeter/trunk/src/core/org/apache/jmeter/samplers/DiskStoreSampleSender.java
jmeter/trunk/src/core/org/apache/jmeter/samplers/HoldSampleSender.java
jmeter/trunk/src/core/org/apache/jmeter/samplers/RemoteSampleListener.java
jmeter/trunk/src/core/org/apache/jmeter/samplers/StandardSampleSender.java
jmeter/trunk/src/core/org/apache/jmeter/samplers/StatisticalSampleSender.java
jmeter/trunk/src/core/org/apache/jmeter/testbeans/BeanInfoSupport.java
jmeter/trunk/src/core/org/apache/jmeter/testelement/TestElement.java
jmeter/trunk/src/core/org/apache/jmeter/testelement/TestIterationListener.java
jmeter/trunk/src/core/org/apache/jmeter/testelement/property/NumberProperty.java
jmeter/trunk/src/core/org/apache/jmeter/threads/RemoteThreadsListener.java
jmeter/trunk/src/core/org/apache/jmeter/threads/TestCompilerHelper.java
jmeter/trunk/src/core/org/apache/jmeter/util/JSR223TestElement.java
jmeter/trunk/src/core/org/apache/jmeter/util/SSLManager.java
jmeter/trunk/src/jorphan/org/apache/jorphan/collections/HashTree.java
jmeter/trunk/src/jorphan/org/apache/jorphan/gui/TreeTableModel.java
jmeter/trunk/src/jorphan/org/apache/jorphan/test/UnitTestManager.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/SamplerCreator.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/HTTPSamplerBaseConverter.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/HTTPResultConverter.java
jmeter/trunk/src/reports/org/apache/jmeter/JMeterReport.java
jmeter/trunk/src/reports/org/apache/jmeter/gui/ReportGuiPackage.java
jmeter/trunk/src/reports/org/apache/jmeter/gui/util/DirectoryPanel.java
jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportFileDialoger.java
jmeter/trunk/src/reports/org/apache/jmeter/gui/util/ReportFilePanel.java
jmeter/trunk/src/reports/org/apache/jmeter/testelement/JTLData.java
Modified:
jmeter/trunk/src/core/org/apache/jmeter/config/gui/RowDetailDialog.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/config/gui/RowDetailDialog.java?rev=1649775&r1=1649774&r2=1649775&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/config/gui/RowDetailDialog.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/config/gui/RowDetailDialog.java Tue
Jan 6 11:02:22 2015
@@ -231,7 +231,7 @@ public class RowDetailDialog extends JDi
/**
* Update model values
- * @param actionEvent
+ * @param actionEvent the event that led to this call
*/
protected void doUpdate(ActionEvent actionEvent) {
tableModel.setValueAt(nameTF.getText(), selectedRow, 0);
Modified:
jmeter/trunk/src/core/org/apache/jmeter/control/ReplaceableController.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/control/ReplaceableController.java?rev=1649775&r1=1649774&r2=1649775&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/control/ReplaceableController.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/control/ReplaceableController.java
Tue Jan 6 11:02:22 2015
@@ -42,7 +42,7 @@ public interface ReplaceableController {
/**
* Compute the replacement tree.
*
- * @param context
+ * @param context the starting point of the replacement
*/
void resolveReplacementSubTree(JMeterTreeNode context);
}
Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractScopedJMeterGuiComponent.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractScopedJMeterGuiComponent.java?rev=1649775&r1=1649774&r2=1649775&view=diff
==
---
jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractScopedJMeterGuiComponent.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/gui/AbstractScopedJMeterGuiComp
svn commit: r1649779 - in /jmeter/trunk/src/core/org/apache/jmeter: threads/JMeterContextService.java util/Calculator.java
Author: fschumacher
Date: Tue Jan 6 11:08:06 2015
New Revision: 1649779
URL: http://svn.apache.org/r1649779
Log:
Bug 57193: Since we are not generating javadoc for private classes,
we can not reference to them in javadoc
Bugzilla Id: 57193
Modified:
jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterContextService.java
jmeter/trunk/src/core/org/apache/jmeter/util/Calculator.java
Modified:
jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterContextService.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterContextService.java?rev=1649779&r1=1649778&r2=1649779&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterContextService.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/threads/JMeterContextService.java
Tue Jan 6 11:08:06 2015
@@ -72,9 +72,13 @@ public final class JMeterContextService
}
/**
- * Replace Thread Context by the parameter.
- * Currently only used by {@link
org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase.ASyncSample
HTTPSamplerBase.ASyncSample}
- * @param context {@link JMeterContext}
+ * Replace Thread Context by the parameter. Currently only used by the
+ * private class ASyncSample in
+ * {@link org.apache.jmeter.protocol.http.sampler.HTTPSamplerBase
+ * HTTPSamplerBase}
+ *
+ * @param context
+ *{@link JMeterContext}
*/
public static void replaceContext(JMeterContext context) {
threadContext.remove();
Modified: jmeter/trunk/src/core/org/apache/jmeter/util/Calculator.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/Calculator.java?rev=1649779&r1=1649778&r2=1649779&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/util/Calculator.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/Calculator.java Tue Jan 6
11:08:06 2015
@@ -74,7 +74,6 @@ public class Calculator {
*
* @param newValue the value for the new sample
*
- * @see #addValue(long, int)
* @deprecated Use {@link #addSample(SampleResult)} instead
*/
@Deprecated
@@ -121,7 +120,6 @@ public class Calculator {
* Add details for a sample result, which may consist of multiple samples.
* Updates the number of bytes read, error count, startTime and elapsedTime
* @param res the sample result; might represent multiple values
- * @see #addValue(long, int)
*/
public void addSample(SampleResult res) {
addBytes(res.getBytes());
svn commit: r1649796 - /jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/AbstractBackendListenerClient.java
Author: fschumacher
Date: Tue Jan 6 12:45:31 2015
New Revision: 1649796
URL: http://svn.apache.org/r1649796
Log:
Bug 57193: Use inheritDoc instead of a simple see attribute. The pointed to
method was missing a parameter, too.
Fix javadocs
Bugzilla Id: 57193
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/AbstractBackendListenerClient.java
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/AbstractBackendListenerClient.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/AbstractBackendListenerClient.java?rev=1649796&r1=1649795&r2=1649796&view=diff
==
---
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/AbstractBackendListenerClient.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/AbstractBackendListenerClient.java
Tue Jan 6 12:45:31 2015
@@ -88,7 +88,7 @@ public abstract class AbstractBackendLis
}
/**
- * @see
org.apache.jmeter.visualizers.backend.BackendListenerClient#createSampleResult(org.apache.jmeter.samplers.SampleResult)
+ * {@inheritDoc}
*/
@Override
public SampleResult createSampleResult(BackendListenerContext context,
SampleResult result) {
svn commit: r1649843 - in /jmeter/trunk: src/core/org/apache/jmeter/testelement/WorkBench.java xdocs/changes.xml
Author: fschumacher
Date: Tue Jan 6 15:51:12 2015
New Revision: 1649843
URL: http://svn.apache.org/r1649843
Log:
Remove unused constructor from Workbench
Bugzilla Id: 57418
Modified:
jmeter/trunk/src/core/org/apache/jmeter/testelement/WorkBench.java
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/src/core/org/apache/jmeter/testelement/WorkBench.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testelement/WorkBench.java?rev=1649843&r1=1649842&r2=1649843&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/testelement/WorkBench.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/testelement/WorkBench.java Tue Jan
6 15:51:12 2015
@@ -27,15 +27,6 @@ public class WorkBench extends AbstractT
private static final boolean SAVE_WORKBENCH_DEFAULT = false;
-/**
- * Constructor for the WorkBench object.
- * @param name the name of this element
- * @param isRootNode IGNORED
- */
-public WorkBench(String name, boolean isRootNode) {
-setName(name);
-}
-
public WorkBench() {
}
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1649843&r1=1649842&r2=1649843&view=diff
==
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Tue Jan 6 15:51:12 2015
@@ -225,6 +225,7 @@ See 56357 for deta
57276RMIC no longer needed since Java 5
57310Replace System.getProperty("file.separator") with
File.separator throughout (Also "path.separator" with File.pathSeparator)
57389Fix potential NPE in converters
+57418Remove unused constructor from Workbench
Thanks
svn commit: r1649845 - in /jmeter/trunk: src/core/org/apache/jmeter/testelement/property/NullProperty.java xdocs/changes.xml
Author: fschumacher
Date: Tue Jan 6 15:56:21 2015
New Revision: 1649845
URL: http://svn.apache.org/r1649845
Log:
Remove unused method isTemporary from NullProperty. The method was a leftover
from some refactoring done in 2003.
Bugzilla Id: 57417
Modified:
jmeter/trunk/src/core/org/apache/jmeter/testelement/property/NullProperty.java
jmeter/trunk/xdocs/changes.xml
Modified:
jmeter/trunk/src/core/org/apache/jmeter/testelement/property/NullProperty.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/testelement/property/NullProperty.java?rev=1649845&r1=1649844&r2=1649845&view=diff
==
---
jmeter/trunk/src/core/org/apache/jmeter/testelement/property/NullProperty.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/testelement/property/NullProperty.java
Tue Jan 6 15:56:21 2015
@@ -70,16 +70,6 @@ public final class NullProperty extends
}
/**
- * see JMeterProperty#isTemporary(TestElement)
- * TODO seems to be a relic from the past.
- * @param owner IGNORED
- * @return always true
- */
-public boolean isTemporary(TestElement owner) {
-return true;
-}
-
-/**
* @see JMeterProperty#mergeIn(JMeterProperty)
*/
@Override
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1649845&r1=1649844&r2=1649845&view=diff
==
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Tue Jan 6 15:56:21 2015
@@ -225,6 +225,7 @@ See 56357 for deta
57276RMIC no longer needed since Java 5
57310Replace System.getProperty("file.separator") with
File.separator throughout (Also "path.separator" with File.pathSeparator)
57389Fix potential NPE in converters
+57417Remove unused method isTemporary from NullProperty. This
was a leftover from a refactoring done in 2003.
57418Remove unused constructor from Workbench
svn commit: r1649850 - in /jmeter/trunk: src/components/org/apache/jmeter/visualizers/MailerVisualizer.java xdocs/changes.xml
Author: fschumacher Date: Tue Jan 6 16:06:17 2015 New Revision: 1649850 URL: http://svn.apache.org/r1649850 Log: Remove unused interface ModelListener. Bugzilla Id: 57419 Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java jmeter/trunk/xdocs/changes.xml Modified: jmeter/trunk/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java?rev=1649850&r1=1649849&r2=1649850&view=diff == --- jmeter/trunk/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java (original) +++ jmeter/trunk/src/components/org/apache/jmeter/visualizers/MailerVisualizer.java Tue Jan 6 16:06:17 2015 @@ -397,12 +397,6 @@ public class MailerVisualizer extends Ab mailerModel.setToAddress(addressField.getText()); } -// -// -// Methods to implement the ModelListener. -// -// - /** * Notifies this Visualizer about model-changes. Causes the Visualizer to * query the model about its new state. Modified: jmeter/trunk/xdocs/changes.xml URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1649850&r1=1649849&r2=1649850&view=diff == --- jmeter/trunk/xdocs/changes.xml (original) +++ jmeter/trunk/xdocs/changes.xml Tue Jan 6 16:06:17 2015 @@ -227,6 +227,7 @@ See 56357 for deta 57389Fix potential NPE in converters 57417Remove unused method isTemporary from NullProperty. This was a leftover from a refactoring done in 2003. 57418Remove unused constructor from Workbench +57419Remove unused interface ModelListener. Thanks
svn commit: r1649851 - /jmeter/trunk/src/components/org/apache/jmeter/visualizers/ModelListener.java
Author: fschumacher Date: Tue Jan 6 16:07:05 2015 New Revision: 1649851 URL: http://svn.apache.org/r1649851 Log: Now really remove ModelListener. Bugzilla Id: 57419 Removed: jmeter/trunk/src/components/org/apache/jmeter/visualizers/ModelListener.java
svn commit: r1652472 - /jmeter/trunk/xdocs/usermanual/component_reference.xml
Author: fschumacher Date: Fri Jan 16 17:34:47 2015 New Revision: 1652472 URL: http://svn.apache.org/r1652472 Log: Minor formatting changes for kerberos section Modified: jmeter/trunk/xdocs/usermanual/component_reference.xml Modified: jmeter/trunk/xdocs/usermanual/component_reference.xml URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=1652472&r1=1652471&r2=1652472&view=diff == --- jmeter/trunk/xdocs/usermanual/component_reference.xml (original) +++ jmeter/trunk/xdocs/usermanual/component_reference.xml Fri Jan 16 17:34:47 2015 @@ -3640,24 +3640,24 @@ This was an experimental feature and has Kerberos Configuration: To configure Kerberos you need to setup at least two JVM system properties: --Djava.security.krb5.conf=krb5.conf --Djava.security.auth.login.config=jaas.conf +-Djava.security.krb5.conf=krb5.conf +-Djava.security.auth.login.config=jaas.conf -You can also configure those two properties in file bin/system.properties. -Look at the two sample configuration files (krb5.conf and jaas.conf) located in the jmeter bin folder for references to more documentation, and tweak them to match -your Kerberos configuration. +You can also configure those two properties in the file bin/system.properties. +Look at the two sample configuration files (krb5.conf and jaas.conf) located in the jmeter bin folder +for references to more documentation, and tweak them to match your Kerberos configuration. When generating a SPN for Kerberos SPNEGO authentication IE and Firefox will omit the port number from the url. Chrome has an option (--enable-auth-negotiate-port) to include the port number if it differs from the standard ones (80 and 443). That behavior can be emulated by setting the following jmeter property as below. - -In jmeter.properties or user.properties, set: + + +In jmeter.properties or user.properties, set: -kerberos.spnego.strip_port=false +kerberos.spnego.strip_port=false - Controls:
svn commit: r1654575 - in /jmeter/trunk: src/protocol/http/org/apache/jmeter/protocol/http/control/DNSCacheManager.java test/src/org/apache/jmeter/protocol/http/control/TestDNSCacheManager.java xdocs/
Author: fschumacher
Date: Sat Jan 24 19:51:20 2015
New Revision: 1654575
URL: http://svn.apache.org/r1654575
Log:
Bug 57447 - Use only the user listed DNS Servers, when "use custom DNS resolver"
option is enabled.
Bugzilla Id: 57447
Added:
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestDNSCacheManager.java
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/DNSCacheManager.java
jmeter/trunk/xdocs/changes.xml
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/DNSCacheManager.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/DNSCacheManager.java?rev=1654575&r1=1654574&r2=1654575&view=diff
==
---
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/DNSCacheManager.java
(original)
+++
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/control/DNSCacheManager.java
Sat Jan 24 19:51:20 2015
@@ -42,7 +42,6 @@ import org.xbill.DNS.ExtendedResolver;
import org.xbill.DNS.Lookup;
import org.xbill.DNS.Record;
import org.xbill.DNS.Resolver;
-import org.xbill.DNS.SimpleResolver;
import org.xbill.DNS.TextParseException;
import org.xbill.DNS.Type;
@@ -104,12 +103,17 @@ public class DNSCacheManager extends Con
clone.cache = new LinkedHashMap();
CollectionProperty dnsServers = getServers();
try {
-clone.resolver = new ExtendedResolver();
+String[] serverNames = new String[dnsServers.size()];
PropertyIterator dnsServIt = dnsServers.iterator();
+int index=0;
while (dnsServIt.hasNext()) {
-String dnsServer = dnsServIt.next().getStringValue();
-((ExtendedResolver) clone.resolver).addResolver(new
SimpleResolver(dnsServer));
+serverNames[index] = dnsServIt.next().getStringValue();
+index++;
}
+clone.resolver = new ExtendedResolver(serverNames);
+log.debug("Using DNS Resolvers: "
++ Arrays.asList(((ExtendedResolver) clone.resolver)
+.getResolvers()));
// resolvers will be chosen via round-robin
((ExtendedResolver) clone.resolver).setLoadBalance(true);
} catch (UnknownHostException uhe) {
@@ -146,13 +150,13 @@ public class DNSCacheManager extends Con
*/
private InetAddress[] requestLookup(String host) throws
UnknownHostException {
InetAddress[] addresses = null;
-if (isCustomResolver() && ((ExtendedResolver)
resolver).getResolvers().length > 1) {
+if (isCustomResolver() && ((ExtendedResolver)
resolver).getResolvers().length > 0) {
try {
Lookup lookup = new Lookup(host, Type.A);
lookup.setCache(lookupCache);
lookup.setResolver(resolver);
Record[] records = lookup.run();
-if (records.length == 0) {
+if (records == null || records.length == 0) {
throw new UnknownHostException("Failed to resolve host
name: " + host);
}
addresses = new InetAddress[records.length];
Added:
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestDNSCacheManager.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestDNSCacheManager.java?rev=1654575&view=auto
==
---
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestDNSCacheManager.java
(added)
+++
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/control/TestDNSCacheManager.java
Sat Jan 24 19:51:20 2015
@@ -0,0 +1,42 @@
+/*
+ * 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.protocol.http.control;
+
+import java.net.UnknownHostException;
+
+import org.apache.jmeter.junit.JMeterTestCase;
+import org.junit.Test;
+
svn commit: r1656177 - in /jmeter/trunk: src/components/org/apache/jmeter/visualizers/ src/core/org/apache/jmeter/config/gui/ src/core/org/apache/jmeter/control/gui/ src/core/org/apache/jmeter/functio
Author: fschumacher
Date: Sat Jan 31 10:59:42 2015
New Revision: 1656177
URL: http://svn.apache.org/r1656177
Log:
Bug: 57110
Reformat code, no functional change. Remove empty javadoc comments.
Bugzilla Id: 57110
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java
jmeter/trunk/src/components/org/apache/jmeter/visualizers/StatVisualizer.java
jmeter/trunk/src/core/org/apache/jmeter/config/gui/RowDetailDialog.java
jmeter/trunk/src/core/org/apache/jmeter/control/gui/TestPlanGui.java
jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java
jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/AddToTree.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/Load.java
jmeter/trunk/src/core/org/apache/jmeter/gui/action/SearchTreeDialog.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java
jmeter/trunk/test/src/org/apache/jmeter/visualizers/GenerateTreeGui.java
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java?rev=1656177&r1=1656176&r2=1656177&view=diff
==
---
jmeter/trunk/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java
Sat Jan 31 10:59:42 2015
@@ -53,8 +53,8 @@ import org.apache.jmeter.util.JMeterUtil
import org.apache.jorphan.gui.ObjectTableModel;
import org.apache.jorphan.reflect.Functor;
-public class PropertyControlGui extends AbstractConfigGui
-implements ActionListener, UnsharedComponent {
+public class PropertyControlGui extends AbstractConfigGui implements
+ActionListener, UnsharedComponent {
private static final long serialVersionUID = 1L;
@@ -72,7 +72,7 @@ public class PropertyControlGui extends
private static final String JMETER = "jmeter"; // $NON-NLS-1$
private final JCheckBox systemButton = new JCheckBox("System");
-
+
private final JCheckBox jmeterButton = new JCheckBox("JMeter");
private final JLabel tableLabel = new JLabel("Properties");
@@ -138,7 +138,7 @@ public class PropertyControlGui extends
private void setUpData(){
tableModel.clearData();
-Properties p=null;
+Properties p = null;
if (systemButton.isSelected()){
p = System.getProperties();
}
@@ -153,14 +153,14 @@ public class PropertyControlGui extends
Collections.sort(al, new Comparator>(){
@Override
public int compare(Map.Entry o1, Map.Entry o2) {
-String m1,m2;
-m1=(String)o1.getKey();
-m2=(String)o2.getKey();
+String m1, m2;
+m1 = (String) o1.getKey();
+m2 = (String) o2.getKey();
return m1.compareTo(m2);
}
});
Iterator> i = al.iterator();
-while(i.hasNext()){
+while (i.hasNext()) {
tableModel.addRow(i.next());
}
@@ -170,6 +170,7 @@ public class PropertyControlGui extends
public void modifyTestElement(TestElement element) {
configureTestElement(element);
}
+
private Component makeMainPanel() {
initializeTableModel();
table = new JTable(tableModel);
@@ -228,10 +229,10 @@ public class PropertyControlGui extends
private void init() {
JPanel p = this;
-setLayout(new BorderLayout(0, 5));
-setBorder(makeBorder());
-add(makeTitlePanel(), BorderLayout.NORTH);
-p = new JPanel();
+setLayout(new BorderLayout(0, 5));
+setBorder(makeBorder());
+add(makeTitlePanel(), BorderLayout.NORTH);
+p = new JPanel();
p.setLayout(new BorderLayout());
@@ -247,12 +248,13 @@ public class PropertyControlGui extends
private void initializeTableModel() {
tableModel = new ObjectTableModel(new String[] { COLUMN_NAMES_0,
COLUMN_NAMES_1 },
new Functor[] {
-new Functor(Map.Entry.class, "getKey"), // $NON-NLS-1$
-new Functor(Map.Entry.class, "getValue") }, // $NON-NLS-1$
+new Functor(Map.Entry.class, "getKey"), // $NON-NLS-1$
+new Functor(Map.Entry.class, "getValue") // $NON-NLS-1$
+},
new Functor[] {
-null, //new Functor("setName"), // $NON-NLS-1$
-new Functor(Map.Entry.class,"setValue", new Class[] {
Object.class }) // $NON-NLS-1$
-},
+
svn commit: r1656178 - in /jmeter/trunk: src/components/org/apache/jmeter/visualizers/PropertyControlGui.java test/src/org/apache/jmeter/visualizers/GenerateTreeGui.java
Author: fschumacher
Date: Sat Jan 31 11:02:21 2015
New Revision: 1656178
URL: http://svn.apache.org/r1656178
Log:
Bug: 57110
Assign variable only once.
Bugzilla Id: 57110
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java
jmeter/trunk/test/src/org/apache/jmeter/visualizers/GenerateTreeGui.java
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java?rev=1656178&r1=1656177&r2=1656178&view=diff
==
---
jmeter/trunk/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/visualizers/PropertyControlGui.java
Sat Jan 31 11:02:21 2015
@@ -227,20 +227,16 @@ public class PropertyControlGui extends
* Initialize the components and layout of this component.
*/
private void init() {
-JPanel p = this;
-
setLayout(new BorderLayout(0, 5));
setBorder(makeBorder());
add(makeTitlePanel(), BorderLayout.NORTH);
-p = new JPanel();
+JPanel p = new JPanel();
p.setLayout(new BorderLayout());
-
p.add(makeLabelPanel(), BorderLayout.NORTH);
p.add(makeMainPanel(), BorderLayout.CENTER);
// Force a minimum table height of 70 pixels
p.add(Box.createVerticalStrut(70), BorderLayout.WEST);
-//p.add(makeButtonPanel(), BorderLayout.SOUTH);
add(p, BorderLayout.CENTER);
table.revalidate();
Modified:
jmeter/trunk/test/src/org/apache/jmeter/visualizers/GenerateTreeGui.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/visualizers/GenerateTreeGui.java?rev=1656178&r1=1656177&r2=1656178&view=diff
==
--- jmeter/trunk/test/src/org/apache/jmeter/visualizers/GenerateTreeGui.java
(original)
+++ jmeter/trunk/test/src/org/apache/jmeter/visualizers/GenerateTreeGui.java
Sat Jan 31 11:02:21 2015
@@ -160,21 +160,15 @@ public class GenerateTreeGui extends Abs
* Initialize the components and layout of this component.
*/
private void init() {
-JPanel p = this;
-
setLayout(new BorderLayout(0, 5));
setBorder(makeBorder());
add(makeTitlePanel(), BorderLayout.NORTH);
-p = new JPanel();
+JPanel p = new JPanel();
p.setLayout(new BorderLayout());
-
p.add(makeLabelPanel(), BorderLayout.NORTH);
-//p.add(makeMainPanel(), BorderLayout.CENTER);
// Force a minimum table height of 70 pixels
p.add(Box.createVerticalStrut(70), BorderLayout.WEST);
-//p.add(makeButtonPanel(), BorderLayout.SOUTH);
-
add(p, BorderLayout.CENTER);
}
/**
svn commit: r1656179 - /jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java
Author: fschumacher
Date: Sat Jan 31 11:04:31 2015
New Revision: 1656179
URL: http://svn.apache.org/r1656179
Log:
Bug: 57110
Inline constant and get rid of then unneeded import.
Bugzilla Id: 57110
Modified:
jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java
Modified:
jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java?rev=1656179&r1=1656178&r2=1656179&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/functions/gui/FunctionHelper.java
Sat Jan 31 11:04:31 2015
@@ -35,7 +35,6 @@ import javax.swing.JDialog;
import javax.swing.JFrame;
import javax.swing.JPanel;
import javax.swing.JRootPane;
-import javax.swing.KeyStroke;
import javax.swing.event.ChangeEvent;
import javax.swing.event.ChangeListener;
@@ -76,7 +75,6 @@ public class FunctionHelper extends JDia
@Override
protected JRootPane createRootPane() {
JRootPane rootPane = new JRootPane();
-KeyStroke stroke = KeyStrokes.ESC;
javax.swing.Action escapeAction = new AbstractAction("ESCAPE") {
private static final long serialVersionUID = -4036804004190858925L;
@@ -88,7 +86,7 @@ public class FunctionHelper extends JDia
};
rootPane.getActionMap().put(escapeAction.getValue(Action.NAME),
escapeAction);
InputMap inputMap =
rootPane.getInputMap(JComponent.WHEN_IN_FOCUSED_WINDOW);
-inputMap.put(stroke, escapeAction.getValue(Action.NAME));
+inputMap.put(KeyStrokes.ESC, escapeAction.getValue(Action.NAME));
return rootPane;
}
svn commit: r1656180 - /jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java
Author: fschumacher
Date: Sat Jan 31 11:05:48 2015
New Revision: 1656180
URL: http://svn.apache.org/r1656180
Log:
Bug: 57110
Convert to new for loop.
Bugzilla Id: 57110
Modified:
jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java
Modified: jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java?rev=1656180&r1=1656179&r2=1656180&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/gui/MainFrame.java Sat Jan 31
11:05:48 2015
@@ -321,8 +321,8 @@ public class MainFrame extends JFrame im
if (menuBar.isSelected()) {
MenuElement[] menuElement = menuBar.getSubElements();
if (menuElement != null) {
-for (int i = 0; i < menuElement.length; i++) {
-JMenu menu = (JMenu) menuElement[i];
+for (MenuElement element : menuElement) {
+JMenu menu = (JMenu) element;
if (menu.isSelected()) {
menu.setPopupMenuVisible(false);
menu.setSelected(false);
@@ -702,9 +702,9 @@ public class MainFrame extends JFrame im
try {
Transferable tr = dtde.getTransferable();
DataFlavor[] flavors = tr.getTransferDataFlavors();
-for (int i = 0; i < flavors.length; i++) {
+for (DataFlavor flavor : flavors) {
// Check for file lists specifically
-if (flavors[i].isFlavorJavaFileListType()) {
+if (flavor.isFlavorJavaFileListType()) {
dtde.acceptDrop(DnDConstants.ACTION_COPY_OR_MOVE);
try {
openJmxFilesFromDragAndDrop(tr);
svn commit: r1656181 - /jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java
Author: fschumacher Date: Sat Jan 31 11:06:56 2015 New Revision: 1656181 URL: http://svn.apache.org/r1656181 Log: Bug: 57110 Correct typo Bugzilla Id: 57110 Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java?rev=1656181&r1=1656180&r2=1656181&view=diff == --- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java (original) +++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java Sat Jan 31 11:06:56 2015 @@ -52,7 +52,7 @@ import org.apache.log.Logger; * this sampler, so that I can take production logs to simulate production * traffic in a test environment. Doing so is desirable to study odd or unusual * behavior. It's also good to compare a new system against an existing system - * to get near apples- to-apples comparison. I've been asked if benchmarks are + * to get near apples-to-apples comparison. I've been asked if benchmarks are * really fair comparisons just about every single time, so this helps me * accomplish that task. *
svn commit: r1656182 - /jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java
Author: fschumacher
Date: Sat Jan 31 11:09:00 2015
New Revision: 1656182
URL: http://svn.apache.org/r1656182
Log:
Bug: 57110
Lowercase variable name, since it is not a constant.
Bugzilla Id: 57110
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java?rev=1656182&r1=1656181&r2=1656182&view=diff
==
---
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java
(original)
+++
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSampler.java
Sat Jan 31 11:09:00 2015
@@ -70,8 +70,8 @@ public class AccessLogSampler extends HT
public static final String DEFAULT_CLASS =
"org.apache.jmeter.protocol.http.util.accesslog.TCLogParser"; // $NON-NLS-1$
-/** private members used by class * */
-private transient LogParser PARSER = null;
+/* private members used by class */
+private transient LogParser parser = null;
// NOTUSED private Class PARSERCLASS = null;
private String logFile, parserClassName, filterClassName;
@@ -133,7 +133,7 @@ public class AccessLogSampler extends HT
SampleResult res = null;
try {
-if (PARSER == null) {
+if (parser == null) {
throw new JMeterException("No Parser available");
}
/*
@@ -146,7 +146,7 @@ public class AccessLogSampler extends HT
// person could use it that way if they have a
// huge gigabyte log file and they only want to
// use a quarter of the entries.
-int thisCount = PARSER.parseAndConfigure(1, this);
+int thisCount = parser.parseAndConfigure(1, this);
if (thisCount < 0) // Was there an error?
{
return errorResult(new Error("Problem parsing the log file"),
new HTTPSampleResult());
@@ -194,13 +194,13 @@ public class AccessLogSampler extends HT
* parser and use different log parser.
*/
public void instantiateParser() {
-if (PARSER == null) {
+if (parser == null) {
try {
if (this.getParserClassName() != null &&
this.getParserClassName().length() > 0) {
if (this.getLogFile() != null &&
this.getLogFile().length() > 0) {
-PARSER = (LogParser)
Class.forName(getParserClassName()).newInstance();
-PARSER.setSourceFile(this.getLogFile());
-PARSER.setFilter(filter);
+parser = (LogParser)
Class.forName(getParserClassName()).newInstance();
+parser.setSourceFile(this.getLogFile());
+parser.setFilter(filter);
} else {
log.error("No log file specified");
}
@@ -311,10 +311,10 @@ public class AccessLogSampler extends HT
if
(TestCloneable.class.isAssignableFrom(Class.forName(parserClassName)))
{
instantiateParser();
-s.PARSER = (LogParser)((TestCloneable)PARSER).clone();
+s.parser = (LogParser)((TestCloneable)parser).clone();
if (filter != null)
{
-s.PARSER.setFilter(s.filter);
+s.parser.setFilter(s.filter);
}
}
} catch (Exception e) {
@@ -330,8 +330,8 @@ public class AccessLogSampler extends HT
*/
@Override
public void testEnded() {
-if (PARSER != null) {
-PARSER.close();
+if (parser != null) {
+parser.close();
}
filter = null;
started = false;
@@ -352,8 +352,8 @@ public class AccessLogSampler extends HT
*/
@Override
public void threadFinished() {
-if(PARSER instanceof ThreadListener) {
-((ThreadListener)PARSER).threadFinished();
+if(parser instanceof ThreadListener) {
+((ThreadListener)parser).threadFinished();
}
if(filter instanceof ThreadListener) {
((ThreadListener)filter).threadFinished();
svn commit: r1656183 - /jmeter/trunk/test/src/org/apache/jmeter/visualizers/GenerateTreeGui.java
Author: fschumacher
Date: Sat Jan 31 11:10:01 2015
New Revision: 1656183
URL: http://svn.apache.org/r1656183
Log:
Bug: 57110
javadoc changes
Bugzilla Id: 57110
Modified:
jmeter/trunk/test/src/org/apache/jmeter/visualizers/GenerateTreeGui.java
Modified:
jmeter/trunk/test/src/org/apache/jmeter/visualizers/GenerateTreeGui.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/visualizers/GenerateTreeGui.java?rev=1656183&r1=1656182&r2=1656183&view=diff
==
--- jmeter/trunk/test/src/org/apache/jmeter/visualizers/GenerateTreeGui.java
(original)
+++ jmeter/trunk/test/src/org/apache/jmeter/visualizers/GenerateTreeGui.java
Sat Jan 31 11:10:01 2015
@@ -52,10 +52,10 @@ import org.apache.jmeter.util.JMeterUtil
/**
* Workbench test element to create a test plan containing samples of each
test element
* (apart from Threads and Test Fragment).
- *
+ *
* The user creates a Thread Group, and the elements are created as child
elements of
* Simple Controllers.
- *
+ *
* Note: the code currently runs on all versions of JMeter back to 2.2.
* Beware of making changes that rely on more recent APIs.
*/
@@ -180,7 +180,7 @@ public class GenerateTreeGui extends Abs
*Node in the tree where we will add the Controller
* @param name
*A name for the Controller
- * @return the new node
+ * @return the new node
*/
private JMeterTreeNode addSimpleController(JMeterTreeModel model,
JMeterTreeNode node, String name) {
final TestElement sc = new GenericController();
@@ -236,7 +236,7 @@ public class GenerateTreeGui extends Abs
*
* @param type
*class of the node to be found
- * @param treeModel
+ * @param treeModel the tree to search in
*
* @return the first node of the given type in the test component tree, or
* null if none was found.
svn commit: r1656184 - /jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java
Author: fschumacher
Date: Sat Jan 31 11:10:57 2015
New Revision: 1656184
URL: http://svn.apache.org/r1656184
Log:
Bug: 57110
Simplify logic to make it even more efficient.
Bugzilla Id: 57110
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java?rev=1656184&r1=1656183&r2=1656184&view=diff
==
---
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java
(original)
+++
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java
Sat Jan 31 11:10:57 2015
@@ -221,20 +221,13 @@ public class LogFilter implements Filter
*/
@Override
public boolean isFiltered(String path,TestElement el) {
-// we do a quick check to see if any
-// filters are set. If not we just
-// return false to be efficient.
-if (this.FILEFILTER || this.PTRNFILTER || this.CHANGEEXT) {
-if (this.FILEFILTER) {
-return filterFile(path);
-} else if (this.PTRNFILTER) {
-return filterPattern(path);
-} else {
-return false;
-}
-} else {
-return false;
+if (this.FILEFILTER) {
+return filterFile(path);
}
+if (this.PTRNFILTER) {
+return filterPattern(path);
+}
+return false;
}
/**
svn commit: r1656186 - /jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java
Author: fschumacher Date: Sat Jan 31 11:51:10 2015 New Revision: 1656186 URL: http://svn.apache.org/r1656186 Log: Convert wrong javadoc comment to simple comment. Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java?rev=1656186&r1=1656185&r2=1656186&view=diff == --- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java (original) +++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/util/accesslog/LogFilter.java Sat Jan 31 11:51:10 2015 @@ -75,7 +75,8 @@ public class LogFilter implements Filter private static final Logger log = LoggingManager.getLoggerForClass(); -/** protected members used by class to filter * */ +// protected members used by class to filter + protected boolean CHANGEEXT = false; protected String OLDEXT = null;
svn commit: r1657628 - /jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListener.java
Author: fschumacher
Date: Thu Feb 5 17:18:42 2015
New Revision: 1657628
URL: http://svn.apache.org/r1657628
Log:
Correct typo
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListener.java
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListener.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListener.java?rev=1657628&r1=1657627&r2=1657628&view=diff
==
---
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListener.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListener.java
Thu Feb 5 17:18:42 2015
@@ -57,7 +57,7 @@ public class BackendListener extends Abs
private BlockingQueue queue;
private AtomicLong queueWaits; // how many times we had to wait to
queue a SampleResult
private AtomicLong queueWaitTime; // how long we had to wait
(nanoSeconds)
-// @GaurdedBy("LOCK")
+// @GuardedBy("LOCK")
private int instanceCount; // number of active tests
private CountDownLatch latch;
}
svn commit: r1657630 - /jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListener.java
Author: fschumacher
Date: Thu Feb 5 17:23:04 2015
New Revision: 1657630
URL: http://svn.apache.org/r1657630
Log:
Whitespace police
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListener.java
Modified:
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListener.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListener.java?rev=1657630&r1=1657629&r2=1657630&view=diff
==
---
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListener.java
(original)
+++
jmeter/trunk/src/components/org/apache/jmeter/visualizers/backend/BackendListener.java
Thu Feb 5 17:23:04 2015
@@ -61,7 +61,7 @@ public class BackendListener extends Abs
private int instanceCount; // number of active tests
private CountDownLatch latch;
}
-
+
/**
*
*/
@@ -83,7 +83,7 @@ public class BackendListener extends Abs
* Lock used to protect accumulators update + instanceCount update
*/
private static final Object LOCK = new Object();
-
+
/**
* Property key representing the arguments for the BackendListenerClient.
*/
@@ -96,16 +96,16 @@ public class BackendListener extends Abs
private Class clientClass;
public static final String DEFAULT_QUEUE_SIZE = "5000";
-
+
// Create unique object as marker for end of queue
private transient static final SampleResult FINAL_SAMPLE_RESULT = new
SampleResult();
-
+
// Name of the test element. Set up by testStarted().
private transient String myName;
-
+
// Holds listenerClientData for this test element
private transient ListenerClientData listenerClientData;
-
+
/*
* This is needed for distributed testing where there is 1 instance
* per server. But we need the total to be shared.
@@ -122,7 +122,7 @@ public class BackendListener extends Abs
queuesByTestElementName.clear();
}
-setArguments(new Arguments());
+setArguments(new Arguments());
}
/*
@@ -142,7 +142,7 @@ public class BackendListener extends Abs
clientClass = Class.forName(name, false,
Thread.currentThread().getContextClassLoader());
} catch (Exception e) {
LOGGER.error(whoAmI() + "\tException initialising: " + name, e);
-}
+}
}
/**
@@ -188,25 +188,23 @@ public class BackendListener extends Abs
LOGGER.error("sampleOccurred, failed to queue the sample", err);
}
}
-
-
+
/**
* Thread that dequeus data from queue to send it to {@link
BackendListenerClient}
*/
private static final class Worker extends Thread {
-
+
private final ListenerClientData listenerClientData;
private final BackendListenerContext context;
private final BackendListenerClient backendListenerClient;
private Worker(BackendListenerClient backendListenerClient, Arguments
arguments, ListenerClientData listenerClientData){
this.listenerClientData = listenerClientData;
// Allow BackendListenerClient implementations to get access to
test element name
-arguments.addArgument(TestElement.NAME, getName());
+arguments.addArgument(TestElement.NAME, getName());
context = new BackendListenerContext(arguments);
this.backendListenerClient = backendListenerClient;
}
-
@Override
public void run() {
boolean isDebugEnabled = LOGGER.isDebugEnabled();
@@ -254,7 +252,6 @@ public class BackendListener extends Abs
}
}
}
-
/**
* Send sampleResults to {@link BackendListenerClient}
@@ -304,14 +301,14 @@ public class BackendListener extends Abs
if(LOGGER.isDebugEnabled()){
LOGGER.debug(whoAmI() + "\ttestStarted(" + host + ")");
}
-
+
int queueSize;
final String size = getQueueSize();
try {
queueSize = Integer.parseInt(size);
} catch (NumberFormatException nfe) {
LOGGER.warn("Invalid queue size '" + size + "' defaulting to " +
DEFAULT_QUEUE_SIZE);
-queueSize = Integer.parseInt(DEFAULT_QUEUE_SIZE);
+queueSize = Integer.parseInt(DEFAULT_QUEUE_SIZE);
}
synchronized (LOCK) {
@@ -343,9 +340,9 @@ public class BackendListener extends Abs
queuesByTestElementName.put(myName, listenerClientData);
}
listenerClientData.instanceCount++;
-}
+}
}
-
+
/**
* Method called at the end of the test. This is called only
svn commit: r1658487 - /jmeter/trunk/res/maven/ApacheJMeter_parent.pom
Author: fschumacher
Date: Mon Feb 9 18:04:02 2015
New Revision: 1658487
URL: http://svn.apache.org/r1658487
Log:
Whitespace police
Modified:
jmeter/trunk/res/maven/ApacheJMeter_parent.pom
Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL:
http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1658487&r1=1658486&r2=1658487&view=diff
==
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Mon Feb 9 18:04:02 2015
@@ -24,7 +24,7 @@ under the License.
Apache JMeter parent
pom
-
+
Apache JMeter is open source software, a 100% pure Java
desktop application designed to load test
functional behavior and measure performance. It was originally
designed for testing Web Applications but has
since expanded to other test functions.
@@ -198,9 +198,9 @@ under the License.
${commons-pool2.version}
- dnsjava
- dnsjava
- ${dnsjava.version}
+dnsjava
+dnsjava
+${dnsjava.version}
excalibur-datasource
@@ -404,7 +404,7 @@ under the License.
slf4j-nop
${slf4j-nop.version}
-
svn commit: r1661738 - /jmeter/trunk/xdocs/usermanual/component_reference.xml
Author: fschumacher
Date: Mon Feb 23 18:18:18 2015
New Revision: 1661738
URL: http://svn.apache.org/r1661738
Log:
Correct typo
Modified:
jmeter/trunk/xdocs/usermanual/component_reference.xml
Modified: jmeter/trunk/xdocs/usermanual/component_reference.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=1661738&r1=1661737&r2=1661738&view=diff
==
--- jmeter/trunk/xdocs/usermanual/component_reference.xml (original)
+++ jmeter/trunk/xdocs/usermanual/component_reference.xml Mon Feb 23 18:18:18
2015
@@ -6254,7 +6254,7 @@ regex within parens, e.g ('.*?').* (which matches anything) and
www (which
matches www only). Non-overlapping matchers would be
a+ (matches a sequence
-of a's) and b+ (matches a sequence of
b's).
+of a's) and b+ (matches a sequence of
b's).
If you want to match a whole string only, enclose it in (^ and
$), e.g. (^thus$).
svn commit: r1663001 - in /jmeter/trunk/src: core/org/apache/jmeter/save/SaveService.java protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
Author: fschumacher
Date: Sat Feb 28 20:49:17 2015
New Revision: 1663001
URL: http://svn.apache.org/r1663001
Log:
Fix a few javadoc warnings
Modified:
jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
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=1663001&r1=1663000&r2=1663001&view=diff
==
--- jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java Sat Feb 28
20:49:17 2015
@@ -507,7 +507,7 @@ public class SaveService {
/**
* Load a Test tree (JMX file)
- * @param file the JMX file
+ * @param reader the JMX file as an {@link InputStream}
* @return the loaded tree or null if an error occurs
* @throws IOException if there is a problem reading the file or
processing it
* @deprecated use {@link SaveService}{@link #loadTree(File)}
Modified:
jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java?rev=1663001&r1=1663000&r2=1663001&view=diff
==
---
jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
(original)
+++
jmeter/trunk/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/config/DataSourceElementBeanInfo.java
Sat Feb 28 20:49:17 2015
@@ -108,11 +108,11 @@ public class DataSourceElementBeanInfo e
* Currently supported tags and their values are:
*
* DEFAULT-1
- * TRANSACTION_NONE{@value Connection#TRANSACTION_NONE}
- * TRANSACTION_REAd_COMMITTED{@value
Connection#TRANSACTION_READ_COMMITTED}
- * TRANSACTION_READ_UNCOMMITTED{@value
Connection#TRANSACTION_READ_UNCOMMITTED}
- * TRANSACTION_REPEATABLE_READ{@value
Connection#TRANSACTION_REPEATABLE_READ}
- * TRANSACTION_SERIALIZABLE{@value
Connection#TRANSACTION_SERIALIZABLE}
+ * TRANSACTION_NONE{@value
java.sql.Connection#TRANSACTION_NONE}
+ * TRANSACTION_REAd_COMMITTED{@value
java.sql.Connection#TRANSACTION_READ_COMMITTED}
+ * TRANSACTION_READ_UNCOMMITTED{@value
java.sql.Connection#TRANSACTION_READ_UNCOMMITTED}
+ * TRANSACTION_REPEATABLE_READ{@value
java.sql.Connection#TRANSACTION_REPEATABLE_READ}
+ * TRANSACTION_SERIALIZABLE{@value
java.sql.Connection#TRANSACTION_SERIALIZABLE}
*
* @param tag name of the transaction isolation mode
* @return integer value of the given transaction isolation mode
svn commit: r1663002 - /jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/MeasuringConnectionManager.java
Author: fschumacher
Date: Sat Feb 28 20:54:47 2015
New Revision: 1663002
URL: http://svn.apache.org/r1663002
Log:
Links to private methods are not allowed in public javadoc tags
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/MeasuringConnectionManager.java
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/MeasuringConnectionManager.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/MeasuringConnectionManager.java?rev=1663002&r1=1663001&r2=1663002&view=diff
==
---
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/MeasuringConnectionManager.java
(original)
+++
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/MeasuringConnectionManager.java
Sat Feb 28 20:54:47 2015
@@ -42,7 +42,8 @@ import java.util.concurrent.TimeUnit;
/**
* Adapter for {@link PoolingClientConnectionManager}
- * that wraps all connection requests into time-measured implementation {@link
MeasuringConnectionRequest}
+ * that wraps all connection requests into time-measured implementation a
private
+ * MeasuringConnectionRequest
*/
public class MeasuringConnectionManager extends PoolingClientConnectionManager
{
svn commit: r1664721 - in /jmeter/trunk/xdocs: nightly.xml usermanual/component_reference.xml
Author: fschumacher Date: Fri Mar 6 21:07:14 2015 New Revision: 1664721 URL: http://svn.apache.org/r1664721 Log: Small markup cleanup in docs. Modified: jmeter/trunk/xdocs/nightly.xml jmeter/trunk/xdocs/usermanual/component_reference.xml Modified: jmeter/trunk/xdocs/nightly.xml URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/nightly.xml?rev=1664721&r1=1664720&r2=1664721&view=diff == --- jmeter/trunk/xdocs/nightly.xml (original) +++ jmeter/trunk/xdocs/nightly.xml Fri Mar 6 21:07:14 2015 @@ -32,9 +32,7 @@ They are intended for use by developers and others wishing to help with resolving JMeter bugs. - -These builds should not be used in production. - +These builds should not be used in production. Where are the nightly builds? JMeter CI builds are currently run by Jenkins and Buildbot These are located at: @@ -70,11 +68,11 @@ Unpack all the archives into the same Warning - please note! - + The nightly builds may or may not work properly - or at all. - + If there is a problem with a particular version, it may be worth reporting this on the JMeter-dev mailing list and/or trying again in a day or two. Modified: jmeter/trunk/xdocs/usermanual/component_reference.xml URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=1664721&r1=1664720&r2=1664721&view=diff == --- jmeter/trunk/xdocs/usermanual/component_reference.xml (original) +++ jmeter/trunk/xdocs/usermanual/component_reference.xml Fri Mar 6 21:07:14 2015 @@ -1021,17 +1021,15 @@ are two interfaces you have to implement HTTPSampler. The servername, port and get images are set by AccessLogSampler. Next, the parser is called with integer 1, telling it to parse one entry. After that, HTTPSampler.sample() is called to make the request. - - -samp = (HTTPSampler) GENERATOR.generateRequest(); -samp.setDomain(this.getDomain()); -samp.setPort(this.getPort()); -samp.setImageParser(this.isImageParser()); -PARSER.parse(1); -res = samp.sample(); -res.setSampleLabel(samp.toString()); - - + +samp = (HTTPSampler) GENERATOR.generateRequest(); +samp.setDomain(this.getDomain()); +samp.setPort(this.getPort()); +samp.setImageParser(this.isImageParser()); +PARSER.parse(1); +res = samp.sample(); +res.setSampleLabel(samp.toString()); + The required methods in LogParser are: setGenerator(Generator) @@ -1687,42 +1685,51 @@ completed, so the net effect was similar The current implementation supports standard Junit convention and extensions. It also includes extensions like oneTimeSetUp and oneTimeTearDown. The sampler works like the JavaSampler with some differences. -1. rather than use Jmeter's test interface, it scans the jar files for classes extending junit's TestCase class. That includes any class or subclass. -2. Junit test jar files should be placed in jmeter/lib/junit instead of /lib directory. -In versions of JMeter after 2.3.1, you can also use the "user.classpath" property to specify where to look for TestCase classes. -3. Junit sampler does not use name/value pairs for configuration like the JavaSampler. The sampler assumes setUp and tearDown will configure the test correctly. -4. The sampler measures the elapsed time only for the test method and does not include setUp and tearDown. -5. Each time the test method is called, Jmeter will pass the result to the listeners. -6. Support for oneTimeSetUp and oneTimeTearDown is done as a method. Since Jmeter is multi-threaded, we cannot call oneTimeSetUp/oneTimeTearDown the same way Maven does it. -7. The sampler reports unexpected exceptions as errors. + +rather than use Jmeter's test interface, it scans the jar files for classes extending junit's TestCase class. That includes any class or subclass. +Junit test jar files should be placed in jmeter/lib/junit instead of /lib directory. +In versions of JMeter after 2.3.1, you can also use the "user.classpath" property to specify where to look for TestCase classes. +Junit sampler does not use name/value pairs for configuration like the JavaSampler. The sampler assumes setUp and tearDown will configure the test correctly. +The sampler measures the elapsed time only for the test method and does not include setUp and tearDown. +Each time the test method is called, Jmeter will pass the result to the listeners. +Support for oneTimeSetUp and oneTimeTearDown is done as a method. Since Jmeter is multi-threaded, we cannot call oneTimeSetUp/oneTimeTearDown the same way Maven does it. +The sampler reports unexpected exceptions as errors. There are some important differences between standard JUnit test runners and JMeter
svn commit: r1664720 - in /jmeter/trunk: build.xml xdocs/css/new-style.css xdocs/stylesheets/website-style.xsl
Author: fschumacher
Date: Fri Mar 6 21:04:57 2015
New Revision: 1664720
URL: http://svn.apache.org/r1664720
Log:
Bug 53764: New layout for the website.
Bugzilla Id: 53764
Added:
jmeter/trunk/xdocs/css/new-style.css
jmeter/trunk/xdocs/stylesheets/website-style.xsl
Modified:
jmeter/trunk/build.xml
Modified: jmeter/trunk/build.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1664720&r1=1664719&r2=1664720&view=diff
==
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Fri Mar 6 21:04:57 2015
@@ -2293,23 +2293,33 @@ run JMeter unless all the JMeter jars ar
-
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Fixing EOL
+Remove superfluos &
+
Removing unnecessary </br> tags
-Copying files
-
-
-
-
-
-
Added: jmeter/trunk/xdocs/css/new-style.css
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/css/new-style.css?rev=1664720&view=auto
==
--- jmeter/trunk/xdocs/css/new-style.css (added)
+++ jmeter/trunk/xdocs/css/new-style.css Fri Mar 6 21:04:57 2015
@@ -0,0 +1,372 @@
+/*
+ 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.
+*/
+.main {
+ font-family: DejaVu Sans, Helvetica, sans-serif;
+ width: 60em;
+}
+
+img {
+ border: 0;
+ width: auto;
+ max-width: 95%;
+ height: auto;
+}
+
+.menu, h1, h2, h3, h4, h5, .go-top, .title {
+ font-family: "Special Elite";
+}
+
+h1, h2, h3, h4, h5, .title {
+ border-bottom: 0.2rem solid orange;
+}
+
+.title>.title {
+ border-bottom: 0px;
+}
+
+.footer {
+ background-color: #444;
+ border-top: 1px solid black;
+ color: white;
+ margin-top: 3em;
+ padding: 2em 0 1em;
+ text-align: center;
+ box-shadow: 0 -8px 21px 0 rgba(0, 0, 0, 0.2);
+}
+
+.menu {
+ border: 1px solid lightgray;
+ box-shadow: 5px 5px 10px rgba(20, 20, 20, 0.3);
+ list-style: outside none none;
+ margin: 0.5em;
+ padding: 0.5em;
+}
+
+.menu+.menu {
+ margin-top: 1.5em;
+}
+
+.menu img {
+ margin-left: 0.3em;
+ vertical-align: middle;
+ width: auto;
+ max-width: 95%;
+ height: auto;
+}
+
+.banner>iframe {
+ width: 140px;
+}
+
+body {
+ margin: 0px;
+ padding: 0px;
+}
+
+.section
+ pre {
+ background: none repeat scroll 0 0 lightblue;
+ border: 1px solid gray;
+ padding: 0.3rem;
+ margin: 0.3rem;
+ font-family: dejavu sans mono, monospace, sans-serif;
+ overflow: auto;
+}
+
+.code {
+ background: none repeat scroll 0 0 lightblue;
+ padding: 0.1em;
+ font-family: dejavu sans mono, monospace, sans-serif;
+}
+
+.required-Yes>span {
+ font-weight: bold;
+}
+
+.deprecated, .note {
+ background: none repeat scroll 0 0 #fee;
+ border: 1px solid #dbb;
+ margin: 1em;
+ padding: 1em;
+}
+
+.component {
+ background: none repeat scroll 0 0 #fff;
+ margin: 1em;
+ padding: 0.4em;
+}
+
+.subsection {
+ background: none repeat scroll 0 0 white;
+ margin: 1em;
+ padding: 1em;
+}
+
+.screenshot {
+ margin: 2em;
+ padding: 0;
+}
+
+.figure {
+ margin: 1em 2em;
+}
+
+.figure>a>img, .screenshot>a>img {
+ box-shadow: 10px 10px 10px 0 rgba(50, 50, 50, 0.25);
+ overflow: auto;
+ width: auto;
+ max-width: 100%;
+ height: auto;
+}
+
+.clear {
+ clear: both;
+}
+
+.nostyle {
+ border: 1px solid black;
+}
+
+.title {
+ font-size: 120%;
+ font-weight: bold;
+}
+
+.example {
+ background: none repeat scroll 0 0 lightgray;
+ border: 1px solid gray;
+ clear: both;
+ padding: 1em;
+ margin: 1em;
+}
+
+.property .name, .property
+ .description, .property
+ .required {
+ display: inline-block;
+}
+
+.property .name {
+ font-style: italic;
+ vertical-align: top;
+ width: 20%;
+ word-wrap: break-word;
+}
+
+.property .description {
+ vertical-align: top;
+ width: 60%;
+}
+
+.property .required {
+ vertical-align: top;
+ width: 20%;
+}
+
+.property+.property {
+ margin-top: 0.5em;
+}
+
+.required.req-false {
+ font-weight: lighter;
+}
+
+.go-top {
svn commit: r1664841 - in /jmeter/trunk/xdocs: css/new-style.css stylesheets/website-style.xsl
Author: fschumacher
Date: Sat Mar 7 12:49:56 2015
New Revision: 1664841
URL: http://svn.apache.org/r1664841
Log:
Less space for the header and use another font for the headings.
Modified:
jmeter/trunk/xdocs/css/new-style.css
jmeter/trunk/xdocs/stylesheets/website-style.xsl
Modified: jmeter/trunk/xdocs/css/new-style.css
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/css/new-style.css?rev=1664841&r1=1664840&r2=1664841&view=diff
==
--- jmeter/trunk/xdocs/css/new-style.css (original)
+++ jmeter/trunk/xdocs/css/new-style.css Sat Mar 7 12:49:56 2015
@@ -27,7 +27,7 @@ img {
}
.menu, h1, h2, h3, h4, h5, .go-top, .title {
- font-family: "Special Elite";
+ font-family: "Sorts Mill Goudy";
}
h1, h2, h3, h4, h5, .title {
@@ -70,6 +70,7 @@ h1, h2, h3, h4, h5, .title {
.banner>iframe {
width: 140px;
+ height: 140px;
}
body {
@@ -203,7 +204,7 @@ body {
th {
border-bottom: 1px solid black;
- font-family: "Special Elite";
+ font-family: "Sorts Mill Goudy";
text-align: left;
}
@@ -237,10 +238,10 @@ table {
.header {
clear: both;
display: table;
- margin-bottom: 2em;
+ margin-bottom: 1rem;
width: 100%;
box-shadow: 0px 5px 33px 0px rgba(0, 0, 0, 0.2);
- padding: 1em 0em 2em;
+ padding: 0.1rem 0em 0.2rem;
border-bottom: 1px solid gray;
}
@@ -280,11 +281,11 @@ table {
.pagelinks li {
display: inline-block;
margin: 1em;
- font-family: "Special Elite";
+ font-family: "Sorts Mill Goudy";
}
.section-index {
- font-family: "Special Elite";
+ font-family: "Sorts Mill Goudy";
margin:;
list-style: none;
}
@@ -369,4 +370,4 @@ table {
.section-index li:hover>ul {
display: block;
}
-}
\ No newline at end of file
+}
Modified: jmeter/trunk/xdocs/stylesheets/website-style.xsl
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/stylesheets/website-style.xsl?rev=1664841&r1=1664840&r2=1664841&view=diff
==
--- jmeter/trunk/xdocs/stylesheets/website-style.xsl (original)
+++ jmeter/trunk/xdocs/stylesheets/website-style.xsl Sat Mar 7 12:49:56 2015
@@ -51,7 +51,7 @@
svn commit: r1664844 - /jmeter/trunk/xdocs/stylesheets/website-style.xsl
Author: fschumacher Date: Sat Mar 7 13:12:04 2015 New Revision: 1664844 URL: http://svn.apache.org/r1664844 Log: Add alt-texts to images in screenshots and figures Modified: jmeter/trunk/xdocs/stylesheets/website-style.xsl Modified: jmeter/trunk/xdocs/stylesheets/website-style.xsl URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/stylesheets/website-style.xsl?rev=1664844&r1=1664843&r2=1664844&view=diff == --- jmeter/trunk/xdocs/stylesheets/website-style.xsl (original) +++ jmeter/trunk/xdocs/stylesheets/website-style.xsl Sat Mar 7 13:12:04 2015 @@ -215,8 +215,9 @@ + - + @@ -358,6 +359,7 @@ + @@ -453,6 +455,7 @@ +
svn commit: r1664845 - /jmeter/trunk/xdocs/stylesheets/website-style.xsl
Author: fschumacher Date: Sat Mar 7 13:20:02 2015 New Revision: 1664845 URL: http://svn.apache.org/r1664845 Log: Alt-text for icons in menu Modified: jmeter/trunk/xdocs/stylesheets/website-style.xsl Modified: jmeter/trunk/xdocs/stylesheets/website-style.xsl URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/stylesheets/website-style.xsl?rev=1664845&r1=1664844&r2=1664845&view=diff == --- jmeter/trunk/xdocs/stylesheets/website-style.xsl (original) +++ jmeter/trunk/xdocs/stylesheets/website-style.xsl Sat Mar 7 13:20:02 2015 @@ -253,7 +253,7 @@ - +
svn commit: r1664860 - in /jmeter/trunk/xdocs: css/new-style.css stylesheets/website-style.xsl
Author: fschumacher
Date: Sat Mar 7 14:54:46 2015
New Revision: 1664860
URL: http://svn.apache.org/r1664860
Log:
Use figure element instead of a div and change anchors using name to id (where
possible)
Modified:
jmeter/trunk/xdocs/css/new-style.css
jmeter/trunk/xdocs/stylesheets/website-style.xsl
Modified: jmeter/trunk/xdocs/css/new-style.css
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/css/new-style.css?rev=1664860&r1=1664859&r2=1664860&view=diff
==
--- jmeter/trunk/xdocs/css/new-style.css (original)
+++ jmeter/trunk/xdocs/css/new-style.css Sat Mar 7 14:54:46 2015
@@ -122,11 +122,11 @@ body {
padding: 0;
}
-.figure {
+figure {
margin: 1em 2em;
}
-.figure>a>img, .screenshot>a>img {
+figure>a>img, .screenshot>a>img {
box-shadow: 10px 10px 10px 0 rgba(50, 50, 50, 0.25);
overflow: auto;
width: auto;
@@ -317,7 +317,7 @@ table {
padding-left: 0px;
margin-left: 0px;
}
- .figure {
+ figure {
margin: 1em 0px;
}
.properties {
Modified: jmeter/trunk/xdocs/stylesheets/website-style.xsl
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/stylesheets/website-style.xsl?rev=1664860&r1=1664859&r2=1664860&view=diff
==
--- jmeter/trunk/xdocs/stylesheets/website-style.xsl (original)
+++ jmeter/trunk/xdocs/stylesheets/website-style.xsl Sat Mar 7 14:54:46 2015
@@ -130,7 +130,7 @@
http://www.apache.org/ads/button.html";
- style="border-width:0;" frameborder="0" scrolling="no"
+ style="border-width:0;"
>
@@ -138,8 +138,7 @@
-
-
+
@@ -262,6 +261,11 @@
+
+
+
+
+
@@ -274,8 +278,7 @@
-
-
+
@@ -297,6 +300,9 @@
+
+
+
@@ -326,20 +332,18 @@
-
+
-
+
(was:
)
-
-
-
-
-
+
+
+
@@ -372,20 +376,25 @@
-
¶
+
+
+
+
+
+
Parameters
+ select="concat(translate(normalize-space(../@name), ' ', '_'),
'_parms', $prop-count)" />
@@ -449,7 +458,7 @@
-
+
@@ -460,7 +469,7 @@
-
+
@@ -515,6 +524,9 @@
+
+
+
svn commit: r1664871 - /jmeter/trunk/xdocs/usermanual/component_reference.xml
Author: fschumacher
Date: Sat Mar 7 15:23:45 2015
New Revision: 1664871
URL: http://svn.apache.org/r1664871
Log:
Use source for block style code fragments and dl for definitions/descriptive
lists
Modified:
jmeter/trunk/xdocs/usermanual/component_reference.xml
Modified: jmeter/trunk/xdocs/usermanual/component_reference.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=1664871&r1=1664870&r2=1664871&view=diff
==
--- jmeter/trunk/xdocs/usermanual/component_reference.xml (original)
+++ jmeter/trunk/xdocs/usermanual/component_reference.xml Sat Mar 7 15:23:45
2015
@@ -4213,18 +4213,19 @@ GUI that they can use while developing n
You can then access com.mongodb.DB object in Beanshell or JSR223 Test
Elements through the element MongoDBHolder
using this code
-
-import com.mongodb.DB;
-import org.apache.jmeter.protocol.mongodb.config.MongoDBHolder;
-DB db = MongoDBHolder.getDBFromSource("value of property MongoDB Source",
"value of property Database Name");
-...
-
+
+import com.mongodb.DB;
+import org.apache.jmeter.protocol.mongodb.config.MongoDBHolder;
+DB db = MongoDBHolder.getDBFromSource("value of property MongoDB Source",
+"value of property Database Name");
+...
+
Descriptive name for the
connection configuration that is shown in the tree.
Mongo DB
Servers
The name of the
variable the connection is tied to.
-Each name must be different. If there are two configuration
elements using the same name, only one will be saved.
+Each name must be different. If there are two configuration
elements using the same name, only one will be saved.
@@ -4347,15 +4348,17 @@ pattern. You can attach multiple asserti
Case is also significant. To override these settings, one can use the
extended regular expression syntax.
For example:
-
-(?i) - ignore case
-(?s) - treat target as single line, i.e. "." matches new-line
-(?is) - both the above
-These can be used anywhere within the expression and remain in effect
until overriden. e.g.
-(?i)apple(?-i) Pie - matches "ApPLe Pie", but not "ApPLe pIe"
-(?s)Apple.+?Pie - matches Apple followed by Pie, which may be on a
subsequent line.
-Apple(?s).+?Pie - same as above, but it's probably clearer to use the (?s)
at the start.
-
+
+(?i)ignore case
+(?s)treat target as single line, i.e. "." matches
new-line
+(?is)both the above
+
+These can be used anywhere within the expression and remain in effect until
overriden. e.g.
+
+(?i)apple(?-i) Piematches "ApPLe Pie", but not
"ApPLe pIe"
+(?s)Apple.+?Piematches Apple followed by Pie, which
may be on a subsequent line.
+Apple(?s).+?Piesame as above, but it's probably
clearer to use the (?s) at the start.
+
@@ -5979,13 +5982,13 @@ This certificate is not one of the certi
correct host.
As a consequence:
-The browser should display a dialogue asking if you want to accept the
certificate or not. For example:
-
+The browser should display a dialogue asking if you want to accept the
certificate or not. For example:
+
1) The server's name "www.example.com" does not match the certificate's name
- "JMeter Proxy (DO NOT TRUST)". Somebody may be trying to eavesdrop on
you.
+ "JMeter Proxy (DO NOT TRUST)". Somebody may be trying to eavesdrop on you.
2) The certificate for "JMeter Proxy (DO NOT TRUST)" is signed by the unknown
Certificate Authority
- "JMeter Proxy (DO NOT TRUST)". It is not possible to verify that this is a
valid certificate.
-
+ "JMeter Proxy (DO NOT TRUST)". It is not possible to verify that this is a
valid certificate.
+
You will need to accept the certificate in order to allow the JMeter Proxy to
intercept the SSL traffic in order to
record it.
However, do not accept this certificate permanently; it should only be
accepted temporarily.
svn commit: r1664876 - /jmeter/trunk/xdocs/stylesheets/website-style.xsl
Author: fschumacher Date: Sat Mar 7 15:38:41 2015 New Revision: 1664876 URL: http://svn.apache.org/r1664876 Log: Scrollbars for iframes have to be hidden using old attributes, as it seems Modified: jmeter/trunk/xdocs/stylesheets/website-style.xsl Modified: jmeter/trunk/xdocs/stylesheets/website-style.xsl URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/stylesheets/website-style.xsl?rev=1664876&r1=1664875&r2=1664876&view=diff == --- jmeter/trunk/xdocs/stylesheets/website-style.xsl (original) +++ jmeter/trunk/xdocs/stylesheets/website-style.xsl Sat Mar 7 15:38:41 2015 @@ -130,7 +130,7 @@ http://www.apache.org/ads/button.html"; - style="border-width:0;" + style="border-width:0;" frameborder="0" scrolling="no" >
