[prev in list] [next in list] [prev in thread] [next in thread]
List: jmeter-dev
Subject: svn commit: r1064920 - in /jakarta/jmeter/trunk: bin/testfiles/
From: sebb () apache ! org
Date: 2011-01-28 22:55:47
Message-ID: 20110128225547.4CADF2388A2C () eris ! apache ! org
[Download RAW message or body]
Author: sebb
Date: Fri Jan 28 22:55:46 2011
New Revision: 1064920
URL: http://svn.apache.org/viewvc?rev=1064920&view=rev
Log:
Bug 50675 - CVS Data Set Config incompatible with Remote Start
Fixed RMI startup to provide location of JMX file relative to user.dir.
Modified:
jakarta/jmeter/trunk/bin/testfiles/BatchTestLocal.csv
jakarta/jmeter/trunk/bin/testfiles/BatchTestLocal.jmx
jakarta/jmeter/trunk/bin/testfiles/BatchTestLocal.xml
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngine.java
jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java
jakarta/jmeter/trunk/xdocs/changes.xml
Modified: jakarta/jmeter/trunk/bin/testfiles/BatchTestLocal.csv
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/bin/testfiles/BatchTestLocal.csv?rev=1064920&r1=1064919&r2=1064920&view=diff
==============================================================================
--- jakarta/jmeter/trunk/bin/testfiles/BatchTestLocal.csv (original)
+++ jakarta/jmeter/trunk/bin/testfiles/BatchTestLocal.csv Fri Jan 28 22:55:46 2011
@@ -1,4 +1,5 @@
label,responseCode,responseMessage,threadName,dataType,success,failureMessage,bytes,grpThreads,allThreads,URL,Filename,SampleCount,ErrorCount
+Setup 1,200,OK,Setup Thread Group 1-1,,true,,0,1,1,null,,1,0
Java 1 C1=1,200,OK,Thread Group 1-1,text,true,,10,1,1,null,,1,0
Java 1 C1=1,200,OK,Thread Group 1-1,text,true,,10,1,1,null,,1,0
Java 1 C1=1,200,OK,Thread Group 1-1,text,true,,10,1,1,null,,1,0
@@ -105,7 +106,7 @@ Java If once 1,,,Thread Group 1-2,,false
Java If once 2,200,OK,Thread Group 1-2,,true,,0,1,1,null,,1,0
Java If all 1,,,Thread Group 1-2,,false,,0,1,1,null,,1,1
Java OK,200,OK,Thread Group 1-2,,true,,0,1,1,null,,1,0
-"HTTP ""Request,",200,OK,Thread Group \
2-1,text,true,,98994,1,1,file:testfiles/BatchTestLocal.jmx,,1,0 +"HTTP \
""Request,",200,OK,Thread Group \
2-1,text,true,,122764,1,1,file:testfiles/BatchTestLocal.jmx,,1,0 1 1,200,OK,Thread \
Group 2-1,,true,,0,1,1,null,,1,0 2 2,200,OK,Thread Group 2-1,,true,,0,1,1,null,,1,0
3 3,200,OK,Thread Group 2-1,,true,,0,1,1,null,,1,0
@@ -121,3 +122,8 @@ TG2 = 3,200,OK,Thread Group 4-1,,true,,0
TG1 = 3,200,OK,Thread Group 4-1,,true,,0,1,1,null,,1,0
TG Loop =3,200,OK,Thread Group 4-1,,true,,0,1,1,null,,1,0
TG2 = 3,200,OK,Thread Group 4-1,,true,,0,1,1,null,,1,0
+CSV_VAR=2,200,OK,CSV Test 6-1,,true,,0,1,1,null,,1,0
+CSV_VAR=3,200,OK,CSV Test 6-1,,true,,0,1,1,null,,1,0
+CSV_VAR=1,200,OK,CSV Test 6-1,,true,,0,1,1,null,,1,0
+CSV_VAR=2,200,OK,CSV Test 6-1,,true,,0,1,1,null,,1,0
+Post 3,200,OK,Post Thread Group 1-1,,true,,0,1,1,null,,1,0
Modified: jakarta/jmeter/trunk/bin/testfiles/BatchTestLocal.jmx
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/bin/testfiles/BatchTestLocal.jmx?rev=1064920&r1=1064919&r2=1064920&view=diff
==============================================================================
--- jakarta/jmeter/trunk/bin/testfiles/BatchTestLocal.jmx (original)
+++ jakarta/jmeter/trunk/bin/testfiles/BatchTestLocal.jmx Fri Jan 28 22:55:46 2011
@@ -759,12 +759,14 @@ This is to ensure the test output is pre
<stringProp name="ThreadGroup.delay"></stringProp>
</ThreadGroup>
<hashTree>
- <HTTPSampler guiclass="HttpTestSampleGui" testclass="HTTPSampler" \
testname="HTTP "Request," enabled="true"> + <HTTPSamplerProxy \
guiclass="HttpTestSampleGui" testclass="HTTPSamplerProxy" testname="HTTP \
"Request," enabled="true"> <elementProp name="HTTPsampler.Arguments" \
elementType="Arguments" guiclass="HTTPArgumentsPanel" testclass="Arguments" \
testname="User Defined Variables" enabled="true"> <collectionProp \
name="Arguments.arguments"/> </elementProp>
<stringProp name="HTTPSampler.domain"></stringProp>
<stringProp name="HTTPSampler.port"></stringProp>
+ <stringProp name="HTTPSampler.connect_timeout"></stringProp>
+ <stringProp name="HTTPSampler.response_timeout"></stringProp>
<stringProp name="HTTPSampler.protocol">file</stringProp>
<stringProp name="HTTPSampler.contentEncoding"></stringProp>
<stringProp \
name="HTTPSampler.path">testfiles/BatchTestLocal.jmx</stringProp> @@ -773,14 +775,12 \
@@ This is to ensure the test output is pre <boolProp \
name="HTTPSampler.auto_redirects">true</boolProp> <boolProp \
name="HTTPSampler.use_keepalive">true</boolProp> <boolProp \
name="HTTPSampler.DO_MULTIPART_POST">false</boolProp>
- <stringProp name="HTTPSampler.FILE_NAME"></stringProp>
- <stringProp name="HTTPSampler.FILE_FIELD"></stringProp>
- <stringProp name="HTTPSampler.mimetype"></stringProp>
+ <stringProp name="HTTPSampler.implementation">Java</stringProp>
<boolProp name="HTTPSampler.monitor">false</boolProp>
<stringProp name="HTTPSampler.embedded_url_re"></stringProp>
<stringProp name="TestPlan.comments">N.B. The file that is loaded must \
have a fixed size, so HTML won't do as it will be different on Unix and Windows. \
We use this file, which has eol=LF - but of course any changes need to be reflected \
in the expected test data.</stringProp>
- </HTTPSampler>
+ </HTTPSamplerProxy>
<hashTree/>
<ResultCollector guiclass="ViewResultsFullVisualizer" \
testclass="ResultCollector" testname="View Results Tree" enabled="true"> <boolProp \
name="ResultCollector.error_logging">false</boolProp> @@ -1114,7 +1114,7 @@ We use \
this file, which has eol=LF - but <stringProp name="2388619">NAME</stringProp>
</collectionProp>
<collectionProp name="UserParameters.thread_values">
- <collectionProp name="81040869">
+ <collectionProp name="-1314400416">
<stringProp name="81040838">USER1</stringProp>
</collectionProp>
</collectionProp>
@@ -1673,6 +1673,457 @@ We use this file, which has eol=LF - but
</TestAction>
<hashTree/>
</hashTree>
+ <SetupThreadGroup guiclass="SetupThreadGroupGui" testclass="SetupThreadGroup" \
testname="Setup Thread Group" enabled="true"> + <stringProp \
name="ThreadGroup.on_sample_error">continue</stringProp> + <elementProp \
name="ThreadGroup.main_controller" elementType="LoopController" \
guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" \
enabled="true"> + <boolProp \
name="LoopController.continue_forever">false</boolProp> + <stringProp \
name="LoopController.loops">1</stringProp> + </elementProp>
+ <stringProp name="ThreadGroup.num_threads">1</stringProp>
+ <stringProp name="ThreadGroup.ramp_time">1</stringProp>
+ <longProp name="ThreadGroup.start_time">1296159999000</longProp>
+ <longProp name="ThreadGroup.end_time">1296159999000</longProp>
+ <boolProp name="ThreadGroup.scheduler">false</boolProp>
+ <stringProp name="ThreadGroup.duration"></stringProp>
+ <stringProp name="ThreadGroup.delay"></stringProp>
+ </SetupThreadGroup>
+ <hashTree>
+ <JavaSampler guiclass="JavaTestSamplerGui" testclass="JavaSampler" \
testname="Setup ${CSV_VAR}" enabled="true"> + <elementProp name="arguments" \
elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" \
enabled="true"> + <collectionProp name="Arguments.arguments">
+ <elementProp name="Sleep_Time" elementType="Argument">
+ <stringProp name="Argument.name">Sleep_Time</stringProp>
+ <stringProp name="Argument.value">100</stringProp>
+ <stringProp name="Argument.metadata">=</stringProp>
+ </elementProp>
+ <elementProp name="Sleep_Mask" elementType="Argument">
+ <stringProp name="Argument.name">Sleep_Mask</stringProp>
+ <stringProp name="Argument.value">0xFF</stringProp>
+ <stringProp name="Argument.metadata">=</stringProp>
+ </elementProp>
+ <elementProp name="Label" elementType="Argument">
+ <stringProp name="Argument.name">Label</stringProp>
+ <stringProp name="Argument.value"></stringProp>
+ <stringProp name="Argument.metadata">=</stringProp>
+ </elementProp>
+ <elementProp name="ResponseCode" elementType="Argument">
+ <stringProp name="Argument.name">ResponseCode</stringProp>
+ <stringProp name="Argument.value">200</stringProp>
+ <stringProp name="Argument.metadata">=</stringProp>
+ </elementProp>
+ <elementProp name="ResponseMessage" elementType="Argument">
+ <stringProp name="Argument.name">ResponseMessage</stringProp>
+ <stringProp name="Argument.value">OK</stringProp>
+ <stringProp name="Argument.metadata">=</stringProp>
+ </elementProp>
+ <elementProp name="Status" elementType="Argument">
+ <stringProp name="Argument.name">Status</stringProp>
+ <stringProp name="Argument.value">OK</stringProp>
+ <stringProp name="Argument.metadata">=</stringProp>
+ </elementProp>
+ <elementProp name="SamplerData" elementType="Argument">
+ <stringProp name="Argument.name">SamplerData</stringProp>
+ <stringProp name="Argument.value"></stringProp>
+ <stringProp name="Argument.metadata">=</stringProp>
+ </elementProp>
+ <elementProp name="ResultData" elementType="Argument">
+ <stringProp name="Argument.name">ResultData</stringProp>
+ <stringProp name="Argument.value"></stringProp>
+ <stringProp name="Argument.metadata">=</stringProp>
+ </elementProp>
+ </collectionProp>
+ </elementProp>
+ <stringProp \
name="classname">org.apache.jmeter.protocol.java.test.JavaTest</stringProp> + \
</JavaSampler> + <hashTree/>
+ <ResultCollector guiclass="SimpleDataWriter" testclass="ResultCollector" \
testname="Write CSV" enabled="true"> + <boolProp \
name="ResultCollector.error_logging">false</boolProp> + <objProp>
+ <name>saveConfig</name>
+ <value class="SampleSaveConfiguration">
+ <time>false</time>
+ <latency>false</latency>
+ <timestamp>false</timestamp>
+ <success>true</success>
+ <label>true</label>
+ <code>true</code>
+ <message>true</message>
+ <threadName>true</threadName>
+ <dataType>true</dataType>
+ <encoding>false</encoding>
+ <assertions>true</assertions>
+ <subresults>true</subresults>
+ <responseData>false</responseData>
+ <samplerData>true</samplerData>
+ <xml>false</xml>
+ <fieldNames>true</fieldNames>
+ <responseHeaders>true</responseHeaders>
+ <requestHeaders>true</requestHeaders>
+ <responseDataOnError>false</responseDataOnError>
+ <saveAssertionResultsFailureMessage>true</saveAssertionResultsFailureMessage>
+ <assertionsResultsToSave>0</assertionsResultsToSave>
+ <bytes>true</bytes>
+ <url>true</url>
+ <fileName>true</fileName>
+ <threadCounts>true</threadCounts>
+ <sampleCount>true</sampleCount>
+ </value>
+ </objProp>
+ <stringProp name="filename">${__P(CSVFILE)}</stringProp>
+ </ResultCollector>
+ <hashTree/>
+ <ResultCollector guiclass="SimpleDataWriter" testclass="ResultCollector" \
testname="Write XML" enabled="true"> + <boolProp \
name="ResultCollector.error_logging">false</boolProp> + <objProp>
+ <name>saveConfig</name>
+ <value class="SampleSaveConfiguration">
+ <time>false</time>
+ <latency>false</latency>
+ <timestamp>false</timestamp>
+ <success>true</success>
+ <label>true</label>
+ <code>true</code>
+ <message>true</message>
+ <threadName>true</threadName>
+ <dataType>true</dataType>
+ <encoding>false</encoding>
+ <assertions>true</assertions>
+ <subresults>true</subresults>
+ <responseData>false</responseData>
+ <samplerData>true</samplerData>
+ <xml>true</xml>
+ <fieldNames>true</fieldNames>
+ <responseHeaders>true</responseHeaders>
+ <requestHeaders>true</requestHeaders>
+ <responseDataOnError>false</responseDataOnError>
+ <saveAssertionResultsFailureMessage>true</saveAssertionResultsFailureMessage>
+ <assertionsResultsToSave>0</assertionsResultsToSave>
+ <bytes>true</bytes>
+ <url>true</url>
+ <fileName>true</fileName>
+ <threadCounts>true</threadCounts>
+ <sampleCount>true</sampleCount>
+ </value>
+ </objProp>
+ <stringProp name="filename">BatchTestLocal.xml</stringProp>
+ </ResultCollector>
+ <hashTree/>
+ </hashTree>
+ <PostThreadGroup guiclass="PostThreadGroupGui" testclass="PostThreadGroup" \
testname="Post Thread Group" enabled="true"> + <stringProp \
name="ThreadGroup.on_sample_error">continue</stringProp> + <elementProp \
name="ThreadGroup.main_controller" elementType="LoopController" \
guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" \
enabled="true"> + <boolProp \
name="LoopController.continue_forever">false</boolProp> + <stringProp \
name="LoopController.loops">1</stringProp> + </elementProp>
+ <stringProp name="ThreadGroup.num_threads">1</stringProp>
+ <stringProp name="ThreadGroup.ramp_time">1</stringProp>
+ <longProp name="ThreadGroup.start_time">1296160031000</longProp>
+ <longProp name="ThreadGroup.end_time">1296160031000</longProp>
+ <boolProp name="ThreadGroup.scheduler">false</boolProp>
+ <stringProp name="ThreadGroup.duration"></stringProp>
+ <stringProp name="ThreadGroup.delay"></stringProp>
+ </PostThreadGroup>
+ <hashTree>
+ <JavaSampler guiclass="JavaTestSamplerGui" testclass="JavaSampler" \
testname="Post ${CSV_VAR}" enabled="true"> + <elementProp name="arguments" \
elementType="Arguments" guiclass="ArgumentsPanel" testclass="Arguments" \
enabled="true"> + <collectionProp name="Arguments.arguments">
+ <elementProp name="Sleep_Time" elementType="Argument">
+ <stringProp name="Argument.name">Sleep_Time</stringProp>
+ <stringProp name="Argument.value">100</stringProp>
+ <stringProp name="Argument.metadata">=</stringProp>
+ </elementProp>
+ <elementProp name="Sleep_Mask" elementType="Argument">
+ <stringProp name="Argument.name">Sleep_Mask</stringProp>
+ <stringProp name="Argument.value">0xFF</stringProp>
+ <stringProp name="Argument.metadata">=</stringProp>
+ </elementProp>
+ <elementProp name="Label" elementType="Argument">
+ <stringProp name="Argument.name">Label</stringProp>
+ <stringProp name="Argument.value"></stringProp>
+ <stringProp name="Argument.metadata">=</stringProp>
+ </elementProp>
+ <elementProp name="ResponseCode" elementType="Argument">
+ <stringProp name="Argument.name">ResponseCode</stringProp>
+ <stringProp name="Argument.value">200</stringProp>
+ <stringProp name="Argument.metadata">=</stringProp>
+ </elementProp>
+ <elementProp name="ResponseMessage" elementType="Argument">
+ <stringProp name="Argument.name">ResponseMessage</stringProp>
+ <stringProp name="Argument.value">OK</stringProp>
+ <stringProp name="Argument.metadata">=</stringProp>
+ </elementProp>
+ <elementProp name="Status" elementType="Argument">
+ <stringProp name="Argument.name">Status</stringProp>
+ <stringProp name="Argument.value">OK</stringProp>
+ <stringProp name="Argument.metadata">=</stringProp>
+ </elementProp>
+ <elementProp name="SamplerData" elementType="Argument">
+ <stringProp name="Argument.name">SamplerData</stringProp>
+ <stringProp name="Argument.value"></stringProp>
+ <stringProp name="Argument.metadata">=</stringProp>
+ </elementProp>
+ <elementProp name="ResultData" elementType="Argument">
+ <stringProp name="Argument.name">ResultData</stringProp>
+ <stringProp name="Argument.value"></stringProp>
+ <stringProp name="Argument.metadata">=</stringProp>
+ </elementProp>
+ </collectionProp>
+ </elementProp>
+ <stringProp \
name="classname">org.apache.jmeter.protocol.java.test.JavaTest</stringProp> + \
</JavaSampler> + <hashTree/>
+ <ResultCollector guiclass="SimpleDataWriter" testclass="ResultCollector" \
testname="Write CSV" enabled="true"> + <boolProp \
name="ResultCollector.error_logging">false</boolProp> + <objProp>
+ <name>saveConfig</name>
+ <value class="SampleSaveConfiguration">
+ <time>false</time>
+ <latency>false</latency>
+ <timestamp>false</timestamp>
+ <success>true</success>
+ <label>true</label>
+ <code>true</code>
+ <message>true</message>
+ <threadName>true</threadName>
+ <dataType>true</dataType>
+ <encoding>false</encoding>
+ <assertions>true</assertions>
+ <subresults>true</subresults>
+ <responseData>false</responseData>
+ <samplerData>true</samplerData>
+ <xml>false</xml>
+ <fieldNames>true</fieldNames>
+ <responseHeaders>true</responseHeaders>
+ <requestHeaders>true</requestHeaders>
+ <responseDataOnError>false</responseDataOnError>
+ <saveAssertionResultsFailureMessage>true</saveAssertionResultsFailureMessage>
+ <assertionsResultsToSave>0</assertionsResultsToSave>
+ <bytes>true</bytes>
+ <url>true</url>
+ <fileName>true</fileName>
+ <threadCounts>true</threadCounts>
+ <sampleCount>true</sampleCount>
+ </value>
+ </objProp>
+ <stringProp name="filename">${__P(CSVFILE)}</stringProp>
+ </ResultCollector>
+ <hashTree/>
+ <ResultCollector guiclass="SimpleDataWriter" testclass="ResultCollector" \
testname="Write XML" enabled="true"> + <boolProp \
name="ResultCollector.error_logging">false</boolProp> + <objProp>
+ <name>saveConfig</name>
+ <value class="SampleSaveConfiguration">
+ <time>false</time>
+ <latency>false</latency>
+ <timestamp>false</timestamp>
+ <success>true</success>
+ <label>true</label>
+ <code>true</code>
+ <message>true</message>
+ <threadName>true</threadName>
+ <dataType>true</dataType>
+ <encoding>false</encoding>
+ <assertions>true</assertions>
+ <subresults>true</subresults>
+ <responseData>false</responseData>
+ <samplerData>true</samplerData>
+ <xml>true</xml>
+ <fieldNames>true</fieldNames>
+ <responseHeaders>true</responseHeaders>
+ <requestHeaders>true</requestHeaders>
+ <responseDataOnError>false</responseDataOnError>
+ <saveAssertionResultsFailureMessage>true</saveAssertionResultsFailureMessage>
+ <assertionsResultsToSave>0</assertionsResultsToSave>
+ <bytes>true</bytes>
+ <url>true</url>
+ <fileName>true</fileName>
+ <threadCounts>true</threadCounts>
+ <sampleCount>true</sampleCount>
+ </value>
+ </objProp>
+ <stringProp name="filename">BatchTestLocal.xml</stringProp>
+ </ResultCollector>
+ <hashTree/>
+ </hashTree>
+ <CSVDataSet guiclass="TestBeanGUI" testclass="CSVDataSet" testname="CSV Data \
Set Config" enabled="true"> + <stringProp name="delimiter">,</stringProp>
+ <stringProp name="fileEncoding"></stringProp>
+ <stringProp name="filename">BatchTestLocal.txt</stringProp>
+ <boolProp name="quotedData">false</boolProp>
+ <boolProp name="recycle">true</boolProp>
+ <stringProp name="shareMode">All threads</stringProp>
+ <boolProp name="stopThread">false</boolProp>
+ <stringProp name="variableNames">CSV_VAR</stringProp>
+ </CSVDataSet>
+ <hashTree/>
+ <ThreadGroup guiclass="ThreadGroupGui" testclass="ThreadGroup" testname="CSV \
Test" enabled="true"> + <stringProp \
name="ThreadGroup.on_sample_error">continue</stringProp> + <elementProp \
name="ThreadGroup.main_controller" elementType="LoopController" \
guiclass="LoopControlPanel" testclass="LoopController" testname="Loop Controller" \
enabled="true"> + <boolProp \
name="LoopController.continue_forever">false</boolProp> + <stringProp \
name="LoopController.loops">4</stringProp> + </elementProp>
+ <stringProp name="ThreadGroup.num_threads">1</stringProp>
+ <stringProp name="ThreadGroup.ramp_time">1</stringProp>
+ <longProp name="ThreadGroup.start_time">1296160584000</longProp>
+ <longProp name="ThreadGroup.end_time">1296160584000</longProp>
+ <boolProp name="ThreadGroup.scheduler">false</boolProp>
+ <stringProp name="ThreadGroup.duration"></stringProp>
+ <stringProp name="ThreadGroup.delay"></stringProp>
+ </ThreadGroup>
+ <hashTree>
+ <JavaSampler guiclass="JavaTestSamplerGui" testclass="JavaSampler" \
testname="CSV_VAR=${CSV_VAR}" enabled="true"> + <elementProp \
name="arguments" elementType="Arguments" guiclass="ArgumentsPanel" \
testclass="Arguments" enabled="true"> + <collectionProp \
name="Arguments.arguments"> + <elementProp name="Sleep_Time" \
elementType="Argument"> + <stringProp \
name="Argument.name">Sleep_Time</stringProp> + <stringProp \
name="Argument.value">100</stringProp> + <stringProp \
name="Argument.metadata">=</stringProp> + </elementProp>
+ <elementProp name="Sleep_Mask" elementType="Argument">
+ <stringProp name="Argument.name">Sleep_Mask</stringProp>
+ <stringProp name="Argument.value">0xFF</stringProp>
+ <stringProp name="Argument.metadata">=</stringProp>
+ </elementProp>
+ <elementProp name="Label" elementType="Argument">
+ <stringProp name="Argument.name">Label</stringProp>
+ <stringProp name="Argument.value"></stringProp>
+ <stringProp name="Argument.metadata">=</stringProp>
+ </elementProp>
+ <elementProp name="ResponseCode" elementType="Argument">
+ <stringProp name="Argument.name">ResponseCode</stringProp>
+ <stringProp name="Argument.value">200</stringProp>
+ <stringProp name="Argument.metadata">=</stringProp>
+ </elementProp>
+ <elementProp name="ResponseMessage" elementType="Argument">
+ <stringProp name="Argument.name">ResponseMessage</stringProp>
+ <stringProp name="Argument.value">OK</stringProp>
+ <stringProp name="Argument.metadata">=</stringProp>
+ </elementProp>
+ <elementProp name="Status" elementType="Argument">
+ <stringProp name="Argument.name">Status</stringProp>
+ <stringProp name="Argument.value">OK</stringProp>
+ <stringProp name="Argument.metadata">=</stringProp>
+ </elementProp>
+ <elementProp name="SamplerData" elementType="Argument">
+ <stringProp name="Argument.name">SamplerData</stringProp>
+ <stringProp name="Argument.value"></stringProp>
+ <stringProp name="Argument.metadata">=</stringProp>
+ </elementProp>
+ <elementProp name="ResultData" elementType="Argument">
+ <stringProp name="Argument.name">ResultData</stringProp>
+ <stringProp name="Argument.value"></stringProp>
+ <stringProp name="Argument.metadata">=</stringProp>
+ </elementProp>
+ </collectionProp>
+ </elementProp>
+ <stringProp \
name="classname">org.apache.jmeter.protocol.java.test.JavaTest</stringProp> + \
</JavaSampler> + <hashTree/>
+ <ResultCollector guiclass="SimpleDataWriter" testclass="ResultCollector" \
testname="Write CSV" enabled="true"> + <boolProp \
name="ResultCollector.error_logging">false</boolProp> + <objProp>
+ <name>saveConfig</name>
+ <value class="SampleSaveConfiguration">
+ <time>false</time>
+ <latency>false</latency>
+ <timestamp>false</timestamp>
+ <success>true</success>
+ <label>true</label>
+ <code>true</code>
+ <message>true</message>
+ <threadName>true</threadName>
+ <dataType>true</dataType>
+ <encoding>false</encoding>
+ <assertions>true</assertions>
+ <subresults>true</subresults>
+ <responseData>false</responseData>
+ <samplerData>true</samplerData>
+ <xml>false</xml>
+ <fieldNames>true</fieldNames>
+ <responseHeaders>true</responseHeaders>
+ <requestHeaders>true</requestHeaders>
+ <responseDataOnError>false</responseDataOnError>
+ <saveAssertionResultsFailureMessage>true</saveAssertionResultsFailureMessage>
+ <assertionsResultsToSave>0</assertionsResultsToSave>
+ <bytes>true</bytes>
+ <url>true</url>
+ <fileName>true</fileName>
+ <threadCounts>true</threadCounts>
+ <sampleCount>true</sampleCount>
+ </value>
+ </objProp>
+ <stringProp name="filename">${__P(CSVFILE)}</stringProp>
+ </ResultCollector>
+ <hashTree/>
+ <ResultCollector guiclass="SimpleDataWriter" testclass="ResultCollector" \
testname="Write XML" enabled="true"> + <boolProp \
name="ResultCollector.error_logging">false</boolProp> + <objProp>
+ <name>saveConfig</name>
+ <value class="SampleSaveConfiguration">
+ <time>false</time>
+ <latency>false</latency>
+ <timestamp>false</timestamp>
+ <success>true</success>
+ <label>true</label>
+ <code>true</code>
+ <message>true</message>
+ <threadName>true</threadName>
+ <dataType>true</dataType>
+ <encoding>false</encoding>
+ <assertions>true</assertions>
+ <subresults>true</subresults>
+ <responseData>false</responseData>
+ <samplerData>true</samplerData>
+ <xml>true</xml>
+ <fieldNames>true</fieldNames>
+ <responseHeaders>true</responseHeaders>
+ <requestHeaders>true</requestHeaders>
+ <responseDataOnError>false</responseDataOnError>
+ <saveAssertionResultsFailureMessage>true</saveAssertionResultsFailureMessage>
+ <assertionsResultsToSave>0</assertionsResultsToSave>
+ <bytes>true</bytes>
+ <url>true</url>
+ <fileName>true</fileName>
+ <threadCounts>true</threadCounts>
+ <sampleCount>true</sampleCount>
+ </value>
+ </objProp>
+ <stringProp name="filename">BatchTestLocal.xml</stringProp>
+ </ResultCollector>
+ <hashTree/>
+ </hashTree>
+ <ResultCollector guiclass="ViewResultsFullVisualizer" \
testclass="ResultCollector" testname="View Results Tree" enabled="true"> + \
<boolProp name="ResultCollector.error_logging">false</boolProp> + <objProp>
+ <name>saveConfig</name>
+ <value class="SampleSaveConfiguration">
+ <time>true</time>
+ <latency>true</latency>
+ <timestamp>true</timestamp>
+ <success>true</success>
+ <label>true</label>
+ <code>true</code>
+ <message>true</message>
+ <threadName>true</threadName>
+ <dataType>true</dataType>
+ <encoding>false</encoding>
+ <assertions>true</assertions>
+ <subresults>true</subresults>
+ <responseData>false</responseData>
+ <samplerData>false</samplerData>
+ <xml>true</xml>
+ <fieldNames>false</fieldNames>
+ <responseHeaders>false</responseHeaders>
+ <requestHeaders>false</requestHeaders>
+ <responseDataOnError>false</responseDataOnError>
+ <saveAssertionResultsFailureMessage>false</saveAssertionResultsFailureMessage>
+ <assertionsResultsToSave>0</assertionsResultsToSave>
+ <bytes>true</bytes>
+ </value>
+ </objProp>
+ <stringProp name="filename"></stringProp>
+ </ResultCollector>
+ <hashTree/>
</hashTree>
</hashTree>
</jmeterTestPlan>
Modified: jakarta/jmeter/trunk/bin/testfiles/BatchTestLocal.xml
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/bin/testfiles/BatchTestLocal.xml?rev=1064920&r1=1064919&r2=1064920&view=diff
==============================================================================
--- jakarta/jmeter/trunk/bin/testfiles/BatchTestLocal.xml (original)
+++ jakarta/jmeter/trunk/bin/testfiles/BatchTestLocal.xml Fri Jan 28 22:55:46 2011
@@ -1,5 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<testResults version="1.2">
+<sample s="true" lb="Setup 1" rc="200" rm="OK" tn="Setup Thread Group 1-1" dt="" \
by="0" sc="1" ec="0" ng="1" na="1"> + <responseHeader \
class="java.lang.String"></responseHeader> + <requestHeader \
class="java.lang.String"></requestHeader> + <responseFile \
class="java.lang.String"></responseFile> +</sample>
<sample s="true" lb="Java 1 C1=1" rc="200" rm="OK" tn="Thread Group 1-1" dt="text" \
by="10" sc="1" ec="0" ng="1" na="1"> <responseHeader \
class="java.lang.String"></responseHeader> <requestHeader \
class="java.lang.String"></requestHeader> @@ -648,7 +653,7 @@
<responseData class="java.lang.String"/>
<responseFile class="java.lang.String"></responseFile>
</sample>
-<httpSample s="true" lb="HTTP "Request," rc="200" rm="OK" tn="Thread Group 2-1" \
dt="text" by="98994" sc="1" ec="0" ng="1" na="1"> +<httpSample s="true" lb="HTTP \
"Request," rc="200" rm="OK" tn="Thread Group 2-1" dt="text" by="122764" sc="1" \
ec="0" ng="1" na="1"> <responseHeader class="java.lang.String"></responseHeader>
<requestHeader class="java.lang.String"></requestHeader>
<responseFile class="java.lang.String"></responseFile>
@@ -727,5 +732,30 @@
<requestHeader class="java.lang.String"></requestHeader>
<responseFile class="java.lang.String"></responseFile>
</sample>
+<sample s="true" lb="CSV_VAR=2" rc="200" rm="OK" tn="CSV Test 6-1" dt="" by="0" \
sc="1" ec="0" ng="1" na="1"> + <responseHeader \
class="java.lang.String"></responseHeader> + <requestHeader \
class="java.lang.String"></requestHeader> + <responseFile \
class="java.lang.String"></responseFile> +</sample>
+<sample s="true" lb="CSV_VAR=3" rc="200" rm="OK" tn="CSV Test 6-1" dt="" by="0" \
sc="1" ec="0" ng="1" na="1"> + <responseHeader \
class="java.lang.String"></responseHeader> + <requestHeader \
class="java.lang.String"></requestHeader> + <responseFile \
class="java.lang.String"></responseFile> +</sample>
+<sample s="true" lb="CSV_VAR=1" rc="200" rm="OK" tn="CSV Test 6-1" dt="" by="0" \
sc="1" ec="0" ng="1" na="1"> + <responseHeader \
class="java.lang.String"></responseHeader> + <requestHeader \
class="java.lang.String"></requestHeader> + <responseFile \
class="java.lang.String"></responseFile> +</sample>
+<sample s="true" lb="CSV_VAR=2" rc="200" rm="OK" tn="CSV Test 6-1" dt="" by="0" \
sc="1" ec="0" ng="1" na="1"> + <responseHeader \
class="java.lang.String"></responseHeader> + <requestHeader \
class="java.lang.String"></requestHeader> + <responseFile \
class="java.lang.String"></responseFile> +</sample>
+<sample s="true" lb="Post 3" rc="200" rm="OK" tn="Post Thread Group 1-1" dt="" \
by="0" sc="1" ec="0" ng="1" na="1"> + <responseHeader \
class="java.lang.String"></responseHeader> + <requestHeader \
class="java.lang.String"></requestHeader> + <responseFile \
class="java.lang.String"></responseFile> +</sample>
</testResults>
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java?rev=1064920&r1=1064919&r2=1064920&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java \
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/ClientJMeterEngine.java \
Fri Jan 28 22:55:46 2011 @@ -18,6 +18,7 @@
package org.apache.jmeter.engine;
+import java.io.File;
import java.net.MalformedURLException;
import java.rmi.Naming;
import java.rmi.NotBoundException;
@@ -26,6 +27,7 @@ import java.rmi.RemoteException;
import java.rmi.server.RemoteObject;
import java.util.Properties;
+import org.apache.jmeter.services.FileServer;
import org.apache.jmeter.testelement.TestListener;
import org.apache.jmeter.threads.JMeterContextService;
import org.apache.jorphan.collections.HashTree;
@@ -126,11 +128,12 @@ public class ClientJMeterEngine implemen
*
* See https://issues.apache.org/bugzilla/show_bug.cgi?id=48350
*/
+ File baseDirRelative = FileServer.getFileServer().getBaseDirRelative();
synchronized(LOCK)
{
- remote.configure(testTree, host);
+ remote.configure(testTree, host, baseDirRelative);
}
- log.info("sent test to " + host);
+ log.info("sent test to " + host + " basedir='"+baseDirRelative+"'");
if (savep != null){
log.info("Sending properties "+savep);
try {
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngine.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngine.java?rev=1064920&r1=1064919&r2=1064920&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngine.java \
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngine.java \
Fri Jan 28 22:55:46 2011 @@ -18,6 +18,7 @@
package org.apache.jmeter.engine;
+import java.io.File;
import java.rmi.Remote;
import java.rmi.RemoteException;
import java.util.Properties;
@@ -25,7 +26,7 @@ import java.util.Properties;
import org.apache.jorphan.collections.HashTree;
public interface RemoteJMeterEngine extends Remote {
- void configure(HashTree testTree, String host) throws RemoteException;
+ void configure(HashTree testTree, String host, File jmxBase) throws \
RemoteException;
void runTest() throws RemoteException, JMeterEngineException;
Modified: jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java?rev=1064920&r1=1064919&r2=1064920&view=diff
==============================================================================
--- jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java \
(original)
+++ jakarta/jmeter/trunk/src/core/org/apache/jmeter/engine/RemoteJMeterEngineImpl.java \
Fri Jan 28 22:55:46 2011 @@ -18,6 +18,7 @@
package org.apache.jmeter.engine;
+import java.io.File;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.rmi.RemoteException;
@@ -25,6 +26,7 @@ import java.rmi.registry.LocateRegistry;
import java.rmi.registry.Registry;
import java.util.Properties;
+import org.apache.jmeter.services.FileServer;
import org.apache.jmeter.util.JMeterUtils;
import org.apache.jorphan.collections.HashTree;
import org.apache.jorphan.logging.LoggingManager;
@@ -116,10 +118,11 @@ public class RemoteJMeterEngineImpl exte
* @param testTree
* the feature to be added to the ThreadGroup attribute
*/
- public void configure(HashTree testTree, String host) throws RemoteException {
- log.info("Creating JMeter engine on host "+host);
+ public void configure(HashTree testTree, String host, File jmxBase) throws \
RemoteException { + log.info("Creating JMeter engine on host "+host+" base \
'"+jmxBase+"'"); backingEngine = new StandardJMeterEngine(host);
backingEngine.configure(testTree);
+ FileServer.getFileServer().setBase(jmxBase);
}
public void runTest() throws RemoteException, JMeterEngineException {
Modified: jakarta/jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jakarta/jmeter/trunk/xdocs/changes.xml?rev=1064920&r1=1064919&r2=1064920&view=diff
==============================================================================
--- jakarta/jmeter/trunk/xdocs/changes.xml (original)
+++ jakarta/jmeter/trunk/xdocs/changes.xml Fri Jan 28 22:55:46 2011
@@ -129,6 +129,10 @@ Change SampleResult to recalculate offse
Also enable reversion to using System.currentTimeMillis() only.
</li>
<li>Bug 50425 - Remove thread groups from Controller add menu</li>
+<li>
+Bug 50675 - CVS Data Set Config incompatible with Remote Start
+Fixed RMI startup to provide location of JMX file relative to user.dir.
+</li>
</ul>
<!-- ==================================================== -->
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@jakarta.apache.org
For additional commands, e-mail: notifications-help@jakarta.apache.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic