Tidy up HTML content and links, add demo5 page

.gitignore

@@ -4,6 +4,7 @@ target/*
 .classpath
 .settings/
 bin/
+Thumbs.db
 
 # Package Files #
 *.jar

.springBeans

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <beansProjectDescription>
 	<version>1</version>
-	<pluginVersion><![CDATA[3.3.0.201307091516-RELEASE]]></pluginVersion>
+	<pluginVersion><![CDATA[3.6.0.201407080615-RELEASE]]></pluginVersion>
 	<configSuffixes>
 		<configSuffix><![CDATA[xml]]></configSuffix>
 	</configSuffixes>
@@ -10,8 +10,14 @@
 		<config>src/main/resources/mvc-configuration.xml</config>
 		<config>java:org.springframework.boot.actuate.autoconfigure.EndpointWebMvcAutoConfiguration</config>
 		<config>java:org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration</config>
-		<config>java:demo1.web.ExceptionConfiguration</config>
+		<config>java:demo.config.ExceptionConfiguration</config>
+		<config>java:demo.main.Main</config>
+		<config>java:demo.utils.BeanLogger</config>
+		<config>java:demo3.config.DemoExceptionConfiguration</config>
+		<config>java:demo.utils.LoggingUtilities</config>
 	</configs>
+	<autoconfigs>
+	</autoconfigs>
 	<configSets>
 		<configSet>
 			<name><![CDATA[system]]></name>
@@ -20,8 +26,8 @@
 			<configs>
 				<config>src/main/resources/mvc-configuration.xml</config>
 				<config>java:org.springframework.boot.actuate.autoconfigure.EndpointWebMvcAutoConfiguration</config>
-				<config>java:demo1.web.ExceptionConfiguration</config>
 				<config>java:org.springframework.boot.autoconfigure.web.WebMvcAutoConfiguration</config>
+				<config>java:demo.config.ExceptionConfiguration</config>
 			</configs>
 			<profiles>
 			</profiles>

pom.xml

@@ -19,7 +19,7 @@
 	<parent>
 		<groupId>org.springframework.boot</groupId>
 		<artifactId>spring-boot-starter-parent</artifactId>
-		<version>1.1.7.RELEASE</version>
+		<version>1.1.8.RELEASE</version>
 	</parent>
 
 	<!-- Spring boot automatically picks up any other dependencies that it recognises 
@@ -42,16 +42,10 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-thymeleaf</artifactId>
 		</dependency>
-
-<!-- 		<dependency> -->
-<!-- 			<groupId>org.scala-lang</groupId> -->
-<!-- 			<artifactId>scala-library</artifactId> -->
-<!-- 			<version>2.10.4</version> -->
-<!-- 		</dependency> -->
 	</dependencies>
 
 	<build>
-		<!-- Specify entry-point class to run as a Java application -->
+		<!-- Specify entry-point class to run as a Java application 
 		<pluginManagement>
 			<plugins>
 				<plugin>
@@ -63,7 +57,7 @@
 					</configuration>
 				</plugin>
 			</plugins>
-		</pluginManagement>
+		</pluginManagement>-->
 
 		<!-- Allow deployment to Cloud Foundry -->
 		<plugins>

src/main/java/demo/config/ExceptionConfiguration.java

@@ -16,8 +16,8 @@
  * Setup for exception handling using a {@link SimpleMappingExceptionResolver}
  * bean.
  * <p>
- * If you prefer to do this in XML set the {@link Main#simpleMappingExceptionResolverConfig} property
- * to <code>XML</code> (see <code>mvc-configuration.xml</code>).
+ * If you prefer to do this in XML set the {@link Main#activeProfile} property
+ * to <code>XML_CONFIG_PROFILE</code> (see <code>mvc-configuration.xml</code>).
  * <p>
  * The use of the JAVA_CONFIG profile here is for demonstration only. A real
  * application wouldn't normally need to switch between XML or Java
@@ -52,7 +52,7 @@ public SimpleMappingExceptionResolver createSimpleMappingExceptionResolver() {
 		SimpleMappingExceptionResolver r = new SimpleMappingExceptionResolver();
 
 		Properties mappings = new Properties();
-		mappings.setProperty("DatabaseException", "databaseError");
+		mappings.setProperty("DatabaseException", "databaseException");
 		mappings.setProperty("InvalidCreditCardException", "creditCardError");
 
 		r.setExceptionMappings(mappings); // None by default
@@ -71,8 +71,8 @@ public SimpleMappingExceptionResolver createSimpleMappingExceptionResolver() {
 		 * 
 		 * Here we are choosing to use SimpleMappingExceptionResolver since many
 		 * Spring applications have used the approach since Spring V1. Normally
-		 * we would specify the view as "error" to match  Spring Boot, however
-		 * so you can see what is happening, we are using a different page.
+		 * we would specify the view as "error" to match Spring Boot, however so
+		 * you can see what is happening, we are using a different page.
 		 */
 		r.setDefaultErrorView("defaultErrorPage");
 		return r;

