jmeter-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From milam...@apache.org
Subject svn commit: r1532767 [7/7] - in /jmeter/trunk: docs/ docs/images/ docs/localising/ docs/usermanual/ src/core/org/apache/jmeter/util/ xdocs/
Date Wed, 16 Oct 2013 13:57:03 GMT
Modified: jmeter/trunk/docs/usermanual/ldapops_tutor.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/ldapops_tutor.html?rev=1532767&r1=1532766&r2=1532767&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/ldapops_tutor.html (original)
+++ jmeter/trunk/docs/usermanual/ldapops_tutor.html Wed Oct 16 13:57:02 2013
@@ -6,9 +6,9 @@
    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.
@@ -20,24 +20,16 @@
 
 
 <!-- start the processing -->
-<!-- ====================================================================== -->
-<!-- Main Page Section -->
-<!-- ====================================================================== -->
 <html>
 <head>
 <link rel="stylesheet" type="text/css" href="../css/style.css"/>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
 
-
-<meta name="author" value="Dolf Smits">
-<meta name="email" value="Dolf.Smits@Siemens.com">
-
 <title>Apache JMeter - JMeter - User's Manual: LDAP Operations</title>
 </head>
 
 <body bgcolor="#ffffff" text="#000000" link="#525D76">
 <table border="0" cellspacing="0">
-<!-- TOP IMAGE -->
 <tr>
 <td>
 <!-- Need to specify height otherwise iframe seems to grab extra -->
@@ -67,7 +59,7 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="http://projects.apache.org/feeds/rss/jmeter.xml">Subscribe to What's
New</a>
 </li>
-<li><a href="../issues.html">Issues</a>
+<li><a href="../issues.html">Issue Tracking</a>
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>
 </li>
@@ -117,8 +109,6 @@ style="border-width:0; float: left" fram
 </ul>
 <p><strong>Community</strong></p>
 <ul>
-<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
-</li>
 <li><a href="../mail.html">Mailing Lists</a>
 </li>
 <li><a href="../svnindex.html">SVN Repositories</a>
@@ -128,6 +118,8 @@ style="border-width:0; float: left" fram
 <ul>
 <li><a href="http://www.apache.org/">ASF</a>
 </li>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved
in the ASF</a>
+</li>
 <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
 </li>
 <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a>
@@ -145,43 +137,43 @@ style="border-width:0; float: left" fram
 <blockquote>
 <p>
 
-								The extended LDAP sampler was built to support testing for very complex testpurposes.
-								It was aimed at supporting the LDAP operations as close as possible.
-								In this short tutorial, I will explain which LDAP operations exist and what they
do.
-								Per operation, I will shortly explain how these operations are implemented.
+    The extended LDAP sampler was built to support testing for very complex testpurposes.
+    It was aimed at supporting the LDAP operations as close as possible.
+    In this short tutorial, I will explain which LDAP operations exist and what they do.
+    Per operation, I will shortly explain how these operations are implemented.
 <br>
 
 
-								LDAP servers are some kind of hierarchical database, they store objects (entries)
in a tree. The uppermost part of a tree is called the ROOT of the tree.
+    LDAP servers are some kind of hierarchical database, they store objects (entries) in
a tree. The uppermost part of a tree is called the ROOT of the tree.
 <br>
 
 
-								eg. When a tree starts with dc=com, the root equals dc=com.
+    eg. When a tree starts with dc=com, the root equals dc=com.
 <br>
 
 
-								The next level can exist under the root, eg dc=Siemens. The full name of this object
(the "distinghuised name") is "dc=siemens,dc=com.
+    The next level can exist under the root, eg dc=test. The full name of this object (the
"distinghuised name") is "dc=test,dc=com.
 <br>
 
 
-								Again, a following level can be made, by adding the user "cn=admin" under dc=siemens,dc=com.
This object has a DN (distinguished name) of "cn=admin,dc=siemens,dc=com".
+    Again, a following level can be made, by adding the user "cn=admin" under dc=test,dc=com.
This object has a DN (distinguished name) of "cn=admin,dc=test,dc=com".
 <br>
 
 
-								The relative distinguished name (RDN) is the last part of the DN, eg. cn=admin.
+    The relative distinguished name (RDN) is the last part of the DN, eg. cn=admin.
 <br>
 
 
