Author: pmouawad
Date: Fri Feb 26 20:51:17 2016
New Revision: 1732555
URL: http://svn.apache.org/viewvc?rev=1732555&view=rev
Log:
Bug 59064 - Remove OldSaveService which supported very old Avalon format JTL
(result) files
Bugzilla Id: 59064
Removed:
jmeter/trunk/src/core/org/apache/jmeter/save/OldSaveService.java
Modified:
jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java
jmeter/trunk/src/core/org/apache/jmeter/samplers/StatisticalSampleResult.java
jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java?rev=1732555&r1=1732554&r2=1732555&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/reporters/ResultCollector.java Fri
Feb 26 20:51:17 2016
@@ -34,7 +34,6 @@ import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
-import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.jmeter.engine.util.NoThreadClone;
import org.apache.jmeter.gui.GuiPackage;
import org.apache.jmeter.samplers.Clearable;
@@ -44,7 +43,6 @@ import org.apache.jmeter.samplers.Sample
import org.apache.jmeter.samplers.SampleResult;
import org.apache.jmeter.samplers.SampleSaveConfiguration;
import org.apache.jmeter.save.CSVSaveService;
-import org.apache.jmeter.save.OldSaveService;
import org.apache.jmeter.save.SaveService;
import org.apache.jmeter.services.FileServer;
import org.apache.jmeter.testelement.TestElement;
@@ -57,7 +55,6 @@ import org.apache.jorphan.logging.Loggin
import org.apache.jorphan.util.JMeterError;
import org.apache.jorphan.util.JOrphanUtils;
import org.apache.log.Logger;
-import org.xml.sax.SAXException;
import com.thoughtworks.xstream.converters.ConversionException;
@@ -356,7 +353,6 @@ public class ResultCollector extends Abs
* This can be one of:
* <ul>
* <li>XStream format</li>
- * <li>Avalon format</li>
* <li>CSV format</li>
* </ul>
*
@@ -391,14 +387,7 @@ public class ResultCollector extends Abs
new ResultCollectorHelper(this,
visualizer));
parsedOK = true;
} catch (ConversionException e) {
- final String message = e.getShortMessage();
- if (message.startsWith("sampleResult")) { //
probably Avalon format
- log.info("Failed to load "+filename+" using
XStream. Assuming Avalon format, as message was: "+message);
- OldSaveService.processSamples(filename,
visualizer, this);
- parsedOK = true;
- } else {
- log.warn("Failed to load "+filename+" using
XStream. Error was: "+e);
- }
+ log.warn("Failed to load "+filename+" using
XStream. Error was: "+e);
} catch (Exception e) {
log.warn("Failed to load "+filename+" using
XStream. Error was: "+e);
}
@@ -407,8 +396,6 @@ public class ResultCollector extends Abs
} catch (IOException | JMeterError | RuntimeException |
OutOfMemoryError e) {
// FIXME Why do we catch OOM ?
log.warn("Problem reading JTL file: "+file);
- } catch (ConfigurationException | SAXException e) { // Avalon only
- log.warn("Problem reading Avalon JTL file: "+file,e);
} finally {
JOrphanUtils.closeQuietly(dataReader);
JOrphanUtils.closeQuietly(bufferedInputStream);
Modified: jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java?rev=1732555&r1=1732554&r2=1732555&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java
(original)
+++ jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleResult.java Fri Feb
26 20:51:17 2016
@@ -400,7 +400,7 @@ public class SampleResult implements Ser
* Allow users to create a sample with specific timestamp and elapsed times
* for cloning purposes, but don't allow the times to be changed later
*
- * Currently used by OldSaveService, CSVSaveService and
+ * Currently used by CSVSaveService and
* StatisticalSampleResult
*
* @param stamp
Modified:
jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java?rev=1732555&r1=1732554&r2=1732555&view=diff
==============================================================================
---
jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/samplers/SampleSaveConfiguration.java
Fri Feb 26 20:51:17 2016
@@ -428,7 +428,7 @@ public class SampleSaveConfiguration imp
}
/**
- * Alternate constructor for use by OldSaveService
+ * Alternate constructor for use by CsvSaveService
*
* @param value initial setting for boolean fields used in Config dialogue
*/
@@ -790,8 +790,7 @@ public class SampleSaveConfiguration imp
///////////////// End of standard field accessors /////////////////////
/**
- * Only intended for use by OldSaveService (and test cases)
- *
+ * Intended for use by CsvSaveService (and test cases)
* @param fmt
* format of the date to be saved. If <code>null</code>
* milliseconds since epoch will be printed
Modified:
jmeter/trunk/src/core/org/apache/jmeter/samplers/StatisticalSampleResult.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/samplers/StatisticalSampleResult.java?rev=1732555&r1=1732554&r2=1732555&view=diff
==============================================================================
---
jmeter/trunk/src/core/org/apache/jmeter/samplers/StatisticalSampleResult.java
(original)
+++
jmeter/trunk/src/core/org/apache/jmeter/samplers/StatisticalSampleResult.java
Fri Feb 26 20:51:17 2016
@@ -39,7 +39,7 @@ public class StatisticalSampleResult ext
}
/**
- * Allow OldSaveService to generate a suitable result when sample/error
counts have been saved.
+ * Allow CsvSaveService to generate a suitable result when sample/error
counts have been saved.
*
* @deprecated Needs to be replaced when multiple sample results are
sorted out
*
Modified: jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java?rev=1732555&r1=1732554&r2=1732555&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java Fri Feb 26
20:51:17 2016
@@ -567,11 +567,6 @@ public class SaveService {
}
return wrapper.testPlan;
} catch (CannotResolveClassException e) {
- if (e.getMessage().startsWith("node")) {
- log.info("Problem loading XML, trying Avalon format");
- reader.reset();
- return OldSaveService.loadSubTree(reader);
- }
if(file != null) {
throw new IllegalArgumentException("Problem loading XML
from:'"+file.getAbsolutePath()+"', cannot determine class for element: " + e,
e);
} else {
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1732555&r1=1732554&r2=1732555&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Fri Feb 26 20:51:17 2016
@@ -91,7 +91,8 @@ Summary
<li><code>__jexl</code> function has been deprecated and will be removed
in next version. See <bugzilla>58903</bugzilla></li>
<li>JMS Subscriber will consider sample in error if number of received
messages is not equals to expected number of messages. It previously considerer
sample OK if only 1 message was received. See <bugzilla>58980</bugzilla></li>
<li>Since version 3.0, HTTP(S) Test Script recorder uses default port 8888
as configured when using Recording Template. See <bugzilla>59006</bugzilla></li>
- <li>Since version 3.0, the parser for embedded ressources (replaced since
2.10 by Lagarto based implementation) relying on htmlparser library
(HtmlParserHTMLParser) has been dropped as long as its dependencies.</li>
+ <li>Since version 3.0, the parser for embedded ressources (replaced since
2.10 by Lagarto based implementation) relying on htmlparser library
(HtmlParserHTMLParser) has been dropped as long as its dependencies.</li>
+ <li>Since version 3.0, the support for reading old Avalon format JTL
(result) files has been removed, see <bugzilla>59064</bugzilla></li>
</ul>
<!-- =================== Improvements =================== -->
@@ -244,6 +245,7 @@ Summary
<li><bug>58897</bug>Improve JUnit Test code. Contributed by Benoit Wiart
(benoit dot wiart at gmail.com)</li>
<li><bug>58967</bug>Use junit categories to exclude tests that need a gui.
Contributed by Benoit Wiart (benoit dot wiart at gmail.com)</li>
<li><bug>59003</bug>ClutilTestCase testSingleArg8 and testSingleArg9 are
identical</li>
+<li><bug>59064</bug>Remove OldSaveService which supported very old Avalon
format JTL (result) files</li>
</ul>
<!-- =================== Bug fixes =================== -->
