Merge pull request #11 from dsyer/feature/vanilla

Make end state simpler

README.adoc

@@ -147,100 +147,6 @@ $ curl localhost:8080
 Greetings from Spring Boot!
 ....
 
-== Switch from Tomcat to Jetty
-What if you prefer Jetty over Tomcat? Jetty and Tomcat are both compliant servlet containers, so it should be easy to switch. With Spring Boot, it is!
-
-Change your `build.gradle` to exclude Tomcat then add Jetty to the list of dependencies:
-
-[source,groovy]
-----
-include::complete/build.gradle[tag=jetty]
-----
-
-If you are using Maven, the changes look like this:
-
-[source,xml]
-----
-include::complete/pom.xml[tag=jetty]
-----
-
-This change isn't about comparing Tomcat vs. Jetty. Instead, it demonstrates how Spring Boot reacts to what is on your classpath. And by no means does it assert which servlet container is right for you.
-
-As you can see below, the code is the same as before:
-
-`src/main/java/hello/Application.java`
-[source,java]
-----
-include::complete/src/main/java/hello/Application.java[]
-----
-    
-
-== Re-run the application
-
-Run the app again:
-
-[subs="attributes"]
-----
-./gradlew build && java -jar build/libs/{project_id}-0.1.0.jar
-----
-
-If you are using Maven, execute:
-
-[subs="attributes"]
-----
-mvn package && java -jar target/{project_id}-0.1.0.jar
-----
-
-Now check out the output:
-
-....
-Let's inspect the beans provided by Spring Boot:
-application
-beanNameHandlerMapping
-defaultServletHandlerMapping
-dispatcherServlet
-embeddedServletContainerCustomizerBeanPostProcessor
-faviconHandlerMapping
-faviconRequestHandler
-handlerExceptionResolver
-helloController
-hiddenHttpMethodFilter
-httpRequestHandlerAdapter
-jettyEmbeddedServletContainerFactory
-messageSource
-mvcContentNegotiationManager
-mvcConversionService
-mvcValidator
-org.springframework.boot.autoconfigure.MessageSourceAutoConfiguration
-org.springframework.boot.autoconfigure.PropertyPlaceholderAutoConfiguration
-org.springframework.boot.autoconfigure.web.EmbeddedServletContainerAutoConfiguration
-org.springframework.boot.autoconfigure.web.EmbeddedServletContainerAutoConfiguration$DispatcherServletConfiguration
-org.springframework.boot.autoconfigure.web.EmbeddedServletContainerAutoConfiguration$EmbeddedJetty
-org.springframework.boot.autoconfigure.web.ServerPropertiesAutoConfiguration
-org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration
-org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration$WebMvcAutoConfigurationAdapter
-org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration$WebMvcAutoConfigurationAdapter$FaviconConfiguration
-org.springframework.boot.context.embedded.properties.ServerProperties
-org.springframework.context.annotation.ConfigurationClassPostProcessor.enhancedConfigurationProcessor
-org.springframework.context.annotation.ConfigurationClassPostProcessor.importAwareProcessor
-org.springframework.context.annotation.internalAutowiredAnnotationProcessor
-org.springframework.context.annotation.internalCommonAnnotationProcessor
-org.springframework.context.annotation.internalConfigurationAnnotationProcessor
-org.springframework.context.annotation.internalRequiredAnnotationProcessor
-org.springframework.web.servlet.config.annotation.DelegatingWebMvcConfiguration
-propertySourcesBinder
-propertySourcesPlaceholderConfigurer
-requestMappingHandlerAdapter
-requestMappingHandlerMapping
-resourceHandlerMapping
-simpleControllerHandlerAdapter
-viewControllerHandlerMapping
-....
-
-There is little change from the previous output, except there is no longer a `tomcatEmbeddedServletContainerFactory`. Instead, there is a new `jettyEmbeddedServletContainer`. 
-
-Otherwise, everything is the same, as it should be. Most beans listed above provide Spring MVC's production-grade features. Simply swapping one part, the servlet container, shouldn't cause a system-wide ripple.
-
 == Add production-grade services
 If you are building a web site for your business, you probably need to add some management services. Spring Boot provides several out of the box with its https://github.com/spring-projects/spring-boot/blob/master/spring-boot-actuator/README.md[actuator module], such as health, audits, beans, and more.
 

complete/build.gradle

@@ -24,12 +24,7 @@ repositories {
 }
 
 dependencies {
-    // tag::jetty[]
-    compile("org.springframework.boot:spring-boot-starter-web") {
-        exclude module: "spring-boot-starter-tomcat"
-    }
-    compile("org.springframework.boot:spring-boot-starter-jetty")
-    // end::jetty[]
+    compile("org.springframework.boot:spring-boot-starter-web")
     // tag::actuator[]
     compile("org.springframework.boot:spring-boot-starter-actuator")
     // end::actuator[]

complete/pom.xml

@@ -14,22 +14,10 @@
     </parent>
 
     <dependencies>
-	    <!-- tag::jetty[] -->
         <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>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-jetty</artifactId>
-        </dependency>
-        <!-- end::jetty[] -->
         <!-- tag::actuator[] -->
         <dependency>
             <groupId>org.springframework.boot</groupId>