-								The characteristics of an object are determined by the objectClasses, which can be
seen as a collection of attributes.
+    The characteristics of an object are determined by the objectClasses, which can be seen
as a collection of attributes.
 <br>
 
 
-								The type of an object is determined by the "structural objectClass" eg person, organizationalUnit
or country.
+    The type of an object is determined by the "structural objectClass" eg person, organizationalUnit
or country.
 <br>
 
 
-								The attributes contain the data of an object, eg mailadress, name, streetadress etc.
Each attribute can have 0, 1 or more values.
-								
+    The attributes contain the data of an object, eg mailadress, name, streetadress etc.
Each attribute can have 0, 1 or more values.
+    
 </p>
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
 <tr><td bgcolor="#828DA6">
@@ -193,10 +185,10 @@ style="border-width:0; float: left" fram
 <blockquote>
 <p>
 
-							Any contact with an LDAP server MUST start with a bind request. LDAP is a state dependent
protocol. Without opening a session to
-							a LDAP server, no additional request can be made.
-							Due to some peculiarities in the JAVA libraries, 2 different bind operations are implemented.
-							
+    Any contact with an LDAP server MUST start with a bind request. LDAP is a state dependent
protocol. Without opening a session to
+    a LDAP server, no additional request can be made.
+    Due to some peculiarities in the JAVA libraries, 2 different bind operations are implemented.
+    
 </p>
 <table border="0" cellspacing="0" cellpadding="2" width="100%">
 <tr><td bgcolor="#828DA6">
@@ -208,9 +200,9 @@ style="border-width:0; float: left" fram
 <blockquote>
 <p>
 
-								This bind is meant to open a session to a LDAP server. Any testplan should use this
operation as the starting point from a session.
-								For each Thread (each virtual user) a seperate connection with the LDAP server is
build, and so a seperate Thread bind is performed.
-							
+    This bind is meant to open a session to a LDAP server. Any testplan should use this operation
as the starting point from a session.
+    For each Thread (each virtual user) a seperate connection with the LDAP server is build,
and so a seperate Thread bind is performed.
+    
 </p>
 </blockquote>
 </td></tr>
@@ -226,11 +218,11 @@ style="border-width:0; float: left" fram
 <blockquote>
 <p>
 
-								This bind is used for user authentication verification.
-								A proper developed LDAP client, who needs an authenticated user, perform a bind with
a given distinguished name and password.
-								This Single bind/unbind operation is for this purpose. It builds it own seperate
connection to the LDAP server, performs a
-								bind operation, and ends the connection again (by sending an unbind).
-						
+        This bind is used for user authentication verification.
+        A proper developed LDAP client, who needs an authenticated user, perform a bind with
a given distinguished name and password.
+        This Single bind/unbind operation is for this purpose. It builds it own seperate
connection to the LDAP server, performs a
+        bind operation, and ends the connection again (by sending an unbind).
+    
 </p>
 </blockquote>
 </td></tr>
@@ -250,10 +242,10 @@ style="border-width:0; float: left" fram
 <blockquote>
 <p>
 
-								To close a connection to a LDAP server, an unbind operation is needed.
-								As the Single bind/unbind operation already (implicitly) performs an unbind, only
a Thread unbind operation is needed.
-								This Thread unbind just closes the connection and cleans up any resources it has
used.
-						
+        To close a connection to a LDAP server, an unbind operation is needed.
+        As the Single bind/unbind operation already (implicitly) performs an unbind, only
a Thread unbind operation is needed.
+        This Thread unbind just closes the connection and cleans up any resources it has
used.
+    
 </p>
 </blockquote>
 </td></tr>
@@ -269,10 +261,10 @@ style="border-width:0; float: left" fram
 <blockquote>
 <p>
 
-		  				The compare operation needs the full distinguished name from a LDAP object, as well
as a attribute and a value for the attribute.
-		  				It will simply check: "Has this object really this attribute with this value?".
-		  				Typical use is checking the membership of a certain user with a given group.
-						
+    The compare operation needs the full distinguished name from a LDAP object, as well as
a attribute and a value for the attribute.
+    It will simply check: "Has this object really this attribute with this value?".
+    Typical use is checking the membership of a certain user with a given group.
+    
 </p>
 </blockquote>
 </td></tr>
@@ -288,10 +280,9 @@ style="border-width:0; float: left" fram
 <blockquote>
 <p>
 
