You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jmeter.apache.org by pm...@apache.org on 2016/03/01 13:19:32 UTC
svn commit: r1733049 - in /jmeter/trunk: bin/
src/core/org/apache/jmeter/save/
src/core/org/apache/jmeter/save/converters/ xdocs/
Author: pmouawad
Date: Tue Mar 1 12:19:31 2016
New Revision: 1733049
URL: http://svn.apache.org/viewvc?rev=1733049&view=rev
Log:
Bug 59094 - Drop support of old JMX file format
Bugzilla Id: 59094
Modified:
jmeter/trunk/bin/jmeter.properties
jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementConverter.java
jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/bin/jmeter.properties
URL: http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.properties?rev=1733049&r1=1733048&r2=1733049&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter.properties (original)
+++ jmeter/trunk/bin/jmeter.properties Tue Mar 1 12:19:31 2016
@@ -42,21 +42,6 @@
cookies=cookies
#---------------------------------------------------------------------------
-# File format configuration for JMX and JTL files
-#---------------------------------------------------------------------------
-
-# Properties:
-# file_format - affects both JMX and JTL files
-# file_format.testplan - affects JMX files only
-# file_format.testlog - affects JTL files only
-#
-# Possible values are:
-# 2.1 - initial format using XStream
-# 2.2 - updated format using XStream, with shorter names
-
-# N.B. format 2.0 (Avalon) is no longer supported
-
-#---------------------------------------------------------------------------
# XML Parser
#---------------------------------------------------------------------------
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=1733049&r1=1733048&r2=1733049&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java Tue Mar 1 12:19:31 2016
@@ -127,46 +127,9 @@ public class SaveService {
// Property name used to define file name
private static final String SAVESERVICE_PROPERTIES = "saveservice_properties"; // $NON-NLS-1$
- // Define file format property names
- private static final String FILE_FORMAT = "file_format"; // $NON-NLS-1$
- private static final String FILE_FORMAT_TESTPLAN = "file_format.testplan"; // $NON-NLS-1$
- private static final String FILE_FORMAT_TESTLOG = "file_format.testlog"; // $NON-NLS-1$
-
// Define file format versions
private static final String VERSION_2_2 = "2.2"; // $NON-NLS-1$
- // Default to overall format, and then to version 2.2
- public static final String TESTPLAN_FORMAT
- = JMeterUtils.getPropDefault(FILE_FORMAT_TESTPLAN
- , JMeterUtils.getPropDefault(FILE_FORMAT, VERSION_2_2));
-
- public static final String TESTLOG_FORMAT
- = JMeterUtils.getPropDefault(FILE_FORMAT_TESTLOG
- , JMeterUtils.getPropDefault(FILE_FORMAT, VERSION_2_2));
-
- private static boolean validateFormat(String format){
- if ("2.2".equals(format)) {
- return true;
- }
- if ("2.1".equals(format)) {
- return true;
- }
- return false;
- }
-
- static{
- if (!validateFormat(TESTPLAN_FORMAT)){
- log.error("Invalid test plan format: "+TESTPLAN_FORMAT);
- }
- if (!validateFormat(TESTLOG_FORMAT)){
- log.error("Invalid test log format: "+TESTLOG_FORMAT);
- }
- }
-
- /** New XStream format - more compressed class names */
- public static final boolean IS_TESTPLAN_FORMAT_22
- = VERSION_2_2.equals(TESTPLAN_FORMAT);
-
// Holds the mappings from the saveservice properties file
// Key: alias Entry: full class name
// There may be multiple aliases which map to the same class
@@ -197,7 +160,7 @@ public class SaveService {
private static String fileEncoding = ""; // read from properties file// $NON-NLS-1$
static {
- log.info("Testplan (JMX) version: "+TESTPLAN_FORMAT+". Testlog (JTL) version: "+TESTLOG_FORMAT);
+ log.info("Testplan (JMX) version: "+VERSION_2_2+". Testlog (JTL) version: "+VERSION_2_2);
initProps();
checkVersions();
}
Modified: jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementConverter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementConverter.java?rev=1733049&r1=1733048&r2=1733049&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementConverter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementConverter.java Tue Mar 1 12:19:31 2016
@@ -27,12 +27,12 @@ import org.apache.jmeter.util.NameUpdate
import org.apache.jorphan.logging.LoggingManager;
import org.apache.log.Logger;
-import com.thoughtworks.xstream.mapper.Mapper;
import com.thoughtworks.xstream.converters.MarshallingContext;
import com.thoughtworks.xstream.converters.UnmarshallingContext;
import com.thoughtworks.xstream.converters.collections.AbstractCollectionConverter;
import com.thoughtworks.xstream.io.HierarchicalStreamReader;
import com.thoughtworks.xstream.io.HierarchicalStreamWriter;
+import com.thoughtworks.xstream.mapper.Mapper;
public class TestElementConverter extends AbstractCollectionConverter {
private static final Logger log = LoggingManager.getLoggerForClass();
@@ -58,14 +58,12 @@ public class TestElementConverter extend
@Override
public void marshal(Object arg0, HierarchicalStreamWriter writer, MarshallingContext context) {
TestElement el = (TestElement) arg0;
- if (SaveService.IS_TESTPLAN_FORMAT_22){
- ConversionHelp.saveSpecialProperties(el,writer);
- }
+ ConversionHelp.saveSpecialProperties(el,writer);
PropertyIterator iter = el.propertyIterator();
while (iter.hasNext()) {
JMeterProperty jmp=iter.next();
// Skip special properties if required
- if (!SaveService.IS_TESTPLAN_FORMAT_22 || !ConversionHelp.isSpecialProperty(jmp.getName())) {
+ if (!ConversionHelp.isSpecialProperty(jmp.getName())) {
// Don't save empty comments - except for the TestPlan (to maintain compatibility)
if (!(
TestElement.COMMENTS.equals(jmp.getName())
Modified: jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java
URL: http://svn.apache.org/viewvc/jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java?rev=1733049&r1=1733048&r2=1733049&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/converters/TestElementPropertyConverter.java Tue Mar 1 12:19:31 2016
@@ -19,7 +19,6 @@
package org.apache.jmeter.save.converters;
import org.apache.jmeter.config.ConfigTestElement;
-import org.apache.jmeter.save.SaveService;
import org.apache.jmeter.testelement.TestElement;
import org.apache.jmeter.testelement.property.JMeterProperty;
import org.apache.jmeter.testelement.property.TestElementProperty;
@@ -62,15 +61,12 @@ public class TestElementPropertyConverte
writer.addAttribute(ConversionHelp.ATT_NAME, ConversionHelp.encode(prop.getName()));
Class<?> clazz = prop.getObjectValue().getClass();
writer.addAttribute(ConversionHelp.ATT_ELEMENT_TYPE,
- SaveService.IS_TESTPLAN_FORMAT_22 ? mapper().serializedClass(clazz) : clazz.getName());
- if (SaveService.IS_TESTPLAN_FORMAT_22){
- TestElement te = (TestElement)prop.getObjectValue();
- ConversionHelp.saveSpecialProperties(te,writer);
- }
-
+ mapper().serializedClass(clazz));
+ TestElement te = (TestElement)prop.getObjectValue();
+ ConversionHelp.saveSpecialProperties(te,writer);
for (JMeterProperty jmp : prop) {
// Skip special properties if required
- if (!SaveService.IS_TESTPLAN_FORMAT_22 || !ConversionHelp.isSpecialProperty(jmp.getName()))
+ if (!ConversionHelp.isSpecialProperty(jmp.getName()))
{
// Don't save empty comments
if (!(TestElement.COMMENTS.equals(jmp.getName())
Modified: jmeter/trunk/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1733049&r1=1733048&r2=1733049&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Tue Mar 1 12:19:31 2016
@@ -228,6 +228,7 @@ Summary
<li><bug>58793</bug>Create developers page explaining how to build and contribute</li>
<li><bug>59046</bug>JMeter Gui Replace controller should keep the name and the selection. Contributed by Benoit Wiart (benoit dot wiart at gmail.com)</li>
<li><bug>59038</bug>Deprecate HTTPClient 3.1 related elements</li>
+<li><bug>59094</bug> - Drop support of old JMX file format</li>
</ul>
<ch_section>Non-functional changes</ch_section>
<ul>