update package structure

webmagic-extension/src/main/java/us/codecraft/webmagic/model/ModelPipeline.java

@@ -2,6 +2,7 @@ package us.codecraft.webmagic.model;
 
 import us.codecraft.webmagic.ResultItems;
 import us.codecraft.webmagic.Task;
+import us.codecraft.webmagic.model.annotation.ExtractBy;
 import us.codecraft.webmagic.pipeline.Pipeline;
 
 import java.lang.annotation.Annotation;

webmagic-extension/src/main/java/us/codecraft/webmagic/model/PageModelExtractor.java

@@ -2,6 +2,7 @@ package us.codecraft.webmagic.model;
 
 import org.apache.commons.lang3.StringUtils;
 import us.codecraft.webmagic.Page;
+import us.codecraft.webmagic.model.annotation.*;
 import us.codecraft.webmagic.selector.*;
 
 import java.lang.annotation.Annotation;

webmagic-extension/src/main/java/us/codecraft/webmagic/model/annotation/ExtractBy.java

@@ -1,4 +1,4 @@
-package us.codecraft.webmagic.model;
+package us.codecraft.webmagic.model.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

webmagic-extension/src/main/java/us/codecraft/webmagic/model/annotation/ExtractBy2.java

@@ -1,4 +1,4 @@
-package us.codecraft.webmagic.model;
+package us.codecraft.webmagic.model.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

webmagic-extension/src/main/java/us/codecraft/webmagic/model/annotation/ExtractBy3.java

@@ -1,4 +1,4 @@
-package us.codecraft.webmagic.model;
+package us.codecraft.webmagic.model.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

webmagic-extension/src/main/java/us/codecraft/webmagic/model/annotation/ExtractByRaw.java

@@ -1,4 +1,4 @@
-package us.codecraft.webmagic.model;
+package us.codecraft.webmagic.model.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

webmagic-extension/src/main/java/us/codecraft/webmagic/model/annotation/ExtractByUrl.java

@@ -1,4 +1,4 @@
-package us.codecraft.webmagic.model;
+package us.codecraft.webmagic.model.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

webmagic-extension/src/main/java/us/codecraft/webmagic/model/annotation/HelpUrl.java

@@ -1,4 +1,4 @@
-package us.codecraft.webmagic.model;
+package us.codecraft.webmagic.model.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

webmagic-extension/src/main/java/us/codecraft/webmagic/model/annotation/TargetUrl.java

@@ -1,4 +1,4 @@
-package us.codecraft.webmagic.model;
+package us.codecraft.webmagic.model.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

webmagic-lucene/src/main/test/java/us/codecraft/webmagic/lucene/OschinaBlog.java

@@ -3,9 +3,9 @@ package us.codecraft.webmagic.lucene;
 import org.apache.lucene.document.Document;
 import org.apache.lucene.queryparser.classic.ParseException;
 import us.codecraft.webmagic.Site;
-import us.codecraft.webmagic.model.ExtractBy;
+import us.codecraft.webmagic.model.annotation.ExtractBy;
 import us.codecraft.webmagic.model.OOSpider;
-import us.codecraft.webmagic.model.TargetUrl;
+import us.codecraft.webmagic.model.annotation.TargetUrl;
 import us.codecraft.webmagic.pipeline.LucenePipeline;
 
 import java.io.IOException;

webmagic-samples/src/main/java/us/codecraft/webmagic/model/samples/IteyeBlog.java

@@ -1,9 +1,9 @@
 package us.codecraft.webmagic.model.samples;
 
 import us.codecraft.webmagic.Site;
-import us.codecraft.webmagic.model.ExtractBy;
+import us.codecraft.webmagic.model.annotation.ExtractBy;
 import us.codecraft.webmagic.model.OOSpider;
-import us.codecraft.webmagic.model.TargetUrl;
+import us.codecraft.webmagic.model.annotation.TargetUrl;
 
 /**
  * @author code4crafter@gmail.com <br>

webmagic-samples/src/main/java/us/codecraft/webmagic/model/samples/News163.java

@@ -3,6 +3,10 @@ package us.codecraft.webmagic.model.samples;
 import us.codecraft.webmagic.PagedModel;
 import us.codecraft.webmagic.Site;
 import us.codecraft.webmagic.model.*;
+import us.codecraft.webmagic.model.annotation.ExtractBy;
+import us.codecraft.webmagic.model.annotation.ExtractBy2;
+import us.codecraft.webmagic.model.annotation.ExtractByUrl;
+import us.codecraft.webmagic.model.annotation.TargetUrl;
 import us.codecraft.webmagic.pipeline.ConsolePipeline;
 import us.codecraft.webmagic.pipeline.PagedPipeline;
 import us.codecraft.webmagic.scheduler.RedisScheduler;

webmagic-samples/src/main/java/us/codecraft/webmagic/model/samples/OschinaAnswer.java

@@ -3,6 +3,9 @@ package us.codecraft.webmagic.model.samples;
 import us.codecraft.webmagic.Page;
 import us.codecraft.webmagic.Site;
 import us.codecraft.webmagic.model.*;
+import us.codecraft.webmagic.model.annotation.ExtractBy;
+import us.codecraft.webmagic.model.annotation.HelpUrl;
+import us.codecraft.webmagic.model.annotation.TargetUrl;
 
 /**
  * @author code4crafter@gmail.com <br>

webmagic-samples/src/main/java/us/codecraft/webmagic/model/samples/OschinaBlog.java

@@ -1,9 +1,9 @@
 package us.codecraft.webmagic.model.samples;
 
 import us.codecraft.webmagic.Site;
-import us.codecraft.webmagic.model.ExtractBy;
+import us.codecraft.webmagic.model.annotation.ExtractBy;
 import us.codecraft.webmagic.model.OOSpider;
-import us.codecraft.webmagic.model.TargetUrl;
+import us.codecraft.webmagic.model.annotation.TargetUrl;
 import us.codecraft.webmagic.pipeline.JsonFilePipeline;
 
 /**