-								The search test simply searches for all objects which comply with a given search
filter, eg.
-								all persons with a "employeeType=inactive" or "all persons with a userID equals user1"
-
-						
+    The search test simply searches for all objects which comply with a given search filter,
eg.
+    all persons with a "employeeType=inactive" or "all persons with a userID equals user1"
+    
 </p>
 </blockquote>
 </td></tr>
@@ -307,9 +298,9 @@ style="border-width:0; float: left" fram
 <blockquote>
 <p>
 
-								This simply add an object to the LDAP directory.
-								Off course the combination of attributes and distinguishedName must be valid!
-						
+    This simply add an object to the LDAP directory.
+    Off course the combination of attributes and distinguishedName must be valid!
+    
 </p>
 </blockquote>
 </td></tr>
@@ -325,24 +316,24 @@ style="border-width:0; float: left" fram
 <blockquote>
 <p>
 
-								This operation modifies one or more attributes from a given object.
-								It needs the distinghised name from the object, as well as the attributes and the
new values for this attribute.
+        This operation modifies one or more attributes from a given object.
+        It needs the distinghised name from the object, as well as the attributes and the
new values for this attribute.
 <br>
 
 
-								Three versions are available, add, for adding an attribute value
+        Three versions are available, add, for adding an attribute value
 <br>
 
 
-								replace, for overwriting the old attribute value with a new value
+        replace, for overwriting the old attribute value with a new value
 <br>
 
 
-								delete, to delete a value form an attribute, or to delete all the values of an attribute
+        delete, to delete a value form an attribute, or to delete all the values of an attribute
 <br>
 
 
-						
+    
 </p>
 </blockquote>
 </td></tr>
@@ -358,9 +349,9 @@ style="border-width:0; float: left" fram
 <blockquote>
 <p>
 
-								This operation deletes an object from the LDAP server.
-								It needs the distinghised name from the object.
-						
+        This operation deletes an object from the LDAP server.
+        It needs the distinghised name from the object.
+    
 </p>
 </blockquote>
 </td></tr>
@@ -376,25 +367,25 @@ style="border-width:0; float: left" fram
 <blockquote>
 <p>
 
-								This operation modifies the distinguished name from an object (it "moves" the object).
+        This operation modifies the distinguished name from an object (it "moves" the object).
 <br>
 
 
-								It comes in two flavours, just renaming an entry, then you specify a new RDN (relative
distinguished name, this is the lowest part of the DN)
+        It comes in two flavours, just renaming an entry, then you specify a new RDN (relative
distinguished name, this is the lowest part of the DN)
 <br>
 
 
-								eg, you can rename "cn=admin,dc=siemens,dc=com" to cn=administrator,dc=Siemens,dc=com"
+        eg, you can rename "cn=admin,dc=test,dc=com" to cn=administrator,dc=test,dc=com"
 <br>
 
 
-								The second flavour is renaming (moving) a complete subtree by specifying a "new superior"
+        The second flavour is renaming (moving) a complete subtree by specifying a "new superior"
 <br>
 
 
-								eg you can move a complete subtree "ou=retired,ou=people,dc=siemens,dc=com" to a
new subtree "ou=retired people,dc=siemens,dc=com" by specifying
-								a new rdn "ou=retired people" and a new superior of "dc=siemens,dc=com"
-						
+        eg you can move a complete subtree "ou=retired,ou=people,dc=test,dc=com" to a new
subtree "ou=retired people,dc=test,dc=com" by specifying
+        a new rdn "ou=retired people" and a new superior of "dc=test,dc=com"
+    
 </p>
 </blockquote>
 </td></tr>
@@ -457,3 +448,8 @@ trademarks of the Apache Software Founda
 
 
 
+
+
+
+
+

Modified: jmeter/trunk/docs/usermanual/listeners.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/listeners.html?rev=1532767&r1=1532766&r2=1532767&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/listeners.html (original)
+++ jmeter/trunk/docs/usermanual/listeners.html Wed Oct 16 13:57:02 2013
@@ -6,9 +6,9 @@
    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.
@@ -20,22 +20,16 @@
 
 
 <!-- start the processing -->
-<!-- ====================================================================== -->
-<!-- Main Page Section -->
-<!-- ====================================================================== -->
 <html>
 <head>
 <link rel="stylesheet" type="text/css" href="../css/style.css"/>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
 
