refactor
diff --git a/freemarker-tutorial/pom.xml b/freemarker-tutorial/pom.xml
index 6e968d6..22b1f09 100644
--- a/freemarker-tutorial/pom.xml
+++ b/freemarker-tutorial/pom.xml
@@ -1,56 +1,76 @@
<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/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <groupId>com.ekingstar</groupId>
- <artifactId>freemarker-quickstart</artifactId>
- <packaging>war</packaging>
- <version>0.0.1-SNAPSHOT</version>
- <name>Freemarker Quickstart Webapp</name>
- <url>http://maven.apache.org</url>
- <dependencies>
- <dependency>
- <groupId>com.jfinal</groupId>
- <artifactId>jfinal</artifactId>
- <version>1.6</version>
- </dependency>
- <dependency>
- <groupId>org.freemarker</groupId>
- <artifactId>freemarker</artifactId>
- <version>2.3.20</version>
- </dependency>
- <dependency>
- <groupId>com.jfinal</groupId>
- <artifactId>jetty-server</artifactId>
- <version>8.1.8</version>
- </dependency>
- <dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.16</version>
- </dependency>
- </dependencies>
- <build>
- <finalName>freemarker_demo</finalName>
- <plugins>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-maven-plugin</artifactId>
- <version>8.1.8.v20121106</version>
- <configuration>
- <stopKey>stop</stopKey>
- <stopPort>5599</stopPort>
- <webAppConfig>
- <contextPath>/</contextPath>
- </webAppConfig>
- <scanIntervalSeconds>5</scanIntervalSeconds>
- <connectors>
- <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
- <port>8080</port>
- <maxIdleTime>60000</maxIdleTime>
- </connector>
- </connectors>
- </configuration>
- </plugin>
- </plugins>
- </build>
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>com.supwisdom.tutorial</groupId>
+ <artifactId>freemarker-tutorial</artifactId>
+ <packaging>war</packaging>
+ <version>1.0-SNAPSHOT</version>
+ <name>Freemarker Tutorial Webapp</name>
+ <url>http://maven.apache.org</url>
+
+ <properties>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
+ <distributionManagement>
+ <repository>
+ <id>ekingstar-releases</id>
+ <name>internal release</name>
+ <url>http://app.supwisdom.com:81/artifactory/libs-release-local</url>
+ </repository>
+ <snapshotRepository>
+ <id>ekingstar-snapshots</id>
+ <name>internal Snapshots</name>
+ <url>http://app.supwisdom.com:81/artifactory/libs-snapshot-local</url>
+ </snapshotRepository>
+ <downloadUrl>http://app.supwisdom.com:81/artifactory</downloadUrl>
+ </distributionManagement>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>com.jfinal</groupId>
+ <artifactId>jfinal</artifactId>
+ <version>1.6</version>
+ </dependency>
+ <dependency>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <version>2.3.20</version>
+ </dependency>
+ <dependency>
+ <groupId>com.jfinal</groupId>
+ <artifactId>jetty-server</artifactId>
+ <version>8.1.8</version>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.16</version>
+ </dependency>
+ </dependencies>
+ <build>
+ <finalName>freemarker_demo</finalName>
+ <plugins>
+ <plugin>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jetty-maven-plugin</artifactId>
+ <version>8.1.8.v20121106</version>
+ <configuration>
+ <stopKey>stop</stopKey>
+ <stopPort>5599</stopPort>
+ <webAppConfig>
+ <contextPath>/</contextPath>
+ </webAppConfig>
+ <scanIntervalSeconds>5</scanIntervalSeconds>
+ <connectors>
+ <connector implementation="org.eclipse.jetty.server.nio.SelectChannelConnector">
+ <port>8080</port>
+ <maxIdleTime>60000</maxIdleTime>
+ </connector>
+ </connectors>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
</project>
diff --git a/freemarker-tutorial/src/main/java/com/ekingstar/common/DefaultConfig.java b/freemarker-tutorial/src/main/java/com/supwisdom/tutorial/freemarker/DefaultConfig.java
similarity index 95%
rename from freemarker-tutorial/src/main/java/com/ekingstar/common/DefaultConfig.java
rename to freemarker-tutorial/src/main/java/com/supwisdom/tutorial/freemarker/DefaultConfig.java
index fb43d17..d418e54 100644
--- a/freemarker-tutorial/src/main/java/com/ekingstar/common/DefaultConfig.java
+++ b/freemarker-tutorial/src/main/java/com/supwisdom/tutorial/freemarker/DefaultConfig.java
@@ -1,4 +1,4 @@
-package com.ekingstar.common;
+package com.supwisdom.tutorial.freemarker;
import com.jfinal.config.Constants;
import com.jfinal.config.Handlers;
diff --git a/freemarker-tutorial/src/main/java/com/ekingstar/common/DefaultController.java b/freemarker-tutorial/src/main/java/com/supwisdom/tutorial/freemarker/DefaultController.java
similarity index 80%
rename from freemarker-tutorial/src/main/java/com/ekingstar/common/DefaultController.java
rename to freemarker-tutorial/src/main/java/com/supwisdom/tutorial/freemarker/DefaultController.java
index d63ad07..73753d7 100644
--- a/freemarker-tutorial/src/main/java/com/ekingstar/common/DefaultController.java
+++ b/freemarker-tutorial/src/main/java/com/supwisdom/tutorial/freemarker/DefaultController.java
@@ -1,4 +1,4 @@
-package com.ekingstar.common;
+package com.supwisdom.tutorial.freemarker;
import com.jfinal.core.Controller;
diff --git a/freemarker-tutorial/src/main/webapp/WEB-INF/web.xml b/freemarker-tutorial/src/main/webapp/WEB-INF/web.xml
index 69687b6..50aa44f 100644
--- a/freemarker-tutorial/src/main/webapp/WEB-INF/web.xml
+++ b/freemarker-tutorial/src/main/webapp/WEB-INF/web.xml
@@ -5,7 +5,7 @@
<filter-class>com.jfinal.core.JFinalFilter</filter-class>
<init-param>
<param-name>configClass</param-name>
- <param-value>com.ekingstar.common.DefaultConfig</param-value>
+ <param-value>com.supwisdom.tutorial.freemarker.DefaultConfig</param-value>
</init-param>
</filter>
<filter-mapping>