Mobai
/
magic-Dependency
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mark slf4j-log4j12 as optional.

master
Sutra Zhou 2020-05-21 19:59:29 +08:00
parent 30667f4687
commit ba1b4017a7
7 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
webmagic-core/pom.xml
View File

@ -48,6 +48,7 @@
<dependency> <dependency>
<groupId>org.slf4j</groupId> <groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId> <artifactId>slf4j-log4j12</artifactId>
<optional>true</optional>
</dependency> </dependency>
<dependency> <dependency>

6
webmagic-extension/src/main/java/us/codecraft/webmagic/example/PatternProcessorExample.java
View File

@ -1,6 +1,8 @@
package us.codecraft.webmagic.example; package us.codecraft.webmagic.example;
import org.apache.log4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import us.codecraft.webmagic.*; import us.codecraft.webmagic.*;
import us.codecraft.webmagic.handler.CompositePageProcessor; import us.codecraft.webmagic.handler.CompositePageProcessor;
import us.codecraft.webmagic.handler.CompositePipeline; import us.codecraft.webmagic.handler.CompositePipeline;
@ -15,7 +17,7 @@ import us.codecraft.webmagic.handler.RequestMatcher;
*/ */
public class PatternProcessorExample { public class PatternProcessorExample {
private static Logger log = Logger.getLogger(PatternProcessorExample.class); private static Logger log = LoggerFactory.getLogger(PatternProcessorExample.class);
public static void main(String... args) { public static void main(String... args) {

5
webmagic-saxon/src/main/java/us/codecraft/webmagic/selector/Xpath2Selector.java
View File

@ -2,11 +2,12 @@ package us.codecraft.webmagic.selector;
import net.sf.saxon.lib.NamespaceConstant; import net.sf.saxon.lib.NamespaceConstant;
import net.sf.saxon.xpath.XPathEvaluator; import net.sf.saxon.xpath.XPathEvaluator;
import org.apache.log4j.Logger;
import org.htmlcleaner.CleanerProperties; import org.htmlcleaner.CleanerProperties;
import org.htmlcleaner.DomSerializer; import org.htmlcleaner.DomSerializer;
import org.htmlcleaner.HtmlCleaner; import org.htmlcleaner.HtmlCleaner;
import org.htmlcleaner.TagNode; import org.htmlcleaner.TagNode;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Document; import org.w3c.dom.Document;
import org.w3c.dom.Node; import org.w3c.dom.Node;
import org.w3c.dom.NodeList; import org.w3c.dom.NodeList;
@ -40,7 +41,7 @@ public class Xpath2Selector implements Selector {
private XPathExpression xPathExpression; private XPathExpression xPathExpression;
private Logger logger = Logger.getLogger(getClass()); private Logger logger = LoggerFactory.getLogger(getClass());
public Xpath2Selector(String xpathStr) { public Xpath2Selector(String xpathStr) {
this.xpathStr = xpathStr; this.xpathStr = xpathStr;

4
webmagic-scripts/pom.xml
View File

@ -49,6 +49,10 @@
<artifactId>webmagic-core</artifactId> <artifactId>webmagic-core</artifactId>
<version>${project.version}</version> <version>${project.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
<dependency> <dependency>
<groupId>us.codecraft</groupId> <groupId>us.codecraft</groupId>
<artifactId>webmagic-extension</artifactId> <artifactId>webmagic-extension</artifactId>

6
webmagic-selenium/src/main/java/us/codecraft/webmagic/downloader/selenium/SeleniumDownloader.java
View File

@ -1,10 +1,12 @@
package us.codecraft.webmagic.downloader.selenium; package us.codecraft.webmagic.downloader.selenium;
import org.apache.log4j.Logger;
import org.openqa.selenium.By; import org.openqa.selenium.By;
import org.openqa.selenium.Cookie; import org.openqa.selenium.Cookie;
import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebDriver;
import org.openqa.selenium.WebElement; import org.openqa.selenium.WebElement;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import us.codecraft.webmagic.Page; import us.codecraft.webmagic.Page;
import us.codecraft.webmagic.Request; import us.codecraft.webmagic.Request;
import us.codecraft.webmagic.Site; import us.codecraft.webmagic.Site;
@ -29,7 +31,7 @@ public class SeleniumDownloader implements Downloader, Closeable {
private volatile WebDriverPool webDriverPool; private volatile WebDriverPool webDriverPool;
private Logger logger = Logger.getLogger(getClass()); private Logger logger = LoggerFactory.getLogger(getClass());
private int sleepTime = 0; private int sleepTime = 0;

5
webmagic-selenium/src/main/java/us/codecraft/webmagic/downloader/selenium/WebDriverPool.java
View File

@ -1,6 +1,5 @@
package us.codecraft.webmagic.downloader.selenium; package us.codecraft.webmagic.downloader.selenium;
import org.apache.log4j.Logger;
import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebDriver;
import org.openqa.selenium.chrome.ChromeDriver; import org.openqa.selenium.chrome.ChromeDriver;
import org.openqa.selenium.firefox.FirefoxDriver; import org.openqa.selenium.firefox.FirefoxDriver;
@ -8,6 +7,8 @@ import org.openqa.selenium.phantomjs.PhantomJSDriver;
import org.openqa.selenium.phantomjs.PhantomJSDriverService; import org.openqa.selenium.phantomjs.PhantomJSDriverService;
import org.openqa.selenium.remote.DesiredCapabilities; import org.openqa.selenium.remote.DesiredCapabilities;
import org.openqa.selenium.remote.RemoteWebDriver; import org.openqa.selenium.remote.RemoteWebDriver;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.FileReader; import java.io.FileReader;
import java.io.IOException; import java.io.IOException;
@ -27,7 +28,7 @@ import java.util.concurrent.atomic.AtomicInteger;
* Time: 下午1:41 <br> * Time: 下午1:41 <br>
*/ */
class WebDriverPool { class WebDriverPool {
private Logger logger = Logger.getLogger(getClass()); private Logger logger = LoggerFactory.getLogger(getClass());
private final static int DEFAULT_CAPACITY = 5; private final static int DEFAULT_CAPACITY = 5;