You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jmeter-dev@jakarta.apache.org by se...@apache.org on 2007/09/09 22:11:31 UTC

svn commit: r574066 - in /jakarta/jmeter/branches/rel-2-2/docs: ./ api/ api/org/apache/jmeter/extractor/ api/org/apache/jmeter/protocol/http/proxy/gui/ api/org/apache/jmeter/protocol/jdbc/config/ api/org/apache/jmeter/protocol/jdbc/sampler/ api/org/apa...

Author: sebb
Date: Sun Sep  9 13:11:30 2007
New Revision: 574066

URL: http://svn.apache.org/viewvc?rev=574066&view=rev
Log:
Synchronise generated documents

Modified:
    jakarta/jmeter/branches/rel-2-2/docs/api/constant-values.html
    jakarta/jmeter/branches/rel-2-2/docs/api/index-all.html
    jakarta/jmeter/branches/rel-2-2/docs/api/org/apache/jmeter/extractor/XPathExtractor.html
    jakarta/jmeter/branches/rel-2-2/docs/api/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.html
    jakarta/jmeter/branches/rel-2-2/docs/api/org/apache/jmeter/protocol/http/proxy/gui/package-tree.html
    jakarta/jmeter/branches/rel-2-2/docs/api/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html
    jakarta/jmeter/branches/rel-2-2/docs/api/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.html
    jakarta/jmeter/branches/rel-2-2/docs/api/org/apache/jmeter/save/converters/ConversionHelp.html
    jakarta/jmeter/branches/rel-2-2/docs/api/org/apache/jmeter/save/converters/package-summary.html
    jakarta/jmeter/branches/rel-2-2/docs/api/org/apache/jmeter/util/XPathUtil.html
    jakarta/jmeter/branches/rel-2-2/docs/api/overview-tree.html
    jakarta/jmeter/branches/rel-2-2/docs/api/serialized-form.html
    jakarta/jmeter/branches/rel-2-2/docs/changes.html
    jakarta/jmeter/branches/rel-2-2/docs/usermanual/component_reference.html
    jakarta/jmeter/branches/rel-2-2/docs/usermanual/get-started.html
    jakarta/jmeter/branches/rel-2-2/docs/usermanual/test_plan.html

Modified: jakarta/jmeter/branches/rel-2-2/docs/api/constant-values.html
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/docs/api/constant-values.html?rev=574066&r1=574065&r2=574066&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/docs/api/constant-values.html (original)
+++ jakarta/jmeter/branches/rel-2-2/docs/api/constant-values.html Sun Sep  9 13:11:30 2007
@@ -539,34 +539,10 @@
 <TD COLSPAN=3><B>org.apache.jmeter.extractor.<A HREF="org/apache/jmeter/extractor/XPathExtractor.html" title="class in org.apache.jmeter.extractor">XPathExtractor</A></B></TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.apache.jmeter.extractor.XPathExtractor.DEFAULT"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;<A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/apache/jmeter/extractor/XPathExtractor.html#DEFAULT">DEFAULT</A></CODE></TD>
-<TD ALIGN="right"><CODE>"XPathExtractor.default"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
 <A NAME="org.apache.jmeter.extractor.XPathExtractor.KEY_PREFIX"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
 <CODE>protected&nbsp;static&nbsp;final&nbsp;<A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
 <TD ALIGN="left"><CODE><A HREF="org/apache/jmeter/extractor/XPathExtractor.html#KEY_PREFIX">KEY_PREFIX</A></CODE></TD>
 <TD ALIGN="right"><CODE>"XPathExtractor."</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.apache.jmeter.extractor.XPathExtractor.REFNAME"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;<A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/apache/jmeter/extractor/XPathExtractor.html#REFNAME">REFNAME</A></CODE></TD>
-<TD ALIGN="right"><CODE>"XPathExtractor.refname"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.apache.jmeter.extractor.XPathExtractor.TOLERANT"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;<A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/apache/jmeter/extractor/XPathExtractor.html#TOLERANT">TOLERANT</A></CODE></TD>
-<TD ALIGN="right"><CODE>"XPathExtractor.tolerant"</CODE></TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<A NAME="org.apache.jmeter.extractor.XPathExtractor.XPATH_QUERY"><!-- --></A><TD ALIGN="right"><FONT SIZE="-1">
-<CODE>public&nbsp;static&nbsp;final&nbsp;<A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD ALIGN="left"><CODE><A HREF="org/apache/jmeter/extractor/XPathExtractor.html#XPATH_QUERY">XPATH_QUERY</A></CODE></TD>
-<TD ALIGN="right"><CODE>"XPathExtractor.xpathQuery"</CODE></TD>
 </TR>
 </FONT></TD>
 </TR>

Modified: jakarta/jmeter/branches/rel-2-2/docs/api/index-all.html
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/docs/api/index-all.html?rev=574066&r1=574065&r2=574066&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/docs/api/index-all.html (original)
+++ jakarta/jmeter/branches/rel-2-2/docs/api/index-all.html Sun Sep  9 13:11:30 2007
@@ -1704,7 +1704,7 @@
 <DD>&nbsp;
 <DT><A HREF="org/apache/jmeter/control/Controller.html" title="interface in org.apache.jmeter.control"><B>Controller</B></A> - interface org.apache.jmeter.control.<A HREF="org/apache/jmeter/control/Controller.html" title="interface in org.apache.jmeter.control">Controller</A>.<DD>This interface will typically be used in the following manner:
  
- Controller controller; //gets initialized while(!<DT><A HREF="org/apache/jmeter/save/converters/ConversionHelp.html" title="class in org.apache.jmeter.save.converters"><B>ConversionHelp</B></A> - class org.apache.jmeter.save.converters.<A HREF="org/apache/jmeter/save/converters/ConversionHelp.html" title="class in org.apache.jmeter.save.converters">ConversionHelp</A>.<DD>&nbsp;<DT><A HREF="org/apache/jmeter/save/converters/ConversionHelp.html#ConversionHelp()"><B>ConversionHelp()</B></A> - 
+ Controller controller; //gets initialized while(!<DT><A HREF="org/apache/jmeter/save/converters/ConversionHelp.html" title="class in org.apache.jmeter.save.converters"><B>ConversionHelp</B></A> - class org.apache.jmeter.save.converters.<A HREF="org/apache/jmeter/save/converters/ConversionHelp.html" title="class in org.apache.jmeter.save.converters">ConversionHelp</A>.<DD>Utility conversion routines for use with XStream<DT><A HREF="org/apache/jmeter/save/converters/ConversionHelp.html#ConversionHelp()"><B>ConversionHelp()</B></A> - 
 Constructor for class org.apache.jmeter.save.converters.<A HREF="org/apache/jmeter/save/converters/ConversionHelp.html" title="class in org.apache.jmeter.save.converters">ConversionHelp</A>
 <DD>&nbsp;
 <DT><A HREF="org/apache/jmeter/engine/ConvertListeners.html" title="class in org.apache.jmeter.engine"><B>ConvertListeners</B></A> - class org.apache.jmeter.engine.<A HREF="org/apache/jmeter/engine/ConvertListeners.html" title="class in org.apache.jmeter.engine">ConvertListeners</A>.<DD>&nbsp;<DT><A HREF="org/apache/jmeter/engine/ConvertListeners.html#ConvertListeners()"><B>ConvertListeners()</B></A> - 
@@ -3708,9 +3708,6 @@
 <DT><A HREF="org/apache/jmeter/gui/action/KeyStrokes.html#DEBUG_ON"><B>DEBUG_ON</B></A> - 
 Static variable in class org.apache.jmeter.gui.action.<A HREF="org/apache/jmeter/gui/action/KeyStrokes.html" title="class in org.apache.jmeter.gui.action">KeyStrokes</A>
 <DD>&nbsp;
