ityouknow 8 years ago
parent
commit
9d18d3e686

+ 1 - 1
README.md

@@ -5,7 +5,6 @@ Spring boot使用的各种示例,以最简单、最实用为标准
 
 
 - [spring-boot-helloworld](https://github.com/ityouknow/spring-boot-starter/tree/master/spring-boot-helloworld):spring-boot的helloWorld版本
-- [spring-boot-helloworld-war](https://github.com/ityouknow/spring-boot-starter/tree/master/spring-boot-helloworld-war):spring-boot打包成war包示例
 - [spring-boot-mybaits-annotation](https://github.com/ityouknow/spring-boot-starter/tree/master/spring-boot-mybatis-annotation):注解版本
 - [spring-boot-mybaits-xml](https://github.com/ityouknow/spring-boot-starter/tree/master/spring-boot-mybatis-xml):xml配置版本
 - [spring-boot-mybatis-mulidatasource](https://github.com/ityouknow/spring-boot-starter/tree/master/spring-boot-mybatis-mulidatasource):springboot+mybatis多数据源最简解决方案
@@ -16,6 +15,7 @@ Spring boot使用的各种示例,以最简单、最实用为标准
 - [spring-boot-mail](https://github.com/ityouknow/spring-boot-starter/tree/master/spring-boot-mail):spring boot和邮件服务
 - [spring-boot-mongodb](https://github.com/ityouknow/spring-boot-starter/tree/master/spring-boot-mongodb):spring boot和mongodb的使用
 - [spring-boot-multi-mongodb](https://github.com/ityouknow/spring-boot-starter/tree/master/spring-boot-multi-mongodb):spring boot和mongodb多数据源的使用
+- [spring-boot-package-war](https://github.com/ityouknow/spring-boot-starter/tree/master/spring-boot-package-war):spring-boot打包成war包示例
 - [Favorites-web](https://github.com/cloudfavorites/favorites-web):云收藏(springboot实战开源软件)
 
 

+ 9 - 16
spring-boot-helloworld-war/pom.xml → spring-boot-package-war/pom.xml

@@ -4,11 +4,11 @@
 	<modelVersion>4.0.0</modelVersion>
 
 	<groupId>com.neo</groupId>
-	<artifactId>spring-boot-helloworld-war</artifactId>
+	<artifactId>spring-boot-package-war</artifactId>
 	<version>0.0.1-SNAPSHOT</version>
 	<packaging>war</packaging>
 
-	<name>spring-boot-helloworld-war</name>
+	<name>spring-boot-package-war</name>
 	<description>Demo project for Spring Boot package war</description>
 
 	<parent>
@@ -36,26 +36,19 @@
 		</dependency>
 		
 		<dependency>
-	        <groupId>org.springframework.boot</groupId>
-	        <artifactId>spring-boot-starter-web</artifactId>
-			<exclusions>
-				<exclusion>
-					<groupId>org.springframework.boot</groupId>
-					<artifactId>spring-boot-starter-tomcat</artifactId>
-				</exclusion>
-			</exclusions>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-web</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework.boot</groupId>
+			<artifactId>spring-boot-starter-tomcat</artifactId>
+			<scope>provided</scope>
 		</dependency>
 	     <dependency>
 	        <groupId>org.springframework.boot</groupId>
 	        <artifactId>spring-boot-devtools</artifactId>
 	        <optional>true</optional>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.tomcat</groupId>
-			<artifactId>tomcat-servlet-api</artifactId>
-			<version>7.0.42</version>
-			<scope>provided</scope>
-		</dependency>
 	</dependencies>
 	
 	<build>

+ 0 - 0
spring-boot-helloworld-war/src/main/java/com/neo/Application.java → spring-boot-package-war/src/main/java/com/neo/Application.java


+ 0 - 0
spring-boot-helloworld-war/src/main/java/com/neo/ServletInitializer.java → spring-boot-package-war/src/main/java/com/neo/ServletInitializer.java


+ 0 - 0
spring-boot-helloworld-war/src/main/java/com/neo/controller/HelloWorldController.java → spring-boot-package-war/src/main/java/com/neo/controller/HelloWorldController.java


+ 0 - 0
spring-boot-helloworld-war/src/main/resources/application.properties → spring-boot-package-war/src/main/resources/application.properties


+ 0 - 0
spring-boot-helloworld-war/src/test/java/com/neo/ApplicationTests.java → spring-boot-package-war/src/test/java/com/neo/ApplicationTests.java


+ 0 - 0
spring-boot-helloworld-war/src/test/java/com/neo/controller/HelloTests.java → spring-boot-package-war/src/test/java/com/neo/controller/HelloTests.java


+ 0 - 0
spring-boot-helloworld-war/src/test/java/com/neo/controller/HelloWorldControlerTests.java → spring-boot-package-war/src/test/java/com/neo/controller/HelloWorldControlerTests.java