mstover1 2003/06/18 14:53:22
Modified: . build.xml
bin .cvsignore jmeter.properties
docs/usermanual component_reference.html
src/core/org/apache/jmeter/engine StandardJMeterEngine.java
src/core/org/apache/jmeter/testelement
AbstractTestElement.java
src/core/org/apache/jmeter/util JMeterUtils.java
xdocs/usermanual component_reference.xml
Added: lib ant-1.5.3-optional.jar ant-1.5.3.jar
jakarta-oro-2.0.7.jar xercesImpl.jar
Removed: lib ant-1.5-optional.jar ant-1.5.jar
jakarta-oro-2.0.1.jar
Log:
Updating third-party jars
Doc updates
Fixing bug with functions in ThreadGroup
Revision Changes Path
1.105 +2 -2 jakarta-jmeter/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-jmeter/build.xml,v
retrieving revision 1.104
retrieving revision 1.105
diff -u -r1.104 -r1.105
--- build.xml 15 Jun 2003 15:56:55 -0000 1.104
+++ build.xml 18 Jun 2003 21:53:19 -0000 1.105
@@ -87,12 +87,12 @@
<!-- 3rd party libraries to be included in the binary distribution -->
<property name="avalon-excalibur.jar" value="lib/avalon-excalibur-4.1.jar"/>
<property name="avalon-framework.jar" value="lib/avalon-framework.jar"/>
- <property name="jakarta-oro.jar" value="lib/jakarta-oro-2.0.1.jar"/>
+ <property name="jakarta-oro.jar" value="lib/jakarta-oro-2.0.7.jar"/>
<property name="commons-collections.jar" value="lib/commons-collections.jar"/>
<property name="junit.jar" value="lib/junit.jar"/>
<property name="logkit.jar" value="lib/logkit-1.0.1.jar"/>
<property name="xalan.jar" value="lib/xalan.jar"/>
- <property name="xerces.jar" value="lib/xerces.jar"/>
+ <property name="xerces.jar" value="lib/xercesImpl.jar"/>
<property name="xml-apis.jar" value="lib/xml-apis.jar"/>
<property name="jdom.jar" value="lib/jdom-b8.jar"/>
<property name="js.jar" value="lib/js.jar"/>
1.2 +1 -0 jakarta-jmeter/bin/.cvsignore
Index: .cvsignore
===================================================================
RCS file: /home/cvs/jakarta-jmeter/bin/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 31 Dec 2002 18:05:53 -0000 1.1
+++ .cvsignore 18 Jun 2003 21:53:19 -0000 1.2
@@ -2,3 +2,4 @@
HTTPSamplerFullTestFile.txt
jmeter.log
testresults.txt
+*.bak
1.81 +2 -0 jakarta-jmeter/bin/jmeter.properties
Index: jmeter.properties
===================================================================
RCS file: /home/cvs/jakarta-jmeter/bin/jmeter.properties,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -r1.80 -r1.81
--- jmeter.properties 15 Jun 2003 15:29:54 -0000 1.80
+++ jmeter.properties 18 Jun 2003 21:53:19 -0000 1.81
@@ -76,6 +76,8 @@
log_level.jmeter=INFO
log_level.jmeter.junit=DEBUG
+log_level.jmeter.threads=DEBUG
+log_level.jmeter.engine=DEBUG
#log_level.jmeter.engine=WARN
#log_level.jmeter.gui=WARN
#log_level.jmeter.testelement=WARN
1.52 +4 -4 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.51
retrieving revision 1.52
diff -u -r1.51 -r1.52
--- component_reference.html 15 Jun 2003 16:09:23 -0000 1.51
+++ component_reference.html 18 Jun 2003 21:53:19 -0000 1.52
@@ -174,12 +174,12 @@
<li><a
href="#__regexFunction">__regexFunction</a></li>
<li><a href="#__counter">__counter</a></li>
<li><a href="#__threadNum">__threadNum</a></li>
- <li><a href="#__intsum">__intsum</a></li>
+ <li><a href="#__intSum">__intSum</a></li>
<li><a
href="#_StringFromFile">_StringFromFile</a></li>
<li><a
href="#__machineName">__machineName</a></li>
<li><a
href="#__javaScript">__javaScript</a></li>
<li><a href="#__Random">__Random</a></li>
- <li><a href="#__CSVFile">__CSVFile</a></li>
+ <li><a href="#__CSVRead">__CSVRead</a></li>
</ul>
</ul>
<table border="0" cellspacing="0" cellpadding="2" width="100%">
@@ -4462,7 +4462,7 @@
<table
border="0" cellspacing="0" cellpadding="2">
<tr><td>
<font face="arial,helvetica,sanserif">
- <a name="__intsum"><h3>13.10.4 __intsum</h3></a>
+ <a name="__intSum"><h3>13.10.4 __intSum</h3></a>
</font>
</td></tr>
<tr><td>
@@ -4699,7 +4699,7 @@
<table
border="0" cellspacing="0" cellpadding="2">
<tr><td>
<font face="arial,helvetica,sanserif">
- <a name="__CSVFile"><h3>13.10.8 __CSVFile</h3></a>
+ <a name="__CSVRead"><h3>13.10.8 __CSVRead</h3></a>
</font>
</td></tr>
<tr><td>
1.1 jakarta-jmeter/lib/ant-1.5.3-optional.jar
<<Binary file>>
1.1 jakarta-jmeter/lib/ant-1.5.3.jar
<<Binary file>>
1.1 jakarta-jmeter/lib/jakarta-oro-2.0.7.jar
<<Binary file>>
1.1 jakarta-jmeter/lib/xercesImpl.jar
<<Binary file>>
1.25 +3 -3
jakarta-jmeter/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java
Index: StandardJMeterEngine.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/engine/StandardJMeterEngine.java,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- StandardJMeterEngine.java 6 Jun 2003 14:44:01 -0000 1.24
+++ StandardJMeterEngine.java 18 Jun 2003 21:53:21 -0000 1.25
@@ -299,7 +299,7 @@
}
notifier = new ListenerNotifier();
schcdule_run = true;
-
+ JMeterContextService.getContext().setSamplingStarted(true);
while (iter.hasNext())
{
ThreadGroup group = (ThreadGroup) iter.next();
1.20 +2 -1
jakarta-jmeter/src/core/org/apache/jmeter/testelement/AbstractTestElement.java
Index: AbstractTestElement.java
===================================================================
RCS file:
/home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/testelement/AbstractTestElement.java,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- AbstractTestElement.java 6 Jun 2003 14:02:08 -0000 1.19
+++ AbstractTestElement.java 18 Jun 2003 21:53:22 -0000 1.20
@@ -297,6 +297,7 @@
*/
public void setRunningVersion(boolean runningVersion)
{
+ log.debug("Setting " + this.getClass() + " to running version: " +
runningVersion);
this.runningVersion = runningVersion;
PropertyIterator iter = propertyIterator();
while (iter.hasNext())
1.36 +3 -1 jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterUtils.java
Index: JMeterUtils.java
===================================================================
RCS file: /home/cvs/jakarta-jmeter/src/core/org/apache/jmeter/util/JMeterUtils.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- JMeterUtils.java 15 Jun 2003 16:08:02 -0000 1.35
+++ JMeterUtils.java 18 Jun 2003 21:53:22 -0000 1.36
@@ -995,3 +995,5 @@
+
+
1.48 +3 -3 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.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- component_reference.xml 15 Jun 2003 15:28:39 -0000 1.47
+++ component_reference.xml 18 Jun 2003 21:53:22 -0000 1.48
@@ -1431,7 +1431,7 @@
</description>
</component>
-<component index="13.10.4" name="__intsum">
+<component index="13.10.4" name="__intSum">
<description><p>The intsum function can be used to compute the sum of two or more
integer values.
</p></description>
@@ -1504,7 +1504,7 @@
</properties>
</component>
-<component index="13.10.8" name="__CSVFile">
+<component index="13.10.8" name="__CSVRead">
<description><p>The CSVFile function returns a string from a CSV file (c.f. <a
href="#_StringFromFile">StringFromFile</a>)</p>
<p>NOTE: A single instance of the file is opened and used for all
threads.</p></description>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