-
-
 <title>Apache JMeter - User's Manual: Listeners</title>
 </head>
 
 <body bgcolor="#ffffff" text="#000000" link="#525D76">
 <table border="0" cellspacing="0">
-<!-- TOP IMAGE -->
 <tr>
 <td>
 <!-- Need to specify height otherwise iframe seems to grab extra -->
@@ -65,7 +59,7 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="http://projects.apache.org/feeds/rss/jmeter.xml">Subscribe to What's
New</a>
 </li>
-<li><a href="../issues.html">Issues</a>
+<li><a href="../issues.html">Issue Tracking</a>
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>
 </li>
@@ -115,8 +109,6 @@ style="border-width:0; float: left" fram
 </ul>
 <p><strong>Community</strong></p>
 <ul>
-<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
-</li>
 <li><a href="../mail.html">Mailing Lists</a>
 </li>
 <li><a href="../svnindex.html">SVN Repositories</a>
@@ -126,6 +118,8 @@ style="border-width:0; float: left" fram
 <ul>
 <li><a href="http://www.apache.org/">ASF</a>
 </li>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved
in the ASF</a>
+</li>
 <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
 </li>
 <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a>
@@ -246,7 +240,7 @@ output results like:.
 timeStamp|time|label|responseCode|threadName|dataType|success|failureMessage
 02/06/03 08:21:42|1187|Home|200|Thread Group-1|text|true|
 02/06/03 08:21:42|47|Login|200|Thread Group-1|text|false|Test Failed: 
-	expected to contain: password etc.
+    expected to contain: password etc.
 
 </pre>
 
@@ -300,7 +294,7 @@ The full set of properties that affect r
 # The commented out values are the defaults.
 
 # legitimate values: xml, csv, db.  Only xml and csv are currently supported.
-#jmeter.save.saveservice.output_format=xml
+#jmeter.save.saveservice.output_format=csv
 
 
 # true when field should be saved; false otherwise
@@ -399,7 +393,7 @@ JMeter (2.9+) will try the following for
 
 
 <li>
-yyyy/MM/dd HH:mm:ss.SSSS
+yyyy/MM/dd HH:mm:ss.SSS
 </li>
 
 
@@ -409,7 +403,7 @@ yyyy/MM/dd HH:mm:ss
 
 
 <li>
-yyyy-MM-dd HH:mm:ss.SSSS
+yyyy-MM-dd HH:mm:ss.SSS
 </li>
 
 
@@ -439,7 +433,7 @@ JMeter 2.8 and earlier used lenient mode
 <blockquote>
 <p>
 
-Versions of JMeter after 2.3.1 allow one to use the 
+JMeter supports the 
 <b>
 sample_variables
 </b>
@@ -473,7 +467,7 @@ Items with (CSV) after the name only app
 CSV format cannot currently be used to save any items that include line-breaks.
 
 </p>
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img
 src="../images/screenshots/sample_result_config.png"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img
 src="../images/screenshots/sample_result_config.png"/><br>
 <font size="-1"><br>
 
 <b>
