You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by se...@apache.org on 2015/05/30 15:47:22 UTC

svn commit: r1682603 - in /jmeter/site/usermanual: boss.html functions.html

Author: sebb
Date: Sat May 30 13:47:22 2015
New Revision: 1682603

URL: http://svn.apache.org/r1682603
Log:
Publish fixes

Modified:
    jmeter/site/usermanual/boss.html
    jmeter/site/usermanual/functions.html

Modified: jmeter/site/usermanual/boss.html
URL: http://svn.apache.org/viewvc/jmeter/site/usermanual/boss.html?rev=1682603&r1=1682602&r2=1682603&view=diff
==============================================================================
--- jmeter/site/usermanual/boss.html (original)
+++ jmeter/site/usermanual/boss.html Sat May 30 13:47:22 2015
@@ -1,7 +1,7 @@
 <!DOCTYPE html SYSTEM "about:legacy-compat">
 <html lang="en"><head><META http-equiv="Content-Type" content="text/html; charset=iso-8859-15"><title>Apache JMeter
           -
-          User's Manual: My boss wants me to...</title><meta name="author" value="Martin Ramshaw"><meta name="email" value="mramshaw at alumni.concordia.ca"><meta name="author" value="Philippe Mouawad"><meta name="email" value="p.mouawad at ubik-ingenierie.com"><meta name="viewport" content="width=device-width, initial-scale=1"><link href="http://fonts.googleapis.com/css?family=Merriweather:400normal" rel="stylesheet" type="text/css"><link rel="stylesheet" type="text/css" href="../css/new-style.css"></head><body role="document"><a href="#content" class="hidden">Main content</a><div class="header"><!--
+          User's Manual: My boss wants me to...</title><meta name="author" value="JMeter developers"><meta name="email" value="dev@jmeter.apache.org"><meta name="viewport" content="width=device-width, initial-scale=1"><link href="http://fonts.googleapis.com/css?family=Merriweather:400normal" rel="stylesheet" type="text/css"><link rel="stylesheet" type="text/css" href="../css/new-style.css"></head><body role="document"><a href="#content" class="hidden">Main content</a><div class="header"><!--
             APACHE LOGO
           --><div><a href="http://www.apache.org"><img title="Apache Software Foundation" width="290" height="75" src="../images/asf-logo.png" alt="Logo ASF"></a></div><!--
               PROJECT LOGO
@@ -151,33 +151,17 @@ and any supplied documentation).
     </div>
 </div>
 <div class="subsection"><h2 id="plugins">18.5 How can I enhance JMeter ?<a class="sectionlink" href="#plugins" title="Link to here">&para;</a></h2>
-<p>There a lot of open-source and commercial plugins that can enhance JMeter, let's mention here the main open-source ones:
+<p>There a lot of open-source and commercial providers who provide JMeter plugins or other resources for use with JMeter.
+Some of these are listed on the JMeter Wiki.
+They are listed under several categories:
+<ul>
+<li><a href="http://wiki.apache.org/jmeter/JMeterPlugins">JMeterPlugins</a> - plugins for extending JMeter</li>
+<li><a href="http://wiki.apache.org/jmeter/JMeterAddons">JMeterAddons</a> - addons for use with JMeter, e.g. plugins for browsers, Maven and Jenkins.</li>
+<li><a href="http://wiki.apache.org/jmeter/JMeterServices">JMeterServices</a> - 3rd party services, e.g. cloud-based JMeter</li>
+</ul>
+Note that appearance of these on the Wiki does not imply any endorsement by the Apache JMeter project.
+Any requests for support should be directed to the relevant supplier.
 </p>
