转为maven webapp

seaswalker · Feb 15, 2017 · 5b9fb26 · 5b9fb26
1 parent 776b378
commit 5b9fb26
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 12 deletions.
diff --git 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
@@ -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>
+</project>
diff --git a/src/main/resource/config.xml → src/main/resources/config.xml b/src/main/resource/config.xml → src/main/resources/config.xml
diff --git a/src/main/resource/property.properties → src/main/resources/property.properties b/src/main/resource/property.properties → src/main/resources/property.properties
diff --git a/...source/resource/resource_en_US.properties → ...ources/resource/resource_en_US.properties b/...source/resource/resource_en_US.properties → ...ources/resource/resource_en_US.properties
diff --git a/...source/resource/resource_zh_CN.properties → ...ources/resource/resource_zh_CN.properties b/...source/resource/resource_zh_CN.properties → ...ources/resource/resource_zh_CN.properties
diff --git a/src/main/webapp/WEB-INF/web.xml 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
@@ -0,0 +1,5 @@
+<html>
+<body>
+<h2>Hello World!</h2>
+</body>
+</html>