Author: pmouawad
Date: Sat Feb 20 13:21:01 2016
New Revision: 1731400
URL: http://svn.apache.org/viewvc?rev=1731400&view=rev
Log:
Bug 59037 - Drop HtmlParserHTMLParser and dependencies on htmlparser and
htmllexer
Bugzilla Id: 59037
Removed:
jmeter/trunk/licenses/bin/htmllexer-2.1.txt
jmeter/trunk/licenses/bin/htmlparser-2.1.txt
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/HtmlParserHTMLParser.java
Modified:
jmeter/trunk/bin/jmeter.properties
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/test/src/org/apache/jmeter/JMeterVersionTest.java
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java
jmeter/trunk/xdocs/changes.xml
jmeter/trunk/xdocs/usermanual/component_reference.xml
Modified: jmeter/trunk/bin/jmeter.properties
URL:
http://svn.apache.org/viewvc/jmeter/trunk/bin/jmeter.properties?rev=1731400&r1=1731399&r2=1731400&view=diff
==============================================================================
--- jmeter/trunk/bin/jmeter.properties (original)
+++ jmeter/trunk/bin/jmeter.properties Sat Feb 20 13:21:01 2016
@@ -717,7 +717,6 @@ HTTPResponse.parsers=htmlParser wmlParse
# Other parsers:
# Default parser before 2.10
-#htmlParser.className=org.apache.jmeter.protocol.http.parser.HtmlParserHTMLParser
#htmlParser.className=org.apache.jmeter.protocol.http.parser.JTidyHTMLParser
# Note that Regexp extractor may detect references that have been commented
out.
# In many cases it will work OK, but you should be aware that it may generate
Modified: jmeter/trunk/build.properties
URL:
http://svn.apache.org/viewvc/jmeter/trunk/build.properties?rev=1731400&r1=1731399&r2=1731400&view=diff
==============================================================================
--- jmeter/trunk/build.properties (original)
+++ jmeter/trunk/build.properties Sat Feb 20 13:21:01 2016
@@ -165,16 +165,6 @@ hamcrest-core.loc = ${maven2.
hamcrest-core.jar = hamcrest-core-${hamcrest-core.version}.jar
hamcrest-core.md5 = 6393363b47ddcbba82321110c3e07519
-# Common file containing both htmlparser and htmllexer jars
-htmlparser.version = 2.1
-htmllexer.loc =
${maven2.repo}/org/htmlparser/htmllexer/${htmlparser.version}
-htmllexer.jar = htmllexer-${htmlparser.version}.jar
-htmllexer.md5 = 1cb7184766a0c52f4d98d671bb08be19
-
-htmlparser.loc =
${maven2.repo}/org/htmlparser/htmlparser/${htmlparser.version}
-htmlparser.jar = htmlparser-${htmlparser.version}.jar
-htmlparser.md5 = aa05b921026c228f92ef8b4a13c26f8d
-
# Apache HttpClient 4.x
httpclient.version = 4.5.1
#
Modified: jmeter/trunk/build.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/build.xml?rev=1731400&r1=1731399&r2=1731400&view=diff
==============================================================================
--- jmeter/trunk/build.xml (original)
+++ jmeter/trunk/build.xml Sat Feb 20 13:21:01 2016
@@ -380,8 +380,6 @@
<include name="${lib.dir}/${excalibur-logger.jar}"/>
<include name="${lib.dir}/${freemarker.jar}"/>
<include name="${lib.dir}/${hamcrest-core.jar}"/>
- <include name="${lib.dir}/${htmllexer.jar}"/>
- <include name="${lib.dir}/${htmlparser.jar}"/>
<include name="${lib.dir}/${httpclient.jar}"/>
<include name="${lib.dir}/${httpcore.jar}"/>
<include name="${lib.dir}/${httpmime.jar}"/>
@@ -455,8 +453,6 @@
<pathelement location="${lib.dir}/${excalibur-logger.jar}"/>
<pathelement location="${lib.dir}/${freemarker.jar}"/>
<pathelement location="${lib.dir}/${hamcrest-core.jar}"/>
- <pathelement location="${lib.dir}/${htmllexer.jar}"/>
- <pathelement location="${lib.dir}/${htmlparser.jar}"/>
<pathelement location="${lib.dir}/${httpclient.jar}"/>
<pathelement location="${lib.dir}/${httpcore.jar}"/>
<pathelement location="${lib.dir}/${httpmime.jar}"/>
@@ -1155,7 +1151,6 @@ run JMeter unless all the JMeter jars ar
<and>
<!-- No need to check all jars; just check a few -->
<available classpathref="classpath"
classname="org.apache.bsf.BSFEngine"/>
- <available classpathref="classpath"
classname="org.htmlparser.Parser"/>
<available classpathref="classpath"
classname="com.thoughtworks.xstream.XStream"/>
</and>
</condition>
@@ -2860,8 +2855,6 @@ run JMeter unless all the JMeter jars ar
<process_jarfile jarname="excalibur-logger"/>
<process_jarfile jarname="freemarker"/>
<process_jarfile jarname="hamcrest-core"/>
- <process_jarfile jarname="htmllexer"/>
- <process_jarfile jarname="htmlparser"/>
<process_jarfile jarname="httpclient"/>
<process_jarfile jarname="httpcore"/>
<process_jarfile jarname="httpmime"/>
Modified: jmeter/trunk/eclipse.classpath
URL:
http://svn.apache.org/viewvc/jmeter/trunk/eclipse.classpath?rev=1731400&r1=1731399&r2=1731400&view=diff
==============================================================================
--- jmeter/trunk/eclipse.classpath (original)
+++ jmeter/trunk/eclipse.classpath Sat Feb 20 13:21:01 2016
@@ -64,8 +64,6 @@
<classpathentry kind="lib" path="lib/freemarker-2.3.23.jar"/>
<classpathentry kind="lib" path="lib/hamcrest-core-1.3.jar"/>
<classpathentry kind="lib" path="lib/geronimo-jms_1.1_spec-1.1.1.jar"/>
- <classpathentry kind="lib" path="lib/htmllexer-2.1.jar"/>
- <classpathentry kind="lib" path="lib/htmlparser-2.1.jar"/>
<classpathentry kind="lib" path="lib/httpclient-4.5.1.jar"/>
<classpathentry kind="lib" path="lib/httpcore-4.4.4.jar"/>
<classpathentry kind="lib" path="lib/httpmime-4.5.1.jar"/>
Propchange: jmeter/trunk/lib/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Sat Feb 20 13:21:01 2016
@@ -22,8 +22,6 @@ excalibur-logger-1.1.jar
freemarker-2.3.23.jar
hamcrest-core-1.3.jar
geronimo*.jar
-htmllexer-2.1.jar
-htmlparser-2.1.jar
httpclient-4.5.1.jar
httpcore-4.4.4.jar
httpmime-4.5.1.jar
Modified: jmeter/trunk/lib/aareadme.txt
URL:
http://svn.apache.org/viewvc/jmeter/trunk/lib/aareadme.txt?rev=1731400&r1=1731399&r2=1731400&view=diff
==============================================================================
--- jmeter/trunk/lib/aareadme.txt (original)
+++ jmeter/trunk/lib/aareadme.txt Sat Feb 20 13:21:01 2016
@@ -104,12 +104,6 @@ freemarker-2.3.23.jar
----------------------
- used by Report/Dashboard feature
-htmlparser-2.1
-htmllexer-2.1
-----------------------
-http://htmlparser.sourceforge.net/
-- http: parsing html
-
jCharts-0.7.5 (org.jCharts)
-------------
http://jcharts.sourceforge.net/downloads.html
Modified: jmeter/trunk/res/maven/ApacheJMeter_parent.pom
URL:
http://svn.apache.org/viewvc/jmeter/trunk/res/maven/ApacheJMeter_parent.pom?rev=1731400&r1=1731399&r2=1731400&view=diff
==============================================================================
--- jmeter/trunk/res/maven/ApacheJMeter_parent.pom (original)
+++ jmeter/trunk/res/maven/ApacheJMeter_parent.pom Sat Feb 20 13:21:01 2016
@@ -75,7 +75,6 @@ under the License.
<excalibur-logger.version>1.1</excalibur-logger.version>
<freemarker.version>2.3.23</freemarker.version>
<hamcrest-core.version>1.3</hamcrest-core.version>
- <htmlparser.version>2.1</htmlparser.version>
<httpclient.version>4.5.1</httpclient.version>
<httpcore.version>4.4.4</httpcore.version>
<jakarta-oro.version>2.0.8</jakarta-oro.version>
@@ -217,16 +216,6 @@ under the License.
<version>${excalibur-logger.version}</version>
</dependency>
<dependency>
- <groupId>org.htmlparser</groupId>
- <artifactId>htmllexer</artifactId>
- <version>${htmlparser.version}</version>
- </dependency>
- <dependency>
- <groupId>org.htmlparser</groupId>
- <artifactId>htmlparser</artifactId>
- <version>${htmlparser.version}</version>
- </dependency>
- <dependency>
<groupId>org.apache.httpcomponents</groupId>
<artifactId>httpclient</artifactId>
<version>${httpclient.version}</version>
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=1731400&r1=1731399&r2=1731400&view=diff
==============================================================================
--- jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java (original)
+++ jmeter/trunk/test/src/org/apache/jmeter/JMeterVersionTest.java Sat Feb 20
13:21:01 2016
@@ -54,7 +54,6 @@ public class JMeterVersionTest extends J
JAR_TO_BUILD_PROP.put("bsf", "apache-bsf");
JAR_TO_BUILD_PROP.put("bsh", "beanshell");
JAR_TO_BUILD_PROP.put("geronimo-jms_1.1_spec", "jms");
- JAR_TO_BUILD_PROP.put("htmllexer", "htmlparser"); // two jars same
version
JAR_TO_BUILD_PROP.put("httpmime", "httpclient"); // two jars same
version
JAR_TO_BUILD_PROP.put("mail", "javamail");
JAR_TO_BUILD_PROP.put("oro", "jakarta-oro");
@@ -205,9 +204,6 @@ public class JMeterVersionTest extends J
for (Map.Entry<String, String> me : versions.entrySet()) {
final String key = me.getKey();
liceNames.add(key+"-"+me.getValue()+".txt");
- if (key.equals("htmlparser")) {
- liceNames.add("htmllexer"+"-"+me.getValue()+".txt");
- }
}
File licencesDir = getFileFromHome("licenses/bin");
String [] lice = licencesDir.list(new FilenameFilter() {
Modified:
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/test/src/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java?rev=1731400&r1=1731399&r2=1731400&view=diff
==============================================================================
---
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java
(original)
+++
jmeter/trunk/test/src/org/apache/jmeter/protocol/http/parser/TestHTMLParser.java
Sat Feb 20 13:21:01 2016
@@ -129,7 +129,6 @@ public class TestHTMLParser extends JMet
// List of parsers to test. Should probably be derived automatically
private static final String[] PARSERS = {
- "org.apache.jmeter.protocol.http.parser.HtmlParserHTMLParser",
"org.apache.jmeter.protocol.http.parser.JTidyHTMLParser",
"org.apache.jmeter.protocol.http.parser.RegexpHTMLParser",
DEFAULT_JMETER_PARSER,
Modified: jmeter/trunk/xdocs/changes.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/changes.xml?rev=1731400&r1=1731399&r2=1731400&view=diff
==============================================================================
--- jmeter/trunk/xdocs/changes.xml (original)
+++ jmeter/trunk/xdocs/changes.xml Sat Feb 20 13:21:01 2016
@@ -90,7 +90,8 @@ Summary
<li>org.apache.jmeter.protocol.http.visualizers.RequestViewHTTP.getQueryMap
signature has changed, if you use it ensure you update your code. See
<bugzilla>58845</bugzilla></li>
<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, 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>
</ul>
<!-- =================== Improvements =================== -->
@@ -208,6 +209,7 @@ Summary
<li><bug>58991</bug>Settings defaults : Switch
"jmeter.save.saveservice.print_field_names" to true (after 2.13)</li>
<li><bug>58987</bug>Report/Dashboard: Improve error reporting.</li>
<li><bug>58870</bug>TableEditor: minimum size is too small. Contributed by
Vincent Herilier (vherilier at gmail.com)</li>
+<li><bug>59037</bug>Drop HtmlParserHTMLParser and dependencies on htmlparser
and htmllexer</li>
</ul>
<ch_section>Non-functional changes</ch_section>
<ul>
Modified: jmeter/trunk/xdocs/usermanual/component_reference.xml
URL:
http://svn.apache.org/viewvc/jmeter/trunk/xdocs/usermanual/component_reference.xml?rev=1731400&r1=1731399&r2=1731400&view=diff
==============================================================================
--- jmeter/trunk/xdocs/usermanual/component_reference.xml (original)
+++ jmeter/trunk/xdocs/usermanual/component_reference.xml Sat Feb 20 13:21:01
2016
@@ -117,8 +117,8 @@ Latency is set to the time it takes to l
<li>background sound</li>
</ul>
<p>
- The default parser is htmlparser.
- This can be changed by using the property
"<code>htmlparser.classname</code>" - see <code>jmeter.properties</code> for
details.
+ The default parser is
<code>org.apache.jmeter.protocol.http.parser.LagartoBasedHtmlParser</code>.
+ This can be changed by using the property
"<code>htmlparser.className</code>" - see <code>jmeter.properties</code> for
details.
</p>
<p>If you are going to send multiple requests to the same web server,
consider
using an <complink name="HTTP Request Defaults"/>
@@ -419,9 +419,7 @@ defaults then nothing is sent.
If not using a file, attach a Header Manager to the sampler and define the
Content-Type there.
The <code>GET</code> and <code>DELETE</code> request methods work similarly to
each other.
</p>
-<p>Up to and including JMeter 2.1.1, only responses with the content-type
"<code>text/html</code>" were scanned for
-embedded resources. Other content-types were assumed to be something other
than HTML.
-JMeter 2.1.2 introduces the new property <code>HTTPResponse.parsers</code>,
which is a list of parser ids,
+<p>JMeter scan responses from embedded resources. It uses the property
<code>HTTPResponse.parsers</code>, which is a list of parser ids,
e.g. <code>htmlParser</code> and <code>wmlParser</code>. For each id found,
JMeter checks two further properties:</p>
<ul>
<li><code>id.types</code> - a list of content types</li>
