jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From milam...@apache.org
Subject svn commit: r1791518 - in /jmeter/trunk: src/components/org/apache/jmeter/assertions/ src/core/org/apache/jmeter/gui/action/ src/core/org/apache/jmeter/report/core/ src/core/org/apache/jmeter/samplers/ src/core/org/apache/jmeter/testelement/property/ s...
Date Sat, 15 Apr 2017 16:27:12 GMT
Author: milamber
Date: Sat Apr 15 16:27:12 2017
New Revision: 1791518

URL: http://svn.apache.org/viewvc?rev=1791518&view=rev
Log:
Fix some typo in comments or log messages
This closes #289
Bugzilla Id: 60994


Modified:
    jmeter/trunk/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java
    jmeter/trunk/src/core/org/apache/jmeter/gui/action/ActionRouter.java
    jmeter/trunk/src/core/org/apache/jmeter/report/core/AbstractSampleWriter.java
    jmeter/trunk/src/core/org/apache/jmeter/samplers/BatchSampleSender.java
    jmeter/trunk/src/core/org/apache/jmeter/testelement/property/AbstractProperty.java
    jmeter/trunk/src/core/org/apache/jmeter/visualizers/gui/AbstractVisualizer.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/BaseParser.java
    jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/AbstractSamplerCreator.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/AccessLogSamplerBeanInfo.java
    jmeter/trunk/xdocs/changes.xml
    jmeter/trunk/xdocs/usermanual/best-practices.xml

Modified: jmeter/trunk/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java?rev=1791518&r1=1791517&r2=1791518&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java (original)
+++ jmeter/trunk/src/components/org/apache/jmeter/assertions/BeanShellAssertion.java Sat Apr
15 16:27:12 2017
@@ -109,7 +109,7 @@ public class BeanShellAssertion extends
                     .toString()));
             result.setError(false);
         }
