From 29f8cd2ec6b70c4a168d71429918e77a7c303465 Mon Sep 17 00:00:00 2001
From: "yihua.huang" <code4crafter@gmail.com>
Date: Tue, 6 Aug 2013 21:26:03 +0800
Subject: [PATCH] change freemarker dep to samples

---
 webmagic-plugin/webmagic-misc/pom.xml         |  5 ----
 .../src/main/resources/ftl/wordpress.ftl      | 23 -------------------
 .../webmagic/FreemarkerPipelineTest.java      | 19 ---------------
 webmagic-samples/pom.xml                      |  5 ++++
 .../webmagic/pipeline/FreemarkerPipeline.java |  0
 5 files changed, 5 insertions(+), 47 deletions(-)
 delete mode 100644 webmagic-plugin/webmagic-misc/src/main/resources/ftl/wordpress.ftl
 delete mode 100644 webmagic-plugin/webmagic-misc/src/test/java/us/codecraft/webmagic/FreemarkerPipelineTest.java
 rename {webmagic-plugin/webmagic-misc => webmagic-samples}/src/main/java/us/codecraft/webmagic/pipeline/FreemarkerPipeline.java (100%)

diff --git a/webmagic-plugin/webmagic-misc/pom.xml b/webmagic-plugin/webmagic-misc/pom.xml
index 4d8776c..98b7c77 100644
--- a/webmagic-plugin/webmagic-misc/pom.xml
+++ b/webmagic-plugin/webmagic-misc/pom.xml
@@ -12,11 +12,6 @@
     <artifactId>webmagic-misc</artifactId>
 
     <dependencies>
-        <dependency>
-            <groupId>org.freemarker</groupId>
-            <artifactId>freemarker</artifactId>
-            <version>2.3.15</version>
-        </dependency>
         <dependency>
             <groupId>org.resthub</groupId>
             <artifactId>hessian</artifactId>
diff --git a/webmagic-plugin/webmagic-misc/src/main/resources/ftl/wordpress.ftl b/webmagic-plugin/webmagic-misc/src/main/resources/ftl/wordpress.ftl
deleted file mode 100644
index 61820b7..0000000
--- a/webmagic-plugin/webmagic-misc/src/main/resources/ftl/wordpress.ftl
+++ /dev/null
@@ -1,23 +0,0 @@
-<item>
-    <title>$it.Title</title>
-    <link>http://127.0.0.1/wordpress/?p=$it.Id</link>
-    <pubDate>${date}</pubDate>
-    <dc:creator>admin</dc:creator>
-    <guid isPermaLink="false">http://127.0.0.1/wordpress/?p=$it.Id</guid>
-    <description></description>
-    <content:encoded><![CDATA[${text}]]></content:encoded>
-    <excerpt:encoded><![CDATA[]]></excerpt:encoded>
-    <#--<wp:post_id>$it.Id</wp:post_id>-->
-    <wp:post_date>${date}</wp:post_date>
-    <wp:post_date_gmt>${date}</wp:post_date_gmt>
-    <wp:comment_status>open</wp:comment_status>
-    <wp:ping_status>open</wp:ping_status>
-    <wp:post_name>${title}</wp:post_name>
-    <wp:status>publish</wp:status>
-    <wp:post_parent>0</wp:post_parent>
-    <wp:menu_order>0</wp:menu_order>
-    <wp:post_type>post</wp:post_type>
-    <wp:post_password></wp:post_password>
-    <wp:is_sticky>0</wp:is_sticky>
-    $tags
-</item>
\ No newline at end of file
diff --git a/webmagic-plugin/webmagic-misc/src/test/java/us/codecraft/webmagic/FreemarkerPipelineTest.java b/webmagic-plugin/webmagic-misc/src/test/java/us/codecraft/webmagic/FreemarkerPipelineTest.java
deleted file mode 100644
index 8ceb99f..0000000
--- a/webmagic-plugin/webmagic-misc/src/test/java/us/codecraft/webmagic/FreemarkerPipelineTest.java
+++ /dev/null
@@ -1,19 +0,0 @@
-package us.codecraft.webmagic;
-
-import org.junit.Test;
-import us.codecraft.webmagic.pipeline.FreemarkerPipeline;
-
-import java.io.IOException;
-
-/**
- * @author code4crafter@gmail.com <br>
- * Date: 13-6-9
- * Time: 上午7:14
- */
-public class FreemarkerPipelineTest {
-
-    @Test
-    public void testTemplateLoad() throws IOException {
-        new FreemarkerPipeline("wordpress.ftl");
-    }
-}
diff --git a/webmagic-samples/pom.xml b/webmagic-samples/pom.xml
index 8a7e00c..a38e872 100644
--- a/webmagic-samples/pom.xml
+++ b/webmagic-samples/pom.xml
@@ -27,6 +27,11 @@
             <artifactId>webmagic-selenium</artifactId>
             <version>${project.version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.freemarker</groupId>
+            <artifactId>freemarker</artifactId>
+            <version>2.3.15</version>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
diff --git a/webmagic-plugin/webmagic-misc/src/main/java/us/codecraft/webmagic/pipeline/FreemarkerPipeline.java b/webmagic-samples/src/main/java/us/codecraft/webmagic/pipeline/FreemarkerPipeline.java
similarity index 100%
rename from webmagic-plugin/webmagic-misc/src/main/java/us/codecraft/webmagic/pipeline/FreemarkerPipeline.java
rename to webmagic-samples/src/main/java/us/codecraft/webmagic/pipeline/FreemarkerPipeline.java