switch to web.xml based initialization, split web and app contexts

cargo.gradle

@@ -7,14 +7,14 @@ dependencies {
 }
 
 cargo {
-	containerId = 'tomcat7x'
+	containerId = 'tomcat6x'
 	port = 8080
 	deployable {
 		context = name
 	}
 
 	local {
-		homeDir = file("$tomcat7")
+		homeDir = file("$tomcat6")
 		log = file('build/tomcat.log')
 	}
 }

src/main/java/org/springsource/samples/montyhall/config/AppConfig.java

@@ -0,0 +1,18 @@
+package org.springsource.samples.montyhall.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.ComponentScan.Filter;
+import org.springframework.stereotype.Controller;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.servlet.ViewResolver;
+import org.springframework.web.servlet.config.annotation.EnableWebMvc;
+import org.springframework.web.servlet.view.InternalResourceViewResolver;
+
+@Configuration
+@ComponentScan(basePackages = "org.springsource.samples.montyhall",
+               excludeFilters = {@Filter(Controller.class)})
+public class AppConfig {
+
+
+}

src/main/java/org/springsource/samples/montyhall/config/WebConfig.java

@@ -9,7 +9,7 @@
 
 @Configuration
 @EnableWebMvc
-@ComponentScan("org.springsource.samples.montyhall")
+@ComponentScan("org.springsource.samples.montyhall.controller")
 public class WebConfig {
 
 	@Bean

src/main/java/org/springsource/samples/montyhall/web/MontyHallWebAppInitializer.java

@@ -10,6 +10,12 @@
 import javax.servlet.ServletRegistration;
 import java.util.Set;
 
+/**
+ * For use with Servlet 3.0 and Tomcat 7.
+ * Cloud Foundry does not yet support Tomcat 7 so use web.xml instead when pushing to
+ * the 'spring' runtime on Cloud Foundry. Alternatively package the whole app including tomcat 7 as
+ * a standalone app.
+ */
 public class MontyHallWebAppInitializer implements WebApplicationInitializer {
 
   @java.lang.Override

src/main/webapp/WEB-INF/web.xml

@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
+	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_2_5.xsd">
+
+	<!-- Use annotation-based configuration from the montyhall.config package -->
+	<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>org.springsource.samples.montyhall.config.AppConfig</param-value>
+	</context-param>
+
+	<!-- Creates the Spring Application Context based on the above -->
+	<listener>
+		<listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
+	</listener>
+
+	<!-- Main servlet -->
+	<servlet>
+		<servlet-name>appServlet</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>org.springsource.samples.montyhall.config.WebConfig</param-value>
+		</init-param>
+		<load-on-startup>1</load-on-startup>
+	</servlet>
+
+	<servlet-mapping>
+		<servlet-name>appServlet</servlet-name>
+		<url-pattern>/</url-pattern>
+	</servlet-mapping>
+
+	<!-- Disables Servlet Container welcome file handling. Needed for compatibility with Servlet 3.0 and Tomcat 7.0 -->
+	<welcome-file-list>
+		<welcome-file></welcome-file>
+	</welcome-file-list>	
+
+</web-app>