update packages structure

pom.xml

@@ -10,7 +10,7 @@
 
     <modules>  
     <module>webmagic-core</module>
-    <module>webmagic-plugin/</module>
+    <module>webmagic-extension/</module>
     <module>webmagic-samples/</module>
     </modules>
 

webmagic-extension/pom.xml

@@ -4,12 +4,12 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <groupId>us.codecraft</groupId>
-        <artifactId>webmagic-plugin</artifactId>
+        <artifactId>webmagic</artifactId>
         <version>0.1.0</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>webmagic-misc</artifactId>
+    <artifactId>webmagic-extension</artifactId>
 
     <dependencies>
         <dependency>
@@ -27,6 +27,15 @@
             <artifactId>selenium-java</artifactId>
             <version>2.33.0</version>
         </dependency>
+        <dependency>
+            <groupId>us.codecraft</groupId>
+            <artifactId>webmagic-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
     </dependencies>
 
 </project>

webmagic-lucene/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>webmagic-plugin</artifactId>
+        <artifactId>webmagic</artifactId>
         <groupId>us.codecraft</groupId>
         <version>0.1.0</version>
     </parent>
@@ -22,6 +22,15 @@
             <artifactId>lucene-queryparser</artifactId>
             <version>4.4.0</version>
         </dependency>
+        <dependency>
+            <groupId>us.codecraft</groupId>
+            <artifactId>webmagic-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+        </dependency>
     </dependencies>
 
 

webmagic-plugin/README.md

@@ -1,6 +0,0 @@
-webmagic-plugin
--------
-webmagic的插件模块。
-目前仅实现了freemarker模板渲染，和redis实现分布式爬虫。
-
-另外有一个使用Selenium来动态渲染页面的模块在开发中。

webmagic-plugin/pom.xml

@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <groupId>us.codecraft</groupId>
-        <artifactId>webmagic</artifactId>
-        <version>0.1.0</version>
-    </parent>
-    <packaging>pom</packaging>
-    <modelVersion>4.0.0</modelVersion>
-    <modules>
-        <module>webmagic-misc</module>
-        <module>webmagic-selenium</module>
-        <module>webmagic-lucene</module>
-    </modules>
-
-    <artifactId>webmagic-plugin</artifactId>
-
-    <dependencies>
-        <dependency>
-            <groupId>us.codecraft</groupId>
-            <artifactId>webmagic-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-        </dependency>
-    </dependencies>
-
-</project>

webmagic-samples/pom.xml

@@ -19,7 +19,7 @@
         </dependency>
         <dependency>
             <groupId>us.codecraft</groupId>
-            <artifactId>webmagic-misc</artifactId>
+            <artifactId>webmagic-extension</artifactId>
             <version>${project.version}</version>
         </dependency>
         <dependency>