sebb        2005/01/09 10:14:46

  Modified:    xdocs    Tag: rel-2_0 changes.xml
               src/core/org/apache/jmeter/resources Tag: rel-2_0
                        messages.properties
               xdocs/usermanual Tag: rel-2_0 functions.xml
  Added:       src/functions/org/apache/jmeter/functions Tag: rel-2_0
                        XPathFileContainer.java XPath.java
                        XPathWrapper.java
  Log:
  XPath function added
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.15.2.12 +2 -2      jakarta-jmeter/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/xdocs/changes.xml,v
  retrieving revision 1.15.2.11
  retrieving revision 1.15.2.12
  diff -u -r1.15.2.11 -r1.15.2.12
  --- changes.xml       8 Jan 2005 15:25:24 -0000       1.15.2.11
  +++ changes.xml       9 Jan 2005 18:14:46 -0000       1.15.2.12
  @@ -30,7 +30,7 @@
   <h4>New functionality:</h4>
   <ul>
   <li>Better checking of parameter count in JavaScript function</li>
  -<li>XPath Assertion</li>
  +<li>XPath Assertion and XPath Function</li>
   </ul>
   <h4>Bug fixes:</h4>
   <ul>
  
  
  
  No                   revision
  No                   revision
  1.1.2.1   +226 -0    
jakarta-jmeter/src/functions/org/apache/jmeter/functions/Attic/XPathFileContainer.java
  
  
  
  
  1.1.2.1   +163 -0    
jakarta-jmeter/src/functions/org/apache/jmeter/functions/Attic/XPath.java
  
  
  
  
  1.1.2.1   +247 -0    
jakarta-jmeter/src/functions/org/apache/jmeter/functions/Attic/XPathWrapper.java
  
  
  
  
  No                   revision
  No                   revision
  1.106.2.14 +2 -0      
jakarta-jmeter/src/core/org/apache/jmeter/resources/messages.properties
  
  Index: messages.properties
  ===================================================================
  RCS file: 
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/resources/messages.properties,v
  retrieving revision 1.106.2.13
  retrieving revision 1.106.2.14
  diff -u -r1.106.2.13 -r1.106.2.14
  --- messages.properties       8 Jan 2005 02:28:29 -0000       1.106.2.13
  +++ messages.properties       9 Jan 2005 18:14:46 -0000       1.106.2.14
  @@ -538,4 +538,6 @@
   xpath_assertion_failed=Invalid XPath Expression
   xpath_assertion_button=Validate
   xpath_assertion_negate=True if nothing matches
  +xpath_file_file_name=XML file to get valued from 
  +xpath_expression=XPath expression to match against
   you_must_enter_a_valid_number=You must enter a valid number
  
  
  
  No                   revision
  No                   revision
  1.14.2.13 +23 -0     jakarta-jmeter/xdocs/usermanual/functions.xml
  
  Index: functions.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-jmeter/xdocs/usermanual/functions.xml,v
  retrieving revision 1.14.2.12
  retrieving revision 1.14.2.13
  diff -u -r1.14.2.12 -r1.14.2.13
  --- functions.xml     12 Oct 2004 16:52:55 -0000      1.14.2.12
  +++ functions.xml     9 Jan 2005 18:14:46 -0000       1.14.2.13
  @@ -50,6 +50,7 @@
           <li><a href="#__logn">log - log a message</a></li>
           <li><a href="#__BeanShell">BeanShell - run BeanShell</a></li>
           <li><a href="#__split">split - Split a string into variables</a></li>
  +        <li><a href="#__XPath">XPath - XPath use an xpath expression</a></li>
   </ul>
   
   <subsection name="16.1 What can functions do" anchor="what_can_do">
  @@ -520,7 +521,29 @@
           
   </properties>
   </component>
  +<component index="16.5.15" name="__XPath">
  +<description>
  +     <p>
  +     The XPath function reads an XML file and matches the XPath, each
  +     of the node match's are iterated through similar to the CVSReader.
  +     </p>
  +     <p/>
  +     Example:
  +     <code>
  +     <br/>
  +             
  +     <br/>
  +     ${__XPath(/path/to/build.xml, //target/@name)}
  +     <br/>
  +     This will match all targets in build.xml and return the name variable
  +     </code>
  +</description>
   
  +<properties>
  +        <property name="XML file to parse" required="Yes"> a XML file to 
parse</property>
  +        <property name="XPath" required="Yes"> a XPath expression to match 
nodes in the XML file</property>        
  +</properties>
  +</component>
   </subsection>
   
   </section>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to