Fix broken merge

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

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-	xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
     xsi:schemaLocation="
       http://java.sun.com/xml/ns/javaee
-      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0"
-	id="WebApp_ID" version="3.0">
+>
 
     <display-name>Spring MVC Application</display-name>
 
@@ -36,7 +35,7 @@
     </servlet-mapping>
 
     <welcome-file-list>
-		<welcome-file />
+        <welcome-file/>
     </welcome-file-list>
 
 </web-app>

core-java-8/pom.xml

@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.baeldung</groupId>
     <artifactId>spring-rest</artifactId>

core-java/pom.xml

@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.baeldung</groupId>
     <artifactId>core-java</artifactId>

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

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-	xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
     xsi:schemaLocation="
       http://java.sun.com/xml/ns/javaee
-      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0"
-	id="WebApp_ID" version="3.0">
+>
 
     <display-name>Spring MVC Application</display-name>
 
@@ -36,7 +35,7 @@
     </servlet-mapping>
 
     <welcome-file-list>
-		<welcome-file />
+        <welcome-file/>
     </welcome-file-list>
 
 </web-app>

gson/pom.xml

@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.baeldung</groupId>
     <artifactId>gson</artifactId>

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

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-	xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
     xsi:schemaLocation="
       http://java.sun.com/xml/ns/javaee
-      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0"
-	id="WebApp_ID" version="3.0">
+>
 
     <display-name>Spring MVC Application</display-name>
 
@@ -36,7 +35,7 @@
     </servlet-mapping>
 
     <welcome-file-list>
-		<welcome-file />
+        <welcome-file/>
     </welcome-file-list>
 
 </web-app>

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

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-	xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
     xsi:schemaLocation="
       http://java.sun.com/xml/ns/javaee
-      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0"
-	id="WebApp_ID" version="3.0">
+>
 
     <display-name>Spring MVC Application</display-name>
 
@@ -36,7 +35,7 @@
     </servlet-mapping>
 
     <welcome-file-list>
-		<welcome-file />
+        <welcome-file/>
     </welcome-file-list>
 
 </web-app>

handling-spring-static-resources/src/main/resources/webSecurityConfig.xml

@@ -1,44 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/security"
+<beans:beans xmlns="http://www.springframework.org/schema/security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
     xmlns:mvc="http://www.springframework.org/schema/mvc"
     xsi:schemaLocation="
 		http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
 		http://www.springframework.org/schema/mvc 
-        http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd">
+        http://www.springframework.org/schema/mvc/spring-mvc-3.0.xsd"
+>
     <http use-expressions="true">
-		<intercept-url pattern="/login*" access="permitAll" />
+        <intercept-url pattern="/login*" access="permitAll"/>
-		<intercept-url pattern="/logout*" access="permitAll" />
+        <intercept-url pattern="/logout*" access="permitAll"/>
-		<intercept-url pattern="/home*" access="permitAll" />
+        <intercept-url pattern="/home*" access="permitAll"/>
-		<intercept-url pattern="/files/**" access="permitAll" />
+        <intercept-url pattern="/files/**" access="permitAll"/>
-		<intercept-url pattern="/resources/**" access="permitAll" />
+        <intercept-url pattern="/resources/**" access="permitAll"/>
-		<intercept-url pattern="/js/**" access="permitAll" />
+        <intercept-url pattern="/js/**" access="permitAll"/>
-		<intercept-url pattern="/other-files/**" access="permitAll" />
+        <intercept-url pattern="/other-files/**" access="permitAll"/>
-		<intercept-url pattern="/invalidSession*" access="isAnonymous()" />
+        <intercept-url pattern="/invalidSession*" access="isAnonymous()"/>
-		<intercept-url pattern="/**" access="isAuthenticated()" />
+        <intercept-url pattern="/**" access="isAuthenticated()"/>
 
-		<form-login login-page='/login.html'
+        <form-login login-page='/login.html' authentication-failure-url="/login.html?error=true" authentication-success-handler-ref="myAuthenticationSuccessHandler"
-			authentication-failure-url="/login.html?error=true"
+            default-target-url="home.html"/>
-			authentication-success-handler-ref="myAuthenticationSuccessHandler"
+        <session-management invalid-session-url="/invalidSession.html" session-fixation-protection="none"/>
-			default-target-url="home.html" />
+        <logout invalidate-session="false" logout-success-url="/logout.html?logSucc=true" logout-url="/j_spring_security_logout" delete-cookies="JSESSIONID"/>
-		<session-management invalid-session-url="/invalidSession.html"
-			session-fixation-protection="none" />
-		<logout invalidate-session="false" logout-success-url="/logout.html?logSucc=true"
-			logout-url="/j_spring_security_logout" delete-cookies="JSESSIONID" />
 
     </http>
 
     <!-- for XML static resource confguration- comment out for java based config -->
     <!-- -<mvc:resources mapping="/resources/**" location="/resources/" /> -->
 
-	<beans:bean id="myAuthenticationSuccessHandler"
+    <beans:bean id="myAuthenticationSuccessHandler" class="org.baeldung.security.MySimpleUrlAuthenticationSuccessHandler"/>
-		class="org.baeldung.security.MySimpleUrlAuthenticationSuccessHandler" />
     <authentication-manager>
         <authentication-provider>
             <user-service>
-				<user name="user1" password="user1Pass" authorities="ROLE_USER" />
+                <user name="user1" password="user1Pass" authorities="ROLE_USER"/>
-				<user name="admin1" password="admin1Pass" authorities="ROLE_ADMIN" />
+                <user name="admin1" password="admin1Pass" authorities="ROLE_ADMIN"/>
             </user-service>
         </authentication-provider>
     </authentication-manager>

handling-spring-static-resources/src/main/webapp/WEB-INF/web.xml

@@ -1,8 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-	xmlns="http://java.sun.com/xml/ns/javaee"
+    version="2.5"
-	xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+>
-	version="2.5">
 
     <context-param>
         <param-name>contextClass</param-name>

httpclient/pom.xml

@@ -35,11 +35,6 @@
                 </exclusion>
             </exclusions>
         </dependency>
-		<!-- <dependency> -->
-		<!-- <groupId>org.apache.httpcomponents</groupId> -->
-		<!-- <artifactId>httpcore</artifactId> -->
-		<!-- <version>${httpcore.version}</version> -->
-		<!-- </dependency> -->
 
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>

jackson/pom.xml

@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.baeldung</groupId>
     <artifactId>jackson</artifactId>

jackson/src/test/java/org/baeldung/jackson/annotation/BeanWithCreator.java

