diff --git a/spring-all/pom.xml b/spring-all/pom.xml
index ac66ecdad8..f9ced963e7 100644
--- a/spring-all/pom.xml
+++ b/spring-all/pom.xml
@@ -170,6 +170,7 @@
             <dependency>
                 <groupId>org.springframework.boot</groupId>
                 <artifactId>spring-boot-starter-thymeleaf</artifactId>
+                <version>${org.springframework.version}</version>
             </dependency>
         </dependencies>
     </dependencyManagement>
diff --git a/spring-all/src/main/java/com/baeldung/contexts/config/AnnotationsBasedApplicationAndServletInitializer.java b/spring-all/src/main/java/com/baeldung/contexts/config/AnnotationsBasedApplicationAndServletInitializer.java
new file mode 100644
index 0000000000..8ec35515a3
--- /dev/null
+++ b/spring-all/src/main/java/com/baeldung/contexts/config/AnnotationsBasedApplicationAndServletInitializer.java
@@ -0,0 +1,28 @@
+package com.baeldung.contexts.config;
+
+import org.springframework.web.context.AbstractContextLoaderInitializer;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
+import org.springframework.web.servlet.support.AbstractDispatcherServletInitializer;
+
+public class AnnotationsBasedApplicationAndServletInitializer extends AbstractDispatcherServletInitializer {
+
+    @Override
+    protected WebApplicationContext createRootApplicationContext() {
+        AnnotationConfigWebApplicationContext rootContext = new AnnotationConfigWebApplicationContext();
+        rootContext.register(RootApplicationConfig.class);
+        return rootContext;
+    }
+
+    @Override
+    protected WebApplicationContext createServletApplicationContext() {
+        AnnotationConfigWebApplicationContext secureWebAppContext = new AnnotationConfigWebApplicationContext();
+        secureWebAppContext.register(SecureWebAppConfig.class);
+        return secureWebAppContext;
+    }
+
+    @Override
+    protected String[] getServletMappings() {
+        return new String[] { "/s/api/*" };
+    }
+}
diff --git a/spring-all/src/main/java/com/baeldung/contexts/config/AnnotationsBasedApplicationInitializer.java b/spring-all/src/main/java/com/baeldung/contexts/config/AnnotationsBasedApplicationInitializer.java
new file mode 100644
index 0000000000..0d2674d4f3
--- /dev/null
+++ b/spring-all/src/main/java/com/baeldung/contexts/config/AnnotationsBasedApplicationInitializer.java
@@ -0,0 +1,16 @@
+package com.baeldung.contexts.config;
+
+import org.springframework.web.context.AbstractContextLoaderInitializer;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
+
+public class AnnotationsBasedApplicationInitializer extends AbstractContextLoaderInitializer {
+
+    @Override
+    protected WebApplicationContext createRootApplicationContext() {
+        AnnotationConfigWebApplicationContext rootContext = new AnnotationConfigWebApplicationContext();
+        rootContext.register(RootApplicationConfig.class);
+        return rootContext;
+    }
+
+}
\ No newline at end of file
diff --git a/spring-all/src/main/java/com/baeldung/contexts/config/ApplicationInitializer.java b/spring-all/src/main/java/com/baeldung/contexts/config/ApplicationInitializer.java
index c3ff90cf39..babad90598 100644
--- a/spring-all/src/main/java/com/baeldung/contexts/config/ApplicationInitializer.java
+++ b/spring-all/src/main/java/com/baeldung/contexts/config/ApplicationInitializer.java
@@ -5,31 +5,31 @@ import javax.servlet.ServletException;
 import javax.servlet.ServletRegistration;
 
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
 import org.springframework.web.WebApplicationInitializer;
 import org.springframework.web.context.ContextLoaderListener;
 import org.springframework.web.context.support.AnnotationConfigWebApplicationContext;
+import org.springframework.web.context.support.XmlWebApplicationContext;
 import org.springframework.web.servlet.DispatcherServlet;
 