-    <div class="subsection"><h2 id="jmeter-plugins">18.5.1 JMeter-Plugins<a class="sectionlink" href="#jmeter-plugins" title="Link to here">&para;</a></h2>
-    <p>This <a href="http://jmeter-plugins.org/" target="_blank">non official project</a> is THE companion to core JMeter.<br>
-    It provides many useful extensions, among which:
-    <ul>
-    <li>Active Threads Over Time Graph Listener</li>
-    <li>Response Times vs Threads Graph Listener</li>
-    <li>Transaction Throughput vs Threads Graph Listener</li>
-    <li>GraphGenerator listener to create graphs at end of a load test</li>
-    <li>Selenium WebDriver Sampler</li>
-     <li>....</li>
-    </ul> 
-    </p>
-    </div>
-    <div class="subsection"><h2 id="jmeter-maven-plugin">18.5.2 JMeter Plugin for Maven<a class="sectionlink" href="#jmeter-maven-plugin" title="Link to here">&para;</a></h2>
-        <p>This <a href="http://jmeter.lazerycode.com/" target="_blank">non official plugin</a> allows you to run your automated JMeter tests through Maven.</p>
-    </div>
-    <div class="subsection"><h2 id="jmeter-performance-plugin">18.5.3 JMeter Performance Plugin<a class="sectionlink" href="#jmeter-performance-plugin" title="Link to here">&para;</a></h2>
-        <p>This <a href="https://wiki.jenkins-ci.org/display/JENKINS/Performance+Plugin" target="_blank">non official plugin</a> allows you to capture reports from JMeter and JUnit.<br>
-        Jenkins will generate graphic charts with the trend report of performance and robustness.
-        It includes the feature of setting the final build status as good, unstable or failed, based on the reported error percentage.
-        </p>
-    </div>
-    <div class="subsection"><h2 id="jmeter-ec2">18.5.4 JMeter plugin for AWS<a class="sectionlink" href="#jmeter-ec2" title="Link to here">&para;</a></h2>
-        <p>This <a href="https://github.com/oliverlloyd/jmeter-ec2" target="_blank">non official plugin</a> automates running Apache JMeter on Amazon EC2</p>
-    </div>    
 </div>
 <div class="subsection"><h2 id="java">18.6 Why Java ?<a class="sectionlink" href="#java" title="Link to here">&para;</a></h2>
 <p>Why not Perl or C ?

Modified: jmeter/site/usermanual/functions.html
URL: http://svn.apache.org/viewvc/jmeter/site/usermanual/functions.html?rev=1682603&r1=1682602&r2=1682603&view=diff
==============================================================================
--- jmeter/site/usermanual/functions.html (original)
+++ jmeter/site/usermanual/functions.html Sat May 30 13:47:22 2015
@@ -496,7 +496,7 @@ Examples:<br>
 <div class="go-top"><a href="#">^</a></div></div>
 
 <div class="component"><h2 id="__machineName">__machineName<a class="sectionlink" href="#__machineName" title="Link to here">&para;</a></h2>
-<div class="description"><p>The machineName function returns the local host name</p></div>
+<div class="description"><p>The machineName function returns the local host name. This uses the Java method InetAddress.getLocalHost() and passes it to getHostName()</p></div>
 
 <div class="properties"><h3 id="__machineName_parms1">
         Parameters
@@ -507,7 +507,7 @@ Examples:<br>
 <div class="go-top"><a href="#">^</a></div></div>
 
 <div class="component"><h2 id="__machineIP">__machineIP<a class="sectionlink" href="#__machineIP" title="Link to here">&para;</a></h2>
-<div class="description"><p>The machineIP function returns the local IP address</p></div>
+<div class="description"><p>The machineIP function returns the local IP address. This uses the Java method InetAddress.getLocalHost() and passes it to getHostAddress()</p></div>
 
 <div class="properties"><h3 id="__machineIP_parms1">
         Parameters
@@ -1191,7 +1191,7 @@ Function which escapes the characters in
 Supports HTML 4.0 entities.
 </p>
 <p>
-For example,<span class="code">&quot;bread&quot; &amp; &quot;butter&quot;</span>
+For example,<span class="code">&quot;bread&quot; & &quot;butter&quot;</span>
 becomes:
 <span class="code">&#38;quot;bread&#38;quot; &#38;amp; &#38;quot;butter&#38;quot;</span>.
 </p>