From 5b9fb26d75a5163c8d3aad825a3a26defc99fb82 Mon Sep 17 00:00:00 2001
From: skywalker <xsdwem7@hotmail.com>
Date: Wed, 15 Feb 2017 17:13:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AC=E4=B8=BAmaven=20webapp?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |  2 +-
 pom.xml                                       | 29 ++++++++++++-------
 src/main/{resource => resources}/config.xml   |  0
 .../property.properties                       |  0
 .../resource/resource_en_US.properties        |  0
 .../resource/resource_zh_CN.properties        |  0
 src/main/webapp/WEB-INF/web.xml               |  7 +++++
 src/main/webapp/index.jsp                     |  5 ++++
 8 files changed, 31 insertions(+), 12 deletions(-)
 rename src/main/{resource => resources}/config.xml (100%)
 rename src/main/{resource => resources}/property.properties (100%)
 rename src/main/{resource => resources}/resource/resource_en_US.properties (100%)
 rename src/main/{resource => resources}/resource/resource_zh_CN.properties (100%)
 create mode 100644 src/main/webapp/WEB-INF/web.xml
 create mode 100644 src/main/webapp/index.jsp

diff --git a/.gitignore b/.gitignore
index c725bf8..2d4f9a2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,4 +12,4 @@ target/
 # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
 hs_err_pid*
 /.idea/
-/Spring.iml
+/spring.iml
diff --git a/pom.xml b/pom.xml
index f39425f..af58069 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1,23 +1,23 @@
-<?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">
+<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>skywalker</groupId>
-    <artifactId>Spring</artifactId>
-    <version>0.0.1-SNAPSHOT</version>
+    <artifactId>spring</artifactId>
     <build>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
                 <configuration>
-                    <source>1.6</source>
-                    <target>1.6</target>
+                    <source>1.8</source>
+                    <target>1.8</target>
                 </configuration>
             </plugin>
         </plugins>
     </build>
-    <packaging>jar</packaging>
-    <name>Spring</name>
+    <packaging>war</packaging>
+    <version>1.0-SNAPSHOT</version>
+    <name>spring Maven Webapp</name>
     <url>http://maven.apache.org</url>
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -49,10 +49,17 @@
             <artifactId>spring-tx</artifactId>
             <version>${spring-version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.springframework</groupId>
+            <artifactId>spring-webmvc</artifactId>
+            <version>${spring-version}</version>
+        </dependency>
+
         <dependency>
             <groupId>javax.servlet</groupId>
-            <artifactId>servlet-api</artifactId>
-            <version>2.5</version>
+            <artifactId>javax.servlet-api</artifactId>
+            <version>3.1.0</version>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.aspectj</groupId>
@@ -87,4 +94,4 @@
             <version>5.1.20</version>
         </dependency>
     </dependencies>
-</project>
\ No newline at end of file
+</project>
diff --git a/src/main/resource/config.xml b/src/main/resources/config.xml
similarity index 100%
rename from src/main/resource/config.xml
rename to src/main/resources/config.xml
diff --git a/src/main/resource/property.properties b/src/main/resources/property.properties
similarity index 100%
rename from src/main/resource/property.properties
rename to src/main/resources/property.properties
diff --git a/src/main/resource/resource/resource_en_US.properties b/src/main/resources/resource/resource_en_US.properties
similarity index 100%
rename from src/main/resource/resource/resource_en_US.properties
rename to src/main/resources/resource/resource_en_US.properties
diff --git a/src/main/resource/resource/resource_zh_CN.properties b/src/main/resources/resource/resource_zh_CN.properties
similarity index 100%
rename from src/main/resource/resource/resource_zh_CN.properties
rename to src/main/resources/resource/resource_zh_CN.properties
diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000..9f88c1f
--- /dev/null
+++ b/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,7 @@
+<!DOCTYPE web-app PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd" >
+
+<web-app>
+  <display-name>Archetype Created Web Application</display-name>
+</web-app>
diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp
new file mode 100644
index 0000000..c38169b
--- /dev/null
+++ b/src/main/webapp/index.jsp
@@ -0,0 +1,5 @@
+<html>
+<body>
+<h2>Hello World!</h2>
+</body>
+</html>