-@Configuration
 public class ApplicationInitializer implements WebApplicationInitializer {
 
     @Override
     public void onStartup(ServletContext servletContext) throws ServletException {
-        AnnotationConfigWebApplicationContext rootContext = new AnnotationConfigWebApplicationContext();
-        rootContext.register(RootApplicationConfig.class);
-        servletContext.addListener(new ContextLoaderListener(rootContext));
+        //XML Context
+        //XmlWebApplicationContext rootContext = new XmlWebApplicationContext();
+        //rootContext.setConfigLocations("/WEB-INF/rootApplicationContext.xml");
+        //Annotations Context
+        //AnnotationConfigWebApplicationContext rootContext = new AnnotationConfigWebApplicationContext();
+        //rootContext.register(RootApplicationConfig.class);
+        //Registration
+        //servletContext.addListener(new ContextLoaderListener(rootContext));
         
-        AnnotationConfigWebApplicationContext normalWebAppContext = new AnnotationConfigWebApplicationContext();
-        normalWebAppContext.register(NormalWebAppConfig.class);
+        XmlWebApplicationContext normalWebAppContext = new XmlWebApplicationContext();
+        normalWebAppContext.setConfigLocation("/WEB-INF/normal-webapp-servlet.xml");
         ServletRegistration.Dynamic normal = servletContext.addServlet("normal-webapp", new DispatcherServlet(normalWebAppContext));
         normal.setLoadOnStartup(1);
         normal.addMapping("/api/*");
-        
-        AnnotationConfigWebApplicationContext secureWebAppContext = new AnnotationConfigWebApplicationContext();
-        secureWebAppContext.register(SecureWebAppConfig.class);
-        ServletRegistration.Dynamic secure = servletContext.addServlet("secure-webapp", new DispatcherServlet(secureWebAppContext));
-        secure.setLoadOnStartup(1);
-        secure.addMapping("/s/api/*");
     }
 
 }
diff --git a/spring-all/src/main/webapp/WEB-INF/greeting.xml b/spring-all/src/main/webapp/WEB-INF/greeting.xml
new file mode 100644
index 0000000000..3f0ae83455
--- /dev/null
+++ b/spring-all/src/main/webapp/WEB-INF/greeting.xml
@@ -0,0 +1,11 @@
+<?xml version = "1.0" encoding = "UTF-8"?>
+
+<beans xmlns="http://www.springframework.org/schema/beans"
+	   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	   xsi:schemaLocation="http://www.springframework.org/schema/beans
+   http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
+	
+	<bean id="greeting" class="com.baeldung.contexts.Greeting">
+		<property name="message" value="Hello World !!" />
+	</bean>
+</beans>
\ No newline at end of file
diff --git a/spring-all/src/main/webapp/WEB-INF/mvc-servlet.xml b/spring-all/src/main/webapp/WEB-INF/mvc-servlet.xml
deleted file mode 100644
index 4ba9642448..0000000000
--- a/spring-all/src/main/webapp/WEB-INF/mvc-servlet.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.2.xsd" >
-
-</beans>
\ No newline at end of file
diff --git a/spring-all/src/main/webapp/WEB-INF/rootApplicationContext.xml b/spring-all/src/main/webapp/WEB-INF/rootApplicationContext.xml
index cd79c64e79..af03661ebc 100644
--- a/spring-all/src/main/webapp/WEB-INF/rootApplicationContext.xml
+++ b/spring-all/src/main/webapp/WEB-INF/rootApplicationContext.xml
@@ -10,7 +10,5 @@
 
 	<context:component-scan base-package="com.baeldung.contexts.services" />
 	
-	<bean id="greeting" class="ccom.baeldung.contexts.Greeting">
-		<property name="message" value="Hello World !!" />
-	</bean>
+	<import resource="greeting.xml" />
 </beans>
\ No newline at end of file
diff --git a/spring-all/src/main/webapp/WEB-INF/web.xml b/spring-all/src/main/webapp/WEB-INF/web.xml
index 2050f28f81..55c2ccd62a 100644
--- a/spring-all/src/main/webapp/WEB-INF/web.xml
+++ b/spring-all/src/main/webapp/WEB-INF/web.xml
@@ -3,37 +3,54 @@
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
         version="3.0">