-<DT><A HREF="org/apache/jmeter/extractor/XPathExtractor.html#DEFAULT"><B>DEFAULT</B></A> - 
-Static variable in class org.apache.jmeter.extractor.<A HREF="org/apache/jmeter/extractor/XPathExtractor.html" title="class in org.apache.jmeter.extractor">XPathExtractor</A>
-<DD>&nbsp;
 <DT><A HREF="org/apache/jmeter/testbeans/BeanInfoSupport.html#DEFAULT"><B>DEFAULT</B></A> - 
 Static variable in class org.apache.jmeter.testbeans.<A HREF="org/apache/jmeter/testbeans/BeanInfoSupport.html" title="class in org.apache.jmeter.testbeans">BeanInfoSupport</A>
 <DD>&nbsp;
@@ -4404,7 +4401,8 @@
 <DD>&nbsp;
 <DT><A HREF="org/apache/jmeter/save/converters/ConversionHelp.html#encode(java.lang.String)"><B>encode(String)</B></A> - 
 Static method in class org.apache.jmeter.save.converters.<A HREF="org/apache/jmeter/save/converters/ConversionHelp.html" title="class in org.apache.jmeter.save.converters">ConversionHelp</A>
-<DD>&nbsp;
+<DD>Encode a string (if necessary) for output to a JTL file.
+ 
 <DT><A HREF="org/apache/jmeter/protocol/http/util/Base64Encoder.html#encodeAtom(byte[], int, int)"><B>encodeAtom(byte[], int, int)</B></A> - 
 Static method in class org.apache.jmeter.protocol.http.util.<A HREF="org/apache/jmeter/protocol/http/util/Base64Encoder.html" title="class in org.apache.jmeter.protocol.http.util">Base64Encoder</A>
 <DD>&nbsp;
@@ -4926,9 +4924,6 @@
 <DT><A HREF="org/apache/jmeter/protocol/http/modifier/gui/ParamModifierGui.html#focusGained(java.awt.event.FocusEvent)"><B>focusGained(FocusEvent)</B></A> - 
 Method in class org.apache.jmeter.protocol.http.modifier.gui.<A HREF="org/apache/jmeter/protocol/http/modifier/gui/ParamModifierGui.html" title="class in org.apache.jmeter.protocol.http.modifier.gui">ParamModifierGui</A>
 <DD>&nbsp;
-<DT><A HREF="org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.html#focusGained(java.awt.event.FocusEvent)"><B>focusGained(FocusEvent)</B></A> - 
-Method in class org.apache.jmeter.protocol.http.proxy.gui.<A HREF="org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.html" title="class in org.apache.jmeter.protocol.http.proxy.gui">ProxyControlGui</A>
-<DD>&nbsp;
 <DT><A HREF="org/apache/jmeter/testbeans/gui/PasswordEditor.html#focusGained(java.awt.event.FocusEvent)"><B>focusGained(FocusEvent)</B></A> - 
 Method in class org.apache.jmeter.testbeans.gui.<A HREF="org/apache/jmeter/testbeans/gui/PasswordEditor.html" title="class in org.apache.jmeter.testbeans.gui">PasswordEditor</A>
 <DD>&nbsp;
@@ -4956,9 +4951,6 @@
 <DT><A HREF="org/apache/jmeter/protocol/http/modifier/gui/ParamModifierGui.html#focusLost(java.awt.event.FocusEvent)"><B>focusLost(FocusEvent)</B></A> - 
 Method in class org.apache.jmeter.protocol.http.modifier.gui.<A HREF="org/apache/jmeter/protocol/http/modifier/gui/ParamModifierGui.html" title="class in org.apache.jmeter.protocol.http.modifier.gui">ParamModifierGui</A>
 <DD>&nbsp;
-<DT><A HREF="org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.html#focusLost(java.awt.event.FocusEvent)"><B>focusLost(FocusEvent)</B></A> - 
-Method in class org.apache.jmeter.protocol.http.proxy.gui.<A HREF="org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.html" title="class in org.apache.jmeter.protocol.http.proxy.gui">ProxyControlGui</A>
-<DD>&nbsp;
 <DT><A HREF="org/apache/jmeter/testbeans/gui/PasswordEditor.html#focusLost(java.awt.event.FocusEvent)"><B>focusLost(FocusEvent)</B></A> - 
 Method in class org.apache.jmeter.testbeans.gui.<A HREF="org/apache/jmeter/testbeans/gui/PasswordEditor.html" title="class in org.apache.jmeter.testbeans.gui">PasswordEditor</A>
 <DD>&nbsp;
@@ -10792,9 +10784,6 @@
 <DT><A HREF="org/apache/jmeter/visualizers/MonitorHealthVisualizer.html#initModel()"><B>initModel()</B></A> - 
 Method in class org.apache.jmeter.visualizers.<A HREF="org/apache/jmeter/visualizers/MonitorHealthVisualizer.html" title="class in org.apache.jmeter.visualizers">MonitorHealthVisualizer</A>
 <DD>&nbsp;
-<DT><A HREF="org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#initPool()"><B>initPool()</B></A> - 
-Method in class org.apache.jmeter.protocol.jdbc.config.<A HREF="org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html" title="class in org.apache.jmeter.protocol.jdbc.config">DataSourceElement</A>
-<DD>&nbsp;
 <DT><A HREF="org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.html#initReceiveClient()"><B>initReceiveClient()</B></A> - 
 Method in class org.apache.jmeter.protocol.jms.sampler.<A HREF="org/apache/jmeter/protocol/jms/sampler/SubscriberSampler.html" title="class in org.apache.jmeter.protocol.jms.sampler">SubscriberSampler</A>
 <DD>Create the ReceiveSubscriber client for the sampler.
@@ -13964,9 +13953,6 @@
 <DT><A HREF="org/apache/jmeter/visualizers/ViewResultsFullVisualizer.html#REDIRECT_COLOR"><B>REDIRECT_COLOR</B></A> - 
 Static variable in class org.apache.jmeter.visualizers.<A HREF="org/apache/jmeter/visualizers/ViewResultsFullVisualizer.html" title="class in org.apache.jmeter.visualizers">ViewResultsFullVisualizer</A>
 <DD>&nbsp;
-<DT><A HREF="org/apache/jmeter/extractor/XPathExtractor.html#REFNAME"><B>REFNAME</B></A> - 
-Static variable in class org.apache.jmeter.extractor.<A HREF="org/apache/jmeter/extractor/XPathExtractor.html" title="class in org.apache.jmeter.extractor">XPathExtractor</A>
-<DD>&nbsp;
 <DT><A HREF="org/apache/jmeter/protocol/http/proxy/ProxyControl.html#REGEX_MATCH"><B>REGEX_MATCH</B></A> - 
 Static variable in class org.apache.jmeter.protocol.http.proxy.<A HREF="org/apache/jmeter/protocol/http/proxy/ProxyControl.html" title="class in org.apache.jmeter.protocol.http.proxy">ProxyControl</A>
 <DD>&nbsp;
@@ -17414,6 +17400,9 @@
 <DT><A HREF="org/apache/jmeter/visualizers/SplineModel.html#setName(java.lang.String)"><B>setName(String)</B></A> - 
 Method in class org.apache.jmeter.visualizers.<A HREF="org/apache/jmeter/visualizers/SplineModel.html" title="class in org.apache.jmeter.visualizers">SplineModel</A>
 <DD>&nbsp;
+<DT><A HREF="org/apache/jmeter/extractor/XPathExtractor.html#setNameSpace(boolean)"><B>setNameSpace(boolean)</B></A> - 
+Method in class org.apache.jmeter.extractor.<A HREF="org/apache/jmeter/extractor/XPathExtractor.html" title="class in org.apache.jmeter.extractor">XPathExtractor</A>
+<DD>&nbsp;
 <DT><A HREF="org/apache/jmeter/modifiers/UserParameters.html#setNames(java.util.Collection)"><B>setNames(Collection)</B></A> - 
 Method in class org.apache.jmeter.modifiers.<A HREF="org/apache/jmeter/modifiers/UserParameters.html" title="class in org.apache.jmeter.modifiers">UserParameters</A>
 <DD>The list of names of the variables to hold values. 
