diff --git a/pom.xml b/pom.xml
index 5033977b..1497bb0c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,10 +8,12 @@
pom
webmagic
-
- webmagic-core
- webmagic-extension/
- webmagic-samples/
+
+ webmagic-core
+ webmagic-extension/
+ webmagic-samples/
+ webmagic-selenium/
+ webmagic-lucene/
@@ -143,5 +145,4 @@
-
diff --git a/webmagic-extension/pom.xml b/webmagic-extension/pom.xml
index 2a3590d3..63034f23 100644
--- a/webmagic-extension/pom.xml
+++ b/webmagic-extension/pom.xml
@@ -22,11 +22,6 @@
jedis
2.0.0
-
- org.seleniumhq.selenium
- selenium-java
- 2.33.0
-
us.codecraft
webmagic-core
diff --git a/webmagic-samples/assembly.xml b/webmagic-samples/assembly.xml
deleted file mode 100644
index 83370a25..00000000
--- a/webmagic-samples/assembly.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
- jar-with-dependencies
-
- jar
-
- false
-
-
- ${project.basedir}/target/classes
- /
-
-
-
-
- false
-
-
-
\ No newline at end of file
diff --git a/webmagic-selenium/README.md b/webmagic-selenium/README.md
new file mode 100644
index 00000000..71d3c48b
--- /dev/null
+++ b/webmagic-selenium/README.md
@@ -0,0 +1,3 @@
+webmagic-extension
+-------
+webmagic的扩展模块。包括注解格式定义爬虫、JSON、分布式等支持。
\ No newline at end of file
diff --git a/webmagic-selenium/pom.xml b/webmagic-selenium/pom.xml
new file mode 100644
index 00000000..814b7b31
--- /dev/null
+++ b/webmagic-selenium/pom.xml
@@ -0,0 +1,31 @@
+
+
+
+ us.codecraft
+ webmagic
+ 0.2.0
+
+ 4.0.0
+
+ webmagic-selenium
+
+
+
+ org.seleniumhq.selenium
+ selenium-java
+ 2.33.0
+
+
+ us.codecraft
+ webmagic-core
+ ${project.version}
+
+
+ junit
+ junit
+
+
+
+
\ No newline at end of file
diff --git a/webmagic-extension/src/main/java/us/codecraft/webmagic/downloader/selenium/SeleniumDownloader.java b/webmagic-selenium/src/main/java/us/codecraft/webmagic/downloader/selenium/SeleniumDownloader.java
similarity index 100%
rename from webmagic-extension/src/main/java/us/codecraft/webmagic/downloader/selenium/SeleniumDownloader.java
rename to webmagic-selenium/src/main/java/us/codecraft/webmagic/downloader/selenium/SeleniumDownloader.java
diff --git a/webmagic-extension/src/main/java/us/codecraft/webmagic/downloader/selenium/WebDriverPool.java b/webmagic-selenium/src/main/java/us/codecraft/webmagic/downloader/selenium/WebDriverPool.java
similarity index 100%
rename from webmagic-extension/src/main/java/us/codecraft/webmagic/downloader/selenium/WebDriverPool.java
rename to webmagic-selenium/src/main/java/us/codecraft/webmagic/downloader/selenium/WebDriverPool.java
diff --git a/webmagic-extension/src/test/java/us/codecraft/webmagic/downloader/SeleniumTest.java b/webmagic-selenium/src/test/java/us/codecraft/webmagic/downloader/SeleniumTest.java
similarity index 100%
rename from webmagic-extension/src/test/java/us/codecraft/webmagic/downloader/SeleniumTest.java
rename to webmagic-selenium/src/test/java/us/codecraft/webmagic/downloader/SeleniumTest.java
diff --git a/webmagic-extension/src/test/java/us/codecraft/webmagic/downloader/selenium/SeleniumDownloaderTest.java b/webmagic-selenium/src/test/java/us/codecraft/webmagic/downloader/selenium/SeleniumDownloaderTest.java
similarity index 100%
rename from webmagic-extension/src/test/java/us/codecraft/webmagic/downloader/selenium/SeleniumDownloaderTest.java
rename to webmagic-selenium/src/test/java/us/codecraft/webmagic/downloader/selenium/SeleniumDownloaderTest.java
diff --git a/webmagic-extension/src/test/java/us/codecraft/webmagic/downloader/selenium/WebDriverPoolTest.java b/webmagic-selenium/src/test/java/us/codecraft/webmagic/downloader/selenium/WebDriverPoolTest.java
similarity index 100%
rename from webmagic-extension/src/test/java/us/codecraft/webmagic/downloader/selenium/WebDriverPoolTest.java
rename to webmagic-selenium/src/test/java/us/codecraft/webmagic/downloader/selenium/WebDriverPoolTest.java
diff --git a/webmagic-samples/src/main/java/us/codecraft/webmagic/samples/selenium/HuabanProcessor.java b/webmagic-selenium/src/test/java/us/codecraft/webmagic/samples/HuabanProcessor.java
similarity index 89%
rename from webmagic-samples/src/main/java/us/codecraft/webmagic/samples/selenium/HuabanProcessor.java
rename to webmagic-selenium/src/test/java/us/codecraft/webmagic/samples/HuabanProcessor.java
index dfff0c6c..6b3d8a07 100644
--- a/webmagic-samples/src/main/java/us/codecraft/webmagic/samples/selenium/HuabanProcessor.java
+++ b/webmagic-selenium/src/test/java/us/codecraft/webmagic/samples/HuabanProcessor.java
@@ -1,4 +1,4 @@
-package us.codecraft.webmagic.samples.selenium;
+package us.codecraft.webmagic.samples;
import us.codecraft.webmagic.Page;
import us.codecraft.webmagic.Site;
@@ -6,7 +6,6 @@ import us.codecraft.webmagic.Spider;
import us.codecraft.webmagic.downloader.selenium.SeleniumDownloader;
import us.codecraft.webmagic.pipeline.FilePipeline;
import us.codecraft.webmagic.processor.PageProcessor;
-import us.codecraft.webmagic.scheduler.RedisScheduler;
/**
* 花瓣网抽取器。
@@ -39,7 +38,6 @@ public class HuabanProcessor implements PageProcessor {
public static void main(String[] args) {
Spider.create(new HuabanProcessor()).thread(5)
- .scheduler(new RedisScheduler("localhost"))
.pipeline(new FilePipeline("/data/webmagic/test/"))
.downloader(new SeleniumDownloader("/Users/yihua/Downloads/chromedriver"))
.runAsync();