-        catch (NoClassDefFoundError ex) { // NOSONAR explicitely trap this error to make
tests work better 
+        catch (NoClassDefFoundError ex) { // NOSONAR explicitly trap this error to make tests
work better
             log.error("BeanShell Jar missing? " + ex.toString());
             result.setError(true);
             result.setFailureMessage("BeanShell Jar missing? " + ex.toString());

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=1791518&r1=1791517&r2=1791518&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 Sat Apr 15 16:27:12
2017
@@ -302,14 +302,14 @@ public final class ActionRouter implemen
         }
         try {
             List<String> listClasses = ClassFinder.findClassesThatExtend(
-                    JMeterUtils.getSearchPaths(), // strPathsOrJars - pathnames or jarfiles
to search for classes
+                    JMeterUtils.getSearchPaths(), // strPathsOrJars - pathNames or jarfiles
to search for classes
                     // classNames - required parent class(es) or annotations
                     new Class[] {Class.forName("org.apache.jmeter.gui.action.Command") },
// $NON-NLS-1$
                     false, // innerClasses - should we include inner classes?
-                    null, // contains - classname should contain this string
+                    null, // contains - className should contain this string
                     // Ignore the classes which are specific to the reporting tool
-                    "org.apache.jmeter.report.gui", // $NON-NLS-1$ // notContains - classname
should not contain this string
-                    false); // annotations - true if classnames are annotations
+                    "org.apache.jmeter.report.gui", // $NON-NLS-1$ // notContains - className
should not contain this string
+                    false); // annotations - true if classNames are annotations
             if (listClasses.isEmpty()) {
                 log.error("!!!!!Uh-oh, didn't find any action handlers!!!!!");
                 throw new JMeterError("No action handlers found - check JMeterHome and libraries");

Modified: jmeter/trunk/src/core/org/apache/jmeter/report/core/AbstractSampleWriter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/report/core/AbstractSampleWriter.java?rev=1791518&r1=1791517&r2=1791518&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/report/core/AbstractSampleWriter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/report/core/AbstractSampleWriter.java Sat Apr
15 16:27:12 2017
@@ -40,7 +40,7 @@ import org.slf4j.LoggerFactory;
  * </p>
  * <p>
  * When a writer is set on the sample writer any previous writer is flushed and
- * closed before beeing replaced by the new one.
+ * closed before being replaced by the new one.
  * </p>
  * 
  * @since 3.0
@@ -77,7 +77,7 @@ public abstract class AbstractSampleWrit
 
     /**
      * Instructs this sample writer to write samples on the specified output
-     * with UTG-8 encoding. The encoding can be overriden by the user through
+     * with UTG-8 encoding. The encoding can be overridden by the user through
      * {@link SaveService#getFileEncoding(String)}
      * 
      * @param out
@@ -97,8 +97,8 @@ public abstract class AbstractSampleWrit
      * Set the destination file in which this sample writer will write samples
      * 
      * @param output
-     *            The ouput file that will receive samples written by this
-     *            sample writter
+     *            The output file that will receive samples written by this
+     *            sample writer
      */
     public void setOutputFile(File output) {
         FileOutputStream fos = null;
@@ -111,7 +111,7 @@ public abstract class AbstractSampleWrit
     }
 
     /**
-     * This method is guaranted to not throw any exception. If writer is already
+     * This method is guaranteed to not throw any exception. If writer is already
      * closed then does nothing.<br>
      * Any buffered data is flushed by this method.
      */

Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/BatchSampleSender.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/BatchSampleSender.java?rev=1791518&r1=1791517&r2=1791518&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/BatchSampleSender.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/BatchSampleSender.java Sat Apr 15 16:27:12
2017
@@ -131,9 +131,9 @@ public class BatchSampleSender extends A
     }
 
     /**
-     * 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.
      *

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=1791518&r1=1791517&r2=1791518&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 Sat
Apr 15 16:27:12 2017
@@ -369,7 +369,7 @@ public abstract class AbstractProperty i
      * <li>TestElement =&gt; TestElementProperty with the same name</li>
      * <li>Map|Collection =&gt; Map|CollectionProperty with the name = item.hashCode</li>
      * </ul>
-     * @param item object to be turned into a propery
+     * @param item object to be turned into a property
      * @return the JMeterProperty
      */
     protected static JMeterProperty makeProperty(Object item) {

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=1791518&r1=1791517&r2=1791518&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 Sat Apr
15 16:27:12 2017
@@ -77,7 +77,7 @@ import org.slf4j.LoggerFactory;
  * </ul>
  * </li>
  * </ul>
- * For most developers, making a new visualizer is primarly for the purpose of
+ * For most developers, making a new visualizer is primarily for the purpose of
  * either calculating new statistics on the sample results that other
  * visualizers don't calculate, or displaying the results visually in a new and
  * interesting way. Making a new visualizer for either of these purposes is easy -

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/BaseParser.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/BaseParser.java?rev=1791518&r1=1791517&r2=1791518&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/BaseParser.java
(original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/BaseParser.java
Sat Apr 15 16:27:12 2017
@@ -76,7 +76,7 @@ public abstract class BaseParser impleme
         LOG.info("Created " + parserClassName);
         if (parser.isReusable()) {
             LinkExtractorParser currentParser = PARSERS.putIfAbsent(
-                    parserClassName, parser);// cache the parser if not alread
+                    parserClassName, parser);// cache the parser if not already
                                              // done by another thread
             if (currentParser != null) {
                 return currentParser;

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/AbstractSamplerCreator.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/AbstractSamplerCreator.java?rev=1791518&r1=1791517&r2=1791518&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/AbstractSamplerCreator.java
(original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/proxy/AbstractSamplerCreator.java
Sat Apr 15 16:27:12 2017
@@ -39,7 +39,7 @@ public abstract class AbstractSamplerCre
     protected static final String HTTP = "http"; // $NON-NLS-1$
     protected static final String HTTPS = "https"; // $NON-NLS-1$
 
-    /** Filetype to be used for the temporary binary files*/
+    /** FileType to be used for the temporary binary files*/
     private static final String BINARY_FILE_SUFFIX =
         JMeterUtils.getPropDefault("proxy.binary.filesuffix",// $NON-NLS-1$
                                    ".binary"); // $NON-NLS-1$
@@ -50,7 +50,7 @@ public abstract class AbstractSamplerCre
     /** Where to store the temporary binary files */
     private static final String BINARY_DIRECTORY =
         JMeterUtils.getPropDefault("proxy.binary.directory",// $NON-NLS-1$
-                System.getProperty("user.dir")); // $NON-NLS-1$ proxy.binary.filetype=binary
+                System.getProperty("user.dir")); // $NON-NLS-1$ proxy.binary.fileType=binary
 
     /*
      * Optionally number the requests

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=1791518&r1=1791517&r2=1791518&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 Apr 15 16:27:12 2017
@@ -50,7 +50,7 @@ import org.slf4j.LoggerFactory;
  * the logs. It also doesn't care how Generator is implemented, as long as it
  * implements the interface. This means a person could simply implement a dummy
  * parser to generate random parameters and the generator consumes the results.
- * This wasn't the original intent of the sampler. I originaly wanted to write
+ * This wasn't the original intent of the sampler. I originally wanted to write
  * 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

Modified: jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerBeanInfo.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerBeanInfo.java?rev=1791518&r1=1791517&r2=1791518&view=diff
==============================================================================
--- jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerBeanInfo.java
(original)
+++ jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/sampler/AccessLogSamplerBeanInfo.java
Sat Apr 15 16:27:12 2017
@@ -98,7 +98,7 @@ public class AccessLogSamplerBeanInfo ex
             log.warn("couldn't find classes and set up properties", e);
             throw new RuntimeException("Could not find classes with class finder", e);
         }
-        log.debug("Got to end of access log samper bean info init");
+        log.debug("Got to end of access log sampler bean info init");
     }
 
 }

Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1791518&r1=1791517&r2=1791518&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml [utf-8] (original)
+++ jmeter/trunk/xdocs/changes.xml [utf-8] Sat Apr 15 16:27:12 2017
@@ -162,6 +162,7 @@ Summary
     
 <h3>General</h3>
 <ul>
+    <li><bug>60994</bug>Fix some typo in comments or log messages</li>
 </ul>
 
  <!--  =================== Thanks =================== -->
@@ -170,6 +171,7 @@ Summary
 <p>We thank all contributors mentioned in bug and improvement sections above:
 </p>
 <ul>
+<li>Mithrandir0407 @ github</li>
 </ul>
 <p>We also thank bug reporters who helped us improve JMeter. <br/>
 For this release we want to give special thanks to the following reporters for the clear
reports and tests made after our fixes:</p>

Modified: jmeter/trunk/xdocs/usermanual/best-practices.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/best-practices.xml?rev=1791518&r1=1791517&r2=1791518&view=diff
==============================================================================
--- jmeter/trunk/xdocs/usermanual/best-practices.xml (original)
+++ jmeter/trunk/xdocs/usermanual/best-practices.xml Sat Apr 15 16:27:12 2017
@@ -115,7 +115,7 @@ The error "<code>unknown_ca</code>" prob
 JMeter Proxy server certificate.
 </p>
 <!--TODO: Describe how to use this to record against one server[name]
-and run against another. Actually, this particular example may be beter for the HTTP Request
Defaults&hellip;
+and run against another. Actually, this particular example may be better for the HTTP Request
Defaults&hellip;
 a good similar example for the variables is http vs. https.-->
 <!--SUMMARY of all TODO's above: we need some actual usage to identify best practices
 with this new features.-->



Mime
View raw message