@@ -19439,9 +19428,6 @@
 <DT><A HREF="org/apache/jmeter/gui/util/ReportMenuFactory.html#TIMERS"><B>TIMERS</B></A> - 
 Static variable in class org.apache.jmeter.gui.util.<A HREF="org/apache/jmeter/gui/util/ReportMenuFactory.html" title="class in org.apache.jmeter.gui.util">ReportMenuFactory</A>
 <DD>&nbsp;
-<DT><A HREF="org/apache/jmeter/extractor/XPathExtractor.html#TOLERANT"><B>TOLERANT</B></A> - 
-Static variable in class org.apache.jmeter.extractor.<A HREF="org/apache/jmeter/extractor/XPathExtractor.html" title="class in org.apache.jmeter.extractor">XPathExtractor</A>
-<DD>&nbsp;
 <DT><A HREF="org/apache/jorphan/gui/layout/VerticalLayout.html#TOP"><B>TOP</B></A> - 
 Static variable in class org.apache.jorphan.gui.layout.<A HREF="org/apache/jorphan/gui/layout/VerticalLayout.html" title="class in org.apache.jorphan.gui.layout">VerticalLayout</A>
 <DD>The anchoring constant that designates anchoring to the top of the
@@ -20658,6 +20644,9 @@
 <DT><A HREF="org/apache/jmeter/extractor/RegexExtractor.html#useHeaders()"><B>useHeaders()</B></A> - 
 Method in class org.apache.jmeter.extractor.<A HREF="org/apache/jmeter/extractor/RegexExtractor.html" title="class in org.apache.jmeter.extractor">RegexExtractor</A>
 <DD>&nbsp;
+<DT><A HREF="org/apache/jmeter/extractor/XPathExtractor.html#useNameSpace()"><B>useNameSpace()</B></A> - 
+Method in class org.apache.jmeter.extractor.<A HREF="org/apache/jmeter/extractor/XPathExtractor.html" title="class in org.apache.jmeter.extractor">XPathExtractor</A>
+<DD>&nbsp;
 <DT><A HREF="org/apache/jmeter/extractor/RegexExtractor.html#useUrl()"><B>useUrl()</B></A> - 
 Method in class org.apache.jmeter.extractor.<A HREF="org/apache/jmeter/extractor/RegexExtractor.html" title="class in org.apache.jmeter.extractor">RegexExtractor</A>
 <DD>&nbsp;
@@ -20984,9 +20973,6 @@
 <DD>&nbsp;
 <DT><A HREF="org/apache/jmeter/protocol/http/sampler/WebServiceSampler.html#XML_PATH_LOC"><B>XML_PATH_LOC</B></A> - 
 Static variable in class org.apache.jmeter.protocol.http.sampler.<A HREF="org/apache/jmeter/protocol/http/sampler/WebServiceSampler.html" title="class in org.apache.jmeter.protocol.http.sampler">WebServiceSampler</A>
-<DD>&nbsp;
-<DT><A HREF="org/apache/jmeter/extractor/XPathExtractor.html#XPATH_QUERY"><B>XPATH_QUERY</B></A> - 
-Static variable in class org.apache.jmeter.extractor.<A HREF="org/apache/jmeter/extractor/XPathExtractor.html" title="class in org.apache.jmeter.extractor">XPathExtractor</A>
 <DD>&nbsp;
 <DT><A HREF="org/apache/jmeter/functions/XPath.html" title="class in org.apache.jmeter.functions"><B>XPath</B></A> - class org.apache.jmeter.functions.<A HREF="org/apache/jmeter/functions/XPath.html" title="class in org.apache.jmeter.functions">XPath</A>.<DD>The function represented by this class allows data to be read from XML files.
  <DT><A HREF="org/apache/jmeter/functions/XPath.html#XPath()"><B>XPath()</B></A> - 

Modified: jakarta/jmeter/branches/rel-2-2/docs/api/org/apache/jmeter/extractor/XPathExtractor.html
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/docs/api/org/apache/jmeter/extractor/XPathExtractor.html?rev=574066&r1=574065&r2=574066&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/docs/api/org/apache/jmeter/extractor/XPathExtractor.html (original)
+++ jakarta/jmeter/branches/rel-2-2/docs/api/org/apache/jmeter/extractor/XPathExtractor.html Sun Sep  9 13:11:30 2007
@@ -128,44 +128,12 @@
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/apache/jmeter/extractor/XPathExtractor.html#DEFAULT">DEFAULT</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>protected static&nbsp;<A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
 <TD><CODE><B><A HREF="../../../../org/apache/jmeter/extractor/XPathExtractor.html#KEY_PREFIX">KEY_PREFIX</A></B></CODE>
 
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
 </TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/apache/jmeter/extractor/XPathExtractor.html#REFNAME">REFNAME</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/apache/jmeter/extractor/XPathExtractor.html#TOLERANT">TOLERANT</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>static&nbsp;<A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../org/apache/jmeter/extractor/XPathExtractor.html#XPATH_QUERY">XPATH_QUERY</A></B></CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
 </TABLE>
 &nbsp;<A NAME="fields_inherited_from_class_org.apache.jmeter.testelement.TestElement"><!-- --></A>
 <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
@@ -261,6 +229,14 @@
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;void</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../org/apache/jmeter/extractor/XPathExtractor.html#setNameSpace(boolean)">setNameSpace</A></B>(boolean&nbsp;val)</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;void</CODE></FONT></TD>
 <TD><CODE><B><A HREF="../../../../org/apache/jmeter/extractor/XPathExtractor.html#setRefName(java.lang.String)">setRefName</A></B>(<A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;refName)</CODE>
 
 <BR>
@@ -282,6 +258,14 @@
 <BR>
 &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
 </TR>
+<TR BGCOLOR="white" CLASS="TableRowColor">
+<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
+<CODE>&nbsp;boolean</CODE></FONT></TD>
+<TD><CODE><B><A HREF="../../../../org/apache/jmeter/extractor/XPathExtractor.html#useNameSpace()">useNameSpace</A></B>()</CODE>
+
+<BR>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+</TR>
 </TABLE>
 &nbsp;<A NAME="methods_inherited_from_class_org.apache.jmeter.testelement.AbstractTestElement"><!-- --></A>
 <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0" SUMMARY="">
@@ -322,46 +306,6 @@
 <DL>
 <DT><B>See Also:</B><DD><A HREF="../../../../constant-values.html#org.apache.jmeter.extractor.XPathExtractor.KEY_PREFIX">Constant Field Values</A></DL>
 </DL>
-<HR>
-
-<A NAME="XPATH_QUERY"><!-- --></A><H3>
-XPATH_QUERY</H3>
-<PRE>
-public static final <A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A> <B>XPATH_QUERY</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../constant-values.html#org.apache.jmeter.extractor.XPathExtractor.XPATH_QUERY">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="REFNAME"><!-- --></A><H3>
-REFNAME</H3>
-<PRE>
-public static final <A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A> <B>REFNAME</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../constant-values.html#org.apache.jmeter.extractor.XPathExtractor.REFNAME">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="DEFAULT"><!-- --></A><H3>
-DEFAULT</H3>
-<PRE>
-public static final <A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A> <B>DEFAULT</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../constant-values.html#org.apache.jmeter.extractor.XPathExtractor.DEFAULT">Constant Field Values</A></DL>
-</DL>
-<HR>
-
-<A NAME="TOLERANT"><!-- --></A><H3>
-TOLERANT</H3>
-<PRE>
-public static final <A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A> <B>TOLERANT</B></PRE>
-<DL>
-<DL>
-<DT><B>See Also:</B><DD><A HREF="../../../../constant-values.html#org.apache.jmeter.extractor.XPathExtractor.TOLERANT">Constant Field Values</A></DL>
-</DL>
 
 <!-- ========= CONSTRUCTOR DETAIL ======== -->
 
@@ -526,6 +470,34 @@
 isTolerant</H3>
 <PRE>
 public boolean <B>isTolerant</B>()</PRE>
