From dc3589a7a0548e0d6d1a1158fabd0f6af9bd4b2e Mon Sep 17 00:00:00 2001
From: Doha2012 <dohae243@gmail.com>
Date: Fri, 11 Aug 2017 22:02:08 +0200
Subject: [PATCH] fix spring-boot module (#2422)

* fix spring config

* fix spring config

* fix spring config

* minor fix

* fix spring-boot module
---
 spring-boot/pom.xml                                       | 8 ++++----
 .../baeldung/servlets/props/PropertySourcesLoader.java    | 2 +-
 .../utils/{Application.java => UtilsApplication.java}     | 4 ++--
 spring-boot/src/main/webapp/WEB-INF/context.xml           | 4 ++--
 spring-boot/src/main/webapp/WEB-INF/dispatcher.xml        | 2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)
 rename spring-boot/src/main/java/com/baeldung/utils/{Application.java => UtilsApplication.java} (83%)

diff --git a/spring-boot/pom.xml b/spring-boot/pom.xml
index 2a1de00039..3fafa6ade2 100644
--- a/spring-boot/pom.xml
+++ b/spring-boot/pom.xml
@@ -52,7 +52,7 @@
             <scope>test</scope>		
         </dependency>
         
-        <dependency>
+<!--         <dependency>
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-core</artifactId>
             <version>${tomcat.version}</version>
@@ -62,7 +62,7 @@
             <groupId>org.apache.tomcat.embed</groupId>
             <artifactId>tomcat-embed-jasper</artifactId>
             <version>${tomcat.version}</version>
-        </dependency>
+        </dependency> -->
 
         <dependency>
             <groupId>io.dropwizard.metrics</groupId>
@@ -253,8 +253,8 @@
 
     <properties>
         <!-- The main class to start by executing java -jar -->
-        <start-class>org.baeldung.boot.DemoApplication</start-class>
-        <spring.version>4.3.4.RELEASE</spring.version>
+<!--         <start-class>org.baeldung.boot.DemoApplication</start-class>
+ -->        <spring.version>4.3.4.RELEASE</spring.version>
         <git-commit-id-plugin.version>2.2.1</git-commit-id-plugin.version>
         <jquery.version>3.1.1</jquery.version>
         <bootstrap.version>3.3.7-1</bootstrap.version>
diff --git a/spring-boot/src/main/java/com/baeldung/servlets/props/PropertySourcesLoader.java b/spring-boot/src/main/java/com/baeldung/servlets/props/PropertySourcesLoader.java
index 56a6751326..aa70bac777 100644
--- a/spring-boot/src/main/java/com/baeldung/servlets/props/PropertySourcesLoader.java
+++ b/spring-boot/src/main/java/com/baeldung/servlets/props/PropertySourcesLoader.java
@@ -9,7 +9,7 @@ import org.springframework.context.annotation.PropertySource;
 import org.springframework.core.env.ConfigurableEnvironment;
 
 @Configuration
-@ComponentScan(basePackages = { "com.baeldung.*" })
+@ComponentScan(basePackages = { "com.baeldung.servlets.*" })
 @PropertySource("classpath:custom.properties") public class PropertySourcesLoader {
 
     private static final Logger log = LoggerFactory.getLogger(PropertySourcesLoader.class);
diff --git a/spring-boot/src/main/java/com/baeldung/utils/Application.java b/spring-boot/src/main/java/com/baeldung/utils/UtilsApplication.java
similarity index 83%
rename from spring-boot/src/main/java/com/baeldung/utils/Application.java
rename to spring-boot/src/main/java/com/baeldung/utils/UtilsApplication.java
index 9d5d75bce2..b63ada9eee 100644
--- a/spring-boot/src/main/java/com/baeldung/utils/Application.java
+++ b/spring-boot/src/main/java/com/baeldung/utils/UtilsApplication.java
@@ -10,11 +10,11 @@ import com.baeldung.autoconfiguration.MySQLAutoconfiguration;
 
 @SpringBootApplication(exclude=MySQLAutoconfiguration.class)
 @ComponentScan(basePackages="com.baeldung.utils")
-public class Application {
+public class UtilsApplication {
 
 	@RolesAllowed("*")
 	public static void main(String[] args) {
-            SpringApplication.run(Application.class, args);
+            SpringApplication.run(UtilsApplication.class, args);
 	}
 
 }
diff --git a/spring-boot/src/main/webapp/WEB-INF/context.xml b/spring-boot/src/main/webapp/WEB-INF/context.xml
index 263bed4430..32f11f78f6 100644
--- a/spring-boot/src/main/webapp/WEB-INF/context.xml
+++ b/spring-boot/src/main/webapp/WEB-INF/context.xml
@@ -6,7 +6,7 @@
                            http://www.springframework.org/schema/context
                            http://www.springframework.org/schema/context/spring-context-4.3.xsd">
 
-    <context:component-scan base-package="com.baeldung"/>
+    <context:component-scan base-package="com.baeldung.servlets"/>
 
-    <bean class="com.baeldung.configuration.WebAppInitializer"/>
+    <bean class="com.baeldung.servlets.configuration.WebAppInitializer"/>
 </beans>
\ No newline at end of file
diff --git a/spring-boot/src/main/webapp/WEB-INF/dispatcher.xml b/spring-boot/src/main/webapp/WEB-INF/dispatcher.xml
index ade8e66777..54e62921be 100644
--- a/spring-boot/src/main/webapp/WEB-INF/dispatcher.xml
+++ b/spring-boot/src/main/webapp/WEB-INF/dispatcher.xml
@@ -7,7 +7,7 @@
    http://www.springframework.org/schema/context
    http://www.springframework.org/schema/context/spring-context-3.0.xsd">
 
-    <context:component-scan base-package="com.baeldung"/>
+    <context:component-scan base-package="com.baeldung.servlets"/>
 
     <bean class="org.springframework.web.servlet.view.InternalResourceViewResolver">
         <property name="prefix" value="/WEB-INF/jsp/"/>