mstover1 2003/06/20 07:15:37
Modified: docs running.html
docs/usermanual best-practices.html build-test-plan.html
component_reference.html index.html test_plan.html
src/components/org/apache/jmeter/assertions/gui
XMLAssertionGui.java
src/components/org/apache/jmeter/control/gui
ThroughputControllerGui.java
src/components/org/apache/jmeter/visualizers GraphModel.java
src/core/org/apache/jmeter/engine/util CompoundVariable.java
src/core/org/apache/jmeter/gui/util JDateField.java
src/core/org/apache/jmeter/threads JMeterContext.java
JMeterContextService.java
src/jorphan/org/apache/jorphan/collections HashTree.java
ListedHashTree.java SearchByClass.java
SortedHashTree.java
src/jorphan/org/apache/jorphan/gui ComponentUtil.java
JLabeledField.java JLabeledTextArea.java
src/jorphan/org/apache/jorphan/io TextFile.java
src/protocol/http/org/apache/jmeter/junit/protocol/http/config
HttpConfigSuite.java
src/protocol/http/org/apache/jmeter/protocol/http/control
Authorization.java Header.java
src/protocol/http/org/apache/jmeter/protocol/http/modifier
UserParameterXMLContentHandler.java
src/protocol/http/org/apache/jmeter/protocol/http/parser
HtmlForm.java
src/protocol/http/org/apache/jmeter/protocol/http/proxy
HttpRequestHdr.java ProxyControl.java
src/protocol/java/org/apache/jmeter/protocol/java/sampler
JavaSamplerContext.java
src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/util
DBKey.java
src/protocol/ldap/org/apache/jmeter/protocol/ldap/config
LdapConfig.java
src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui
LdapConfigGui.java
src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui
LdapTestSamplerGui.java
src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler
LDAPSampler.java LdapClient.java
xdocs/stylesheets site.vsl
xdocs/usermanual best-practices.xml build-test-plan.xml
component_reference.xml index.xml test_plan.xml
Removed: lib xerces.jar
Log:
Updating third party libs
Updating docs
Updating import statements
Revision Changes Path
1.71 +0 -0 jakarta-jmeter/docs/running.html
Index: running.html
===================================================================
RCS file: /home/cvs/jakarta-jmeter/docs/running.html,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -r1.70 -r1.71
1.29 +7 -28 jakarta-jmeter/docs/usermanual/best-practices.html
Index: best-practices.html
===================================================================
RCS file: /home/cvs/jakarta-jmeter/docs/usermanual/best-practices.html,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- best-practices.html 15 Jun 2003 16:09:23 -0000 1.28
+++ best-practices.html 20 Jun 2003 14:15:30 -0000 1.29
@@ -195,44 +195,23 @@
fresh.
</p>
<p >
- Although JMeter will
record directly to the ThreadGroup if no Logical Controller is
-present, it's recommended that you add a
-
<a href="../usermanual/component_reference.html#Simple_Controller">Simple
Controller</a>
- so that all
-samples are recorded there. This conveniently packages all your samples under one
+ The Proxy Server
expects to find a ThreadGroup element with a Recording Controller under it where it
will record HTTP Requests to. This conveniently packages all your samples under one
controller, which can be given a name that describes the test case.
</p>
<p >
Now, go through the
steps of a Test Case. If you have no pre-defined test cases, use
-JMeter to record your actions to define some test cases. Once you have finished a
+JMeter to record your actions to define your test cases. Once you have finished a
definite series of steps, save the entire test case in an appropriately named file.
Then, wipe
clean and start a new test case. By doing this, you can quickly record a large
number of
test case "rough drafts".
</p>
<p >
One of the most useful
features of the Proxy Server is that you can abstract out
-certain common elements from the recorded samples. By attaching an
-
<a href="../usermanual/component_reference.html#HTTP_Request_Defaults">HTTP
Request Defaults</a>
- ,
-with the "domain" property specified (eg jakarta.apache.org), to your
-
<a href="../usermanual/component_reference.html#Simple_Controller">Simple
Controller</a>
- ,
-you can direct JMeter to:
- </p>
-
<ol >
-
<li >
- Only record samples
with matching "domain" fields under this Controller, and
- </li>
-
-
-
<li >
- Remove the "domain"
field from the recorded sample.
- </li>
-
-
- </ol>
-
<p >
- You can do the same
with the "Path" field.
+certain common elements from the recorded samples. By defining some
+
<a href="functions.html">
+ user-defined variables
+ </a>
+ at the Test
Plan level, you can have JMeter automatically replace values in you recorded samples.
For instance, if you are testing an app on server "xxx.yyy.com", then you can define a
variable called "server" with the value of "xxx.yyy.com", and anyplace that value is
found in your recorded samples will be replaced with "${server}".
</p>
</blockquote>
</p>
1.30 +1 -1 jakarta-jmeter/docs/usermanual/build-test-plan.html
Index: build-test-plan.html
===================================================================
RCS file: /home/cvs/jakarta-jmeter/docs/usermanual/build-test-plan.html,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- build-test-plan.html 15 Jun 2003 16:09:23 -0000 1.29
+++ build-test-plan.html 20 Jun 2003 14:15:30 -0000 1.30
@@ -237,7 +237,7 @@
<font size="-1"> complex example
</font></td></tr></table></p>
<p >
- In this example, the
requests or named to reflect the order in which they will be executed. Timer #1 will
apply to Requests Two, Three, and Four (notice how order is irrelevant for
hierarchical elements). Assertion #1 will apply only to Request Three. Timer #2 will
affect all the requests.
+ In this example, the
requests are named to reflect the order in which they will be executed. Timer #1 will
apply to Requests Two, Three, and Four (notice how order is irrelevant for
hierarchical elements). Assertion #1 will apply only to Request Three. Timer #2 will
affect all the requests.
</p>
<p >
Hopefully these
examples make it clear how configuration (hierarchical) elements are applied. If you
imagine each Request being passed up the tree branches, to its parent, then to its
parent's parent, etc, and each time collecting all the configuration elements of that
parent, then you will see how it works.
1.53 +9 -11 jakarta-jmeter/docs/usermanual/component_reference.html
Index: component_reference.html
===================================================================
RCS file: /home/cvs/jakarta-jmeter/docs/usermanual/component_reference.html,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -r1.52 -r1.53
--- component_reference.html 18 Jun 2003 21:53:19 -0000 1.52
+++ component_reference.html 20 Jun 2003 14:15:30 -0000 1.53
@@ -2594,15 +2594,13 @@
Where Do Samples Get
Recorded?
</b>
<p >
- JMeter places the
recorded samples in the Thread Group, or if you have a Simple Logic Controller,
JMeter places
-them there. Also, if you have a HTTP Request Defaults element, then the recorded
samples will have empty fields for
-the default values you specified.
- </p>
-
<p><table
border="1" bgcolor="#bbbb00" width="50%" cellspacing="0" cellpadding="2">
- <tr><td> If you have
more than one Simple Logic Controller, JMeter records the samples to each
-of your Simple Logic Controllers. We plan to correct this in a future release.
- </td></tr>
- </table></p>
+ JMeter places the
recorded samples in a Recording Controller found under a Thread Group (so be sure to
add a ThreadGroup and then a Recording Controller before you start recording). Also,
if you have a HTTP Request Defaults element, then the recorded samples will have empty
fields for
+the default values you specified. Additionally, you can specify user-defined
values that will replaced in your samples as they are recorded. See
+
<a href="best-practices.html#proxy_server">
+ Best Practices with
the Proxy Server
+ </a>
+ for more info.
+ </p>
<p >
When you are done
recording your test samples, stop the proxy server (hit the "stop" button). Remember
to reset
your browser's proxy settings. Now, you may want to sort and re-order the test
script, add timers, listeners, a
@@ -3957,8 +3955,8 @@
<p
>
Allows the user to
extract values from a server response using a Perl-type regular expression. As a
post-processor,
this element will execute after each Sample request in its
-
<a href="build-test-plan.html#scoping_rules">scope</a>
- , applying the
regular expression, extracting the requested values,
+
<a href="build-test-plan.html#scoping_rules">scope</a>
+ ,
applying the regular expression, extracting the requested values,
generate the template string, and store the result into the given variable name.
</p>
<p><b>Control Panel</b></p>
1.43 +14 -0 jakarta-jmeter/docs/usermanual/index.html
Index: index.html
===================================================================
RCS file: /home/cvs/jakarta-jmeter/docs/usermanual/index.html,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- index.html 15 Jun 2003 16:09:24 -0000 1.42
+++ index.html 20 Jun 2003 14:15:30 -0000 1.43
@@ -405,6 +405,20 @@
</a>
</li>
+
+
<li >
+
<a href="test_plan.html#preprocessors">
+ 4.7 Pre-Processor
Elements
+ </a>
+ </li>
+
+
+
<li >
+
<a href="test_plan.html#postprocessors">
+ 4.8 Post-Processor
Elements
+ </a>
+ </li>
+
</ul>
1.28 +34 -0 jakarta-jmeter/docs/usermanual/test_plan.html
Index: test_plan.html
===================================================================
RCS file: /home/cvs/jakarta-jmeter/docs/usermanual/test_plan.html,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- test_plan.html 15 Jun 2003 16:09:24 -0000 1.27
+++ test_plan.html 20 Jun 2003 14:15:31 -0000 1.28
@@ -603,6 +603,40 @@
</td></tr>
<tr><td><br></td></tr>
</table>
+
<table
border="0" cellspacing="0" cellpadding="2" width="100%">
+ <tr><td bgcolor="#828DA6">
+ <font color="#ffffff" face="arial,helvetica,sanserif">
+ <a name="preprocessors"><strong>4.7 Pre-Processor
Elements</strong></a>
+ </font>
+ </td></tr>
+ <tr><td>
+ <blockquote>
+
<p >
+ A Pre-Processor
executes some action prior to a Sampler Request being made. If a Pre-Processor is
attached to a Sampler element, then it will execute just prior to that sampler element
running. A Pre-Processor is most often used to modify the settings of a Sample
Request just before it runs, or to update variables that aren't extracted from
response text. See the
+
<a href="build-test-plan.html#scoping_rules">scoping rules</a>
+ for
more details on when Pre-Processors are executed.
+ </p>
+ </blockquote>
+ </td></tr>
+ <tr><td><br></td></tr>
+ </table>
+
<table
border="0" cellspacing="0" cellpadding="2" width="100%">
+ <tr><td bgcolor="#828DA6">
+ <font color="#ffffff" face="arial,helvetica,sanserif">
+ <a name="postprocessors"><strong>4.8 Post-Processor
Elements</strong></a>
+ </font>
+ </td></tr>
+ <tr><td>
+ <blockquote>
+
<p >
+ A Post-Processor
executes some action after a Sampler Request has been made. If a Post-Processor is
attached to a Sampler element, then it will execute just after that sampler element
runs. A Post-Processor is most often used to process the response data, often to
extract values from it. See the
+
<a href="build-test-plan.html#scoping_rules">scoping rules</a>
+ for
more details on when Pre-Processors are executed.
+ </p>
+ </blockquote>
+ </td></tr>
+ <tr><td><br></td></tr>
+ </table>
</blockquote>
</p>
</td></tr>
1.2 +2 -2
jakarta-jmeter/src/components/org/apache/jmeter/assertions/gui/XMLAssertionGui.java
Index: XMLAssertionGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/assertions/gui/XMLAssertionGui.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- XMLAssertionGui.java 6 Jun 2003 13:03:55 -0000 1.1
+++ XMLAssertionGui.java 20 Jun 2003 14:15:33 -0000 1.2
@@ -54,9 +54,9 @@
*/
package org.apache.jmeter.assertions.gui;
+import org.apache.jmeter.assertions.XMLAssertion;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.util.JMeterUtils;
-import org.apache.jmeter.assertions.XMLAssertion;
import org.apache.jorphan.gui.layout.VerticalLayout;
1.5 +3 -3
jakarta-jmeter/src/components/org/apache/jmeter/control/gui/ThroughputControllerGui.java
Index: ThroughputControllerGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/control/gui/ThroughputControllerGui.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ThroughputControllerGui.java 14 May 2003 14:51:27 -0000 1.4
+++ ThroughputControllerGui.java 20 Jun 2003 14:15:33 -0000 1.5
@@ -54,8 +54,8 @@
*/
package org.apache.jmeter.control.gui;
-import java.awt.event.ActionListener;
import java.awt.event.ActionEvent;
+import java.awt.event.ActionListener;
import java.awt.event.ItemEvent;
import java.awt.event.ItemListener;
1.7 +1 -1
jakarta-jmeter/src/components/org/apache/jmeter/visualizers/GraphModel.java
Index: GraphModel.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/components/org/apache/jmeter/visualizers/GraphModel.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- GraphModel.java 7 May 2003 16:44:16 -0000 1.6
+++ GraphModel.java 20 Jun 2003 14:15:34 -0000 1.7
@@ -62,7 +62,7 @@
import org.apache.jmeter.samplers.Clearable;
import org.apache.jmeter.samplers.SampleResult;
-import org.apache.jorphan.math.*;
+import org.apache.jorphan.math.StatCalculator;
/**
* Title: Apache JMeter Description: Copyright: Copyright (c) 2000 Company:
1.14 +1 -2
jakarta-jmeter/src/core/org/apache/jmeter/engine/util/CompoundVariable.java
Index: CompoundVariable.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/engine/util/CompoundVariable.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- CompoundVariable.java 11 Jun 2003 14:58:45 -0000 1.13
+++ CompoundVariable.java 20 Jun 2003 14:15:34 -0000 1.14
@@ -74,7 +74,6 @@
import org.apache.jorphan.logging.LoggingManager;
import org.apache.jorphan.reflect.ClassFinder;
import org.apache.log.Logger;
-//import org.apache.oro.text.perl.Perl5Util;
import org.apache.oro.text.regex.MalformedPatternException;
import org.apache.oro.text.regex.Perl5Compiler;
import org.apache.oro.text.regex.Perl5Matcher;
1.2 +10 -11
jakarta-jmeter/src/core/org/apache/jmeter/gui/util/JDateField.java
Index: JDateField.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/gui/util/JDateField.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JDateField.java 11 Jun 2003 14:08:13 -0000 1.1
+++ JDateField.java 20 Jun 2003 14:15:34 -0000 1.2
@@ -55,18 +55,17 @@
package org.apache.jmeter.gui.util;
-import javax.swing.JTextField;
-import java.util.Date;
-import java.util.Calendar;
-import java.util.GregorianCalendar;
-import java.util.Date;
-import java.awt.event.KeyAdapter;
-import java.awt.event.FocusListener;
import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
+import java.awt.event.KeyAdapter;
import java.awt.event.KeyEvent;
-
import java.text.DateFormat;
import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.GregorianCalendar;
+
+import javax.swing.JTextField;
/****************************************
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
*
1.7 +1 -2
jakarta-jmeter/src/core/org/apache/jmeter/threads/JMeterContext.java
Index: JMeterContext.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/threads/JMeterContext.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- JMeterContext.java 16 May 2003 16:58:17 -0000 1.6
+++ JMeterContext.java 20 Jun 2003 14:15:34 -0000 1.7
@@ -1,8 +1,7 @@
package org.apache.jmeter.threads;
import org.apache.jmeter.samplers.SampleResult;
-import org.apache.jmeter.threads.JMeterVariables;
-import org.apache.jmeter.samplers.*;
+import org.apache.jmeter.samplers.Sampler;
/**
* @author Administrator
1.3 +0 -2
jakarta-jmeter/src/core/org/apache/jmeter/threads/JMeterContextService.java
Index: JMeterContextService.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/threads/JMeterContextService.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JMeterContextService.java 7 Apr 2003 18:31:55 -0000 1.2
+++ JMeterContextService.java 20 Jun 2003 14:15:34 -0000 1.3
@@ -59,8 +59,6 @@
import java.util.HashMap;
import java.util.Map;
-import org.apache.jmeter.threads.JMeterContext;
-
/**
* @author Thad Smith
*
1.4 +1 -1
jakarta-jmeter/src/jorphan/org/apache/jorphan/collections/HashTree.java
Index: HashTree.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/jorphan/org/apache/jorphan/collections/HashTree.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- HashTree.java 5 Jun 2003 16:22:21 -0000 1.3
+++ HashTree.java 20 Jun 2003 14:15:34 -0000 1.4
@@ -69,8 +69,8 @@
import junit.framework.TestCase;
-import org.apache.log.Logger;
import org.apache.jorphan.logging.LoggingManager;
+import org.apache.log.Logger;
/**********************************************************************
This class is used to create a tree structure of objects. Each element in the tree
is also a key to the next node down in the tree. It provides many ways to add
objects and
1.4 +10 -2
jakarta-jmeter/src/jorphan/org/apache/jorphan/collections/ListedHashTree.java
Index: ListedHashTree.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/jorphan/org/apache/jorphan/collections/ListedHashTree.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ListedHashTree.java 5 Jun 2003 16:22:22 -0000 1.3
+++ ListedHashTree.java 20 Jun 2003 14:15:34 -0000 1.4
@@ -54,8 +54,16 @@
*/
package org.apache.jorphan.collections;
-import java.io.*;
-import java.util.*;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
/****************************************
* ListedHashTree is a different implementation of the [EMAIL PROTECTED] HashTree}
collection class.
1.2 +5 -1
jakarta-jmeter/src/jorphan/org/apache/jorphan/collections/SearchByClass.java
Index: SearchByClass.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/jorphan/org/apache/jorphan/collections/SearchByClass.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SearchByClass.java 17 Oct 2002 19:47:18 -0000 1.1
+++ SearchByClass.java 20 Jun 2003 14:15:34 -0000 1.2
@@ -55,7 +55,11 @@
package org.apache.jorphan.collections;
-import java.util.*;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
/**
* Useful for finding all nodes in the tree that represent objects of a particular
* type. For instance, if your tree contains all strings, and a few StringBuffer
objects,
1.2 +1 -2
jakarta-jmeter/src/jorphan/org/apache/jorphan/collections/SortedHashTree.java
Index: SortedHashTree.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/jorphan/org/apache/jorphan/collections/SortedHashTree.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- SortedHashTree.java 17 Oct 2002 19:47:18 -0000 1.1
+++ SortedHashTree.java 20 Jun 2003 14:15:34 -0000 1.2
@@ -63,9 +63,8 @@
import java.util.Map;
import java.util.TreeMap;
-import org.apache.log.Logger;
-
import org.apache.jorphan.logging.LoggingManager;
+import org.apache.log.Logger;
/**********************************************************************
* SortedHashTree is a different implementation of the [EMAIL PROTECTED] HashTree}
collection class.
1.2 +1 -1
jakarta-jmeter/src/jorphan/org/apache/jorphan/gui/ComponentUtil.java
Index: ComponentUtil.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/jorphan/org/apache/jorphan/gui/ComponentUtil.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ComponentUtil.java 17 Oct 2002 19:47:18 -0000 1.1
+++ ComponentUtil.java 20 Jun 2003 14:15:34 -0000 1.2
@@ -64,8 +64,8 @@
* @version 1.0
*/
-import java.awt.Dimension;
import java.awt.Component;
+import java.awt.Dimension;
/**
* This class is a Util for awt Component and could be
1.2 +3 -2
jakarta-jmeter/src/jorphan/org/apache/jorphan/gui/JLabeledField.java
Index: JLabeledField.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/jorphan/org/apache/jorphan/gui/JLabeledField.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- JLabeledField.java 17 Oct 2002 19:47:18 -0000 1.1
+++ JLabeledField.java 20 Jun 2003 14:15:35 -0000 1.2
@@ -55,8 +55,9 @@
package org.apache.jorphan.gui;
-import javax.swing.event.*;
-import java.util.*;
+import java.util.List;
+
+import javax.swing.event.ChangeListener;
/**
* Title:
1.3 +12 -7
jakarta-jmeter/src/jorphan/org/apache/jorphan/gui/JLabeledTextArea.java
Index: JLabeledTextArea.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/jorphan/org/apache/jorphan/gui/JLabeledTextArea.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- JLabeledTextArea.java 27 Apr 2003 23:02:36 -0000 1.2
+++ JLabeledTextArea.java 20 Jun 2003 14:15:35 -0000 1.3
@@ -55,15 +55,20 @@
package org.apache.jorphan.gui;
-import javax.swing.*;
-import java.util.*;
-import javax.swing.text.Document;
-import javax.swing.event.ChangeListener;
-import javax.swing.event.ChangeEvent;
import java.awt.BorderLayout;
-import java.util.ArrayList;
-import java.awt.event.FocusListener;
import java.awt.event.FocusEvent;
+import java.awt.event.FocusListener;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
+
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTextArea;
+import javax.swing.event.ChangeEvent;
+import javax.swing.event.ChangeListener;
+import javax.swing.text.Document;
/**
* A Helper component that wraps a JTextField with a label into
1.2 +1 -2 jakarta-jmeter/src/jorphan/org/apache/jorphan/io/TextFile.java
Index: TextFile.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/jorphan/org/apache/jorphan/io/TextFile.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- TextFile.java 17 Oct 2002 19:47:18 -0000 1.1
+++ TextFile.java 20 Jun 2003 14:15:35 -0000 1.2
@@ -62,9 +62,8 @@
import java.io.IOException;
import java.io.Writer;
-import org.apache.log.Logger;
-
import org.apache.jorphan.logging.LoggingManager;
+import org.apache.log.Logger;
/************************************************************
* !ToDo (Class description)
1.2 +1 -1
jakarta-jmeter/src/protocol/http/org/apache/jmeter/junit/protocol/http/config/HttpConfigSuite.java
Index: HttpConfigSuite.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/junit/protocol/http/config/HttpConfigSuite.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HttpConfigSuite.java 11 Aug 2002 19:24:50 -0000 1.1
+++ HttpConfigSuite.java 20 Jun 2003 14:15:35 -0000 1.2
@@ -54,7 +54,7 @@
*/
package org.apache.jmeter.junit.protocol.http.config;
-import junit.framework.*;
+import junit.framework.TestSuite;
/**
* Title: Apache JMeter
* Description:
1.4 +2 -2
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/control/Authorization.java
Index: Authorization.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/control/Authorization.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Authorization.java 2 May 2003 18:15:00 -0000 1.3
+++ Authorization.java 20 Jun 2003 14:15:35 -0000 1.4
@@ -54,9 +54,9 @@
*/
package org.apache.jmeter.protocol.http.control;
-import org.apache.jmeter.config.*;
-import java.io.*;
+import java.io.Serializable;
+import org.apache.jmeter.config.ConfigElement;
import org.apache.jmeter.testelement.AbstractTestElement;
/**
* This class is an Authorization encapsulator.
1.3 +2 -2
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/control/Header.java
Index: Header.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/control/Header.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Header.java 7 Apr 2003 14:35:25 -0000 1.2
+++ Header.java 20 Jun 2003 14:15:35 -0000 1.3
@@ -55,9 +55,9 @@
package org.apache.jmeter.protocol.http.control;
-import org.apache.jmeter.config.*;
-import java.io.*;
+import java.io.Serializable;
+import org.apache.jmeter.config.ConfigElement;
import org.apache.jmeter.testelement.AbstractTestElement;
/**
1.2 +11 -4
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterXMLContentHandler.java
Index: UserParameterXMLContentHandler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/modifier/UserParameterXMLContentHandler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- UserParameterXMLContentHandler.java 11 Aug 2002 19:24:51 -0000 1.1
+++ UserParameterXMLContentHandler.java 20 Jun 2003 14:15:35 -0000 1.2
@@ -54,9 +54,16 @@
*/
package org.apache.jmeter.protocol.http.modifier;
-import org.xml.sax.*;
-import java.util.*;
-import java.io.*;
+import java.io.CharArrayWriter;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.xml.sax.Attributes;
+import org.xml.sax.ContentHandler;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
/************************************************************
* Title: Jakarta-JMeter Description: Copyright: Copyright (c) 2001 Company:
1.2 +2 -1
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlForm.java
Index: HtmlForm.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlForm.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- HtmlForm.java 11 Aug 2002 19:24:52 -0000 1.1
+++ HtmlForm.java 20 Jun 2003 14:15:35 -0000 1.2
@@ -1,6 +1,7 @@
package org.apache.jmeter.protocol.http.parser;
-import java.util.*;
+import java.util.Collection;
+import java.util.Collections;
/************************************************************
* Title: Description: Copyright: Copyright (c) 2001 Company:
1.13 +4 -4
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java
Index: HttpRequestHdr.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/HttpRequestHdr.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- HttpRequestHdr.java 5 Jun 2003 15:02:06 -0000 1.12
+++ HttpRequestHdr.java 20 Jun 2003 14:15:35 -0000 1.13
@@ -22,8 +22,8 @@
import org.apache.jmeter.protocol.http.sampler.HTTPSampler;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.util.JMeterUtils;
-import org.apache.log.Logger;
import org.apache.jorphan.logging.LoggingManager;
+import org.apache.log.Logger;
/****************************************
* The headers of the client HTTP request.
1.24 +1 -2
jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java
Index: ProxyControl.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/http/org/apache/jmeter/protocol/http/proxy/ProxyControl.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ProxyControl.java 1 Jun 2003 18:58:23 -0000 1.23
+++ ProxyControl.java 20 Jun 2003 14:15:35 -0000 1.24
@@ -54,7 +54,6 @@
*/
package org.apache.jmeter.protocol.http.proxy;
import java.io.Serializable;
-import java.net.UnknownHostException;
import java.util.Collection;
import java.util.Enumeration;
import java.util.HashSet;
1.6 +1 -3
jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java
Index: JavaSamplerContext.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/java/org/apache/jmeter/protocol/java/sampler/JavaSamplerContext.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- JavaSamplerContext.java 8 May 2003 21:03:37 -0000 1.5
+++ JavaSamplerContext.java 20 Jun 2003 14:15:36 -0000 1.6
@@ -54,8 +54,6 @@
*/
package org.apache.jmeter.protocol.java.sampler;
-import java.lang.Long; // Import needed for some versions of JavaDoc to
- // properly handle @see tag below.
import java.util.Iterator;
import java.util.Map;
1.2 +4 -1
jakarta-jmeter/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/util/DBKey.java
Index: DBKey.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/jdbc/org/apache/jmeter/protocol/jdbc/util/DBKey.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- DBKey.java 11 Aug 2002 19:24:53 -0000 1.1
+++ DBKey.java 20 Jun 2003 14:15:36 -0000 1.2
@@ -55,7 +55,10 @@
package org.apache.jmeter.protocol.jdbc.util;
-import java.io.*;
+import java.io.IOException;
+import java.io.ObjectInputStream;
+import java.io.ObjectOutputStream;
+import java.io.Serializable;
public class DBKey implements Serializable{
1.2 +3 -2
jakarta-jmeter/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/LdapConfig.java
Index: LdapConfig.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/LdapConfig.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LdapConfig.java 4 Jun 2003 14:31:44 -0000 1.1
+++ LdapConfig.java 20 Jun 2003 14:15:36 -0000 1.2
@@ -55,11 +55,12 @@
package org.apache.jmeter.protocol.ldap.config;
import java.io.Serializable;
-import org.apache.jmeter.config.ConfigTestElement;
+
import org.apache.jmeter.config.Arguments;
+import org.apache.jmeter.config.ConfigTestElement;
import org.apache.jmeter.protocol.ldap.sampler.LDAPSampler;
-import org.apache.jmeter.testelement.property.TestElementProperty;
import org.apache.jmeter.testelement.property.BooleanProperty;
+import org.apache.jmeter.testelement.property.TestElementProperty;
/****************************************
* Title: JMeter Description: Copyright: Copyright (c) 2000 Company: Apache
1.2 +12 -13
jakarta-jmeter/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapConfigGui.java
Index: LdapConfigGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/ldap/org/apache/jmeter/protocol/ldap/config/gui/LdapConfigGui.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LdapConfigGui.java 4 Jun 2003 14:31:44 -0000 1.1
+++ LdapConfigGui.java 20 Jun 2003 14:15:36 -0000 1.2
@@ -53,29 +53,28 @@
* <http://www.apache.org/>.
*/
package org.apache.jmeter.protocol.ldap.config.gui;
-import javax.swing.JLabel;
-import javax.swing.JPanel;
-import javax.swing.JTextField;
-import javax.swing.JRadioButton;
-import javax.swing.JCheckBox;
-import javax.swing.BorderFactory;
-import javax.swing.ButtonGroup;
-
import java.awt.BorderLayout;
-import java.awt.event.ItemListener;
-import java.awt.event.ItemEvent;
import java.awt.CardLayout;
+import java.awt.event.ItemEvent;
+import java.awt.event.ItemListener;
+import javax.swing.BorderFactory;
+import javax.swing.ButtonGroup;
+import javax.swing.JCheckBox;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JRadioButton;
+import javax.swing.JTextField;
import org.apache.jmeter.config.ConfigTestElement;
-import org.apache.jmeter.config.gui.ArgumentsPanel;
import org.apache.jmeter.config.gui.AbstractConfigGui;
+import org.apache.jmeter.config.gui.ArgumentsPanel;
+import org.apache.jmeter.gui.util.VerticalPanel;
import org.apache.jmeter.protocol.ldap.sampler.LDAPSampler;
import org.apache.jmeter.testelement.TestElement;
-import org.apache.jmeter.testelement.property.StringProperty;
import org.apache.jmeter.testelement.property.BooleanProperty;
+import org.apache.jmeter.testelement.property.StringProperty;
import org.apache.jmeter.testelement.property.TestElementProperty;
-import org.apache.jmeter.gui.util.VerticalPanel;
import org.apache.jmeter.util.JMeterUtils;
/****************************************
1.2 +3 -6
jakarta-jmeter/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapTestSamplerGui.java
Index: LdapTestSamplerGui.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/ldap/org/apache/jmeter/protocol/ldap/control/gui/LdapTestSamplerGui.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LdapTestSamplerGui.java 4 Jun 2003 14:31:44 -0000 1.1
+++ LdapTestSamplerGui.java 20 Jun 2003 14:15:36 -0000 1.2
@@ -53,15 +53,12 @@
* <http://www.apache.org/>.
*/
package org.apache.jmeter.protocol.ldap.control.gui;
-import javax.swing.BorderFactory;
-import javax.swing.JPanel;
-import javax.swing.border.Border;
-import javax.swing.border.EmptyBorder;
import java.awt.BorderLayout;
-import java.awt.GridLayout;
-import org.apache.jmeter.gui.util.VerticalPanel;
+import javax.swing.BorderFactory;
+
import org.apache.jmeter.config.gui.LoginConfigGui;
+import org.apache.jmeter.gui.util.VerticalPanel;
import org.apache.jmeter.protocol.ldap.config.gui.LdapConfigGui;
import org.apache.jmeter.protocol.ldap.sampler.LDAPSampler;
import org.apache.jmeter.samplers.gui.AbstractSamplerGui;
1.2 +7 -8
jakarta-jmeter/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPSampler.java
Index: LDAPSampler.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LDAPSampler.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LDAPSampler.java 4 Jun 2003 14:31:44 -0000 1.1
+++ LDAPSampler.java 20 Jun 2003 14:15:36 -0000 1.2
@@ -54,14 +54,16 @@
*/
package org.apache.jmeter.protocol.ldap.sampler;
-import javax.naming.NoPermissionException;
import javax.naming.NamingException;
-import javax.naming.directory.DirContext;
-import javax.naming.directory.BasicAttributes;
+import javax.naming.NoPermissionException;
+import javax.naming.directory.Attribute;
import javax.naming.directory.BasicAttribute;
+import javax.naming.directory.BasicAttributes;
+import javax.naming.directory.DirContext;
import javax.naming.directory.ModificationItem;
-import javax.naming.directory.Attribute;
+import org.apache.jmeter.config.Argument;
+import org.apache.jmeter.config.Arguments;
import org.apache.jmeter.config.ConfigTestElement;
import org.apache.jmeter.config.LoginConfig;
import org.apache.jmeter.protocol.ldap.config.LdapConfig;
@@ -69,13 +71,10 @@
import org.apache.jmeter.samplers.Entry;
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.testelement.TestElement;
-import org.apache.jmeter.testelement.property.TestElementProperty;
import org.apache.jmeter.testelement.property.BooleanProperty;
import org.apache.jmeter.testelement.property.PropertyIterator;
import org.apache.jmeter.testelement.property.StringProperty;
-import org.apache.jmeter.config.Arguments;
-import org.apache.jmeter.config.Argument;
-
+import org.apache.jmeter.testelement.property.TestElementProperty;
import org.apache.log.Hierarchy;
import org.apache.log.Logger;
1.2 +5 -4
jakarta-jmeter/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LdapClient.java
Index: LdapClient.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/protocol/ldap/org/apache/jmeter/protocol/ldap/sampler/LdapClient.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- LdapClient.java 4 Jun 2003 14:31:45 -0000 1.1
+++ LdapClient.java 20 Jun 2003 14:15:36 -0000 1.2
@@ -55,15 +55,16 @@
package org.apache.jmeter.protocol.ldap.sampler;
import java.util.Hashtable;
+
import javax.naming.Context;
-import javax.naming.NoPermissionException;
import javax.naming.NamingException;
+import javax.naming.NoPermissionException;
+import javax.naming.directory.BasicAttributes;
import javax.naming.directory.DirContext;
import javax.naming.directory.InitialDirContext;
-import javax.naming.directory.BasicAttributes;
-import javax.naming.directory.BasicAttribute;
-import javax.naming.directory.SearchControls;
import javax.naming.directory.ModificationItem;
+import javax.naming.directory.SearchControls;
+
import org.apache.log.Hierarchy;
import org.apache.log.Logger;
1.18 +7 -3 jakarta-jmeter/xdocs/stylesheets/site.vsl
Index: site.vsl
===================================================================
RCS file: /home/cvs/jakarta-jmeter/xdocs/stylesheets/site.vsl,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- site.vsl 15 Jun 2003 15:28:39 -0000 1.17
+++ site.vsl 20 Jun 2003 14:15:36 -0000 1.18
@@ -187,8 +187,12 @@
</table></p>
#end
-#macro (scope)
- <a href="build-test-plan.html#scoping_rules">scope</a>
+#macro (scope $scope)
+ #if ($scope.getText() == "")
+ <a href="build-test-plan.html#scoping_rules">scope</a>
+ #else
+ <a href="build-test-plan.html#scoping_rules">$scope.getText()</a>
+ #end
#end
#macro (unknown $u_node)
@@ -213,7 +217,7 @@
#elseif ($u_node.getName().equals("subsection"))
#subsection ($u_node)
#elseif ($u_node.getName().equals("scope"))
- #scope ()
+ #scope ($u_node)
#else
#outputTag($u_node)
#runloop($u_node)
1.6 +5 -12 jakarta-jmeter/xdocs/usermanual/best-practices.xml
Index: best-practices.xml
===================================================================
RCS file: /home/cvs/jakarta-jmeter/xdocs/usermanual/best-practices.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- best-practices.xml 11 Jun 2003 15:49:30 -0000 1.5
+++ best-practices.xml 20 Jun 2003 14:15:36 -0000 1.6
@@ -43,23 +43,16 @@
also have to exclude stylesheets, javascript files, and other included files. Test
out your settings to verify you are recording what you want, and then erase and
start
fresh.</p>
-<p>Although JMeter will record directly to the ThreadGroup if no Logical Controller
is
-present, it's recommended that you add a <complink name="Simple Controller"/> so
that all
-samples are recorded there. This conveniently packages all your samples under one
+<p>The Proxy Server expects to find a ThreadGroup element with a Recording
Controller under it where it will record HTTP Requests to. This conveniently packages
all your samples under one
controller, which can be given a name that describes the test case.</p>
<p>Now, go through the steps of a Test Case. If you have no pre-defined test
cases, use
-JMeter to record your actions to define some test cases. Once you have finished a
+JMeter to record your actions to define your test cases. Once you have finished a
definite series of steps, save the entire test case in an appropriately named file.
Then, wipe
clean and start a new test case. By doing this, you can quickly record a large
number of
test case "rough drafts".</p>
<p>One of the most useful features of the Proxy Server is that you can abstract out
-certain common elements from the recorded samples. By attaching an <complink
name="HTTP Request Defaults"/>,
-with the "domain" property specified (eg jakarta.apache.org), to your <complink
name="Simple Controller"/>,
-you can direct JMeter to:</p>
-<ol><li>Only record samples with matching "domain" fields under this Controller,
and</li>
-<li>Remove the "domain" field from the recorded sample.</li>
-</ol>
-<p>You can do the same with the "Path" field.</p>
+certain common elements from the recorded samples. By defining some <a
href="functions.html">user-defined variables</a> at the Test Plan level, you can have
JMeter automatically replace values in you recorded samples. For instance, if you are
testing an app on server "xxx.yyy.com", then you can define a variable called "server"
with the value of "xxx.yyy.com", and anyplace that value is found in your recorded
samples will be replaced with "${server}".</p>
+
</section>
</body>
1.11 +2 -2 jakarta-jmeter/xdocs/usermanual/build-test-plan.xml
Index: build-test-plan.xml
===================================================================
RCS file: /home/cvs/jakarta-jmeter/xdocs/usermanual/build-test-plan.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build-test-plan.xml 13 Jun 2003 14:51:51 -0000 1.10
+++ build-test-plan.xml 20 Jun 2003 14:15:36 -0000 1.11
@@ -63,7 +63,7 @@
<p>Assertion #1 is applied only to Request One, while Assertion #2 is applied to
Requests Two and Three.</p>
<p>Another example, this time using Timers:</p>
<figure image="scoping3.png">complex example</figure>
-<p>In this example, the requests or named to reflect the order in which they will
be executed. Timer #1 will apply to Requests Two, Three, and Four (notice how order
is irrelevant for hierarchical elements). Assertion #1 will apply only to Request
Three. Timer #2 will affect all the requests.</p>
+<p>In this example, the requests are named to reflect the order in which they will
be executed. Timer #1 will apply to Requests Two, Three, and Four (notice how order
is irrelevant for hierarchical elements). Assertion #1 will apply only to Request
Three. Timer #2 will affect all the requests.</p>
<p>Hopefully these examples make it clear how configuration (hierarchical) elements
are applied. If you imagine each Request being passed up the tree branches, to its
parent, then to its parent's parent, etc, and each time collecting all the
configuration elements of that parent, then you will see how it works. </p>
</section>
1.49 +3 -6 jakarta-jmeter/xdocs/usermanual/component_reference.xml
Index: component_reference.xml
===================================================================
RCS file: /home/cvs/jakarta-jmeter/xdocs/usermanual/component_reference.xml,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- component_reference.xml 18 Jun 2003 21:53:22 -0000 1.48
+++ component_reference.xml 20 Jun 2003 14:15:36 -0000 1.49
@@ -828,11 +828,8 @@
the port # is from the Proxy Control Panel shown above.</note>
<b>Where Do Samples Get Recorded?</b>
-<p>JMeter places the recorded samples in the Thread Group, or if you have a Simple
Logic Controller, JMeter places
-them there. Also, if you have a HTTP Request Defaults element, then the recorded
samples will have empty fields for
-the default values you specified.</p>
-<note>If you have more than one Simple Logic Controller, JMeter records the samples
to each
-of your Simple Logic Controllers. We plan to correct this in a future
release.</note>
+<p>JMeter places the recorded samples in a Recording Controller found under a
Thread Group (so be sure to add a ThreadGroup and then a Recording Controller before
you start recording). Also, if you have a HTTP Request Defaults element, then the
recorded samples will have empty fields for
+the default values you specified. Additionally, you can specify user-defined
values that will replaced in your samples as they are recorded. See <a
href="best-practices.html#proxy_server">Best Practices with the Proxy Server</a> for
more info.</p>
<p>When you are done recording your test samples, stop the proxy server (hit the
"stop" button). Remember to reset
your browser's proxy settings. Now, you may want to sort and re-order the test
script, add timers, listeners, a
1.27 +3 -1 jakarta-jmeter/xdocs/usermanual/index.xml
Index: index.xml
===================================================================
RCS file: /home/cvs/jakarta-jmeter/xdocs/usermanual/index.xml,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- index.xml 11 Jun 2003 15:49:30 -0000 1.26
+++ index.xml 20 Jun 2003 14:15:37 -0000 1.27
@@ -62,6 +62,8 @@
<li><a href="test_plan.html#timers">4.4 Timers</a></li>
<li><a href="test_plan.html#assertions">4.5 Assertions</a></li>
<li><a href="test_plan.html#config_elements">4.6 Configuration
Elements</a></li>
+ <li><a href="test_plan.html#preprocessors">4.7 Pre-Processor Elements</a></li>
+ <li><a href="test_plan.html#postprocessors">4.8 Post-Processor
Elements</a></li>
</ul>
<li><a href="build-web-test-plan.html">5. Building a Web Test Plan</a></li>
<ul>
1.12 +9 -1 jakarta-jmeter/xdocs/usermanual/test_plan.xml
Index: test_plan.xml
===================================================================
RCS file: /home/cvs/jakarta-jmeter/xdocs/usermanual/test_plan.xml,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- test_plan.xml 13 Jun 2003 14:51:51 -0000 1.11
+++ test_plan.xml 20 Jun 2003 14:15:37 -0000 1.12
@@ -255,6 +255,14 @@
Test Plan Showing Accessability of Configuration Elements</figure>
</subsection>
+<subsection name="4.7 Pre-Processor Elements" anchor="preprocessors">
+<p>A Pre-Processor executes some action prior to a Sampler Request being made. If
a Pre-Processor is attached to a Sampler element, then it will execute just prior to
that sampler element running. A Pre-Processor is most often used to modify the
settings of a Sample Request just before it runs, or to update variables that aren't
extracted from response text. See the <scope>scoping rules</scope> for more details
on when Pre-Processors are executed.</p>
+</subsection>
+
+<subsection name="4.8 Post-Processor Elements" anchor="postprocessors">
+<p>A Post-Processor executes some action after a Sampler Request has been made. If
a Post-Processor is attached to a Sampler element, then it will execute just after
that sampler element runs. A Post-Processor is most often used to process the
response data, often to extract values from it. See the <scope>scoping rules</scope>
for more details on when Pre-Processors are executed.</p>
+</subsection>
+
</section>
</body>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