+<DL>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="setNameSpace(boolean)"><!-- --></A><H3>
+setNameSpace</H3>
+<PRE>
+public void <B>setNameSpace</B>(boolean&nbsp;val)</PRE>
+<DL>
+<DD><DL>
+</DL>
+</DD>
+<DD><DL>
+</DL>
+</DD>
+</DL>
+<HR>
+
+<A NAME="useNameSpace()"><!-- --></A><H3>
+useNameSpace</H3>
+<PRE>
+public boolean <B>useNameSpace</B>()</PRE>
 <DL>
 <DD><DL>
 </DL>

Modified: jakarta/jmeter/branches/rel-2-2/docs/api/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.html
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/docs/api/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.html?rev=574066&r1=574065&r2=574066&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/docs/api/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.html (original)
+++ jakarta/jmeter/branches/rel-2-2/docs/api/org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.html Sun Sep  9 13:11:30 2007
@@ -96,11 +96,11 @@
                               <IMG SRC="../../../../../../../resources/inherit.gif" ALT="extended by"><B>org.apache.jmeter.protocol.http.proxy.gui.ProxyControlGui</B>
 </PRE>
 <DL>
-<DT><B>All Implemented Interfaces:</B> <DD><A HREF="http://java.sun.com/j2se/1.4.2/docs/api/javax/accessibility/Accessible.html" title="class or interface in javax.accessibility">Accessible</A>, <A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/awt/event/ActionListener.html" title="class or interface in java.awt.event">ActionListener</A>, <A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/util/EventListener.html" title="class or interface in java.util">EventListener</A>, <A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/awt/event/FocusListener.html" title="class or interface in java.awt.event">FocusListener</A>, <A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/awt/image/ImageObserver.html" title="class or interface in java.awt.image">ImageObserver</A>, <A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/awt/event/ItemListener.html" title="class or interface in java.awt.event">ItemListener</A>, <A HREF="../../../../../../../org/apache/jmeter/gui/JMeterGUICom
 ponent.html" title="interface in org.apache.jmeter.gui">JMeterGUIComponent</A>, <A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/awt/event/KeyListener.html" title="class or interface in java.awt.event">KeyListener</A>, <A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/awt/MenuContainer.html" title="class or interface in java.awt">MenuContainer</A>, <A HREF="../../../../../../../org/apache/jmeter/visualizers/Printable.html" title="interface in org.apache.jmeter.visualizers">Printable</A>, <A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/io/Serializable.html" title="class or interface in java.io">Serializable</A>, <A HREF="../../../../../../../org/apache/jmeter/gui/UnsharedComponent.html" title="interface in org.apache.jmeter.gui">UnsharedComponent</A></DD>
+<DT><B>All Implemented Interfaces:</B> <DD><A HREF="http://java.sun.com/j2se/1.4.2/docs/api/javax/accessibility/Accessible.html" title="class or interface in javax.accessibility">Accessible</A>, <A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/awt/event/ActionListener.html" title="class or interface in java.awt.event">ActionListener</A>, <A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/util/EventListener.html" title="class or interface in java.util">EventListener</A>, <A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/awt/image/ImageObserver.html" title="class or interface in java.awt.image">ImageObserver</A>, <A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/awt/event/ItemListener.html" title="class or interface in java.awt.event">ItemListener</A>, <A HREF="../../../../../../../org/apache/jmeter/gui/JMeterGUIComponent.html" title="interface in org.apache.jmeter.gui">JMeterGUIComponent</A>, <A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/awt/event/KeyL
 istener.html" title="class or interface in java.awt.event">KeyListener</A>, <A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/awt/MenuContainer.html" title="class or interface in java.awt">MenuContainer</A>, <A HREF="../../../../../../../org/apache/jmeter/visualizers/Printable.html" title="interface in org.apache.jmeter.visualizers">Printable</A>, <A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/io/Serializable.html" title="class or interface in java.io">Serializable</A>, <A HREF="../../../../../../../org/apache/jmeter/gui/UnsharedComponent.html" title="interface in org.apache.jmeter.gui">UnsharedComponent</A></DD>
 </DL>
 <HR>
 <DL>
-<DT>public class <B>ProxyControlGui</B><DT>extends <A HREF="../../../../../../../org/apache/jmeter/control/gui/LogicControllerGui.html" title="class in org.apache.jmeter.control.gui">LogicControllerGui</A><DT>implements <A HREF="../../../../../../../org/apache/jmeter/gui/JMeterGUIComponent.html" title="interface in org.apache.jmeter.gui">JMeterGUIComponent</A>, <A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/awt/event/ActionListener.html" title="class or interface in java.awt.event">ActionListener</A>, <A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/awt/event/ItemListener.html" title="class or interface in java.awt.event">ItemListener</A>, <A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/awt/event/KeyListener.html" title="class or interface in java.awt.event">KeyListener</A>, <A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/awt/event/FocusListener.html" title="class or interface in java.awt.event">FocusListener</A>, <A HREF="../../../../../../../org/apa
 che/jmeter/gui/UnsharedComponent.html" title="interface in org.apache.jmeter.gui">UnsharedComponent</A></DL>
+<DT>public class <B>ProxyControlGui</B><DT>extends <A HREF="../../../../../../../org/apache/jmeter/control/gui/LogicControllerGui.html" title="class in org.apache.jmeter.control.gui">LogicControllerGui</A><DT>implements <A HREF="../../../../../../../org/apache/jmeter/gui/JMeterGUIComponent.html" title="interface in org.apache.jmeter.gui">JMeterGUIComponent</A>, <A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/awt/event/ActionListener.html" title="class or interface in java.awt.event">ActionListener</A>, <A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/awt/event/ItemListener.html" title="class or interface in java.awt.event">ItemListener</A>, <A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/awt/event/KeyListener.html" title="class or interface in java.awt.event">KeyListener</A>, <A HREF="../../../../../../../org/apache/jmeter/gui/UnsharedComponent.html" title="interface in org.apache.jmeter.gui">UnsharedComponent</A></DL>
 
 <P>
 <DL>
@@ -252,22 +252,6 @@
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.html#focusGained(java.awt.event.FocusEvent)">focusGained</A></B>(<A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/awt/event/FocusEvent.html" title="class or interface in java.awt.event">FocusEvent</A>&nbsp;e)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;void</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../../org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.html#focusLost(java.awt.event.FocusEvent)">focusLost</A></B>(<A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/awt/event/FocusEvent.html" title="class or interface in java.awt.event">FocusEvent</A>&nbsp;e)</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;<A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A></CODE></FONT></TD>
 <TD><CODE><B><A HREF="../../../../../../../org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.html#getLabelResource()">getLabelResource</A></B>()</CODE>
 
@@ -605,34 +589,6 @@
 </DD>
 <DD><DL>
 <DT><B>Parameters:</B><DD><CODE>element</CODE> - the TestElement to configure</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="focusLost(java.awt.event.FocusEvent)"><!-- --></A><H3>
