Author: pmouawad
Date: Sun May 28 21:19:52 2017
New Revision: 1796542
URL: http://svn.apache.org/viewvc?rev=1796542&view=rev
Log:
Update jodd to 3.8.6 from 3.8.1
Modified:
jmeter/trunk/src/components/org/apache/jmeter/extractor/JoddExtractor.java
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java
Modified:
jmeter/trunk/src/components/org/apache/jmeter/extractor/JoddExtractor.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/components/org/apache/jmeter/extractor/JoddExtractor.java?rev=1796542&r1=1796541&r2=1796542&view=diff
==============================================================================
--- jmeter/trunk/src/components/org/apache/jmeter/extractor/JoddExtractor.java
(original)
+++ jmeter/trunk/src/components/org/apache/jmeter/extractor/JoddExtractor.java
Sun May 28 21:19:52 2017
@@ -20,14 +20,14 @@ package org.apache.jmeter.extractor;
import java.util.List;
+import org.apache.jmeter.threads.JMeterContextService;
+import org.apache.jorphan.util.JOrphanUtils;
+
import jodd.lagarto.dom.LagartoDOMBuilder;
import jodd.lagarto.dom.Node;
import jodd.lagarto.dom.NodeSelector;
import jodd.log.LoggerFactory;
-import jodd.log.impl.Slf4jLoggerFactory;
-
-import org.apache.jmeter.threads.JMeterContextService;
-import org.apache.jorphan.util.JOrphanUtils;
+import jodd.log.impl.Slf4jLogger;
/**
* Jodd-Lagerto based CSS/JQuery extractor
@@ -44,7 +44,7 @@ public class JoddExtractor implements Ex
private static final String CACHE_KEY_PREFIX =
JoddExtractor.class.getName()+"_PARSED_BODY";
static {
- LoggerFactory.setLoggerFactory(new Slf4jLoggerFactory());
+ LoggerFactory.setLoggerProvider(Slf4jLogger.PROVIDER);
}
/**
Modified:
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java
URL:
http://svn.apache.org/viewvc/jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java?rev=1796542&r1=1796541&r2=1796542&view=diff
==============================================================================
---
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java
(original)
+++
jmeter/trunk/src/protocol/http/org/apache/jmeter/protocol/http/parser/LagartoBasedHtmlParser.java
Sun May 28 21:19:52 2017
@@ -37,7 +37,7 @@ import jodd.lagarto.TagType;
import jodd.lagarto.TagUtil;
import jodd.lagarto.dom.HtmlCCommentExpressionMatcher;
import jodd.log.LoggerFactory;
-import jodd.log.impl.Slf4jLoggerFactory;
+import jodd.log.impl.Slf4jLogger;
/**
* Parser based on Lagarto
@@ -46,7 +46,7 @@ import jodd.log.impl.Slf4jLoggerFactory;
public class LagartoBasedHtmlParser extends HTMLParser {
private static final Logger log =
org.slf4j.LoggerFactory.getLogger(LagartoBasedHtmlParser.class);
static {
- LoggerFactory.setLoggerFactory(new Slf4jLoggerFactory());
+ LoggerFactory.setLoggerProvider(Slf4jLogger.PROVIDER);
}
/*