+
+    <!-- Uncommented, this disallows org.springframework.web.SpringServletContainerInitializer to run and execute
+         application initializers. -->
+    <!--<absolute-ordering>
+    </absolute-ordering>-->
 	
 	 <!-- load root application context -->
-  	<context-param>
+    <!--<listener>
+        <listener-class>
+            org.springframework.web.context.ContextLoaderListener
+        </listener-class>
+    </listener>-->
+  	<!--<context-param>
     	<param-name>contextConfigLocation</param-name>
     	<param-value>/WEB-INF/rootApplicationContext.xml</param-value>
-	</context-param>
-	<listener>
-   		<listener-class>
-        	org.springframework.web.context.ContextLoaderListener
-   		</listener-class>
-	</listener> 
-	
+	</context-param>-->
+    <!--<context-param>
+        <param-name>contextClass</param-name>
+        <param-value>org.springframework.web.context.support.AnnotationConfigWebApplicationContext</param-value>
+    </context-param>
+    <context-param>
+        <param-name>contextConfigLocation</param-name>
+        <param-value>com.baeldung.contexts.config.RootApplicationConfig, com.baeldung.contexts.config.NormalWebAppConfig</param-value>
+    </context-param>-->
+    <!--<context-param>
+        <param-name>contextConfigLocation</param-name>
+        <param-value>org.baeldung.bean.config</param-value>
+    </context-param>-->
+
 	<!-- secure web app context -->
-    <servlet>
+    <!--<servlet>
         <servlet-name>secure-webapp</servlet-name>
-        	<servlet-class>
-            	org.springframework.web.servlet.DispatcherServlet
-        	</servlet-class>
-		    <load-on-startup>1</load-on-startup>
-			<init-param>
-				<param-name>contextConfigLocation</param-name>
-				<param-value>/WEB-INF/secure-webapp-servlet.xml</param-value>
-			</init-param>
+        <servlet-class>
+            org.springframework.web.servlet.DispatcherServlet
+        </servlet-class>
+        <init-param>
+            <param-name>contextConfigLocation</param-name>
+            <param-value>/WEB-INF/secure-webapp-servlet.xml</param-value>
+        </init-param>
+        <load-on-startup>1</load-on-startup>
     </servlet>
     <servlet-mapping>
         <servlet-name>secure-webapp</servlet-name>
         <url-pattern>/s/api/*</url-pattern>
-    </servlet-mapping>
+    </servlet-mapping>-->
     
     <!-- normal web app context -->
-    <servlet>
+    <!--<servlet>
         <servlet-name>normal-webapp</servlet-name>
         <servlet-class>
             org.springframework.web.servlet.DispatcherServlet
@@ -43,23 +60,26 @@
     <servlet-mapping>
         <servlet-name>normal-webapp</servlet-name>
         <url-pattern>/api/*</url-pattern>
-    </servlet-mapping>
-	
+    </servlet-mapping>-->
+    <!-- normal webapp with annotations-based context -->
     <servlet>
-        <servlet-name>test-mvc</servlet-name>
+        <servlet-name>normal-webapp-annotations</servlet-name>
         <servlet-class>
             org.springframework.web.servlet.DispatcherServlet
         </servlet-class>
+        <init-param>
+            <param-name>contextClass</param-name>
+            <param-value>org.springframework.web.context.support.AnnotationConfigWebApplicationContext</param-value>
+        </init-param>
         <init-param>
             <param-name>contextConfigLocation</param-name>
-            <param-value>/WEB-INF/test-mvc.xml</param-value>
+            <param-value>com.baeldung.contexts.config.NormalWebAppConfig</param-value>
         </init-param>
         <load-on-startup>1</load-on-startup>
     </servlet>
-
     <servlet-mapping>
-        <servlet-name>test-mvc</servlet-name>
-        <url-pattern>/test/*</url-pattern>
+        <servlet-name>normal-webapp-annotations</servlet-name>
+        <url-pattern>/api-ann/*</url-pattern>
     </servlet-mapping>
 
     <welcome-file-list>