Author: milamber
Date: Fri Apr 15 07:21:14 2016
New Revision: 1739240
URL: http://svn.apache.org/viewvc?rev=1739240&view=rev
Log:
Revert Bugzilla 58679 - A character of value 0 is not valid as part of XML, but
it's was written by xpp3.
This closes #197
Bugzilla Id: 58679
Added:
jmeter/trunk/licenses/bin/xmlpull-1.1.3.1.txt (with props)
jmeter/trunk/licenses/bin/xpp3-1.1.4c.txt (with props)
Modified:
jmeter/trunk/LICENSE
jmeter/trunk/build.properties
jmeter/trunk/build.xml
jmeter/trunk/eclipse.classpath
jmeter/trunk/lib/ (props changed)
jmeter/trunk/lib/aareadme.txt
jmeter/trunk/res/maven/ApacheJMeter_parent.pom
jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java
jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java
jmeter/trunk/xdocs/changes.xml
Modified: jmeter/trunk/LICENSE
URL:
http://svn.apache.org/viewvc/jmeter/trunk/LICENSE?rev=1739240&r1=1739239&r2=1739240&view=diff
==============================================================================
--- jmeter/trunk/LICENSE [utf-8] (original)
+++ jmeter/trunk/LICENSE [utf-8] Fri Apr 15 07:21:14 2016
@@ -246,4 +246,6 @@ For details, please see the files under:
* rhino-1.7.7.1.jar (MPL 2.0)
* rsyntaxtextarea-2.5.8.jar (?)
* slf4j-api-1.7.13.jar (MIT)
+* xmlpull-1.1.3.1.jar (Public Domain)
+* xpp3-1.1.4c.jar (Indiana University Extreme! Lab Software License 1.1.1)
* xstream-1.4.8.jar (BSD)
Modified: jmeter/trunk/build.properties
URL:
http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1739240&r1=1739239&r2=1739240&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Fri Apr 15 07:21:14 2016
@@ -306,6 +306,17 @@ xstream.jar = xstream-${
xstream.loc =
${maven2.repo}/com/thoughtworks/xstream/xstream/${xstream.version}
xstream.md5 = 4551a29c38f22ed25eaf109eda50ff03
+# XMLPull is required by XStream 1.4.x
+xmlpull.version = 1.1.3.1
+xmlpull.jar = xmlpull-${xmlpull.version}.jar
+xmlpull.loc = ${maven2.repo}/xmlpull/xmlpull/${xmlpull.version}
+xmlpull.md5 = cc57dacc720eca721a50e78934b822d2
+
+xpp3.version = 1.1.4c
+xpp3.jar = xpp3_min-${xpp3.version}.jar
+xpp3.loc = ${maven2.repo}/xpp3/xpp3_min/${xpp3.version}
+xpp3.md5 = DCD95BCB84B09897B2B66D4684C040DA
+
# Xalan can be found at: http://xml.apache.org/xalan-j/
xalan.version = 2.7.2
xalan.jar = xalan-${xalan.version}.jar
Modified: jmeter/trunk/build.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1739240&r1=1739239&r2=1739240&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Fri Apr 15 07:21:14 2016
@@ -413,6 +413,8 @@
<include name="${lib.dir}/${xerces.jar}"/>
<include name="${lib.dir}/${xml-apis.jar}"/>
<include name="${lib.dir}/${xmlgraphics-commons.jar}"/>
+ <include name="${lib.dir}/${xmlpull.jar}"/>
+ <include name="${lib.dir}/${xpp3.jar}"/>
<include name="${lib.dir}/${xstream.jar}"/>
</patternset>
@@ -488,6 +490,8 @@
<pathelement location="${lib.dir}/${xerces.jar}"/>
<pathelement location="${lib.dir}/${xml-apis.jar}"/>
<pathelement location="${lib.dir}/${xmlgraphics-commons.jar}"/>
+ <pathelement location="${lib.dir}/${xmlpull.jar}"/>
+ <pathelement location="${lib.dir}/${xpp3.jar}"/>
<pathelement location="${lib.dir}/${xstream.jar}"/>
<!-- Generated jars -->
<fileset dir="${lib.dir}" includes="jorphan.jar"/>
@@ -2932,6 +2936,8 @@ run JMeter unless all the JMeter jars ar
<process_jarfile jarname="xerces"/>
<process_jarfile jarname="xml-apis"/>
<process_jarfile jarname="xmlgraphics-commons"/>
+ <process_jarfile jarname="xmlpull"/>
+ <process_jarfile jarname="xpp3"/>
<process_jarfile jarname="xstream"/>
</target>
Modified: jmeter/trunk/eclipse.classpath
URL:
http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1739240&r1=1739239&r2=1739240&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Fri Apr 15 07:21:14 2016
@@ -96,6 +96,8 @@
<classpathentry kind="lib" path="lib/xercesImpl-2.11.0.jar"/>
<classpathentry kind="lib" path="lib/xml-apis-1.4.01.jar"/>
<classpathentry kind="lib" path="lib/xmlgraphics-commons-2.0.1.jar"/>
+ <classpathentry kind="lib" path="lib/xmlpull-1.1.3.1.jar"/>
+ <classpathentry kind="lib" path="lib/xpp3_min-1.1.4c.jar"/>
<classpathentry kind="lib" path="lib/xstream-1.4.8.jar"/>
<!-- Needed for build and test -->
<classpathentry kind="lib" path="lib/api/bcmail-jdk15on-1.49.jar"/>
Propchange: jmeter/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Fri Apr 15 07:21:14 2016
@@ -56,4 +56,6 @@ xalan-2.7.2.jar
xercesImpl-2.11.0.jar
xml-apis-1.4.01.jar
xmlgraphics-commons-2.0.1.jar
+xmlpull-1.1.3.1.jar
+xpp3_min-1.1.4c.jar
xstream-1.4.8.jar
Modified: jmeter/trunk/lib/aareadme.txt
URL:
http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1739240&r1=1739239&r2=1739240&view=diff
==============================================================================
--- jmeter/trunk/lib/aareadme.txt (original)
+++ jmeter/trunk/lib/aareadme.txt Fri Apr 15 07:21:14 2016
@@ -266,6 +266,18 @@ xmlgraphics-commons-2.0.1 (org.apache.xm
http://xmlgraphics.apache.org/commons/download.html
- SaveGraphicsService
+xmlpull-1.1.3.1
+---------------
+http://www.xmlpull.org/impls.shtml
+- xstream
+
+
+xpp3_min-1.1.4c
+---------------
+http://x-stream.github.io/download.html
+or
+http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/
+- xstream
xstream-1.4.8
-------------
Added: jmeter/trunk/licenses/bin/xmlpull-1.1.3.1.txt
URL:
http://svn.apache.org/viewvc/jmeter/trunk/licenses/bin/xmlpull-1.1.3.1.txt?rev=1739240&view=auto
==============================================================================
--- jmeter/trunk/licenses/bin/xmlpull-1.1.3.1.txt (added)
+++ jmeter/trunk/licenses/bin/xmlpull-1.1.3.1.txt Fri Apr 15 07:21:14 2016
@@ -0,0 +1,3 @@
+http://www.xmlpull.org/
+
+The XmlPull API is in public domain
\ No newline at end of file
Propchange: jmeter/trunk/licenses/bin/xmlpull-1.1.3.1.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jmeter/trunk/licenses/bin/xmlpull-1.1.3.1.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: jmeter/trunk/licenses/bin/xpp3-1.1.4c.txt
URL:
http://svn.apache.org/viewvc/jmeter/trunk/licenses/bin/xpp3-1.1.4c.txt?rev=1739240&view=auto
==============================================================================
--- jmeter/trunk/licenses/bin/xpp3-1.1.4c.txt (added)
+++ jmeter/trunk/licenses/bin/xpp3-1.1.4c.txt Fri Apr 15 07:21:14 2016
@@ -0,0 +1,48 @@
+Extracted from
http://www.extreme.indiana.edu/dist/java-repository/xpp3/distributions/xpp3-1.1.4c_src.zip
+
+Indiana University Extreme! Lab Software License
+
+Version 1.1.1
+
+Copyright (c) 2002 Extreme! Lab, Indiana University. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the distribution.
+
+3. The end-user documentation included with the redistribution, if any,
+ must include the following acknowledgment:
+
+ "This product includes software developed by the Indiana University
+ Extreme! Lab (http://www.extreme.indiana.edu/)."
+
+Alternately, this acknowledgment may appear in the software itself,
+if and wherever such third-party acknowledgments normally appear.
+
+4. The names "Indiana Univeristy" and "Indiana Univeristy Extreme! Lab"
+must not be used to endorse or promote products derived from this
+software without prior written permission. For written permission,
+please contact http://www.extreme.indiana.edu/.
+
+5. Products derived from this software may not use "Indiana Univeristy"
+name nor may "Indiana Univeristy" appear in their name, without prior
+written permission of the Indiana University.
+
+THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESSED OR IMPLIED
+WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHORS, COPYRIGHT HOLDERS OR ITS CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Propchange: jmeter/trunk/licenses/bin/xpp3-1.1.4c.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: jmeter/trunk/licenses/bin/xpp3-1.1.4c.txt
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL:
http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1739240&r1=1739239&r2=1739240&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Fri Apr 15 07:21:14 2016
@@ -100,7 +100,9 @@ under the License.
<jtidy.version>r938</jtidy.version>
<tika-core.version>1.12</tika-core.version>
<tika-parsers.version>1.12</tika-parsers.version>
+ <xmlpull.version>1.1.3.1</xmlpull.version>
<xstream.version>1.4.8</xstream.version>
+ <xpp3.version>1.1.4c</xpp3.version>
<xalan.version>2.7.2</xalan.version>
<serializer.version>2.7.2</serializer.version>
<xerces.version>2.11.0</xerces.version>
@@ -292,6 +294,16 @@ under the License.
<version>${xstream.version}</version>
</dependency>
<dependency>
+ <groupId>xmlpull</groupId>
+ <artifactId>xmlpull</artifactId>
+ <version>${xmlpull.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>xpp3</groupId>
+ <artifactId>xpp3_min</artifactId>
+ <version>${xpp3.version}</version>
+ </dependency>
+ <dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
<version>${xalan.version}</version>
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=1739240&r1=1739239&r2=1739240&view=diff
==============================================================================
--- jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java (original)
+++ jmeter/trunk/src/core/org/apache/jmeter/save/SaveService.java Fri Apr 15
07:21:14 2016
@@ -57,8 +57,7 @@ import com.thoughtworks.xstream.converte
import com.thoughtworks.xstream.converters.DataHolder;
import
com.thoughtworks.xstream.converters.reflection.PureJavaReflectionProvider;
import com.thoughtworks.xstream.converters.reflection.ReflectionProvider;
-import com.thoughtworks.xstream.io.xml.PrettyPrintWriter;
-import com.thoughtworks.xstream.io.xml.StaxDriver;
+import com.thoughtworks.xstream.io.xml.XppDriver;
import com.thoughtworks.xstream.mapper.CannotResolveClassException;
import com.thoughtworks.xstream.mapper.Mapper;
import com.thoughtworks.xstream.mapper.MapperWrapper;
@@ -81,7 +80,7 @@ public class SaveService {
private static final class XStreamWrapper extends XStream {
private XStreamWrapper(ReflectionProvider reflectionProvider) {
- super(reflectionProvider, new StaxDriver());
+ super(reflectionProvider);
}
// Override wrapMapper in order to insert the Wrapper in the chain
@@ -302,7 +301,7 @@ public class SaveService {
// Use deprecated method, to avoid duplicating code
ScriptWrapper wrapper = new ScriptWrapper();
wrapper.testPlan = tree;
- JMXSAVER.marshal(wrapper, new PrettyPrintWriter(outputStreamWriter));
+ JMXSAVER.toXML(wrapper, outputStreamWriter);
outputStreamWriter.write('\n');// Ensure terminated properly
outputStreamWriter.close();
}
@@ -313,7 +312,7 @@ public class SaveService {
OutputStreamWriter outputStreamWriter = getOutputStreamWriter(out);
writeXmlHeader(outputStreamWriter);
// Use deprecated method, to avoid duplicating code
- JMXSAVER.marshal(el, new PrettyPrintWriter(outputStreamWriter));
+ JMXSAVER.toXML(el, outputStreamWriter);
outputStreamWriter.close();
}
@@ -341,7 +340,7 @@ public class SaveService {
// This is effectively the same as saver.toXML(Object, Writer) except
we get to provide the DataHolder
// Don't know why there is no method for this in the XStream class
try {
- JTLSAVER.marshal(evt.getResult(), new PrettyPrintWriter(writer),
dh);
+ JTLSAVER.marshal(evt.getResult(), new
XppDriver().createWriter(writer), dh);
} catch(RuntimeException e) {
throw new IllegalArgumentException("Failed
marshalling:"+(evt.getResult() != null ? showDebuggingInfo(evt.getResult()) :
"null"), e);
}
@@ -469,7 +468,7 @@ public class SaveService {
dh.put(RESULTCOLLECTOR_HELPER_OBJECT, resultCollectorHelper); // Allow
TestResultWrapper to feed back the samples
// This is effectively the same as saver.fromXML(InputStream) except
we get to provide the DataHolder
// Don't know why there is no method for this in the XStream class
- JTLSAVER.unmarshal(new StaxDriver().createReader(reader), null, dh);
+ JTLSAVER.unmarshal(new XppDriver().createReader(reader), null, dh);
inputStreamReader.close();
}
Modified: jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java?rev=1739240&r1=1739239&r2=1739240&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java Fri Apr 15
07:21:14 2016
@@ -58,6 +58,7 @@ public class JMeterVersionTest extends J
JAR_TO_BUILD_PROP.put("mail", "javamail");
JAR_TO_BUILD_PROP.put("oro", "jakarta-oro");
JAR_TO_BUILD_PROP.put("xercesImpl", "xerces");
+ JAR_TO_BUILD_PROP.put("xpp3_min", "xpp3");
}
private static final File JMETER_HOME = new
File(JMeterUtils.getJMeterHome());
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1739240&r1=1739239&r2=1739240&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Fri Apr 15 07:21:14 2016
@@ -271,8 +271,6 @@ Deprecated Libraries dropped or replaced
<li>htmllexer-2.1.jar (see <bugzilla>59037</bugzilla>)</li>
<li>htmlparser-2.1.jar (see <bugzilla>59037</bugzilla>)</li>
<li>soap-2.3.1.jar</li>
- <li>xmlpull-1.1.3.1.jar (see <bugzilla>58679</bugzilla>)</li>
- <li>xpp3_min-1.1.4c.jar (see <bugzilla>58679</bugzilla>)</li>
<li>jdom-1.1.3.jar (see <bugzilla>59156</bugzilla>)</li>
</ul>
</li>
@@ -460,7 +458,6 @@ Deprecated Libraries dropped or replaced
<li><bug>59037</bug>Drop HtmlParserHTMLParser and dependencies on htmlparser
and htmllexer</li>
<li><bug>58465</bug>JMS Read response field is badly named and documented</li>
<li><bug>58601</bug>Change check for modification of
<code>saveservice.properties</code> from <code>SVN Revision ID</code> to sha1
sum of the file itself.</li>
-<li><bug>58679</bug>Replace the xpp pull parser in xstream with a java6+
standard solution. Contributed by Benoit Wiart (benoit dot wiart at
gmail.com)</li>
<li><bug>58726</bug>Remove the <code>jmeterthread.startearlier</code>
parameter. Contributed by Benoit Wiart (benoit dot wiart at gmail.com)</li>
<li><bug>58784</bug>Make <code>JMeterUtils#runSafe</code> sync/async awt
invocation configurable and change the visualizers to use the async
version.</li>
<li><bug>58790</bug>Issue in CheckDirty and its relation to ActionRouter</li>