@@ -1225,7 +1219,15 @@ use the menu item Run/Clear (Ctrl+Shift+
 <blockquote>
 <p>
 JMeter is capable of saving any listener as a PNG file. To do so, select the
-listener in the left panel. Click edit -> Save As Image. A file dialog will
+listener in the left panel. Click 
+<b>
+Edit
+</b>
+ > 
+<b>
+Save As Image
+</b>
+. A file dialog will
 appear. Enter the desired name and save the listener.
 
 </p>
@@ -1237,14 +1239,15 @@ The data will be saved to the clipboard,
 e.g. a spreadsheet or text editor.
 
 </p>
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img
 src="../images/screenshots/save_image.png"><br>
-<font size="-1">Figure 1 - Edit -> Save As Image
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img
 src="../images/screenshots/save_image.png"/><br>
+<font size="-1">Figure 1 - Edit > Save As Image
 </font></td></tr></table></p>
 </blockquote>
 </p>
 </td></tr>
 <tr><td><br></td></tr>
 </table>
+<br>
 <table>
 <tr>
 <td bgcolor="#525D76">
@@ -1258,7 +1261,6 @@ e.g. a spreadsheet or text editor.
 </td>
 </tr>
 </table>
-<br>
 </td>
 </tr>
 <tr><td colspan="2">
@@ -1310,3 +1312,8 @@ trademarks of the Apache Software Founda
 
 
 
+
+
+
+
+

Modified: jmeter/trunk/docs/usermanual/regular_expressions.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/regular_expressions.html?rev=1532767&r1=1532766&r2=1532767&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/regular_expressions.html (original)
+++ jmeter/trunk/docs/usermanual/regular_expressions.html Wed Oct 16 13:57:02 2013
@@ -6,9 +6,9 @@
    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.
@@ -20,22 +20,16 @@
 
 
 <!-- start the processing -->
-<!-- ====================================================================== -->
-<!-- Main Page Section -->
-<!-- ====================================================================== -->
 <html>
 <head>
 <link rel="stylesheet" type="text/css" href="../css/style.css"/>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
 
-
-
 <title>Apache JMeter - User's Manual: Regular Expressions</title>
 </head>
 
 <body bgcolor="#ffffff" text="#000000" link="#525D76">
 <table border="0" cellspacing="0">
-<!-- TOP IMAGE -->
 <tr>
 <td>
 <!-- Need to specify height otherwise iframe seems to grab extra -->
@@ -65,7 +59,7 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="http://projects.apache.org/feeds/rss/jmeter.xml">Subscribe to What's
New</a>
 </li>
-<li><a href="../issues.html">Issues</a>
+<li><a href="../issues.html">Issue Tracking</a>
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>
 </li>
@@ -115,8 +109,6 @@ style="border-width:0; float: left" fram
 </ul>
 <p><strong>Community</strong></p>
 <ul>
-<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
-</li>
 <li><a href="../mail.html">Mailing Lists</a>
 </li>
 <li><a href="../svnindex.html">SVN Repositories</a>
@@ -126,6 +118,8 @@ style="border-width:0; float: left" fram
 <ul>
 <li><a href="http://www.apache.org/">ASF</a>
 </li>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved
in the ASF</a>
+</li>
 <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
 </li>
 <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a>
@@ -250,7 +244,7 @@ extended regular expressions
 </i>
 , i.e. /abc/i becomes (?i)abc.
 See also 
-<a href="placement">
+<a href="#placement">
 Placement of modifiers
 </a>
  below.
@@ -805,6 +799,7 @@ without needing to access any external s
 </td></tr>
 <tr><td><br></td></tr>
 </table>
+<br>
 <table>
 <tr>
 <td bgcolor="#525D76">
@@ -818,7 +813,6 @@ without needing to access any external s
 </td>
 </tr>
 </table>
-<br>
 </td>
 </tr>
 <tr><td colspan="2">
@@ -870,3 +864,8 @@ trademarks of the Apache Software Founda
 
 
 
+
+
+
+
+

Modified: jmeter/trunk/docs/usermanual/remote-test.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/remote-test.html?rev=1532767&r1=1532766&r2=1532767&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/remote-test.html (original)
+++ jmeter/trunk/docs/usermanual/remote-test.html Wed Oct 16 13:57:02 2013
@@ -6,9 +6,9 @@
    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.
@@ -20,22 +20,16 @@
 
 
 <!-- start the processing -->
-<!-- ====================================================================== -->
-<!-- Main Page Section -->
-<!-- ====================================================================== -->
 <html>
 <head>
 <link rel="stylesheet" type="text/css" href="../css/style.css"/>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
 
-
-
 <title>Apache JMeter - User's Manual: Remote (Distributed) Testing</title>
 </head>
 
 <body bgcolor="#ffffff" text="#000000" link="#525D76">
 <table border="0" cellspacing="0">
-<!-- TOP IMAGE -->
 <tr>
 <td>
 <!-- Need to specify height otherwise iframe seems to grab extra -->
@@ -65,7 +59,7 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="http://projects.apache.org/feeds/rss/jmeter.xml">Subscribe to What's
New</a>
 </li>
-<li><a href="../issues.html">Issues</a>
+<li><a href="../issues.html">Issue Tracking</a>
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>
 </li>
@@ -115,8 +109,6 @@ style="border-width:0; float: left" fram
 </ul>
 <p><strong>Community</strong></p>
 <ul>
-<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
-</li>
 <li><a href="../mail.html">Mailing Lists</a>
 </li>
 <li><a href="../svnindex.html">SVN Repositories</a>
@@ -126,6 +118,8 @@ style="border-width:0; float: left" fram
 <ul>
 <li><a href="http://www.apache.org/">ASF</a>
 </li>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved
in the ASF</a>
+</li>
 <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
 </li>
 <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a>
@@ -207,8 +201,8 @@ server, you need to be mindful of the fa
 overhead on the application server and thus your testing results will be 
 somewhat tainted.  The recommended approach is to have one or more machines on
 the same Ethernet segment as your application server that you configure to run
-the JMeter Engine.  This will minimize the impact of the network on the test 
-results without impacting the performance of the application serer 
+the JMeter Engine.  This will minimise the impact of the network on the test 
+results without impacting the performance of the application server 
 itself.
 
 </p>
@@ -291,7 +285,7 @@ command line option
 </a>
 
 instead to specify the remote host(s) to use. This has the same effect as using -r and -Jremote_hosts={serverlist}.
-	E.g. jmeter -Rhost1,127.0.0.1,host2
+    E.g. jmeter -Rhost1,127.0.0.1,host2
 </p>
 <p>
 If you define the JMeter property server.exitaftertest=true, then the server will exit after
it runs a single test.
@@ -309,7 +303,7 @@ use the script "bin/jmeter".  You will n
 (see figure 1). These menus contain the client that you set in the properties file.  Use
the remote start and stop instead of the 
 normal JMeter start and stop menu items.
 </p>
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img
width='232' height='156' src="../images/screenshots/remote/run-menu00.gif"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img
width='232' height='156' src="../images/screenshots/remote/run-menu00.gif"/><br>
 <font size="-1">Figure 1 - Run Menu
 </font></td></tr></table></p>
 <p>
@@ -373,17 +367,17 @@ directory.  Before running rmiregistry, 
 
 <ul>
 
-	
+    
 <li>
 JMETER_HOME/lib/ext/ApacheJMeter_core.jar
 </li>
 
-	
+    
 <li>
 JMETER_HOME/lib/jorphan.jar
 </li>
 
-	
+    
 <li>
 JMETER_HOME/lib/logkit-1.2.jar
 </li>
@@ -752,6 +746,7 @@ time_threshold - number of milliseconds 
 </td></tr>
 <tr><td><br></td></tr>
 </table>
+<br>
 <table>
 <tr>
 <td bgcolor="#525D76">
@@ -765,7 +760,6 @@ time_threshold - number of milliseconds 
 </td>
 </tr>
 </table>
-<br>
 </td>
 </tr>
 <tr><td colspan="2">
@@ -817,3 +811,8 @@ trademarks of the Apache Software Founda
 
 
 
+
+
+
+
+

Modified: jmeter/trunk/docs/usermanual/test_plan.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/docs/usermanual/test_plan.html?rev=1532767&r1=1532766&r2=1532767&view=diff
==============================================================================
--- jmeter/trunk/docs/usermanual/test_plan.html (original)
+++ jmeter/trunk/docs/usermanual/test_plan.html Wed Oct 16 13:57:02 2013
@@ -6,9 +6,9 @@
    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.
@@ -20,22 +20,16 @@
 
 
 <!-- start the processing -->
-<!-- ====================================================================== -->
-<!-- Main Page Section -->
-<!-- ====================================================================== -->
 <html>
 <head>
 <link rel="stylesheet" type="text/css" href="../css/style.css"/>
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"/>
 
-
-
 <title>Apache JMeter - User's Manual: Elements of a Test Plan</title>
 </head>
 
 <body bgcolor="#ffffff" text="#000000" link="#525D76">
 <table border="0" cellspacing="0">
-<!-- TOP IMAGE -->
 <tr>
 <td>
 <!-- Need to specify height otherwise iframe seems to grab extra -->
@@ -65,7 +59,7 @@ style="border-width:0; float: left" fram
 </li>
 <li><a href="http://projects.apache.org/feeds/rss/jmeter.xml">Subscribe to What's
New</a>
 </li>
-<li><a href="../issues.html">Issues</a>
+<li><a href="../issues.html">Issue Tracking</a>
 </li>
 <li><a href="http://www.apache.org/licenses/">License</a>
 </li>
@@ -115,8 +109,6 @@ style="border-width:0; float: left" fram
 </ul>
 <p><strong>Community</strong></p>
 <ul>
-<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved</a>
-</li>
 <li><a href="../mail.html">Mailing Lists</a>
 </li>
 <li><a href="../svnindex.html">SVN Repositories</a>
@@ -126,6 +118,8 @@ style="border-width:0; float: left" fram
 <ul>
 <li><a href="http://www.apache.org/">ASF</a>
 </li>
+<li><a href="http://www.apache.org/foundation/getinvolved.html">Get Involved
in the ASF</a>
+</li>
 <li><a href="http://www.apache.org/foundation/sponsorship.html">Sponsorship</a>
 </li>
 <li><a href="http://www.apache.org/foundation/thanks.html">Thanks</a>
@@ -236,15 +230,15 @@ Version 1.9 introduces a test run 
 scheduler
 </b>
 . 
-	Click the checkbox at the bottom of the Thread Group panel to reveal extra fields
-	 in which you can enter the start and end times of the run. 
-	 When the test is started, JMeter will wait if necessary until the start-time has been reached.
-	 At the end of each cycle, JMeter checks if the end-time has been reached, and if so, the
run is stopped,
-	 otherwise the test is allowed to continue until the iteration limit is reached.
+    Click the checkbox at the bottom of the Thread Group panel to reveal extra fields
+     in which you can enter the start and end times of the run. 
+     When the test is started, JMeter will wait if necessary until the start-time has been
reached.
+     At the end of each cycle, JMeter checks if the end-time has been reached, and if so,
the run is stopped,
+     otherwise the test is allowed to continue until the iteration limit is reached.
 </p>
 <p>
 Alternatively, one can use the relative delay and duration fields. 
-	 Note that delay overrides start-time, and duration over-rides end-time.
+     Note that delay overrides start-time, and duration over-rides end-time.
 </p>
 </blockquote>
 </td></tr>
@@ -311,37 +305,37 @@ JMeter samplers include:
 
 <ul>
 
-	
+    
 <li>
 FTP Request
 </li>
 
-	
+    
 <li>
 HTTP Request
 </li>
 
-	
+    
 <li>
 JDBC Request
 </li>
 
-	
+    
 <li>
 Java object request
 </li>
 
-	
+    
 <li>
 LDAP Request
 </li>
 
-	
+    
 <li>
 SOAP/XML-RPC Request
 </li>
 
-	
+    
 <li>
 WebService (SOAP) Request
 </li>
@@ -414,80 +408,80 @@ following test tree:
 Test Plan
 </li>
 
-	
+    
 <ul>
 
-	
+    
 <li>
 Thread Group
 </li>
 
-		
+        
 <ul>
 
-		
+        
 <li>
 Once Only Controller
 </li>
 
-			
+            
 <ul>
 
-			
+            
 <li>
 Login Request (an 
 <a href="../usermanual/component_reference.html#HTTP_Request">HTTP Request</a>
 )
 </li>
 
-			
+            
 </ul>
 
-		
+        
 <li>
 Load Search Page (HTTP Sampler)
 </li>
 
-		
+        
 <li>
 Interleave Controller
 </li>
 
-			
+            
 <ul>
 
-			
+            
 <li>
 Search "A" (HTTP Sampler)
 </li>
 
-			
+            
 <li>
 Search "B" (HTTP Sampler)
 </li>
 
-			
+            
 <li>
 HTTP default request (Configuration Element)
 </li>
 
-			
+            
 </ul>
 
-		
+        
 <li>
 HTTP default request (Configuration Element)
 </li>
 
-		
+        
 <li>
 Cookie Manager (Configuration Element)
 </li>
 
-		
+        
 </ul>
 
-	
+    
 </ul>
 
 
@@ -739,7 +733,7 @@ and will count towards the error %age fo
 <p>
 A configuration element works closely with a Sampler.  Although it does not send requests
 (except for 
-<a href="../usermanual/component_reference.html#HTTP_Proxy_Server">HTTP Proxy Server</a>
+<a href="../usermanual/component_reference.html#HTTP(S)_Test_Script_Recorder">HTTP(S)
Test Script Recorder</a>
 ), it can add to or modify requests.
 </p>
 <p>
@@ -754,9 +748,9 @@ branch.  For example, we defined two HTT
 Since we placed "Web Defaults 1" inside a Loop Controller, only "Web Page 2" can access it.
 The other HTTP
 requests will use "Web Defaults 2", since we placed it in the Thread Group (the "parent"
of all other branches).
 </p>
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img
 src="../images/screenshots/http-config/http-config-example.png"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img
 src="../images/screenshots/http-config/http-config-example.png"/><br>
 <font size="-1">Figure 1 -
-	Test Plan Showing Accessability of Configuration Elements
+    Test Plan Showing Accessability of Configuration Elements
 </font></td></tr></table></p>
 <p>
 <table border="1" bgcolor="#bbbb00" width="50%" cellspacing="0" cellpadding="2">
@@ -980,7 +974,7 @@ Assertion 1
 
 The JMeter test tree contains elements that are both hierarchical and ordered.  Some elements
in the test trees are strictly hierarchical (Listeners, Config Elements, Post-Procesors, Pre-Processors,
Assertions, Timers), and some are primarily ordered (controllers, samplers).  When you create
your test plan, you will create an ordered list of sample request (via Samplers) that represent
a set of steps to be executed.  These requests are often organized within controllers that
are also ordered.  Given the following test tree:
 </p>
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img
 src="../images/screenshots/scoping1.png"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img
 src="../images/screenshots/scoping1.png"/><br>
 <font size="-1">Example test tree
 </font></td></tr></table></p>
 <p>
@@ -999,7 +993,7 @@ If its parent is a request, then it is a
 parent is a Controller, then it affects all requests that are descendants of
 that Controller.  In the following test tree:
 </p>
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img
 src="../images/screenshots/scoping2.png"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img
 src="../images/screenshots/scoping2.png"/><br>
 <font size="-1">Hierarchy example
 </font></td></tr></table></p>
 <p>
@@ -1008,7 +1002,7 @@ Assertion #1 is applied only to Request 
 <p>
 Another example, this time using Timers:
 </p>
-<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img
 src="../images/screenshots/scoping3.png"><br>
+<p><table border="0" cellspacing="0" cellpadding="0"><tr><td><img
 src="../images/screenshots/scoping3.png"/><br>
 <font size="-1">complex example
 </font></td></tr></table></p>
 <p>
@@ -1204,6 +1198,7 @@ jmeter ... -Jhost=www3.example.org -Jloo
 </td></tr>
 <tr><td><br></td></tr>
 </table>
+<br>
 <table>
 <tr>
 <td bgcolor="#525D76">
@@ -1217,7 +1212,6 @@ jmeter ... -Jhost=www3.example.org -Jloo
 </td>
 </tr>
 </table>
-<br>
 </td>
 </tr>
 <tr><td colspan="2">
@@ -1269,3 +1263,8 @@ trademarks of the Apache Software Founda
 
 
 
+
+
+
+
+

Modified: jmeter/trunk/src/core/org/apache/jmeter/util/JMeterVersion.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/util/JMeterVersion.java?rev=1532767&r1=1532766&r2=1532767&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/util/JMeterVersion.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/util/JMeterVersion.java Wed Oct 16 13:57:02 2013
@@ -49,7 +49,7 @@ public final class JMeterVersion {
      * This ensures that JMeterUtils always gets the correct
      * version, even if JMeterUtils is not re-compiled during the build.
      */
-    private static final String VERSION = "2.10-SNAPSHOT";
+    private static final String VERSION = "2.10";
 
     private static final String IMPLEMENTATION;
     

Modified: jmeter/trunk/xdocs/download_jmeter.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/download_jmeter.xml?rev=1532767&r1=1532766&r2=1532767&view=diff
==============================================================================
--- jmeter/trunk/xdocs/download_jmeter.xml (original)
+++ jmeter/trunk/xdocs/download_jmeter.xml Wed Oct 16 13:57:02 2013
@@ -18,7 +18,7 @@
 
 <!DOCTYPE document
 [
-<!ENTITY release '2.9'>
+<!ENTITY release '2.10'>
 ]>
     
 <document>   

Modified: jmeter/trunk/xdocs/overview.html
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/overview.html?rev=1532767&r1=1532766&r2=1532767&view=diff
==============================================================================
--- jmeter/trunk/xdocs/overview.html (original)
+++ jmeter/trunk/xdocs/overview.html Wed Oct 16 13:57:02 2013
@@ -18,7 +18,7 @@
 <!-- This file is copied into the Javadoc overview -->
 <html>
 <body>
-This is the documentation for Apache JMeter version 2.9 API.
-@version 2.9
+This is the documentation for Apache JMeter version 2.10 API.
+@version 2.10
 </body>
 </html>
\ No newline at end of file



Mime
View raw message