-focusLost</H3>
-<PRE>
-public void <B>focusLost</B>(<A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/awt/event/FocusEvent.html" title="class or interface in java.awt.event">FocusEvent</A>&nbsp;e)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/awt/event/FocusListener.html#focusLost(java.awt.event.FocusEvent)" title="class or interface in java.awt.event">focusLost</A></CODE> in interface <CODE><A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/awt/event/FocusListener.html" title="class or interface in java.awt.event">FocusListener</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="focusGained(java.awt.event.FocusEvent)"><!-- --></A><H3>
-focusGained</H3>
-<PRE>
-public void <B>focusGained</B>(<A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/awt/event/FocusEvent.html" title="class or interface in java.awt.event">FocusEvent</A>&nbsp;e)</PRE>
-<DL>
-<DD><DL>
-<DT><B>Specified by:</B><DD><CODE><A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/awt/event/FocusListener.html#focusGained(java.awt.event.FocusEvent)" title="class or interface in java.awt.event">focusGained</A></CODE> in interface <CODE><A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/awt/event/FocusListener.html" title="class or interface in java.awt.event">FocusListener</A></CODE></DL>
-</DD>
-<DD><DL>
-</DL>
 </DD>
 </DL>
 <HR>

Modified: jakarta/jmeter/branches/rel-2-2/docs/api/org/apache/jmeter/protocol/http/proxy/gui/package-tree.html
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/docs/api/org/apache/jmeter/protocol/http/proxy/gui/package-tree.html?rev=574066&r1=574065&r2=574066&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/docs/api/org/apache/jmeter/protocol/http/proxy/gui/package-tree.html (original)
+++ jakarta/jmeter/branches/rel-2-2/docs/api/org/apache/jmeter/protocol/http/proxy/gui/package-tree.html Sun Sep  9 13:11:30 2007
@@ -95,7 +95,7 @@
 <UL>
 <LI TYPE="circle">class org.apache.jmeter.control.gui.<A HREF="../../../../../../../org/apache/jmeter/control/gui/AbstractControllerGui.html" title="class in org.apache.jmeter.control.gui"><B>AbstractControllerGui</B></A><UL>
 <LI TYPE="circle">class org.apache.jmeter.control.gui.<A HREF="../../../../../../../org/apache/jmeter/control/gui/LogicControllerGui.html" title="class in org.apache.jmeter.control.gui"><B>LogicControllerGui</B></A><UL>
-<LI TYPE="circle">class org.apache.jmeter.protocol.http.proxy.gui.<A HREF="../../../../../../../org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.html" title="class in org.apache.jmeter.protocol.http.proxy.gui"><B>ProxyControlGui</B></A> (implements java.awt.event.<A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/awt/event/ActionListener.html" title="class or interface in java.awt.event">ActionListener</A>, java.awt.event.<A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/awt/event/FocusListener.html" title="class or interface in java.awt.event">FocusListener</A>, java.awt.event.<A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/awt/event/ItemListener.html" title="class or interface in java.awt.event">ItemListener</A>, org.apache.jmeter.gui.<A HREF="../../../../../../../org/apache/jmeter/gui/JMeterGUIComponent.html" title="interface in org.apache.jmeter.gui">JMeterGUIComponent</A>, java.awt.event.<A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/awt/eve
 nt/KeyListener.html" title="class or interface in java.awt.event">KeyListener</A>, org.apache.jmeter.gui.<A HREF="../../../../../../../org/apache/jmeter/gui/UnsharedComponent.html" title="interface in org.apache.jmeter.gui">UnsharedComponent</A>)
+<LI TYPE="circle">class org.apache.jmeter.protocol.http.proxy.gui.<A HREF="../../../../../../../org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.html" title="class in org.apache.jmeter.protocol.http.proxy.gui"><B>ProxyControlGui</B></A> (implements java.awt.event.<A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/awt/event/ActionListener.html" title="class or interface in java.awt.event">ActionListener</A>, java.awt.event.<A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/awt/event/ItemListener.html" title="class or interface in java.awt.event">ItemListener</A>, org.apache.jmeter.gui.<A HREF="../../../../../../../org/apache/jmeter/gui/JMeterGUIComponent.html" title="interface in org.apache.jmeter.gui">JMeterGUIComponent</A>, java.awt.event.<A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/awt/event/KeyListener.html" title="class or interface in java.awt.event">KeyListener</A>, org.apache.jmeter.gui.<A HREF="../../../../../../../org/apache/jmeter/gui/Unshar
 edComponent.html" title="interface in org.apache.jmeter.gui">UnsharedComponent</A>)
 </UL>
 </UL>
 </UL>

Modified: jakarta/jmeter/branches/rel-2-2/docs/api/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/docs/api/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html?rev=574066&r1=574065&r2=574066&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/docs/api/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html (original)
+++ jakarta/jmeter/branches/rel-2-2/docs/api/org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html Sun Sep  9 13:11:30 2007
@@ -259,14 +259,6 @@
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
-<CODE>&nbsp;org.apache.avalon.excalibur.datasource.DataSourceComponent</CODE></FONT></TD>
-<TD><CODE><B><A HREF="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#initPool()">initPool</A></B>()</CODE>
-
-<BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
-</TR>
-<TR BGCOLOR="white" CLASS="TableRowColor">
-<TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
 <CODE>&nbsp;boolean</CODE></FONT></TD>
 <TD><CODE><B><A HREF="../../../../../../org/apache/jmeter/protocol/jdbc/config/DataSourceElement.html#isAutocommit()">isAutocommit</A></B>()</CODE>
 
@@ -576,23 +568,6 @@
 </DD>
 <DD><DL>
 </DL>
-</DD>
-</DL>
-<HR>
-
-<A NAME="initPool()"><!-- --></A><H3>
-initPool</H3>
-<PRE>
-public org.apache.avalon.excalibur.datasource.DataSourceComponent <B>initPool</B>()
-                                                                    throws <A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/lang/Exception.html" title="class or interface in java.lang">Exception</A></PRE>
-<DL>
-<DD><DL>
-</DL>
-</DD>
-<DD><DL>
-
-<DT><B>Throws:</B>
-<DD><CODE><A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/lang/Exception.html" title="class or interface in java.lang">Exception</A></CODE></DL>
 </DD>
 </DL>
 <HR>

Modified: jakarta/jmeter/branches/rel-2-2/docs/api/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.html
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/docs/api/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.html?rev=574066&r1=574065&r2=574066&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/docs/api/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.html (original)
+++ jakarta/jmeter/branches/rel-2-2/docs/api/org/apache/jmeter/protocol/jdbc/sampler/JDBCSampler.html Sun Sep  9 13:11:30 2007
@@ -103,8 +103,6 @@
 
 <P>
 <DL>
-<DT><B>Author:</B></DT>
-  <DD>Original author unknown, <a href="mailto:jeremy_a@bigfoot.com">Jeremy Arnold</a></DD>
 <DT><B>See Also:</B><DD><A HREF="../../../../../../serialized-form.html#org.apache.jmeter.protocol.jdbc.sampler.JDBCSampler">Serialized Form</A></DL>
 <HR>
 

Modified: jakarta/jmeter/branches/rel-2-2/docs/api/org/apache/jmeter/save/converters/ConversionHelp.html
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/docs/api/org/apache/jmeter/save/converters/ConversionHelp.html?rev=574066&r1=574065&r2=574066&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/docs/api/org/apache/jmeter/save/converters/ConversionHelp.html (original)
+++ jakarta/jmeter/branches/rel-2-2/docs/api/org/apache/jmeter/save/converters/ConversionHelp.html Sun Sep  9 13:11:30 2007
@@ -93,10 +93,10 @@
 <DT>public class <B>ConversionHelp</B><DT>extends <A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/lang/Object.html" title="class or interface in java.lang">Object</A></DL>
 
 <P>
-<DL>
-<DT><B>Author:</B></DT>
-  <DD>mstover</DD>
-</DL>
+Utility conversion routines for use with XStream
+<P>
+
+<P>
 <HR>
 
 <P>
@@ -184,7 +184,8 @@
 <TD><CODE><B><A HREF="../../../../../org/apache/jmeter/save/converters/ConversionHelp.html#encode(java.lang.String)">encode</A></B>(<A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;p)</CODE>
 
 <BR>
-&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</TD>
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Encode a string (if necessary) for output to a JTL file.
+ </TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD ALIGN="right" VALIGN="top" WIDTH="1%"><FONT SIZE="-1">
@@ -334,8 +335,13 @@
 <PRE>
 public static <A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A> <B>encode</B>(<A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/lang/String.html" title="class or interface in java.lang">String</A>&nbsp;p)</PRE>
 <DL>
+<DD>Encode a string (if necessary) for output to a JTL file.
+ Strings are only encoded if the output version is 1.0,
+ but nulls are always converted to the empty string.
+<P>
 <DD><DL>
-</DL>
+<DT><B>Parameters:</B><DD><CODE>p</CODE> - string to encode
+<DT><B>Returns:</B><DD>encoded string (will never be null)</DL>
 </DD>
 </DL>
 <HR>

Modified: jakarta/jmeter/branches/rel-2-2/docs/api/org/apache/jmeter/save/converters/package-summary.html
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/docs/api/org/apache/jmeter/save/converters/package-summary.html?rev=574066&r1=574065&r2=574066&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/docs/api/org/apache/jmeter/save/converters/package-summary.html (original)
+++ jakarta/jmeter/branches/rel-2-2/docs/api/org/apache/jmeter/save/converters/package-summary.html Sun Sep  9 13:11:30 2007
@@ -87,7 +87,7 @@
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD WIDTH="15%"><B><A HREF="../../../../../org/apache/jmeter/save/converters/ConversionHelp.html" title="class in org.apache.jmeter.save.converters">ConversionHelp</A></B></TD>
-<TD>&nbsp;</TD>
+<TD>Utility conversion routines for use with XStream</TD>
 </TR>
 <TR BGCOLOR="white" CLASS="TableRowColor">
 <TD WIDTH="15%"><B><A HREF="../../../../../org/apache/jmeter/save/converters/HashTreeConverter.html" title="class in org.apache.jmeter.save.converters">HashTreeConverter</A></B></TD>

Modified: jakarta/jmeter/branches/rel-2-2/docs/api/org/apache/jmeter/util/XPathUtil.html
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/docs/api/org/apache/jmeter/util/XPathUtil.html?rev=574066&r1=574065&r2=574066&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/docs/api/org/apache/jmeter/util/XPathUtil.html (original)
+++ jakarta/jmeter/branches/rel-2-2/docs/api/org/apache/jmeter/util/XPathUtil.html Sun Sep  9 13:11:30 2007
@@ -177,17 +177,15 @@
 public static <A HREF="http://java.sun.com/j2se/1.4.2/docs/api/javax/xml/parsers/DocumentBuilder.html" title="class or interface in javax.xml.parsers">DocumentBuilder</A> <B>makeDocumentBuilder</B>(boolean&nbsp;validate,
                                                   boolean&nbsp;whitespace,
                                                   boolean&nbsp;namespace)
-                                           throws <A HREF="http://java.sun.com/j2se/1.4.2/docs/api/javax/xml/parsers/ParserConfigurationException.html" title="class or interface in javax.xml.parsers">ParserConfigurationException</A>,
-                                                  <A HREF="http://java.sun.com/j2se/1.4.2/docs/api/org/xml/sax/SAXException.html" title="class or interface in org.xml.sax">SAXException</A></PRE>
+                                           throws <A HREF="http://java.sun.com/j2se/1.4.2/docs/api/javax/xml/parsers/ParserConfigurationException.html" title="class or interface in javax.xml.parsers">ParserConfigurationException</A></PRE>
 <DL>
 <DD>Create a DocumentBuilder using the makeDocumentFactory func.
 <P>
 <DD><DL>
-<DT><B>Parameters:</B><DD><CODE>validate</CODE> - <DD><CODE>whitespace</CODE> - <DD><CODE>namespace</CODE> - 
+<DT><B>Parameters:</B><DD><CODE>validate</CODE> - should the parser validate documents?<DD><CODE>whitespace</CODE> - should the parser eliminate whitespace in element content?<DD><CODE>namespace</CODE> - should the parser be namespace aware?
 <DT><B>Returns:</B><DD>document builder
 <DT><B>Throws:</B>
-<DD><CODE><A HREF="http://java.sun.com/j2se/1.4.2/docs/api/javax/xml/parsers/ParserConfigurationException.html" title="class or interface in javax.xml.parsers">ParserConfigurationException</A></CODE>
-<DD><CODE><A HREF="http://java.sun.com/j2se/1.4.2/docs/api/org/xml/sax/SAXException.html" title="class or interface in org.xml.sax">SAXException</A></CODE></DL>
+<DD><CODE><A HREF="http://java.sun.com/j2se/1.4.2/docs/api/javax/xml/parsers/ParserConfigurationException.html" title="class or interface in javax.xml.parsers">ParserConfigurationException</A></CODE></DL>
 </DD>
 </DL>
 <HR>
@@ -207,7 +205,7 @@
 <DD>Utility function to get new Document
 <P>
 <DD><DL>
-<DT><B>Parameters:</B><DD><CODE>stream</CODE> - Document Input stream<DD><CODE>validate</CODE> - Validate Document<DD><CODE>whitespace</CODE> - Element Whitespace<DD><CODE>namespace</CODE> - Is Namespace aware.<DD><CODE>tolerant</CODE> - Is tolerant
+<DT><B>Parameters:</B><DD><CODE>stream</CODE> - Document Input stream<DD><CODE>validate</CODE> - Validate Document<DD><CODE>whitespace</CODE> - Element Whitespace<DD><CODE>namespace</CODE> - Is Namespace aware.<DD><CODE>tolerant</CODE> - Is tolerant - i.e. use the Tidy parser
 <DT><B>Returns:</B><DD>document
 <DT><B>Throws:</B>
 <DD><CODE><A HREF="http://java.sun.com/j2se/1.4.2/docs/api/javax/xml/parsers/ParserConfigurationException.html" title="class or interface in javax.xml.parsers">ParserConfigurationException</A></CODE>

Modified: jakarta/jmeter/branches/rel-2-2/docs/api/overview-tree.html
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/docs/api/overview-tree.html?rev=574066&r1=574065&r2=574066&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/docs/api/overview-tree.html (original)
+++ jakarta/jmeter/branches/rel-2-2/docs/api/overview-tree.html Sun Sep  9 13:11:30 2007
@@ -361,7 +361,7 @@
 <LI TYPE="circle">class org.apache.jmeter.control.gui.<A HREF="org/apache/jmeter/control/gui/ForeachControlPanel.html" title="class in org.apache.jmeter.control.gui"><B>ForeachControlPanel</B></A><LI TYPE="circle">class org.apache.jmeter.control.gui.<A HREF="org/apache/jmeter/control/gui/IfControllerPanel.html" title="class in org.apache.jmeter.control.gui"><B>IfControllerPanel</B></A> (implements java.awt.event.<A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/awt/event/ActionListener.html" title="class or interface in java.awt.event">ActionListener</A>)
 <LI TYPE="circle">class org.apache.jmeter.control.gui.<A HREF="org/apache/jmeter/control/gui/IncludeControllerGui.html" title="class in org.apache.jmeter.control.gui"><B>IncludeControllerGui</B></A><LI TYPE="circle">class org.apache.jmeter.control.gui.<A HREF="org/apache/jmeter/control/gui/InterleaveControlGui.html" title="class in org.apache.jmeter.control.gui"><B>InterleaveControlGui</B></A><LI TYPE="circle">class org.apache.jmeter.control.gui.<A HREF="org/apache/jmeter/control/gui/LogicControllerGui.html" title="class in org.apache.jmeter.control.gui"><B>LogicControllerGui</B></A><UL>
 <LI TYPE="circle">class org.apache.jmeter.protocol.http.control.gui.<A HREF="org/apache/jmeter/protocol/http/control/gui/HttpMirrorControlGui.html" title="class in org.apache.jmeter.protocol.http.control.gui"><B>HttpMirrorControlGui</B></A> (implements java.awt.event.<A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/awt/event/ActionListener.html" title="class or interface in java.awt.event">ActionListener</A>, org.apache.jmeter.gui.<A HREF="org/apache/jmeter/gui/JMeterGUIComponent.html" title="interface in org.apache.jmeter.gui">JMeterGUIComponent</A>, org.apache.jmeter.gui.<A HREF="org/apache/jmeter/gui/UnsharedComponent.html" title="interface in org.apache.jmeter.gui">UnsharedComponent</A>)
-<LI TYPE="circle">class org.apache.jmeter.protocol.http.proxy.gui.<A HREF="org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.html" title="class in org.apache.jmeter.protocol.http.proxy.gui"><B>ProxyControlGui</B></A> (implements java.awt.event.<A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/awt/event/ActionListener.html" title="class or interface in java.awt.event">ActionListener</A>, java.awt.event.<A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/awt/event/FocusListener.html" title="class or interface in java.awt.event">FocusListener</A>, java.awt.event.<A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/awt/event/ItemListener.html" title="class or interface in java.awt.event">ItemListener</A>, org.apache.jmeter.gui.<A HREF="org/apache/jmeter/gui/JMeterGUIComponent.html" title="interface in org.apache.jmeter.gui">JMeterGUIComponent</A>, java.awt.event.<A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/awt/event/KeyListener.html" title="class or inter
 face in java.awt.event">KeyListener</A>, org.apache.jmeter.gui.<A HREF="org/apache/jmeter/gui/UnsharedComponent.html" title="interface in org.apache.jmeter.gui">UnsharedComponent</A>)
+<LI TYPE="circle">class org.apache.jmeter.protocol.http.proxy.gui.<A HREF="org/apache/jmeter/protocol/http/proxy/gui/ProxyControlGui.html" title="class in org.apache.jmeter.protocol.http.proxy.gui"><B>ProxyControlGui</B></A> (implements java.awt.event.<A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/awt/event/ActionListener.html" title="class or interface in java.awt.event">ActionListener</A>, java.awt.event.<A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/awt/event/ItemListener.html" title="class or interface in java.awt.event">ItemListener</A>, org.apache.jmeter.gui.<A HREF="org/apache/jmeter/gui/JMeterGUIComponent.html" title="interface in org.apache.jmeter.gui">JMeterGUIComponent</A>, java.awt.event.<A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/awt/event/KeyListener.html" title="class or interface in java.awt.event">KeyListener</A>, org.apache.jmeter.gui.<A HREF="org/apache/jmeter/gui/UnsharedComponent.html" title="interface in org.apache.jmeter.gui">Un
 sharedComponent</A>)
 <LI TYPE="circle">class org.apache.jmeter.control.gui.<A HREF="org/apache/jmeter/control/gui/RandomOrderControllerGui.html" title="class in org.apache.jmeter.control.gui"><B>RandomOrderControllerGui</B></A><LI TYPE="circle">class org.apache.jmeter.protocol.http.control.gui.<A HREF="org/apache/jmeter/protocol/http/control/gui/RecordController.html" title="class in org.apache.jmeter.protocol.http.control.gui"><B>RecordController</B></A></UL>
 <LI TYPE="circle">class org.apache.jmeter.control.gui.<A HREF="org/apache/jmeter/control/gui/LoopControlPanel.html" title="class in org.apache.jmeter.control.gui"><B>LoopControlPanel</B></A> (implements java.awt.event.<A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/awt/event/ActionListener.html" title="class or interface in java.awt.event">ActionListener</A>)
 <LI TYPE="circle">class org.apache.jmeter.control.gui.<A HREF="org/apache/jmeter/control/gui/ModuleControllerGui.html" title="class in org.apache.jmeter.control.gui"><B>ModuleControllerGui</B></A><LI TYPE="circle">class org.apache.jmeter.control.gui.<A HREF="org/apache/jmeter/control/gui/OnceOnlyControllerGui.html" title="class in org.apache.jmeter.control.gui"><B>OnceOnlyControllerGui</B></A><LI TYPE="circle">class org.apache.jmeter.control.gui.<A HREF="org/apache/jmeter/control/gui/RandomControlGui.html" title="class in org.apache.jmeter.control.gui"><B>RandomControlGui</B></A><LI TYPE="circle">class org.apache.jmeter.control.gui.<A HREF="org/apache/jmeter/control/gui/RunTimeGui.html" title="class in org.apache.jmeter.control.gui"><B>RunTimeGui</B></A> (implements java.awt.event.<A HREF="http://java.sun.com/j2se/1.4.2/docs/api/java/awt/event/ActionListener.html" title="class or interface in java.awt.event">ActionListener</A>)

Modified: jakarta/jmeter/branches/rel-2-2/docs/api/serialized-form.html
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/docs/api/serialized-form.html?rev=574066&r1=574065&r2=574066&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/docs/api/serialized-form.html (original)
+++ jakarta/jmeter/branches/rel-2-2/docs/api/serialized-form.html Sun Sep  9 13:11:30 2007
@@ -11409,6 +11409,16 @@
 <DL>
 </DL>
 </DL>
+<HR>
+
+<H3>
+nameSpace</H3>
+<PRE>
+<A HREF="http://java.sun.com/j2se/1.4.2/docs/api/javax/swing/JCheckBox.html" title="class or interface in javax.swing">JCheckBox</A> <B>nameSpace</B></PRE>
+<DL>
+<DL>
+</DL>
+</DL>
 
 <P>
 <HR SIZE="4" NOSHADE>

Modified: jakarta/jmeter/branches/rel-2-2/docs/changes.html
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/docs/changes.html?rev=574066&r1=574065&r2=574066&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/docs/changes.html (original)
+++ jakarta/jmeter/branches/rel-2-2/docs/changes.html Sun Sep  9 13:11:30 2007
@@ -152,6 +152,16 @@
 						</li>
 									
 
+												<li	>
+								Bug 43332 - 2.3RC4 does not clear Guis based on TestBean
+						</li>
+									
+
+												<li	>
+								Bug 42948 - Problems with Proxy gui table fields in Java 1.6
+						</li>
+									
+
 						</ul>
 							  									 				<h4	>
 								Improvements

Modified: jakarta/jmeter/branches/rel-2-2/docs/usermanual/component_reference.html
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/docs/usermanual/component_reference.html?rev=574066&r1=574065&r2=574066&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/docs/usermanual/component_reference.html (original)
+++ jakarta/jmeter/branches/rel-2-2/docs/usermanual/component_reference.html Sun Sep  9 13:11:30 2007
@@ -728,7 +728,7 @@
         
 												<b	>
 								In versions of JMeter after 2.2: if both the 'name' atribute and MIME type (below) are omitted, then the file is sent as the body
-        of the POST request. This allows arbitraty POST bodies to be sent.
+        of the POST request. This allows arbitrary POST bodies to be sent.
 						</b>
 									
         
@@ -942,6 +942,26 @@
 									
 		    
 												<li	>
+								Commit
+						</li>
+									
+		    
+												<li	>
+								Rollback
+						</li>
+									
+		    
+												<li	>
+								Autocommit(false)
+						</li>
+									
+		    
+												<li	>
+								Autocommit(true)
+						</li>
+									
+		    
+												<li	>
 								Edit - this should be a variable reference that evaluates to one of the above
 						</li>
 									
@@ -956,7 +976,46 @@
 		</tr>
 			<tr>
 			<td>SQL Query</td>
-			<td>						SQL query (for example, "select * from t_customers").
+			<td>						
+        SQL query.
+        Do not enter a trailing semi-colon.
+        There is no need to use { and } to enclose Callable statements.
+        For example:
+        
+												<ul	>
+								
+        
+												<li	>
+								select * from t_customers where id=23
+						</li>
+									
+        
+												<li	>
+								CALL SYSCS_UTIL.SYSCS_EXPORT_TABLE (null,?, ?, null, null, null)
+        
+												<ul	>
+								
+        
+												<li	>
+								Parameter values: tablename,filename
+						</li>
+									
+        
+												<li	>
+								Parameter types:  VARCHAR,VARCHAR
+						</li>
+									
+        
+						</ul>
+									
+        
+						</li>
+									
+        The second example assumes you are using Apache Derby.
+        
+						</ul>
+									
+        
 			</td>
 			<td>
 											Yes
@@ -975,7 +1034,7 @@
         
 			</td>
 			<td>
-											Yes, if a prepared statement has parameters
+											Yes, if a prepared or callable statement has parameters
 								</td>
 		</tr>
 			<tr>
@@ -990,15 +1049,14 @@
         
 			</td>
 			<td>
-											Yes, if a prepared statement has parameters
+											Yes, if a prepared or callable statement has parameters
 								</td>
 		</tr>
 		</table>
 	</p>
 							  									 			 	<p><b>See Also:</b>
 	<ul>
-						<li><a href="test_plan.html#assertions">Assertion</a></li>
-								<li><a href="build-db-test-plan.html">Building a Database Test Plan</a></li>
+						<li><a href="build-db-test-plan.html">Building a Database Test Plan</a></li>
 								<li>	<a href="../usermanual/component_reference.html#JDBC_Connection_Configuration">JDBC Connection Configuration</a>
 </li>
 				</ul>
@@ -6250,11 +6308,14 @@
 	
 												<p><table border="1" bgcolor="#bbbb00" width="50%" cellspacing="0" cellpadding="2">
 		<tr><td>						CSV Dataset variables are defined after configuration processing is completed,
-	so they cannot be used for other configuration items such as JDBC Config (see 
+	so they cannot be used for some configuration items - such as JDBC Config - 
+	that process their contents at configuration time (see 
 												<a	 href="http://issues.apache.org/bugzilla/show_bug.cgi?id=40934">
 								Bug 40394 
 						</a>
-									)
+									)
+	However the variables do work in the HTTP Auth Manager, as the username etc are processed at run-time.
+	
 			</td></tr>
 	</table></p>
 									
@@ -6391,7 +6452,7 @@
 
 												<p	>
 								The Authorization Manager lets you specify one or more user logins for web pages that are
-restricted using Basic HTTP Authentication.  You see this type of authentication when you use
+restricted using server authentication.  You see this type of authentication when you use
 your browser to access a restricted page, and your browser displays a login dialog box.  JMeter
 transmits the login information when it encounters this type of page.
 						</p>
@@ -6419,10 +6480,14 @@
 									
 
 												<p><table border="1" bgcolor="#bbbb00" width="50%" cellspacing="0" cellpadding="2">
-		<tr><td>						In the current release, all JMeter threads in a Thread Group use the same username/password
-for a given Base URL even if you create multiple users with the same Base URL in the authorization table.
-We plan to correct this in a future release.  As a workwaround, you can create multiple Thread Groups for your
-Test Plan, with each Thread Group having its own Authorization Manager.
+		<tr><td>						
+When looking for a match against a URL, JMeter checks each entry in turn, and stops when it finds the first match.
+Thus the most specific URLs should appear first in the list, followed by less specific ones.
+Duplicate URLs will be ignored.
+If you want to use different usernames/passwords for different threads, you can use variables.
+These can be set up using a 
+												<a href="../usermanual/component_reference.html#CSV_Data_Set_Config">CSV Data Set Config</a>
+									 Element (for example).
 
 			</td></tr>
 	</table></p>
@@ -6527,7 +6592,7 @@
 						</ul>
 							  									 				<p><table border="1" bgcolor="#bbbb00" width="50%" cellspacing="0" cellpadding="2">
 		<tr><td>						When you save the Test Plan, JMeter automatically saves all of the authorization
-table entries.
+table entries - including any passwords, which are not encrypted.
 			</td></tr>
 	</table></p>
 							  									 				<a name="authorization_example"/>
@@ -6621,6 +6686,16 @@
 						</p>
 									
 
+												<p	>
+								
+Since version 2.0.3, cookies with null values are ignored by default.
+This can be changed by setting the JMeter property: CookieManager.delete_null_cookies=false.
+Note that this also applies to manually defined cookies - any such cookies will be removed from the display when it is updated.
+Note also that the cookie name must be unique - if a second cookie is defined with the same name, it will replace the first.
+
+						</p>
+									
+
 														<p><b>Control Panel</b></p>
 						<div align="center"><img width='548' height='319' src="../images/screenshots/http-config/http-cookie-manager.png"></div>
 											  									 			 <p>
@@ -6648,8 +6723,8 @@
 			<td>Cookie Policy</td>
 			<td>						The cookie policy that will be used to manage the cookies. 
   "compatibility" is the default, and should work in most cases.
-  See http://jakarta.apache.org/commons/httpclient/cookies.html and 
-  http://jakarta.apache.org/commons/httpclient/apidocs/org/apache/commons/httpclient/cookie/CookiePolicy.html
+  See http://jakarta.apache.org/httpcomponents/httpclient-3.x/cookies.html and 
+  http://jakarta.apache.org/httpcomponents/httpclient-3.x/apidocs/org/apache/commons/httpclient/cookie/CookiePolicy.html
   [Note: "ignoreCookies" is equivalent to omitting the CookieManager.]
     
 			</td>
@@ -6660,7 +6735,13 @@
 			<tr>
 			<td>Cookies Stored in the Cookie Manager</td>
 			<td>						This
-  gives you the opportunity to use hardcoded cookies that will be used by all threads during the test execution.
+  gives you the opportunity to use hardcoded cookies that will be used by all threads during the test execution.
+  
+												<br	>
+						</br>
+									
+  The "domain" is the hostname of the server (without http://); the port is currently ignored.
+  
 			</td>
 			<td>
 											No (discouraged, unless you know what you're doing)
@@ -9154,6 +9235,7 @@
 								log - (Logger) - can be used to write to the log file
 						</li>
 									
+
 
 												<li	>
 								ctx - (JMeterContext) - gives access to the context

Modified: jakarta/jmeter/branches/rel-2-2/docs/usermanual/get-started.html
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/docs/usermanual/get-started.html?rev=574066&r1=574065&r2=574066&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/docs/usermanual/get-started.html (original)
+++ jakarta/jmeter/branches/rel-2-2/docs/usermanual/get-started.html Sun Sep  9 13:11:30 2007
@@ -1138,9 +1138,9 @@
                 Define loglevel: [category=]level 
                 e.g. jorphan=INFO or jmeter.util=DEBUG
         -r, --runremote
-                Start remote servers
+                Start remote servers (as defined by the jmeter property remote_hosts)
         -R, --remotestart  server1,...
-                Start these remote servers
+                Start these remote servers (overrides remote_hosts)
         -d, --homedir {argument}
                 the jmeter home directory to use
 

Modified: jakarta/jmeter/branches/rel-2-2/docs/usermanual/test_plan.html
URL: http://svn.apache.org/viewvc/jakarta/jmeter/branches/rel-2-2/docs/usermanual/test_plan.html?rev=574066&r1=574065&r2=574066&view=diff
==============================================================================
--- jakarta/jmeter/branches/rel-2-2/docs/usermanual/test_plan.html (original)
+++ jakarta/jmeter/branches/rel-2-2/docs/usermanual/test_plan.html Sun Sep  9 13:11:30 2007
@@ -845,6 +845,68 @@
 		</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="properties"><strong>4.10 Properties and Variables</strong></a>
+		  </font>
+		</td></tr>
+		<tr><td>
+		  <blockquote>
+		  									 				<p	>
+								
+JMeter 
+												<b	>
+								properties
+						</b>
+									 are defined in jmeter.properties (see 
+												<a	 href="get-started.html#configuring_jmeter">
+								Gettting Started - Configuring JMeter
+						</a>
+									 for more details).
+
+												<br	>
+						</br>
+									
+Properties are global to jmeter, and are used to define some of the defaults JMeter uses.
+For example the property remote_hosts defines the servers that JMeter will try to run remotely.
+Properties can be referenced in test plans 
+- see 
+												<a	 href="functions.html#__property">
+								Functions - read a property
+						</a>
+									 -
+but cannot be used for thread-specific values.
+
+						</p>
+							  									 				<p	>
+								
+JMeter 
+												<b	>
+								variables
+						</b>
+									 are local to each thread. The values may be the same for each thread, or they may be different.
+
+												<br	>
+						</br>
+									
+If a variable is updated by a thread, only the thread copy of the variable is changed.
+For example the 
+												<a href="../usermanual/component_reference.html#Regular_Expression_Extractor">Regular Expression Extractor</a>
+									 Post-Processor 
+will set its variables according to the sample that its thread has read, and these can be used later
+by the same thread.
+For details of how to reference variables and functions, see 
+												<a	 href="functions.html">
+								Functions and Variables
+						</a>
+									
+
+						</p>
+							  		  </blockquote>
+		</td></tr>
+		<tr><td><br></td></tr>
+	 </table>
 							  		  </blockquote>
 		  </p>
 		</td></tr>



---------------------------------------------------------------------
To unsubscribe, e-mail: jmeter-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: jmeter-dev-help@jakarta.apache.org