@@ -3,7 +3,6 @@ package org.baeldung.jackson.annotation;
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-
 public class BeanWithCreator {
     public int id;
     public String name;

jackson/src/test/java/org/baeldung/jackson/annotation/Zoo.java

@@ -16,12 +16,8 @@ public class Zoo {
         this.animal = animal;
     }
 
-
     @JsonTypeInfo(use = JsonTypeInfo.Id.NAME, include = As.PROPERTY, property = "type")
-    @JsonSubTypes({
+    @JsonSubTypes({ @JsonSubTypes.Type(value = Dog.class, name = "dog"), @JsonSubTypes.Type(value = Cat.class, name = "cat") })
-        @JsonSubTypes.Type(value = Dog.class, name = "dog"),
-        @JsonSubTypes.Type(value = Cat.class, name = "cat")
-    })
     public static class Animal {
         public String name;
 

jackson/src/test/java/org/baeldung/jackson/test/JacksonAnnotationTest.java

@@ -49,7 +49,6 @@ import com.fasterxml.jackson.databind.ser.FilterProvider;
 import com.fasterxml.jackson.databind.ser.impl.SimpleBeanPropertyFilter;
 import com.fasterxml.jackson.databind.ser.impl.SimpleFilterProvider;
 
-
 public class JacksonAnnotationTest {
 
     @Test

jackson/src/test/java/org/baeldung/jackson/test/JacksonDeserializationUnitTest.java

@@ -66,7 +66,7 @@ public class JacksonDeserializationUnitTest {
 
     @Test
     public final void givenJsonHasUnknownValuesButJacksonIsIgnoringUnknownFields_whenDeserializing_thenCorrect() throws JsonParseException, JsonMappingException, IOException {
-        final String jsonAsString =// @formatter:off
+        final String jsonAsString = // @formatter:off
                 "{\"stringValue\":\"a\"," +
                 "\"intValue\":1," +
                 "\"booleanValue\":true," +
@@ -84,7 +84,7 @@ public class JacksonDeserializationUnitTest {
 
     @Test
     public final void givenJsonHasUnknownValuesButUnknownFieldsAreIgnoredOnClass_whenDeserializing_thenCorrect() throws JsonParseException, JsonMappingException, IOException {
-        final String jsonAsString =// @formatter:off
+        final String jsonAsString = // @formatter:off
                 "{\"stringValue\":\"a\"," +
                 "\"intValue\":1," +
                 "\"booleanValue\":true," +

jackson/src/test/java/org/baeldung/jackson/test/UnitTestSuite.java

@@ -6,7 +6,7 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
 @RunWith(Suite.class)
-@Suite.SuiteClasses({// @formatter:off
+@Suite.SuiteClasses({ // @formatter:off
     JacksonCollectionDeserializationUnitTest.class
     ,JacksonSerializationEnumsUnitTest.class
     ,JacksonDeserializationUnitTest.class

mockito/pom.xml

@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.baeldung</groupId>
     <artifactId>mockito</artifactId>

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

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-	xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
     xsi:schemaLocation="
       http://java.sun.com/xml/ns/javaee
-      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0"
-	id="WebApp_ID" version="3.0">
+>
 
     <display-name>Spring MVC Application</display-name>
 
@@ -36,7 +35,7 @@
     </servlet-mapping>
 
     <welcome-file-list>
-		<welcome-file />
+        <welcome-file/>
     </welcome-file-list>
 
 </web-app>

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

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-	xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
     xsi:schemaLocation="
       http://java.sun.com/xml/ns/javaee
-      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0"
-	id="WebApp_ID" version="3.0">
+>
 
     <display-name>Spring MVC Application</display-name>
 
@@ -36,7 +35,7 @@
     </servlet-mapping>
 
     <welcome-file-list>
-		<welcome-file />
+        <welcome-file/>
     </welcome-file-list>
 
 </web-app>

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

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-	xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
     xsi:schemaLocation="
       http://java.sun.com/xml/ns/javaee
-      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0"
-	id="WebApp_ID" version="3.0">
+>
 
     <display-name>Spring MVC Application</display-name>
 
@@ -36,7 +35,7 @@
     </servlet-mapping>
 
     <welcome-file-list>
-		<welcome-file />
+        <welcome-file/>
     </welcome-file-list>
 
 </web-app>

spring-all/.classpath

@@ -30,7 +30,7 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>

spring-all/pom.xml

@@ -69,6 +69,7 @@
             <artifactId>hsqldb</artifactId>
             <version>2.3.2</version>
         </dependency>
+        
         <!-- validation -->
 
         <dependency>

spring-all/src/main/resources/config.xml

@@ -1,21 +1,20 @@
-<beans xmlns="http://www.springframework.org/schema/beans"
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cache="http://www.springframework.org/schema/cache"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:cache="http://www.springframework.org/schema/cache"
+    xmlns:context="http://www.springframework.org/schema/context" xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:aop="http://www.springframework.org/schema/aop"
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd
         http://www.springframework.org/schema/cache http://www.springframework.org/schema/cache/spring-cache-4.0.xsd
         http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd
         http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-4.0.xsd
-    ">
+    "
+>
 
-	<cache:annotation-driven />
+    <cache:annotation-driven/>
 
-	<context:annotation-config />
+    <context:annotation-config/>
-	<bean class="org.baeldung.caching.config.MyAppConfig" />
+    <bean class="org.baeldung.caching.config.MyAppConfig"/>
 
     <!-- the service that you wish to make cacheable. -->
-	<bean id="customerDataService" class="org.baeldung.caching.example.CustomerDataService" />
+    <bean id="customerDataService" class="org.baeldung.caching.example.CustomerDataService"/>
 
     <bean id="cacheManager" class="org.springframework.cache.support.SimpleCacheManager">
         <property name="caches">
@@ -30,16 +29,14 @@
     <!-- define caching behavior -->
     <cache:advice id="cachingBehavior" cache-manager="cacheManager">
         <cache:caching cache="addresses">
-			<cache:cacheable method="getAddress" key="#customer.name" />
+            <cache:cacheable method="getAddress" key="#customer.name"/>
         </cache:caching>
     </cache:advice>
 
 
-	<!-- apply the behavior to all the implementations of CustomerDataService 
+    <!-- apply the behavior to all the implementations of CustomerDataService interface -->
-		interface -->
     <aop:config>
-		<aop:advisor advice-ref="cachingBehavior"
+        <aop:advisor advice-ref="cachingBehavior" pointcut="execution(* org.baeldung.caching.example.CustomerDataService.*(..))"/>
-			pointcut="execution(* org.baeldung.caching.example.CustomerDataService.*(..))" />
     </aop:config>
 
 </beans>

spring-all/src/main/resources/configForProperties.xml

@@ -4,12 +4,13 @@
     xsi:schemaLocation="
       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd
       http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.1.xsd
-      http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd">
+      http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd"
+>
 
-    <context:property-placeholder location="classpath:foo.properties" />
+    <context:property-placeholder location="classpath:foo.properties"/>
 
     <bean id="componentInXmlUsingProperties" class="org.baeldung.properties.core.ComponentInXmlUsingProperties">
-        <constructor-arg value="${key.something}" />
+        <constructor-arg value="${key.something}"/>
     </bean>
 
 </beans>

spring-all/src/main/resources/configForPropertiesOne.xml

@@ -4,12 +4,13 @@
     xsi:schemaLocation="
       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd
       http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.1.xsd
-      http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd">
+      http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd"
+>
 
-    <context:property-placeholder location="classpath:foo.properties" ignore-unresolvable="true" order="1" />
+    <context:property-placeholder location="classpath:foo.properties" ignore-unresolvable="true" order="1"/>
 
     <bean id="componentInXmlUsingProperties" class="org.baeldung.properties.core.ComponentInXmlUsingProperties">
-        <constructor-arg value="${key.something2}" />
+        <constructor-arg value="${key.something2}"/>
     </bean>
 
 </beans>

spring-all/src/main/resources/configForPropertiesTwo.xml

@@ -4,7 +4,8 @@
     xsi:schemaLocation="
       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd
       http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.1.xsd
-      http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd">
+      http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd"
+>
 
     <context:property-placeholder location="classpath:bar.properties" order="2"/>
 

spring-all/src/main/resources/jdbc/springJdbc-config.xml

@@ -1,20 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd">
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd"
+>
 
     <bean id="employeeDao" class="org.baeldung.jdbc.EmployeeDAO">
-		<property name="dataSource" ref="dataSource" />
+        <property name="dataSource" ref="dataSource"/>
     </bean>
 
-	<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource"
+    <bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close">
-		destroy-method="close">
+        <property name="driverClassName" value="${jdbc.driverClassName}"/>
-		<property name="driverClassName" value="${jdbc.driverClassName}" />
+        <property name="url" value="${jdbc.url}"/>
-		<property name="url" value="${jdbc.url}" />
+        <property name="username" value="${jdbc.username}"/>
-		<property name="username" value="${jdbc.username}" />
+        <property name="password" value="${jdbc.password}"/>
-		<property name="password" value="${jdbc.password}" />
     </bean>
 
-	<context:property-placeholder location="jdbc.properties" />
+    <context:property-placeholder location="jdbc.properties"/>
 </beans>

spring-all/src/main/resources/springAsync-config.xml

@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
     xmlns:task="http://www.springframework.org/schema/task"
     xsi:schemaLocation="http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.1.xsd
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd">
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd"
+>
 
-	<task:annotation-driven executor="myExecutor" />
+    <task:annotation-driven executor="myExecutor"/>
-	<task:executor id="myExecutor" pool-size="5" />
+    <task:executor id="myExecutor" pool-size="5"/>
 
-	<bean id="asyncAnnotationExample" class="org.baeldung.async.AsyncAnnotationExample" />
+    <bean id="asyncAnnotationExample" class="org.baeldung.async.AsyncAnnotationExample"/>
 
 </beans>

spring-all/src/main/resources/springProfiles-config.xml

@@ -1,15 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:context="http://www.springframework.org/schema/context"
     xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd">
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd"
+>
 
     <beans profile="dev">
-		<bean id="devDatasourceConfig" class="org.baeldung.profiles.DevDatasourceConfig" />
+        <bean id="devDatasourceConfig" class="org.baeldung.profiles.DevDatasourceConfig"/>
     </beans>
 
     <beans profile="production">
-		<bean id="productionDatasourceConfig" class="org.baeldung.profiles.ProductionDatasourceConfig" />
+        <bean id="productionDatasourceConfig" class="org.baeldung.profiles.ProductionDatasourceConfig"/>
     </beans>
 </beans>

spring-all/src/main/resources/springScheduled-config.xml

@@ -1,26 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:task="http://www.springframework.org/schema/task"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:task="http://www.springframework.org/schema/task"
     xmlns:context="http://www.springframework.org/schema/context"
     xsi:schemaLocation="
 		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd
 		http://www.springframework.org/schema/task http://www.springframework.org/schema/task/spring-task-4.1.xsd
-		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd">
+		http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd"
+>
 
-	<context:property-placeholder location="classpath:springScheduled.properties" />
+    <context:property-placeholder location="classpath:springScheduled.properties"/>
 
     <!-- Configure the scheduler -->
-	<task:scheduler id="myScheduler" pool-size="10" />
+    <task:scheduler id="myScheduler" pool-size="10"/>
 
-	<bean id="myscheduler"
+    <bean id="myscheduler" class="org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler"/>
-		class="org.springframework.scheduling.concurrent.ThreadPoolTaskScheduler" />
 
     <!-- Configure the fixedDealy, fixedRate or cron based schduled tasks -->
-	<bean id="schedulingWithXmlConfig" class="org.baeldung.scheduling.SchedulingWithXmlConfig" />
+    <bean id="schedulingWithXmlConfig" class="org.baeldung.scheduling.SchedulingWithXmlConfig"/>
 
     <task:scheduled-tasks scheduler="myScheduler">
-		<task:scheduled ref="schedulingWithXmlConfig" method="scheduleFixedDelayTask" fixed-delay="${fixedDelay.in.milliseconds}" initial-delay="1000" />			
+        <task:scheduled ref="schedulingWithXmlConfig" method="scheduleFixedDelayTask" fixed-delay="${fixedDelay.in.milliseconds}" initial-delay="1000"/>
-		<task:scheduled ref="schedulingWithXmlConfig" method="scheduleFixedRateTask" fixed-rate="${fixedRate.in.milliseconds}" />			
+        <task:scheduled ref="schedulingWithXmlConfig" method="scheduleFixedRateTask" fixed-rate="${fixedRate.in.milliseconds}"/>
-		<task:scheduled ref="schedulingWithXmlConfig" method="scheduleTaskUsingCronExpression" cron="${cron.expression}" />
+        <task:scheduled ref="schedulingWithXmlConfig" method="scheduleTaskUsingCronExpression" cron="${cron.expression}"/>
     </task:scheduled-tasks>
 </beans>

spring-all/src/main/webapp/WEB-INF/web_old.xml

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-	xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
     xsi:schemaLocation="
       http://java.sun.com/xml/ns/javaee
-      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0"
-	id="WebApp_ID" version="3.0">
+>
 
     <display-name>Spring MVC Application</display-name>
 

spring-all/src/test/java/org/baeldung/properties/parentchild/ChildValueHolder.java

@@ -11,7 +11,6 @@ public class ChildValueHolder {
     @Value("${child.name:-}")
     private String childName;
 
-
     public String getParentName() {
         return parentName;
     }

spring-all/src/test/java/org/baeldung/properties/parentchild/ParentValueHolder.java

@@ -11,7 +11,6 @@ public class ParentValueHolder {
     @Value("${child.name:-}")
     private String childName;
 
-
     public String getParentName() {
         return parentName;
     }

spring-all/src/test/java/org/baeldung/test/IntegrationTestSuite.java

@@ -11,7 +11,7 @@ import org.junit.runners.Suite;
 import org.junit.runners.Suite.SuiteClasses;
 
 @RunWith(Suite.class)
-@SuiteClasses({//@formatter:off
+@SuiteClasses({ //@formatter:off
     PropertiesWithXmlIntegrationTest.class,
     ExternalPropertiesWithJavaIntegrationTest.class,
     ExternalPropertiesWithMultipleXmlsIntegrationTest.class,

spring-boot/pom.xml

@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.baeldung</groupId>
     <artifactId>spring-boot</artifactId>
@@ -19,24 +18,8 @@
         <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> -->
-
-		<!-- <dependency>
-		    <groupId>org.springframework.boot</groupId>
-		    <artifactId>spring-boot-starter-undertow</artifactId>
-		</dependency> -->
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>

spring-boot/src/main/java/org/baeldung/common/error/MyCustomErrorController.java

@@ -11,7 +11,7 @@ public class MyCustomErrorController implements ErrorController {
         // TODO Auto-generated constructor stub
     }
 
-    @RequestMapping(value=PATH)
+    @RequestMapping(value = PATH)
     public String error() {
         return "Error heaven";
     }

spring-boot/src/main/java/org/baeldung/common/resources/ExecutorServiceExitCodeGenerator.java

@@ -20,8 +20,7 @@ public class ExecutorServiceExitCodeGenerator implements ExitCodeGenerator {
                 executorService.shutdownNow();
                 returnCode = 1;
             }
-        }
+        } catch (SecurityException ex) {
-        catch (SecurityException ex) {
             returnCode = 0;
         }
         return returnCode;

spring-boot/src/main/java/org/baeldung/controller/servlet/HelloWorldServlet.java

@@ -22,8 +22,7 @@ public class HelloWorldServlet extends HttpServlet {
             out = response.getWriter();
             out.println("HelloWorldServlet: GET METHOD");
             out.flush();
-        }
+        } finally {
-        finally {
             if (!Objects.isNull(out))
                 out.close();
         }
@@ -35,8 +34,7 @@ public class HelloWorldServlet extends HttpServlet {
             out = response.getWriter();
             out.println("HelloWorldServlet: POST METHOD");
             out.flush();
-        }
+        } finally {
-        finally {
             if (!Objects.isNull(out))
                 out.close();
         }

spring-boot/src/main/java/org/baeldung/controller/servlet/SpringHelloWorldServlet.java

@@ -22,8 +22,7 @@ public class SpringHelloWorldServlet extends HttpServlet {
             out = response.getWriter();
             out.println("SpringHelloWorldServlet: GET METHOD");
             out.flush();
-        }
+        } finally {
-        finally {
             if (!Objects.isNull(out))
                 out.close();
         }
@@ -35,8 +34,7 @@ public class SpringHelloWorldServlet extends HttpServlet {
             out = response.getWriter();
             out.println("SpringHelloWorldServlet: POST METHOD");
             out.flush();
-        }
+        } finally {
-        finally {
             if (!Objects.isNull(out))
                 out.close();
         }

spring-boot/src/main/java/org/baeldung/main/SpringBootApplication.java

@@ -19,9 +19,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 @RestController
 @EnableAutoConfiguration
-@ComponentScan({ "org.baeldung.common.error", "org.baeldung.common.error.controller", 
+@ComponentScan({ "org.baeldung.common.error", "org.baeldung.common.error.controller", "org.baeldung.common.properties", "org.baeldung.common.resources", "org.baeldung.endpoints", "org.baeldung.service", "org.baeldung.monitor.jmx", "org.baeldung.service" })
-    "org.baeldung.common.properties", "org.baeldung.common.resources", "org.baeldung.endpoints", 
-    "org.baeldung.service", "org.baeldung.monitor.jmx", "org.baeldung.service"})
 public class SpringBootApplication {
 
     private static ApplicationContext applicationContext;
@@ -57,7 +55,7 @@ public class SpringBootApplication {
         return bean;
     }
 
-/*    @Bean
+    /*    @Bean
     public JettyEmbeddedServletContainerFactory  jettyEmbeddedServletContainerFactory() {
         JettyEmbeddedServletContainerFactory jettyContainer = new JettyEmbeddedServletContainerFactory();
         jettyContainer.setPort(9000);

spring-exceptions/pom.xml

@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.baeldung</groupId>
     <artifactId>spring-exceptions</artifactId>

spring-exceptions/src/main/java/org/baeldung/persistence/dao/impl/ChildDao.java

@@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public class ChildDao extends AbstractHibernateDao<Child> implements IChildDao {
+public class ChildDao extends AbstractHibernateDao<Child>implements IChildDao {
 
     @Autowired
     private SessionFactory sessionFactory;

spring-exceptions/src/main/java/org/baeldung/persistence/dao/impl/FooDao.java

@@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public class FooDao extends AbstractHibernateDao<Foo> implements IFooDao {
+public class FooDao extends AbstractHibernateDao<Foo>implements IFooDao {
 
     @Autowired
     private SessionFactory sessionFactory;

spring-exceptions/src/main/java/org/baeldung/persistence/dao/impl/ParentDao.java

@@ -8,7 +8,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public class ParentDao extends AbstractHibernateDao<Parent> implements IParentDao {
+public class ParentDao extends AbstractHibernateDao<Parent>implements IParentDao {
 
     @Autowired
     private SessionFactory sessionFactory;

spring-exceptions/src/main/java/org/baeldung/persistence/service/impl/ChildService.java

@@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
-public class ChildService extends AbstractService<Child> implements IChildService {
+public class ChildService extends AbstractService<Child>implements IChildService {
 
     @Autowired
     private IChildDao dao;

spring-exceptions/src/main/java/org/baeldung/persistence/service/impl/FooService.java

@@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
-public class FooService extends AbstractService<Foo> implements IFooService {
+public class FooService extends AbstractService<Foo>implements IFooService {
 
     @Autowired
     private IFooDao dao;

spring-exceptions/src/main/java/org/baeldung/persistence/service/impl/ParentService.java

@@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
-public class ParentService extends AbstractService<Parent> implements IParentService {
+public class ParentService extends AbstractService<Parent>implements IParentService {
 
     @Autowired
     private IParentDao dao;

spring-exceptions/src/main/resources/configForProperties.xml

@@ -4,12 +4,13 @@
     xsi:schemaLocation="
       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd
       http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.1.xsd
-      http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd">
+      http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd"
+>
 
-    <context:property-placeholder location="classpath:foo.properties" />
+    <context:property-placeholder location="classpath:foo.properties"/>
 
     <bean id="componentInXmlUsingProperties" class="org.baeldung.properties.core.ComponentInXmlUsingProperties">
-        <constructor-arg value="${key.something}" />
+        <constructor-arg value="${key.something}"/>
     </bean>
 
 </beans>

spring-exceptions/src/main/resources/configForPropertiesOne.xml

@@ -4,12 +4,13 @@
     xsi:schemaLocation="
       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd
       http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.1.xsd
-      http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd">
+      http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd"
+>
 
-    <context:property-placeholder location="classpath:foo.properties" ignore-unresolvable="true" order="1" />
+    <context:property-placeholder location="classpath:foo.properties" ignore-unresolvable="true" order="1"/>
 
     <bean id="componentInXmlUsingProperties" class="org.baeldung.properties.core.ComponentInXmlUsingProperties">
-        <constructor-arg value="${key.something2}" />
+        <constructor-arg value="${key.something2}"/>
     </bean>
 
 </beans>

spring-exceptions/src/main/resources/configForPropertiesTwo.xml

@@ -4,7 +4,8 @@
     xsi:schemaLocation="
       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd
       http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.1.xsd
-      http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd">
+      http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd"
+>
 
     <context:property-placeholder location="classpath:bar.properties" order="2"/>
 

spring-exceptions/src/main/webapp/WEB-INF/web_old.xml

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-	xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
     xsi:schemaLocation="
       http://java.sun.com/xml/ns/javaee
-      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0"
-	id="WebApp_ID" version="3.0">
+>
 
     <display-name>Spring MVC Application</display-name>
 

spring-exceptions/src/test/java/org/baeldung/ex/beancreationexception/BeanCreationExceptionTestSuite.java

@@ -4,7 +4,7 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
 @RunWith(Suite.class)
-@Suite.SuiteClasses({// @formatter:off
+@Suite.SuiteClasses({ // @formatter:off
     Cause1BeanCreationExceptionIntegrationTest.class
     ,Cause2BeanCreationExceptionIntegrationTest.class
     ,Cause3BeanCreationExceptionIntegrationTest.class

spring-hibernate3/pom.xml

@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.baeldung</groupId>
     <artifactId>spring-hibernate3</artifactId>

spring-hibernate3/src/main/java/org/baeldung/persistence/dao/FooDao.java

@@ -4,7 +4,7 @@ import org.baeldung.persistence.model.Foo;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public class FooDao extends AbstractHibernateDao<Foo> implements IFooDao {
+public class FooDao extends AbstractHibernateDao<Foo>implements IFooDao {
 
     public FooDao() {
         super();

spring-hibernate3/src/main/resources/persistenceConfig.xml

@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" 
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-   xmlns:context="http://www.springframework.org/schema/context"
     xsi:schemaLocation="
       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd
-      http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd">
+      http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd"
+>
 
-    <context:property-placeholder location="classpath:persistence-mysql.properties" />
+    <context:property-placeholder location="classpath:persistence-mysql.properties"/>
 
     <bean id="sessionFactory" class="org.springframework.orm.hibernate3.annotation.AnnotationSessionFactoryBean">
-        <property name="dataSource" ref="dataSource" />
+        <property name="dataSource" ref="dataSource"/>
-        <property name="packagesToScan" value="org.baeldung.persistence.model" />
+        <property name="packagesToScan" value="org.baeldung.persistence.model"/>
         <property name="hibernateProperties">
             <props>
                 <prop key="hibernate.hbm2ddl.auto">${hibernate.hbm2ddl.auto}</prop>
@@ -20,16 +19,16 @@
     </bean>
 
     <bean id="dataSource" class="org.apache.tomcat.dbcp.dbcp.BasicDataSource">
-        <property name="driverClassName" value="${jdbc.driverClassName}" />
+        <property name="driverClassName" value="${jdbc.driverClassName}"/>
-        <property name="url" value="${jdbc.url}" />
+        <property name="url" value="${jdbc.url}"/>
-        <property name="username" value="${jdbc.user}" />
+        <property name="username" value="${jdbc.user}"/>
-        <property name="password" value="${jdbc.pass}" />
+        <property name="password" value="${jdbc.pass}"/>
     </bean>
 
     <bean id="txManager" class="org.springframework.orm.hibernate3.HibernateTransactionManager">
-        <property name="sessionFactory" ref="sessionFactory" />
+        <property name="sessionFactory" ref="sessionFactory"/>
     </bean>
 
-    <bean id="persistenceExceptionTranslationPostProcessor" class="org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor" />
+    <bean id="persistenceExceptionTranslationPostProcessor" class="org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor"/>
 
 </beans>

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

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0">
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0"
+>
     <display-name>Spring Hibernate 3 Application</display-name>
     <context-param>
         <param-name>contextClass</param-name>

spring-hibernate4/pom.xml

@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.baeldung</groupId>
     <artifactId>spring-hibernate4</artifactId>

spring-hibernate4/src/main/java/org/baeldung/persistence/dao/common/GenericHibernateDao.java

@@ -8,6 +8,6 @@ import org.springframework.stereotype.Repository;
 
 @Repository
 @Scope(BeanDefinition.SCOPE_PROTOTYPE)
-public class GenericHibernateDao<T extends Serializable> extends AbstractHibernateDao<T> implements IGenericDao<T> {
+public class GenericHibernateDao<T extends Serializable> extends AbstractHibernateDao<T>implements IGenericDao<T> {
     //
 }

spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/ChildDao.java

@@ -6,7 +6,7 @@ import org.baeldung.persistence.model.Child;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public class ChildDao extends AbstractHibernateDao<Child> implements IChildDao {
+public class ChildDao extends AbstractHibernateDao<Child>implements IChildDao {
 
     public ChildDao() {
         super();

spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/FooDao.java

@@ -6,7 +6,7 @@ import org.baeldung.persistence.model.Foo;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public class FooDao extends AbstractHibernateDao<Foo> implements IFooDao {
+public class FooDao extends AbstractHibernateDao<Foo>implements IFooDao {
 
     public FooDao() {
         super();

spring-hibernate4/src/main/java/org/baeldung/persistence/dao/impl/ParentDao.java

@@ -6,7 +6,7 @@ import org.baeldung.persistence.model.Parent;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public class ParentDao extends AbstractHibernateDao<Parent> implements IParentDao {
+public class ParentDao extends AbstractHibernateDao<Parent>implements IParentDao {
 
     public ParentDao() {
         super();

spring-hibernate4/src/main/java/org/baeldung/persistence/service/impl/ChildService.java

@@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
-public class ChildService extends AbstractService<Child> implements IChildService {
+public class ChildService extends AbstractService<Child>implements IChildService {
 
     @Autowired
     private IChildDao dao;

spring-hibernate4/src/main/java/org/baeldung/persistence/service/impl/FooService.java

@@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
-public class FooService extends AbstractService<Foo> implements IFooService {
+public class FooService extends AbstractService<Foo>implements IFooService {
 
     @Autowired
     private IFooDao dao;

spring-hibernate4/src/main/java/org/baeldung/persistence/service/impl/ParentService.java

@@ -9,7 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 @Service
-public class ParentService extends AbstractService<Parent> implements IParentService {
+public class ParentService extends AbstractService<Parent>implements IParentService {
 
     @Autowired
     private IParentDao dao;

spring-hibernate4/src/main/resources/hibernate4Config.xml

@@ -1,16 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans" 
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-   xmlns:context="http://www.springframework.org/schema/context"
     xsi:schemaLocation="
       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd
-      http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd">
+      http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd"
+>
 
-    <context:property-placeholder location="classpath:persistence-mysql.properties" />
+    <context:property-placeholder location="classpath:persistence-mysql.properties"/>
 
     <bean id="sessionFactory" class="org.springframework.orm.hibernate4.LocalSessionFactoryBean">
-        <property name="dataSource" ref="dataSource" />
+        <property name="dataSource" ref="dataSource"/>
-        <property name="packagesToScan" value="org.baeldung.persistence.model" />
+        <property name="packagesToScan" value="org.baeldung.persistence.model"/>
         <property name="hibernateProperties">
             <props>
                 <prop key="hibernate.hbm2ddl.auto">${hibernate.hbm2ddl.auto}</prop>
@@ -20,16 +19,16 @@
     </bean>
 
     <bean id="dataSource" class="org.apache.tomcat.dbcp.dbcp.BasicDataSource">
-        <property name="driverClassName" value="${jdbc.driverClassName}" />
+        <property name="driverClassName" value="${jdbc.driverClassName}"/>
-        <property name="url" value="${jdbc.url}" />
+        <property name="url" value="${jdbc.url}"/>
-        <property name="username" value="${jdbc.user}" />
+        <property name="username" value="${jdbc.user}"/>
-        <property name="password" value="${jdbc.pass}" />
+        <property name="password" value="${jdbc.pass}"/>
     </bean>
 
     <bean id="txManager" class="org.springframework.orm.hibernate4.HibernateTransactionManager">
-        <property name="sessionFactory" ref="sessionFactory" />
+        <property name="sessionFactory" ref="sessionFactory"/>
     </bean>
 
-    <bean id="persistenceExceptionTranslationPostProcessor" class="org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor" />
+    <bean id="persistenceExceptionTranslationPostProcessor" class="org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor"/>
 
 </beans>

spring-hibernate4/src/main/resources/webSecurityConfig.xml

@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<beans:beans xmlns="http://www.springframework.org/schema/security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
-	xmlns:beans="http://www.springframework.org/schema/beans"
     xsi:schemaLocation="
 		http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd">
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd"
+>
 
     <http access-denied-page="/access-denied.html" use-expressions="true">
-		<intercept-url pattern="/access-denied*" access="hasAnyRole('ROLE_LOCATION_WRITE','ROLE_POLYGON_WRITE')" />
+        <intercept-url pattern="/access-denied*" access="hasAnyRole('ROLE_LOCATION_WRITE','ROLE_POLYGON_WRITE')"/>
-		<intercept-url pattern="/admin/**" access="hasAnyRole('ROLE_ADMIN')" />
+        <intercept-url pattern="/admin/**" access="hasAnyRole('ROLE_ADMIN')"/>
-		<intercept-url pattern="/organization/**" access="hasAnyRole('ROLE_ORGANIZATION')" />
+        <intercept-url pattern="/organization/**" access="hasAnyRole('ROLE_ORGANIZATION')"/>
-		<intercept-url pattern="/location/edit*" access="hasAnyRole('ROLE_LOCATION_WRITE')" />
+        <intercept-url pattern="/location/edit*" access="hasAnyRole('ROLE_LOCATION_WRITE')"/>
-		<intercept-url pattern="/location/view*" access="permitAll" />
+        <intercept-url pattern="/location/view*" access="permitAll"/>
 
-		<intercept-url pattern="/login*" access="isAnonymous()" />
+        <intercept-url pattern="/login*" access="isAnonymous()"/>
-		<intercept-url pattern="/register*" access="isAnonymous()" />
+        <intercept-url pattern="/register*" access="isAnonymous()"/>
-		<intercept-url pattern="/login-denied/**" access="isAnonymous()" />
+        <intercept-url pattern="/login-denied/**" access="isAnonymous()"/>
 
-		<intercept-url pattern="/**" access="permitAll" />
+        <intercept-url pattern="/**" access="permitAll"/>
 
-		<form-login login-page='/login.html' default-target-url="/" always-use-default-target="false" authentication-failure-url="/login.html?error=true" />
+        <form-login login-page='/login.html' default-target-url="/" always-use-default-target="false" authentication-failure-url="/login.html?error=true"/>
 
-		<logout />
+        <logout/>
 
-		<anonymous />
+        <anonymous/>
 
         <session-management invalid-session-url="/">
-			<concurrency-control max-sessions="1" />
+            <concurrency-control max-sessions="1"/>
         </session-management>
     </http>
 
     <authentication-manager alias="authenticationManager" erase-credentials="false">
-		<authentication-provider ref="restAuthenticationProvider" />
+        <authentication-provider ref="restAuthenticationProvider"/>
     </authentication-manager>
 
 </beans:beans>

spring-hibernate4/src/test/java/org/baeldung/persistence/IntegrationTestSuite.java

@@ -9,7 +9,7 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
 @RunWith(Suite.class)
-@Suite.SuiteClasses({// @formatter:off
+@Suite.SuiteClasses({ // @formatter:off
     FooServiceBasicPersistenceIntegrationTest.class
     ,FooPaginationPersistenceIntegrationTest.class
     ,FooServicePersistenceIntegrationTest.class

spring-jpa/.classpath

@@ -29,7 +29,7 @@
 	</classpathentry>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
 		<attributes>
-			<attribute name="owner.project.facets" value="java"/>
+			<attribute name="maven.pomderived" value="true"/>
 		</attributes>
 	</classpathentry>
 	<classpathentry kind="output" path="target/classes"/>

spring-jpa/pom.xml

@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.baeldung</groupId>

spring-jpa/src/main/java/org/baeldung/persistence/dao/FooDao.java

@@ -4,7 +4,7 @@ import org.baeldung.persistence.model.Foo;
 import org.springframework.stereotype.Repository;
 
 @Repository
-public class FooDao extends AbstractJpaDAO<Foo> implements IFooDao {
+public class FooDao extends AbstractJpaDAO<Foo>implements IFooDao {
 
     public FooDao() {
         super();

spring-jpa/src/main/resources/jpaConfig.xml

@@ -4,19 +4,18 @@
     xsi:schemaLocation="
       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd
       http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-4.1.xsd
-      http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd">
+      http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-4.1.xsd"
+>
 
-    <context:property-placeholder location="classpath:persistence-mysql.properties" />
+    <context:property-placeholder location="classpath:persistence-mysql.properties"/>
 
     <bean id="myEmf" class="org.springframework.orm.jpa.LocalContainerEntityManagerFactoryBean">
-        <property name="dataSource" ref="dataSource" />
+        <property name="dataSource" ref="dataSource"/>
-        <property name="packagesToScan" value="org.baeldung.persistence.model" />
+        <property name="packagesToScan" value="org.baeldung.persistence.model"/>
         <property name="jpaVendorAdapter">
-            <bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter" />
+            <bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter"/>
-            <!-- <bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter" />
+            <!-- <bean class="org.springframework.orm.jpa.vendor.HibernateJpaVendorAdapter" /> <property name="generateDdl" value="${jpa.generateDdl}" /> <property name="databasePlatform" 
-                <property name="generateDdl" value="${jpa.generateDdl}" />
+                value="${persistence.dialect}" /> </bean> -->
-                <property name="databasePlatform" value="${persistence.dialect}" />
-            </bean> -->
         </property>
         <property name="jpaProperties">
             <props>
@@ -27,17 +26,17 @@
     </bean>
 
     <bean id="dataSource" class="org.springframework.jdbc.datasource.DriverManagerDataSource">
-        <property name="driverClassName" value="${jdbc.driverClassName}" />
+        <property name="driverClassName" value="${jdbc.driverClassName}"/>
-        <property name="url" value="${jdbc.url}" />
+        <property name="url" value="${jdbc.url}"/>
-        <property name="username" value="${jdbc.user}" />
+        <property name="username" value="${jdbc.user}"/>
-        <property name="password" value="${jdbc.pass}" />
+        <property name="password" value="${jdbc.pass}"/>
     </bean>
 
     <bean id="transactionManager" class="org.springframework.orm.jpa.JpaTransactionManager">
-        <property name="entityManagerFactory" ref="myEmf" />
+        <property name="entityManagerFactory" ref="myEmf"/>
     </bean>
-    <tx:annotation-driven />
+    <tx:annotation-driven/>
 
-    <bean id="persistenceExceptionTranslationPostProcessor" class="org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor" />
+    <bean id="persistenceExceptionTranslationPostProcessor" class="org.springframework.dao.annotation.PersistenceExceptionTranslationPostProcessor"/>
 
 </beans>

spring-jpa/src/main/resources/webSecurityConfig.xml

@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<beans:beans xmlns="http://www.springframework.org/schema/security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
-	xmlns:beans="http://www.springframework.org/schema/beans"
     xsi:schemaLocation="
 		http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd">
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd"
+>
 
     <http access-denied-page="/access-denied.html" use-expressions="true">
-		<intercept-url pattern="/access-denied*" access="hasAnyRole('ROLE_LOCATION_WRITE','ROLE_POLYGON_WRITE')" />
+        <intercept-url pattern="/access-denied*" access="hasAnyRole('ROLE_LOCATION_WRITE','ROLE_POLYGON_WRITE')"/>
-		<intercept-url pattern="/admin/**" access="hasAnyRole('ROLE_ADMIN')" />
+        <intercept-url pattern="/admin/**" access="hasAnyRole('ROLE_ADMIN')"/>
-		<intercept-url pattern="/organization/**" access="hasAnyRole('ROLE_ORGANIZATION')" />
+        <intercept-url pattern="/organization/**" access="hasAnyRole('ROLE_ORGANIZATION')"/>
-		<intercept-url pattern="/location/edit*" access="hasAnyRole('ROLE_LOCATION_WRITE')" />
+        <intercept-url pattern="/location/edit*" access="hasAnyRole('ROLE_LOCATION_WRITE')"/>
-		<intercept-url pattern="/location/view*" access="permitAll" />
+        <intercept-url pattern="/location/view*" access="permitAll"/>
 
-		<intercept-url pattern="/login*" access="isAnonymous()" />
+        <intercept-url pattern="/login*" access="isAnonymous()"/>
-		<intercept-url pattern="/register*" access="isAnonymous()" />
+        <intercept-url pattern="/register*" access="isAnonymous()"/>
-		<intercept-url pattern="/login-denied/**" access="isAnonymous()" />
+        <intercept-url pattern="/login-denied/**" access="isAnonymous()"/>
 
-		<intercept-url pattern="/**" access="permitAll" />
+        <intercept-url pattern="/**" access="permitAll"/>
 
-		<form-login login-page='/login.html' default-target-url="/" always-use-default-target="false" authentication-failure-url="/login.html?error=true" />
+        <form-login login-page='/login.html' default-target-url="/" always-use-default-target="false" authentication-failure-url="/login.html?error=true"/>
 
-		<logout />
+        <logout/>
 
-		<anonymous />
+        <anonymous/>
 
         <session-management invalid-session-url="/">
-			<concurrency-control max-sessions="1" />
+            <concurrency-control max-sessions="1"/>
         </session-management>
     </http>
 
     <authentication-manager alias="authenticationManager" erase-credentials="false">
-		<authentication-provider ref="restAuthenticationProvider" />
+        <authentication-provider ref="restAuthenticationProvider"/>
     </authentication-manager>
 
 </beans:beans>

spring-jpa/src/test/java/org/baeldung/persistence/service/PersistenceTestSuite.java

@@ -4,7 +4,7 @@ import org.junit.runner.RunWith;
 import org.junit.runners.Suite;
 
 @RunWith(Suite.class)
-@Suite.SuiteClasses({// @formatter:off
+@Suite.SuiteClasses({ // @formatter:off
     FooPaginationPersistenceIntegrationTest.class
     ,FooServicePersistenceIntegrationTest.class
     ,FooServiceSortingTests.class

spring-mvc-java/pom.xml

@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.baeldung</groupId>
     <artifactId>spring-mvc-java</artifactId>

spring-mvc-java/src/main/webapp/WEB-INF/web_old.xml

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-	xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
     xsi:schemaLocation="
       http://java.sun.com/xml/ns/javaee
-      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0"
-	id="WebApp_ID" version="3.0">
+>
 
     <display-name>Spring MVC Application</display-name>
 

spring-mvc-no-xml/pom.xml

@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.baeldung</groupId>
     <version>0.1-SNAPSHOT</version>

spring-mvc-no-xml/src/main/java/org/baeldung/servlet/WebAppOld.java

@@ -1,6 +1,6 @@
 package org.baeldung.servlet;
 
-//public class WebApp implements WebApplicationInitializer {
+// public class WebApp implements WebApplicationInitializer {
 //
 // public WebApp() {
 // super();

spring-mvc-no-xml/src/main/resources/webSecurityConfig.xml

@@ -1,36 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<beans:beans xmlns="http://www.springframework.org/schema/security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
-	xmlns:beans="http://www.springframework.org/schema/beans"
     xsi:schemaLocation="
 		http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd">
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd"
+>
 
     <http access-denied-page="/access-denied.html" use-expressions="true">
-		<intercept-url pattern="/access-denied*" access="hasAnyRole('ROLE_LOCATION_WRITE','ROLE_POLYGON_WRITE')" />
+        <intercept-url pattern="/access-denied*" access="hasAnyRole('ROLE_LOCATION_WRITE','ROLE_POLYGON_WRITE')"/>
-		<intercept-url pattern="/admin/**" access="hasAnyRole('ROLE_ADMIN')" />
+        <intercept-url pattern="/admin/**" access="hasAnyRole('ROLE_ADMIN')"/>
-		<intercept-url pattern="/organization/**" access="hasAnyRole('ROLE_ORGANIZATION')" />
+        <intercept-url pattern="/organization/**" access="hasAnyRole('ROLE_ORGANIZATION')"/>
-		<intercept-url pattern="/location/edit*" access="hasAnyRole('ROLE_LOCATION_WRITE')" />
+        <intercept-url pattern="/location/edit*" access="hasAnyRole('ROLE_LOCATION_WRITE')"/>
-		<intercept-url pattern="/location/view*" access="permitAll" />
+        <intercept-url pattern="/location/view*" access="permitAll"/>
 
-		<intercept-url pattern="/login*" access="isAnonymous()" />
+        <intercept-url pattern="/login*" access="isAnonymous()"/>
-		<intercept-url pattern="/register*" access="isAnonymous()" />
+        <intercept-url pattern="/register*" access="isAnonymous()"/>
-		<intercept-url pattern="/login-denied/**" access="isAnonymous()" />
+        <intercept-url pattern="/login-denied/**" access="isAnonymous()"/>
 
-		<intercept-url pattern="/**" access="permitAll" />
+        <intercept-url pattern="/**" access="permitAll"/>
 
-		<form-login login-page='/login.html' default-target-url="/" always-use-default-target="false" authentication-failure-url="/login.html?error=true" />
+        <form-login login-page='/login.html' default-target-url="/" always-use-default-target="false" authentication-failure-url="/login.html?error=true"/>
 
-		<logout />
+        <logout/>
 
-		<anonymous />
+        <anonymous/>
 
         <session-management invalid-session-url="/">
-			<concurrency-control max-sessions="1" />
+            <concurrency-control max-sessions="1"/>
         </session-management>
     </http>
 
     <authentication-manager alias="authenticationManager" erase-credentials="false">
-		<authentication-provider ref="restAuthenticationProvider" />
+        <authentication-provider ref="restAuthenticationProvider"/>
     </authentication-manager>
 
 </beans:beans>

spring-mvc-no-xml/src/main/webapp/WEB-INF/web_old.xml

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-	xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
     xsi:schemaLocation="
       http://java.sun.com/xml/ns/javaee
-      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0"
-	id="WebApp_ID" version="3.0">
+>
 
     <display-name>Spring MVC No XML Application</display-name>
 

spring-mvc-xml/pom.xml

@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.baeldung</groupId>
     <version>0.1-SNAPSHOT</version>

spring-mvc-xml/src/main/resources/webMvcConfig.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:context="http://www.springframework.org/schema/context"
     xmlns:mvc="http://www.springframework.org/schema/mvc"
     xsi:schemaLocation="
         http://www.springframework.org/schema/beans 
@@ -8,16 +7,16 @@
         http://www.springframework.org/schema/context
 		http://www.springframework.org/schema/context/spring-context-4.1.xsd
         http://www.springframework.org/schema/mvc
-        http://www.springframework.org/schema/mvc/spring-mvc-4.1.xsd">
+        http://www.springframework.org/schema/mvc/spring-mvc-4.1.xsd"
+>
 
-	<mvc:annotation-driven />
+    <mvc:annotation-driven/>
-	<context:component-scan base-package="org.baeldung.spring.controller" />
+    <context:component-scan base-package="org.baeldung.spring.controller"/>
-	<bean id="viewResolver"
+    <bean id="viewResolver" class="org.springframework.web.servlet.view.InternalResourceViewResolver">
-		class="org.springframework.web.servlet.view.InternalResourceViewResolver">
+        <property name="prefix" value="/WEB-INF/view/"/>
-		<property name="prefix" value="/WEB-INF/view/" />
+        <property name="suffix" value=".jsp"/>
-		<property name="suffix" value=".jsp" />
     </bean>
 
-	<mvc:view-controller path="/sample.html" view-name="sample" />
+    <mvc:view-controller path="/sample.html" view-name="sample"/>
 
 </beans>

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

@@ -2,7 +2,8 @@
 <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
     xsi:schemaLocation="
       http://java.sun.com/xml/ns/javaee
-      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0">
+      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0"
+>
 
     <display-name>Spring MVC XML Application</display-name>
 

spring-rest/pom.xml

@@ -159,7 +159,6 @@
             <version>${spring.version}</version>
         </dependency>
 
-
     </dependencies>
 
     <build>

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

@@ -35,7 +35,7 @@
     </servlet-mapping>
 
     <welcome-file-list>
-        <welcome-file />
+        <welcome-file/>
     </welcome-file-list>
 
 </web-app>

spring-security-basic-auth/pom.xml

@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.baeldung</groupId>
     <artifactId>spring-security-mvc-basic-auth</artifactId>

spring-security-basic-auth/src/main/resources/webSecurityConfig.xml

@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans:beans xmlns="http://www.springframework.org/schema/security"
+<beans:beans xmlns="http://www.springframework.org/schema/security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
     xsi:schemaLocation="
 		http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.0.xsd"
+>
 
-	<http pattern="/securityNone" security="none" />
+    <http pattern="/securityNone" security="none"/>
 
     <http use-expressions="true">
-		<intercept-url pattern="/**" access="isAuthenticated()" />
+        <intercept-url pattern="/**" access="isAuthenticated()"/>
 
-        <http-basic entry-point-ref="myBasicAuthenticationEntryPoint" />
+        <http-basic entry-point-ref="myBasicAuthenticationEntryPoint"/>
 
     </http>
 
     <authentication-manager>
         <authentication-provider>
             <user-service>
-				<user name="user1" password="user1Pass" authorities="ROLE_USER" />
+                <user name="user1" password="user1Pass" authorities="ROLE_USER"/>
             </user-service>
         </authentication-provider>
     </authentication-manager>

spring-security-basic-auth/src/main/webapp/WEB-INF/web.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0">
+    xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0"
+>
     <display-name>Spring Security Basic Auth Application</display-name>
 
     <context-param>

spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/Role.java

@@ -21,7 +21,7 @@ public class Role {
     private Collection<User> users;
 
     @ManyToMany
-    @JoinTable(name = "roles_privileges", joinColumns = @JoinColumn(name = "role_id", referencedColumnName = "id"), inverseJoinColumns = @JoinColumn(name = "privilege_id", referencedColumnName = "id"))
+    @JoinTable(name = "roles_privileges", joinColumns = @JoinColumn(name = "role_id", referencedColumnName = "id") , inverseJoinColumns = @JoinColumn(name = "privilege_id", referencedColumnName = "id") )
     private Collection<Privilege> privileges;
 
     private String name;

spring-security-login-and-registration/src/main/java/org/baeldung/persistence/model/User.java

@@ -32,7 +32,7 @@ public class User {
     private boolean tokenExpired;
 
     @ManyToMany
-    @JoinTable(name = "users_roles", joinColumns = @JoinColumn(name = "user_id", referencedColumnName = "id"), inverseJoinColumns = @JoinColumn(name = "role_id", referencedColumnName = "id"))
+    @JoinTable(name = "users_roles", joinColumns = @JoinColumn(name = "user_id", referencedColumnName = "id") , inverseJoinColumns = @JoinColumn(name = "role_id", referencedColumnName = "id") )
     private Collection<Role> roles;
 
     public User() {

spring-security-login-and-registration/src/main/java/org/baeldung/validation/PasswordMatches.java

@@ -18,7 +18,7 @@ public @interface PasswordMatches {
 
     String message() default "Passwords don't match";
 
-    Class<?>[] groups() default {};
+    Class<?>[]groups() default {};
 
-    Class<? extends Payload>[] payload() default {};
+    Class<? extends Payload>[]payload() default {};
 }

spring-security-login-and-registration/src/main/java/org/baeldung/validation/ValidEmail.java

@@ -18,7 +18,7 @@ public @interface ValidEmail {
 
     String message() default "Invalid Email";
 
-    Class<?>[] groups() default {};
+    Class<?>[]groups() default {};
 
-    Class<? extends Payload>[] payload() default {};
+    Class<? extends Payload>[]payload() default {};
 }

spring-security-login-and-registration/src/main/java/org/baeldung/validation/ValidPassword.java

@@ -20,8 +20,8 @@ public @interface ValidPassword {
 
     String message() default "Invalid Password";
 
-    Class<?>[] groups() default {};
+    Class<?>[]groups() default {};
 
-    Class<? extends Payload>[] payload() default {};
+    Class<? extends Payload>[]payload() default {};
 
 }

spring-security-login-and-registration/src/main/resources/webSecurityConfig.xml

@@ -3,37 +3,38 @@
     xmlns:mvc="http://www.springframework.org/schema/mvc"
     xsi:schemaLocation="
 		http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd">
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd"
+>
 
     <http use-expressions="true">
-        <intercept-url pattern="/login*" access="permitAll" />
+        <intercept-url pattern="/login*" access="permitAll"/>
-        <intercept-url pattern="/logout*" access="permitAll" />
+        <intercept-url pattern="/logout*" access="permitAll"/>
-        <intercept-url pattern="/signin/**" access="permitAll" />
+        <intercept-url pattern="/signin/**" access="permitAll"/>
-        <intercept-url pattern="/signup/**" access="permitAll" />
+        <intercept-url pattern="/signup/**" access="permitAll"/>
-        <intercept-url pattern="/user/registration*" access="permitAll" />
+        <intercept-url pattern="/user/registration*" access="permitAll"/>
-        <intercept-url pattern="/regitrationConfirm*" access="permitAll" />
+        <intercept-url pattern="/regitrationConfirm*" access="permitAll"/>
-        <intercept-url pattern="/expiredAccount*" access="permitAll" />
+        <intercept-url pattern="/expiredAccount*" access="permitAll"/>
-        <intercept-url pattern="/registration*" access="permitAll" />
+        <intercept-url pattern="/registration*" access="permitAll"/>
-        <intercept-url pattern="/badUser*" access="permitAll" />
+        <intercept-url pattern="/badUser*" access="permitAll"/>
-        <intercept-url pattern="/user/resendRegistrationToken*" access="permitAll" />
+        <intercept-url pattern="/user/resendRegistrationToken*" access="permitAll"/>
-        <intercept-url pattern="/forgetPassword*" access="permitAll" />
+        <intercept-url pattern="/forgetPassword*" access="permitAll"/>
-        <intercept-url pattern="/user/resetPassword*" access="permitAll" />
+        <intercept-url pattern="/user/resetPassword*" access="permitAll"/>
-        <intercept-url pattern="/user/changePassword*" access="permitAll" />
+        <intercept-url pattern="/user/changePassword*" access="permitAll"/>
-        <intercept-url pattern="/updatePassword*" access="isAuthenticated()" />
+        <intercept-url pattern="/updatePassword*" access="isAuthenticated()"/>
-        <intercept-url pattern="/user/savePassword*" access="isAuthenticated()" />
+        <intercept-url pattern="/user/savePassword*" access="isAuthenticated()"/>
 
-        <intercept-url pattern="/emailError*" access="permitAll" />
+        <intercept-url pattern="/emailError*" access="permitAll"/>
-        <intercept-url pattern="/resources/**" access="permitAll" />
+        <intercept-url pattern="/resources/**" access="permitAll"/>
-        <intercept-url pattern="/invalidSession*" access="isAnonymous()" />
+        <intercept-url pattern="/invalidSession*" access="isAnonymous()"/>
-        <intercept-url pattern="/**" access="isAuthenticated()" />
+        <intercept-url pattern="/**" access="isAuthenticated()"/>
         <form-login login-page='/login.html' authentication-failure-url="/login.html?error=true" authentication-success-handler-ref="myAuthenticationSuccessHandler"
-            default-target-url="/homepage.html" />
+            default-target-url="/homepage.html"/>
-        <session-management invalid-session-url="/invalidSession.html" session-fixation-protection="none" />
+        <session-management invalid-session-url="/invalidSession.html" session-fixation-protection="none"/>
-        <logout invalidate-session="false" logout-success-url="/logout.html?logSucc=true" logout-url="/j_spring_security_logout" delete-cookies="JSESSIONID" />
+        <logout invalidate-session="false" logout-success-url="/logout.html?logSucc=true" logout-url="/j_spring_security_logout" delete-cookies="JSESSIONID"/>
     </http>
 
     <authentication-manager>
-        <authentication-provider ref="authProvider" />
+        <authentication-provider ref="authProvider"/>
     </authentication-manager>
 
 </beans:beans>

spring-security-login-and-registration/src/main/webapp/WEB-INF/web.xml

@@ -2,7 +2,8 @@
 <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
     xsi:schemaLocation="
       http://java.sun.com/xml/ns/javaee
-      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0">
+      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0"
+>
 
     <context-param>
         <param-name>contextClass</param-name>

spring-security-mvc-custom/pom.xml

@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.baeldung</groupId>
     <artifactId>spring-security-mvc-custom</artifactId>

spring-security-mvc-custom/src/main/resources/webSecurityConfig.xml

@@ -4,28 +4,29 @@
 		http://www.springframework.org/schema/security 
         http://www.springframework.org/schema/security/spring-security-3.2.xsd
 		http://www.springframework.org/schema/beans 
-        http://www.springframework.org/schema/beans/spring-beans-4.1.xsd">
+        http://www.springframework.org/schema/beans/spring-beans-4.1.xsd"
+>
 
     <http use-expressions="true">
-        <intercept-url pattern="/anonymous*" access="isAnonymous()" />
+        <intercept-url pattern="/anonymous*" access="isAnonymous()"/>
-        <intercept-url pattern="/login*" access="permitAll" />
+        <intercept-url pattern="/login*" access="permitAll"/>
-        <intercept-url pattern="/**" access="isAuthenticated()" />
+        <intercept-url pattern="/**" access="isAuthenticated()"/>
 
-        <form-login login-page='/login.html' authentication-success-handler-ref="myAuthenticationSuccessHandler" authentication-failure-url="/login.html?error=true" />
+        <form-login login-page='/login.html' authentication-success-handler-ref="myAuthenticationSuccessHandler" authentication-failure-url="/login.html?error=true"/>
 
-        <logout delete-cookies="JSESSIONID" />
+        <logout delete-cookies="JSESSIONID"/>
 
-        <remember-me key="uniqueAndSecret" token-validity-seconds="86400" />
+        <remember-me key="uniqueAndSecret" token-validity-seconds="86400"/>
 
     </http>
 
-    <beans:bean id="myAuthenticationSuccessHandler" class="org.baeldung.security.MySimpleUrlAuthenticationSuccessHandler" />
+    <beans:bean id="myAuthenticationSuccessHandler" class="org.baeldung.security.MySimpleUrlAuthenticationSuccessHandler"/>
 
     <authentication-manager>
         <authentication-provider>
             <user-service>
-                <user name="user1" password="user1Pass" authorities="ROLE_USER" />
+                <user name="user1" password="user1Pass" authorities="ROLE_USER"/>
-                <user name="admin1" password="admin1Pass" authorities="ROLE_ADMIN" />
+                <user name="admin1" password="admin1Pass" authorities="ROLE_ADMIN"/>
             </user-service>
         </authentication-provider>
     </authentication-manager>

spring-security-mvc-custom/src/main/webapp/WEB-INF/web.xml

@@ -2,7 +2,8 @@
 <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
     xsi:schemaLocation="
       http://java.sun.com/xml/ns/javaee
-      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0">
+      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0"
+>
 
     <display-name>Spring MVC Custom Application</display-name>
 

spring-security-mvc-digest-auth/pom.xml

@@ -1,5 +1,4 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <groupId>org.baeldung</groupId>
     <artifactId>spring-security-mvc-digest-auth</artifactId>

spring-security-mvc-digest-auth/src/main/resources/webSecurityConfig.xml

@@ -2,28 +2,29 @@
 <beans:beans xmlns="http://www.springframework.org/schema/security" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"
     xsi:schemaLocation="
 		http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd
-		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd">
+		http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd"
+>
 
     <beans:bean id="digestFilter" class="org.springframework.security.web.authentication.www.DigestAuthenticationFilter">
-        <beans:property name="userDetailsService" ref="userService" />
+        <beans:property name="userDetailsService" ref="userService"/>
-        <beans:property name="authenticationEntryPoint" ref="digestEntryPoint" />
+        <beans:property name="authenticationEntryPoint" ref="digestEntryPoint"/>
     </beans:bean>
     <beans:bean id="digestEntryPoint" class="org.springframework.security.web.authentication.www.DigestAuthenticationEntryPoint">
-        <beans:property name="realmName" value="Contacts Realm via Digest Authentication" />
+        <beans:property name="realmName" value="Contacts Realm via Digest Authentication"/>
-        <beans:property name="key" value="acegi" />
+        <beans:property name="key" value="acegi"/>
     </beans:bean>
 
     <!-- the security namespace configuration -->
     <http use-expressions="true" entry-point-ref="digestEntryPoint">
-        <intercept-url pattern="/**" access="isAuthenticated()" />
+        <intercept-url pattern="/**" access="isAuthenticated()"/>
 
-        <custom-filter ref="digestFilter" position="BASIC_AUTH_FILTER" />
+        <custom-filter ref="digestFilter" position="BASIC_AUTH_FILTER"/>
     </http>
 
     <authentication-manager>
         <authentication-provider>
             <user-service id="userService">
-                <user name="user1" password="user1Pass" authorities="ROLE_USER" />
+                <user name="user1" password="user1Pass" authorities="ROLE_USER"/>
             </user-service>
         </authentication-provider>
     </authentication-manager>

spring-security-mvc-digest-auth/src/main/webapp/WEB-INF/web.xml

@@ -1,10 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
-	xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
     xsi:schemaLocation="
       http://java.sun.com/xml/ns/javaee
-      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
+      http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" id="WebApp_ID" version="3.0"
-	id="WebApp_ID" version="3.0">
+>
 
     <display-name>Spring Security Basic Auth Application</display-name>