src/main/java/demo/config/ResponseDataControllerAdvice.java

@@ -7,18 +7,25 @@
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.servlet.handler.SimpleMappingExceptionResolver;
 
-import demo.config.DemoExceptionConfiguration.SwitchableSimpleMappingExceptionResolver;
 import demo.main.Main;
+import demo3.web.SwitchableSimpleMappingExceptionResolver;
 
 /**
- * Adds useful data into to the model for every request.
+ * Adds useful data into to the model for every request. This is another use of
+ * a Controller Advice (besides exception handling).
  * 
- * @author paulchapman
+ * @author Paul Chapman
  *
  */
 @ControllerAdvice
 public class ResponseDataControllerAdvice {
 
+	public static final String SOURCE_ON_GITHUB = //
+	"https://github.com/paulc4/mvc-exceptions/blob/master/src/main";
+
+	public static final String BLOG_URL = //
+	"https://spring.io/blog/2013/11/01/exception-handling-in-spring-mvc";
+
 	private SimpleMappingExceptionResolver resolver;
 
 	/**
@@ -78,4 +85,24 @@ else if (resolver instanceof SwitchableSimpleMappingExceptionResolver) {
 		} else
 			return "on";
 	}
+
+	/**
+	 * URL of this source on github.
+	 * 
+	 * @return
+	 */
+	@ModelAttribute("gitHubSrc")
+	public String getGitHubSrcURL() {
+		return SOURCE_ON_GITHUB;
+	}
+
+	/**
+	 * Add Blog URL to model for use in any web-page.
+	 * 
+	 * @return URL of the Spring IO Blog article this demo relates to.
+	 */
+	@ModelAttribute("blogUrl")
+	public String getBlogUrl() {
+		return BLOG_URL;
+	}
 }

src/main/java/demo/exceptions/SupportInfoException.java

@@ -0,0 +1,18 @@
+package demo.exceptions;
+
+public class SupportInfoException extends RuntimeException {
+
+	/**
+	 * Unique ID for Serialized object
+	 */
+	private static final long serialVersionUID = 4657491283614755649L;
+
+	public SupportInfoException(String msg) {
+		super(msg);
+	}
+
+	public SupportInfoException(String msg, Throwable t) {
+		super(msg, t);
+	}
+
+}

src/main/java/demo/main/Main.java

@@ -30,12 +30,12 @@
  * @author Paul Chapman
  */
 @EnableAutoConfiguration
-@ComponentScan({ "demo", "demo1.web", "demo2", "demo3" })
+@ComponentScan({ "demo", "demo1", "demo2", "demo3", "demo4" })
 @ImportResource("classpath:mvc-configuration.xml")
 public class Main extends SpringBootServletInitializer {
 
 	/**
-	 * Hoe should a <code>SimpleMappingExceptionResolver</code> be created?
+	 * How should a <code>SimpleMappingExceptionResolver</code> be created?
 	 * <ul>
 	 * <li>DEMO (default) - Java Config is used and a custom
 	 * <code>SimpleMappingExceptionResolver</code> is setup that can be enabled
@@ -46,6 +46,9 @@ public class Main extends SpringBootServletInitializer {
 	 * {@link ExceptionConfiguration}.
 	 * <li>NONE - No <code>SimpleMappingExceptionResolver</code> is created.
 	 * </ul>
+	 * <p>
+	 * Demo mode is the default - set to "java-config" or "xml-config" to match
+	 * however you intend to use Spring for a mor realistic setup.
 	 * 
 	 * @see Profiles
 	 */